Compile fixes

diff --git a/software/SCSI2SD/src/scsi.c b/software/SCSI2SD/src/scsi.c
index 79d1e7399a36b2d94b322732c36a8f3c0f0a37ce..2f88cc4eab68b051867b2932a9c98db1565d2d00 100755 (executable)
--- a/software/SCSI2SD/src/scsi.c
+++ b/software/SCSI2SD/src/scsi.c
@@ -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

diff --git a/software/SCSI2SD/src/sd.c b/software/SCSI2SD/src/sd.c
index bf1adc23e671a280996b262a12e75a494933d1a3..20f2f059484b12bce6553b764a1c7df5c7f8f0b0 100755 (executable)
--- a/software/SCSI2SD/src/sd.c
+++ b/software/SCSI2SD/src/sd.c
@@ -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