From 468da235589a30498ccd3d30d558b263b99bb954 Mon Sep 17 00:00:00 2001
From: pjgat09 <pjgat09@gmail.com>
Date: Mon, 6 May 2013 00:08:36 +0000
Subject: [PATCH] N64: Set RDRAM as the main memory

---
 BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs b/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs
index 80e51ed089..a09ce5219f 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs
@@ -204,7 +204,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo.N64
 		}
 
 		public IList<MemoryDomain> MemoryDomains { get; private set; }
-		public MemoryDomain MainMemory { get { return null; } }
+		public MemoryDomain MainMemory { get; private set; }
 
 		bool disposed = false;
 		public void Dispose()
@@ -323,13 +323,13 @@ namespace BizHawk.Emulation.Consoles.Nintendo.N64
 		  M64TYPE_STRING
 		};
 
-		enum m64p_dbg_memptr_type {
-		  M64P_DBG_PTR_RDRAM = 1,
-		  M64P_DBG_PTR_PI_REG,
-		  M64P_DBG_PTR_SI_REG,
-		  M64P_DBG_PTR_VI_REG,
-		  M64P_DBG_PTR_RI_REG,
-		  M64P_DBG_PTR_AI_REG
+		enum m64p_dbg_memptr_type {
+		  M64P_DBG_PTR_RDRAM = 1,
+		  M64P_DBG_PTR_PI_REG,
+		  M64P_DBG_PTR_SI_REG,
+		  M64P_DBG_PTR_VI_REG,
+		  M64P_DBG_PTR_RI_REG,
+		  M64P_DBG_PTR_AI_REG
 		};
 
 		//[DllImport(@"..\..\libmupen64plus\mupen64plus-ui-console\projects\msvc11\Release\mupen64plus.dll", CallingConvention = CallingConvention.Cdecl)]
@@ -608,6 +608,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo.N64
 
 			MemoryDomains = new List<MemoryDomain>();
 			MemoryDomains.Add(new MemoryDomain("RDRAM", 0x400000, Endian.Little, getRDRAMByte, setRDRAMByte));
+			MainMemory = MemoryDomains[0];
 
 			rdram = m64pDebugMemGetPointer(m64p_dbg_memptr_type.M64P_DBG_PTR_RDRAM);