Merge pull request #327 from ZuluSCSI/fix-section-type

Fix device type being ignored in zuluscsi.ini

lib/SCSI2SD/include/scsi2sd.h

@@ -71,13 +71,13 @@ typedef enum
 
 typedef enum
 {
-	S2S_CFG_FIXED,
-	S2S_CFG_REMOVABLE,
-	S2S_CFG_OPTICAL,
-	S2S_CFG_FLOPPY_14MB,
-	S2S_CFG_MO,
-	S2S_CFG_SEQUENTIAL,
-	S2S_CFG_NETWORK,
+	S2S_CFG_FIXED = 0,
+	S2S_CFG_REMOVABLE = 1,
+	S2S_CFG_OPTICAL = 2,
+	S2S_CFG_FLOPPY_14MB = 3,
+	S2S_CFG_MO = 4,
+	S2S_CFG_SEQUENTIAL = 5,
+	S2S_CFG_NETWORK = 6
 
 } S2S_CFG_TYPE;
 

src/ZuluSCSI_cdrom.cpp

@@ -1226,7 +1226,7 @@ bool cdromSwitchNextImage(image_config_t &img)
     {
         logmsg("Switching to next CD-ROM image for ", target_idx, ": ", filename);
         img.file.close();
-        bool status = scsiDiskOpenHDDImage(target_idx, filename, target_idx, 0, 2048);
+        bool status = scsiDiskOpenHDDImage(target_idx, filename, target_idx, 0, 2048, S2S_CFG_OPTICAL);
 
         if (status)
         {

src/ZuluSCSI_config.h

@@ -28,8 +28,8 @@
 #include <ZuluSCSI_platform.h>
 
 // Use variables for version number
-#define FW_VER_NUM      "23.10.26"
-#define FW_VER_SUFFIX   "release"
+#define FW_VER_NUM      "23.10.30"
+#define FW_VER_SUFFIX   "dev"
 #define ZULU_FW_VERSION FW_VER_NUM "-" FW_VER_SUFFIX
 
 // Configuration and log file paths

src/ZuluSCSI_disk.cpp

@@ -895,7 +895,7 @@ void scsiDiskLoadConfig(int target_idx)
     {
         int blocksize = (img.deviceType == S2S_CFG_OPTICAL) ? 2048 : 512;
         logmsg("-- Opening '", filename, "' for id: ", target_idx);
-        scsiDiskOpenHDDImage(target_idx, filename, target_idx, 0, blocksize);
+        scsiDiskOpenHDDImage(target_idx, filename, target_idx, 0, blocksize, (S2S_CFG_TYPE) img.deviceType);
     }
 }
 

zuluscsi.ini

@@ -40,7 +40,7 @@
 #Product = "FIREBALL1"
 #Version = "1.0"
 #Serial = "0123456789ABCDEF"
-#Type = 0     # 0: Fixed, 1: Removable, 2: Optical, 3: Floppy, 4: Mag-optical, 5: Tape
+#Type = 0     # 0: Fixed, 1: Removable, 2: Optical, 3: Floppy, 4: Mag-optical, 5: Tape, 6: Network
 #TypeModifier = 0  # Affects only INQUIRY response
 #SectorsPerTrack = 63
 #HeadsPerCylinder = 255