X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FPico.c;h=3ab0fe3ecd3202d776ef5a44eba08848c1ee2c1b;hb=2b02d6e533b114456785f39a356476eb97306fcf;hp=16a25dad6aa8b22c5948f258c2dfa76949552418;hpb=bf5fbbb4b9c10cf1f47bc5c7da887adfc73a3a90;p=picodrive.git

diff --git a/Pico/cd/Pico.c b/Pico/cd/Pico.c
index 16a25da..3ab0fe3 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;
@@ -10,54 +10,30 @@ extern unsigned int s68k_poll_adclk;
 void (*PicoMCDopenTray)(void) = NULL;
 int  (*PicoMCDcloseTray)(void) = NULL;
 
-#define dump_ram(ram,fname) \
-{ \
-  int i, d; \
-  FILE *f; \
-\
-  for (i = 0; i < sizeof(ram); i+=2) { \
-    d = (ram[i]<<8) | ram[i+1]; \
-    *(unsigned short *)(ram+i) = d; \
-  } \
-  f = fopen(fname, "wb"); \
-  if (f) { \
-    fwrite(ram, 1, sizeof(ram), f); \
-    fclose(f); \
-  } \
-  for (i = 0; i < sizeof(ram); i+=2) { \
-    d = (ram[i]<<8) | ram[i+1]; \
-    *(unsigned short *)(ram+i) = d; \
-  } \
-}
-
 
-PICO_INTERNAL int PicoInitMCD(void)
+PICO_INTERNAL void PicoInitMCD(void)
 {
   SekInitS68k();
   Init_CD_Driver();
-
-  return 0;
 }
 
-
 PICO_INTERNAL void PicoExitMCD(void)
 {
   End_CD_Driver();
+}
 
-  //dump_ram(Pico_mcd->prg_ram, "prg.bin");
-  //dump_ram(Pico.ram, "ram.bin");
+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(int hard)
+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));
@@ -69,16 +45,21 @@ PICO_INTERNAL int PicoResetMCD(int hard)
   Reset_CD();
   LC89510_Reset();
   gfx_cd_reset();
-#ifdef _ASM_CD_MEMORY_C
   PicoMemResetCD(1);
+#ifdef _ASM_CD_MEMORY_C
   //PicoMemResetCDdecode(1); // don't have to call this in 2M mode
 #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;
 }
@@ -87,14 +68,19 @@ static __inline void SekRunM68k(int cyc)
 {
   int cyc_do;
   SekCycleAim+=cyc;
-  if((cyc_do=SekCycleAim-SekCycleCnt) < 0) return;
-#if defined(EMU_C68K)
-  PicoCpu.cycles=cyc_do;
-  CycloneRun(&PicoCpu);
-  SekCycleCnt+=cyc_do-PicoCpu.cycles;
+  if ((cyc_do=SekCycleAim-SekCycleCnt) <= 0) return;
+#if defined(EMU_CORE_DEBUG)
+  SekCycleCnt+=CM_compareRun(cyc_do, 0);
+#elif defined(EMU_C68K)
+  PicoCpuCM68k.cycles=cyc_do;
+  CycloneRun(&PicoCpuCM68k);
+  SekCycleCnt+=cyc_do-PicoCpuCM68k.cycles;
 #elif defined(EMU_M68K)
-  m68k_set_context(&PicoM68kCPU);
+  m68k_set_context(&PicoCpuMM68k);
   SekCycleCnt+=m68k_execute(cyc_do);
+#elif defined(EMU_F68K)
+  g_m68kcontext=&PicoCpuFM68k;
+  SekCycleCnt+=fm68k_emulate(cyc_do, 0, 0);
 #endif
 }
 
