implement transfer delays for both SPI busses

also make microphone input return 0x800

3 files changed, 32 insertions, 4 deletions

diff --git a/src/NDS.h b/src/NDS.h
index c6cd84b..2e53dd0 100644
--- a/src/NDS.h
+++ b/src/NDS.h
@@ -32,6 +32,8 @@ enum
 
     Event_DisplayFIFO,
     Event_ROMTransfer,
+    Event_ROMSPITransfer,
+    Event_SPITransfer,
 
     Event_MAX
 };
diff --git a/src/NDSCart.cpp b/src/NDSCart.cpp
index 969fce4..48300b2 100644
--- a/src/NDSCart.cpp
+++ b/src/NDSCart.cpp
@@ -1117,12 +1117,20 @@ u32 ReadROMData()
 void WriteSPICnt(u16 val)
 {
     SPICnt = (SPICnt & 0x0080) | (val & 0xE043);
+    if (SPICnt & (1<<7))
+        printf("!! CHANGING AUXSPICNT DURING TRANSFER: %04X\n", val);
+}
+
+void SPITransferDone(u32 param)
+{
+    SPICnt &= ~(1<<7);
 }
 
 u8 ReadSPIData()
 {
     if (!(SPICnt & (1<<15))) return 0;
     if (!(SPICnt & (1<<13))) return 0;
+    if (SPICnt & (1<<7)) return 0; // checkme
 
     return NDSCart_SRAM::Read();
 }
@@ -1132,9 +1140,14 @@ void WriteSPIData(u8 val)
     if (!(SPICnt & (1<<15))) return;
     if (!(SPICnt & (1<<13))) return;
 
-    // TODO: take delays into account
+    if (SPICnt & (1<<7)) printf("!! WRITING AUXSPIDATA DURING PENDING TRANSFER\n");
 
+    SPICnt |= (1<<7);
     NDSCart_SRAM::Write(val, SPICnt&(1<<6));
+
+    // SPI transfers one bit per cycle -> 8 cycles per byte
+    u32 delay = 8 * (8 << (SPICnt & 0x3));
+    NDS::ScheduleEvent(NDS::Event_ROMSPITransfer, false, delay, SPITransferDone, 0);
 }
 
 }
diff --git a/src/SPI.cpp b/src/SPI.cpp
index 6a364f7..9d00b58 100644
--- a/src/SPI.cpp
+++ b/src/SPI.cpp
@@ -454,6 +454,7 @@ void Write(u8 val, u32 hold)
         {
         case 0x10: ConvResult = TouchY; break;
         case 0x50: ConvResult = TouchX; break;
+        case 0x60: ConvResult = 0x800; break; // TODO: mic
         default: ConvResult = 0xFFF; break;
         }
 
@@ -505,11 +506,21 @@ void WriteCnt(u16 val)
 {
     Cnt = (Cnt & 0x0080) | (val & 0xCF03);
     if (val & 0x0400) printf("!! CRAPOED 16BIT SPI MODE\n");
+    if (Cnt & (1<<7)) printf("!! CHANGING SPICNT DURING TRANSFER: %04X\n", val);
+}
+
+void TransferDone(u32 param)
+{
+    Cnt &= ~(1<<7);
+
+    if (Cnt & (1<<14))
+        NDS::SetIRQ(1, NDS::IRQ_SPI);
 }
 
 u8 ReadData()
 {
     if (!(Cnt & (1<<15))) return 0;
+    if (Cnt & (1<<7)) return 0; // checkme
 
     switch (Cnt & 0x0300)
     {
@@ -524,8 +535,9 @@ void WriteData(u8 val)
 {
     if (!(Cnt & (1<<15))) return;
 
-    // TODO: take delays into account
+    if (Cnt & (1<<7)) printf("!! WRITING AUXSPIDATA DURING PENDING TRANSFER\n");
 
+    Cnt |= (1<<7);
     switch (Cnt & 0x0300)
     {
     case 0x0000: SPI_Powerman::Write(val, Cnt&(1<<11)); break;
@@ -534,8 +546,9 @@ void WriteData(u8 val)
     default: printf("SPI to unknown device %04X %02X\n", Cnt, val); break;
     }
 
-    if (Cnt & (1<<14))
-        NDS::SetIRQ(1, NDS::IRQ_SPI);
+    // SPI transfers one bit per cycle -> 8 cycles per byte
+    u32 delay = 8 * (8 << (Cnt & 0x3));
+    NDS::ScheduleEvent(NDS::Event_SPITransfer, false, delay, TransferDone, 0);
 }
 
 }