X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPico%2FMemory.c;h=8c4674b59651549f8cb5a1a357edd2921e01cbe0;hb=d95259bdaaf911218656d8a74b096ff7306034f6;hp=22166918e7ca9519cd28716b1f268fd4ead96d90;hpb=1e6b5e39f45341524d90a4c71776e92a6d2d6fe5;p=picodrive.git

diff --git a/Pico/Pico/Memory.c b/Pico/Pico/Memory.c
index 2216691..8c4674b 100644
--- a/Pico/Pico/Memory.c
+++ b/Pico/Pico/Memory.c
@@ -34,23 +34,23 @@ static u32 PicoReadPico8(u32 a)
       case 0x01: d = PicoPicohw.r1; break;
       case 0x03:
         d  =  PicoPad[0]&0x1f; // d-pad
-        d |= (PicoPad[0]&0x20) << 2; // red button -> C
+        d |= (PicoPad[0]&0x20) << 2; // pen push -> C
         d  = ~d;
         break;
 
-      case 0x05: d = (PicoPicohw.pen_pos[0] >> 8) & 3; break; // what is MS bit for? Games read it..
-      case 0x07: d =  PicoPicohw.pen_pos[0] & 0xff;    break;
-      case 0x09: d = (PicoPicohw.pen_pos[1] >> 8) & 3; break;
-      case 0x0b: d =  PicoPicohw.pen_pos[1] & 0xff;    break;
+      case 0x05: d = (PicoPicohw.pen_pos[0] >> 8);  break; // what is MS bit for? Games read it..
+      case 0x07: d =  PicoPicohw.pen_pos[0] & 0xff; break;
+      case 0x09: d = (PicoPicohw.pen_pos[1] >> 8);  break;
+      case 0x0b: d =  PicoPicohw.pen_pos[1] & 0xff; break;
       case 0x0d: d = (1 << (PicoPicohw.page & 7)) - 1; break;
-      case 0x12: d = 0x80; break;
+      case 0x12: d = PicoPicohw.fifo_bytes == 0 ? 0x80 : 0; break; // guess
       default:
         elprintf(EL_UIO, "r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPc);
         break;
     }
   }
 
-//  elprintf(EL_UIO, "r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPc);
+  //elprintf(EL_UIO, "r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPc);
 
 end:
   elprintf(EL_IO, "r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPc);
@@ -72,10 +72,14 @@ static u32 PicoReadPico16(u32 a)
     goto end;
   }
 
-  if (a == 0x800010)
+  if      (a == 0x800010)
     d = (PicoPicohw.fifo_bytes > 0x3f) ? 0 : (0x3f - PicoPicohw.fifo_bytes);
+  else if (a == 0x800012)
+    d = PicoPicohw.fifo_bytes == 0 ? 0x8000 : 0; // guess
+  else
+    elprintf(EL_UIO, "r16: %06x, %04x @%06x", a&0xffffff, d, SekPc);
 
-  elprintf(EL_UIO, "r16: %06x, %04x @%06x", a&0xffffff, d, SekPc);
+  //elprintf(EL_UIO, "r16: %06x, %04x @%06x", a&0xffffff, d, SekPc);
 
 end:
   elprintf(EL_IO, "r16: %06x, %04x @%06x", a&0xffffff, d, SekPc);
@@ -106,14 +110,21 @@ end:
 
 // -----------------------------------------------------------------
 //                            Write Ram
-
+/*
 void dump(u16 w)
 {
-  FILE *f = fopen("dump.bin", "a");
-  fwrite(&w, 1, 2, f);
-  fclose(f);
+  static FILE *f[0x10] = { NULL, };
+  char fname[32];
+  int num = PicoPicohw.r12 & 0xf;
+
+  w = (w << 8) | (w >> 8);
+  sprintf(fname, "ldump%i.bin", num);
+  if (f[num] == NULL)
+    f[num] = fopen(fname, "wb");
+  fwrite(&w, 1, 2, f[num]);
+  //fclose(f);
 }
-
+*/
 
 static void PicoWritePico8(u32 a,u8 d)
 {
@@ -130,7 +141,13 @@ static void PicoWritePico8(u32 a,u8 d)
     return;
   }
 
-  elprintf(EL_UIO, "w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPc);
+  switch (a & 0x1f) {
+    case 0x19: case 0x1b: case 0x1d: case 0x1f: break; // 'S' 'E' 'G' 'A'
+    default:
+      elprintf(EL_UIO, "w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPc);
+      break;
+  }
+  //elprintf(EL_UIO, "w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPc);
 }
 
 static void PicoWritePico16(u32 a,u16 d)
@@ -142,11 +159,30 @@ static void PicoWritePico16(u32 a,u16 d)
   a&=0xfffffe;
   if ((a&0xfffff0)==0xc00000) { PicoVideoWrite(a,(u16)d); return; } // VDP
 
-//  if (a == 0x800010) dump(d);
-  if (a == 0x800010) PicoPicohw.fifo_bytes += 2;
-  if (a == 0x800012) PicoPicohw.r12 = d;
+  //if (a == 0x800010) dump(d);
+  if (a == 0x800010)
+  {
+    PicoPicohw.fifo_bytes += 2;
+
+    if (PicoPicohw.xpcm_ptr < PicoPicohw.xpcm_buffer + XPCM_BUFFER_SIZE) {
+      *PicoPicohw.xpcm_ptr++ = d >> 8;
+      *PicoPicohw.xpcm_ptr++ = d;
+    }
+    else if (PicoPicohw.xpcm_ptr == PicoPicohw.xpcm_buffer + XPCM_BUFFER_SIZE) {
+      elprintf(EL_ANOMALY|EL_PICOHW, "xpcm_buffer overflow!");
+      PicoPicohw.xpcm_ptr++;
+    }
+  }
+  else if (a == 0x800012) {
+    int r12_old = PicoPicohw.r12;
+    PicoPicohw.r12 = d;
+    if (r12_old != d)
+      PicoReratePico();
+  }
+  else
+    elprintf(EL_UIO, "w16: %06x, %04x", a&0xffffff, d);
 
-  elprintf(EL_UIO, "w16: %06x, %04x", a&0xffffff, d);
+  //elprintf(EL_UIO, "w16: %06x, %04x", a&0xffffff, d);
 }
 
 static void PicoWritePico32(u32 a,u32 d)
@@ -226,5 +262,15 @@ PICO_INTERNAL void PicoMemSetupPico(void)
   pm68k_read_memory_pcr_16 = m68k_read_memory_pcrp_16;
   pm68k_read_memory_pcr_32 = m68k_read_memory_pcrp_32;
 #endif
+#ifdef EMU_F68K
+  // use standard setup, only override handlers
+  PicoMemSetup();
+  PicoCpuFM68k.read_byte =PicoReadPico8;
+  PicoCpuFM68k.read_word =PicoReadPico16;
+  PicoCpuFM68k.read_long =PicoReadPico32;
+  PicoCpuFM68k.write_byte=PicoWritePico8;
+  PicoCpuFM68k.write_word=PicoWritePico16;
+  PicoCpuFM68k.write_long=PicoWritePico32;
+#endif
 }