Ver código fonte

Copy our original files over and merge

Eric Helgeson 6 meses atrás
pai
commit
d2d4a5802c

+ 2 - 0
lib/BlueSCSI_platform_RP2MCU/sd_card_sdio.cpp

@@ -1,4 +1,6 @@
 /** 
+ * This file is originally part of ZuluSCSI adopted for BlueSCSI
+ *
  * ZuluSCSI™ - Copyright (c) 2022-2025 Rabbit Hole Computing™
  * Copyright (c) 2024 Tech by Androda, LLC
  * 

+ 0 - 0
lib/SCSI2SD/src/firmware/toolbox.h → lib/SCSI2SD/src/firmware/bluescsi_toolbox.h


+ 1 - 1
lib/SCSI2SD/src/firmware/mode.c

@@ -23,7 +23,7 @@
 #include "disk.h"
 #include "inquiry.h"
 #include "BlueSCSI_mode.h"
-#include "toolbox.h"
+#include "bluescsi_toolbox.h"
 
 #include <string.h>
 

+ 1 - 1
lib/SCSI2SD/src/firmware/scsi.c

@@ -36,7 +36,7 @@
 #include "mo.h"
 #include "vendor.h"
 #include <string.h>
-#include "toolbox.h"
+#include "bluescsi_toolbox.h"
 
 // Global SCSI device state.
 ScsiDevice scsiDev S2S_DMA_ALIGN;

+ 1 - 1
lib/SCSI2SD/src/firmware/vendor.c

@@ -19,7 +19,7 @@
 #include "scsi.h"
 #include "vendor.h"
 #include "diagnostic.h"
-#include "toolbox.h"
+#include "bluescsi_toolbox.h"
 #include <string.h>
 
 // Callback after the DATA OUT phase is complete.

+ 7 - 6
src/BlueSCSI.cpp

@@ -1,16 +1,17 @@
 /*
- *  ZuluSCSI™
- *  Copyright (c) 2022-2025 Rabbit Hole Computing™
+ *  BlueSCSI v2
+ *  Copyright (c) 2023 Eric Helgeson, Androda, and contributors.
+ *
+ *  This project is based on ZuluSCSI, BlueSCSI v1, and SCSI2SD:
+ *
+ *  ZuluSCSI
+ *  Copyright (c) 2022 Rabbit Hole Computing
  *
  * This project is based on BlueSCSI:
  *
  *  BlueSCSI
  *  Copyright (c) 2021  Eric Helgeson, Androda
  *
- * This work incorporates work by following
- *  Copyright (c) 2023 joshua stein <jcs@jcs.org>
- *  Copyright (c) 2023 zigzagjoe
- *
  *  This file is free software: you may copy, redistribute and/or modify it
  *  under the terms of the GNU General Public License as published by the
  *  Free Software Foundation, either version 2 of the License, or (at your

+ 6 - 8
src/Toolbox.cpp → src/BlueSCSI_Toolbox.cpp

@@ -1,10 +1,8 @@
-/** 
+/**
  * Copyright (C) 2023 Eric Helgeson
- * Copyright (c) 2024-2025 Rabbit Hole Computing
- * Copyright (C) 2025 Niels Martin Hansen
- * 
- * This file is originally part of BlueSCSI adopted for BlueSCSI
- * 
+ *
+ * This file is part of BlueSCSI
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -18,14 +16,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 **/
-#include "Toolbox.h"
+#include "BlueSCSI_Toolbox.h"
 #include "BlueSCSI_disk.h"
 #include "BlueSCSI_cdrom.h"
 #include "BlueSCSI_log.h"
 #include <minIni.h>
 #include <SdFat.h>
 extern "C" {
-#include <toolbox.h>
+#include <bluescsi_toolbox.h>
 #include <scsi2sd_time.h>
 #include <sd.h>
 #include <mode.h>

+ 0 - 0
src/Toolbox.h → src/BlueSCSI_Toolbox.h


+ 2 - 0
src/BlueSCSI_config.h

@@ -1,4 +1,6 @@
 /**
+ * This file is originally part of ZuluSCSI adopted for BlueSCSI
+ *
  * ZuluSCSI™ - Copyright (c) 2022-2025 Rabbit Hole Computing™
  * Portions copyright (c) 2023 joshua stein <jcs@jcs.org>
  *

+ 1 - 1
src/BlueSCSI_disk.cpp

@@ -1,7 +1,7 @@
 /**
  * SCSI2SD V6 - Copyright (C) 2013 Michael McMaster <michael@codesrc.com>
  * Portions Copyright (C) 2014 Doug Brown <doug@downtowndougbrown.com>
- * Portions Copyright (C) 2023 Eric Helgeson
+ * Copyright (C) 2023 Eric Helgeson
  * ZuluSCSI™ - Copyright (c) 2022-2025 Rabbit Hole Computing™
  *
  * This file is licensed under the GPL version 3 or any later version. 

+ 3 - 0
src/BlueSCSI_initiator.cpp

@@ -1,4 +1,7 @@
 /**
+ * This file is originally part of ZuluSCSI adopted for BlueSCSI
+ *
+ * BlueSCSI - Copyright (c) 2024 Eric Helgeson, Androda
  * ZuluSCSI™ - Copyright (c) 2022-2025 Rabbit Hole Computing™
  *
  * ZuluSCSI™ firmware is licensed under the GPL version 3 or any later version. 

+ 2 - 0
src/BlueSCSI_settings.cpp

@@ -1,4 +1,6 @@
 /**
+ * This file is originally part of ZuluSCSI adopted for BlueSCSI
+ *
  * ZuluSCSI™ - Copyright (c) 2023-2025 Rabbit Hole Computing™
  * Copyright (c) 2023 Eric Helgeson
  * 

+ 2 - 0
src/BlueSCSI_settings.h

@@ -1,4 +1,6 @@
 /**
+ * This file is originally part of ZuluSCSI adopted for BlueSCSI
+ *
  * ZuluSCSI™ - Copyright (c) 2023-2025 Rabbit Hole Computing™
  * Copyright (c) 2023 Eric Helgeson
  * 

+ 3 - 1
src/ImageBackingStore.cpp

@@ -1,6 +1,8 @@
 /**
+ * This file is originally part of ZuluSCSI adopted for BlueSCSI
+ *
  * ZuluSCSI™ - Copyright (c) 2022-2025 Rabbit Hole Computing™
- * Portions - Copyright (C) 2023 Eric Helgeson
+ * Copyright (C) 2023 Eric Helgeson
  *
  * This file is licensed under the GPL version 3 or any later version. 
  *

+ 3 - 1
src/QuirksCheck.cpp

@@ -1,4 +1,6 @@
-/** 
+/**
+ * This file is part of BlueSCSI
+ *
  * Copyright (C) 2023 Eric Helgeson
  * Portions ZuluSCSI™ - Copyright (c) 2023-2025 Rabbit Hole Computing™
  * 

+ 3 - 2
src/QuirksCheck.h

@@ -1,5 +1,6 @@
-
-/** 
+/**
+ * This file is part of BlueSCSI
+ *
  * Copyright (C) 2023 Eric Helgeson
  * Portions ZuluSCSI™ - Copyright (c) 2023-2025 Rabbit Hole Computing™
  *