X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fsound%2Fsound.c;h=99500847ccdc359bd2c3b318b98d5655c2d5a3ce;hb=03e4f2a349247334666c87abe3a908df72d23051;hp=6ea966bb49b1a90e71f302f948a57a9f9cb712d5;hpb=4f265db77684ec33f9533e7c76734498df03bba4;p=picodrive.git diff --git a/Pico/sound/sound.c b/Pico/sound/sound.c index 6ea966b..9950084 100644 --- a/Pico/sound/sound.c +++ b/Pico/sound/sound.c @@ -8,18 +8,15 @@ #include -#include "sound.h" #include "ym2612.h" #include "sn76496.h" -#ifndef __GNUC__ -#pragma warning (disable:4244) -#endif - #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" @@ -29,15 +26,14 @@ // master int buffer to mix to static int PsndBuffer[2*44100/50]; -//int z80CycleAim = 0; - // dac -short *dac_out; -unsigned short dac_info[312]; // pppppppp ppppllll, p - pos in buff, l - length to write for this sample +static unsigned short dac_info[312]; // pppppppp ppppllll, p - pos in buff, l - length to write for this sample // for Pico int PsndRate=0; int PsndLen=0; // number of mono samples, multiply by 2 for stereo +int PsndLen_exc_add=0; // this is for non-integer sample counts per line, eg. 22050/60 +int PsndLen_exc_cnt=0; short *PsndOut=NULL; // PCM data buffer // from ym2612.c @@ -49,13 +45,13 @@ void YM2612TimerHandler(int c,int cnt); extern int *sn76496_regs; -static void dac_recalculate() +static void dac_recalculate(void) { int i, dac_cnt, pos, len, lines = Pico.m.pal ? 312 : 262, mid = Pico.m.pal ? 68 : 93; if(PsndLen <= lines) { // shrinking algo - dac_cnt = 0;//lines - PsndLen; + dac_cnt = -PsndLen; len=1; pos=0; dac_info[225] = 1; @@ -72,7 +68,7 @@ static void dac_recalculate() } } else { // stretching - dac_cnt = PsndLen/2; + dac_cnt = PsndLen; pos=0; for(i = 225; i != 224; i++) { if (i >= lines) i = 0; @@ -92,72 +88,87 @@ static void dac_recalculate() } // last sample for(len = 0, i = pos; i < PsndLen; i++) len++; + if (PsndLen_exc_add) len++; dac_info[224] = (pos<<4)|len; } -// dprintf("rate is %i, len %i", PsndRate, PsndLen); -// for(i=0; i < lines; i++) -// dprintf("%03i : %03i : %i", i, dac_info[i]>>4, dac_info[i]&0xf); -//exit(8); + //for(i=len=0; i < lines; i++) { + // printf("%03i : %03i : %i\n", i, dac_info[i]>>4, dac_info[i]&0xf); + // len+=dac_info[i]&0xf; + //} + //printf("rate is %i, len %f\n", PsndRate, (double)PsndRate/(Pico.m.pal ? 50.0 : 60.0)); + //printf("len total: %i, last pos: %i\n", len, pos); + //exit(8); } -void sound_reset() +PICO_INTERNAL void sound_reset(void) { - extern int z80stopCycle; void *ym2612_regs; - // init even if we are not going to use them, just in case we ever enable it - YM2612Init(Pico.m.pal ? OSC_PAL/7 : OSC_NTSC/7, PsndRate); // also clear the internal registers+addr line ym2612_regs = YM2612GetRegs(); memset(ym2612_regs, 0, 0x200+4); + z80startCycle = z80stopCycle = 0; - SN76496_init(Pico.m.pal ? OSC_PAL/15 : OSC_NTSC/15, PsndRate); - - // calculate PsndLen - PsndLen=PsndRate/(Pico.m.pal ? 50 : 60); - - // recalculate dac info - dac_recalculate(); - z80stopCycle = 0; + sound_rerate(0); } // to be called after changing sound rate or chips -void sound_rerate() +void sound_rerate(int preserve_state) { - unsigned int state[28]; + void *state = NULL; + int target_fps = Pico.m.pal ? 50 : 60; - // not all rates are supported in MCD mode due to mp3 decoder + // not all rates are supported in MCD mode due to mp3 decoder limitations if (PicoMCD & 1) { if (PsndRate != 11025 && PsndRate != 22050 && PsndRate != 44100) PsndRate = 22050; - if (!(PicoOpt & 8)) PicoOpt |= 8; + PicoOpt |= 8; // force stereo } - if ((PicoMCD & 1) && Pico_mcd->m.audio_track) Pico_mcd->m.audio_offset = mp3_get_offset(); + 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); - // feed it back it's own registers, just like after loading state - 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 (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); + } - memcpy(state, sn76496_regs, 28*4); // remember old state + if (preserve_state) memcpy(state, sn76496_regs, 28*4); // remember old state SN76496_init(Pico.m.pal ? OSC_PAL/15 : OSC_NTSC/15, PsndRate); - memcpy(sn76496_regs, state, 28*4); // restore old state + if (preserve_state) memcpy(sn76496_regs, state, 28*4); // restore old state + + if (state) + free(state); // calculate PsndLen - PsndLen=PsndRate/(Pico.m.pal ? 50 : 60); + PsndLen=PsndRate / target_fps; + PsndLen_exc_add=((PsndRate - PsndLen*target_fps)<<16) / target_fps; + PsndLen_exc_cnt=0; // recalculate dac info dac_recalculate(); if (PicoMCD & 1) pcm_set_rate(PsndRate); + + // clear all buffers + memset32(PsndBuffer, 0, sizeof(PsndBuffer)/4); + if (PsndOut) + sound_clear(); } // This is called once per raster (aka line), but not necessarily for every line -void sound_timers_and_dac(int raster) +PICO_INTERNAL void sound_timers_and_dac(int raster) { int pos, len; int do_dac = PsndOut && (PicoOpt&1) && *ym2612_dacen; @@ -181,22 +192,16 @@ void sound_timers_and_dac(int raster) d[0] = dout; if (len > 1) { d[2] = dout; - if (len > 2) { + if (len > 2) d[4] = dout; - if (len > 3) - d[6] = dout; - } } } else { short *d = PsndOut + pos; d[0] = dout; if (len > 1) { d[1] = dout; - if (len > 2) { + if (len > 2) d[2] = dout; - if (len > 3) - d[3] = dout; - } } } } @@ -211,43 +216,62 @@ void sound_timers_and_dac(int raster) } -void sound_clear(void) +PICO_INTERNAL void sound_clear(void) { - if (PicoOpt & 8) memset32((int *) PsndOut, 0, PsndLen); - else memset(PsndOut, 0, PsndLen<<1); -// memset(PsndBuffer, 0, (PicoOpt & 8) ? (PsndLen<<3) : (PsndLen<<2)); + 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); } -int sound_render(int offset, int length) +PICO_INTERNAL int sound_render(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 = (PicoMCD&1) && (PicoOpt&0x400) && (Pico_mcd->pcm.control & 0x80) && Pico_mcd->pcm.enabled; offset <<= stereo; + if (offset == 0) { // should happen once per frame + // compensate for float part of PsndLen + PsndLen_exc_cnt += PsndLen_exc_add; + if (PsndLen_exc_cnt >= 0x10000) { + PsndLen_exc_cnt -= 0x10000; + length++; + } + } + // PSG if (PicoOpt & 2) SN76496Update(PsndOut+offset, length, stereo); // Add in the stereo FM buffer - if (PicoOpt & 1) - YM2612UpdateOne(buf32, length, stereo, 1); + if (PicoOpt & 1) { + 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); // 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); - return 0; + return length; } @@ -294,22 +318,23 @@ static unsigned int DrZ80_rebaseSP(unsigned short a) static unsigned char DrZ80_in(unsigned short p) { + elprintf(EL_ANOMALY, "Z80 port %04x read", p); return 0xff; } static void DrZ80_out(unsigned short p,unsigned char d) { + elprintf(EL_ANOMALY, "Z80 port %04x write %02x", p, d); } static void DrZ80_irq_callback() { drZ80.Z80_IRQ = 0; // lower irq when accepted } - #endif // z80 functionality wrappers -void z80_init() +PICO_INTERNAL void z80_init(void) { #if defined(_USE_MZ80) struct mz80context z80; @@ -329,7 +354,6 @@ void z80_init() mz80SetContext(&z80); #elif defined(_USE_DRZ80) - memset(&drZ80, 0, sizeof(struct DrZ80)); drZ80.z80_rebasePC=DrZ80_rebasePC; drZ80.z80_rebaseSP=DrZ80_rebaseSP; @@ -340,10 +364,18 @@ void z80_init() drZ80.z80_in =DrZ80_in; drZ80.z80_out =DrZ80_out; drZ80.z80_irq_callback=DrZ80_irq_callback; + +#elif defined(_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 - 0x2000); // mirror + Cz80_Set_ReadB(&CZ80, (UINT8 (*)(UINT32 address))z80_read); + Cz80_Set_WriteB(&CZ80, z80_write); #endif } -void z80_reset() +PICO_INTERNAL void z80_reset(void) { #if defined(_USE_MZ80) mz80reset(); @@ -356,29 +388,33 @@ void z80_reset() drZ80.Z80IM = 0; // 1? drZ80.Z80PC = drZ80.z80_rebasePC(0); drZ80.Z80SP = drZ80.z80_rebaseSP(0x2000); // 0xf000 ? +#elif defined(_USE_CZ80) + Cz80_Reset(&CZ80); #endif Pico.m.z80_fakeval = 0; // for faking when Z80 is disabled } -void z80_resetCycles() +PICO_INTERNAL void z80_resetCycles(void) { #if defined(_USE_MZ80) mz80GetElapsedTicks(1); #endif } -void z80_int() +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 -int z80_run(int cycles) +PICO_INTERNAL int z80_run(int cycles) { #if defined(_USE_MZ80) int ticks_pre = mz80GetElapsedTicks(0); @@ -386,12 +422,14 @@ int z80_run(int 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 } -void z80_pack(unsigned char *data) +PICO_INTERNAL void z80_pack(unsigned char *data) { #if defined(_USE_MZ80) struct mz80context mz80; @@ -403,13 +441,16 @@ void z80_pack(unsigned char *data) 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" + memcpy(data+4, &CZ80, (INT32)&CZ80.BasePC - (INT32)&CZ80); #endif } -void z80_unpack(unsigned char *data) +PICO_INTERNAL void z80_unpack(unsigned char *data) { #if defined(_USE_MZ80) - if(*(int *)data == 0x00005A6D) { // "mZ" save? + if (*(int *)data == 0x00005A6D) { // "mZ" save? struct mz80context mz80; mz80GetContext(&mz80); memcpy(&mz80.z80clockticks, data+4, sizeof(mz80)-5*4); @@ -419,7 +460,7 @@ void z80_unpack(unsigned char *data) z80_int(); } #elif defined(_USE_DRZ80) - if(*(int *)data == 0x015A7244) { // "DrZ" v1 save? + if (*(int *)data == 0x015A7244) { // "DrZ" v1 save? memcpy(&drZ80, data+4, 0x54); // update bases drZ80.Z80PC = drZ80.z80_rebasePC(drZ80.Z80PC-drZ80.Z80PC_BASE); @@ -429,21 +470,30 @@ void z80_unpack(unsigned char *data) 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+4, (INT32)&CZ80.BasePC - (INT32)&CZ80); + else { + z80_reset(); + z80_int(); + } #endif } -void z80_exit() +PICO_INTERNAL void z80_exit(void) { #if defined(_USE_MZ80) mz80shutdown(); #endif } -#if defined(__DEBUG_PRINT) || defined(WIN32) -void z80_debug(char *dstr) +#if 1 // defined(__DEBUG_PRINT) || defined(__GP2X__) || defined(__GIZ__) +PICO_INTERNAL void z80_debug(char *dstr) { #if defined(_USE_DRZ80) - sprintf(dstr, "%sZ80 state: PC: %04x SP: %04x\n", dstr, drZ80.Z80PC-drZ80.Z80PC_BASE, drZ80.Z80SP-drZ80.Z80SP_BASE); + 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