X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPico.c;h=6d9d525e171bd6dfb4a3908e28c565166e85a4a8;hb=689fb2c0898deb6f87006dc5755516eb0ff6e647;hp=38c8233ce9a15ec9c79c8d71d18239959d06b48c;hpb=03e4f2a349247334666c87abe3a908df72d23051;p=picodrive.git

diff --git a/Pico/Pico.c b/Pico/Pico.c
index 38c8233..6d9d525 100644
--- a/Pico/Pico.c
+++ b/Pico/Pico.c
@@ -17,7 +17,9 @@ int PicoSkipFrame=0; // skip rendering frame?
 int PicoRegionOverride = 0; // override the region detection 0: Auto, 1: Japan NTSC, 2: Japan PAL, 4: US, 8: Europe
 int PicoAutoRgnOrder = 0;
 int emustatus = 0; // rapid_ym2612, multi_ym_updates
-void (*PicoWriteSound)(int len) = 0; // called once per frame at the best time to send sound buffer (PsndOut) to hardware
+void (*PicoWriteSound)(int len) = NULL; // called at the best time to send sound buffer (PsndOut) to hardware
+void (*PicoResetHook)(void) = NULL;
+void (*PicoLineHook)(void) = NULL;
 
 struct PicoSRAM SRam = {0,};
 int z80startCycle, z80stopCycle; // in 68k cycles
@@ -137,7 +139,9 @@ int PicoReset(int hard)
   Pico.m.pal=pal;
   Pico.video.status = 0x3408 | pal; // always set bits | vblank | pal
 
-  sound_reset(); // pal must be known here
+  PsndReset(); // pal must be known here
+
+  if (PicoResetHook) PicoResetHook();
 
   if (PicoMCD & 1) {
     PicoResetMCD(hard);
@@ -205,7 +209,7 @@ static __inline void SekRunM68k(int cyc)
   if((cyc_do=SekCycleAim-SekCycleCnt) <= 0) return;
 #if defined(EMU_CORE_DEBUG)
   // this means we do run-compare
-  SekCycleCnt+=CM_compareRun(cyc_do);
+  SekCycleCnt+=CM_compareRun(cyc_do, 0);
 #elif defined(EMU_C68K)
   PicoCpuCM68k.cycles=cyc_do;
   CycloneRun(&PicoCpuCM68k);
@@ -213,7 +217,7 @@ static __inline void SekRunM68k(int cyc)
 #elif defined(EMU_M68K)
   SekCycleCnt+=m68k_execute(cyc_do);
 #elif defined(EMU_F68K)
-  SekCycleCnt+=fm68k_emulate(cyc_do+1);
+  SekCycleCnt+=fm68k_emulate(cyc_do+1, 0);
 #endif
 }
 
@@ -222,7 +226,7 @@ static __inline void SekStep(void)
   // this is required for timing sensitive stuff to work
   int realaim=SekCycleAim; SekCycleAim=SekCycleCnt+1;
 #if defined(EMU_CORE_DEBUG)
-  SekCycleCnt+=CM_compareRun(1);
+  SekCycleCnt+=CM_compareRun(1, 0);
 #elif defined(EMU_C68K)
   PicoCpuCM68k.cycles=1;
   CycloneRun(&PicoCpuCM68k);
@@ -230,7 +234,7 @@ static __inline void SekStep(void)
 #elif defined(EMU_M68K)
   SekCycleCnt+=m68k_execute(1);
 #elif defined(EMU_F68K)
-  SekCycleCnt+=fm68k_emulate(1);
+  SekCycleCnt+=fm68k_emulate(1, 0);
 #endif
   SekCycleAim=realaim;
 }
@@ -255,17 +259,17 @@ static __inline void getSamples(int y)
 
   if(y == 224) {
     if(emustatus & 2)
-         curr_pos += sound_render(curr_pos, PsndLen-PsndLen/2);
-    else curr_pos  = sound_render(0, PsndLen);
+         curr_pos += PsndRender(curr_pos, PsndLen-PsndLen/2);
+    else curr_pos  = PsndRender(0, PsndLen);
     if (emustatus&1) emustatus|=2; else emustatus&=~2;
     if (PicoWriteSound) PicoWriteSound(curr_pos);
     // clear sound buffer
-    sound_clear();
+    PsndClear();
   }
   else if(emustatus & 3) {
     emustatus|= 2;
     emustatus&=~1;
-    curr_pos = sound_render(0, PsndLen/2);
+    curr_pos = PsndRender(0, PsndLen/2);
   }
 }
 
@@ -293,14 +297,14 @@ static void PicoRunZ80Simple(int line_from, int line_to)
   if (PicoOpt&1) {
     // we have ym2612 enabled, so we have to run Z80 in lines, so we could update DAC and timers
     for (line = line_from; line < line_to; line++) {
-      sound_timers_and_dac(line);
+      Psnd_timers_and_dac(line);
       if ((line == 224 || line == line_sample) && PsndOut) getSamples(line);
       if (line == 32 && PsndOut) emustatus &= ~1;
       if (line >= line_from_r && line < line_to_r)
-        z80_run(228);
+        z80_run_nr(228);
     }
   } else if (line_to_r-line_from_r > 0) {
-    z80_run(228*(line_to_r-line_from_r));
+    z80_run_nr(228*(line_to_r-line_from_r));
     // samples will be taken by caller
   }
 }
@@ -397,10 +401,10 @@ static int PicoFrameSimple(void)
 
   // here we render sound if ym2612 is disabled
   if (!(PicoOpt&1) && PsndOut) {
-    int len = sound_render(0, PsndLen);
+    int len = PsndRender(0, PsndLen);
     if (PicoWriteSound) PicoWriteSound(len);
     // clear sound buffer
-    sound_clear();
+    PsndClear();
   }
 
   // a gap between flags set and vint