X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fsound%2Fsound.c;h=99500847ccdc359bd2c3b318b98d5655c2d5a3ce;hb=03e4f2a349247334666c87abe3a908df72d23051;hp=c0b32523eefffed3969a79d5ce03a3a4396e9c2a;hpb=0af33fe0ef24a3e3b65217ad0d7aa2db03d16fc1;p=picodrive.git

diff --git a/Pico/sound/sound.c b/Pico/sound/sound.c
index c0b3252..9950084 100644
--- a/Pico/sound/sound.c
+++ b/Pico/sound/sound.c
@@ -8,18 +8,15 @@
 
 
 #include <string.h>
-#include "sound.h"
 #include "ym2612.h"
 #include "sn76496.h"
 
-#ifndef __GNUC__
-#pragma warning (disable:4244)
-#endif
-
 #if defined(_USE_MZ80)
 #include "../../cpu/mz80/mz80.h"
 #elif defined(_USE_DRZ80)
 #include "../../cpu/DrZ80/drz80.h"
+#elif defined(_USE_CZ80)
+#include "../../cpu/cz80/cz80.h"
 #endif
 
 #include "../PicoInt.h"
@@ -29,11 +26,8 @@
 // master int buffer to mix to
 static int PsndBuffer[2*44100/50];
 
-//int z80CycleAim = 0;
-
 // dac
-short *dac_out;
-unsigned short dac_info[312]; // pppppppp ppppllll, p - pos in buff, l - length to write for this sample
+static unsigned short dac_info[312]; // pppppppp ppppllll, p - pos in buff, l - length to write for this sample
 
 // for Pico
 int PsndRate=0;
@@ -51,7 +45,7 @@ void YM2612TimerHandler(int c,int cnt);
 extern int *sn76496_regs;
 
 
-static void dac_recalculate()
+static void dac_recalculate(void)
 {
   int i, dac_cnt, pos, len, lines = Pico.m.pal ? 312 : 262, mid = Pico.m.pal ? 68 : 93;
 
@@ -107,16 +101,14 @@ static void dac_recalculate()
 }
 
 
-void sound_reset()
+PICO_INTERNAL void sound_reset(void)
 {
   void *ym2612_regs;
 
   // also clear the internal registers+addr line
   ym2612_regs = YM2612GetRegs();
   memset(ym2612_regs, 0, 0x200+4);
-  // setting these to 0 might confuse timing code,
-  // so better set to something like this instead
-  z80startCycle = z80stopCycle = 0x01000000;
+  z80startCycle = z80stopCycle = 0;
 
   sound_rerate(0);
 }
