X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fsound%2Fsound.c;h=6658548b0b556cc81b3c95fbee6bb6087bd3fff1;hb=602133e1c66666f9152b1edb3014e137a9768cad;hp=1b1269688bbe1402876c43415994c46ea236ac86;hpb=a4221917e147ba303f2cf6c09d12362bf2802084;p=picodrive.git

diff --git a/Pico/sound/sound.c b/Pico/sound/sound.c
index 1b12696..6658548 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,18 +11,12 @@
 #include "ym2612.h"
 #include "sn76496.h"
 
-#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"
 #include "../cd/pcm.h"
 #include "mix.h"
 
+void (*PsndMix_32_to_16l)(short *dest, int *src, int count) = mix_32_to_16l_stereo;
+
 // master int buffer to mix to
 static int PsndBuffer[2*44100/50];
 
@@ -36,11 +30,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;
 
@@ -101,7 +90,7 @@ static void dac_recalculate(void)
 }
 
 
-PICO_INTERNAL void sound_reset(void)
+PICO_INTERNAL void PsndReset(void)
 {
   void *ym2612_regs;
 
@@ -110,27 +99,27 @@ PICO_INTERNAL void sound_reset(void)
   memset(ym2612_regs, 0, 0x200+4);
   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)
 {
   void *state = NULL;
   int target_fps = Pico.m.pal ? 50 : 60;
 
   // not all rates are supported in MCD mode due to mp3 decoder limitations
-  if (PicoMCD & 1) {
+  if (PicoAHW & PAHW_MCD) {
     if (PsndRate != 11025 && PsndRate != 22050 && PsndRate != 44100) PsndRate = 22050;
-    PicoOpt |= 8; // force stereo
+    PicoOpt |= POPT_EN_STEREO; // force stereo
   }
 
   if (preserve_state) {
     state = malloc(0x200);
     if (state == NULL) return;
     memcpy(state, YM2612GetRegs(), 0x200);
-    if ((PicoMCD & 1) && Pico_mcd->m.audio_track)
+    if ((PicoAHW & PAHW_MCD) && Pico_mcd->m.audio_track)
       Pico_mcd->m.audio_offset = mp3_get_offset();
   }
   YM2612Init(Pico.m.pal ? OSC_PAL/7 : OSC_NTSC/7, PsndRate);
@@ -138,7 +127,7 @@ void sound_rerate(int 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)
+    if ((PicoAHW & PAHW_MCD) && Pico_mcd->m.audio_track)
       mp3_start_play(Pico_mcd->TOC.Tracks[Pico_mcd->m.audio_track].F, Pico_mcd->m.audio_offset);
   }
 
@@ -157,22 +146,25 @@ void sound_rerate(int preserve_state)
   // recalculate dac info
   dac_recalculate();
 
-  if (PicoMCD & 1)
+  if (PicoAHW & PAHW_MCD)
     pcm_set_rate(PsndRate);
 
   // clear all buffers
   memset32(PsndBuffer, 0, sizeof(PsndBuffer)/4);
   if (PsndOut)
-    sound_clear();
+    PsndClear();
+
+  // set mixer
+  PsndMix_32_to_16l = (PicoOpt & POPT_EN_STEREO) ? mix_32_to_16l_stereo : mix_32_to_16_mono;
 }
 
 
 // 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;
-//  int do_pcm = PsndOut && (PicoMCD&1) && (PicoOpt&0x400);
+  int do_dac = PsndOut && (PicoOpt&POPT_EN_FM) && *ym2612_dacen;
+//  int do_pcm = PsndOut && (PicoAHW&1) && (PicoOpt&0x400);
 
   // Our raster lasts 63.61323/64.102564 microseconds (NTSC/PAL)
   YM2612PicoTick(1);
@@ -184,10 +176,11 @@ PICO_INTERNAL void sound_timers_and_dac(int raster)
 
   pos>>=4;
 
