Compile fixes
authorMichael McMaster <michael@codesrc.com>
Sun, 1 Nov 2015 10:30:53 +0000 (20:30 +1000)
committerMichael McMaster <michael@codesrc.com>
Sun, 1 Nov 2015 10:30:53 +0000 (20:30 +1000)
software/SCSI2SD/src/scsi.c
software/SCSI2SD/src/sd.c

index 79d1e73..2f88cc4 100755 (executable)
@@ -31,6 +31,8 @@
 #include "time.h"\r
 #include "cdrom.h"\r
 #include "debug.h"\r
+#include "tape.h"\r
+#include "mo.h"\r
 \r
 #include <string.h>\r
 \r
index bf1adc2..20f2f05 100755 (executable)
@@ -63,6 +63,9 @@ static uint8_t dummyBuffer[2]  __attribute__((aligned(4))) = {0xFF, 0xFF};
 volatile uint8_t sdRxDMAComplete;\r
 volatile uint8_t sdTxDMAComplete;\r
 \r
+static void sdCompleteRead();\r
+static void sdCompleteWrite();\r
+\r
 CY_ISR_PROTO(sdRxISR);\r
 CY_ISR(sdRxISR)\r
 {\r
@@ -426,7 +429,7 @@ sdReadMultiSectorDMA(uint8_t* outputBuffer)
        dmaReadSector(outputBuffer);\r
 }\r
 \r
-void sdCompleteRead()\r
+static void sdCompleteRead()\r
 {\r
        if (unlikely(sdIOState != SD_IDLE))\r
        {\r
@@ -442,7 +445,7 @@ void sdCompleteRead()
        {\r
                uint8 r1b = sdCommandAndResponse(SD_STOP_TRANSMISSION, 0);\r
 \r
-               if (unlikely(r1b) && (scsiDev.PHASE == DATA_IN))\r
+               if (unlikely(r1b) && (scsiDev.phase == DATA_IN))\r
                {\r
                        scsiDev.status = CHECK_CONDITION;\r
                        scsiDev.target->sense.code = HARDWARE_ERROR;\r
@@ -570,7 +573,7 @@ sdWriteSectorDMAPoll()
        }\r
 }\r
 \r
-void sdCompleteWrite()\r
+static void sdCompleteWrite()\r
 {\r
        if (unlikely(sdIOState != SD_IDLE))\r
        {\r