Add scsi mode page 0 support (merge from v5)

diff --git a/src/firmware/inquiry.c b/src/firmware/inquiry.c
index 70dca308b86acd754647ed63cf431204d387a1f6..99bb8dc0e98f0ac0b86c00d5b5ef55f7c7450ef1 100755 (executable)
--- a/src/firmware/inquiry.c
+++ b/src/firmware/inquiry.c
@@ -171,20 +171,19 @@ void s2s_scsiInquiry()
                scsiDev.dataLen = allocationLength;\r
 \r
                // Set the device type as needed.\r
+               scsiDev.data[0] = getDeviceTypeQualifier();\r
+\r
                switch (scsiDev.target->cfg->deviceType)\r
                {\r
                case S2S_CFG_OPTICAL:\r
-                       scsiDev.data[0] = 0x05; // device type\r
                        scsiDev.data[1] |= 0x80; // Removable bit.\r
                        break;\r
 \r
                case S2S_CFG_SEQUENTIAL:\r
-                       scsiDev.data[0] = 0x01; // device type\r
                        scsiDev.data[1] |= 0x80; // Removable bit.\r
                        break;\r
 \r
                case S2S_CFG_MO:\r
-                       scsiDev.data[0] = 0x07; // device type\r
                        scsiDev.data[1] |= 0x80; // Removable bit.\r
                        break;\r
 \r
@@ -227,3 +226,32 @@ uint32_t s2s_getStandardInquiry(
                sizeof(cfg->prodId) +\r
                sizeof(cfg->revision);\r
 }\r
+\r
+uint8_t getDeviceTypeQualifier()\r
+{\r
+       // Set the device type as needed.\r
+       switch (scsiDev.target->cfg->deviceType)\r
+       {\r
+       case S2S_CFG_OPTICAL:\r
+               return 0x05;\r
+               break;\r
+\r
+       case S2S_CFG_SEQUENTIAL:\r
+               return 0x01;\r
+               break;\r
+\r
+       case S2S_CFG_MO:\r
+               return 0x07;\r
+               break;\r
+\r
+       case S2S_CFG_FLOPPY_14MB:\r
+       case S2S_CFG_REMOVEABLE:\r
+               return 0;\r
+               break;\r
+\r
+       default:\r
+               // Accept defaults for a fixed disk.\r
+               return 0;\r
+       }\r
+}\r
+\r

diff --git a/src/firmware/inquiry.h b/src/firmware/inquiry.h
index 29da77760e344efce41df8bf87bd24f11f73995f..963b6595154e5a35dd7e9d7224e2fb0dee854039 100755 (executable)
--- a/src/firmware/inquiry.h
+++ b/src/firmware/inquiry.h
@@ -19,5 +19,7 @@
 
 void s2s_scsiInquiry(void);
 uint32_t s2s_getStandardInquiry(const S2S_TargetCfg* cfg, uint8_t* out, uint32_t maxlen);
+uint8_t getDeviceTypeQualifier(void);
+
 
 #endif

diff --git a/src/firmware/mode.c b/src/firmware/mode.c
index 773059a8d0cedf6d208c1ec503d6ae4adbc39e37..fd4ba3441bdee8bb2bbe00fd5d8edb812014a3b9 100755 (executable)
--- a/src/firmware/mode.c
+++ b/src/firmware/mode.c
@@ -19,9 +19,26 @@
 #include "scsi.h"\r
 #include "mode.h"\r
 #include "disk.h"\r
+#include "inquiry.h"\r
 \r
 #include <string.h>\r
 \r
+// "Vendor" defined page which was included by Seagate, and required for\r\r
+// Amiga 500 using DKB SpitFire controller.\r\r
+static const uint8_t OperatingPage[] =\r
+{\r
+0x00, // Page code\r
+0x02, // Page length\r
+\r
+// Bit 4 = unit attension (0 = on, 1 = off).\r
+// Bit 7 = usage bit, EEPROM life exceeded warning = 1.\r
+0x80, \r
+\r
+// Bit 7 = reserved.\r
+// Bits 0:6: Device type qualifier, as per Inquiry data\r
+0x00\r
+};\r
+\r
 static const uint8_t ReadWriteErrorRecoveryPage[] =\r
 {\r
 0x01, // Page code\r
@@ -508,6 +525,21 @@ static void doModeSense(
                idx += sizeof(CCSCachingPage);\r
        }\r
 \r
+       // SCSI 2 standard says page 0 is always last.\r
+       if (pageCode == 0x00 || pageCode == 0x3F)\r
+       {\r
+               pageFound = 1;\r
+               pageIn(pc, idx, OperatingPage, sizeof(OperatingPage));\r
+\r
+               // Note inverted logic for the flag.\r
+               scsiDev.data[idx+2] =\r
+                       (scsiDev.boardCfg.flags & S2S_CFG_ENABLE_UNIT_ATTENTION) ? 0x80 : 0x90;\r
+\r
+               scsiDev.data[idx+3] = getDeviceTypeQualifier();\r
+\r
+               idx += sizeof(OperatingPage);\r
+       }\r
+\r
        if (!pageFound)\r
        {\r
                // Unknown Page Code\r