@@ -102,27 +88,38 @@ static __inline void SekRunS68k(int cyc)
 {
   int cyc_do;
   SekCycleAimS68k+=cyc;
-  if((cyc_do=SekCycleAimS68k-SekCycleCntS68k) < 0) return;
-#if defined(EMU_C68K)
-  PicoCpuS68k.cycles=cyc_do;
-  CycloneRun(&PicoCpuS68k);
-  SekCycleCntS68k+=cyc_do-PicoCpuS68k.cycles;
+  if ((cyc_do=SekCycleAimS68k-SekCycleCntS68k) <= 0) return;
+#if defined(EMU_CORE_DEBUG)
+  SekCycleCntS68k+=CM_compareRun(cyc_do, 1);
+#elif defined(EMU_C68K)
+  PicoCpuCS68k.cycles=cyc_do;
+  CycloneRun(&PicoCpuCS68k);
+  SekCycleCntS68k+=cyc_do-PicoCpuCS68k.cycles;
 #elif defined(EMU_M68K)
-  m68k_set_context(&PicoS68kCPU);
+  m68k_set_context(&PicoCpuMS68k);
   SekCycleCntS68k+=m68k_execute(cyc_do);
+#elif defined(EMU_F68K)
+  g_m68kcontext=&PicoCpuFS68k;
+  SekCycleCntS68k+=fm68k_emulate(cyc_do, 0, 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, 0);
+}
 #else
 static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
 {
   int cycn, cycn_s68k, cyc_do;
-  int ex;
   SekCycleAim+=cyc_m68k;
   SekCycleAimS68k+=cyc_s68k;
 
@@ -132,26 +129,31 @@ static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
   /* loop 488 downto 0 in steps of PS_STEP */
   for (cycn = (488<<16)-PS_STEP_M68K; cycn >= 0; cycn -= PS_STEP_M68K)
   {
-    ex = 0;
     cycn_s68k = (cycn + cycn/2 + cycn/8) >> 16;
     if ((cyc_do = SekCycleAim-SekCycleCnt-(cycn>>16)) > 0) {
 #if defined(EMU_C68K)
-      PicoCpu.cycles = cyc_do;
-      CycloneRun(&PicoCpu);
-      SekCycleCnt += cyc_do - PicoCpu.cycles;
+      PicoCpuCM68k.cycles = cyc_do;
+      CycloneRun(&PicoCpuCM68k);
+      SekCycleCnt += cyc_do - PicoCpuCM68k.cycles;
 #elif defined(EMU_M68K)
-      m68k_set_context(&PicoM68kCPU);
-      SekCycleCnt += (ex = m68k_execute(cyc_do));
+      m68k_set_context(&PicoCpuMM68k);
+      SekCycleCnt += m68k_execute(cyc_do);
+#elif defined(EMU_F68K)
+      g_m68kcontext = &PicoCpuFM68k;
+      SekCycleCnt += fm68k_emulate(cyc_do, 0, 0);
 #endif
     }
     if ((cyc_do = SekCycleAimS68k-SekCycleCntS68k-cycn_s68k) > 0) {
 #if defined(EMU_C68K)
-      PicoCpuS68k.cycles = cyc_do;
-      CycloneRun(&PicoCpuS68k);
-      SekCycleCntS68k += cyc_do - PicoCpuS68k.cycles;
+      PicoCpuCS68k.cycles = cyc_do;
+      CycloneRun(&PicoCpuCS68k);
+      SekCycleCntS68k += cyc_do - PicoCpuCS68k.cycles;
 #elif defined(EMU_M68K)
-      m68k_set_context(&PicoS68kCPU);
-      SekCycleCntS68k += (ex = m68k_execute(cyc_do));
+      m68k_set_context(&PicoCpuMS68k);
+      SekCycleCntS68k += m68k_execute(cyc_do);
+#elif defined(EMU_F68K)
+      g_m68kcontext = &PicoCpuFS68k;
+      SekCycleCntS68k += fm68k_emulate(cyc_do, 0, 0);
 #endif
     }
   }
@@ -225,10 +227,10 @@ static __inline void update_chips(void)
 
 static __inline void getSamples(int y)
 {
-  int len = sound_render(0, PsndLen);
+  int len = PsndRender(0, PsndLen);
   if (PicoWriteSound) PicoWriteSound(len);
   // clear sound buffer
-  sound_clear();
+  PsndClear();
 }
 
 
@@ -236,14 +238,12 @@ static __inline void getSamples(int y)
 #include "../PicoFrameHints.c"
 
 
-PICO_INTERNAL int PicoFrameMCD(void)
+PICO_INTERNAL void PicoFrameMCD(void)
 {
-  if(!(PicoOpt&0x10))
+  if (!(PicoOpt&POPT_ALT_RENDERER))
     PicoFrameStart();
 
   PicoFrameHints();
-
-  return 0;
 }