X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2F940ctl_ym2612.c;h=bd88c718b29340a331e7658fb7dfd0f98811aa7c;hb=f80d67e12bb5ab0973f586de1a7e2ad260f414ec;hp=63d1e48efd202525b05e1b891568bacb2a2def4c;hpb=75736070161d40608ba3052b4c95b42943f9de3d;p=picodrive.git diff --git a/platform/gp2x/940ctl_ym2612.c b/platform/gp2x/940ctl_ym2612.c index 63d1e48..bd88c71 100644 --- a/platform/gp2x/940ctl_ym2612.c +++ b/platform/gp2x/940ctl_ym2612.c @@ -12,7 +12,9 @@ #include "emu.h" #include "menu.h" #include "asmutils.h" +#include "mp3.h" #include "../../Pico/PicoInt.h" +#include "../../Pico/sound/mix.h" /* we will need some gp2x internals here */ extern volatile unsigned short *gp2x_memregs; /* from minimal library rlyeh */ @@ -20,8 +22,8 @@ extern volatile unsigned long *gp2x_memregl; static unsigned char *shared_mem = 0; static _940_data_t *shared_data = 0; -static _940_ctl_t *shared_ctl = 0; -static unsigned char *mp3_mem = 0; +_940_ctl_t *shared_ctl = 0; +unsigned char *mp3_mem = 0; #define MP3_SIZE_MAX (0x1000000 - 4*640*480) @@ -224,22 +226,15 @@ int YM2612PicoTick_940(int n) } -static void wait_busy_940(void) +#define CHECK_BUSY(job) \ + (gp2x_memregs[0x3b46>>1] & (1<<(job-1))) + +static void wait_busy_940(int job) { int i; -#if 0 - printf("940 busy, entering wait loop.. (cnt: %i, wc: %i, ve: ", shared_ctl->loopc, shared_ctl->waitc); - for (i = 0; i < 8; i++) - printf("%i ", shared_ctl->vstarts[i]); - printf(")\n"); - for (i = 0; shared_ctl->busy; i++) - { - spend_cycles(1024); /* needs tuning */ - } - printf("wait iterations: %i\n", i); -#else - for (i = 0; shared_ctl->busy && i < 0x10000; i++) + job--; + for (i = 0; (gp2x_memregs[0x3b46>>1] & (1<vstarts[i]); printf(")\n"); + printf("irq pending flags: DUALCPU %04x, SRCPND %08lx (see 26), INTPND %08lx\n", + gp2x_memregs[0x3b46>>1], gp2x_memregl[0x4500>>2], gp2x_memregl[0x4510>>2]); + printf("last lr: %08x, lastjob: %i\n", shared_ctl->last_lr, shared_ctl->lastjob); + printf("trying to interrupt..\n"); + gp2x_memregs[0x3B3E>>1] = 0xffff; + for (i = 0; gp2x_memregs[0x3b46>>1] && i < 0x10000; i++) + spend_cycles(8*1024); + printf("i = 0x%x\n", i); + printf("irq pending flags: DUALCPU %04x, SRCPND %08lx (see 26), INTPND %08lx\n", + gp2x_memregs[0x3b46>>1], gp2x_memregl[0x4500>>2], gp2x_memregl[0x4510>>2]); + printf("last lr: %08x, lastjob: %i\n", shared_ctl->last_lr, shared_ctl->lastjob); + strcpy(menuErrorMsg, "940 crashed."); engineState = PGS_Menu; crashed_940 = 1; -#endif } -static void add_job_940(int job0, int job1) +static void add_job_940(int job) { - shared_ctl->jobs[0] = job0; - shared_ctl->jobs[1] = job1; - shared_ctl->busy = 1; - gp2x_memregs[0x3B3E>>1] = 0xffff; // cause an IRQ for 940 + if (job <= 0 || job > 16) { + printf("add_job_940: bad job: %i\n", job); + return; + } + + // generate interrupt for this job + job--; + gp2x_memregs[(0x3B20+job*2)>>1] = 1; + +// printf("added %i, pending %04x\n", job+1, gp2x_memregs[0x3b46>>1]); } @@ -268,8 +280,6 @@ void YM2612PicoStateLoad_940(void) { int i, old_A1 = addr_A1; - if (shared_ctl->busy) wait_busy_940(); - // feed all the registers and update internal state for(i = 0; i < 0x100; i++) { YM2612Write_940(0, i); @@ -282,7 +292,7 @@ void YM2612PicoStateLoad_940(void) addr_A1 = old_A1; - add_job_940(JOB940_PICOSTATELOAD, 0); + add_job_940(JOB940_PICOSTATELOAD); } @@ -299,6 +309,30 @@ static void internal_reset(void) } +/* this must be called after mmu hack, the allocated regions must not get cached */ +void sharedmem_init(void) +{ + if (shared_mem != NULL) return; + + shared_mem = (unsigned char *) mmap(0, 0x210000, PROT_READ|PROT_WRITE, MAP_SHARED, memdev, 0x2000000); + if(shared_mem == MAP_FAILED) + { + printf("mmap(shared_data) failed with %i\n", errno); + exit(1); + } + shared_data = (_940_data_t *) (shared_mem+0x100000); + /* this area must not get buffered on either side */ + shared_ctl = (_940_ctl_t *) (shared_mem+0x200000); + mp3_mem = (unsigned char *) mmap(0, MP3_SIZE_MAX, PROT_READ|PROT_WRITE, MAP_SHARED, memdev, 0x3000000); + if (mp3_mem == MAP_FAILED) + { + printf("mmap(mp3_mem) failed with %i\n", errno); + exit(1); + } + crashed_940 = 1; +} + + extern char **g_argv; /* none of the functions in this file should be called before this one */ @@ -310,30 +344,12 @@ void YM2612Init_940(int baseclock, int rate) Reset940(1, 2); Pause940(1); - gp2x_memregs[0x3B46>>1] = 0xffff; // clear pending DUALCPU interrupts for 940 - gp2x_memregs[0x3B42>>1] = 0xffff; // enable DUALCPU interrupts for 940 + gp2x_memregs[0x3B40>>1] = 0; // disable DUALCPU interrupts for 920 + gp2x_memregs[0x3B42>>1] = 1; // enable DUALCPU interrupts for 940 + gp2x_memregl[0x4504>>2] = 0; // make sure no FIQs will be generated gp2x_memregl[0x4508>>2] = ~(1<<26); // unmask DUALCPU ints in the undocumented 940's interrupt controller - if (shared_mem == NULL) - { - shared_mem = (unsigned char *) mmap(0, 0x210000, PROT_READ|PROT_WRITE, MAP_SHARED, memdev, 0x2000000); - if(shared_mem == MAP_FAILED) - { - printf("mmap(shared_data) failed with %i\n", errno); - exit(1); - } - shared_data = (_940_data_t *) (shared_mem+0x100000); - /* this area must not get buffered on either side */ - shared_ctl = (_940_ctl_t *) (shared_mem+0x200000); - mp3_mem = (unsigned char *) mmap(0, MP3_SIZE_MAX, PROT_READ|PROT_WRITE, MAP_SHARED, memdev, 0x3000000); - if (mp3_mem == MAP_FAILED) - { - printf("mmap(mp3_mem) failed with %i\n", errno); - exit(1); - } - crashed_940 = 1; - } if (crashed_940) { @@ -383,18 +399,20 @@ void YM2612Init_940(int baseclock, int rate) loaded_mp3 = 0; - /* now cause 940 to init it's ym2612 stuff */ - shared_ctl->baseclock = baseclock; - shared_ctl->rate = rate; - shared_ctl->jobs[0] = JOB940_INITALL; - shared_ctl->jobs[1] = 0; - shared_ctl->busy = 1; + gp2x_memregs[0x3B46>>1] = 0xffff; // clear pending DUALCPU interrupts for 940 + gp2x_memregl[0x4500>>2] = 0xffffffff; // clear pending IRQs in SRCPND + gp2x_memregl[0x4510>>2] = 0xffffffff; // clear pending IRQs in INTPND /* start the 940 */ Reset940(0, 2); Pause940(0); // YM2612ResetChip_940(); // will be done on JOB940_YM2612INIT + + /* now cause 940 to init it's ym2612 stuff */ + shared_ctl->baseclock = baseclock; + shared_ctl->rate = rate; + add_job_940(JOB940_INITALL); } @@ -406,136 +424,121 @@ void YM2612ResetChip_940(void) return; } - if (shared_ctl->busy) wait_busy_940(); - internal_reset(); - add_job_940(JOB940_YM2612RESETCHIP, 0); + add_job_940(JOB940_YM2612RESETCHIP); } -static void mix_samples(short *dest_buf, int *ym_buf, short *mp3_buf, int len, int stereo) +int YM2612UpdateOne_940(int *buffer, int length, int stereo, int is_buf_empty) { - if (mp3_buf) - { - if (stereo) - { - for (; len > 0; len--) - { - int l, r, lm, rm; - l = r = *dest_buf; - l += *ym_buf++; r += *ym_buf++; - lm = *mp3_buf++; rm = *mp3_buf++; - l += lm - lm/2; r += rm - rm/2; - Limit( l, MAXOUT, MINOUT ); - Limit( r, MAXOUT, MINOUT ); - *dest_buf++ = l; *dest_buf++ = r; - } - } else { - for (; len > 0; len--) - { - // TODO: normalize - int l = *ym_buf++; - l += *dest_buf; - l += *mp3_buf++; - Limit( l, MAXOUT, MINOUT ); - *dest_buf++ = l; - } - } + int *ym_buf = shared_data->ym_buffer; + + //printf("YM2612UpdateOne_940()\n"); + + if (CHECK_BUSY(JOB940_YM2612UPDATEONE)) wait_busy_940(JOB940_YM2612UPDATEONE); + + // mix in ym buffer + if (is_buf_empty) memcpy32(buffer, ym_buf, length< 0; len--) +// { +// *dest_buf++ += *ym_buf++; +// } + + if (shared_ctl->writebuffsel == 1) { + shared_ctl->writebuff0[writebuff_ptr] = 0xffff; + } else { + shared_ctl->writebuff1[writebuff_ptr] = 0xffff; } - else - { - if (stereo) - { - for (; len > 0; len--) - { - int l, r; - l = r = *dest_buf; - l += *ym_buf++, r += *ym_buf++; - Limit( l, MAXOUT, MINOUT ); - Limit( r, MAXOUT, MINOUT ); - *dest_buf++ = l; *dest_buf++ = r; - } - } else { - for (; len > 0; len--) - { - int l = *ym_buf++; - l += *dest_buf; - Limit( l, MAXOUT, MINOUT ); - *dest_buf++ = l; - } - } + writebuff_ptr = 0; + + /* predict sample counter for next frame */ + if (PsndLen_exc_add) { + if (PsndLen_exc_cnt + PsndLen_exc_add >= 0x10000) length = PsndLen + 1; + else length = PsndLen; } -} + /* give 940 ym job */ + shared_ctl->writebuffsel ^= 1; + shared_ctl->length = length; + shared_ctl->stereo = stereo; + + add_job_940(JOB940_YM2612UPDATEONE); + + return 1; +} -// here we assume that length is different between games, but constant in one game static int mp3_samples_ready = 0, mp3_buffer_offs = 0; -static int mp3_play_bufsel = 0; +static int mp3_play_bufsel = 0, mp3_job_started = 0; -void YM2612UpdateOne_940(short *buffer, int length, int stereo) +void mp3_update(int *buffer, int length, int stereo) { - int cdda_on, *ym_buffer = shared_data->mix_buffer, mp3_job = 0; + int length_mp3; + int cdda_on; - //printf("YM2612UpdateOne_940()\n"); - if (shared_ctl->busy) wait_busy_940(); + // not data track, CDC is reading, playback was started, track not ended + cdda_on = !(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1) && + loaded_mp3 && shared_ctl->mp3_offs < shared_ctl->mp3_len; - //printf("940 (cnt: %i, wc: %i, ve: ", shared_ctl->loopc, shared_ctl->waitc); - //for (i = 0; i < 8; i++) - // printf("%i ", shared_ctl->vstarts[i]); - //printf(")\n"); + if (!cdda_on) return; - // emulatind MCD, cdda enabled in config, not data track, CDC is reading, playback was started, track not ended - cdda_on = (PicoMCD & 1) && (currentConfig.EmuOpt&0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) && - (Pico_mcd->scd.Status_CDC & 1) && loaded_mp3 && shared_ctl->mp3_offs < shared_ctl->mp3_len; + if (!(PicoOpt&0x200)) { + mp3_update_local(buffer, length, stereo); + return; + } - /* mix data from previous go */ - if (cdda_on && mp3_samples_ready >= length) + length_mp3 = length; + if (PsndRate == 22050) length_mp3 <<= 1; // mp3s are locked to 44100Hz stereo + else if (PsndRate == 11025) length_mp3 <<= 2; // so make length 44100ish + + /* do we have to wait? */ + if (mp3_job_started && mp3_samples_ready < length_mp3) { + if (CHECK_BUSY(JOB940_MP3DECODE)) wait_busy_940(JOB940_MP3DECODE); + mp3_job_started = 0; + mp3_samples_ready += 1152; + } + + /* mix mp3 data, only stereo */ + if (mp3_samples_ready >= length_mp3) { - if (1152 - mp3_buffer_offs >= length) { - mix_samples(buffer, ym_buffer, shared_data->mp3_buffer[mp3_play_bufsel] + mp3_buffer_offs*2, length, stereo); + int shr = 0; + void (*mix_samples)(int *dest_buf, short *mp3_buf, int count) = mix_16h_to_32; + if (PsndRate == 22050) { mix_samples = mix_16h_to_32_s1; shr = 1; } + else if (PsndRate == 11025) { mix_samples = mix_16h_to_32_s2; shr = 2; } - mp3_buffer_offs += length; + if (1152 - mp3_buffer_offs >= length_mp3) { + mix_samples(buffer, shared_data->mp3_buffer[mp3_play_bufsel] + mp3_buffer_offs*2, length<<1); + + mp3_buffer_offs += length_mp3; } else { - // collect from both buffers.. + // collect samples from both buffers.. int left = 1152 - mp3_buffer_offs; - mix_samples(buffer, ym_buffer, shared_data->mp3_buffer[mp3_play_bufsel] + mp3_buffer_offs*2, left, stereo); - mp3_play_bufsel ^= 1; - mp3_buffer_offs = length - left; - mix_samples(buffer + left * 2, ym_buffer + left * 2, - shared_data->mp3_buffer[mp3_play_bufsel], mp3_buffer_offs, stereo); + if (mp3_play_bufsel == 0) + { + mix_samples(buffer, shared_data->mp3_buffer[0] + mp3_buffer_offs*2, length<<1); + mp3_buffer_offs = length_mp3 - left; + mp3_play_bufsel = 1; + } else { + mix_samples(buffer, shared_data->mp3_buffer[1] + mp3_buffer_offs*2, (left>>shr)<<1); + mp3_buffer_offs = length_mp3 - left; + mix_samples(buffer + ((left>>shr)<<1), + shared_data->mp3_buffer[0], (mp3_buffer_offs>>shr)<<1); + mp3_play_bufsel = 0; + } } - mp3_samples_ready -= length; - } else { - mix_samples(buffer, ym_buffer, 0, length, stereo); - } - - //printf("new writes: %i\n", writebuff_ptr); - if (shared_ctl->writebuffsel == 1) { - shared_ctl->writebuff0[writebuff_ptr] = 0xffff; - } else { - shared_ctl->writebuff1[writebuff_ptr] = 0xffff; + mp3_samples_ready -= length_mp3; } - writebuff_ptr = 0; - /* give 940 ym job */ - shared_ctl->writebuffsel ^= 1; - shared_ctl->length = length; - shared_ctl->stereo = stereo; - - // make sure we will have enough mp3 samples next frame - if (cdda_on && mp3_samples_ready < length) + // ask to decode more if we already can + if (!mp3_job_started) { + mp3_job_started = 1; shared_ctl->mp3_buffsel ^= 1; - mp3_job = JOB940_MP3DECODE; - mp3_samples_ready += 1152; + add_job_940(JOB940_MP3DECODE); } - - add_job_940(JOB940_YM2612UPDATEONE, mp3_job); - //spend_cycles(512); - //printf("SRCPND: %08lx, INTMODE: %08lx, INTMASK: %08lx, INTPEND: %08lx\n", - // gp2x_memregl[0x4500>>2], gp2x_memregl[0x4504>>2], gp2x_memregl[0x4508>>2], gp2x_memregl[0x4510>>2]); } @@ -545,19 +548,25 @@ void mp3_start_play(FILE *f, int pos) // pos is 0-1023 { int byte_offs = 0; - if (!(currentConfig.EmuOpt&0x800)) { // cdda disabled? + if (!(PicoOpt&0x800)) { // cdda disabled? return; } if (loaded_mp3 != f) { - printf("loading mp3... "); fflush(stdout); + // printf("loading mp3... "); fflush(stdout); fseek(f, 0, SEEK_SET); fread(mp3_mem, 1, MP3_SIZE_MAX, f); - if (feof(f)) printf("done.\n"); - else printf("done. mp3 too large, not all data loaded.\n"); + // if (feof(f)) printf("done.\n"); + // else printf("done. mp3 too large, not all data loaded.\n"); shared_ctl->mp3_len = ftell(f); loaded_mp3 = f; + + if (PicoOpt&0x200) { + // as we are going to change 940's cacheable area, we must invalidate it's cache.. + if (CHECK_BUSY(JOB940_MP3DECODE)) wait_busy_940(JOB940_MP3DECODE); + add_job_940(JOB940_INVALIDATE_DCACHE); + } } // seek.. @@ -566,13 +575,16 @@ void mp3_start_play(FILE *f, int pos) // pos is 0-1023 byte_offs *= pos; byte_offs >>= 6; } - printf("mp3 pos1024: %i, byte_offs %i/%i\n", pos, byte_offs, shared_ctl->mp3_len); + // printf("mp3 pos1024: %i, byte_offs %i/%i\n", pos, byte_offs, shared_ctl->mp3_len); shared_ctl->mp3_offs = byte_offs; - // reset buffer pointers.. + // reset buffer pointers and stuff.. mp3_samples_ready = mp3_buffer_offs = mp3_play_bufsel = 0; + mp3_job_started = 0; shared_ctl->mp3_buffsel = 1; // will change to 0 on first decode + + if (!(PicoOpt&0x200)) mp3_start_local(); } @@ -581,8 +593,8 @@ int mp3_get_offset(void) int offs1024 = 0; int cdda_on; - cdda_on = (PicoMCD & 1) && (currentConfig.EmuOpt&0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) && - (Pico_mcd->scd.Status_CDC & 1) && loaded_mp3 && shared_ctl->mp3_offs < shared_ctl->mp3_len; + cdda_on = (PicoMCD & 1) && (PicoOpt&0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) && + (Pico_mcd->scd.Status_CDC & 1) && loaded_mp3; if (cdda_on) { offs1024 = shared_ctl->mp3_offs << 7;