Merge pull request #313 from ZuluSCSI/zuluscsi-v1.2-dev

ZuluSCSI v1.1 ODE and ZuluSCSI v1.2 support
ZuluSCSI · Oct 13, 2023 · 45f2a9e · 45f2a9e
2 parents 05cb69d + 584f398
commit 45f2a9e
Show file tree

Hide file tree

Showing 23 changed files with 2,039 additions and 80 deletions.
diff --git a/lib/SCSI2SD/include/scsi2sd.h b/lib/SCSI2SD/include/scsi2sd.h
@@ -69,7 +69,7 @@ typedef enum
 typedef enum
 {
 	S2S_CFG_FIXED,
-	S2S_CFG_REMOVEABLE,
+	S2S_CFG_REMOVABLE,
 	S2S_CFG_OPTICAL,
 	S2S_CFG_FLOPPY_14MB,
 	S2S_CFG_MO,

diff --git a/lib/SCSI2SD/src/firmware/inquiry.c b/lib/SCSI2SD/src/firmware/inquiry.c
@@ -198,7 +198,7 @@ void s2s_scsiInquiry()
 			break;
 
 		case S2S_CFG_FLOPPY_14MB:
-		case S2S_CFG_REMOVEABLE:
+		case S2S_CFG_REMOVABLE:
 			scsiDev.data[1] |= 0x80; // Removable bit.
 			break;
 		default:
@@ -260,7 +260,7 @@ uint8_t getDeviceTypeQualifier()
 		break;
 
 	case S2S_CFG_FLOPPY_14MB:
-	case S2S_CFG_REMOVEABLE:
+	case S2S_CFG_REMOVABLE:
 		return 0;
 		break;
 

diff --git a/lib/SCSI2SD/src/firmware/mode.c b/lib/SCSI2SD/src/firmware/mode.c
@@ -272,7 +272,7 @@ static void doModeSense(
 	switch (scsiDev.target->cfg->deviceType)
 	{
 	case S2S_CFG_FIXED:
-	case S2S_CFG_REMOVEABLE:
+	case S2S_CFG_REMOVABLE:
 		mediumType = 0; // We should support various floppy types here!
 		// Contains cache bits (0) and a Write-Protect bit.
 		deviceSpecificParam =