Fix up compilation issues

diff --git a/software/SCSI2SD/src/cdrom.c b/software/SCSI2SD/src/cdrom.c
index 7f93948ebf9332f240cceb7b572917413dc0b147..9b28326a25b2c1350e69411490de70fe3b0f2aa6 100755 (executable)
--- a/software/SCSI2SD/src/cdrom.c
+++ b/software/SCSI2SD/src/cdrom.c
@@ -162,7 +162,7 @@ static void doReadTOC(int MSF, uint8_t track, uint16_t allocationLength)
                memcpy(scsiDev.data, SimpleTOC, len);
 
                uint32_t capacity = getScsiCapacity(
-                       scsoDev.target->device,
+                       scsiDev.target->device,
                        scsiDev.target->cfg->sdSectorStart,
                        scsiDev.target->state.bytesPerSector,
                        scsiDev.target->cfg->scsiSectors);

diff --git a/software/SCSI2SD/src/config.c b/software/SCSI2SD/src/config.c
index ada1a472a97b985a8b78e69349a0c89152002c90..1a19dfbb45823245f96a4ca1fa8e77facbaa9e51 100755 (executable)
--- a/software/SCSI2SD/src/config.c
+++ b/software/SCSI2SD/src/config.c
@@ -63,7 +63,7 @@ static int usbInEpState;
 static int usbDebugEpState;\r
 static int usbReady;\r
 \r
