Merge remote-tracking branch 'remotes/origin/master' into dsi_camera

1 files changed, 3 insertions, 5 deletions

diff --git a/src/DMA.h b/src/DMA.h
index 0344fba..b0b4ab2 100644
--- a/src/DMA.h
+++ b/src/DMA.h
@@ -34,9 +34,12 @@ public:
     void WriteCnt(u32 val);
     void Start();
 
+    template <int ConsoleType>
     void Run();
 
+    template <int ConsoleType>
     void Run9();
+    template <int ConsoleType>
     void Run7();
 
     bool IsInMode(u32 mode)
@@ -86,11 +89,6 @@ private:
     bool Stall;
 
     bool IsGXFIFODMA;
-
-    u16 (*BusRead16)(u32 addr);
-    u32 (*BusRead32)(u32 addr);
-    void (*BusWrite16)(u32 addr, u16 val);
-    void (*BusWrite32)(u32 addr, u32 val);
 };
 
 #endif