X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2F940ctl.c;h=4bfd043c73b2dd907f14cb896b07ed632b5b5cd1;hb=f342bededbe5d51afd1632e689f5105e50d4f63e;hp=4a571ffd8838408984ac29a5eb6fc5b72bf79655;hpb=6850f9ec3b7c97084f1f0567824c65aa56e7fabb;p=libpicofe.git diff --git a/gp2x/940ctl.c b/gp2x/940ctl.c index 4a571ff..4bfd043 100644 --- a/gp2x/940ctl.c +++ b/gp2x/940ctl.c @@ -11,29 +11,24 @@ #include #include "code940/940shared.h" -#include "gp2x.h" -#include "emu.h" -#include "menu.h" +#include "soc_mmsp2.h" +#include "soc.h" #include "../common/mp3.h" #include "../common/arm_utils.h" #include "../common/menu.h" #include "../common/emu.h" -#include "../../Pico/PicoInt.h" -#include "../../Pico/sound/ym2612.h" -#include "../../Pico/sound/mix.h" +#include "../common/input.h" +#include "../../pico/pico_int.h" +#include "../../pico/sound/ym2612.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; 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 (0x400000 + 0x800000) // 12M -#define CODE940_FILE "pico940_v2.bin" +#define CODE940_FILE "pico940_v3.bin" int crashed_940 = 0; @@ -69,7 +64,8 @@ int YM2612Write_940(unsigned int a, unsigned int v, int scanline) //printf("%05i:%03i: ym w ([%i] %02x)\n", Pico.m.frame_count, Pico.m.scanline, a, v); - switch (a) { + 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 */ @@ -81,10 +77,6 @@ int YM2612Write_940(unsigned int a, unsigned int v, int scanline) upd = 0; break; - case 1: /* data port 0 */ - if (ST_address == 0x2b) upd = 0; /* DAC sel */ - break; - case 2: /* address port 1 */ if (addr_A1 == 1 && ST_address == v) return 0; @@ -153,7 +145,7 @@ static void wait_busy_940(int job) 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, too much overclock?"); + me_update_msg("940 crashed, too much overclock?"); engineState = PGS_Menu; crashed_940 = 1; } @@ -186,6 +178,61 @@ void YM2612PicoStateLoad_940(void) addr_A1 = *(INT32 *) (REGS + 0x200); } +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; + } + + /* 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); + + return 0; +} + static void internal_reset(void) { @@ -195,12 +242,12 @@ static void internal_reset(void) /* 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); @@ -218,7 +265,7 @@ void sharedmem_init(void) } -void sharedmem_deinit(void) +void sharedmem940_finish(void) { munmap(shared_mem, 0x210000); munmap(mp3_mem, MP3_SIZE_MAX); @@ -228,16 +275,13 @@ 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"); 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 @@ -249,23 +293,19 @@ void YM2612Init_940(int baseclock, int rate) 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_FILE); - + emu_make_path(binpath, CODE940_FILE, sizeof(binpath)); fp = fopen(binpath, "rb"); if(!fp) { - memset(gp2x_screen, 0, 320*240*2); + 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, 100); printf("failed to open %s\n", binpath); exit(1); } @@ -297,8 +337,8 @@ void YM2612Init_940(int baseclock, int rate) gp2x_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 @@ -348,8 +388,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 */ @@ -363,24 +403,24 @@ 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; - - // playback was started, track not ended - cdda_on = loaded_mp3 && shared_ctl->mp3_offs < shared_ctl->mp3_len; - - if (!cdda_on) return; - if (!(PicoOpt&0x200)) { + if (!(PicoOpt & POPT_EXT_FM)) { mp3_update_local(buffer, length, stereo); return; } + // check if playback was started, track not ended + if (loaded_mp3 == NULL || shared_ctl->mp3_offs >= shared_ctl->mp3_len) + return; + 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 @@ -433,13 +473,16 @@ void mp3_update(int *buffer, int length, int stereo) } -/***********************************************************/ - -void mp3_start_play(FILE *f, int pos) // pos is 0-1023 +void mp3_start_play(void *f_, int pos) // pos is 0-1023 { int byte_offs = 0; + FILE *f = f_; + + if (!(PicoOpt & POPT_EN_MCD_CDDA) || f == NULL) + return; - if (!(PicoOpt&0x800)) { // cdda disabled? + if (!(PicoOpt & POPT_EXT_FM)) { + mp3_start_play_local(f, pos); return; } @@ -457,7 +500,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); @@ -471,7 +514,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; @@ -480,25 +523,7 @@ 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(); -} - - -int mp3_get_offset(void) -{ - unsigned int offs1024 = 0; - int cdda_on; - - cdda_on = (PicoAHW & PAHW_MCD) && (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; - offs1024 /= shared_ctl->mp3_len >> 3; - } - printf("offs1024=%u (%i/%i)\n", offs1024, shared_ctl->mp3_offs, shared_ctl->mp3_len); - - return offs1024; + add_job_940(JOB940_MP3RESET); + if (CHECK_BUSY(JOB940_MP3RESET)) wait_busy_940(JOB940_MP3RESET); } -