Fix building other targets

ZuluSCSI · Nov 29, 2023 · 4b62b82 · 4b62b82
1 parent f5b99f5
commit 4b62b82
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 8 deletions.
diff --git a/ZuluSCSI-firmware-2023.10.31-Cardreader_Pico_Dayna.uf2 b/ZuluSCSI-firmware-2023.10.31-Cardreader_Pico_Dayna.uf2
diff --git a/ZuluSCSI-firmware-23.11.27-Cardreader_Pico_Dayna.uf2 b/ZuluSCSI-firmware-23.11.27-Cardreader_Pico_Dayna.uf2
diff --git a/lib/ZuluSCSI_platform_RP2040/ZuluSCSI_platform.h b/lib/ZuluSCSI_platform_RP2040/ZuluSCSI_platform.h
@@ -26,6 +26,7 @@
 #include <stdint.h>
 #include <Arduino.h>
 #include "ZuluSCSI_platform_network.h"
+#include "rp_msc_reader.h"
 
 #ifdef ZULUSCSI_PICO
 // ZuluSCSI Pico carrier board variant

diff --git a/lib/ZuluSCSI_platform_RP2040/msc_device.c b/lib/ZuluSCSI_platform_RP2040/msc_device.c
@@ -23,6 +23,7 @@
  *
  * This file is part of the TinyUSB stack.
  */
+#ifdef PLATFORM_CARDREADER
 
 #include "tusb_option.h"
 
@@ -950,3 +951,4 @@ static void proc_write10_new_data(uint8_t rhport, mscd_interface_t* p_msc, uint3
 }
 
 #endif
+#endif // PLATFORM_CARDREADER
diff --git a/lib/ZuluSCSI_platform_RP2040/rp_msc_reader.cpp b/lib/ZuluSCSI_platform_RP2040/rp_msc_reader.cpp
@@ -1,4 +1,5 @@
 /* TODO - Header. By ZZJ. */
+#ifdef PLATFORM_CARDREADER
 
 #include <SdFat.h>
 #include <device/usbd.h>
@@ -9,8 +10,6 @@
 #include "msc.h"
 #include "msc_device.h"
 
-#ifdef PLATFORM_CARDREADER
-
 #if CFG_TUD_MSC_EP_BUFSIZE < SD_SECTOR_SIZE
   #error "CFG_TUD_MSC_EP_BUFSIZE is too small! It needs to be at least 512 (SD_SECTOR_SIZE)"
 #endif
@@ -293,4 +292,4 @@ extern "C" void tud_msc_write10_complete_cb(uint8_t lun) {
   SD.card()->syncDevice();
 }
 
-#endif
+#endif // PLATFORM_CARDREADER
diff --git a/lib/ZuluSCSI_platform_RP2040/rp_msc_reader.h b/lib/ZuluSCSI_platform_RP2040/rp_msc_reader.h
@@ -1,10 +1,8 @@
 /* TODO - Header. By ZZJ. */
-
+#ifdef PLATFORM_CARDREADER
 #ifndef RP_MSC_READER_H
 #define RP_MSC_READER_H
 
-#ifdef PLATFORM_CARDREADER
-
 // wait up to this long during init sequence for USB enumeration to enter card reader
 #define CR_ENUM_TIMEOUT 1000
 

diff --git a/src/ZuluSCSI.cpp b/src/ZuluSCSI.cpp
@@ -706,8 +706,6 @@ static void reinitSCSI()
 
 }
 
-#include "rp_msc_reader.h"
-
 extern "C" void zuluscsi_setup(void)
 {
   platform_init();

diff --git a/testbuild/zulu pico dayna.uf2 b/testbuild/zulu pico dayna.uf2
-Original file line number
+Diff line change
@@ Expand Up / @@ -706,8 +706,6 @@ static void reinitSCSI() @@
     }
-    #include "rp_msc_reader.h"
     extern "C" void zuluscsi_setup(void)
     {
       platform_init();
@@ Expand Down @@