-static void initBoardConfig(BoardConfig* config) {\r
+static void initBoardConfig(S2S_BoardConfig* config) {\r
        memcpy(\r
                config,\r
                (\r
@@ -71,7 +71,7 @@ static void initBoardConfig(BoardConfig* config) {
                        (CY_FLASH_SIZEOF_ARRAY * (size_t) SCSI_CONFIG_ARRAY) +\r
                        (CY_FLASH_SIZEOF_ROW * SCSI_CONFIG_BOARD_ROW)\r
                        ),\r
-               sizeof(BoardConfig));\r
+               sizeof(S2S_BoardConfig));\r
 \r
        if (memcmp(config->magic, "BCFG", 4)) {\r
                // Set a default from the deprecated flags, or 0 if\r
@@ -83,7 +83,7 @@ static void initBoardConfig(BoardConfig* config) {
        }\r
 }\r
 \r
-void configInit(BoardConfig* config)\r
+void configInit(S2S_BoardConfig* config)\r
 {\r
        // The USB block will be powered by an internal 3.3V regulator.\r
        // The PSoC must be operating between 4.6V and 5V for the regulator\r
@@ -93,7 +93,7 @@ void configInit(BoardConfig* config)
        usbReady = 0; // We don't know if host is connected yet.\r
 \r
        int invalid = 1;\r
-       uint8_t* rawConfig = getConfigByIndex(0);\r
+       uint8_t* rawConfig = (uint8_t*)getConfigByIndex(0);\r
        int i;\r
        for (i = 0; i < 64; ++i)\r
        {\r
@@ -404,14 +404,14 @@ void configSave(int scsiId, uint16_t bytesPerSector)
        int cfgIdx;\r
        for (cfgIdx = 0; cfgIdx < MAX_SCSI_TARGETS; ++cfgIdx)\r
        {\r
-               const TargetConfig* tgt = getConfigByIndex(cfgIdx);\r
+               const S2S_TargetCfg* tgt = getConfigByIndex(cfgIdx);\r
                if ((tgt->scsiId & CONFIG_TARGET_ID_BITS) == scsiId)\r
                {\r
                        // Save row to flash\r
                        // We only save the first row of the configuration\r
                        // this contains the parameters changeable by a MODE SELECT command\r
                        uint8_t rowData[CYDEV_FLS_ROW_SIZE];\r
-                       TargetConfig* rowCfgData = (TargetConfig*)&rowData;\r
+                       S2S_TargetCfg* rowCfgData = (S2S_TargetCfg*)&rowData;\r
                        memcpy(rowCfgData, tgt, sizeof(rowData));\r
                        rowCfgData->bytesPerSector = bytesPerSector;\r
 \r
@@ -426,12 +426,12 @@ void configSave(int scsiId, uint16_t bytesPerSector)
 }\r
 \r
 \r
-const TargetConfig* getConfigByIndex(int i)\r
+const S2S_TargetCfg* getConfigByIndex(int i)\r
 {\r
        if (i <= 3)\r
        {\r
                size_t row = SCSI_CONFIG_0_ROW + (i * SCSI_CONFIG_ROWS);\r
-               return (const TargetConfig*)\r
+               return (const S2S_TargetCfg*)\r
                        (\r
                                CY_FLASH_BASE +\r
                                (CY_FLASH_SIZEOF_ARRAY * (size_t) SCSI_CONFIG_ARRAY) +\r
@@ -439,7 +439,7 @@ const TargetConfig* getConfigByIndex(int i)
                                );\r
        } else {\r
                size_t row = SCSI_CONFIG_4_ROW + ((i-4) * SCSI_CONFIG_ROWS);\r
-               return (const TargetConfig*)\r
+               return (const S2S_TargetCfg*)\r
                        (\r
                                CY_FLASH_BASE +\r
                                (CY_FLASH_SIZEOF_ARRAY * (size_t) SCSI_CONFIG_ARRAY) +\r
@@ -448,12 +448,12 @@ const TargetConfig* getConfigByIndex(int i)
        }\r
 }\r
 \r
-const TargetConfig* getConfigById(int scsiId)\r
+const S2S_TargetCfg* getConfigById(int scsiId)\r
 {\r
        int i;\r
        for (i = 0; i < MAX_SCSI_TARGETS; ++i)\r
        {\r
-               const TargetConfig* tgt = getConfigByIndex(i);\r
+               const S2S_TargetCfg* tgt = getConfigByIndex(i);\r
                if ((tgt->scsiId & CONFIG_TARGET_ID_BITS) == scsiId)\r
                {\r
                        return tgt;\r

diff --git a/software/SCSI2SD/src/config.h b/software/SCSI2SD/src/config.h
index 2c47a1eb01e64f6212d61345872dc17999c19395..42b0fc5adb054fb4f0c6d5bd88b15f77ee679f1d 100755 (executable)
--- a/software/SCSI2SD/src/config.h
+++ b/software/SCSI2SD/src/config.h
@@ -20,12 +20,12 @@
 #include "device.h"\r
 #include "scsi2sd.h"\r
 \r
-void configInit(BoardConfig* config);\r
+void configInit(S2S_BoardConfig* config);\r
 void debugInit(void);\r
 void configPoll(void);\r
 void configSave(int scsiId, uint16_t byesPerSector);\r
 \r
-const TargetConfig* getConfigByIndex(int index);\r
-const TargetConfig* getConfigById(int scsiId);\r
+const S2S_TargetCfg* getConfigByIndex(int index);\r
+const S2S_TargetCfg* getConfigById(int scsiId);\r
 \r
 #endif\r

diff --git a/software/SCSI2SD/src/disk.c b/software/SCSI2SD/src/disk.c
index b49923a65bc90ddd6859d3e562cda1f95ebdf998..acae400d7c5705140247bb6d87592098ea3ea3a5 100755 (executable)
--- a/software/SCSI2SD/src/disk.c
+++ b/software/SCSI2SD/src/disk.c
@@ -76,7 +76,7 @@ static void doFormatUnitHeader(void)
        {\r
                // Save the "MODE SELECT savable parameters"\r
                configSave(\r
-                       scsiDev.target->targetId,\r
+                       scsiDev.target->cfg->scsiId & CONFIG_TARGET_ID_BITS,\r
                        scsiDev.target->state.bytesPerSector);\r
        }\r
 \r
@@ -108,7 +108,6 @@ static void doReadCapacity()
 \r
        uint32_t capacity = getScsiCapacity(\r
                scsiDev.target->device,\r
-               scsiDev.device,\r
                scsiDev.target->cfg->sdSectorStart,\r
                scsiDev.target->state.bytesPerSector,\r
                scsiDev.target->cfg->scsiSectors);\r
@@ -172,7 +171,7 @@ static void doWrite(uint32 lba, uint32 blocks)
        }\r
        else if (unlikely(((uint64) lba) + blocks >\r
                getScsiCapacity(\r
-                       scsiDev->device,\r
+                       scsiDev.target->device,\r
                        scsiDev.target->cfg->sdSectorStart,\r
                        bytesPerSector,\r
                        scsiDev.target->cfg->scsiSectors\r
@@ -218,6 +217,7 @@ static void doRead(uint32 lba, uint32 blocks)
        }\r
 \r
        uint32_t capacity = getScsiCapacity(\r
+        scsiDev.target->device,\r
                scsiDev.target->cfg->sdSectorStart,\r
                scsiDev.target->state.bytesPerSector,\r
                scsiDev.target->cfg->scsiSectors);\r
@@ -271,6 +271,7 @@ static void doSeek(uint32 lba)
 {\r
        if (lba >=\r
                getScsiCapacity(\r
+            scsiDev.target->device,\r
                        scsiDev.target->cfg->sdSectorStart,\r
                        scsiDev.target->state.bytesPerSector,\r
                        scsiDev.target->cfg->scsiSectors)\r

diff --git a/software/SCSI2SD/src/geometry.c b/software/SCSI2SD/src/geometry.c
index c3c6bb7cfc632d8e374071511cce86e8d08e4496..7d4d4e6fe75dfbcb652b24c00ea6e939ba8f9c6e 100755 (executable)
--- a/software/SCSI2SD/src/geometry.c
+++ b/software/SCSI2SD/src/geometry.c
@@ -21,19 +21,22 @@
 #include <string.h>\r
 \r
 uint32_t getScsiCapacity(\r
+    S2S_Device* device,\r
        uint32_t sdSectorStart,\r
        uint16_t bytesPerSector,\r
        uint32_t scsiSectors)\r
 {\r
+    uint32_t devCapacity = device->getCapacity(device);\r
+    \r
        uint32_t capacity =\r
-               (sdDev.capacity - sdSectorStart) /\r
+               (devCapacity - sdSectorStart) /\r
                        SDSectorsPerSCSISector(bytesPerSector);\r
 \r
-       if (sdDev.capacity == 0)\r
+       if (devCapacity == 0)\r
        {\r
                capacity = 0;\r
        }\r
-       else if (sdSectorStart >= sdDev.capacity)\r
+       else if (sdSectorStart >= devCapacity)\r
        {\r
                capacity = 0;\r
        }\r

diff --git a/software/SCSI2SD/src/geometry.h b/software/SCSI2SD/src/geometry.h
index 76da6e133adccdcbe9c0a2c41da2e8e2b5ed30bb..26fda1ac314594ebe0b2987d1694f8a5735f6eb1 100755 (executable)
--- a/software/SCSI2SD/src/geometry.h
+++ b/software/SCSI2SD/src/geometry.h
@@ -21,7 +21,8 @@
 
 #include "config.h"
 #include "storedevice.h"
-
+#include "sd.h"
+    
 typedef enum
 {
        ADDRESS_BLOCK = 0,

diff --git a/software/SCSI2SD/src/inquiry.c b/software/SCSI2SD/src/inquiry.c
index b51069d6931a4a395ef3c6a53f69a62a89195607..e1778a4669196e73db2b06d52aeb03780f382e32 100755 (executable)
--- a/software/SCSI2SD/src/inquiry.c
+++ b/software/SCSI2SD/src/inquiry.c
@@ -91,7 +91,7 @@ static const uint8 AscImpOperatingDefinition[] =
 'S','C','S','I','-','2'
 };
 
-static void useCustomVPD(const TargetConfig* cfg, int pageCode)
+static void useCustomVPD(const S2S_TargetCfg* cfg, int pageCode)
 {
        int cfgIdx = 0;
        int found = 0;
@@ -147,7 +147,7 @@ void scsiInquiry()
                }
                else
                {
-                       const TargetConfig* config = scsiDev.target->cfg;
+                       const S2S_TargetCfg* config = scsiDev.target->cfg;
                        memcpy(scsiDev.data, StandardResponse, sizeof(StandardResponse));
                        scsiDev.data[1] = scsiDev.target->cfg->deviceTypeModifier;
 
@@ -180,7 +180,7 @@ void scsiInquiry()
        {
                memcpy(scsiDev.data, UnitSerialNumber, sizeof(UnitSerialNumber));
                scsiDev.dataLen = sizeof(UnitSerialNumber);
-               const TargetConfig* config = scsiDev.target->cfg;
+               const S2S_TargetCfg* config = scsiDev.target->cfg;
                memcpy(&scsiDev.data[4], config->serial, sizeof(config->serial));
                scsiDev.phase = DATA_IN;
        }

diff --git a/software/SCSI2SD/src/main.c b/software/SCSI2SD/src/main.c
index f552923a65bbc3108089aab3f381e7679fd8af92..0349c77d3642b23988e5fd556e0579277879a94d 100755 (executable)
--- a/software/SCSI2SD/src/main.c
+++ b/software/SCSI2SD/src/main.c
@@ -42,7 +42,6 @@ int main()
        configInit(&scsiDev.boardCfg);\r
        debugInit();\r
 \r
-\r
        scsiPhyConfig();\r
 \r
        scsiInit();\r
@@ -99,7 +98,7 @@ int main()
                        scsiDev.target &&\r
                        (scsiDev.target->device->mediaState & MEDIA_PRESENT))\r
                {\r
-                       scsiDev.target->device->pollMediaBusy();\r
+                       scsiDev.target->device->pollMediaBusy(scsiDev.target->device);\r
                }\r
        }\r
        return 0;\r

diff --git a/software/SCSI2SD/src/mode.c b/software/SCSI2SD/src/mode.c
index 5c2e4dc61f3c8a26887887a7b5231fc8ec74506c..0a5056ddd4bc441a7c4a8089b6fc5672eca06be7 100755 (executable)
--- a/software/SCSI2SD/src/mode.c
+++ b/software/SCSI2SD/src/mode.c
@@ -241,7 +241,7 @@ static void pageIn(int pc, int dataIdx, const uint8* pageData, int pageLen)
        }\r
 }\r
 \r
-static int useCustomPages(const TargetConfig* cfg, int pc, int pageCode, int* idx)\r
+static int useCustomPages(const S2S_TargetCfg* cfg, int pc, int pageCode, int* idx)\r
 {\r
        int found = 0;\r
        int cfgIdx = 0;\r
@@ -626,7 +626,7 @@ static void doModeSelect(void)
                                scsiDev.target->state.bytesPerSector = bytesPerSector;\r
                                if (bytesPerSector != scsiDev.target->cfg->bytesPerSector)\r
                                {\r
-                                       configSave(scsiDev.target->targetId, bytesPerSector);\r
+                                       configSave(scsiDev.target->cfg->scsiId & CONFIG_TARGET_ID_BITS, bytesPerSector);\r
                                }\r
                        }\r
                }\r
@@ -659,7 +659,7 @@ static void doModeSelect(void)
                                scsiDev.target->state.bytesPerSector = bytesPerSector;\r
                                if (scsiDev.cdb[1] & 1) // SP Save Pages flag\r
                                {\r
-                                       configSave(scsiDev.target->targetId, bytesPerSector);\r
+                                       configSave(scsiDev.target->cfg->scsiId & CONFIG_TARGET_ID_BITS, bytesPerSector);\r
                                }\r
                        }\r
                        break;\r

diff --git a/software/SCSI2SD/src/scsi.c b/software/SCSI2SD/src/scsi.c
index a4d59f055740a80a0090d4182e9a90811de09d3a..f415a3c146c4b118bd799e74bb91c45154a2463c 100755 (executable)
--- a/software/SCSI2SD/src/scsi.c
+++ b/software/SCSI2SD/src/scsi.c
@@ -319,7 +319,7 @@ static void process_Command()
        if ((scsiDev.lun > 0) && (scsiDev.boardCfg.flags & CONFIG_MAP_LUNS_TO_IDS))\r
        {\r
                S2S_Target* lunTarget = s2s_DeviceFindByScsiId(scsiDev.lun);\r
-               if (lunTarget! = NULL)\r
+               if (lunTarget != NULL)\r
                {\r
                        scsiDev.target = lunTarget;\r
                        scsiDev.lun = 0;\r
@@ -330,7 +330,7 @@ static void process_Command()
        control = scsiDev.cdb[scsiDev.cdbLen - 1];\r
 \r
        scsiDev.cmdCount++;\r
-       const TargetConfig* cfg = scsiDev.target->cfg;\r
+       const S2S_TargetCfg* cfg = scsiDev.target->cfg;\r
 \r
        if (unlikely(scsiDev.resetFlag))\r
        {\r
@@ -663,7 +663,7 @@ static void process_SelectionPhase()
        int atnFlag = SCSI_ReadFilt(SCSI_Filt_ATN);\r
 \r
        S2S_Target* target = NULL;\r
-       for (int testIdx = 0; testtIndex < 8; ++testtIndex)\r
+       for (int testIdx = 0; testIdx < 8; ++testIdx)\r
        {\r
                target = s2s_DeviceFindByScsiId(1 << testIdx);\r
                if (target)\r
@@ -725,7 +725,7 @@ static void process_SelectionPhase()
                // SCSI1/SASI initiators may not set their own ID.\r
                {\r
                        int i;\r
-                       uint8_t initiatorMask = mask ^ (1 << target->targetId);\r
+                       uint8_t initiatorMask = mask ^ (1 << (target->cfg->scsiId & CONFIG_TARGET_ID_BITS));\r
                        scsiDev.initiatorId = -1;\r
                        for (i = 0; i < 8; ++i)\r
                        {\r
@@ -1056,17 +1056,17 @@ void scsiInit()
        for (int devIdx = 0; devIdx < deviceCount; ++devIdx)\r
        {\r
                int targetCount;\r
-               S2S_Target* targets = devices[deviceIdx].getTargets(devices + deviceIdx, &targetCount);\r
+               S2S_Target* targets = allDevices[devIdx].getTargets(allDevices + devIdx, &targetCount);\r
 \r
                for (int i = 0; i < targetCount; ++i)\r
                {\r
                        S2S_TargetState* state = &(targets[i].state);\r
 \r
-                       scsiDev.targets[i].state.reservedId = -1;\r
-                       scsiDev.targets[i].state.reserverId = -1;\r
-                       scsiDev.targets[i].state.unitAttention = POWER_ON_RESET;\r
-                       scsiDev.targets[i].state.sense.code = NO_SENSE;\r
-                       scsiDev.targets[i].state.sense.asc = NO_ADDITIONAL_SENSE_INFORMATION;\r
+                       state->reservedId = -1;\r
+                       state->reserverId = -1;\r
+                       state->unitAttention = POWER_ON_RESET;\r
+                       state->sense.code = NO_SENSE;\r
+                       state->sense.asc = NO_ADDITIONAL_SENSE_INFORMATION;\r
 \r
                        state->bytesPerSector = targets[i].cfg->bytesPerSector;\r
                }\r
@@ -1105,7 +1105,7 @@ int scsiReconnect()
        {\r
                // Arbitrate.\r
                ledOn();\r
-               uint8_t scsiIdMask = 1 << scsiDev.target->targetId;\r
+               uint8_t scsiIdMask = 1 << (scsiDev.target->cfg->scsiId & CONFIG_TARGET_ID_BITS);\r
                SCSI_Out_Bits_Write(scsiIdMask);\r
                SCSI_Out_Ctl_Write(1); // Write bits manually.\r
                SCSI_SetPin(SCSI_Out_BSY);\r

diff --git a/software/SCSI2SD/src/scsi.h b/software/SCSI2SD/src/scsi.h
index a259105a94c417d0dbef0d335b9ee49e254f58d6..f353e584be9608beb86a7cb8d2c9e0189ed81b47 100755 (executable)
--- a/software/SCSI2SD/src/scsi.h
+++ b/software/SCSI2SD/src/scsi.h
@@ -76,6 +76,7 @@ typedef enum
 typedef struct
 {
        S2S_Target* target;
+    S2S_BoardConfig boardCfg;
 
        // Set to true (1) if the ATN flag was set, and we need to
        // enter the MESSAGE_OUT phase.

diff --git a/software/SCSI2SD/src/sd.c b/software/SCSI2SD/src/sd.c
index 3014e706d22eb72db6cc5785e29bf97e4acfb6cc..a16ad505176f85907ef401b0fd305e6b1f528bb8 100755 (executable)
--- a/software/SCSI2SD/src/sd.c
+++ b/software/SCSI2SD/src/sd.c
@@ -35,7 +35,7 @@ static int sd_pollMediaChange(S2S_Device* dev);
 static void sd_pollMediaBusy(S2S_Device* dev);\r
 \r
 // Global\r
-SdCard sdCard S2S_DMA_ALIGN = {\r
+SdCard sdCard = {\r
        {\r
                sd_earlyInit,\r
                sd_getTargets,\r
@@ -1003,14 +1003,14 @@ void sdCheckPresent()
                                // LOGICAL_UNIT_NOT_READY_INITIALIZING_COMMAND_REQUIRED sense\r
                                // code, even if they stopped it first with\r
                                // START STOP UNIT command.\r
-                               blockDev.state |= DISK_STARTED;\r
+                               sdCard.dev.mediaState |= MEDIA_STARTED;\r
 \r
                                if (!firstInit)\r
                                {\r
                                        int i;\r
                                        for (i = 0; i < MAX_SCSI_TARGETS; ++i)\r
                                        {\r
-                                               scsiDev.targets[i].unitAttention = PARAMETERS_CHANGED;\r
+                                               sdCard.targets[i].state.unitAttention = PARAMETERS_CHANGED;\r
                                        }\r
                                }\r
                                firstInit = 0;\r
@@ -1035,12 +1035,12 @@ static void sd_earlyInit(S2S_Device* dev)
 {\r
        SdCard* sdCardDevice = (SdCard*)dev;\r
 \r
-       for (int i = 0; i < MAX_TARGETS; ++i)\r
+       for (int i = 0; i < MAX_SCSI_TARGETS; ++i)\r
        {\r
                sdCardDevice->targets[i].device = dev;\r
                sdCardDevice->targets[i].cfg = getConfigByIndex(i);\r
        }\r
-       sdCardDevice->lastPollMediaTime = s2s_getTime_ms();\r
+       sdCardDevice->lastPollMediaTime = getTime_ms();\r
 \r
        // Don't require the host to send us a START STOP UNIT command\r
        sdCardDevice->dev.mediaState = MEDIA_STARTED;\r
@@ -1050,7 +1050,7 @@ static void sd_earlyInit(S2S_Device* dev)
 static S2S_Target* sd_getTargets(S2S_Device* dev, int* count)\r
 {\r
        SdCard* sdCardDevice = (SdCard*)dev;\r
-       *count = MAX_TARGETS;\r
+       *count = MAX_SCSI_TARGETS;\r
        return sdCardDevice->targets;\r
 }\r
 \r
@@ -1063,9 +1063,9 @@ static uint32_t sd_getCapacity(S2S_Device* dev)
 static int sd_pollMediaChange(S2S_Device* dev)\r
 {\r
        SdCard* sdCardDevice = (SdCard*)dev;\r
-       if (s2s_elapsedTime_ms(sdCardDevice->lastPollMediaTime) > 200)\r
+       if (elapsedTime_ms(sdCardDevice->lastPollMediaTime) > 200)\r
        {\r
-               sdCardDevice->lastPollMediaTime = s2s_getTime_ms();\r
+               sdCardDevice->lastPollMediaTime = getTime_ms();\r
                sdCheckPresent();\r
                return 0;\r
        }\r
@@ -1078,6 +1078,6 @@ static int sd_pollMediaChange(S2S_Device* dev)
 static void sd_pollMediaBusy(S2S_Device* dev)\r
 {\r
        SdCard* sdCardDevice = (SdCard*)dev;\r
-       sdCardDevice->lastPollMediaTime = s2s_getTime_ms();\r
+       sdCardDevice->lastPollMediaTime = getTime_ms();\r
 }\r
 \r

diff --git a/software/SCSI2SD/src/sd.h b/software/SCSI2SD/src/sd.h
index d6e2ec8cc2fc16c0a518280181f52209d6972813..602f93804f48662e3c76df3b766bdaf3c9c378fd 100755 (executable)
--- a/software/SCSI2SD/src/sd.h
+++ b/software/SCSI2SD/src/sd.h
@@ -56,11 +56,11 @@ typedef struct
 {
        S2S_Device dev;
 
-       S2S_Target targets[MAX_TARGETS];
+       S2S_Target targets[MAX_SCSI_TARGETS];
 
        int version; // SDHC = version 2.
        int ccs; // Card Capacity Status. 1 = SDHC or SDXC
-       uint32 capacity; // in 512 byte blocks
+       uint32_t capacity; // in 512 byte blocks
 
        uint8_t csd[16]; // Unparsed CSD
        uint8_t cid[16]; // Unparsed CID

diff --git a/software/SCSI2SD/src/sense.h b/software/SCSI2SD/src/sense.h
index 78528687af9306a3674d725aa2ce49dd49f5aac5..e73631f114c9c30313d87d0d4eef0685ed2865fc 100755 (executable)
--- a/software/SCSI2SD/src/sense.h
+++ b/software/SCSI2SD/src/sense.h
@@ -169,8 +169,8 @@ typedef enum
 
 typedef struct
 {
-       uint8 code;
-       uint16 asc;
+       uint8_t code;
+       uint16_t asc;
 } ScsiSense;
 
 #endif

diff --git a/software/SCSI2SD/src/storedevice.c b/software/SCSI2SD/src/storedevice.c
index 261f461bd4245789f9ee19a7fc17d013bdce7ad7..a6b01732de8fbbef64ac473531b98a77ab35d5ed 100644 (file)
--- a/software/SCSI2SD/src/storedevice.c
+++ b/software/SCSI2SD/src/storedevice.c
@@ -33,8 +33,8 @@ S2S_Target* s2s_DeviceFindByScsiId(int scsiId)
                {
                        S2S_Target* target = targets + targetIdx;
                        if (target &&
-                               (target->cfg->scsiId & S2S_CFG_TARGET_ENABLED) &&
-                               ((target->cfg->scsiId & S2S_CFG_TARGET_ID_BITS) == scsiId))
+                               (target->cfg->scsiId & CONFIG_TARGET_ENABLED) &&
+                               ((target->cfg->scsiId & CONFIG_TARGET_ID_BITS) == scsiId))
                        {
                                return target;
                        }

diff --git a/software/SCSI2SD/v5.2/SCSI2SD.cydsn/SCSI2SD.cyfit b/software/SCSI2SD/v5.2/SCSI2SD.cydsn/SCSI2SD.cyfit
index c3ea79e5d1f5771107430e4c4fe8c43406c6db53..453a9b13a7820f0b30920a5fc503d52a8cf6423e 100644 (file)
Binary files a/software/SCSI2SD/v5.2/SCSI2SD.cydsn/SCSI2SD.cyfit and b/software/SCSI2SD/v5.2/SCSI2SD.cydsn/SCSI2SD.cyfit differ

diff --git a/software/SCSI2SD/v5.2/SCSI2SD.cydsn/SCSI2SD.cyprj b/software/SCSI2SD/v5.2/SCSI2SD.cydsn/SCSI2SD.cyprj
index b52eef2b6778fd4ec2ecd66667a0c389f3f67051..073546949120fd96bd94c569c1e9bf593057eef4 100644 (file)
--- a/software/SCSI2SD/v5.2/SCSI2SD.cydsn/SCSI2SD.cyprj
+++ b/software/SCSI2SD/v5.2/SCSI2SD.cydsn/SCSI2SD.cyprj
@@ -151,6 +151,13 @@
 <build_action v="SOURCE_C;;;;" />
 <PropertyDeltas />
 </CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
+<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFileSerialize" version="3" xml_contents_version="1">
+<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemSerialize" version="2" name="storedevice.c" persistent="..\..\src\storedevice.c">
+<Hidden v="False" />
+</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
+<build_action v="SOURCE_C;;;;" />
+<PropertyDeltas />
+</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
 </dependencies>
 </CyGuid_0820c2e7-528d-4137-9a08-97257b946089>
 </CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8>
@@ -322,6 +329,13 @@
 <build_action v="HEADER;;;;" />
 <PropertyDeltas />
 </CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
+<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFileSerialize" version="3" xml_contents_version="1">
+<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemSerialize" version="2" name="storedevice.h" persistent="..\..\src\storedevice.h">
+<Hidden v="False" />
+</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
+<build_action v="HEADER;;;;" />
+<PropertyDeltas />
+</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
 </dependencies>
 </CyGuid_0820c2e7-528d-4137-9a08-97257b946089>
 </CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8>

diff --git a/software/include/scsi2sd.h b/software/include/scsi2sd.h
index e9e44e2b5a7b095e19bd554e877b9fa63b2b0c7a..fe52e761a10dcf60511abb7310b1893166acf8e8 100755 (executable)
--- a/software/include/scsi2sd.h
+++ b/software/include/scsi2sd.h
@@ -184,7 +184,7 @@ typedef struct __attribute__((packed))
        uint8_t modePages[1024];
        uint8_t vpd[1024];
        uint8_t unused[1024]; // Total size is 4k.
-} TargetConfig;
+} S2S_TargetCfg;
 
 typedef struct __attribute__((packed))
 {
@@ -198,7 +198,7 @@ typedef struct __attribute__((packed))
 
 
        uint8_t reserved[247]; // Pad out to 256 bytes
-} BoardConfig;
+} S2S_BoardConfig;
 
 typedef enum
 {