// This is part of Pico Library\r
\r
// (c) Copyright 2004 Dave, All rights reserved.\r
-// (c) Copyright 2006 notaz, All rights reserved.\r
+// (c) Copyright 2006,2007 notaz, All rights reserved.\r
// Free for non-commercial use.\r
\r
// For commercial use, separate licencing terms must be obtained.\r
#include "ym2612.h"\r
#include "sn76496.h"\r
\r
-#if defined(_USE_MZ80)\r
-#include "../../cpu/mz80/mz80.h"\r
-#elif defined(_USE_DRZ80)\r
-#include "../../cpu/DrZ80/drz80.h"\r
-#elif defined(_USE_CZ80)\r
-#include "../../cpu/cz80/cz80.h"\r
-#endif\r
-\r
#include "../PicoInt.h"\r
#include "../cd/pcm.h"\r
#include "mix.h"\r
\r
+void (*PsndMix_32_to_16l)(short *dest, int *src, int count) = mix_32_to_16l_stereo;\r
+\r
// master int buffer to mix to\r
static int PsndBuffer[2*44100/50];\r
\r
int PsndLen_exc_cnt=0;\r
short *PsndOut=NULL; // PCM data buffer\r
\r
-// from ym2612.c\r
-extern int *ym2612_dacen;\r
-extern INT32 *ym2612_dacout;\r
-void YM2612TimerHandler(int c,int cnt);\r
-\r
// sn76496\r
extern int *sn76496_regs;\r
\r
int target_fps = Pico.m.pal ? 50 : 60;\r
\r
// not all rates are supported in MCD mode due to mp3 decoder limitations\r
- if (PicoMCD & 1) {\r
+ if (PicoAHW & PAHW_MCD) {\r
if (PsndRate != 11025 && PsndRate != 22050 && PsndRate != 44100) PsndRate = 22050;\r
- PicoOpt |= 8; // force stereo\r
+ PicoOpt |= POPT_EN_STEREO; // force stereo\r
}\r
\r
if (preserve_state) {\r
state = malloc(0x200);\r
if (state == NULL) return;\r
memcpy(state, YM2612GetRegs(), 0x200);\r
- if ((PicoMCD & 1) && Pico_mcd->m.audio_track)\r
+ if ((PicoAHW & PAHW_MCD) && Pico_mcd->m.audio_track)\r
Pico_mcd->m.audio_offset = mp3_get_offset();\r
}\r
YM2612Init(Pico.m.pal ? OSC_PAL/7 : OSC_NTSC/7, PsndRate);\r
// feed it back it's own registers, just like after loading state\r
memcpy(YM2612GetRegs(), state, 0x200);\r
YM2612PicoStateLoad();\r
- if ((PicoMCD & 1) && Pico_mcd->m.audio_track)\r
+ if ((PicoAHW & PAHW_MCD) && Pico_mcd->m.audio_track)\r
mp3_start_play(Pico_mcd->TOC.Tracks[Pico_mcd->m.audio_track].F, Pico_mcd->m.audio_offset);\r
}\r
\r
// recalculate dac info\r
dac_recalculate();\r
\r
- if (PicoMCD & 1)\r
+ if (PicoAHW & PAHW_MCD)\r
pcm_set_rate(PsndRate);\r
\r
// clear all buffers\r
memset32(PsndBuffer, 0, sizeof(PsndBuffer)/4);\r
if (PsndOut)\r
PsndClear();\r
+\r
+ // set mixer\r
+ PsndMix_32_to_16l = (PicoOpt & POPT_EN_STEREO) ? mix_32_to_16l_stereo : mix_32_to_16_mono;\r
}\r
\r
\r
PICO_INTERNAL void Psnd_timers_and_dac(int raster)\r
{\r
int pos, len;\r
- int do_dac = PsndOut && (PicoOpt&1) && *ym2612_dacen;\r
-// int do_pcm = PsndOut && (PicoMCD&1) && (PicoOpt&0x400);\r
+ int do_dac = PsndOut && (PicoOpt&POPT_EN_FM) && *ym2612_dacen;\r
+// int do_pcm = PsndOut && (PicoAHW&1) && (PicoOpt&0x400);\r
\r
// Our raster lasts 63.61323/64.102564 microseconds (NTSC/PAL)\r
YM2612PicoTick(1);\r
\r
pos>>=4;\r
\r
- if (do_dac) {\r
+ if (do_dac)\r
+ {\r
short *d = PsndOut + pos*2;\r
int dout = *ym2612_dacout;\r
- if(PicoOpt&8) {\r
+ if(PicoOpt&POPT_EN_STEREO) {\r
// some manual loop unrolling here :)\r
d[0] = dout;\r
if (len > 1) {\r
{\r
int len = PsndLen;\r
if (PsndLen_exc_add) len++;\r
- if (PicoOpt & 8) memset32((int *) PsndOut, 0, len); // clear both channels at once\r
- else memset(PsndOut, 0, len<<1);\r
+ if (PicoOpt & POPT_EN_STEREO)\r
+ memset32((int *) PsndOut, 0, len); // assume PsndOut to be aligned\r
+ else {\r
+ short *out = PsndOut;\r
+ if ((int)out & 2) { *out++ = 0; len--; }\r
+ memset32((int *) out, 0, len/2);\r
+ if (len & 1) out[len-1] = 0;\r
+ }\r
}\r
\r
\r
int *buf32 = PsndBuffer+offset;\r
int stereo = (PicoOpt & 8) >> 3;\r
// emulating CD && PCM option enabled && PCM chip on && have enabled channels\r
- int do_pcm = (PicoMCD&1) && (PicoOpt&0x400) && (Pico_mcd->pcm.control & 0x80) && Pico_mcd->pcm.enabled;\r
+ int do_pcm = (PicoAHW & PAHW_MCD) && (PicoOpt&POPT_EN_MCD_PCM) &&\r
+ (Pico_mcd->pcm.control & 0x80) && Pico_mcd->pcm.enabled;\r
offset <<= stereo;\r
\r
+#if !SIMPLE_WRITE_SOUND\r
if (offset == 0) { // should happen once per frame\r
// compensate for float part of PsndLen\r
PsndLen_exc_cnt += PsndLen_exc_add;\r
length++;\r
}\r
}\r
+#endif\r
\r
// PSG\r
- if (PicoOpt & 2)\r
+ if (PicoOpt & POPT_EN_PSG)\r
SN76496Update(PsndOut+offset, length, stereo);\r
\r
// Add in the stereo FM buffer\r
- if (PicoOpt & 1) {\r
+ if (PicoOpt & POPT_EN_FM) {\r
buf32_updated = YM2612UpdateOne(buf32, length, stereo, 1);\r
} else\r
memset32(buf32, 0, length<<stereo);\r
\r
// CD: CDDA audio\r
// CD mode, cdda enabled, not data track, CDC is reading\r
- if ((PicoMCD & 1) && (PicoOpt & 0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))\r
+ if ((PicoAHW & PAHW_MCD) && (PicoOpt & POPT_EN_MCD_CDDA) &&\r
+ !(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))\r
mp3_update(buf32, length, stereo);\r
\r
// convert + limit to normal 16bit output\r
- if (stereo)\r
- mix_32_to_16l_stereo(PsndOut+offset, buf32, length);\r
- else mix_32_to_16_mono (PsndOut+offset, buf32, length);\r
+ PsndMix_32_to_16l(PsndOut+offset, buf32, length);\r
\r
return length;\r
}\r
{(UINT16) -1,(UINT16) -1,NULL}\r
};\r
\r
+int mz80_run(int cycles)\r
+{\r
+ int ticks_pre = mz80GetElapsedTicks(0);\r
+ mz80exec(cycles);\r
+ return mz80GetElapsedTicks(0) - ticks_pre;\r
+}\r
+\r
#elif defined(_USE_DRZ80)\r
\r
-static struct DrZ80 drZ80;\r
+struct DrZ80 drZ80;\r
\r
static unsigned int DrZ80_rebasePC(unsigned short a)\r
{\r
memset(&CZ80, 0, sizeof(CZ80));\r
Cz80_Init(&CZ80);\r
Cz80_Set_Fetch(&CZ80, 0x0000, 0x1fff, (UINT32)Pico.zram); // main RAM\r
- Cz80_Set_Fetch(&CZ80, 0x2000, 0x3fff, (UINT32)Pico.zram - 0x2000); // mirror\r
- Cz80_Set_ReadB(&CZ80, (UINT8 (*)(UINT32 address))z80_read);\r
+ Cz80_Set_Fetch(&CZ80, 0x2000, 0x3fff, (UINT32)Pico.zram); // mirror\r
+ Cz80_Set_ReadB(&CZ80, (UINT8 (*)(UINT32 address))z80_read); // unused (hacked in)\r
Cz80_Set_WriteB(&CZ80, z80_write);\r
Cz80_Set_INPort(&CZ80, z80_in);\r
Cz80_Set_OUTPort(&CZ80, z80_out);\r
drZ80.Z80SP = drZ80.z80_rebaseSP(0x2000); // 0xf000 ?\r
#elif defined(_USE_CZ80)\r
Cz80_Reset(&CZ80);\r
+ Cz80_Set_Reg(&CZ80, CZ80_IX, 0xffff);\r
+ Cz80_Set_Reg(&CZ80, CZ80_IY, 0xffff);\r
+ Cz80_Set_Reg(&CZ80, CZ80_SP, 0x2000);\r
#endif\r
Pico.m.z80_fakeval = 0; // for faking when Z80 is disabled\r
}\r
\r
-PICO_INTERNAL void z80_resetCycles(void)\r
-{\r
-#if defined(_USE_MZ80)\r
- mz80GetElapsedTicks(1);\r
-#endif\r
-}\r
-\r
-PICO_INTERNAL void z80_int(void)\r
-{\r
-#if defined(_USE_MZ80)\r
- mz80int(0);\r
-#elif defined(_USE_DRZ80)\r
- drZ80.z80irqvector = 0xFF; // default IRQ vector RST opcode\r
- drZ80.Z80_IRQ = 1;\r
-#elif defined(_USE_CZ80)\r
- Cz80_Set_IRQ(&CZ80, 0, HOLD_LINE);\r
-#endif\r
-}\r
-\r
-// returns number of cycles actually executed\r
-PICO_INTERNAL int z80_run(int cycles)\r
-{\r
-#if defined(_USE_MZ80)\r
- int ticks_pre = mz80GetElapsedTicks(0);\r
- mz80exec(cycles);\r
- return mz80GetElapsedTicks(0) - ticks_pre;\r
-#elif defined(_USE_DRZ80)\r
- return cycles - DrZ80Run(&drZ80, cycles);\r
-#elif defined(_USE_CZ80)\r
- return Cz80_Exec(&CZ80, cycles);\r
-#else\r
- return cycles;\r
-#endif\r
-}\r
\r
PICO_INTERNAL void z80_pack(unsigned char *data)\r
{\r
memcpy(data+4, &drZ80, 0x54);\r
#elif defined(_USE_CZ80)\r
*(int *)data = 0x00007a43; // "Cz"\r
- memcpy(data+4, &CZ80, (INT32)&CZ80.BasePC - (INT32)&CZ80);\r
+ *(int *)(data+4) = Cz80_Get_Reg(&CZ80, CZ80_PC);\r
+ memcpy(data+8, &CZ80, (INT32)&CZ80.BasePC - (INT32)&CZ80);\r
#endif\r
}\r
\r
z80_int(); // try to goto int handler, maybe we won't execute trash there?\r
}\r
#elif defined(_USE_CZ80)\r
- if (*(int *)data == 0x00007a43) // "Cz" save?\r
- memcpy(&CZ80, data+4, (INT32)&CZ80.BasePC - (INT32)&CZ80);\r
- else {\r
+ if (*(int *)data == 0x00007a43) { // "Cz" save?\r
+ memcpy(&CZ80, data+8, (INT32)&CZ80.BasePC - (INT32)&CZ80);\r
+ Cz80_Set_Reg(&CZ80, CZ80_PC, *(int *)(data+4));\r
+ } else {\r
z80_reset();\r
z80_int();\r
}\r