Support custom mode pages

diff --git a/CHANGELOG b/CHANGELOG
index efe853804f76b6ffc8c3c9922c778b165650c942..e773d33742492c18d352c8256a14476345dcc820 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+2016xxxx               4.x
+       - Added support for configurable mode pages
+
 20160111               4.6
        - Fixed bug when using sector size that isn't a multiple of 4
        (eg. 522 bytes)

diff --git a/software/SCSI2SD/src/mode.c b/software/SCSI2SD/src/mode.c
index 5cdf5de3ba1169fe5433926dd975e56a00a579c7..c3628780b0f131d042d4086bad1f56fb7815d00a 100755 (executable)
--- a/software/SCSI2SD/src/mode.c
+++ b/software/SCSI2SD/src/mode.c
@@ -197,6 +197,33 @@ static void pageIn(int pc, int dataIdx, const uint8* pageData, int pageLen)
        }\r
 }\r
 \r
+static int useCustomPages(TargetConfig* cfg, int pc, int pageCode, int* idx)\r
+{\r
+       int found = 0;\r
+       int cfgIdx = 0;\r
+       while ((cfgIdx < sizeof(cfg->modePages) + 2) &&\r
+               (cfg->modePages[cfgIdx + 1] != 0)\r
+               )\r
+       {\r
+               int pageSize = cfg->modePages[cfgIdx + 1] + 2;\r
+               int dataPageCode = cfg->modePages[cfgIdx] & 0x3f;\r
+               if ((dataPageCode == pageCode) ||\r
+                       (pageCode == 0x3f)\r
+                       )\r
+               {\r
+                       pageIn(pc, *idx, &cfg->modePages[cfgIdx], pageSize);\r
+                       *idx += pageSize;\r
+                       found = 1;\r
+                       if (pageCode != 0x3f)\r
+                       {\r
+                               break;\r
+                       }\r
+               }\r
+               cfgIdx += pageSize;\r
+       }\r
+       return found;\r
+}\r
+\r
 static void doModeSense(\r
        int sixByteCmd, int dbd, int pc, int pageCode, int allocLength)\r
 {\r
@@ -305,6 +332,12 @@ static void doModeSense(
 \r
        int pageFound = 0;\r
 \r
+       if (scsiDev.target->cfg->modePages[1] != 0)\r
+       {\r
+               pageFound = useCustomPages(scsiDev.target->cfg, pc, pageCode, &idx);\r
+               pageCode = 0xFF; // dodgy, skip rest of logic\r
+       }\r
+\r
        if (pageCode == 0x01 || pageCode == 0x3F)\r
        {\r
                pageFound = 1;\r

diff --git a/software/include/scsi2sd.h b/software/include/scsi2sd.h
index 1da8316e522681849e290ced18e4f5f2fb0e38d1..54f6bb972a62b2eb58162cbd17911092b5afe7d6 100755 (executable)
--- a/software/include/scsi2sd.h
+++ b/software/include/scsi2sd.h
@@ -153,7 +153,8 @@ typedef struct __attribute__((packed))
 
        uint8_t reserved[960]; // Pad out to 1024 bytes for main section.
 
-       uint8_t vpd[3072]; // Total size is 4k.
+       uint8_t modePages[1024];
+       uint8_t unused[2048]; // Total size is 4k.
 } TargetConfig;
 
 typedef struct __attribute__((packed))

diff --git a/software/scsi2sd-util/ConfigUtil.cc b/software/scsi2sd-util/ConfigUtil.cc
index 5a8713b236ef17d8017ebb7503d6d77b07402019..2074ad59f3c1034c5ef44357f3954c3f00f03bdc 100644 (file)
--- a/software/scsi2sd-util/ConfigUtil.cc
+++ b/software/scsi2sd-util/ConfigUtil.cc
@@ -23,6 +23,12 @@
 
 #include <string.h>
 
+#include <wx/wxprec.h>
+#ifndef WX_PRECOMP
+#include <wx/wx.h>
+#endif
+#include <wx/base64.h>
+#include <wx/buffer.h>
 #include <wx/xml/xml.h>
 
 
@@ -80,6 +86,22 @@ namespace
                return toLE32(in);
        }
 
+       std::vector<uint8_t> getModePages(const TargetConfig& cfg)
+       {
+               std::vector<uint8_t> result;
+               int i = 0;
+               while (i < sizeof(cfg.modePages) + 2)
+               {
+                       int pageLen = cfg.modePages[i+1];
+                       if (pageLen == 0) break;
+                       std::copy(
+                               &cfg.modePages[i],
+                               &cfg.modePages[i+pageLen+2],
+                               std::back_inserter(result));
+                       i += pageLen + 2;
+               }
+               return result;
+       }
 }
 
 BoardConfig
