X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPico.c;h=a76c9e40cfc611a453d3638c97c10fa71fa62044;hb=a12b1b29cc7e394128da59614c2efe8f5d182741;hp=bb0f6e5b819a4c9a687a27d856d81685cfb8e3ef;hpb=f8ef8ff7100baa0ac0ecfcacb47aea3a9e24bc38;p=picodrive.git

diff --git a/Pico/Pico.c b/Pico/Pico.c
index bb0f6e5..a76c9e4 100644
--- a/Pico/Pico.c
+++ b/Pico/Pico.c
@@ -19,6 +19,7 @@ int PicoAutoRgnOrder = 0;
 int emustatus = 0; // rapid_ym2612, multi_ym_updates
 void (*PicoWriteSound)(int len) = NULL; // called at the best time to send sound buffer (PsndOut) to hardware
 void (*PicoResetHook)(void) = NULL;
+void (*PicoLineHook)(int count) = NULL;
 
 struct PicoSRAM SRam = {0,};
 int z80startCycle, z80stopCycle; // in 68k cycles
@@ -37,6 +38,7 @@ int PicoInit(void)
   z80_init(); // init even if we aren't going to use it
 
   PicoInitMCD();
+  PicoSVPInit();
 
   SRam.data=0;
 
@@ -62,6 +64,9 @@ int PicoReset(int hard)
 
   if (Pico.romsize<=0) return 1;
 
+  /* must call now, so that banking is reset, and correct vectors get fetched */
+  if (PicoResetHook) PicoResetHook();
+
   PicoMemReset();
   SekReset();
   // s68k doesn't have the TAS quirk, so we just globally set normal TAS handler in MCD mode (used by Batman games).
@@ -77,7 +82,7 @@ int PicoReset(int hard)
   Pico.video.pending_ints=0;
   emustatus = 0;
 
-  if(hard) {
+  if (hard) {
     // clear all memory of the emulated machine
     memset(&Pico.ram,0,(unsigned int)&Pico.rom-(unsigned int)&Pico.ram);
   }
@@ -140,8 +145,6 @@ int PicoReset(int hard)
 
   PsndReset(); // pal must be known here
 
-  if (PicoResetHook) PicoResetHook();
-
   if (PicoMCD & 1) {
     PicoResetMCD(hard);
     return 0;
@@ -160,15 +163,16 @@ int PicoReset(int hard)
 
 // dma2vram settings are just hacks to unglitch Legend of Galahad (needs <= 104 to work)
 // same for Outrunners (92-121, when active is set to 24)
+// 96 is VR hack
 static const int dma_timings[] = {
-83,  167, 166,  83, // vblank: 32cell: dma2vram dma2[vs|c]ram vram_fill vram_copy
+96,  167, 166,  83, // vblank: 32cell: dma2vram dma2[vs|c]ram vram_fill vram_copy
 102, 205, 204, 102, // vblank: 40cell:
 16,   16,  15,   8, // active: 32cell:
 24,   18,  17,   9  // ...
 };
 
 static const int dma_bsycles[] = {
-(488<<8)/82,  (488<<8)/167, (488<<8)/166, (488<<8)/83,
+(488<<8)/96,  (488<<8)/167, (488<<8)/166, (488<<8)/83,
 (488<<8)/102, (488<<8)/205, (488<<8)/204, (488<<8)/102,
 (488<<8)/16,  (488<<8)/16,  (488<<8)/15,  (488<<8)/8,
 (488<<8)/24,  (488<<8)/18,  (488<<8)/17,  (488<<8)/9
@@ -254,6 +258,12 @@ static int CheckIdle(void)
 // to be called on 224 or line_sample scanlines only
 static __inline void getSamples(int y)
 {
+#if SIMPLE_WRITE_SOUND
+  if (y != 224) return;
+  PsndRender(0, PsndLen);
+  if (PicoWriteSound) PicoWriteSound(PsndLen);
+  PsndClear();
+#else
   static int curr_pos = 0;
 
   if(y == 224) {
@@ -270,6 +280,7 @@ static __inline void getSamples(int y)
     emustatus&=~1;
     curr_pos = PsndRender(0, PsndLen/2);
   }
+#endif
 }
 
 
@@ -363,6 +374,7 @@ static int PicoFrameSimple(void)
     SekRunM68k(cycles_68k_block);
 
     PicoRunZ80Simple(line, lines);
+    if (PicoLineHook) PicoLineHook(lines_step);
     line=lines;
   }
 
@@ -376,6 +388,7 @@ static int PicoFrameSimple(void)
 
     lines += sects*lines_step;
     PicoRunZ80Simple(line, lines);
+    if (PicoLineHook) PicoLineHook(sects*lines_step);
   }
 
   // render screen
@@ -439,6 +452,7 @@ static int PicoFrameSimple(void)
     SekRunM68k(cycles_68k_vblock);
 
     PicoRunZ80Simple(line, lines);
+    if (PicoLineHook) PicoLineHook(lines_step);
     line=lines;
 
     sects--;
@@ -449,6 +463,7 @@ static int PicoFrameSimple(void)
   if (sects) {
     lines += sects*lines_step;
     PicoRunZ80Simple(line, lines);
+    if (PicoLineHook) PicoLineHook(sects*lines_step);
   }
 
   return 0;
@@ -490,6 +505,17 @@ void PicoFrameDrawOnly(void)
   for (y=0;y<224;y++) PicoLine(y);
 }
 
+int PicoGetStat(pstat_t which)
+{
+  switch (which)
+  {
+    case PS_PAL:       return Pico.m.pal;
+    case PS_40_CELL:   return Pico.video.reg[12]&1;
+    case PS_240_LINES: return Pico.m.pal && (Pico.video.reg[1]&8);
+  }
+  return 0;
+}
+
 // callback to output message from emu
 void (*PicoMessage)(const char *msg)=NULL;
 
@@ -576,14 +602,6 @@ char *debugString(void)
   }
 #endif
 
-#if 0
-  {
-    FILE *f = fopen("zram", "wb");
-    fwrite(Pico.zram, 1, 0x2000, f);
-    fclose(f);
-  }
-#endif
-
   return dstr;
 }
 #endif