X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fsound%2Fsound.c;h=b12afc3c25265e87d201269e0662674da5f6ef87;hb=3f23709ef37c5b3511c1445cbed7b447b56a37e0;hp=2b61fc98241f60cae1502f692ea71de905b6b9cf;hpb=d8afe7b8a7f4e5c359a2d347f0dd182575cf66fc;p=picodrive.git diff --git a/pico/sound/sound.c b/pico/sound/sound.c index 2b61fc9..b12afc3 100644 --- a/pico/sound/sound.c +++ b/pico/sound/sound.c @@ -1,23 +1,25 @@ -// This is part of Pico Library - -// (c) Copyright 2004 Dave, 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. - +/* + * PicoDrive + * (c) Copyright Dave, 2004 + * (C) notaz, 2006-2009 + * + * This work is licensed under the terms of MAME license. + * See COPYING file in the top-level directory. + */ #include #include "ym2612.h" #include "sn76496.h" #include "../pico_int.h" -#include "../cd/pcm.h" +#include "../cd/cue.h" #include "mix.h" +#define SIMPLE_WRITE_SOUND 0 + 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]; +static int PsndBuffer[2*(44100+100)/50]; // dac static unsigned short dac_info[312+4]; // pppppppp ppppllll, p - pos in buff, l - length to write for this sample @@ -107,14 +109,9 @@ static void dac_recalculate(void) PICO_INTERNAL void PsndReset(void) { - void *ym2612_regs; - - // also clear the internal registers+addr line - ym2612_regs = YM2612GetRegs(); - memset(ym2612_regs, 0, 0x200+4); - timers_reset(); - + // PsndRerate calls YM2612Init, which also resets PsndRerate(0); + timers_reset(); } @@ -124,12 +121,6 @@ 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 (PicoAHW & PAHW_MCD) { - if (PsndRate != 11025 && PsndRate != 22050 && PsndRate != 44100) PsndRate = 22050; - PicoOpt |= POPT_EN_STEREO; // force stereo - } - if (preserve_state) { state = malloc(0x204); if (state == NULL) return; @@ -160,9 +151,6 @@ void PsndRerate(int preserve_state) // recalculate dac info dac_recalculate(); - if (PicoAHW & PAHW_MCD) - pcm_set_rate(PsndRate); - // clear all buffers memset32(PsndBuffer, 0, sizeof(PsndBuffer)/4); memset(cdda_out_buffer, 0, sizeof(cdda_out_buffer)); @@ -183,6 +171,9 @@ PICO_INTERNAL void PsndDoDAC(int line_to) int dout = ym2612.dacout; int line_from = PsndDacLine; + if (line_to >= 312) + line_to = 311; + PsndDacLine = line_to + 1; pos =dac_info[line_from]>>4; @@ -197,14 +188,6 @@ PICO_INTERNAL void PsndDoDAC(int line_to) short *d = PsndOut + pos; for (; len > 0; len--, d++) *d = dout; } - -#if 0 - if (do_pcm) { - int *d = PsndBuffer; - d += (PicoOpt&8) ? pos*2 : pos; - pcm_update(d, len, 1); - } -#endif } // cdda @@ -212,12 +195,14 @@ static pm_file *cdda_stream = NULL; static void cdda_raw_update(int *buffer, int length) { - int ret, cdda_bytes; - if (cdda_stream == NULL) return; + int ret, cdda_bytes, mult = 1; + if (cdda_stream == NULL) + return; cdda_bytes = length*4; - if (PsndRate <= 22050) cdda_bytes *= 2; - if (PsndRate < 22050) cdda_bytes *= 2; + if (PsndRate <= 22050 + 100) mult = 2; + if (PsndRate < 22050 - 100) mult = 4; + cdda_bytes *= mult; ret = pm_read(cdda_out_buffer, cdda_bytes, cdda_stream); if (ret < cdda_bytes) { @@ -227,10 +212,10 @@ static void cdda_raw_update(int *buffer, int length) } // now mix - switch (PsndRate) { - case 44100: mix_16h_to_32(buffer, cdda_out_buffer, length*2); break; - case 22050: mix_16h_to_32_s1(buffer, cdda_out_buffer, length*2); break; - case 11025: mix_16h_to_32_s2(buffer, cdda_out_buffer, length*2); break; + switch (mult) { + case 1: mix_16h_to_32(buffer, cdda_out_buffer, length*2); break; + case 2: mix_16h_to_32_s1(buffer, cdda_out_buffer, length*2); break; + case 4: mix_16h_to_32_s2(buffer, cdda_out_buffer, length*2); break; } } @@ -247,7 +232,7 @@ PICO_INTERNAL void cdda_start_play(void) lba_offset += Pico_mcd->TOC.Tracks[index].Offset; // find the actual file for this track - for (i = index; i >= 0; i--) + for (i = index; i > 0; i--) if (Pico_mcd->TOC.Tracks[i].F != NULL) break; if (Pico_mcd->TOC.Tracks[i].F == NULL) { @@ -255,7 +240,7 @@ PICO_INTERNAL void cdda_start_play(void) return; } - if (Pico_mcd->TOC.Tracks[i].ftype == TYPE_MP3) + if (Pico_mcd->TOC.Tracks[i].ftype == CT_MP3) { int pos1024 = 0; @@ -275,7 +260,7 @@ PICO_INTERNAL void cdda_start_play(void) cdda_stream = Pico_mcd->TOC.Tracks[i].F; PicoCDBufferFlush(); // buffering relies on fp not being touched pm_seek(cdda_stream, lba_offset * 2352, SEEK_SET); - if (Pico_mcd->TOC.Tracks[i].ftype == TYPE_WAV) + if (Pico_mcd->TOC.Tracks[i].ftype == CT_WAV) { // skip headers, assume it's 44kHz stereo uncompressed pm_seek(cdda_stream, 44, SEEK_CUR); @@ -291,7 +276,7 @@ PICO_INTERNAL void PsndClear(void) memset32((int *) PsndOut, 0, len); // assume PsndOut to be aligned else { short *out = PsndOut; - if ((int)out & 2) { *out++ = 0; len--; } + if ((long)out & 2) { *out++ = 0; len--; } memset32((int *) out, 0, len/2); if (len & 1) out[len-1] = 0; } @@ -303,11 +288,11 @@ static 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 = (PicoAHW & PAHW_MCD) && (PicoOpt&POPT_EN_MCD_PCM) && - (Pico_mcd->pcm.control & 0x80) && Pico_mcd->pcm.enabled; + offset <<= stereo; + pprof_start(sound); + #if !SIMPLE_WRITE_SOUND if (offset == 0) { // should happen once per frame // compensate for float part of PsndLen @@ -335,10 +320,11 @@ static int PsndRender(int offset, int length) memset32(buf32, 0, length<scd.Cur_Track - 1; - if (Pico_mcd->TOC.Tracks[index].ftype == TYPE_MP3) + if (Pico_mcd->TOC.Tracks[index].ftype == CT_MP3) mp3_update(buf32, length, stereo); else cdda_raw_update(buf32, length); } + if ((PicoAHW & PAHW_32X) && (PicoOpt & POPT_EN_PWM)) + p32x_pwm_update(buf32, length, stereo); + // convert + limit to normal 16bit output PsndMix_32_to_16l(PsndOut+offset, buf32, length); + pprof_end(sound); + return length; } @@ -368,7 +359,8 @@ PICO_INTERNAL void PsndGetSamples(int y) #if SIMPLE_WRITE_SOUND if (y != 224) return; PsndRender(0, PsndLen); - if (PicoWriteSound) PicoWriteSound(PsndLen); + if (PicoWriteSound) + PicoWriteSound(PsndLen * ((PicoOpt & POPT_EN_STEREO) ? 4 : 2)); PsndClear(); #else static int curr_pos = 0; @@ -378,8 +370,11 @@ PICO_INTERNAL void PsndGetSamples(int y) if (emustatus & 2) curr_pos += PsndRender(curr_pos, PsndLen-PsndLen/2); else curr_pos = PsndRender(0, PsndLen); - if (emustatus&1) emustatus|=2; else emustatus&=~2; - if (PicoWriteSound) PicoWriteSound(curr_pos); + if (emustatus & 1) + emustatus |= 2; + else emustatus &= ~2; + if (PicoWriteSound) + PicoWriteSound(curr_pos * ((PicoOpt & POPT_EN_STEREO) ? 4 : 2)); // clear sound buffer PsndClear(); } @@ -391,271 +386,33 @@ PICO_INTERNAL void PsndGetSamples(int y) #endif } - -// ----------------------------------------------------------------- -// z80 stuff - -#ifdef _USE_MZ80 - -// memhandlers for mz80 core -unsigned char mz80_read(UINT32 a, struct MemoryReadByte *w) { return z80_read(a); } -void mz80_write(UINT32 a, UINT8 d, struct MemoryWriteByte *w) { z80_write(d, a); } - -// structures for mz80 core -static struct MemoryReadByte mz80_mem_read[]= -{ - {0x0000,0xffff,mz80_read}, - {(UINT32) -1,(UINT32) -1,NULL} -}; -static struct MemoryWriteByte mz80_mem_write[]= +PICO_INTERNAL void PsndGetSamplesMS(void) { - {0x0000,0xffff,mz80_write}, - {(UINT32) -1,(UINT32) -1,NULL} -}; -static struct z80PortRead mz80_io_read[] ={ - {(UINT16) -1,(UINT16) -1,NULL} -}; -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; -} - -#endif - -#ifdef _USE_DRZ80 - -struct DrZ80 drZ80; - -static unsigned int DrZ80_rebasePC(unsigned short a) -{ - drZ80.Z80PC_BASE = (unsigned int) Pico.zram; - return drZ80.Z80PC_BASE + a; -} - -static unsigned int DrZ80_rebaseSP(unsigned short a) -{ - drZ80.Z80SP_BASE = (unsigned int) Pico.zram; - return drZ80.Z80SP_BASE + a; -} -#endif - -#if defined(_USE_DRZ80) || defined(_USE_CZ80) -static unsigned char z80_in(unsigned short p) -{ - elprintf(EL_ANOMALY, "Z80 port %04x read", p); - return 0xff; -} - -static void z80_out(unsigned short p,unsigned char d) -{ - elprintf(EL_ANOMALY, "Z80 port %04x write %02x", p, d); -} -#endif - - -// z80 functionality wrappers -PICO_INTERNAL void z80_init(void) -{ -#ifdef _USE_MZ80 - struct mz80context z80; - - // z80 - mz80init(); - // Modify the default context - mz80GetContext(&z80); - - // point mz80 stuff - z80.z80Base=Pico.zram; - z80.z80MemRead=mz80_mem_read; - z80.z80MemWrite=mz80_mem_write; - z80.z80IoRead=mz80_io_read; - z80.z80IoWrite=mz80_io_write; - - mz80SetContext(&z80); -#endif -#ifdef _USE_DRZ80 - memset(&drZ80, 0, sizeof(struct DrZ80)); - drZ80.z80_rebasePC=DrZ80_rebasePC; - drZ80.z80_rebaseSP=DrZ80_rebaseSP; - drZ80.z80_read8 =z80_read; - drZ80.z80_read16 =NULL; - drZ80.z80_write8 =z80_write; - drZ80.z80_write16 =NULL; - drZ80.z80_in =z80_in; - drZ80.z80_out =z80_out; - drZ80.z80_irq_callback=NULL; -#endif -#ifdef _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); // 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 -} - -PICO_INTERNAL void z80_reset(void) -{ -#ifdef _USE_MZ80 - mz80reset(); -#endif -#ifdef _USE_DRZ80 - memset(&drZ80, 0, 0x54); - drZ80.Z80F = (1<<2); // set ZFlag - drZ80.Z80F2 = (1<<2); // set ZFlag - drZ80.Z80IX = 0xFFFF << 16; - drZ80.Z80IY = 0xFFFF << 16; - drZ80.Z80IM = 0; // 1? - drZ80.z80irqvector = 0xff0000; // RST 38h - drZ80.Z80PC = drZ80.z80_rebasePC(0); - drZ80.Z80SP = drZ80.z80_rebaseSP(0x2000); // 0xf000 ? -#endif -#ifdef _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 -} - -#if 0 -static int had_irq = 0, z80_ppc, z80_ops_done = 0; -int z80_cycles_left = 0; - -void z80_int(void) -{ - had_irq = 1; -} - -static void xfail(void) -{ - printf("PC: %04x, %04x\n", Cz80_Get_Reg(&CZ80, CZ80_PC), z80_ppc); - printf("z80_ops_done done: %i\n", z80_ops_done); - exit(1); -} - -int z80_run(int cycles) -{ - int fail = 0; - int cdrz, ccz; - - z80_cycles_left = cycles; - z80_ppc = Cz80_Get_Reg(&CZ80, CZ80_PC); - - if (had_irq) { - printf("irq @ %04x\n", Cz80_Get_Reg(&CZ80, CZ80_PC)); - Cz80_Set_IRQ(&CZ80, 0, HOLD_LINE); - drZ80.Z80_IRQ = 1; - had_irq = 0; - } - - while (z80_cycles_left > 0) - { - ccz = Cz80_Exec(&CZ80, 1); - cdrz = 1 - DrZ80Run(&drZ80, 1); - - if (drZ80.Z80_IRQ && (drZ80.Z80IF&1)) - cdrz += 1 - DrZ80Run(&drZ80, 1); // cz80 processes IRQ after EI, DrZ80 does not - - if (cdrz != ccz) { - printf("cycles: %i vs %i\n", cdrz, ccz); - fail = 1; - } - - if (drZ80.Z80PC - drZ80.Z80PC_BASE != Cz80_Get_Reg(&CZ80, CZ80_PC)) { - printf("PC: %04x vs %04x\n", drZ80.Z80PC - drZ80.Z80PC_BASE, Cz80_Get_Reg(&CZ80, CZ80_PC)); - fail = 1; - } - - if (fail) xfail(); + int stereo = (PicoOpt & 8) >> 3; + int length = PsndLen; - z80_ops_done++; - z80_cycles_left -= ccz; - z80_ppc = Cz80_Get_Reg(&CZ80, CZ80_PC); +#if !SIMPLE_WRITE_SOUND + // compensate for float part of PsndLen + PsndLen_exc_cnt += PsndLen_exc_add; + if (PsndLen_exc_cnt >= 0x10000) { + PsndLen_exc_cnt -= 0x10000; + length++; } - - return co - z80_cycles_left; -} #endif + // PSG + if (PicoOpt & POPT_EN_PSG) + SN76496Update(PsndOut, length, stereo); -PICO_INTERNAL void z80_pack(unsigned char *data) -{ -#if defined(_USE_MZ80) - struct mz80context mz80; - *(int *)data = 0x00005A6D; // "mZ" - mz80GetContext(&mz80); - memcpy(data+4, &mz80.z80clockticks, sizeof(mz80)-5*4); // don't save base&memhandlers -#elif defined(_USE_DRZ80) - *(int *)data = 0x015A7244; // "DrZ" v1 - drZ80.Z80PC = drZ80.z80_rebasePC(drZ80.Z80PC-drZ80.Z80PC_BASE); - drZ80.Z80SP = drZ80.z80_rebaseSP(drZ80.Z80SP-drZ80.Z80SP_BASE); - memcpy(data+4, &drZ80, 0x54); -#elif defined(_USE_CZ80) - *(int *)data = 0x00007a43; // "Cz" - *(int *)(data+4) = Cz80_Get_Reg(&CZ80, CZ80_PC); - memcpy(data+8, &CZ80, (INT32)&CZ80.BasePC - (INT32)&CZ80); -#endif -} - -PICO_INTERNAL void z80_unpack(unsigned char *data) -{ -#if defined(_USE_MZ80) - if (*(int *)data == 0x00005A6D) { // "mZ" save? - struct mz80context mz80; - mz80GetContext(&mz80); - memcpy(&mz80.z80clockticks, data+4, sizeof(mz80)-5*4); - mz80SetContext(&mz80); - } else { - z80_reset(); - z80_int(); + // upmix to "stereo" if needed + if (stereo) { + int i, *p; + for (i = length, p = (void *)PsndOut; i > 0; i--, p++) + *p |= *p << 16; } -#elif defined(_USE_DRZ80) - if (*(int *)data == 0x015A7244) { // "DrZ" v1 save? - memcpy(&drZ80, data+4, 0x54); - // update bases - drZ80.Z80PC = drZ80.z80_rebasePC(drZ80.Z80PC-drZ80.Z80PC_BASE); - drZ80.Z80SP = drZ80.z80_rebaseSP(drZ80.Z80SP-drZ80.Z80SP_BASE); - } else { - z80_reset(); - drZ80.Z80IM = 1; - 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+8, (INT32)&CZ80.BasePC - (INT32)&CZ80); - Cz80_Set_Reg(&CZ80, CZ80_PC, *(int *)(data+4)); - } else { - z80_reset(); - z80_int(); - } -#endif -} -PICO_INTERNAL void z80_exit(void) -{ -#if defined(_USE_MZ80) - mz80shutdown(); -#endif + if (PicoWriteSound != NULL) + PicoWriteSound(length * ((PicoOpt & POPT_EN_STEREO) ? 4 : 2)); + PsndClear(); } -#if 1 // defined(__DEBUG_PRINT) || defined(__GP2X__) || defined(__GIZ__) -PICO_INTERNAL void z80_debug(char *dstr) -{ -#if defined(_USE_DRZ80) - sprintf(dstr, "Z80 state: PC: %04x SP: %04x\n", drZ80.Z80PC-drZ80.Z80PC_BASE, drZ80.Z80SP-drZ80.Z80SP_BASE); -#elif defined(_USE_CZ80) - sprintf(dstr, "Z80 state: PC: %04x SP: %04x\n", CZ80.PC - CZ80.BasePC, CZ80.SP.W); -#endif -} -#endif