Merge branch 'master' of https://github.com/NPO-197/melonDS-lua

Author: NPO-197

flake.lock

@@ -10,7 +10,7 @@
     let
       pkgs = import nixpkgs { inherit system; };
       inherit (pkgs.lib) cmakeBool optionals makeLibraryPath;
-      inherit (pkgs.stdenv) isLinux isDarwin;
+      inherit (pkgs.stdenv.hostPlatform) isLinux isDarwin;
 
       revision = with self; if sourceInfo?dirtyRev
         then sourceInfo.dirtyRev
@@ -21,7 +21,7 @@
 
       melonDS = pkgs.stdenv.mkDerivation {
         pname = "melonDS";
-        version = "1.0-${shortRevision}";
+        version = "1.1-${shortRevision}";
         src = ./.;
 
         nativeBuildInputs = with pkgs; [

flake.nix

@@ -1433,9 +1433,14 @@ static void GPU_WriteVRAM_ARM7(u32 addr, T val) noexcept
     NDS::Current->GPU.WriteVRAM_ARM7<T>(addr, val);
 }
 
-u32 NDSCartSlot_ReadROMData()
-{ // TODO: Add a NDS* parameter, when NDS* is eventually implemented
-    return NDS::Current->NDSCartSlot.ReadROMData();
+u32 NDSCartSlot_ReadROMData9()
+{
+    return NDS::Current->NDSCartSlots[0]->ReadROMData(0);
+}
+
+u32 NDSCartSlot_ReadROMData7()
+{
+    return NDS::Current->NDSCartSlots[0]->ReadROMData(1);
 }
 
 static u8 NDS_ARM9IORead8(u32 addr)
@@ -1505,8 +1510,8 @@ void* ARMJIT_Memory::GetFuncForAddr(ARM* cpu, u32 addr, bool store, int size) co
         switch (addr & 0xFF000000)
         {
         case 0x04000000:
-            if (!store && size == 32 && addr == 0x04100010 && NDS.ExMemCnt[0] & (1<<11))
-                return (void*)NDSCartSlot_ReadROMData;
+            if (!store && size == 32 && addr == 0x04100010)
+                return (void*)NDSCartSlot_ReadROMData9;
 
             /*
                 unfortunately we can't map GPU2D this way

src/ARMJIT_Memory.cpp

@@ -41,11 +41,9 @@ add_library(core STATIC
     GPU3D_Soft.cpp
     GPU3D_Texcache.cpp
     GPU3D_Texcache.h
-    melonDLDI.h
     Mic.cpp
     NDS.cpp
     NDSCart.cpp
-    NDSCartR4.cpp
     Platform.h
     ROMList.h
     ROMList.cpp
@@ -67,6 +65,15 @@ add_library(core STATIC
     DSP_HLE/G711Ucode.cpp
     DSP_HLE/GraphicsUcode.cpp
 
+    NDSCart/CartCommon.cpp
+    NDSCart/CartRetail.cpp
+    NDSCart/CartRetailNAND.cpp
+    NDSCart/CartRetailIR.cpp
+    NDSCart/CartRetailBT.cpp
+    NDSCart/CartSD.cpp
+    NDSCart/CartHomebrew.cpp
+    NDSCart/CartR4.cpp
+
     fatfs/ff.c
     fatfs/ffsystem.c
     fatfs/ffunicode.c

src/CMakeLists.txt

@@ -145,6 +145,8 @@ void DMA::WriteCnt(u32 val)
 
         if ((StartMode & 0x7) == 0)
             Start();
+        else if (StartMode == 0x05 || StartMode == 0x12)
+            NDS.NDSCartSlots[0]->CheckDMA(CPU);
         else if (StartMode == 0x07)
             NDS.GPU.GPU3D.CheckFIFODMA();
 
@@ -621,6 +623,9 @@ void DMA::Run9()
     Running = 0;
     InProgress = false;
     NDS.ResumeCPU(0, 1<<Num);
+
+    if (StartMode == 0x05)
+        NDS.NDSCartSlots[0]->CheckDMA(0);
 }
 
 void DMA::Run7()
@@ -691,6 +696,9 @@ void DMA::Run7()
     Running = 0;
     InProgress = false;
     NDS.ResumeCPU(1, 1<<Num);
+
+    if (StartMode == 0x12)
+        NDS.NDSCartSlots[0]->CheckDMA(1);
 }
 
 void DMA::Run()