FAME + some random stuff added

[picodrive.git] / Pico / Memory.c

diff --git a/Pico/Memory.c b/Pico/Memory.c
index aa15bef..b0aa7af 100644 (file)
--- a/Pico/Memory.c
+++ b/Pico/Memory.c
@@ -45,7 +45,7 @@ void log_io(unsigned int addr, int bits, int rw);
 #define log_io(...)\r
 #endif\r
 \r
-#if defined(EMU_C68K) || defined(EMU_A68K)\r
+#if defined(EMU_C68K)\r
 static __inline int PicoMemBase(u32 pc)\r
 {\r
   int membase=0;\r
@@ -69,10 +69,6 @@ static __inline int PicoMemBase(u32 pc)
 #endif\r
 \r
 \r
-#ifdef EMU_A68K\r
-extern u8 *OP_ROM=NULL,*OP_RAM=NULL;\r
-#endif\r
-\r
 static u32 CPU_CALL PicoCheckPc(u32 pc)\r
 {\r
   u32 ret=0;\r
@@ -90,11 +86,6 @@ static u32 CPU_CALL PicoCheckPc(u32 pc)
   PicoCpu.membase-=pc&0xff000000;\r
 \r
   ret = PicoCpu.membase+pc;\r
-#elif defined(EMU_A68K)\r
-  OP_ROM=(u8 *)PicoMemBase(pc);\r
-\r
-  // don't bother calling us back unless it's outside the 64k segment\r
-  M68000_regs.AsmBank=(pc>>16);\r
 #endif\r
   return ret;\r
 }\r
@@ -498,8 +489,8 @@ static void CPU_CALL PicoWrite32(u32 a,u32 d)
 // -----------------------------------------------------------------\r
 PICO_INTERNAL void PicoMemSetup(void)\r
 {\r
-#ifdef EMU_C68K\r
   // Setup memory callbacks:\r
+#ifdef EMU_C68K\r
   PicoCpu.checkpc=PicoCheckPc;\r
   PicoCpu.fetch8 =PicoCpu.read8 =PicoRead8;\r
   PicoCpu.fetch16=PicoCpu.read16=PicoRead16;\r
@@ -508,43 +499,16 @@ PICO_INTERNAL void PicoMemSetup(void)
   PicoCpu.write16=PicoWrite16;\r
   PicoCpu.write32=PicoWrite32;\r
 #endif\r
+#ifdef EMU_F68K\r
+  PicoCpuM68k.read_byte =PicoRead8;\r
+  PicoCpuM68k.read_word =PicoRead16;\r
+  PicoCpuM68k.read_long =PicoRead32;\r
+  PicoCpuM68k.write_byte=PicoWrite8;\r
+  PicoCpuM68k.write_word=PicoWrite16;\r
+  PicoCpuM68k.write_long=PicoWrite32;\r
+#endif\r
 }\r
 \r
-#ifdef EMU_A68K\r
-struct A68KInter\r
-{\r
-  u32 unknown;\r
-  u8  (__fastcall *Read8) (u32 a);\r
-  u16 (__fastcall *Read16)(u32 a);\r
-  u32 (__fastcall *Read32)(u32 a);\r
-  void (__fastcall *Write8)  (u32 a,u8 d);\r
-  void (__fastcall *Write16) (u32 a,u16 d);\r
-  void (__fastcall *Write32) (u32 a,u32 d);\r
-  void (__fastcall *ChangePc)(u32 a);\r
-  u8  (__fastcall *PcRel8) (u32 a);\r
-  u16 (__fastcall *PcRel16)(u32 a);\r
-  u32 (__fastcall *PcRel32)(u32 a);\r
-  u16 (__fastcall *Dir16)(u32 a);\r
-  u32 (__fastcall *Dir32)(u32 a);\r
-};\r
-\r
-struct A68KInter a68k_memory_intf=\r
-{\r
-  0,\r
-  PicoRead8,\r
-  PicoRead16,\r
-  PicoRead32,\r
-  PicoWrite8,\r
-  PicoWrite16,\r
-  PicoWrite32,\r
-  PicoCheckPc,\r
-  PicoRead8,\r
-  PicoRead16,\r
-  PicoRead32,\r
-  PicoRead16, // unused\r
-  PicoRead32, // unused\r
-};\r
-#endif\r
 \r
 #ifdef EMU_M68K\r
 unsigned int  m68k_read_pcrelative_CD8 (unsigned int a);\r