From d943a51b9658e1898f49b6773f85778ae7348400 Mon Sep 17 00:00:00 2001
From: Arisotura <thetotalworm@gmail.com>
Date: Thu, 20 Jun 2019 03:19:51 +0200
Subject: [PATCH] ayyy

getting there!
---
 src/DSi.cpp      | 2 +-
 src/DSi_I2C.cpp  | 9 ++++-----
 src/DSi_NDMA.cpp | 4 ++--
 src/DSi_SD.cpp   | 5 ++++-
 src/NDS.cpp      | 4 ++--
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/DSi.cpp b/src/DSi.cpp
index ee9d21ce..0e35d53e 100644
--- a/src/DSi.cpp
+++ b/src/DSi.cpp
@@ -1239,7 +1239,7 @@ u8 ARM7IORead8(u32 addr)
     CASE_READ8_32BIT(0x04004060, MBK[1][8])
 
     case 0x04004500: return DSi_I2C::ReadData();
-    case 0x04004501: printf("read I2C CNT %02X\n", DSi_I2C::Cnt); return DSi_I2C::Cnt;
+    case 0x04004501: return DSi_I2C::Cnt;
 
     case 0x04004D00: return ConsoleID & 0xFF;
     case 0x04004D01: return (ConsoleID >> 8) & 0xFF;
diff --git a/src/DSi_I2C.cpp b/src/DSi_I2C.cpp
index 8b01b0e8..845dd9db 100644
--- a/src/DSi_I2C.cpp
+++ b/src/DSi_I2C.cpp
@@ -152,7 +152,7 @@ void Reset()
 
 void WriteCnt(u8 val)
 {
-    printf("I2C: write CNT %02X\n", val);
+    //printf("I2C: write CNT %02X\n", val);
 
     // TODO: check ACK flag
     // TODO: transfer delay
@@ -174,7 +174,7 @@ void WriteCnt(u8 val)
             default: Data = 0; break;
             }
 
-            printf("I2C read, device=%02X, cnt=%02X, data=%02X, last=%d\n", Device, val, Data, islast);
+            //printf("I2C read, device=%02X, cnt=%02X, data=%02X, last=%d\n", Device, val, Data, islast);
         }
         else
         {
@@ -184,7 +184,7 @@ void WriteCnt(u8 val)
             if (val & (1<<1))
             {
                 Device = Data & 0xFE;
-                printf("I2C: %s start, device=%02X\n", (Data&0x01)?"read":"write", Device);
+                //printf("I2C: %s start, device=%02X\n", (Data&0x01)?"read":"write", Device);
 
                 switch (Device)
                 {
@@ -193,7 +193,7 @@ void WriteCnt(u8 val)
             }
             else
             {
-                printf("I2C write, device=%02X, cnt=%02X, data=%02X, last=%d\n", Device, val, Data, islast);
+                //printf("I2C write, device=%02X, cnt=%02X, data=%02X, last=%d\n", Device, val, Data, islast);
 
                 switch (Device)
                 {
@@ -212,7 +212,6 @@ void WriteCnt(u8 val)
 
 u8 ReadData()
 {
-    printf("I2C: read the data: %02X\n", Data);
     return Data;
 }
 
diff --git a/src/DSi_NDMA.cpp b/src/DSi_NDMA.cpp
index a62904a8..37eb6873 100644
--- a/src/DSi_NDMA.cpp
+++ b/src/DSi_NDMA.cpp
@@ -135,8 +135,8 @@ void DSi_NDMA::Start()
 
     // TODO eventually: not stop if we're running code in ITCM
 
-    if (SubblockTimer & 0xFFFF)
-        printf("TODO! NDMA SUBBLOCK TIMER: %08X\n", SubblockTimer);
+    //if (SubblockTimer & 0xFFFF)
+    //    printf("TODO! NDMA SUBBLOCK TIMER: %08X\n", SubblockTimer);
 
     if (NDS::DMAsRunning(CPU))
         Running = 1;
diff --git a/src/DSi_SD.cpp b/src/DSi_SD.cpp
index fbb2e142..3764a3c2 100644
--- a/src/DSi_SD.cpp
+++ b/src/DSi_SD.cpp
@@ -218,6 +218,8 @@ u16 DSi_SDHost::Read(u32 addr)
     case 0x026: return BlockLen16;
     case 0x028: return SDOption;
 
+    case 0x02C: return 0; // TODO
+
     case 0x030: // FIFO16
         {
             // TODO: decrement BlockLen????
@@ -275,7 +277,7 @@ u16 DSi_SDHost::Read(u32 addr)
     case 0x108: return BlockCount32;
     }
 
-    printf("unknown %s read %08X\n", SD_DESC, addr);
+    printf("unknown %s read %08X @ %08X\n", SD_DESC, addr, NDS::GetPC(1));
     return 0;
 }
 
@@ -356,6 +358,7 @@ void DSi_SDHost::Write(u32 addr, u16 val)
                     break;
                 }
             }
+            else printf("%s: SENDING CMD %04X TO NULL DEVICE\n", SD_DESC, val);
         }
         return;
 
diff --git a/src/NDS.cpp b/src/NDS.cpp
index 66223733..61cf5477 100644
--- a/src/NDS.cpp
+++ b/src/NDS.cpp
@@ -1600,7 +1600,7 @@ void debug(u32 param)
         fwrite(&val, 4, 1, shit);
     }
     fclose(shit);*/
-    FILE*
+    /*FILE*
     shit = fopen("debug/dump9.bin", "wb");
     for (u32 i = 0x02000000; i < 0x04000000; i+=4)
     {
@@ -1614,7 +1614,7 @@ void debug(u32 param)
         u32 val = DSi::ARM7Read32(i);
         fwrite(&val, 4, 1, shit);
     }
-    fclose(shit);
+    fclose(shit);*/
 }