X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FMemoryCmn.c;h=dcd5d756067b571bfa2a28652362de63d678910b;hb=449ecf9257636348c23bf78bf502c424a48c4201;hp=b49eaf2b426af0678e80bb91e98b94e4165c4164;hpb=9dc09829192f73f5d0502c8b312a39863bca60d3;p=picodrive.git

diff --git a/Pico/MemoryCmn.c b/Pico/MemoryCmn.c
index b49eaf2..dcd5d75 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
@@ -25,7 +18,8 @@ u8 z80Read8(u32 a)
 
   a&=0x1fff;
 
-  if(!(PicoOpt&4)) {
+  if (!(PicoOpt&POPT_EN_Z80))
+  {
     // Z80 disabled, do some faking
     static u8 zerosent = 0;
     if(a == Pico.m.z80_lastaddr) { // probably polling something
@@ -127,7 +121,7 @@ u32 OtherRead16(u32 a, int realsize)
   if ((a&0xff0000)==0xa00000) {
     if ((a&0x4000)==0x0000) { d=z80Read8(a); d|=d<<8; goto end; } // Z80 ram (not byteswaped)
     if ((a&0x6000)==0x4000) { // 0x4000-0x5fff, Fudge if disabled
-      if(PicoOpt&1) d=YM2612Read();
+      if(PicoOpt&POPT_EN_FM) d=YM2612Read();
       else d=Pico.m.rotate++&3;
       elprintf(EL_YM2612R, "read ym2612: %02x", d);
       goto end;
@@ -136,7 +130,7 @@ u32 OtherRead16(u32 a, int realsize)
     goto end;
   }
 
-  d = OtherRead16End(a, realsize);
+  d = PicoRead16Hook(a, realsize);
 
 end:
   return d;
@@ -146,12 +140,13 @@ static void IoWrite8(u32 a, u32 d)
 {
   a=(a>>1)&0xf;
   // 6 button gamepad: if TH went from 0 to 1, gamepad changes state
-  if(PicoOpt&0x20) {
-    if(a==1) {
+  if(PicoOpt&POPT_6BTN_PAD)
+  {
+    if (a==1) {
       Pico.m.padDelay[0] = 0;
       if(!(Pico.ioports[1]&0x40) && (d&0x40)) Pico.m.padTHPhase[0]++;
     }
-    else if(a==2) {
+    else if (a==2) {
       Pico.m.padDelay[1] = 0;
       if(!(Pico.ioports[2]&0x40) && (d&0x40)) Pico.m.padTHPhase[1]++;
     }
@@ -191,7 +186,7 @@ void OtherWrite8(u32 a,u32 d)
     return;
   }
 
-  OtherWrite8End(a, d, 8);
+  PicoWrite8Hook(a, d, 8);
 }
 
 
@@ -201,7 +196,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
@@ -227,10 +222,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);
+}