Ver Fonte

Merge pull request #284 from ZuluSCSI/rp2040-file-renames

Rename files for new pcb designs using the RP2040
Alex Perez há 2 anos atrás
pai
commit
dc747dfedb

+ 1 - 1
lib/ZuluSCSI_platform_RP2040/ZuluSCSI_platform.cpp

@@ -38,7 +38,7 @@
 #include <multicore.h>
 #include <USB/PluggableUSBSerial.h>
 #include "audio.h"
-#include "scsi_accel_rp2040.h"
+#include "scsi_accel_target.h"
 
 extern "C" {
 

+ 1 - 1
lib/ZuluSCSI_platform_RP2040/ZuluSCSI_platform.h

@@ -31,7 +31,7 @@
 #include "ZuluSCSI_platform_gpio_BS2.h"
 #else
 // Normal RP2040 variant, using RP2040 chip directly
-#include "ZuluSCSI_platform_gpio.h"
+#include "ZuluSCSI_platform_gpio_RP2040.h"
 #endif
 
 #include "scsiHostPhy.h"

+ 0 - 0
lib/ZuluSCSI_platform_RP2040/ZuluSCSI_platform_gpio.h → lib/ZuluSCSI_platform_RP2040/ZuluSCSI_platform_gpio_RP2040.h


+ 6 - 4
lib/ZuluSCSI_platform_RP2040/run_pioasm.sh

@@ -2,8 +2,10 @@
 
 # This script regenerates the .pio.h files from .pio
 
-pioasm rp2040_sdio.pio rp2040_sdio.pio.h
-pioasm rp2040_sdio_BS2.pio rp2040_sdio_BS2.pio.h
+pioasm sdio_RP2040.pio sdio_RP2040.pio.h
+pioasm sdio_BS2.pio sdio_BS2.pio.h
 
-pioasm scsi_accel.pio scsi_accel.pio.h
-pioasm scsi_accel_BS2.pio scsi_accel_BS2.pio.h
+pioasm scsi_accel_target_RP2040.pio scsi_accel_target_RP2040.pio.h
+pioasm scsi_accel_target_BS2.pio scsi_accel_target_BS2.pio.h
+
+pioasm scsi_accel_host_RP2040.pio scsi_accel_host_RP2040.pio.h

+ 1 - 1
lib/ZuluSCSI_platform_RP2040/scsiPhy.cpp

@@ -29,7 +29,7 @@
 #include "ZuluSCSI_log.h"
 #include "ZuluSCSI_log_trace.h"
 #include "ZuluSCSI_config.h"
-#include "scsi_accel_rp2040.h"
+#include "scsi_accel_target.h"
 #include "hardware/structs/iobank0.h"
 
 #include <scsi2sd.h>

+ 1 - 1
lib/ZuluSCSI_platform_RP2040/scsi_accel_host.cpp

@@ -24,7 +24,7 @@
 #include "scsi_accel_host.h"
 #include "ZuluSCSI_platform.h"
 #include "ZuluSCSI_log.h"
-#include "scsi_accel_host.pio.h"
+#include "scsi_accel_host_RP2040.pio.h"
 #include <hardware/pio.h>
 #include <hardware/dma.h>
 #include <hardware/irq.h>

+ 0 - 0
lib/ZuluSCSI_platform_RP2040/scsi_accel_host.pio → lib/ZuluSCSI_platform_RP2040/scsi_accel_host_RP2040.pio


+ 0 - 0
lib/ZuluSCSI_platform_RP2040/scsi_accel_host.pio.h → lib/ZuluSCSI_platform_RP2040/scsi_accel_host_RP2040.pio.h


+ 3 - 3
lib/ZuluSCSI_platform_RP2040/scsi_accel_rp2040.cpp → lib/ZuluSCSI_platform_RP2040/scsi_accel_target.cpp

@@ -29,7 +29,7 @@
 
 #include "ZuluSCSI_platform.h"
 #include "ZuluSCSI_log.h"
-#include "scsi_accel_rp2040.h"
+#include "scsi_accel_target.h"
 #include <hardware/pio.h>
 #include <hardware/dma.h>
 #include <hardware/irq.h>
@@ -39,9 +39,9 @@
 #include <multicore.h>
 
 #ifdef ZULUSCSI_BS2
-#include "scsi_accel_BS2.pio.h"
+#include "scsi_accel_target_BS2.pio.h"
 #else
-#include "scsi_accel.pio.h"
+#include "scsi_accel_target_RP2040.pio.h"
 #endif
 
 // SCSI bus write acceleration uses up to 3 PIO state machines:

+ 0 - 0
lib/ZuluSCSI_platform_RP2040/scsi_accel_rp2040.h → lib/ZuluSCSI_platform_RP2040/scsi_accel_target.h


+ 0 - 0
lib/ZuluSCSI_platform_RP2040/scsi_accel_BS2.pio → lib/ZuluSCSI_platform_RP2040/scsi_accel_target_BS2.pio


+ 0 - 0
lib/ZuluSCSI_platform_RP2040/scsi_accel_BS2.pio.h → lib/ZuluSCSI_platform_RP2040/scsi_accel_target_BS2.pio.h


+ 0 - 0
lib/ZuluSCSI_platform_RP2040/scsi_accel.pio → lib/ZuluSCSI_platform_RP2040/scsi_accel_target_RP2040.pio


+ 0 - 0
lib/ZuluSCSI_platform_RP2040/scsi_accel.pio.h → lib/ZuluSCSI_platform_RP2040/scsi_accel_target_RP2040.pio.h


+ 1 - 1
lib/ZuluSCSI_platform_RP2040/sd_card_sdio.cpp

@@ -26,7 +26,7 @@
 #ifdef SD_USE_SDIO
 
 #include "ZuluSCSI_log.h"
-#include "rp2040_sdio.h"
+#include "sdio.h"
 #include <hardware/gpio.h>
 #include <SdFat.h>
 #include <SdCard/SdCardInfo.h>

+ 3 - 3
lib/ZuluSCSI_platform_RP2040/rp2040_sdio.cpp → lib/ZuluSCSI_platform_RP2040/sdio.cpp

@@ -29,7 +29,7 @@
 // https://www.sdcard.org/downloads/pls/
 // "SDIO Physical Layer Simplified Specification Version 8.00"
 
-#include "rp2040_sdio.h"
+#include "sdio.h"
 #include <hardware/pio.h>
 #include <hardware/dma.h>
 #include <hardware/gpio.h>
@@ -37,9 +37,9 @@
 #include <ZuluSCSI_log.h>
 
 #ifdef ZULUSCSI_BS2
-#include "rp2040_sdio_BS2.pio.h"
+#include "sdio_BS2.pio.h"
 #else
-#include "rp2040_sdio.pio.h"
+#include "sdio_RP2040.pio.h"
 #endif
 
 #define SDIO_PIO pio1

+ 0 - 0
lib/ZuluSCSI_platform_RP2040/rp2040_sdio.h → lib/ZuluSCSI_platform_RP2040/sdio.h


+ 0 - 0
lib/ZuluSCSI_platform_RP2040/rp2040_sdio_BS2.pio → lib/ZuluSCSI_platform_RP2040/sdio_BS2.pio


+ 0 - 0
lib/ZuluSCSI_platform_RP2040/rp2040_sdio_BS2.pio.h → lib/ZuluSCSI_platform_RP2040/sdio_BS2.pio.h


+ 0 - 0
lib/ZuluSCSI_platform_RP2040/rp2040_sdio.pio → lib/ZuluSCSI_platform_RP2040/sdio_RP2040.pio


+ 0 - 0
lib/ZuluSCSI_platform_RP2040/rp2040_sdio.pio.h → lib/ZuluSCSI_platform_RP2040/sdio_RP2040.pio.h