X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2F940ctl.c;h=99c25d6454826867546cb73cec213a8576e126bf;hb=93f9619ed819dee07948416c98ca2f1c70a22666;hp=6c52cca25a561ceae9a423d3022025462b67a445;hpb=d5d119243c9e1086e1e6cb34ea05bfd6ab18c200;p=picodrive.git diff --git a/platform/gp2x/940ctl.c b/platform/gp2x/940ctl.c index 6c52cca..99c25d6 100644 --- a/platform/gp2x/940ctl.c +++ b/platform/gp2x/940ctl.c @@ -1,5 +1,10 @@ -// Code for communication with ARM940 and control of it. -// (c) Copyright 2007, Grazvydas "notaz" Ignotas +/* + * Code for communication with ARM940 and control of it. + * (C) notaz, 2006-2009 + * + * This work is licensed under the terms of MAME license. + * See COPYING file in the top-level directory. + */ #include #include @@ -10,26 +15,27 @@ #include #include +#include "../libpicofe/input.h" +#include "../libpicofe/gp2x/soc_mmsp2.h" +#include "../libpicofe/gp2x/soc.h" +#include "../common/mp3.h" +#include "../common/arm_utils.h" +#include "../common/menu_pico.h" +#include "../common/emu.h" +#include "../../pico/pico_int.h" +#include "../../pico/sound/ym2612.h" +#include "../../pico/sound/mix.h" #include "code940/940shared.h" -#include "gp2x.h" -#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 */ -extern volatile unsigned long *gp2x_memregl; - -extern int reset_timing; +#include "plat.h" +#include "940ctl.h" + static unsigned char *shared_mem = 0; static _940_data_t *shared_data = 0; _940_ctl_t *shared_ctl = 0; unsigned char *mp3_mem = 0; -#define MP3_SIZE_MAX (0x1000000 - 4*640*480) +#define MP3_SIZE_MAX (0x400000 + 0x800000) // 12M +#define CODE940_FILE "pico940_v3.bin" int crashed_940 = 0; @@ -47,171 +53,61 @@ static FILE *loaded_mp3 = 0; } /* these will be managed locally on our side */ -extern int *ym2612_dacen; -extern INT32 *ym2612_dacout; -extern void *ym2612_regs; - -static UINT8 *REGS = 0; /* we will also keep local copy of regs for savestates and such */ -static INT32 addr_A1; /* address line A1 */ -static int dacen; -static INT32 dacout; static UINT8 ST_address; /* address register */ -static UINT8 ST_status; /* status flag */ -static UINT8 ST_mode; /* mode CSM / 3SLOT */ -static int ST_TA; /* timer a */ -static int ST_TAC; /* timer a maxval */ -static int ST_TAT; /* timer a ticker */ -static UINT8 ST_TB; /* timer b */ -static int ST_TBC; /* timer b maxval */ -static int ST_TBT; /* timer b ticker */ +static INT32 addr_A1; /* address line A1 */ static int writebuff_ptr = 0; -/* OPN Mode Register Write */ -static int set_timers( int v ) -{ - int change; - - /* b7 = CSM MODE */ - /* b6 = 3 slot mode */ - /* b5 = reset b */ - /* b4 = reset a */ - /* b3 = timer enable b */ - /* b2 = timer enable a */ - /* b1 = load b */ - /* b0 = load a */ - change = (ST_mode ^ v) & 0xc0; - ST_mode = v; - - /* reset Timer b flag */ - if( v & 0x20 ) - ST_status &= ~2; - - /* reset Timer a flag */ - if( v & 0x10 ) - ST_status &= ~1; - - return change; -} - /* YM2612 write */ /* a = address */ /* v = value */ /* returns 1 if sample affecting state changed */ -int YM2612Write_940(unsigned int a, unsigned int v) +int YM2612Write_940(unsigned int a, unsigned int v, int scanline) { - int addr; int upd = 1; /* the write affects sample generation */ - v &= 0xff; /* adjust to 8 bit bus */ a &= 3; //printf("%05i:%03i: ym w ([%i] %02x)\n", Pico.m.frame_count, Pico.m.scanline, a, v); - switch( a ) { - case 0: /* address port 0 */ - if (!addr_A1 && ST_address == v) - return 0; /* address already selected, don't send this command to 940 */ - ST_address = v; - /* don't send DAC or timer related address changes to 940 */ - if (!addr_A1 && (v & 0xf0) == 0x20 && - (v == 0x24 || v == 0x25 || v == 0x26 || v == 0x2a)) + switch (a) + { + case 0: /* address port 0 */ + if (addr_A1 == 0 && ST_address == v) + return 0; /* address already selected, don't send this command to 940 */ + ST_address = v; + addr_A1 = 0; + /* don't send DAC or timer related address changes to 940 */ + if (v == 0x24 || v == 0x25 || v == 0x26 || v == 0x2a) return 0; - addr_A1 = 0; - upd = 0; - break; - - case 1: /* data port 0 */ - if (addr_A1 != 0) { - return 0; /* verified on real YM2608 */ - } - - addr = ST_address; - REGS[addr] = v; + upd = 0; + break; - switch( addr & 0xf0 ) - { - case 0x20: /* 0x20-0x2f Mode */ - switch( addr ) - { - case 0x24: { // timer A High 8 - int TAnew = (ST_TA & 0x03)|(((int)v)<<2); - if(ST_TA != TAnew) { - // we should reset ticker only if new value is written. Outrun requires this. - ST_TA = TAnew; - ST_TAC = (1024-TAnew)*18; - ST_TAT = 0; - } - return 0; - } - case 0x25: { // timer A Low 2 - int TAnew = (ST_TA & 0x3fc)|(v&3); - if(ST_TA != TAnew) { - ST_TA = TAnew; - ST_TAC = (1024-TAnew)*18; - ST_TAT = 0; - } - return 0; - } - case 0x26: // timer B - if(ST_TB != v) { - ST_TB = v; - ST_TBC = (256-v)<<4; - ST_TBC *= 18; - ST_TBT = 0; - } + case 2: /* address port 1 */ + if (addr_A1 == 1 && ST_address == v) return 0; - case 0x27: /* mode, timer control */ - if (set_timers( v )) - break; // other side needs ST.mode for 3slot mode - return 0; - case 0x2a: /* DAC data (YM2612) */ - dacout = ((int)v - 0x80) << 6; /* level unknown (notaz: 8 seems to be too much) */ - return 0; - case 0x2b: /* DAC Sel (YM2612) */ - /* b7 = dac enable */ - dacen = v & 0x80; - upd = 0; - break; // other side has to know this - default: - break; - } + ST_address = v; + addr_A1 = 1; + upd = 0; break; - } - break; - - case 2: /* address port 1 */ - if (addr_A1 && ST_address == v) - return 0; - ST_address = v; - addr_A1 = 1; - upd = 0; - break; - - case 3: /* data port 1 */ - if (addr_A1 != 1) { - return 0; /* verified on real YM2608 */ - } - - addr = ST_address | 0x100; - REGS[addr] = v; - break; } //printf("ym pass\n"); - if(currentConfig.EmuOpt & 4) { + if (currentConfig.EmuOpt & 4) + { UINT16 *writebuff = shared_ctl->writebuffsel ? shared_ctl->writebuff0 : shared_ctl->writebuff1; /* detect rapid ym updates */ - if (upd && !(writebuff_ptr & 0x80000000) && Pico.m.scanline < 224) { + if (upd && !(writebuff_ptr & 0x80000000) && scanline < 224) + { int mid = Pico.m.pal ? 68 : 93; - if (Pico.m.scanline > mid) { - //printf("%05i:%03i: rapid ym\n", Pico.m.frame_count, Pico.m.scanline); + if (scanline > mid) { + //printf("%05i:%03i: rapid ym\n", Pico.m.frame_count, scanline); writebuff[writebuff_ptr++ & 0xffff] = 0xfffe; writebuff_ptr |= 0x80000000; - //printf("%05i:%03i: ym w ([%02x] %02x, upd=%i)\n", Pico.m.frame_count, Pico.m.scanline, addr, v, upd); + //printf("%05i:%03i: ym w ([%02x] %02x, upd=%i)\n", Pico.m.frame_count, scanline, addr, v, upd); } } @@ -226,48 +122,16 @@ int YM2612Write_940(unsigned int a, unsigned int v) return 0; // cause the engine to do updates once per frame only } -UINT8 YM2612Read_940(void) -{ - return ST_status; -} - - -int YM2612PicoTick_940(int n) -{ - //int ret = 0; - - // timer A - if(ST_mode & 0x01 && (ST_TAT+=64*n) >= ST_TAC) { - ST_TAT -= ST_TAC; - if(ST_mode & 0x04) ST_status |= 1; - // CSM mode total level latch and auto key on -/* FIXME - if(ST_mode & 0x80) { - CSMKeyControll( &(ym2612_940->CH[2]) ); // Vectorman2, etc. - ret = 1; - } -*/ - } - - // timer B - if(ST_mode & 0x02 && (ST_TBT+=64*n) >= ST_TBC) { - ST_TBT -= ST_TBC; - if(ST_mode & 0x08) ST_status |= 2; - } - - return 0; -} - #define CHECK_BUSY(job) \ - (gp2x_memregs[0x3b46>>1] & (1<<(job-1))) + (memregs[0x3b46>>1] & (1<<(job-1))) static void wait_busy_940(int job) { int i; job--; - for (i = 0; (gp2x_memregs[0x3b46>>1] & (1<>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("irq pending flags: DUALCPU %04x, SRCPND %08x (see 26), INTPND %08x\n", + memregs[0x3b46>>1], memregl[0x4500>>2], 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++) + memregs[0x3B3E>>1] = 0xffff; + for (i = 0; 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("irq pending flags: DUALCPU %04x, SRCPND %08x (see 26), INTPND %08x\n", + memregs[0x3b46>>1], memregl[0x4500>>2], memregl[0x4510>>2]); printf("last lr: %08x, lastjob: %i\n", shared_ctl->last_lr, shared_ctl->lastjob); - strcpy(menuErrorMsg, "940 crashed, too much overclock?"); + menu_update_msg("940 crashed, too much overclock?"); engineState = PGS_Menu; crashed_940 = 1; } @@ -303,56 +167,94 @@ static void add_job_940(int job) // generate interrupt for this job job--; - gp2x_memregs[(0x3B20+job*2)>>1] = 1; + memregs[(0x3B20+job*2)>>1] = 1; -// printf("added %i, pending %04x\n", job+1, gp2x_memregs[0x3b46>>1]); +// printf("added %i, pending %04x\n", job+1, memregs[0x3b46>>1]); } void YM2612PicoStateLoad_940(void) { - int i, old_A1 = addr_A1; + UINT8 *REGS = YM2612GetRegs(); /* make sure JOB940_PICOSTATELOAD gets done before next JOB940_YM2612UPDATEONE */ add_job_940(JOB940_PICOSTATELOAD); if (CHECK_BUSY(JOB940_PICOSTATELOAD)) wait_busy_940(JOB940_PICOSTATELOAD); writebuff_ptr = 0; + addr_A1 = *(INT32 *) (REGS + 0x200); +} - // feed all the registers and update internal state - for(i = 0; i < 0x100; i++) { - YM2612Write_940(0, i); - YM2612Write_940(1, REGS[i]); +void YM2612PicoStateSave2_940(int tat, int tbt) +{ + UINT8 *ym_remote_regs, *ym_local_regs; + add_job_940(JOB940_PICOSTATESAVE2); + if (CHECK_BUSY(JOB940_PICOSTATESAVE2)) wait_busy_940(JOB940_PICOSTATESAVE2); + + ym_remote_regs = (UINT8 *) shared_ctl->writebuff0; + ym_local_regs = YM2612GetRegs(); + if (*(UINT32 *)(ym_remote_regs + 0x100) != 0x41534d59) { + printf("code940 didn't return valid save data\n"); + return; } - for(i = 0; i < 0x100; i++) { - YM2612Write_940(2, i); - YM2612Write_940(3, REGS[i|0x100]); + + /* copy addin data only */ + memcpy(ym_local_regs, ym_remote_regs, 0x20); + memcpy(ym_local_regs + 0x100, ym_remote_regs + 0x100, 0x30); + memcpy(ym_local_regs + 0x0b8, ym_remote_regs + 0x0b8, 0x48); + memcpy(ym_local_regs + 0x1b8, ym_remote_regs + 0x1b8, 0x48); + *(INT32 *)(ym_local_regs + 0x108) = tat; + *(INT32 *)(ym_local_regs + 0x10c) = tbt; +} + +int YM2612PicoStateLoad2_940(int *tat, int *tbt) +{ + UINT8 *ym_remote_regs, *ym_local_regs; + ym_local_regs = YM2612GetRegs(); + ym_remote_regs = (UINT8 *) shared_ctl->writebuff0; + + if (*(UINT32 *)(ym_local_regs + 0x100) != 0x41534d59) + return -1; + + *tat = *(INT32 *)(ym_local_regs + 0x108); + *tbt = *(INT32 *)(ym_local_regs + 0x10c); + + if (CHECK_BUSY(JOB940_YM2612UPDATEONE)) wait_busy_940(JOB940_YM2612UPDATEONE); + + /* flush writes */ + if (shared_ctl->writebuffsel == 1) { + shared_ctl->writebuff0[writebuff_ptr & 0xffff] = 0xffff; + } else { + shared_ctl->writebuff1[writebuff_ptr & 0xffff] = 0xffff; } + shared_ctl->writebuffsel ^= 1; + writebuff_ptr = 0; + add_job_940(JOB940_PICOSTATELOAD2_PREP); + if (CHECK_BUSY(JOB940_PICOSTATELOAD2_PREP)) wait_busy_940(JOB940_PICOSTATELOAD2_PREP); + + memcpy(ym_remote_regs, ym_local_regs, 0x200); + + add_job_940(JOB940_PICOSTATELOAD2); + if (CHECK_BUSY(JOB940_PICOSTATELOAD2)) wait_busy_940(JOB940_PICOSTATELOAD2); - addr_A1 = old_A1; + return 0; } static void internal_reset(void) { writebuff_ptr = 0; - ST_mode = 0; - ST_status = 0; /* normal mode */ - ST_TA = 0; - ST_TAC = 0; - ST_TB = 0; - ST_TBC = 0; - dacen = 0; + ST_address = addr_A1 = -1; } /* this must be called after mmu hack, the allocated regions must not get cached */ -void sharedmem_init(void) +void sharedmem940_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) + if (shared_mem == MAP_FAILED) { printf("mmap(shared_data) failed with %i\n", errno); exit(1); @@ -360,7 +262,7 @@ void sharedmem_init(void) 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); + mp3_mem = (unsigned char *) mmap(0, MP3_SIZE_MAX, PROT_READ|PROT_WRITE, MAP_SHARED, memdev, 0x2400000); if (mp3_mem == MAP_FAILED) { printf("mmap(mp3_mem) failed with %i\n", errno); @@ -370,7 +272,7 @@ void sharedmem_init(void) } -void sharedmem_deinit(void) +void sharedmem940_finish(void) { munmap(shared_mem, 0x210000); munmap(mp3_mem, MP3_SIZE_MAX); @@ -380,44 +282,43 @@ void sharedmem_deinit(void) } -extern char **g_argv; - -/* none of the functions in this file should be called before this one */ void YM2612Init_940(int baseclock, int rate) { + static int oldrate; + + // HACK + if (Pico.m.frame_count > 0 && !crashed_940 && rate == oldrate) + return; + printf("YM2612Init_940()\n"); printf("Mem usage: shared_data: %i, shared_ctl: %i\n", sizeof(*shared_data), sizeof(*shared_ctl)); - Reset940(1, 2); - Pause940(1); + reset940(1, 2); + pause940(1); - gp2x_memregs[0x3B40>>1] = 0; // disable DUALCPU interrupts for 920 - gp2x_memregs[0x3B42>>1] = 1; // enable DUALCPU interrupts for 940 + memregs[0x3B40>>1] = 0; // disable DUALCPU interrupts for 920 + 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 + memregl[0x4504>>2] = 0; // make sure no FIQs will be generated + memregl[0x4508>>2] = ~(1<<26); // unmask DUALCPU ints in the undocumented 940's interrupt controller if (crashed_940) { unsigned char ucData[1024]; - int nRead, i, nLen = 0; - char binpath[1024]; + int nRead, nLen = 0; + char binpath[512]; FILE *fp; - strncpy(binpath, g_argv[0], 1023); - binpath[1023] = 0; - for (i = strlen(binpath); i > 0; i--) - if (binpath[i] == '/') { binpath[i] = 0; break; } - strcat(binpath, "/code940.bin"); - + emu_make_path(binpath, CODE940_FILE, sizeof(binpath)); fp = fopen(binpath, "rb"); if(!fp) { - memset(gp2x_screen, 0, 320*240); - gp2x_text_out8(10, 100, "failed to open required file:"); - gp2x_text_out8(10, 110, "code940.bin"); - gp2x_video_flip(); + memset(g_screen_ptr, 0, 320*240*2); + text_out16(10, 100, "failed to open required file:"); + text_out16(10, 110, CODE940_FILE); + gp2x_video_flip2(); + in_menu_wait(PBTN_MOK|PBTN_MBACK, NULL, 100); printf("failed to open %s\n", binpath); exit(1); } @@ -437,22 +338,20 @@ void YM2612Init_940(int baseclock, int rate) memset(shared_data, 0, sizeof(*shared_data)); memset(shared_ctl, 0, sizeof(*shared_ctl)); - REGS = YM2612GetRegs(); - - ym2612_dacen = &dacen; - ym2612_dacout = &dacout; + /* cause local ym2612 to init REGS */ + YM2612Init_(baseclock, rate); internal_reset(); - loaded_mp3 = 0; + loaded_mp3 = NULL; - 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 + memregs[0x3B46>>1] = 0xffff; // clear pending DUALCPU interrupts for 940 + memregl[0x4500>>2] = 0xffffffff; // clear pending IRQs in SRCPND + memregl[0x4510>>2] = 0xffffffff; // clear pending IRQs in INTPND /* start the 940 */ - Reset940(0, 2); - Pause940(0); + reset940(0, 2); + pause940(0); // YM2612ResetChip_940(); // will be done on JOB940_YM2612INIT @@ -460,17 +359,20 @@ void YM2612Init_940(int baseclock, int rate) shared_ctl->baseclock = baseclock; shared_ctl->rate = rate; add_job_940(JOB940_INITALL); + + oldrate = rate; } void YM2612ResetChip_940(void) { - printf("YM2612ResetChip_940()\n"); + //printf("YM2612ResetChip_940()\n"); if (shared_data == NULL) { printf("YM2612ResetChip_940: reset before init?\n"); return; } + YM2612ResetChip_(); internal_reset(); add_job_940(JOB940_YM2612RESETCHIP); @@ -489,7 +391,7 @@ int YM2612UpdateOne_940(int *buffer, int length, int stereo, int is_buf_empty) ym_active_chs = shared_ctl->ym_active_chs; // mix in ym buffer. is_buf_empty means nobody mixed there anything yet and it may contain trash - if (is_buf_empty && ym_active_chs) memcpy32(buffer, ym_buf, length<writebuffsel == 1) { @@ -501,8 +403,8 @@ int YM2612UpdateOne_940(int *buffer, int length, int stereo, int is_buf_empty) /* predict sample counter for next frame */ if (PsndLen_exc_add) { - if (PsndLen_exc_cnt + PsndLen_exc_add >= 0x10000) length = PsndLen + 1; - else length = PsndLen; + length = PsndLen; + if (PsndLen_exc_cnt + PsndLen_exc_add >= 0x10000) length++; } /* give 940 ym job */ @@ -516,90 +418,51 @@ int YM2612UpdateOne_940(int *buffer, int length, int stereo, int is_buf_empty) } -static int mp3_samples_ready = 0, mp3_buffer_offs = 0; -static int mp3_play_bufsel = 0, mp3_job_started = 0; - -void mp3_update(int *buffer, int length, int stereo) -{ - int length_mp3; - int cdda_on; - - // 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; +/***********************************************************/ - if (!cdda_on) return; +// FIXME: double buffering no longer used.. - if (!(PicoOpt&0x200)) { - mp3_update_local(buffer, length, stereo); - return; +int mp3dec_decode(FILE *f, int *file_pos, int file_len) +{ + if (!(PicoIn.opt & POPT_EXT_FM)) { + //mp3_update_local(buffer, length, stereo); + return 0; } - 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; + // check if playback was started, track not ended + if (loaded_mp3 == NULL || shared_ctl->mp3_offs >= shared_ctl->mp3_len) { + *file_pos = file_len; + return 1; } - /* mix mp3 data, only stereo */ - if (mp3_samples_ready >= length_mp3) - { - 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; } + /* do we have to wait? */ + if (CHECK_BUSY(JOB940_MP3DECODE)) + wait_busy_940(JOB940_MP3DECODE); - if (1152 - mp3_buffer_offs >= length_mp3) { - mix_samples(buffer, shared_data->mp3_buffer[mp3_play_bufsel] + mp3_buffer_offs*2, length<<1); + memcpy(cdda_out_buffer, + shared_data->mp3_buffer[shared_ctl->mp3_buffsel], + sizeof(cdda_out_buffer)); - mp3_buffer_offs += length_mp3; - } else { - // collect samples from both buffers.. - int left = 1152 - mp3_buffer_offs; - 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_mp3; - } + *file_pos = shared_ctl->mp3_offs; - // ask to decode more if we already can - if (!mp3_job_started) - { - mp3_job_started = 1; - shared_ctl->mp3_buffsel ^= 1; + if (shared_ctl->mp3_offs < shared_ctl->mp3_len) { + // ask to decode more + //shared_ctl->mp3_buffsel ^= 1; add_job_940(JOB940_MP3DECODE); } -} + return 0; +} -/***********************************************************/ - -void mp3_start_play(FILE *f, int pos) // pos is 0-1023 +int mp3dec_start(FILE *f, int fpos_start) { - int byte_offs = 0; - - if (!(PicoOpt&0x800)) { // cdda disabled? - return; + if (!(PicoIn.opt & POPT_EXT_FM)) { + //mp3_start_play_local(f, pos); + return -1; } if (loaded_mp3 != f) { - // printf("loading mp3... "); fflush(stdout); if (PicoMessage != NULL) { fseek(f, 0, SEEK_END); @@ -608,54 +471,31 @@ void mp3_start_play(FILE *f, int pos) // pos is 0-1023 } 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("Warning: mp3 was 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); - } + // 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); reset_timing = 1; } - // seek.. - if (pos) { - byte_offs = (shared_ctl->mp3_len << 6) >> 10; - byte_offs *= pos; - byte_offs >>= 6; - } - // 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 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(); -} - - -int mp3_get_offset(void) -{ - int offs1024 = 0; - int cdda_on; + shared_ctl->mp3_offs = fpos_start; + shared_ctl->mp3_buffsel = 0; - cdda_on = (PicoMCD & 1) && (PicoOpt&0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) && - (Pico_mcd->scd.Status_CDC & 1) && loaded_mp3; + add_job_940(JOB940_MP3RESET); + if (CHECK_BUSY(JOB940_MP3RESET)) + wait_busy_940(JOB940_MP3RESET); - if (cdda_on) { - offs1024 = shared_ctl->mp3_offs << 7; - offs1024 /= shared_ctl->mp3_len; - offs1024 <<= 3; + // because we decode ahea, need to start now + if (shared_ctl->mp3_offs < shared_ctl->mp3_len) { + add_job_940(JOB940_MP3DECODE); } - printf("offs1024=%i (%i/%i)\n", offs1024, shared_ctl->mp3_offs, shared_ctl->mp3_len); - return offs1024; + return 0; } -