From 0b558479a6200629f0779ff5e48b9348fdf900dc Mon Sep 17 00:00:00 2001 From: Michael McMaster Date: Sun, 1 Nov 2015 20:30:53 +1000 Subject: [PATCH] Compile fixes --- software/SCSI2SD/src/scsi.c | 2 ++ software/SCSI2SD/src/sd.c | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/software/SCSI2SD/src/scsi.c b/software/SCSI2SD/src/scsi.c index 79d1e73..2f88cc4 100755 --- a/software/SCSI2SD/src/scsi.c +++ b/software/SCSI2SD/src/scsi.c @@ -31,6 +31,8 @@ #include "time.h" #include "cdrom.h" #include "debug.h" +#include "tape.h" +#include "mo.h" #include diff --git a/software/SCSI2SD/src/sd.c b/software/SCSI2SD/src/sd.c index bf1adc2..20f2f05 100755 --- 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; volatile uint8_t sdTxDMAComplete; +static void sdCompleteRead(); +static void sdCompleteWrite(); + CY_ISR_PROTO(sdRxISR); CY_ISR(sdRxISR) { @@ -426,7 +429,7 @@ sdReadMultiSectorDMA(uint8_t* outputBuffer) dmaReadSector(outputBuffer); } -void sdCompleteRead() +static void sdCompleteRead() { if (unlikely(sdIOState != SD_IDLE)) { @@ -442,7 +445,7 @@ void sdCompleteRead() { uint8 r1b = sdCommandAndResponse(SD_STOP_TRANSMISSION, 0); - if (unlikely(r1b) && (scsiDev.PHASE == DATA_IN)) + if (unlikely(r1b) && (scsiDev.phase == DATA_IN)) { scsiDev.status = CHECK_CONDITION; scsiDev.target->sense.code = HARDWARE_ERROR; @@ -570,7 +573,7 @@ sdWriteSectorDMAPoll() } } -void sdCompleteWrite() +static void sdCompleteWrite() { if (unlikely(sdIOState != SD_IDLE)) {