X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fsound%2Fsound.c;h=d901a1dce8f210360d99ec6eafb9a3ee853c6c83;hb=b542be4686241c9e0722ff8e452980f9ac2b4d7c;hp=6a45033284dfc98ae35373841f7747c878ef47f3;hpb=eff55556cff77fd64cff4be32e449e0a58aed6fe;p=picodrive.git

diff --git a/Pico/sound/sound.c b/Pico/sound/sound.c
index 6a45033..d901a1d 100644
--- a/Pico/sound/sound.c
+++ b/Pico/sound/sound.c
@@ -1,7 +1,7 @@
 // This is part of Pico Library
 
 // (c) Copyright 2004 Dave, All rights reserved.
-// (c) Copyright 2006 notaz, All rights reserved.
+// (c) Copyright 2006,2007 notaz, All rights reserved.
 // Free for non-commercial use.
 
 // For commercial use, separate licencing terms must be obtained.
@@ -11,12 +11,6 @@
 #include "ym2612.h"
 #include "sn76496.h"
 
-#if defined(_USE_MZ80)
-#include "../../cpu/mz80/mz80.h"
-#elif defined(_USE_DRZ80)
-#include "../../cpu/DrZ80/drz80.h"
-#endif
-
 #include "../PicoInt.h"
 #include "../cd/pcm.h"
 #include "mix.h"
@@ -34,11 +28,6 @@ int PsndLen_exc_add=0; // this is for non-integer sample counts per line, eg. 22
 int PsndLen_exc_cnt=0;
 short *PsndOut=NULL; // PCM data buffer
 
-// from ym2612.c
-extern int   *ym2612_dacen;
-extern INT32 *ym2612_dacout;
-void YM2612TimerHandler(int c,int cnt);
-
 // sn76496
 extern int *sn76496_regs;
 
@@ -99,25 +88,23 @@ static void dac_recalculate(void)
 }
 
 
-PICO_INTERNAL void sound_reset(void)
+PICO_INTERNAL void PsndReset(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);
+  PsndRerate(0);
 }
 
 
 // to be called after changing sound rate or chips
-void sound_rerate(int preserve_state)
+void PsndRerate(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
@@ -127,12 +114,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);
@@ -142,6 +133,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;
@@ -156,12 +150,12 @@ void sound_rerate(int preserve_state)
   // clear all buffers
   memset32(PsndBuffer, 0, sizeof(PsndBuffer)/4);
   if (PsndOut)
-    sound_clear();
+    PsndClear();
 }
 
 
 // This is called once per raster (aka line), but not necessarily for every line
-PICO_INTERNAL void sound_timers_and_dac(int raster)
+PICO_INTERNAL void Psnd_timers_and_dac(int raster)
 {
   int pos, len;
   int do_dac = PsndOut && (PicoOpt&1) && *ym2612_dacen;
@@ -209,16 +203,22 @@ PICO_INTERNAL void sound_timers_and_dac(int raster)
 }
 
 
-PICO_INTERNAL void sound_clear(void)
+PICO_INTERNAL void PsndClear(void)
 {
   int len = PsndLen;
   if (PsndLen_exc_add) len++;
-  if (PicoOpt & 8) memset32((int *) PsndOut, 0, len); // clear both channels at once
-  else memset(PsndOut, 0, len<<1);
+  if (PicoOpt & 8)
+    memset32((int *) PsndOut, 0, len); // assume PsndOut to be aligned
+  else {
+    short *out = PsndOut;
+    if ((int)out & 2) { *out++ = 0; len--; }
+    memset32((int *) out, 0, len/2);
+    if (len & 1) out[len-1] = 0;
+  }
 }
 
 
