X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=Pico%2Fsound%2Fsound.c;h=fbb81c8902ed98a0cbbda0f4daff8c98f9e3fac3;hb=dca310c413517d278898b967cfe610574310acd8;hp=aa2acb2e4c75e761d3a32a1bbc26a408ed0edb6d;hpb=88b3d7c16ae976d332b8462de839b86f856a7180;p=picodrive.git

diff --git a/Pico/sound/sound.c b/Pico/sound/sound.c
index aa2acb2..fbb81c8 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;
 
@@ -164,6 +153,9 @@ void PsndRerate(int preserve_state)
   memset32(PsndBuffer, 0, sizeof(PsndBuffer)/4);
   if (PsndOut)
     PsndClear();
+
+  // set mixer
+  PsndMix_32_to_16l = (PicoOpt & 8) ? mix_32_to_16l_stereo : mix_32_to_16_mono;
 }
 
 
@@ -254,9 +246,9 @@ PICO_INTERNAL int PsndRender(int offset, int length)
     SN76496Update(PsndOut+offset, length, stereo);
 
   // Add in the stereo FM buffer
-  if (PicoOpt & 1)
+  if (PicoOpt & 1) {
     buf32_updated = YM2612UpdateOne(buf32, length, stereo, 1);
-  else
+  } else
     memset32(buf32, 0, length<<stereo);
 
 //printf("active_chs: %02x\n", buf32_updated);
@@ -273,9 +265,7 @@ PICO_INTERNAL int PsndRender(int offset, int length)
     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;
 }
@@ -306,9 +296,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)
 {
@@ -378,8 +375,8 @@ PICO_INTERNAL void z80_init(void)
   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);
@@ -401,44 +398,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)
 {