@@ -125,7 +117,7 @@ void sound_reset()
 // to be called after changing sound rate or chips
 void sound_rerate(int preserve_state)
 {
-  unsigned int state[28];
+  void *state = NULL;
   int target_fps = Pico.m.pal ? 50 : 60;
 
   // not all rates are supported in MCD mode due to mp3 decoder limitations
@@ -135,12 +127,16 @@ void sound_rerate(int preserve_state)
   }
 
   if (preserve_state) {
+    state = malloc(0x200);
+    if (state == NULL) return;
+    memcpy(state, YM2612GetRegs(), 0x200);
     if ((PicoMCD & 1) && Pico_mcd->m.audio_track)
       Pico_mcd->m.audio_offset = mp3_get_offset();
   }
   YM2612Init(Pico.m.pal ? OSC_PAL/7 : OSC_NTSC/7, PsndRate);
   if (preserve_state) {
     // feed it back it's own registers, just like after loading state
+    memcpy(YM2612GetRegs(), state, 0x200);
     YM2612PicoStateLoad();
     if ((PicoMCD & 1) && Pico_mcd->m.audio_track)
       mp3_start_play(Pico_mcd->TOC.Tracks[Pico_mcd->m.audio_track].F, Pico_mcd->m.audio_offset);
@@ -150,6 +146,9 @@ void sound_rerate(int preserve_state)
   SN76496_init(Pico.m.pal ? OSC_PAL/15 : OSC_NTSC/15, PsndRate);
   if (preserve_state) memcpy(sn76496_regs, state, 28*4); // restore old state
 
+  if (state)
+    free(state);
+
   // calculate PsndLen
   PsndLen=PsndRate / target_fps;
   PsndLen_exc_add=((PsndRate - PsndLen*target_fps)<<16) / target_fps;
@@ -169,7 +168,7 @@ void sound_rerate(int preserve_state)
 
 
 // This is called once per raster (aka line), but not necessarily for every line
-void sound_timers_and_dac(int raster)
+PICO_INTERNAL void sound_timers_and_dac(int raster)
 {
   int pos, len;
   int do_dac = PsndOut && (PicoOpt&1) && *ym2612_dacen;
@@ -217,7 +216,7 @@ void sound_timers_and_dac(int raster)
 }
 
 
-void sound_clear(void)
+PICO_INTERNAL void sound_clear(void)
 {
   int len = PsndLen;
   if (PsndLen_exc_add) len++;
@@ -226,7 +225,7 @@ void sound_clear(void)
 }
 
 
-int sound_render(int offset, int length)
+PICO_INTERNAL int sound_render(int offset, int length)
 {
   int  buf32_updated = 0;
   int *buf32 = PsndBuffer+offset;
@@ -263,7 +262,8 @@ int sound_render(int offset, int length)
   }
 
   // CD: CDDA audio
-  if ((PicoMCD & 1) && (PicoOpt & 0x800))
+  // CD mode, cdda enabled, not data track, CDC is reading
+  if ((PicoMCD & 1) && (PicoOpt & 0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))
     mp3_update(buf32, length, stereo);
 
   // convert + limit to normal 16bit output
@@ -318,22 +318,23 @@ static unsigned int DrZ80_rebaseSP(unsigned short a)
 
 static unsigned char DrZ80_in(unsigned short p)
 {
+  elprintf(EL_ANOMALY, "Z80 port %04x read", p);
   return 0xff;
 }
 
 static void DrZ80_out(unsigned short p,unsigned char d)
 {
+  elprintf(EL_ANOMALY, "Z80 port %04x write %02x", p, d);
 }
 
 static void DrZ80_irq_callback()
 {
   drZ80.Z80_IRQ = 0; // lower irq when accepted
 }
-
 #endif
 
 // z80 functionality wrappers
-void z80_init()
+PICO_INTERNAL void z80_init(void)
 {
 #if defined(_USE_MZ80)
   struct mz80context z80;
@@ -353,7 +354,6 @@ void z80_init()
   mz80SetContext(&z80);
 
 #elif defined(_USE_DRZ80)
-
   memset(&drZ80, 0, sizeof(struct DrZ80));
   drZ80.z80_rebasePC=DrZ80_rebasePC;
   drZ80.z80_rebaseSP=DrZ80_rebaseSP;
@@ -364,10 +364,18 @@ void z80_init()
   drZ80.z80_in      =DrZ80_in;
   drZ80.z80_out     =DrZ80_out;
   drZ80.z80_irq_callback=DrZ80_irq_callback;
+
+#elif defined(_USE_CZ80)
+  memset(&CZ80, 0, sizeof(CZ80));
+  Cz80_Init(&CZ80);
+  Cz80_Set_Fetch(&CZ80, 0x0000, 0x1fff, (UINT32)Pico.zram); // main RAM
+  Cz80_Set_Fetch(&CZ80, 0x2000, 0x3fff, (UINT32)Pico.zram - 0x2000); // mirror
+  Cz80_Set_ReadB(&CZ80, (UINT8 (*)(UINT32 address))z80_read);
+  Cz80_Set_WriteB(&CZ80, z80_write);
 #endif
 }
 
-void z80_reset()
+PICO_INTERNAL void z80_reset(void)
 {
 #if defined(_USE_MZ80)
   mz80reset();
@@ -380,29 +388,33 @@ void z80_reset()
   drZ80.Z80IM = 0; // 1?
   drZ80.Z80PC = drZ80.z80_rebasePC(0);
   drZ80.Z80SP = drZ80.z80_rebaseSP(0x2000); // 0xf000 ?
+#elif defined(_USE_CZ80)
+  Cz80_Reset(&CZ80);
 #endif
   Pico.m.z80_fakeval = 0; // for faking when Z80 is disabled
 }
 
-void z80_resetCycles()
+PICO_INTERNAL void z80_resetCycles(void)
 {
 #if defined(_USE_MZ80)
   mz80GetElapsedTicks(1);
 #endif
 }
 
-void z80_int()
+PICO_INTERNAL void z80_int(void)
 {
 #if defined(_USE_MZ80)
   mz80int(0);
 #elif defined(_USE_DRZ80)
   drZ80.z80irqvector = 0xFF; // default IRQ vector RST opcode
   drZ80.Z80_IRQ = 1;
+#elif defined(_USE_CZ80)
+  Cz80_Set_IRQ(&CZ80, 0, HOLD_LINE);
 #endif
 }
 
 // returns number of cycles actually executed
-int z80_run(int cycles)
+PICO_INTERNAL int z80_run(int cycles)
 {
 #if defined(_USE_MZ80)
   int ticks_pre = mz80GetElapsedTicks(0);
@@ -410,12 +422,14 @@ int z80_run(int cycles)
   return mz80GetElapsedTicks(0) - ticks_pre;
 #elif defined(_USE_DRZ80)
   return cycles - DrZ80Run(&drZ80, cycles);
+#elif defined(_USE_CZ80)
+  return Cz80_Exec(&CZ80, cycles);
 #else
   return cycles;
 #endif
 }
 
-void z80_pack(unsigned char *data)
+PICO_INTERNAL void z80_pack(unsigned char *data)
 {
 #if defined(_USE_MZ80)
   struct mz80context mz80;
@@ -427,13 +441,16 @@ void z80_pack(unsigned char *data)
   drZ80.Z80PC = drZ80.z80_rebasePC(drZ80.Z80PC-drZ80.Z80PC_BASE);
   drZ80.Z80SP = drZ80.z80_rebaseSP(drZ80.Z80SP-drZ80.Z80SP_BASE);
   memcpy(data+4, &drZ80, 0x54);
+#elif defined(_USE_CZ80)
+  *(int *)data = 0x00007a43; // "Cz"
+  memcpy(data+4, &CZ80, (INT32)&CZ80.BasePC - (INT32)&CZ80);
 #endif
 }
 
-void z80_unpack(unsigned char *data)
+PICO_INTERNAL void z80_unpack(unsigned char *data)
 {
 #if defined(_USE_MZ80)
-  if(*(int *)data == 0x00005A6D) { // "mZ" save?
+  if (*(int *)data == 0x00005A6D) { // "mZ" save?
     struct mz80context mz80;
     mz80GetContext(&mz80);
     memcpy(&mz80.z80clockticks, data+4, sizeof(mz80)-5*4);
@@ -443,7 +460,7 @@ void z80_unpack(unsigned char *data)
     z80_int();
   }
 #elif defined(_USE_DRZ80)
-  if(*(int *)data == 0x015A7244) { // "DrZ" v1 save?
+  if (*(int *)data == 0x015A7244) { // "DrZ" v1 save?
     memcpy(&drZ80, data+4, 0x54);
     // update bases
     drZ80.Z80PC = drZ80.z80_rebasePC(drZ80.Z80PC-drZ80.Z80PC_BASE);
@@ -453,21 +470,30 @@ void z80_unpack(unsigned char *data)
     drZ80.Z80IM = 1;
     z80_int(); // try to goto int handler, maybe we won't execute trash there?
   }
+#elif defined(_USE_CZ80)
+  if (*(int *)data == 0x00007a43) // "Cz" save?
+    memcpy(&CZ80, data+4, (INT32)&CZ80.BasePC - (INT32)&CZ80);
+  else {
+    z80_reset();
+    z80_int();
+  }
 #endif
 }
 
-void z80_exit()
+PICO_INTERNAL void z80_exit(void)
 {
 #if defined(_USE_MZ80)
   mz80shutdown();
 #endif
 }
 
-#if defined(__DEBUG_PRINT) || defined(__GP2X__)
-void z80_debug(char *dstr)
+#if 1 // defined(__DEBUG_PRINT) || defined(__GP2X__) || defined(__GIZ__)
+PICO_INTERNAL void z80_debug(char *dstr)
 {
 #if defined(_USE_DRZ80)
   sprintf(dstr, "Z80 state: PC: %04x SP: %04x\n", drZ80.Z80PC-drZ80.Z80PC_BASE, drZ80.Z80SP-drZ80.Z80SP_BASE);
+#elif defined(_USE_CZ80)
+  sprintf(dstr, "Z80 state: PC: %04x SP: %04x\n", CZ80.PC - CZ80.BasePC, CZ80.SP.W);
 #endif
 }
 #endif