-PICO_INTERNAL int sound_render(int offset, int length)
+PICO_INTERNAL int PsndRender(int offset, int length)
 {
   int  buf32_updated = 0;
   int *buf32 = PsndBuffer+offset;
@@ -255,7 +255,8 @@ PICO_INTERNAL 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
@@ -292,9 +293,16 @@ static struct z80PortWrite mz80_io_write[]={
   {(UINT16) -1,(UINT16) -1,NULL}
 };
 
+int mz80_run(int cycles)
+{
+  int ticks_pre = mz80GetElapsedTicks(0);
+  mz80exec(cycles);
+  return mz80GetElapsedTicks(0) - ticks_pre;
+}
+
 #elif defined(_USE_DRZ80)
 
-static struct DrZ80 drZ80;
+struct DrZ80 drZ80;
 
 static unsigned int DrZ80_rebasePC(unsigned short a)
 {
@@ -308,22 +316,26 @@ static unsigned int DrZ80_rebaseSP(unsigned short a)
   return drZ80.Z80SP_BASE + a;
 }
 
-static unsigned char DrZ80_in(unsigned short p)
+static void DrZ80_irq_callback()
 {
-  return 0xff;
+  drZ80.Z80_IRQ = 0; // lower irq when accepted
 }
+#endif
 
-static void DrZ80_out(unsigned short p,unsigned char d)
+#if defined(_USE_DRZ80) || defined(_USE_CZ80)
+static unsigned char z80_in(unsigned short p)
 {
+  elprintf(EL_ANOMALY, "Z80 port %04x read", p);
+  return 0xff;
 }
 
-static void DrZ80_irq_callback()
+static void z80_out(unsigned short p,unsigned char d)
 {
-  drZ80.Z80_IRQ = 0; // lower irq when accepted
+  elprintf(EL_ANOMALY, "Z80 port %04x write %02x", p, d);
 }
-
 #endif
 
+
 // z80 functionality wrappers
 PICO_INTERNAL void z80_init(void)
 {
@@ -345,7 +357,6 @@ PICO_INTERNAL void z80_init(void)
   mz80SetContext(&z80);
 
 #elif defined(_USE_DRZ80)
-
   memset(&drZ80, 0, sizeof(struct DrZ80));
   drZ80.z80_rebasePC=DrZ80_rebasePC;
   drZ80.z80_rebaseSP=DrZ80_rebaseSP;
@@ -353,9 +364,19 @@ PICO_INTERNAL void z80_init(void)
   drZ80.z80_read16  =z80_read16;
   drZ80.z80_write8  =z80_write;
   drZ80.z80_write16 =z80_write16;
-  drZ80.z80_in      =DrZ80_in;
-  drZ80.z80_out     =DrZ80_out;
+  drZ80.z80_in      =z80_in;
+  drZ80.z80_out     =z80_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); // unused (hacked in)
+  Cz80_Set_WriteB(&CZ80, z80_write);
+  Cz80_Set_INPort(&CZ80, z80_in);
+  Cz80_Set_OUTPort(&CZ80, z80_out);
 #endif
 }
 
@@ -372,40 +393,12 @@ PICO_INTERNAL void z80_reset(void)
   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
 }
 
-PICO_INTERNAL void z80_resetCycles(void)
-{
-#if defined(_USE_MZ80)
-  mz80GetElapsedTicks(1);
-#endif
-}
-
-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;
-#endif
-}
-
-// returns number of cycles actually executed
-PICO_INTERNAL int z80_run(int cycles)
-{
-#if defined(_USE_MZ80)
-  int ticks_pre = mz80GetElapsedTicks(0);
-  mz80exec(cycles);
-  return mz80GetElapsedTicks(0) - ticks_pre;
-#elif defined(_USE_DRZ80)
-  return cycles - DrZ80Run(&drZ80, cycles);
-#else
-  return cycles;
-#endif
-}
 
 PICO_INTERNAL void z80_pack(unsigned char *data)
 {
@@ -419,13 +412,17 @@ PICO_INTERNAL 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"
+  *(int *)(data+4) = Cz80_Get_Reg(&CZ80, CZ80_PC);
+  memcpy(data+8, &CZ80, (INT32)&CZ80.BasePC - (INT32)&CZ80);
 #endif
 }
 
 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);
@@ -435,7 +432,7 @@ PICO_INTERNAL 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);
@@ -445,6 +442,14 @@ PICO_INTERNAL 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+8, (INT32)&CZ80.BasePC - (INT32)&CZ80);
+    Cz80_Set_Reg(&CZ80, CZ80_PC, *(int *)(data+4));
+  } else {
+    z80_reset();
+    z80_int();
+  }
 #endif
 }
 
@@ -455,11 +460,13 @@ PICO_INTERNAL void z80_exit(void)
 #endif
 }
 
-#if defined(__DEBUG_PRINT) || defined(__GP2X__)
+#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