X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FMemoryCmn.c;h=996a5ae489810b16dbd7d623e39f963b1b2ddd66;hb=d4ca252d929395352f581b532e9d3726da31d718;hp=145a7e682c31c06f8f4b1bccf57a1879e6be5518;hpb=b542be4686241c9e0722ff8e452980f9ac2b4d7c;p=picodrive.git

diff --git a/Pico/MemoryCmn.c b/Pico/MemoryCmn.c
index 145a7e6..996a5ae 100644
--- a/Pico/MemoryCmn.c
+++ b/Pico/MemoryCmn.c
@@ -8,13 +8,6 @@ typedef unsigned int   u32;
 #define UTYPES_DEFINED
 #endif
 
-#ifdef _ASM_MEMORY_C
-u32 OtherRead16End(u32 a, int realsize);
-#endif
-#ifdef _ASM_CD_MEMORY_C
-static void OtherWrite8End(u32 a,u32 d,int realsize);
-#endif
-
 
 #ifndef _ASM_MEMORY_C
 static
@@ -136,7 +129,7 @@ u32 OtherRead16(u32 a, int realsize)
     goto end;
   }
 
-  d = OtherRead16End(a, realsize);
+  d = PicoRead16Hook(a, realsize);
 
 end:
   return d;
@@ -191,7 +184,7 @@ void OtherWrite8(u32 a,u32 d)
     return;
   }
 
-  OtherWrite8End(a, d, 8);
+  PicoWrite8Hook(a, d, 8);
 }
 
 
@@ -201,7 +194,7 @@ static
 void OtherWrite16(u32 a,u32 d)
 {
   if (a==0xa11100)            { z80WriteBusReq(d>>8); return; }
-  if (a==0xa11200)            { dprintf("write z80reset: %04x", d); if(!(d&0x100)) z80_reset(); return; }
+  if (a==0xa11200)            { elprintf(EL_BUSREQ, "write z80reset: %04x", d); if(!(d&0x100)) z80_reset(); return; }
   if ((a&0xffffe0)==0xa10000) { IoWrite8(a, d); return; } // I/O ports
   if ((a&0xff4000)==0xa00000) { if(!(Pico.m.z80Run&1)) Pico.zram[a&0x1fff]=(u8)(d>>8); return; } // Z80 ram (MSB only)
   if ((a&0xe700f8)==0xc00010||(a&0xff7ff8)==0xa07f10) { if(PicoOpt&2) SN76496Write(d); return; } // PSG Sound
@@ -217,7 +210,7 @@ void OtherWrite16(u32 a,u32 d)
 #ifndef _CD_MEMORY_C
   if (a >= SRam.start && a <= SRam.end) {
     elprintf(EL_SRAMIO, "sram w16 [%06x] %04x @ %06x", a, d, SekPc);
-    if ((a&0x16)==0x10) { // detected, not EEPROM, write not disabled
+    if ((Pico.m.sram_reg&0x16)==0x10) { // detected, not EEPROM, write not disabled
       u8 *pm=(u8 *)(SRam.data-SRam.start+a);
       *pm++=d>>8;
       *pm++=d;
@@ -227,10 +220,8 @@ void OtherWrite16(u32 a,u32 d)
       SRAMWrite(a, d);
     return;
   }
-#else
-  OtherWrite8End(a,  d>>8, 16);
-  OtherWrite8End(a+1,d&0xff, 16);
 #endif
-}
 
+  PicoWrite16Hook(a, d, 16);
+}