GD32F450: Update and rebase to newest main branch (az* renaming)

lib/ZuluSCSI_platform_GD32F450/ZuluSCSI_platform.cpp

@@ -9,7 +9,7 @@
 
 extern "C" {
 
-const char *g_azplatform_name = PLATFORM_NAME;
+const char *g_platform_name = PLATFORM_NAME;
 static bool g_enable_apple_quirks = false;
 
 /*************************/
@@ -56,7 +56,7 @@ void SysTick_Handler_inner(uint32_t *sp)
         {
             if (!scsiDev.resetFlag)
             {
-                azlog("WATCHDOG TIMEOUT at PC ", sp[6], " LR ", sp[5], " attempting bus reset");
+                logmsg("WATCHDOG TIMEOUT at PC ", sp[6], " LR ", sp[5], " attempting bus reset");
                 scsiDev.resetFlag = 1;
             }
 
@@ -107,7 +107,7 @@ void SysTick_Handle_PreEmptively()
 
 // Initialize SPI and GPIO configuration
 // Clock has already been initialized by system_gd32f20x.c
-void azplatform_init()
+void platform_init()
 {
     SystemCoreClockUpdate();
 
@@ -229,42 +229,42 @@ void azplatform_init()
     gpio_af_set(GPIOB, GPIO_AF_0, GPIO_PIN_3);   
 }
 
-void azplatform_late_init()
+void platform_late_init()
 {
-    azlog("Platform: ", g_azplatform_name);
-    azlog("FW Version: ", g_azlog_firmwareversion);
+    logmsg("Platform: ", g_platform_name);
+    logmsg("FW Version: ", g_log_firmwareversion);
     
     if (gpio_input_bit_get(DIP_PORT, DIPSW3_PIN))
     {
-        azlog("DIPSW3 is ON: Enabling SCSI termination");
+        logmsg("DIPSW3 is ON: Enabling SCSI termination");
         gpio_bit_reset(SCSI_TERM_EN_PORT, SCSI_TERM_EN_PIN);
     }
     else
     {
-        azlog("DIPSW3 is OFF: SCSI termination disabled");
+        logmsg("DIPSW3 is OFF: SCSI termination disabled");
     }
 
     if (gpio_input_bit_get(DIP_PORT, DIPSW2_PIN))
     {
-        azlog("DIPSW2 is ON: enabling debug messages");
-        g_azlog_debug = true;
+        logmsg("DIPSW2 is ON: enabling debug messages");
+        g_log_debug = true;
     }
     else
     {
-        g_azlog_debug = false;
+        g_log_debug = false;
     }
 
     if (gpio_input_bit_get(DIP_PORT, DIPSW1_PIN))
     {
-        azlog("DIPSW1 is ON: enabling Apple quirks by default");
+        logmsg("DIPSW1 is ON: enabling Apple quirks by default");
         g_enable_apple_quirks = true;
     }
 }
 
-void azplatform_disable_led(void)
+void platform_disable_led(void)
 {
     gpio_mode_set(LED_PORT, GPIO_MODE_INPUT, GPIO_PUPD_NONE, LED_PINS);
-    azlog("Disabling status LED");
+    logmsg("Disabling status LED");
 }
 
 /*****************************************/
@@ -274,7 +274,7 @@ void azplatform_disable_led(void)
 extern SdFs SD;
 
 // Writes log data to the PB3 SWO pin
-void azplatform_log(const char *s)
+void platform_log(const char *s)
 {
     while (*s)
     {
@@ -284,9 +284,9 @@ void azplatform_log(const char *s)
     }
 }
 
-void azplatform_emergency_log_save()
+void platform_emergency_log_save()
 {
-    azplatform_set_sd_callback(NULL, NULL);
+    platform_set_sd_callback(NULL, NULL);
 
     SD.begin(SD_CONFIG_CRASH);
     FsFile crashfile = SD.open(CRASHFILE, O_WRONLY | O_CREAT | O_TRUNC);
@@ -301,8 +301,8 @@ void azplatform_emergency_log_save()
     }
 
     uint32_t startpos = 0;
-    crashfile.write(azlog_get_buffer(&startpos));
-    crashfile.write(azlog_get_buffer(&startpos));
+    crashfile.write(log_get_buffer(&startpos));
+    crashfile.write(log_get_buffer(&startpos));
     crashfile.flush();
     crashfile.close();
 }
@@ -316,29 +316,29 @@ void show_hardfault(uint32_t *sp)
     uint32_t lr = sp[5];
     uint32_t cfsr = SCB->CFSR;
     
-    azlog("--------------");
-    azlog("CRASH!");
-    azlog("Platform: ", g_azplatform_name);
-    azlog("FW Version: ", g_azlog_firmwareversion);
-    azlog("CFSR: ", cfsr);
-    azlog("SP: ", (uint32_t)sp);
-    azlog("PC: ", pc);
-    azlog("LR: ", lr);
-    azlog("R0: ", sp[0]);
-    azlog("R1: ", sp[1]);
-    azlog("R2: ", sp[2]);
-    azlog("R3: ", sp[3]);
+    logmsg("--------------");
+    logmsg("CRASH!");
+    logmsg("Platform: ", g_platform_name);
+    logmsg("FW Version: ", g_log_firmwareversion);
+    logmsg("CFSR: ", cfsr);
+    logmsg("SP: ", (uint32_t)sp);
+    logmsg("PC: ", pc);
+    logmsg("LR: ", lr);
+    logmsg("R0: ", sp[0]);
+    logmsg("R1: ", sp[1]);
+    logmsg("R2: ", sp[2]);
+    logmsg("R3: ", sp[3]);
 
     uint32_t *p = (uint32_t*)((uint32_t)sp & ~3);
     for (int i = 0; i < 8; i++)
     {
         if (p == &_estack) break; // End of stack
         
-        azlog("STACK ", (uint32_t)p, ":    ", p[0], " ", p[1], " ", p[2], " ", p[3]);
+        logmsg("STACK ", (uint32_t)p, ":    ", p[0], " ", p[1], " ", p[2], " ", p[3]);
         p += 4;
     }
 
-    azplatform_emergency_log_save();
+    platform_emergency_log_save();
 
     while (1)
     {
@@ -393,22 +393,22 @@ void __assert_func(const char *file, int line, const char *func, const char *exp
 {
     uint32_t dummy = 0;
 
-    azlog("--------------");
-    azlog("ASSERT FAILED!");
-    azlog("Platform: ", g_azplatform_name);
-    azlog("FW Version: ", g_azlog_firmwareversion);
-    azlog("Assert failed: ", file , ":", line, " in ", func, ":", expr);
+    logmsg("--------------");
+    logmsg("ASSERT FAILED!");
+    logmsg("Platform: ", g_platform_name);
+    logmsg("FW Version: ", g_log_firmwareversion);
+    logmsg("Assert failed: ", file , ":", line, " in ", func, ":", expr);
 
     uint32_t *p = (uint32_t*)((uint32_t)&dummy & ~3);
     for (int i = 0; i < 8; i++)
     {
         if (p == &_estack) break; // End of stack
 
-        azlog("STACK ", (uint32_t)p, ":    ", p[0], " ", p[1], " ", p[2], " ", p[3]);
+        logmsg("STACK ", (uint32_t)p, ":    ", p[0], " ", p[1], " ", p[2], " ", p[3]);
         p += 4;
     }
 
-    azplatform_emergency_log_save();
+    platform_emergency_log_save();
 
     while(1)
     {
@@ -423,11 +423,11 @@ void __assert_func(const char *file, int line, const char *func, const char *exp
 
 static void watchdog_handler(uint32_t *sp)
 {
-    azlog("-------------- WATCHDOG TIMEOUT");
+    logmsg("-------------- WATCHDOG TIMEOUT");
     show_hardfault(sp);
 }
 
-void azplatform_reset_watchdog()
+void platform_reset_watchdog()
 {
     // This uses a software watchdog based on systick timer interrupt.
     // It gives us opportunity to collect better debug info than the
@@ -439,24 +439,24 @@ void azplatform_reset_watchdog()
 /* Flash reprogramming */
 /***********************/
 
-bool azplatform_rewrite_flash_page(uint32_t offset, uint8_t buffer[AZPLATFORM_FLASH_PAGE_SIZE])
+bool platform_rewrite_flash_page(uint32_t offset, uint8_t buffer[PLATFORM_FLASH_PAGE_SIZE])
 {
     // @TODO rewrite this function for sector erases as page erases aren't available
-    azlog("Flash rewrite not implemented for the GD32F4xx yet.");
+    logmsg("Flash rewrite not implemented for the GD32F4xx yet.");
     return false;
 
     if (offset == 0)
     {
         if (buffer[3] != 0x20 || buffer[7] != 0x08)
         {
-            azlog("Invalid firmware file, starts with: ", bytearray(buffer, 16));
+            logmsg("Invalid firmware file, starts with: ", bytearray(buffer, 16));
             return false;
         }
     }
 
-    azdbg("Writing flash at offset ", offset, " data ", bytearray(buffer, 4));
-    assert(offset % AZPLATFORM_FLASH_PAGE_SIZE == 0);
-    assert(offset >= AZPLATFORM_BOOTLOADER_SIZE);
+    dbgmsg("Writing flash at offset ", offset, " data ", bytearray(buffer, 4));
+    assert(offset % PLATFORM_FLASH_PAGE_SIZE == 0);
+    assert(offset >= PLATFORM_BOOTLOADER_SIZE);
     
     fmc_unlock();
     // @TODO make sure this is no longer needed
@@ -468,18 +468,18 @@ bool azplatform_rewrite_flash_page(uint32_t offset, uint8_t buffer[AZPLATFORM_FL
     // status = fmc_page_erase(FLASH_BASE + offset);
     if (status != FMC_READY)
     {
-        azlog("Erase failed: ", (int)status);
+        logmsg("Erase failed: ", (int)status);
         return false;
     }
 
     uint32_t *buf32 = (uint32_t*)buffer;
-    uint32_t num_words = AZPLATFORM_FLASH_PAGE_SIZE / 4;
+    uint32_t num_words = PLATFORM_FLASH_PAGE_SIZE / 4;
     for (int i = 0; i < num_words; i++)
     {
         status = fmc_word_program(FLASH_BASE + offset + i * 4, buf32[i]);
         if (status != FMC_READY)
         {
-            azlog("Flash write failed: ", (int)status);
+            logmsg("Flash write failed: ", (int)status);
             return false;
         }   
     }
@@ -492,16 +492,16 @@ bool azplatform_rewrite_flash_page(uint32_t offset, uint8_t buffer[AZPLATFORM_FL
         uint32_t actual = *(volatile uint32_t*)(FLASH_BASE + offset + i * 4);
         if (actual != expected)
         {
-            azlog("Flash verify failed at offset ", offset + i * 4, " got ", actual, " expected ", expected);
+            logmsg("Flash verify failed at offset ", offset + i * 4, " got ", actual, " expected ", expected);
             return false;
         }
     }
     return true;
 }
 
-void azplatform_boot_to_main_firmware()
+void platform_boot_to_main_firmware()
 {
-    uint32_t *mainprogram_start = (uint32_t*)(0x08000000 + AZPLATFORM_BOOTLOADER_SIZE);
+    uint32_t *mainprogram_start = (uint32_t*)(0x08000000 + PLATFORM_BOOTLOADER_SIZE);
     SCB->VTOR = (uint32_t)mainprogram_start;
   
     __asm__(
@@ -514,7 +514,7 @@ void azplatform_boot_to_main_firmware()
 /* SCSI configuration based on DIPSW1 */
 /**************************************/
 
-void azplatform_config_hook(S2S_TargetCfg *config)
+void platform_config_hook(S2S_TargetCfg *config)
 {
     // Enable Apple quirks by dip switch
     if (g_enable_apple_quirks)

lib/ZuluSCSI_platform_GD32F450/ZuluSCSI_platform.h

@@ -12,7 +12,7 @@
 extern "C" {
 #endif
 
-extern const char *g_azplatform_name;
+extern const char *g_platform_name;
 
 #if defined(ZULUSCSI_V1_4)
 #   define PLATFORM_NAME "ZuluSCSI v1.4"
@@ -25,7 +25,7 @@ extern const char *g_azplatform_name;
 #endif
 
 // Debug logging functions
-void azplatform_log(const char *s);
+void platform_log(const char *s);
 
 // Minimal millis() implementation as GD32F205 does not
 // have an Arduino core yet.
@@ -52,25 +52,25 @@ static inline void delay_100ns()
 }
 
 // Initialize SPI and GPIO configuration
-void azplatform_init();
+void platform_init();
 
 // Initialization for main application, not used for bootloader
-void azplatform_late_init();
+void platform_late_init();
 
 // Disable the status LED
-void azplatform_disable_led(void);
+void platform_disable_led(void);
 
 // Setup soft watchdog
-void azplatform_reset_watchdog();
+void platform_reset_watchdog();
 
 // Reinitialize SD card connection and save log from interrupt context.
 // This can be used in crash handlers.
-void azplatform_emergency_log_save();
+void platform_emergency_log_save();
 
 // Set callback that will be called during data transfer to/from SD card.
 // This can be used to implement simultaneous transfer to SCSI bus.
 typedef void (*sd_callback_t)(uint32_t bytes_complete);
-void azplatform_set_sd_callback(sd_callback_t func, const uint8_t *buffer);
+void platform_set_sd_callback(sd_callback_t func, const uint8_t *buffer);
 
 // This function is called by scsiPhy.cpp.
 // It resets the systick counter to give 1 millisecond of uninterrupted transfer time.
@@ -78,16 +78,16 @@ void azplatform_set_sd_callback(sd_callback_t func, const uint8_t *buffer);
 void SysTick_Handle_PreEmptively();
 
 // Reprogram firmware in main program area.
-#define AZPLATFORM_BOOTLOADER_SIZE 32768
-#define AZPLATFORM_FLASH_TOTAL_SIZE (256 * 1024)
-#define AZPLATFORM_FLASH_PAGE_SIZE 2048
-bool azplatform_rewrite_flash_page(uint32_t offset, uint8_t buffer[AZPLATFORM_FLASH_PAGE_SIZE]);
-void azplatform_boot_to_main_firmware();
+#define PLATFORM_BOOTLOADER_SIZE 32768
+#define PLATFORM_FLASH_TOTAL_SIZE (256 * 1024)
+#define PLATFORM_FLASH_PAGE_SIZE 2048
+bool platform_rewrite_flash_page(uint32_t offset, uint8_t buffer[PLATFORM_FLASH_PAGE_SIZE]);
+void platform_boot_to_main_firmware();
 
 // Configuration customizations based on DIP switch settings
 // When DIPSW1 is on, Apple quirks are enabled by default.
-void azplatform_config_hook(S2S_TargetCfg *config);
-#define AZPLATFORM_CONFIG_HOOK(cfg) azplatform_config_hook(cfg)
+void platform_config_hook(S2S_TargetCfg *config);
+#define PLATFORM_CONFIG_HOOK(cfg) platform_config_hook(cfg)
 
 // Write a single SCSI pin.
 // Example use: SCSI_OUT(ATN, 1) sets SCSI_ATN to low (active) state.

lib/ZuluSCSI_platform_GD32F450/scsiPhy.cpp

@@ -114,7 +114,7 @@ static void scsi_rst_assert_interrupt()
 
     if (rst1 && rst2)
     {
-        azdbg("BUS RESET");
+        dbgmsg("BUS RESET");
         scsiDev.resetFlag = 1;
     }
 }
@@ -141,7 +141,7 @@ static void selectPhyMode()
 
     if (g_scsi_phy_mode != oldmode)
     {
-        azlog("SCSI PHY operating mode: ", g_scsi_phy_mode_names[g_scsi_phy_mode]);
+        logmsg("SCSI PHY operating mode: ", g_scsi_phy_mode_names[g_scsi_phy_mode]);
     }
 }
 
@@ -325,7 +325,7 @@ extern "C" void scsiStartWrite(const uint8_t* data, uint32_t count)
     }
     else
     {
-        azlog("Unknown SCSI PHY mode: ", (int)g_scsi_phy_mode);
+        logmsg("Unknown SCSI PHY mode: ", (int)g_scsi_phy_mode);
     }
 }
 

lib/ZuluSCSI_platform_GD32F450/scsi_accel_dma.cpp

@@ -285,7 +285,7 @@ static void check_dma_next_buffer()
 // This is higher priority interrupt
 extern "C" void SCSI_TIMER_DMACHA_IRQ()
 {
-    // azdbg("DMA irq A, counts: ", dma_transfer_number_get(SCSI_TIMER_DMA, SCSI_TIMER_DMACHA), " ",
+    // dbgmsg("DMA irq A, counts: ", dma_transfer_number_get(SCSI_TIMER_DMA, SCSI_TIMER_DMACHA), " ",
     //             dma_transfer_number_get(SCSI_TIMER_DMA, SCSI_TIMER_DMACHB), " ",
     //              TIMER_CNT(SCSI_TIMER));
 
@@ -296,7 +296,7 @@ extern "C" void SCSI_TIMER_DMACHA_IRQ()
     {
         if (dma_interrupt_flag_get(SCSI_TIMER_DMA, SCSI_TIMER_DMACHA, DMA_FLAG_FTF))
         {
-            azlog("ERROR: SCSI DMA overrun: ", intf0, intf1,
+            logmsg("ERROR: SCSI DMA overrun: ", intf0, intf1,
                " bytes_app: ", g_scsi_dma.bytes_app,
                " bytes_dma: ", g_scsi_dma.bytes_dma,
                " dma_idx: ", g_scsi_dma.dma_idx,
@@ -335,7 +335,7 @@ extern "C" void SCSI_TIMER_DMACHA_IRQ()
 // This is lower priority interrupt, to make sure DMA buffer data has already been filled
 extern "C" void SCSI_TIMER_DMACHB_IRQ()
 {
-    // azdbg("DMA irq B, counts: ", dma_transfer_number_get(SCSI_TIMER_DMA, SCSI_TIMER_DMACHA), " ",
+    // dbgmsg("DMA irq B, counts: ", dma_transfer_number_get(SCSI_TIMER_DMA, SCSI_TIMER_DMACHA), " ",
     //               dma_transfer_number_get(SCSI_TIMER_DMA, SCSI_TIMER_DMACHB), " ",
     //               TIMER_CNT(SCSI_TIMER));
     if (dma_interrupt_flag_get(SCSI_TIMER_DMA, SCSI_TIMER_DMACHB, DMA_FLAG_FTF))
@@ -425,7 +425,7 @@ void scsi_accel_dma_startWrite(const uint8_t* data, uint32_t count, volatile int
         }
     }
 
-    // azdbg("Starting DMA write of ", (int)count, " bytes");
+    // dbgmsg("Starting DMA write of ", (int)count, " bytes");
     scsi_dma_gpio_config(true);
     g_scsi_dma_state = SCSIDMA_WRITE;
     g_scsi_dma.app_buf = (uint8_t*)data;
@@ -483,7 +483,7 @@ void scsi_accel_dma_finishWrite(volatile int *resetFlag)
     {
         if ((uint32_t)(millis() - start) > 5000)
         {
-            azlog("scsi_accel_dma_finishWrite() timeout, DMA counts ",
+            logmsg("scsi_accel_dma_finishWrite() timeout, DMA counts ",
                 dma_transfer_number_get(SCSI_TIMER_DMA, SCSI_TIMER_DMACHA), " ",
                 dma_transfer_number_get(SCSI_TIMER_DMA, SCSI_TIMER_DMACHB), " ",
                 TIMER_CNT(SCSI_TIMER));

lib/ZuluSCSI_platform_GD32F450/scsi_accel_sync.cpp

@@ -177,7 +177,7 @@ void scsi_accel_sync_recv(uint8_t *data, uint32_t count, int* parityError, volat
             {
                 // We are in a pinch here: without ACK pulses coming, the EXMC and DMA peripherals
                 // are locked up. The only way out is a whole system reset.
-                azlog("SCSI Synchronous read timeout: resetting system");
+                logmsg("SCSI Synchronous read timeout: resetting system");
                 NVIC_SystemReset();
             }
         }
@@ -501,7 +501,7 @@ void scsi_accel_sync_send(const uint8_t* data, uint32_t count, volatile int *res
     }
     else
     {
-        azdbg("No optimized routine for syncOffset=", syncOffset, " syndPeriod=", syncPeriod, ", using fallback");
+        dbgmsg("No optimized routine for syncOffset=", syncOffset, " syndPeriod=", syncPeriod, ", using fallback");
         while (count-- > 0)
         {
             while (TIMER_CNT(SCSI_SYNC_TIMER) > count + syncOffset && !*resetFlag);
@@ -519,7 +519,7 @@ void scsi_accel_sync_send(const uint8_t* data, uint32_t count, volatile int *res
 
     if (*resetFlag)
     {
-        azdbg("Bus reset during sync transfer, total ", (int)count,
+        dbgmsg("Bus reset during sync transfer, total ", (int)count,
               " bytes, remaining ACK count ", (int)TIMER_CNT(SCSI_SYNC_TIMER));
     }
 

lib/ZuluSCSI_platform_GD32F450/sd_card_sdio.cpp

@@ -26,7 +26,7 @@ static uint32_t g_sdio_sector_count;
 static bool logSDError(int line)
 {
     g_sdio_error_line = line;
-    azlog("SDIO SD card error on line ", line, ", error code ", (int)g_sdio_error);
+    logmsg("SDIO SD card error on line ", line, ", error code ", (int)g_sdio_error);
     return false;
 }
 
@@ -40,7 +40,7 @@ bool SdioCard::begin(SdioConfig sdioConfig)
     if (g_sdio_error != SD_OK)
     {
         // Don't spam the log when main program polls for card insertion.
-        azdbg("sd_init() failed: ", (int)g_sdio_error);
+        dbgmsg("sd_init() failed: ", (int)g_sdio_error);
         return false;
     }
 
@@ -101,19 +101,19 @@ bool SdioCard::readOCR(uint32_t* ocr)
 
 bool SdioCard::readData(uint8_t* dst)
 {
-    azlog("SdioCard::readData() called but not implemented!");
+    logmsg("SdioCard::readData() called but not implemented!");
     return false;
 }
 
 bool SdioCard::readStart(uint32_t sector)
 {
-    azlog("SdioCard::readStart() called but not implemented!");
+    logmsg("SdioCard::readStart() called but not implemented!");
     return false;
 }
 
 bool SdioCard::readStop()
 {
-    azlog("SdioCard::readStop() called but not implemented!");
+    logmsg("SdioCard::readStop() called but not implemented!");
     return false;
 }
 
@@ -150,7 +150,7 @@ bool SdioCard::stopTransmission(bool blocking)
         }
         if (isBusy())
         {
-            azlog("SdioCard::stopTransmission() timeout");
+            logmsg("SdioCard::stopTransmission() timeout");
             return false;
         }
         else
@@ -181,19 +181,19 @@ uint8_t SdioCard::type() const
 
 bool SdioCard::writeData(const uint8_t* src)
 {
-    azlog("SdioCard::writeData() called but not implemented!");
+    logmsg("SdioCard::writeData() called but not implemented!");
     return false;
 }
 
 bool SdioCard::writeStart(uint32_t sector)
 {
-    azlog("SdioCard::writeStart() called but not implemented!");
+    logmsg("SdioCard::writeStart() called but not implemented!");
     return false;
 }
 
 bool SdioCard::writeStop()
 {
-    azlog("SdioCard::writeStop() called but not implemented!");
+    logmsg("SdioCard::writeStop() called but not implemented!");
     return false;
 }
 
@@ -203,12 +203,12 @@ bool SdioCard::erase(uint32_t firstSector, uint32_t lastSector)
 }
 
 bool SdioCard::cardCMD6(uint32_t arg, uint8_t* status) {
-    azlog("SdioCard::cardCMD6() not implemented");
+    logmsg("SdioCard::cardCMD6() not implemented");
     return false;
 }
 
 bool SdioCard::readSCR(scr_t* scr) {
-    azlog("SdioCard::readSCR() not implemented");
+    logmsg("SdioCard::readSCR() not implemented");
     return false;
 }
 
@@ -219,7 +219,7 @@ static const uint8_t *m_stream_buffer;
 static uint32_t m_stream_count;
 static uint32_t m_stream_count_start;
 
-void azplatform_set_sd_callback(sd_callback_t func, const uint8_t *buffer)
+void platform_set_sd_callback(sd_callback_t func, const uint8_t *buffer)
 {
     m_stream_callback = func;
     m_stream_buffer = buffer;
@@ -248,7 +248,7 @@ static sdio_callback_t get_stream_callback(const uint8_t *buf, uint32_t count, c
         }
         else
         {
-            azdbg("SD card ", accesstype, "(", (int)sector,
+            dbgmsg("SD card ", accesstype, "(", (int)sector,
                   ") slow transfer, buffer", (uint32_t)buf, " vs. ", (uint32_t)(m_stream_buffer + m_stream_count));
             return NULL;
         }
@@ -285,7 +285,7 @@ bool SdioCard::readSectors(uint32_t sector, uint8_t* dst, size_t n)
         {
             if (!readSector(sector + i, dst + i * 512))
             {
-                azlog("End of drive read failed at ", sector, " + ", i);
+                logmsg("End of drive read failed at ", sector, " + ", i);
                 return false;
             }
         }

lib/ZuluSCSI_platform_GD32F450/sd_card_spi.cpp

@@ -121,7 +121,7 @@ public:
         }
         else if (m_stream_callback)
         {
-            azdbg("Stream buffer mismatch: ", (uint32_t)buf, " vs. ", (uint32_t)(m_stream_buffer + m_stream_count));
+            dbgmsg("Stream buffer mismatch: ", (uint32_t)buf, " vs. ", (uint32_t)(m_stream_buffer + m_stream_count));
         }
 
         // Use DMA to stream dummy TX data and store RX data
@@ -143,7 +143,7 @@ public:
         {
             if (millis() - start > 500)
             {
-                azlog("ERROR: SPI DMA receive of ", (int)count, " bytes timeouted");
+                logmsg("ERROR: SPI DMA receive of ", (int)count, " bytes timeouted");
                 return 1;
             }
 
@@ -156,7 +156,7 @@ public:
 
         if (DMA_INTF(DMA0) & DMA_FLAG_ADD(DMA_FLAG_ERR, SD_SPI_RX_DMA_CHANNEL))
         {
-            azlog("ERROR: SPI DMA receive set DMA_FLAG_ERR");
+            logmsg("ERROR: SPI DMA receive set DMA_FLAG_ERR");
         }
 
         SPI_CTL1(SD_SPI) &= ~(SPI_CTL1_DMAREN | SPI_CTL1_DMATEN);
@@ -181,7 +181,7 @@ public:
         }
         else if (m_stream_callback)
         {
-            azdbg("Stream buffer mismatch: ", (uint32_t)buf, " vs. ", (uint32_t)(m_stream_buffer + m_stream_count));
+            dbgmsg("Stream buffer mismatch: ", (uint32_t)buf, " vs. ", (uint32_t)(m_stream_buffer + m_stream_count));
         }
 
         // Use DMA to stream TX data
@@ -198,7 +198,7 @@ public:
         {
             if (millis() - start > 500)
             {
-                azlog("ERROR: SPI DMA transmit of ", (int)count, " bytes timeouted");
+                logmsg("ERROR: SPI DMA transmit of ", (int)count, " bytes timeouted");
                 return;
             }
 
@@ -211,7 +211,7 @@ public:
 
         if (DMA_INTF(DMA0) & DMA_FLAG_ADD(DMA_FLAG_ERR, SD_SPI_TX_DMA_CHANNEL))
         {
-            azlog("ERROR: SPI DMA transmit set DMA_FLAG_ERR");
+            logmsg("ERROR: SPI DMA transmit set DMA_FLAG_ERR");
         }
 
         wait_idle();
@@ -258,7 +258,7 @@ void sdCsWrite(SdCsPin_t pin, bool level)
 GD32SPIDriver g_sd_spi_port;
 SdSpiConfig g_sd_spi_config(0, DEDICATED_SPI, SD_SCK_MHZ(30), &g_sd_spi_port);
 
-void azplatform_set_sd_callback(sd_callback_t func, const uint8_t *buffer)
+void platform_set_sd_callback(sd_callback_t func, const uint8_t *buffer)
 {
     g_sd_spi_port.set_sd_callback(func, buffer);    
 }

platformio.ini

@@ -1,7 +1,7 @@
 ; PlatformIO Project Configuration File https://docs.platformio.org/page/projectconf.html
 
 [platformio]
-default_envs = ZuluSCSIv1_0, ZuluSCSIv1_0_mini, ZuluSCSIv1_1, ZuluSCSI_RP2040, ZuluSCSI_BS2, ZULUSCSI_v1_4
+default_envs = ZuluSCSIv1_0, ZuluSCSIv1_0_mini, ZuluSCSIv1_1, ZuluSCSI_RP2040, ZuluSCSI_BS2, ZULUSCSIv1_4
 
 ; Example platform to serve as a base for porting efforts
 [env:template]