-  if (do_dac) {
+  if (do_dac)
+  {
     short *d = PsndOut + pos*2;
     int dout = *ym2612_dacout;
-    if(PicoOpt&8) {
+    if(PicoOpt&POPT_EN_STEREO) {
       // some manual loop unrolling here :)
       d[0] = dout;
       if (len > 1) {
@@ -216,24 +209,32 @@ 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 & POPT_EN_STEREO)
+    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;
   int stereo = (PicoOpt & 8) >> 3;
   // emulating CD && PCM option enabled && PCM chip on && have enabled channels
-  int do_pcm = (PicoMCD&1) && (PicoOpt&0x400) && (Pico_mcd->pcm.control & 0x80) && Pico_mcd->pcm.enabled;
+  int do_pcm = (PicoAHW & PAHW_MCD) && (PicoOpt&POPT_EN_MCD_PCM) &&
+		(Pico_mcd->pcm.control & 0x80) && Pico_mcd->pcm.enabled;
   offset <<= stereo;
 
+#if !SIMPLE_WRITE_SOUND
   if (offset == 0) { // should happen once per frame
     // compensate for float part of PsndLen
     PsndLen_exc_cnt += PsndLen_exc_add;
@@ -242,13 +243,14 @@ PICO_INTERNAL int sound_render(int offset, int length)
       length++;
     }
   }
+#endif
 
   // PSG
-  if (PicoOpt & 2)
+  if (PicoOpt & POPT_EN_PSG)
     SN76496Update(PsndOut+offset, length, stereo);
 
   // Add in the stereo FM buffer
-  if (PicoOpt & 1) {
+  if (PicoOpt & POPT_EN_FM) {
     buf32_updated = YM2612UpdateOne(buf32, length, stereo, 1);
   } else
     memset32(buf32, 0, length<<stereo);
@@ -263,13 +265,12 @@ PICO_INTERNAL int sound_render(int offset, int length)
 
   // CD: CDDA audio
   // 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))
+  if ((PicoAHW & PAHW_MCD) && (PicoOpt & POPT_EN_MCD_CDDA) &&
+		!(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))
     mp3_update(buf32, length, stereo);
 
   // convert + limit to normal 16bit output
-  if (stereo)
-       mix_32_to_16l_stereo(PsndOut+offset, buf32, length);
-  else mix_32_to_16_mono   (PsndOut+offset, buf32, length);
+  PsndMix_32_to_16l(PsndOut+offset, buf32, length);
 
   return length;
 }
@@ -300,9 +301,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)
 {
@@ -316,23 +324,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()
 {
-  elprintf(EL_ANOMALY, "Z80 port %04x read", p);
-  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 write %02x", p, d);
+  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)
 {
@@ -361,17 +372,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);
+  Cz80_Set_Fetch(&CZ80, 0x2000, 0x3fff, (UINT32)Pico.zram); // 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
 }
 
@@ -390,44 +403,13 @@ PICO_INTERNAL void z80_reset(void)
   drZ80.Z80SP = drZ80.z80_rebaseSP(0x2000); // 0xf000 ?
 #elif defined(_USE_CZ80)
   Cz80_Reset(&CZ80);
+  Cz80_Set_Reg(&CZ80, CZ80_IX, 0xffff);
+  Cz80_Set_Reg(&CZ80, CZ80_IY, 0xffff);
+  Cz80_Set_Reg(&CZ80, CZ80_SP, 0x2000);
 #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;
-#elif defined(_USE_CZ80)
-  Cz80_Set_IRQ(&CZ80, 0, HOLD_LINE);
-#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);
-#elif defined(_USE_CZ80)
-  return Cz80_Exec(&CZ80, cycles);
-#else
-  return cycles;
-#endif
-}
 
 PICO_INTERNAL void z80_pack(unsigned char *data)
 {
@@ -443,8 +425,8 @@ PICO_INTERNAL void z80_pack(unsigned char *data)
   memcpy(data+4, &drZ80, 0x54);
 #elif defined(_USE_CZ80)
   *(int *)data = 0x00007a43; // "Cz"
-  memcpy(data+4, &CZ80, (INT32)&CZ80.BasePC - (INT32)&CZ80);
-  printf("size: %i (%x)\n", (INT32)&CZ80.BasePC - (INT32)&CZ80, (INT32)&CZ80.BasePC - (INT32)&CZ80); // FIXME rm
+  *(int *)(data+4) = Cz80_Get_Reg(&CZ80, CZ80_PC);
+  memcpy(data+8, &CZ80, (INT32)&CZ80.BasePC - (INT32)&CZ80);
 #endif
 }
 
@@ -472,9 +454,10 @@ PICO_INTERNAL void z80_unpack(unsigned char *data)
     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 {
+  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();
   }