Merge pull request #352 from ZuluSCSI/cdrom-img-fix

Fix device type for IMG0-9
ZuluSCSI · Dec 4, 2023 · 703a752 · 703a752
2 parents 03d870d + a935a96
commit 703a752
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/lib/SCSI2SD/include/scsi2sd.h b/lib/SCSI2SD/include/scsi2sd.h
@@ -77,7 +77,8 @@ typedef enum
 	S2S_CFG_FLOPPY_14MB = 3,
 	S2S_CFG_MO = 4,
 	S2S_CFG_SEQUENTIAL = 5,
-	S2S_CFG_NETWORK = 6
+	S2S_CFG_NETWORK = 6,
+	S2S_CFG_NOT_SET = 255
 
 } S2S_CFG_TYPE;
 

diff --git a/src/ZuluSCSI_config.h b/src/ZuluSCSI_config.h
@@ -28,7 +28,7 @@
 #include <ZuluSCSI_platform.h>
 
 // Use variables for version number
-#define FW_VER_NUM      "23.11.28"
+#define FW_VER_NUM      "23.12.04"
 #define FW_VER_SUFFIX   "dev"
 #define ZULU_FW_VERSION FW_VER_NUM "-" FW_VER_SUFFIX
 

diff --git a/src/ZuluSCSI_disk.cpp b/src/ZuluSCSI_disk.cpp
@@ -296,6 +296,12 @@ bool scsiDiskOpenHDDImage(int target_idx, const char *filename, int scsi_id, int
             logmsg("---- WARNING: file ", filename, " is not contiguous. This will increase read latency.");
         }
 
+        S2S_CFG_TYPE setting_type = (S2S_CFG_TYPE) g_scsi_settings.getDevice(target_idx)->deviceType;
+        if ( setting_type != S2S_CFG_NOT_SET)
+        {
+            type = setting_type;
+        }
+
         if (type == S2S_CFG_FIXED)
         {
             logmsg("---- Configuring as disk drive drive");

diff --git a/src/ZuluSCSI_settings.cpp b/src/ZuluSCSI_settings.cpp
@@ -281,7 +281,7 @@ scsi_system_settings_t *ZuluSCSISettings::initSystem(const char *presetName)
     cfgSys.useFATAllocSize = false;
 
     // setting set for all or specific devices
-    cfgDev.deviceType = 0;
+    cfgDev.deviceType = S2S_CFG_NOT_SET;
     cfgDev.deviceTypeModifier = 0;
     cfgDev.sectorsPerTrack = 63;
     cfgDev.headsPerCylinder = 255;