X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPico%2FMemory.c;h=2f8e1d6c3615a86e8e3a6c74060b466ebfc160c7;hb=213c16adcb630666f694646645a8ed4bc30c334b;hp=f1eddd087c009ae392629473f95e872d9c39504c;hpb=9037e45d9f2752fdd6ebbc01328148839403a84f;p=picodrive.git

diff --git a/Pico/Pico/Memory.c b/Pico/Pico/Memory.c
index f1eddd0..2f8e1d6 100644
--- a/Pico/Pico/Memory.c
+++ b/Pico/Pico/Memory.c
@@ -1,4 +1,5 @@
 #include "../PicoInt.h"
+#include "../sound/sn76496.h"
 
 #ifndef UTYPES_DEFINED
 typedef unsigned char  u8;
@@ -7,6 +8,7 @@ typedef unsigned int   u32;
 #define UTYPES_DEFINED
 #endif
 
+
 // -----------------------------------------------------------------
 //                     Read Rom and read Ram
 
@@ -19,13 +21,36 @@ static u32 PicoReadPico8(u32 a)
 
   a&=0xffffff;
 
-  if ((a&0xffffe0)==0xc00000) { // VDP
+  if ((a&0xfffff0)==0xc00000) { // VDP
     d=PicoVideoRead(a);
     if ((a&1)==0) d>>=8;
     goto end;
   }
 
-  elprintf(EL_UIO, "r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPc);
+  if ((a&0xffffe0)==0x800000) // Pico I/O
+  {
+    switch (a & 0x1f)
+    {
+      case 0x01: d = PicoPicohw.r1; break;
+      case 0x03:
+        d  =  PicoPad[0]&0x1f; // d-pad
+        d |= (PicoPad[0]&0x20) << 2; // red button -> C
+        d  = ~d;
+        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 = 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);
 
 end:
   elprintf(EL_IO, "r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPc);
@@ -42,15 +67,20 @@ static u32 PicoReadPico16(u32 a)
 
   if (a<Pico.romsize) { d = *(u16 *)(Pico.rom+a); goto end; } // Rom
 
-  if ((a&0xffffe0)==0xc00000) {
+  if ((a&0xfffff0)==0xc00000) {
     d = PicoVideoRead(a);
     goto end;
   }
 
-  elprintf(EL_UIO, "r16: %06x, %04x  @%06x", a&0xffffff, d, SekPc);
+  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
+
+  elprintf(EL_UIO, "r16: %06x, %04x @%06x", a&0xffffff, d, SekPc);
 
 end:
-  elprintf(EL_IO, "r16: %06x, %04x  @%06x", a&0xffffff, d, SekPc);
+  elprintf(EL_IO, "r16: %06x, %04x @%06x", a&0xffffff, d, SekPc);
   return d;
 }
 
@@ -64,7 +94,7 @@ static u32 PicoReadPico32(u32 a)
 
   if (a<Pico.romsize) { u16 *pm=(u16 *)(Pico.rom+a); d = (pm[0]<<16)|pm[1]; goto end; } // Rom
 
-  if ((a&0xffffe0)==0xc00000) {
+  if ((a&0xfffff0)==0xc00000) {
     d = (PicoVideoRead(a)<<16)|PicoVideoRead(a+2);
     goto end;
   }
@@ -79,6 +109,14 @@ end:
 // -----------------------------------------------------------------
 //                            Write Ram
 
+void dump(u16 w)
+{
+  FILE *f = fopen("dump.bin", "a");
+  fwrite(&w, 1, 2, f);
+  fclose(f);
+}
+
+
 static void PicoWritePico8(u32 a,u8 d)
 {
   elprintf(EL_IO, "w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPc);
@@ -86,7 +124,9 @@ static void PicoWritePico8(u32 a,u8 d)
   if ((a&0xe00000)==0xe00000) { *(u8 *)(Pico.ram+((a^1)&0xffff))=d; return; } // Ram
 
   a&=0xffffff;
-  if ((a&0xffffe0)==0xc00000) { // VDP
+  if ((a&0xfffff9)==0xc00011) { if (PicoOpt&2) SN76496Write(d); return; } // PSG Sound
+
+  if ((a&0xfffff0)==0xc00000) { // VDP
     d&=0xff;
     PicoVideoWrite(a,(u16)(d|(d<<8))); // Byte access gets mirrored
     return;
@@ -102,7 +142,28 @@ static void PicoWritePico16(u32 a,u16 d)
   if ((a&0xe00000)==0xe00000) { *(u16 *)(Pico.ram+(a&0xfffe))=d; return; } // Ram
 
   a&=0xfffffe;
-  if ((a&0xffffe0)==0xc00000) { PicoVideoWrite(a,(u16)d); return; } // VDP
+  if ((a&0xfffff0)==0xc00000) { PicoVideoWrite(a,(u16)d); return; } // VDP
+
+//  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, "xpcm_buffer overflow!");
+      PicoPicohw.xpcm_ptr++;
+    }
+  }
+  else if (a == 0x800012) {
+    int r12_old = PicoPicohw.r12;
+    PicoPicohw.r12 = d;
+    if (r12_old != d)
+      PicoReratePico();
+  }
 
   elprintf(EL_UIO, "w16: %06x, %04x", a&0xffffff, d);
 }
@@ -120,7 +181,7 @@ static void PicoWritePico32(u32 a,u32 d)
   }
 
   a&=0xfffffe;
-  if ((a&0xffffe0)==0xc00000)
+  if ((a&0xfffff0)==0xc00000)
   {
     // VDP:
     PicoVideoWrite(a,  (u16)(d>>16));
@@ -164,6 +225,15 @@ static unsigned int m68k_read_memory_pcrp_32(unsigned int a)
 
 PICO_INTERNAL void PicoMemSetupPico(void)
 {
+#ifdef EMU_C68K
+  PicoCpuCM68k.checkpc=PicoCheckPc;
+  PicoCpuCM68k.fetch8 =PicoCpuCM68k.read8 =PicoReadPico8;
+  PicoCpuCM68k.fetch16=PicoCpuCM68k.read16=PicoReadPico16;
+  PicoCpuCM68k.fetch32=PicoCpuCM68k.read32=PicoReadPico32;
+  PicoCpuCM68k.write8 =PicoWritePico8;
+  PicoCpuCM68k.write16=PicoWritePico16;
+  PicoCpuCM68k.write32=PicoWritePico32;
+#endif
 #ifdef EMU_M68K
   pm68k_read_memory_8  = PicoReadPico8;
   pm68k_read_memory_16 = PicoReadPico16;