// 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
\r
\r
#include <string.h>\r
-#include "sound.h"\r
#include "ym2612.h"\r
#include "sn76496.h"\r
\r
-#ifndef __GNUC__\r
-#pragma warning (disable:4244)\r
-#endif\r
-\r
-#if defined(_USE_MZ80)\r
-#include "../../cpu/mz80/mz80.h"\r
-#elif defined(_USE_DRZ80)\r
-#include "../../cpu/DrZ80/drz80.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 z80CycleAim = 0;\r
-\r
// dac\r
-short *dac_out;\r
-unsigned short dac_info[312]; // pppppppp ppppllll, p - pos in buff, l - length to write for this sample\r
+static unsigned short dac_info[312]; // pppppppp ppppllll, p - pos in buff, l - length to write for this sample\r
\r
// for Pico\r
int PsndRate=0;\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
\r
-static void dac_recalculate()\r
+static void dac_recalculate(void)\r
{\r
int i, dac_cnt, pos, len, lines = Pico.m.pal ? 312 : 262, mid = Pico.m.pal ? 68 : 93;\r
\r
}\r
\r
\r
-void sound_reset()\r
+PICO_INTERNAL void PsndReset(void)\r
{\r
- extern int z80stopCycle;\r
void *ym2612_regs;\r
\r
// also clear the internal registers+addr line\r
ym2612_regs = YM2612GetRegs();\r
memset(ym2612_regs, 0, 0x200+4);\r
- z80stopCycle = 0;\r
+ z80startCycle = z80stopCycle = 0;\r
\r
- sound_rerate(0);\r
+ PsndRerate(0);\r
}\r
\r
\r
// to be called after changing sound rate or chips\r
-void sound_rerate(int preserve_state)\r
+void PsndRerate(int preserve_state)\r
{\r
- unsigned int state[28];\r
+ void *state = NULL;\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
- if ((PicoMCD & 1) && Pico_mcd->m.audio_track)\r
+ state = malloc(0x200);\r
+ if (state == NULL) return;\r
+ memcpy(state, YM2612GetRegs(), 0x200);\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
if (preserve_state) {\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
SN76496_init(Pico.m.pal ? OSC_PAL/15 : OSC_NTSC/15, PsndRate);\r
if (preserve_state) memcpy(sn76496_regs, state, 28*4); // restore old state\r
\r
+ if (state)\r
+ free(state);\r
+\r
// calculate PsndLen\r
PsndLen=PsndRate / target_fps;\r
PsndLen_exc_add=((PsndRate - PsndLen*target_fps)<<16) / target_fps;\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
- sound_clear();\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
// This is called once per raster (aka line), but not necessarily for every line\r
-void sound_timers_and_dac(int raster)\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
\r
\r
-void sound_clear(void)\r
+PICO_INTERNAL void PsndClear(void)\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 sound_render(int offset, int length)\r
+PICO_INTERNAL int PsndRender(int offset, int length)\r
{\r
+ int buf32_updated = 0;\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
- YM2612UpdateOne(buf32, length, stereo, 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
+//printf("active_chs: %02x\n", buf32_updated);\r
\r
// CD: PCM sound\r
- if (do_pcm)\r
+ if (do_pcm) {\r
pcm_update(buf32, length, stereo);\r
+ //buf32_updated = 1;\r
+ }\r
\r
// CD: CDDA audio\r
-// if ((PicoMCD & 1) && (PicoOpt & 0x800))\r
-// mp3_update(PsndBuffer+offset, length, stereo);\r
+ // CD mode, cdda enabled, not data track, CDC is reading\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
return drZ80.Z80SP_BASE + a;\r
}\r
\r
-static unsigned char DrZ80_in(unsigned short p)\r
+static void DrZ80_irq_callback()\r
{\r
- return 0xff;\r
+ drZ80.Z80_IRQ = 0; // lower irq when accepted\r
}\r
+#endif\r
\r
-static void DrZ80_out(unsigned short p,unsigned char d)\r
+#if defined(_USE_DRZ80) || defined(_USE_CZ80)\r
+static unsigned char z80_in(unsigned short p)\r
{\r
+ elprintf(EL_ANOMALY, "Z80 port %04x read", p);\r
+ return 0xff;\r
}\r
\r
-static void DrZ80_irq_callback()\r
+static void z80_out(unsigned short p,unsigned char d)\r
{\r
- drZ80.Z80_IRQ = 0; // lower irq when accepted\r
+ elprintf(EL_ANOMALY, "Z80 port %04x write %02x", p, d);\r
}\r
-\r
#endif\r
\r
+\r
// z80 functionality wrappers\r
-void z80_init()\r
+PICO_INTERNAL void z80_init(void)\r
{\r
#if defined(_USE_MZ80)\r
struct mz80context z80;\r
mz80SetContext(&z80);\r
\r
#elif defined(_USE_DRZ80)\r
-\r
memset(&drZ80, 0, sizeof(struct DrZ80));\r
drZ80.z80_rebasePC=DrZ80_rebasePC;\r
drZ80.z80_rebaseSP=DrZ80_rebaseSP;\r
drZ80.z80_read16 =z80_read16;\r
drZ80.z80_write8 =z80_write;\r
drZ80.z80_write16 =z80_write16;\r
- drZ80.z80_in =DrZ80_in;\r
- drZ80.z80_out =DrZ80_out;\r
+ drZ80.z80_in =z80_in;\r
+ drZ80.z80_out =z80_out;\r
drZ80.z80_irq_callback=DrZ80_irq_callback;\r
+\r
+#elif defined(_USE_CZ80)\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); // 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
#endif\r
}\r
\r
-void z80_reset()\r
+PICO_INTERNAL void z80_reset(void)\r
{\r
#if defined(_USE_MZ80)\r
mz80reset();\r
drZ80.Z80IM = 0; // 1?\r
drZ80.Z80PC = drZ80.z80_rebasePC(0);\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
-void z80_resetCycles()\r
-{\r
-#if defined(_USE_MZ80)\r
- mz80GetElapsedTicks(1);\r
-#endif\r
-}\r
-\r
-void z80_int()\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
-#endif\r
-}\r
-\r
-// returns number of cycles actually executed\r
-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
-#else\r
- return cycles;\r
-#endif\r
-}\r
\r
-void z80_pack(unsigned char *data)\r
+PICO_INTERNAL void z80_pack(unsigned char *data)\r
{\r
#if defined(_USE_MZ80)\r
struct mz80context mz80;\r
drZ80.Z80PC = drZ80.z80_rebasePC(drZ80.Z80PC-drZ80.Z80PC_BASE);\r
drZ80.Z80SP = drZ80.z80_rebaseSP(drZ80.Z80SP-drZ80.Z80SP_BASE);\r
memcpy(data+4, &drZ80, 0x54);\r
+#elif defined(_USE_CZ80)\r
+ *(int *)data = 0x00007a43; // "Cz"\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
-void z80_unpack(unsigned char *data)\r
+PICO_INTERNAL void z80_unpack(unsigned char *data)\r
{\r
#if defined(_USE_MZ80)\r
- if(*(int *)data == 0x00005A6D) { // "mZ" save?\r
+ if (*(int *)data == 0x00005A6D) { // "mZ" save?\r
struct mz80context mz80;\r
mz80GetContext(&mz80);\r
memcpy(&mz80.z80clockticks, data+4, sizeof(mz80)-5*4);\r
z80_int();\r
}\r
#elif defined(_USE_DRZ80)\r
- if(*(int *)data == 0x015A7244) { // "DrZ" v1 save?\r
+ if (*(int *)data == 0x015A7244) { // "DrZ" v1 save?\r
memcpy(&drZ80, data+4, 0x54);\r
// update bases\r
drZ80.Z80PC = drZ80.z80_rebasePC(drZ80.Z80PC-drZ80.Z80PC_BASE);\r
drZ80.Z80IM = 1;\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+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
#endif\r
}\r
\r
-void z80_exit()\r
+PICO_INTERNAL void z80_exit(void)\r
{\r
#if defined(_USE_MZ80)\r
mz80shutdown();\r
#endif\r
}\r
\r
-#if defined(__DEBUG_PRINT) || defined(WIN32)\r
-void z80_debug(char *dstr)\r
+#if 1 // defined(__DEBUG_PRINT) || defined(__GP2X__) || defined(__GIZ__)\r
+PICO_INTERNAL void z80_debug(char *dstr)\r
{\r
#if defined(_USE_DRZ80)\r
- sprintf(dstr, "%sZ80 state: PC: %04x SP: %04x\n", dstr, drZ80.Z80PC-drZ80.Z80PC_BASE, drZ80.Z80SP-drZ80.Z80SP_BASE);\r
+ sprintf(dstr, "Z80 state: PC: %04x SP: %04x\n", drZ80.Z80PC-drZ80.Z80PC_BASE, drZ80.Z80SP-drZ80.Z80SP_BASE);\r
+#elif defined(_USE_CZ80)\r
+ sprintf(dstr, "Z80 state: PC: %04x SP: %04x\n", CZ80.PC - CZ80.BasePC, CZ80.SP.W);\r
#endif\r
}\r
#endif\r
notaz.gp2x.de / picodrive.git / blobdiff