X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2F940ctl.c;h=f01ffa3329b3950eda59f87f2492ce0eab3781f0;hb=6e507f764b95d5f6088ea7f174586cfb0360a236;hp=917ed29c0d8284cecd1894f6b22fb38fefd7b58b;hpb=5ecedd0cc2257b564dfcf68cb0e9d7d541bfc2b8;p=libpicofe.git diff --git a/gp2x/940ctl.c b/gp2x/940ctl.c index 917ed29..f01ffa3 100644 --- a/gp2x/940ctl.c +++ b/gp2x/940ctl.c @@ -33,7 +33,7 @@ _940_ctl_t *shared_ctl = 0; unsigned char *mp3_mem = 0; #define MP3_SIZE_MAX (0x400000 + 0x800000) // 12M -#define CODE940_FILE "pico940.bin" +#define CODE940_FILE "pico940_v3.bin" int crashed_940 = 0; @@ -51,160 +51,61 @@ static FILE *loaded_mp3 = 0; } /* these will be managed locally on our side */ -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 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 = (ym2612_st->mode ^ v) & 0xc0; - ym2612_st->mode = v; - - /* reset Timer b flag */ - if( v & 0x20 ) - ym2612_st->status &= ~2; - - /* reset Timer a flag */ - if( v & 0x10 ) - ym2612_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 = (ym2612_st->TA & 0x03)|(((int)v)<<2); - if (ym2612_st->TA != TAnew) { - // we should reset ticker only if new value is written. Outrun requires this. - ym2612_st->TA = TAnew; - ym2612_st->TAC = (1024-TAnew)*18; - ym2612_st->TAT = 0; - } - return 0; - } - case 0x25: { // timer A Low 2 - int TAnew = (ym2612_st->TA & 0x3fc)|(v&3); - if (ym2612_st->TA != TAnew) { - ym2612_st->TA = TAnew; - ym2612_st->TAC = (1024-TAnew)*18; - ym2612_st->TAT = 0; - } - return 0; - } - case 0x26: // timer B - if (ym2612_st->TB != v) { - ym2612_st->TB = v; - ym2612_st->TBC = (256-v)<<4; - ym2612_st->TBC *= 18; - ym2612_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); } } @@ -272,42 +173,76 @@ static void add_job_940(int job) 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); - *addr_A1 = old_A1; + add_job_940(JOB940_PICOSTATELOAD2); + if (CHECK_BUSY(JOB940_PICOSTATELOAD2)) wait_busy_940(JOB940_PICOSTATELOAD2); + + return 0; } static void internal_reset(void) { writebuff_ptr = 0; - ym2612_st->mode = 0; - ym2612_st->status = 0; /* normal mode */ - ym2612_st->TA = 0; - ym2612_st->TAC = 0; - ym2612_st->TAT = 0; - ym2612_st->TB = 0; - ym2612_st->TBC = 0; - ym2612_st->TBT = 0; - dacen = 0; - dacout = 0; - ST_address= 0; + ST_address = addr_A1 = -1; } @@ -317,7 +252,7 @@ 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) + if (shared_mem == MAP_FAILED) { printf("mmap(shared_data) failed with %i\n", errno); exit(1); @@ -347,7 +282,6 @@ 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) { printf("YM2612Init_940()\n"); @@ -405,12 +339,6 @@ void YM2612Init_940(int baseclock, int rate) /* cause local ym2612 to init REGS */ YM2612Init_(baseclock, rate); - REGS = YM2612GetRegs(); - addr_A1 = (INT32 *) (REGS + 0x200); - - ym2612_dacen = &dacen; - ym2612_dacout = &dacout; - internal_reset(); loaded_mp3 = 0; @@ -434,12 +362,13 @@ void YM2612Init_940(int baseclock, int 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); @@ -470,8 +399,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 */ @@ -579,7 +508,7 @@ void mp3_start_play(FILE *f, int pos) // pos is 0-1023 shared_ctl->mp3_len = ftell(f); loaded_mp3 = f; - if (PicoOpt&0x200) { + if (PicoOpt & POPT_EXT_FM) { // 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); @@ -593,7 +522,7 @@ 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; @@ -602,7 +531,13 @@ void mp3_start_play(FILE *f, int pos) // pos is 0-1023 mp3_job_started = 0; shared_ctl->mp3_buffsel = 1; // will change to 0 on first decode - if (!(PicoOpt&0x200)) mp3_start_local(); + if (PicoOpt & POPT_EXT_FM) + { + add_job_940(JOB940_MP3RESET); + if (CHECK_BUSY(JOB940_MP3RESET)) wait_busy_940(JOB940_MP3RESET); + } + else + mp3_start_local(); } @@ -611,7 +546,7 @@ int mp3_get_offset(void) unsigned int offs1024 = 0; int cdda_on; - cdda_on = (PicoMCD & 1) && (PicoOpt&0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) && + cdda_on = (PicoAHW & PAHW_MCD) && (PicoOpt&0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1) && loaded_mp3; if (cdda_on) {