Merge branch 'main' into zuluscsi-v1.2-dev

.github/workflows/firmware_build.yml

@@ -7,8 +7,10 @@ on:
 
 jobs:
   build_firmware:
-    name: Build firmware on Ubuntu 20.04
-    runs-on: ubuntu-20.04
+    name: RHC-internal-Z4
+    runs-on: self-hosted
+#    name: Build firmware on Ubuntu 20.04
+#    runs-on: ubuntu-20.04
     
     steps:
       - name: Check out code from GitHub
@@ -19,12 +21,12 @@ jobs:
       
       - name: Install platformio
         run: |
-          sudo pip install platformio
+          pip install -U platformio
       
       - name: Build firmware
         run: |
           cd ZuluSCSI
-          pio run -v
+          pio run -v -j8
     
       - name: Rename firmware files
         run: |

lib/ZuluSCSI_platform_GD32F205/ZuluSCSI_platform.cpp

@@ -367,6 +367,7 @@ static bool get_quirks(uint32_t port, uint32_t pin, const char *switch_name)
     return false;
 }
 
+#ifdef PLATFORM_VERSION_1_1_PLUS
 static bool get_direct_mode(uint32_t port, uint32_t pin, const char *switch_name)
 {
     if (!gpio_input_bit_get(port, pin))
@@ -377,6 +378,7 @@ static bool get_direct_mode(uint32_t port, uint32_t pin, const char *switch_name
     logmsg(switch_name, " is ON: Disabling direct/raw mode");
     return false;
 }
+#endif
 
 void platform_late_init()
 {

src/ZuluSCSI_disk.cpp

@@ -647,7 +647,7 @@ static void scsiDiskLoadConfig(int target_idx, const char *section)
             tmp[2] += target_idx;
             scsiDiskCheckDir(tmp, target_idx, &img, S2S_CFG_OPTICAL, "optical");
 
-            strcpy(tmp, "RM0");
+            strcpy(tmp, "RE0");
             tmp[2] += target_idx;
             scsiDiskCheckDir(tmp, target_idx, &img, S2S_CFG_REMOVABLE, "removable");
 
@@ -659,7 +659,7 @@ static void scsiDiskLoadConfig(int target_idx, const char *section)
             tmp[2] += target_idx;
             scsiDiskCheckDir(tmp, target_idx, &img, S2S_CFG_SEQUENTIAL, "tape");
 
-            strcpy(tmp, "FP0");
+            strcpy(tmp, "FD0");
             tmp[2] += target_idx;
             scsiDiskCheckDir(tmp, target_idx, &img, S2S_CFG_FLOPPY_14MB, "floppy");
         }
@@ -781,7 +781,7 @@ int scsiDiskGetNextImageName(image_config_t &img, char *buf, size_t buflen)
                     strcpy(dirname, "CD0");
                 break;
                 case S2S_CFG_REMOVABLE:
-                    strcpy(dirname, "RM0");
+                    strcpy(dirname, "RE0");
                 break;
                 case S2S_CFG_MO:
                     strcpy(dirname, "MO0");
@@ -790,7 +790,7 @@ int scsiDiskGetNextImageName(image_config_t &img, char *buf, size_t buflen)
                     strcpy(dirname ,"TP0");
                 break;
                 case S2S_CFG_FLOPPY_14MB:
-                    strcpy(dirname, "FP0");
+                    strcpy(dirname, "FD0");
                 break;
                 default:
                     dbgmsg("No matching device type for default directory found");