@@ -194,6 +216,7 @@ std::string
 ConfigUtil::toXML(const TargetConfig& config)
 {
        std::stringstream s;
+       std::vector<uint8_t> modePages(getModePages(config));
 
        s <<
                "<SCSITarget id=\"" <<
@@ -269,6 +292,13 @@ ConfigUtil::toXML(const TargetConfig& config)
                "\n" <<
                "       <!-- 16 character serial number -->\n" <<
                "       <serial>" << std::string(config.serial, 16) << "</serial>\n" <<
+               "\n" <<
+               "       <!-- Custom mode pages, base64 encoded, up to 1024 bytes.-->\n" <<
+               "       <modePages>\n" <<
+                       (modePages.size() == 0 ? "" :
+                               wxBase64Encode(&modePages[0], modePages.size())) <<
+                               "\n" <<
+               "       </modePages>\n" <<
                "</SCSITarget>\n";
 
        return s.str();
@@ -292,7 +322,7 @@ ConfigUtil::toXML(const BoardConfig& config)
                "       <!-- ********************************************************\n" <<
                "       Only set to true when using with a fast SCSI2 host\n " <<
                "       controller. This can cause problems with older/slower\n" <<
-               "        hardware.\n" <<
+               "       hardware.\n" <<
                "       ********************************************************* -->\n" <<
                "       <enableScsi2>" <<
                        (config.flags & CONFIG_ENABLE_SCSI2 ? "true" : "false") <<
@@ -318,9 +348,9 @@ ConfigUtil::toXML(const BoardConfig& config)
                        "</enableDisconnect>\n" <<
 
                "       <!-- ********************************************************\n" <<
-               "   Respond to very short duration selection attempts. This supports\n" <<
-               "   non-standard hardware, but is generally safe to enable.\n" <<
-               "   Required for Philips P2000C.\n" <<
+               "       Respond to very short duration selection attempts. This supports\n" <<
+               "       non-standard hardware, but is generally safe to enable.\n" <<
+               "       Required for Philips P2000C.\n" <<
                "       ********************************************************* -->\n" <<
                "       <selLatch>" <<
                        (config.flags & CONFIG_ENABLE_SEL_LATCH? "true" : "false") <<
@@ -328,12 +358,12 @@ ConfigUtil::toXML(const BoardConfig& config)
 
 
                "       <!-- ********************************************************\n" <<
-               "   Convert luns to IDs. The unit must already be configured to respond\n" <<
-               "   on the ID. Allows dual drives to be accessed from a \n" <<
-               "   XEBEC S1410 SASI bridge.\n" <<
-               "   eg. Configured for dual drives as IDs 0 and 1, but the XEBEC will\n" <<
-               "   access the second disk as ID0, lun 1.\n" <<
-               "   See ttp://bitsavers.trailing-edge.com/pdf/xebec/104524C_S1410Man_Aug83.pdf\n" <<
+               "       Convert luns to IDs. The unit must already be configured to respond\n" <<
+               "       on the ID. Allows dual drives to be accessed from a \n" <<
+               "       XEBEC S1410 SASI bridge.\n" <<
+               "       eg. Configured for dual drives as IDs 0 and 1, but the XEBEC will\n" <<
+               "       access the second disk as ID0, lun 1.\n" <<
+               "       See ttp://bitsavers.trailing-edge.com/pdf/xebec/104524C_S1410Man_Aug83.pdf\n" <<
                "       ********************************************************* -->\n" <<
                "       <mapLunsToIds>" <<
                        (config.flags & CONFIG_MAP_LUNS_TO_IDS ? "true" : "false") <<
@@ -474,6 +504,13 @@ parseTarget(wxXmlNode* node)
                        memset(result.serial, ' ', sizeof(result.serial));
                        memcpy(result.serial, s.c_str(), s.size());
                }
+               else if (child->GetName() == "modePages")
+               {
+                       wxMemoryBuffer buf =
+                               wxBase64Decode(child->GetNodeContent(), wxBase64DecodeMode_SkipWS);
+                       size_t len = std::min(buf.GetDataLen(), sizeof(result.modePages));
+                       memcpy(result.modePages, buf.GetData(), len);
+               }
 
                child = child->GetNext();
        }