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

diff --git a/Pico/cd/Pico.c b/Pico/cd/Pico.c
index 02cad9b..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,42 +10,16 @@ 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)
@@ -77,7 +51,7 @@ PICO_INTERNAL int PicoResetMCD(void)
 #endif
 
   // use SRam.data for RAM cart
-  if (PicoOpt&0x8000) {
+  if (PicoOpt&POPT_EN_MCD_RAMCART) {
     if (SRam.data == NULL)
       SRam.data = calloc(1, 0x12000);
   }
@@ -106,7 +80,7 @@ static __inline void SekRunM68k(int cyc)
   SekCycleCnt+=m68k_execute(cyc_do);
 #elif defined(EMU_F68K)
   g_m68kcontext=&PicoCpuFM68k;
-  SekCycleCnt+=fm68k_emulate(cyc_do, 0);
+  SekCycleCnt+=fm68k_emulate(cyc_do, 0, 0);
 #endif
 }
 
@@ -126,7 +100,7 @@ static __inline void SekRunS68k(int cyc)
   SekCycleCntS68k+=m68k_execute(cyc_do);
 #elif defined(EMU_F68K)
   g_m68kcontext=&PicoCpuFS68k;
-  SekCycleCntS68k+=fm68k_emulate(cyc_do, 0);
+  SekCycleCntS68k+=fm68k_emulate(cyc_do, 0, 0);
 #endif
 }
 
@@ -140,7 +114,7 @@ static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
 {
   SekCycleAim+=cyc_m68k;
   SekCycleAimS68k+=cyc_s68k;
-  fm68k_emulate(0, 1);
+  fm68k_emulate(0, 1, 0);
 }
 #else
 static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
@@ -166,7 +140,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, 0);
+      SekCycleCnt += fm68k_emulate(cyc_do, 0, 0);
 #endif
     }
     if ((cyc_do = SekCycleAimS68k-SekCycleCntS68k-cycn_s68k) > 0) {
@@ -179,7 +153,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, 0);
+      SekCycleCntS68k += fm68k_emulate(cyc_do, 0, 0);
 #endif
     }
   }
@@ -264,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;
 }