Fix bug in using nor flash storage without SD

diff --git a/software/SCSI2SD/src/config.c b/software/SCSI2SD/src/config.c
index ddc146adfbf88994c1c8ef360278e1351492b2d3..2d4c628280574bfeee8de4bd9cfe3b3e6af5ebf2 100755 (executable)
--- a/software/SCSI2SD/src/config.c
+++ b/software/SCSI2SD/src/config.c
@@ -67,7 +67,7 @@ static int usbReady;
 static void initBoardConfig(S2S_BoardConfig* config) {\r
        memcpy(\r
                config,\r
-               (\r
+               (const void*)(\r
                        CY_FLASH_BASE +\r
                        (CY_FLASH_SIZEOF_ARRAY * (size_t) SCSI_CONFIG_ARRAY) +\r
                        (CY_FLASH_SIZEOF_ROW * SCSI_CONFIG_BOARD_ROW)\r
@@ -472,7 +472,7 @@ void debugPoll()
                dbgHidBuffer[61] = sdCard.capacity;\r
 \r
                dbgHidBuffer[62] = FIRMWARE_VERSION >> 8;\r
-               dbgHidBuffer[63] = FIRMWARE_VERSION;\r
+               dbgHidBuffer[63] = FIRMWARE_VERSION & 0xFF;\r
 \r
                USBFS_LoadInEP(USB_EP_DEBUG, (uint8 *)&dbgHidBuffer, sizeof(dbgHidBuffer));\r
                usbDebugEpState = USB_DATA_SENT;\r

diff --git a/software/SCSI2SD/src/disk.c b/software/SCSI2SD/src/disk.c
index 48f589023ff5e3333f5d864b631ad3af5d94aba2..9fbeeba6664bc5cf00e86249f62b9788128352e0 100755 (executable)
--- a/software/SCSI2SD/src/disk.c
+++ b/software/SCSI2SD/src/disk.c
@@ -576,8 +576,14 @@ void scsiDiskPoll()
                        // Wait for the next DMA interrupt. It's beneficial to halt the\r
                        // processor to give the DMA controller more memory bandwidth to\r
                        // work with.\r
-                       int scsiBusy = 1;\r
-                       int sdBusy = 1;\r
+                       int scsiBusy;\r
+                       int sdBusy;\r
+                       {\r
+                               uint8_t intr = CyEnterCriticalSection();\r
+                               scsiBusy = scsiDMABusy();\r
+                               sdBusy = isSDDevice && sdDMABusy();\r
+                               CyExitCriticalSection(intr);\r
+                       }\r
                        while (scsiBusy && sdBusy && isSDDevice)\r
                        {\r
                                uint8_t intr = CyEnterCriticalSection();\r

diff --git a/software/SCSI2SD/src/flash.c b/software/SCSI2SD/src/flash.c
index 0e6ba954581abc99c95e45fc13f5f411af7690c9..44b02800ac2abeac0b1e41cfd65cae89c1c510eb 100644 (file)
--- a/software/SCSI2SD/src/flash.c
+++ b/software/SCSI2SD/src/flash.c
@@ -47,7 +47,7 @@ static void spiFlash_erase(S2S_Device* dev, uint32_t sectorNumber, uint32_t coun
 static void spiFlash_read(S2S_Device* dev, uint32_t sectorNumber, uint32_t count, uint8_t* buffer);
 static void spiFlash_readAsync(S2S_Device* dev, uint32_t sectorNumber, uint32_t count, uint8_t* buffer);
 static int  spiFlash_readAsyncPoll(S2S_Device* dev);
-static void spiFlash_write(S2S_Device* dev, uint32_t sectorNumber, uint32_t count, uint8_t* buffer);
+static void spiFlash_write(S2S_Device* dev, uint32_t sectorNumber, uint32_t count, const uint8_t* buffer);
 
 SpiFlash spiFlash = {
     {
@@ -298,7 +298,7 @@ static void spiFlash_erase(S2S_Device* dev, uint32_t sectorNumber, uint32_t coun
     nNOR_CS_Write(1); // Deselect
 }
 
-static void spiFlash_write(S2S_Device* dev, uint32_t sectorNumber, uint32_t count, uint8_t* buffer)
+static void spiFlash_write(S2S_Device* dev, uint32_t sectorNumber, uint32_t count, const uint8_t* buffer)
 {
     // SpiFlash* spiFlash = (SpiFlash*)dev;
 

diff --git a/software/SCSI2SD/src/main.c b/software/SCSI2SD/src/main.c
index b9a6215797b16779e817d16e119412a796ed1a65..cead0c7637922389a43b7165bfe2f99ee0333140 100755 (executable)
--- a/software/SCSI2SD/src/main.c
+++ b/software/SCSI2SD/src/main.c
@@ -24,7 +24,7 @@
 #include "time.h"\r
 #include "trace.h"\r
 \r
-const char* Notice = "Copyright (C) 2015-2018 Michael McMaster <michael@codesrc.com>";\r
+const char* Notice = "Copyright (C) 2015-2021 Michael McMaster <michael@codesrc.com>";\r
 \r
 int main()\r
 {\r

diff --git a/software/SCSI2SD/src/scsiPhy.c b/software/SCSI2SD/src/scsiPhy.c
index 46f665346b9777bf621585ec1ea351c7ee197f21..0ba494a12d06fcce22632b2af6313eaa4940542e 100755 (executable)
--- a/software/SCSI2SD/src/scsiPhy.c
+++ b/software/SCSI2SD/src/scsiPhy.c
@@ -309,11 +309,11 @@ doTxSingleDMA(const uint8* data, uint32 count)
 }\r
 \r
 void\r
-scsiWriteDMA(const uint8* data, uint32 count)\r
+scsiWriteDMA(const uint8_t* data, uint32 count)\r
 {\r
        dmaSentCount = 0;\r
        dmaTotalCount = count;\r
-       dmaBuffer = data;\r
+       dmaBuffer = (uint8_t*) data;\r
 \r
        uint32_t singleCount = (count > MAX_DMA_BYTES) ? MAX_DMA_BYTES : count;\r
        doTxSingleDMA(data, singleCount);\r

diff --git a/software/SCSI2SD/src/sd.c b/software/SCSI2SD/src/sd.c
index 7bf25fc42acaace9580a3b55c1bb9d447980f449..279499bbc8342c5ddee35acd96dee411ee74ab1d 100755 (executable)
--- a/software/SCSI2SD/src/sd.c
+++ b/software/SCSI2SD/src/sd.c
@@ -38,7 +38,7 @@ static void sd_erase(S2S_Device* dev, uint32_t sectorNumber, uint32_t count);
 static void sd_read(S2S_Device* dev, uint32_t sectorNumber, uint32_t count, uint8_t* buffer);\r
 static void sd_readAsync(S2S_Device* dev, uint32_t sectorNumber, uint32_t count, uint8_t* buffer);\r
 static int  sd_readAsyncPoll(S2S_Device* dev);\r
-static void sd_write(S2S_Device* dev, uint32_t sectorNumber, uint32_t count, uint8_t* buffer);\r
+static void sd_write(S2S_Device* dev, uint32_t sectorNumber, uint32_t count, const uint8_t* buffer);\r
 \r
 \r
 // Global\r
@@ -1139,7 +1139,7 @@ static int sd_readAsyncPoll(S2S_Device* dev)
 }\r
 \r
 \r
-static void sd_write(S2S_Device* dev, uint32_t sectorNumber, uint32_t count, uint8_t* buffer)\r
+static void sd_write(S2S_Device* dev, uint32_t sectorNumber, uint32_t count, const uint8_t* buffer)\r
 {\r
     // TODO\r
 }\r

diff --git a/software/SCSI2SD/src/storedevice.h b/software/SCSI2SD/src/storedevice.h
index e66c640cbc9337fb867bf274b809b722993af42a..90ad86d4d5280a41e17c6c9a94754d3e8a28dd7c 100644 (file)
--- a/software/SCSI2SD/src/storedevice.h
+++ b/software/SCSI2SD/src/storedevice.h
@@ -80,7 +80,7 @@ struct S2S_DeviceStruct
     void (*read)(S2S_Device* dev, uint32_t sectorNumber, uint32_t count, uint8_t* buffer);
     void (*readAsync)(S2S_Device* dev, uint32_t sectorNumber, uint32_t count, uint8_t* buffer);
     int  (*readAsyncPoll)(S2S_Device* dev);
-    void (*write)(S2S_Device* dev, uint32_t sectorNumber, uint32_t count, uint8_t* buffer);
+    void (*write)(S2S_Device* dev, uint32_t sectorNumber, uint32_t count, const uint8_t* buffer);
 
        MEDIA_STATE mediaState;
     CONFIG_STOREDEVICE deviceType;

diff --git a/software/SCSI2SD/v5.2/SCSI2SD.cydsn/SCSI2SD.cyfit b/software/SCSI2SD/v5.2/SCSI2SD.cydsn/SCSI2SD.cyfit
index 944974d08cc044bce005b03a4f863e9400438edf..9765968d85dc0b79e512c6779ac4e450d1dcf854 100644 (file)
Binary files a/software/SCSI2SD/v5.2/SCSI2SD.cydsn/SCSI2SD.cyfit and b/software/SCSI2SD/v5.2/SCSI2SD.cydsn/SCSI2SD.cyfit differ