X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fsound%2Fsound.c;h=c39d0c194437a0f673dda9060ed8ab83a04d28e2;hb=c9e1affca5438353fdb156fb07a747af83251e14;hp=f43252ffd7757117a5c3ac02611f854ce4d124b2;hpb=c5b61ac25d64d5fb1e8d825e6b44c6c50b05ab34;p=picodrive.git diff --git a/Pico/sound/sound.c b/Pico/sound/sound.c index f43252f..c39d0c1 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,24 +11,21 @@ #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]; // dac static unsigned short dac_info[312]; // pppppppp ppppllll, p - pos in buff, l - length to write for this sample +// cdda output buffer +short cdda_out_buffer[2*1152]; + // for Pico int PsndRate=0; int PsndLen=0; // number of mono samples, multiply by 2 for stereo @@ -36,11 +33,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; @@ -121,25 +113,23 @@ void PsndRerate(int preserve_state) int target_fps = Pico.m.pal ? 50 : 60; // not all rates are supported in MCD mode due to mp3 decoder limitations - if (PicoMCD & 1) { + if (PicoAHW & PAHW_MCD) { if (PsndRate != 11025 && PsndRate != 22050 && PsndRate != 44100) PsndRate = 22050; - PicoOpt |= 8; // force stereo + PicoOpt |= POPT_EN_STEREO; // force stereo } if (preserve_state) { state = malloc(0x200); if (state == NULL) return; memcpy(state, YM2612GetRegs(), 0x200); - if ((PicoMCD & 1) && Pico_mcd->m.audio_track) - Pico_mcd->m.audio_offset = mp3_get_offset(); } YM2612Init(Pico.m.pal ? OSC_PAL/7 : OSC_NTSC/7, PsndRate); if (preserve_state) { // feed it back it's own registers, just like after loading state memcpy(YM2612GetRegs(), state, 0x200); YM2612PicoStateLoad(); - if ((PicoMCD & 1) && Pico_mcd->m.audio_track) - mp3_start_play(Pico_mcd->TOC.Tracks[Pico_mcd->m.audio_track].F, Pico_mcd->m.audio_offset); + if ((PicoAHW & PAHW_MCD) && !(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1)) + cdda_start_play(); } if (preserve_state) memcpy(state, sn76496_regs, 28*4); // remember old state @@ -157,13 +147,17 @@ void PsndRerate(int preserve_state) // recalculate dac info dac_recalculate(); - if (PicoMCD & 1) + 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)); if (PsndOut) PsndClear(); + + // set mixer + PsndMix_32_to_16l = (PicoOpt & POPT_EN_STEREO) ? mix_32_to_16l_stereo : mix_32_to_16_mono; } @@ -171,8 +165,8 @@ void PsndRerate(int preserve_state) PICO_INTERNAL void Psnd_timers_and_dac(int raster) { int pos, len; - int do_dac = PsndOut && (PicoOpt&1) && *ym2612_dacen; -// int do_pcm = PsndOut && (PicoMCD&1) && (PicoOpt&0x400); + int do_dac = PsndOut && (PicoOpt&POPT_EN_FM) && *ym2612_dacen; +// int do_pcm = PsndOut && (PicoAHW&1) && (PicoOpt&0x400); // Our raster lasts 63.61323/64.102564 microseconds (NTSC/PAL) YM2612PicoTick(1); @@ -184,10 +178,11 @@ PICO_INTERNAL void Psnd_timers_and_dac(int raster) pos>>=4; - if (do_dac) { + if (do_dac) + { short *d = PsndOut + pos*2; int dout = *ym2612_dacout; - if(PicoOpt&8) { + if(PicoOpt&POPT_EN_STEREO) { // some manual loop unrolling here :) d[0] = dout; if (len > 1) { @@ -215,13 +210,89 @@ PICO_INTERNAL void Psnd_timers_and_dac(int raster) #endif } +// cdda +static pm_file *cdda_stream = NULL; + +static void cdda_raw_update(int *buffer, int length) +{ + int ret, cdda_bytes; + if (cdda_stream == NULL) return; + + cdda_bytes = length*4; + if (PsndRate <= 22050) cdda_bytes *= 2; + if (PsndRate < 22050) cdda_bytes *= 2; + + ret = pm_read(cdda_out_buffer, cdda_bytes, cdda_stream); + if (ret < cdda_bytes) { + memset((char *)cdda_out_buffer + ret, 0, cdda_bytes - ret); + cdda_stream = NULL; + return; + } + + // 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; + } +} + +PICO_INTERNAL void cdda_start_play(void) +{ + int lba_offset, index, lba_length, i; + + elprintf(EL_STATUS, "cdda play track #%i", Pico_mcd->scd.Cur_Track); + + index = Pico_mcd->scd.Cur_Track - 1; + + lba_offset = Pico_mcd->scd.Cur_LBA - Track_to_LBA(index + 1); + if (lba_offset < 0) lba_offset = 0; + lba_offset += Pico_mcd->TOC.Tracks[index].Offset; + + // find the actual file for this track + for (i = index; i >= 0; i--) + if (Pico_mcd->TOC.Tracks[i].F != NULL) break; + + if (Pico_mcd->TOC.Tracks[i].F == NULL) { + elprintf(EL_STATUS|EL_ANOMALY, "no track?!"); + return; + } + + if (Pico_mcd->TOC.Tracks[i].ftype == TYPE_MP3) + { + int pos1024 = 0; + + lba_length = Pico_mcd->TOC.Tracks[i].Length; + for (i++; i < Pico_mcd->TOC.Last_Track; i++) { + if (Pico_mcd->TOC.Tracks[i].F != NULL) break; + lba_length += Pico_mcd->TOC.Tracks[i].Length; + } + + if (lba_offset) + pos1024 = lba_offset * 1024 / lba_length; + + mp3_start_play(Pico_mcd->TOC.Tracks[index].F, pos1024); + return; + } + + 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); +} + PICO_INTERNAL void PsndClear(void) { int len = PsndLen; if (PsndLen_exc_add) len++; - if (PicoOpt & 8) memset32((int *) PsndOut, 0, len); // clear both channels at once - else memset(PsndOut, 0, len<<1); + if (PicoOpt & POPT_EN_STEREO) + memset32((int *) PsndOut, 0, len); // assume PsndOut to be aligned + else { + short *out = PsndOut; + if ((int)out & 2) { *out++ = 0; len--; } + memset32((int *) out, 0, len/2); + if (len & 1) out[len-1] = 0; + } } @@ -231,9 +302,11 @@ PICO_INTERNAL int PsndRender(int offset, int length) int *buf32 = PsndBuffer+offset; int stereo = (PicoOpt & 8) >> 3; // emulating CD && PCM option enabled && PCM chip on && have enabled channels - int do_pcm = (PicoMCD&1) && (PicoOpt&0x400) && (Pico_mcd->pcm.control & 0x80) && Pico_mcd->pcm.enabled; + int do_pcm = (PicoAHW & PAHW_MCD) && (PicoOpt&POPT_EN_MCD_PCM) && + (Pico_mcd->pcm.control & 0x80) && Pico_mcd->pcm.enabled; offset <<= stereo; +#if !SIMPLE_WRITE_SOUND if (offset == 0) { // should happen once per frame // compensate for float part of PsndLen PsndLen_exc_cnt += PsndLen_exc_add; @@ -242,13 +315,14 @@ PICO_INTERNAL int PsndRender(int offset, int length) length++; } } +#endif // PSG - if (PicoOpt & 2) + if (PicoOpt & POPT_EN_PSG) SN76496Update(PsndOut+offset, length, stereo); // Add in the stereo FM buffer - if (PicoOpt & 1) { + if (PicoOpt & POPT_EN_FM) { buf32_updated = YM2612UpdateOne(buf32, length, stereo, 1); } else memset32(buf32, 0, length<s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1)) - mp3_update(buf32, length, stereo); + if ((PicoAHW & PAHW_MCD) && (PicoOpt & POPT_EN_MCD_CDDA) && + !(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1)) + { + // note: only 44, 22 and 11 kHz supported, with forced stereo + int index = Pico_mcd->scd.Cur_Track - 1; + + if (Pico_mcd->TOC.Tracks[index].ftype == TYPE_MP3) + mp3_update(buf32, length, stereo); + else + cdda_raw_update(buf32, length); + } // 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; } +// ----------------------------------------------------------------- +// z80 stuff + #if defined(_USE_MZ80) @@ -300,9 +384,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) { @@ -372,8 +463,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); @@ -395,44 +486,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) {