X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FPico.c;h=0bb61161dbfbbff2dafe0db9ace009a4b0626621;hb=43e6eaad0b73b37907be3342e0fd4cf65919e9f6;hp=6db7e6aefcfa81f0e1e8e04e31812528be9eeabd;hpb=b5e5172d049a83251874fb33e65a53c9654dc0bc;p=picodrive.git

diff --git a/Pico/cd/Pico.c b/Pico/cd/Pico.c
index 6db7e6a..0bb6116 100644
--- a/Pico/cd/Pico.c
+++ b/Pico/cd/Pico.c
@@ -2,7 +2,7 @@
 
 
 #include "../PicoInt.h"
-
+#include "../sound/ym2612.h"
 
 extern unsigned char formatted_bram[4*0x10];
 extern unsigned int s68k_poll_adclk;
@@ -48,16 +48,18 @@ PICO_INTERNAL void PicoExitMCD(void)
   //dump_ram(Pico.ram, "ram.bin");
 }
 
-PICO_INTERNAL int PicoResetMCD(int hard)
+PICO_INTERNAL void PicoPowerMCD(void)
+{
+  int fmt_size = sizeof(formatted_bram);
+  memset(Pico_mcd->prg_ram,    0, sizeof(Pico_mcd->prg_ram));
+  memset(Pico_mcd->word_ram2M, 0, sizeof(Pico_mcd->word_ram2M));
+  memset(Pico_mcd->pcm_ram,    0, sizeof(Pico_mcd->pcm_ram));
+  memset(Pico_mcd->bram, 0, sizeof(Pico_mcd->bram));
+  memcpy(Pico_mcd->bram + sizeof(Pico_mcd->bram) - fmt_size, formatted_bram, fmt_size);
+}
+
+PICO_INTERNAL int PicoResetMCD(void)
 {
-  if (hard) {
-    int fmt_size = sizeof(formatted_bram);
-    memset(Pico_mcd->prg_ram,    0, sizeof(Pico_mcd->prg_ram));
-    memset(Pico_mcd->word_ram2M, 0, sizeof(Pico_mcd->word_ram2M));
-    memset(Pico_mcd->pcm_ram,    0, sizeof(Pico_mcd->pcm_ram));
-    memset(Pico_mcd->bram, 0, sizeof(Pico_mcd->bram));
-    memcpy(Pico_mcd->bram + sizeof(Pico_mcd->bram) - fmt_size, formatted_bram, fmt_size);
-  }
   memset(Pico_mcd->s68k_regs, 0, sizeof(Pico_mcd->s68k_regs));
   memset(&Pico_mcd->pcm, 0, sizeof(Pico_mcd->pcm));
   memset(&Pico_mcd->m, 0, sizeof(Pico_mcd->m));
@@ -75,10 +77,15 @@ PICO_INTERNAL int PicoResetMCD(int hard)
 #endif
 
   // use SRam.data for RAM cart
-  if (SRam.data) free(SRam.data);
-  SRam.data = NULL;
-  if (PicoOpt&0x8000)
-    SRam.data = calloc(1, 0x12000);
+  if (PicoOpt&POPT_EN_MCD_RAMCART) {
+    if (SRam.data == NULL)
+      SRam.data = calloc(1, 0x12000);
+  }
+  else if (SRam.data != NULL) {
+    free(SRam.data);
+    SRam.data = NULL;
+  }
+  SRam.start = SRam.end = 0; // unused
 
   return 0;
 }
@@ -99,7 +106,7 @@ static __inline void SekRunM68k(int cyc)
   SekCycleCnt+=m68k_execute(cyc_do);
 #elif defined(EMU_F68K)
   g_m68kcontext=&PicoCpuFM68k;
-  SekCycleCnt+=fm68k_emulate(cyc_do);
+  SekCycleCnt+=fm68k_emulate(cyc_do, 0);
 #endif
 }
 
@@ -119,15 +126,22 @@ static __inline void SekRunS68k(int cyc)
   SekCycleCntS68k+=m68k_execute(cyc_do);
 #elif defined(EMU_F68K)
   g_m68kcontext=&PicoCpuFS68k;
-  SekCycleCntS68k+=fm68k_emulate(cyc_do);
+  SekCycleCntS68k+=fm68k_emulate(cyc_do, 0);
 #endif
 }
 
 #define PS_STEP_M68K ((488<<16)/20) // ~24
 //#define PS_STEP_S68K 13
 
-#ifdef _ASM_CD_PICO_C
-void SekRunPS(int cyc_m68k, int cyc_s68k);
+#if defined(_ASM_CD_PICO_C)
+extern void SekRunPS(int cyc_m68k, int cyc_s68k);
+#elif defined(EMU_F68K)
+static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
+{
+  SekCycleAim+=cyc_m68k;
+  SekCycleAimS68k+=cyc_s68k;
+  fm68k_emulate(0, 1);
+}
 #else
 static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
 {
@@ -152,7 +166,7 @@ static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
       SekCycleCnt += m68k_execute(cyc_do);
 #elif defined(EMU_F68K)
       g_m68kcontext = &PicoCpuFM68k;
-      SekCycleCnt += fm68k_emulate(cyc_do);
+      SekCycleCnt += fm68k_emulate(cyc_do, 0);
 #endif
     }
     if ((cyc_do = SekCycleAimS68k-SekCycleCntS68k-cycn_s68k) > 0) {
@@ -165,7 +179,7 @@ static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
       SekCycleCntS68k += m68k_execute(cyc_do);
 #elif defined(EMU_F68K)
       g_m68kcontext = &PicoCpuFS68k;
-      SekCycleCntS68k += fm68k_emulate(cyc_do);
+      SekCycleCntS68k += fm68k_emulate(cyc_do, 0);
 #endif
     }
   }
@@ -252,7 +266,7 @@ static __inline void getSamples(int y)
 
 PICO_INTERNAL int PicoFrameMCD(void)
 {
-  if(!(PicoOpt&0x10))
+  if (!(PicoOpt&POPT_ALT_RENDERER))
     PicoFrameStart();
 
   PicoFrameHints();