-// This is part of Pico Library\r
-\r
-// (c) Copyright 2004 Dave, 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
+ * PicoDrive\r
+ * (c) Copyright Dave, 2004\r
+ * (C) notaz, 2006-2009\r
+ *\r
+ * This work is licensed under the terms of MAME license.\r
+ * See COPYING file in the top-level directory.\r
+ */\r
\r
#include <string.h>\r
#include "ym2612.h"\r
#include "../cd/pcm.h"\r
#include "mix.h"\r
\r
+#define SIMPLE_WRITE_SOUND 0\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
+static int PsndBuffer[2*(44100+100)/50];\r
\r
// dac\r
static unsigned short dac_info[312+4]; // pppppppp ppppllll, p - pos in buff, l - length to write for this sample\r
\r
PICO_INTERNAL void PsndReset(void)\r
{\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
- timers_reset();\r
-\r
+ // PsndRerate calls YM2612Init, which also resets\r
PsndRerate(0);\r
+ timers_reset();\r
}\r
\r
\r
\r
// not all rates are supported in MCD mode due to mp3 decoder limitations\r
if (PicoAHW & PAHW_MCD) {\r
- if (PsndRate != 11025 && PsndRate != 22050 && PsndRate != 44100) PsndRate = 22050;\r
+ if (!(11025-100 <= PsndRate && PsndRate <= 11025+100) &&\r
+ !(22050-100 <= PsndRate && PsndRate <= 22050+100) &&\r
+ !(44100-100 <= PsndRate && PsndRate <= 44100+100))\r
+ PsndRate = 22050;\r
PicoOpt |= POPT_EN_STEREO; // force stereo\r
}\r
\r
if (preserve_state) {\r
- state = malloc(0x200);\r
+ state = malloc(0x204);\r
if (state == NULL) return;\r
- memcpy(state, YM2612GetRegs(), 0x200);\r
+ ym2612_pack_state();\r
+ memcpy(state, YM2612GetRegs(), 0x204);\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
+ memcpy(YM2612GetRegs(), state, 0x204);\r
ym2612_unpack_state();\r
if ((PicoAHW & PAHW_MCD) && !(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))\r
cdda_start_play();\r
int dout = ym2612.dacout;\r
int line_from = PsndDacLine;\r
\r
+ if (line_to >= 312)\r
+ line_to = 311;\r
+\r
PsndDacLine = line_to + 1;\r
\r
pos =dac_info[line_from]>>4;\r
\r
static void cdda_raw_update(int *buffer, int length)\r
{\r
- int ret, cdda_bytes;\r
- if (cdda_stream == NULL) return;\r
+ int ret, cdda_bytes, mult = 1;\r
+ if (cdda_stream == NULL)\r
+ return;\r
\r
cdda_bytes = length*4;\r
- if (PsndRate <= 22050) cdda_bytes *= 2;\r
- if (PsndRate < 22050) cdda_bytes *= 2;\r
+ if (PsndRate <= 22050 + 100) mult = 2;\r
+ if (PsndRate < 22050 - 100) mult = 4;\r
+ cdda_bytes *= mult;\r
\r
ret = pm_read(cdda_out_buffer, cdda_bytes, cdda_stream);\r
if (ret < cdda_bytes) {\r
}\r
\r
// now mix\r
- switch (PsndRate) {\r
- case 44100: mix_16h_to_32(buffer, cdda_out_buffer, length*2); break;\r
- case 22050: mix_16h_to_32_s1(buffer, cdda_out_buffer, length*2); break;\r
- case 11025: mix_16h_to_32_s2(buffer, cdda_out_buffer, length*2); break;\r
+ switch (mult) {\r
+ case 1: mix_16h_to_32(buffer, cdda_out_buffer, length*2); break;\r
+ case 2: mix_16h_to_32_s1(buffer, cdda_out_buffer, length*2); break;\r
+ case 4: mix_16h_to_32_s2(buffer, cdda_out_buffer, length*2); break;\r
}\r
}\r
\r
lba_offset += Pico_mcd->TOC.Tracks[index].Offset;\r
\r
// find the actual file for this track\r
- for (i = index; i >= 0; i--)\r
+ for (i = index; i > 0; i--)\r
if (Pico_mcd->TOC.Tracks[i].F != NULL) break;\r
\r
if (Pico_mcd->TOC.Tracks[i].F == NULL) {\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
+ if ((long)out & 2) { *out++ = 0; len--; }\r
memset32((int *) out, 0, len/2);\r
if (len & 1) out[len-1] = 0;\r
}\r
(Pico_mcd->pcm.control & 0x80) && Pico_mcd->pcm.enabled;\r
offset <<= stereo;\r
\r
+ pprof_start(sound);\r
+\r
#if !SIMPLE_WRITE_SOUND\r
if (offset == 0) { // should happen once per frame\r
// compensate for float part of PsndLen\r
memset32(buf32, 0, length<<stereo);\r
\r
//printf("active_chs: %02x\n", buf32_updated);\r
+ (void)buf32_updated;\r
\r
// CD: PCM sound\r
if (do_pcm) {\r
cdda_raw_update(buf32, length);\r
}\r
\r
+ if ((PicoAHW & PAHW_32X) && (PicoOpt & POPT_EN_PWM))\r
+ p32x_pwm_update(buf32, length, stereo);\r
+\r
// convert + limit to normal 16bit output\r
PsndMix_32_to_16l(PsndOut+offset, buf32, length);\r
\r
+ pprof_end(sound);\r
+\r
return length;\r
}\r
\r
#if SIMPLE_WRITE_SOUND\r
if (y != 224) return;\r
PsndRender(0, PsndLen);\r
- if (PicoWriteSound) PicoWriteSound(PsndLen);\r
+ if (PicoWriteSound)\r
+ PicoWriteSound(PsndLen * ((PicoOpt & POPT_EN_STEREO) ? 4 : 2));\r
PsndClear();\r
#else\r
static int curr_pos = 0;\r
if (emustatus & 2)\r
curr_pos += PsndRender(curr_pos, PsndLen-PsndLen/2);\r
else curr_pos = PsndRender(0, PsndLen);\r
- if (emustatus&1) emustatus|=2; else emustatus&=~2;\r
- if (PicoWriteSound) PicoWriteSound(curr_pos);\r
+ if (emustatus & 1)\r
+ emustatus |= 2;\r
+ else emustatus &= ~2;\r
+ if (PicoWriteSound)\r
+ PicoWriteSound(curr_pos * ((PicoOpt & POPT_EN_STEREO) ? 4 : 2));\r
// clear sound buffer\r
PsndClear();\r
}\r
#endif\r
}\r
\r
-\r
-// -----------------------------------------------------------------\r
-// z80 stuff\r
-\r
-#ifdef _USE_MZ80\r
-\r
-// memhandlers for mz80 core\r
-unsigned char mz80_read(UINT32 a, struct MemoryReadByte *w) { return z80_read(a); }\r
-void mz80_write(UINT32 a, UINT8 d, struct MemoryWriteByte *w) { z80_write(d, a); }\r
-\r
-// structures for mz80 core\r
-static struct MemoryReadByte mz80_mem_read[]=\r
-{\r
- {0x0000,0xffff,mz80_read},\r
- {(UINT32) -1,(UINT32) -1,NULL}\r
-};\r
-static struct MemoryWriteByte mz80_mem_write[]=\r
-{\r
- {0x0000,0xffff,mz80_write},\r
- {(UINT32) -1,(UINT32) -1,NULL}\r
-};\r
-static struct z80PortRead mz80_io_read[] ={\r
- {(UINT16) -1,(UINT16) -1,NULL}\r
-};\r
-static struct z80PortWrite mz80_io_write[]={\r
- {(UINT16) -1,(UINT16) -1,NULL}\r
-};\r
-\r
-int mz80_run(int cycles)\r
+PICO_INTERNAL void PsndGetSamplesMS(void)\r
{\r
- int ticks_pre = mz80GetElapsedTicks(0);\r
- mz80exec(cycles);\r
- return mz80GetElapsedTicks(0) - ticks_pre;\r
-}\r
-\r
-#endif\r
-\r
-#ifdef _USE_DRZ80\r
-\r
-struct DrZ80 drZ80;\r
-\r
-static unsigned int DrZ80_rebasePC(unsigned short a)\r
-{\r
- drZ80.Z80PC_BASE = (unsigned int) Pico.zram;\r
- return drZ80.Z80PC_BASE + a;\r
-}\r
-\r
-static unsigned int DrZ80_rebaseSP(unsigned short a)\r
-{\r
- drZ80.Z80SP_BASE = (unsigned int) Pico.zram;\r
- return drZ80.Z80SP_BASE + a;\r
-}\r
-#endif\r
-\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 z80_out(unsigned short p,unsigned char d)\r
-{\r
- elprintf(EL_ANOMALY, "Z80 port %04x write %02x", p, d);\r
-}\r
-#endif\r
-\r
-\r
-// z80 functionality wrappers\r
-PICO_INTERNAL void z80_init(void)\r
-{\r
-#ifdef _USE_MZ80\r
- struct mz80context z80;\r
-\r
- // z80\r
- mz80init();\r
- // Modify the default context\r
- mz80GetContext(&z80);\r
-\r
- // point mz80 stuff\r
- z80.z80Base=Pico.zram;\r
- z80.z80MemRead=mz80_mem_read;\r
- z80.z80MemWrite=mz80_mem_write;\r
- z80.z80IoRead=mz80_io_read;\r
- z80.z80IoWrite=mz80_io_write;\r
-\r
- mz80SetContext(&z80);\r
-#endif\r
-#ifdef _USE_DRZ80\r
- memset(&drZ80, 0, sizeof(struct DrZ80));\r
- drZ80.z80_rebasePC=DrZ80_rebasePC;\r
- drZ80.z80_rebaseSP=DrZ80_rebaseSP;\r
- drZ80.z80_read8 =z80_read;\r
- drZ80.z80_read16 =NULL;\r
- drZ80.z80_write8 =z80_write;\r
- drZ80.z80_write16 =NULL;\r
- drZ80.z80_in =z80_in;\r
- drZ80.z80_out =z80_out;\r
- drZ80.z80_irq_callback=NULL;\r
-#endif\r
-#ifdef _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
-PICO_INTERNAL void z80_reset(void)\r
-{\r
-#ifdef _USE_MZ80\r
- mz80reset();\r
-#endif\r
-#ifdef _USE_DRZ80\r
- memset(&drZ80, 0, 0x54);\r
- drZ80.Z80F = (1<<2); // set ZFlag\r
- drZ80.Z80F2 = (1<<2); // set ZFlag\r
- drZ80.Z80IX = 0xFFFF << 16;\r
- drZ80.Z80IY = 0xFFFF << 16;\r
- drZ80.Z80IM = 0; // 1?\r
- drZ80.z80irqvector = 0xff0000; // RST 38h\r
- drZ80.Z80PC = drZ80.z80_rebasePC(0);\r
- drZ80.Z80SP = drZ80.z80_rebaseSP(0x2000); // 0xf000 ?\r
-#endif\r
-#ifdef _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
-#if 0\r
-static int had_irq = 0, z80_ppc, z80_ops_done = 0;\r
-int z80_cycles_left = 0;\r
-\r
-void z80_int(void)\r
-{\r
- had_irq = 1;\r
-}\r
-\r
-static void xfail(void)\r
-{\r
- printf("PC: %04x, %04x\n", Cz80_Get_Reg(&CZ80, CZ80_PC), z80_ppc);\r
- printf("z80_ops_done done: %i\n", z80_ops_done);\r
- exit(1);\r
-}\r
-\r
-int z80_run(int cycles)\r
-{\r
- int fail = 0;\r
- int cdrz, ccz;\r
-\r
- z80_cycles_left = cycles;\r
- z80_ppc = Cz80_Get_Reg(&CZ80, CZ80_PC);\r
-\r
- if (had_irq) {\r
- printf("irq @ %04x\n", Cz80_Get_Reg(&CZ80, CZ80_PC));\r
- Cz80_Set_IRQ(&CZ80, 0, HOLD_LINE);\r
- drZ80.Z80_IRQ = 1;\r
- had_irq = 0;\r
- }\r
-\r
- while (z80_cycles_left > 0)\r
- {\r
- ccz = Cz80_Exec(&CZ80, 1);\r
- cdrz = 1 - DrZ80Run(&drZ80, 1);\r
-\r
- if (drZ80.Z80_IRQ && (drZ80.Z80IF&1))\r
- cdrz += 1 - DrZ80Run(&drZ80, 1); // cz80 processes IRQ after EI, DrZ80 does not\r
-\r
- if (cdrz != ccz) {\r
- printf("cycles: %i vs %i\n", cdrz, ccz);\r
- fail = 1;\r
- }\r
-\r
- if (drZ80.Z80PC - drZ80.Z80PC_BASE != Cz80_Get_Reg(&CZ80, CZ80_PC)) {\r
- printf("PC: %04x vs %04x\n", drZ80.Z80PC - drZ80.Z80PC_BASE, Cz80_Get_Reg(&CZ80, CZ80_PC));\r
- fail = 1;\r
- }\r
-\r
- if (fail) xfail();\r
+ int stereo = (PicoOpt & 8) >> 3;\r
+ int length = PsndLen;\r
\r
- z80_ops_done++;\r
- z80_cycles_left -= ccz;\r
- z80_ppc = Cz80_Get_Reg(&CZ80, CZ80_PC);\r
+#if !SIMPLE_WRITE_SOUND\r
+ // compensate for float part of PsndLen\r
+ PsndLen_exc_cnt += PsndLen_exc_add;\r
+ if (PsndLen_exc_cnt >= 0x10000) {\r
+ PsndLen_exc_cnt -= 0x10000;\r
+ length++;\r
}\r
-\r
- return co - z80_cycles_left;\r
-}\r
#endif\r
\r
+ // PSG\r
+ if (PicoOpt & POPT_EN_PSG)\r
+ SN76496Update(PsndOut, length, stereo);\r
\r
-PICO_INTERNAL void z80_pack(unsigned char *data)\r
-{\r
-#if defined(_USE_MZ80)\r
- struct mz80context mz80;\r
- *(int *)data = 0x00005A6D; // "mZ"\r
- mz80GetContext(&mz80);\r
- memcpy(data+4, &mz80.z80clockticks, sizeof(mz80)-5*4); // don't save base&memhandlers\r
-#elif defined(_USE_DRZ80)\r
- *(int *)data = 0x015A7244; // "DrZ" v1\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
-PICO_INTERNAL void z80_unpack(unsigned char *data)\r
-{\r
-#if defined(_USE_MZ80)\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
- mz80SetContext(&mz80);\r
- } else {\r
- z80_reset();\r
- z80_int();\r
- }\r
-#elif defined(_USE_DRZ80)\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.Z80SP = drZ80.z80_rebaseSP(drZ80.Z80SP-drZ80.Z80SP_BASE);\r
- } else {\r
- z80_reset();\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
+ // upmix to "stereo" if needed\r
+ if (stereo) {\r
+ int i, *p;\r
+ for (i = length, p = (void *)PsndOut; i > 0; i--, p++)\r
+ *p |= *p << 16;\r
}\r
-#endif\r
-}\r
\r
-PICO_INTERNAL void z80_exit(void)\r
-{\r
-#if defined(_USE_MZ80)\r
- mz80shutdown();\r
-#endif\r
+ if (PicoWriteSound != NULL)\r
+ PicoWriteSound(length * ((PicoOpt & POPT_EN_STEREO) ? 4 : 2));\r
+ PsndClear();\r
}\r
\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, "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