port to updated Cyclone, debug menu

[picodrive.git] / Pico / sound / sound.c

diff --git a/Pico/sound/sound.c b/Pico/sound/sound.c
index cc36a44..c0b3252 100644 (file)
--- a/Pico/sound/sound.c
+++ b/Pico/sound/sound.c
@@ -109,13 +109,14 @@ static void dac_recalculate()
 \r
 void sound_reset()\r
 {\r
-  extern int z80stopCycle;\r
   void *ym2612_regs;\r
 \r
   // also clear the internal registers+addr line\r
   ym2612_regs = YM2612GetRegs();\r
   memset(ym2612_regs, 0, 0x200+4);\r
-  z80stopCycle = 0;\r
+  // setting these to 0 might confuse timing code,\r
+  // so better set to something like this instead\r
+  z80startCycle = z80stopCycle = 0x01000000;\r
 \r
   sound_rerate(0);\r
 }\r
@@ -462,11 +463,11 @@ void z80_exit()
 #endif\r
 }\r
 \r
-#if defined(__DEBUG_PRINT) || defined(WIN32)\r
+#if defined(__DEBUG_PRINT) || defined(__GP2X__)\r
 void z80_debug(char *dstr)\r
 {\r
 #if defined(_USE_DRZ80)\r
-  sprintf(dstr, "%sZ80 state: PC: %04x SP: %04x\n", dstr, drZ80.Z80PC-drZ80.Z80PC_BASE, drZ80.Z80SP-drZ80.Z80SP_BASE);\r
+  sprintf(dstr, "Z80 state: PC: %04x SP: %04x\n", drZ80.Z80PC-drZ80.Z80PC_BASE, drZ80.Z80SP-drZ80.Z80SP_BASE);\r
 #endif\r
 }\r
 #endif\r