#include "../common/arm_utils.h"\r
#include "../common/menu.h"\r
#include "../common/emu.h"\r
-#include "../../Pico/PicoInt.h"\r
-#include "../../Pico/sound/ym2612.h"\r
-#include "../../Pico/sound/mix.h"\r
+#include "../../pico/pico_int.h"\r
+#include "../../pico/sound/ym2612.h"\r
+#include "../../pico/sound/mix.h"\r
\r
/* we will need some gp2x internals here */\r
extern volatile unsigned short *gp2x_memregs; /* from minimal library rlyeh */\r
unsigned char *mp3_mem = 0;\r
\r
#define MP3_SIZE_MAX (0x400000 + 0x800000) // 12M\r
-#define CODE940_FILE "pico940.bin"\r
+#define CODE940_FILE "pico940_v3.bin"\r
\r
int crashed_940 = 0;\r
\r
}\r
\r
/* these will be managed locally on our side */\r
-static UINT8 *REGS = 0; /* we will also keep local copy of regs for savestates and such */\r
-static INT32 *addr_A1; /* address line A1 */\r
-\r
-static int dacen;\r
-static INT32 dacout;\r
static UINT8 ST_address; /* address register */\r
+static INT32 addr_A1; /* address line A1 */\r
\r
static int writebuff_ptr = 0;\r
\r
\r
-/* OPN Mode Register Write */\r
-static int set_timers( int v )\r
-{\r
- int change;\r
-\r
- /* b7 = CSM MODE */\r
- /* b6 = 3 slot mode */\r
- /* b5 = reset b */\r
- /* b4 = reset a */\r
- /* b3 = timer enable b */\r
- /* b2 = timer enable a */\r
- /* b1 = load b */\r
- /* b0 = load a */\r
- change = (ym2612_st->mode ^ v) & 0xc0;\r
- ym2612_st->mode = v;\r
-\r
- /* reset Timer b flag */\r
- if( v & 0x20 )\r
- ym2612_st->status &= ~2;\r
-\r
- /* reset Timer a flag */\r
- if( v & 0x10 )\r
- ym2612_st->status &= ~1;\r
-\r
- return change;\r
-}\r
-\r
/* YM2612 write */\r
/* a = address */\r
/* v = value */\r
/* returns 1 if sample affecting state changed */\r
-int YM2612Write_940(unsigned int a, unsigned int v)\r
+int YM2612Write_940(unsigned int a, unsigned int v, int scanline)\r
{\r
- int addr;\r
int upd = 1; /* the write affects sample generation */\r
\r
- v &= 0xff; /* adjust to 8 bit bus */\r
a &= 3;\r
\r
//printf("%05i:%03i: ym w ([%i] %02x)\n", Pico.m.frame_count, Pico.m.scanline, a, v);\r
\r
- switch( a ) {\r
- case 0: /* address port 0 */\r
- if (!*addr_A1 && ST_address == v)\r
- return 0; /* address already selected, don't send this command to 940 */\r
- ST_address = v;\r
- /* don't send DAC or timer related address changes to 940 */\r
- if (!*addr_A1 && (v & 0xf0) == 0x20 &&\r
- (v == 0x24 || v == 0x25 || v == 0x26 || v == 0x2a))\r
+ switch (a)\r
+ {\r
+ case 0: /* address port 0 */\r
+ if (addr_A1 == 0 && ST_address == v)\r
+ return 0; /* address already selected, don't send this command to 940 */\r
+ ST_address = v;\r
+ addr_A1 = 0;\r
+ /* don't send DAC or timer related address changes to 940 */\r
+ if (v == 0x24 || v == 0x25 || v == 0x26 || v == 0x2a)\r
return 0;\r
- *addr_A1 = 0;\r
- upd = 0;\r
- break;\r
-\r
- case 1: /* data port 0 */\r
- if (*addr_A1 != 0) {\r
- return 0; /* verified on real YM2608 */\r
- }\r
-\r
- addr = ST_address;\r
- REGS[addr] = v;\r
+ upd = 0;\r
+ break;\r
\r
- switch( addr & 0xf0 )\r
- {\r
- case 0x20: /* 0x20-0x2f Mode */\r
- switch( addr )\r
- {\r
- case 0x24: { // timer A High 8\r
- int TAnew = (ym2612_st->TA & 0x03)|(((int)v)<<2);\r
- if (ym2612_st->TA != TAnew) {\r
- // we should reset ticker only if new value is written. Outrun requires this.\r
- ym2612_st->TA = TAnew;\r
- ym2612_st->TAC = (1024-TAnew)*18;\r
- ym2612_st->TAT = 0;\r
- }\r
- return 0;\r
- }\r
- case 0x25: { // timer A Low 2\r
- int TAnew = (ym2612_st->TA & 0x3fc)|(v&3);\r
- if (ym2612_st->TA != TAnew) {\r
- ym2612_st->TA = TAnew;\r
- ym2612_st->TAC = (1024-TAnew)*18;\r
- ym2612_st->TAT = 0;\r
- }\r
- return 0;\r
- }\r
- case 0x26: // timer B\r
- if (ym2612_st->TB != v) {\r
- ym2612_st->TB = v;\r
- ym2612_st->TBC = (256-v)<<4;\r
- ym2612_st->TBC *= 18;\r
- ym2612_st->TBT = 0;\r
- }\r
+ case 2: /* address port 1 */\r
+ if (addr_A1 == 1 && ST_address == v)\r
return 0;\r
- case 0x27: /* mode, timer control */\r
- if (set_timers( v ))\r
- break; // other side needs ST.mode for 3slot mode\r
- return 0;\r
- case 0x2a: /* DAC data (YM2612) */\r
- dacout = ((int)v - 0x80) << 6; /* level unknown (notaz: 8 seems to be too much) */\r
- return 0;\r
- case 0x2b: /* DAC Sel (YM2612) */\r
- /* b7 = dac enable */\r
- dacen = v & 0x80;\r
- upd = 0;\r
- break; // other side has to know this\r
- default:\r
- break;\r
- }\r
+ ST_address = v;\r
+ addr_A1 = 1;\r
+ upd = 0;\r
break;\r
- }\r
- break;\r
-\r
- case 2: /* address port 1 */\r
- if (*addr_A1 && ST_address == v)\r
- return 0;\r
- ST_address = v;\r
- *addr_A1 = 1;\r
- upd = 0;\r
- break;\r
-\r
- case 3: /* data port 1 */\r
- if (*addr_A1 != 1) {\r
- return 0; /* verified on real YM2608 */\r
- }\r
-\r
- addr = ST_address | 0x100;\r
- REGS[addr] = v;\r
- break;\r
}\r
\r
//printf("ym pass\n");\r
\r
- if(currentConfig.EmuOpt & 4) {\r
+ if (currentConfig.EmuOpt & 4)\r
+ {\r
UINT16 *writebuff = shared_ctl->writebuffsel ? shared_ctl->writebuff0 : shared_ctl->writebuff1;\r
\r
/* detect rapid ym updates */\r
- if (upd && !(writebuff_ptr & 0x80000000) && Pico.m.scanline < 224) {\r
+ if (upd && !(writebuff_ptr & 0x80000000) && scanline < 224)\r
+ {\r
int mid = Pico.m.pal ? 68 : 93;\r
- if (Pico.m.scanline > mid) {\r
- //printf("%05i:%03i: rapid ym\n", Pico.m.frame_count, Pico.m.scanline);\r
+ if (scanline > mid) {\r
+ //printf("%05i:%03i: rapid ym\n", Pico.m.frame_count, scanline);\r
writebuff[writebuff_ptr++ & 0xffff] = 0xfffe;\r
writebuff_ptr |= 0x80000000;\r
- //printf("%05i:%03i: ym w ([%02x] %02x, upd=%i)\n", Pico.m.frame_count, Pico.m.scanline, addr, v, upd);\r
+ //printf("%05i:%03i: ym w ([%02x] %02x, upd=%i)\n", Pico.m.frame_count, scanline, addr, v, upd);\r
}\r
}\r
\r
\r
void YM2612PicoStateLoad_940(void)\r
{\r
- int i, old_A1 = *addr_A1;\r
+ UINT8 *REGS = YM2612GetRegs();\r
\r
/* make sure JOB940_PICOSTATELOAD gets done before next JOB940_YM2612UPDATEONE */\r
add_job_940(JOB940_PICOSTATELOAD);\r
if (CHECK_BUSY(JOB940_PICOSTATELOAD)) wait_busy_940(JOB940_PICOSTATELOAD);\r
\r
writebuff_ptr = 0;\r
+ addr_A1 = *(INT32 *) (REGS + 0x200);\r
+}\r
\r
- // feed all the registers and update internal state\r
- for(i = 0; i < 0x100; i++) {\r
- YM2612Write_940(0, i);\r
- YM2612Write_940(1, REGS[i]);\r
+void YM2612PicoStateSave2_940(int tat, int tbt)\r
+{\r
+ UINT8 *ym_remote_regs, *ym_local_regs;\r
+ add_job_940(JOB940_PICOSTATESAVE2);\r
+ if (CHECK_BUSY(JOB940_PICOSTATESAVE2)) wait_busy_940(JOB940_PICOSTATESAVE2);\r
+\r
+ ym_remote_regs = (UINT8 *) shared_ctl->writebuff0;\r
+ ym_local_regs = YM2612GetRegs();\r
+ if (*(UINT32 *)(ym_remote_regs + 0x100) != 0x41534d59) {\r
+ printf("code940 didn't return valid save data\n");\r
+ return;\r
}\r
- for(i = 0; i < 0x100; i++) {\r
- YM2612Write_940(2, i);\r
- YM2612Write_940(3, REGS[i|0x100]);\r
+\r
+ /* copy addin data only */\r
+ memcpy(ym_local_regs, ym_remote_regs, 0x20);\r
+ memcpy(ym_local_regs + 0x100, ym_remote_regs + 0x100, 0x30);\r
+ memcpy(ym_local_regs + 0x0b8, ym_remote_regs + 0x0b8, 0x48);\r
+ memcpy(ym_local_regs + 0x1b8, ym_remote_regs + 0x1b8, 0x48);\r
+ *(INT32 *)(ym_local_regs + 0x108) = tat;\r
+ *(INT32 *)(ym_local_regs + 0x10c) = tbt;\r
+}\r
+\r
+int YM2612PicoStateLoad2_940(int *tat, int *tbt)\r
+{\r
+ UINT8 *ym_remote_regs, *ym_local_regs;\r
+ ym_local_regs = YM2612GetRegs();\r
+ ym_remote_regs = (UINT8 *) shared_ctl->writebuff0;\r
+\r
+ if (*(UINT32 *)(ym_local_regs + 0x100) != 0x41534d59)\r
+ return -1;\r
+\r
+ *tat = *(INT32 *)(ym_local_regs + 0x108);\r
+ *tbt = *(INT32 *)(ym_local_regs + 0x10c);\r
+\r
+ if (CHECK_BUSY(JOB940_YM2612UPDATEONE)) wait_busy_940(JOB940_YM2612UPDATEONE);\r
+\r
+ /* flush writes */\r
+ if (shared_ctl->writebuffsel == 1) {\r
+ shared_ctl->writebuff0[writebuff_ptr & 0xffff] = 0xffff;\r
+ } else {\r
+ shared_ctl->writebuff1[writebuff_ptr & 0xffff] = 0xffff;\r
}\r
+ shared_ctl->writebuffsel ^= 1;\r
+ writebuff_ptr = 0;\r
+ add_job_940(JOB940_PICOSTATELOAD2_PREP);\r
+ if (CHECK_BUSY(JOB940_PICOSTATELOAD2_PREP)) wait_busy_940(JOB940_PICOSTATELOAD2_PREP);\r
+\r
+ memcpy(ym_remote_regs, ym_local_regs, 0x200);\r
\r
- *addr_A1 = old_A1;\r
+ add_job_940(JOB940_PICOSTATELOAD2);\r
+ if (CHECK_BUSY(JOB940_PICOSTATELOAD2)) wait_busy_940(JOB940_PICOSTATELOAD2);\r
+\r
+ return 0;\r
}\r
\r
\r
static void internal_reset(void)\r
{\r
writebuff_ptr = 0;\r
- ym2612_st->mode = 0;\r
- ym2612_st->status = 0; /* normal mode */\r
- ym2612_st->TA = 0;\r
- ym2612_st->TAC = 0;\r
- ym2612_st->TAT = 0;\r
- ym2612_st->TB = 0;\r
- ym2612_st->TBC = 0;\r
- ym2612_st->TBT = 0;\r
- dacen = 0;\r
- dacout = 0;\r
- ST_address= 0;\r
+ ST_address = addr_A1 = -1;\r
}\r
\r
\r
if (shared_mem != NULL) return;\r
\r
shared_mem = (unsigned char *) mmap(0, 0x210000, PROT_READ|PROT_WRITE, MAP_SHARED, memdev, 0x2000000);\r
- if(shared_mem == MAP_FAILED)\r
+ if (shared_mem == MAP_FAILED)\r
{\r
printf("mmap(shared_data) failed with %i\n", errno);\r
exit(1);\r
\r
extern char **g_argv;\r
\r
-/* none of the functions in this file should be called before this one */\r
void YM2612Init_940(int baseclock, int rate)\r
{\r
printf("YM2612Init_940()\n");\r
fp = fopen(binpath, "rb");\r
if(!fp)\r
{\r
- memset(gp2x_screen, 0, 320*240*2);\r
+ memset(g_screen_ptr, 0, 320*240*2);\r
text_out16(10, 100, "failed to open required file:");\r
text_out16(10, 110, CODE940_FILE);\r
gp2x_video_flip2();\r
/* cause local ym2612 to init REGS */\r
YM2612Init_(baseclock, rate);\r
\r
- REGS = YM2612GetRegs();\r
- addr_A1 = (INT32 *) (REGS + 0x200);\r
-\r
- ym2612_dacen = &dacen;\r
- ym2612_dacout = &dacout;\r
-\r
internal_reset();\r
\r
loaded_mp3 = 0;\r
\r
void YM2612ResetChip_940(void)\r
{\r
- printf("YM2612ResetChip_940()\n");\r
+ //printf("YM2612ResetChip_940()\n");\r
if (shared_data == NULL) {\r
printf("YM2612ResetChip_940: reset before init?\n");\r
return;\r
}\r
\r
+ YM2612ResetChip_();\r
internal_reset();\r
\r
add_job_940(JOB940_YM2612RESETCHIP);\r
\r
/* predict sample counter for next frame */\r
if (PsndLen_exc_add) {\r
- if (PsndLen_exc_cnt + PsndLen_exc_add >= 0x10000) length = PsndLen + 1;\r
- else length = PsndLen;\r
+ length = PsndLen;\r
+ if (PsndLen_exc_cnt + PsndLen_exc_add >= 0x10000) length++;\r
}\r
\r
/* give 940 ym job */\r
shared_ctl->mp3_len = ftell(f);\r
loaded_mp3 = f;\r
\r
- if (PicoOpt&0x200) {\r
+ if (PicoOpt & POPT_EXT_FM) {\r
// as we are going to change 940's cacheable area, we must invalidate it's cache..\r
if (CHECK_BUSY(JOB940_MP3DECODE)) wait_busy_940(JOB940_MP3DECODE);\r
add_job_940(JOB940_INVALIDATE_DCACHE);\r
byte_offs *= pos;\r
byte_offs >>= 6;\r
}\r
- // printf("mp3 pos1024: %i, byte_offs %i/%i\n", pos, byte_offs, shared_ctl->mp3_len);\r
+ printf(" mp3 pos1024: %i, byte_offs %i/%i\n", pos, byte_offs, shared_ctl->mp3_len);\r
\r
shared_ctl->mp3_offs = byte_offs;\r
\r
mp3_job_started = 0;\r
shared_ctl->mp3_buffsel = 1; // will change to 0 on first decode\r
\r
- if (!(PicoOpt&0x200)) mp3_start_local();\r
+ if (PicoOpt & POPT_EXT_FM)\r
+ {\r
+ add_job_940(JOB940_MP3RESET);\r
+ if (CHECK_BUSY(JOB940_MP3RESET)) wait_busy_940(JOB940_MP3RESET);\r
+ }\r
+ else\r
+ mp3_start_local();\r
}\r
\r
\r
unsigned int offs1024 = 0;\r
int cdda_on;\r
\r
- cdda_on = (PicoMCD & 1) && (PicoOpt&0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) &&\r
+ cdda_on = (PicoAHW & PAHW_MCD) && (PicoOpt&0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) &&\r
(Pico_mcd->scd.Status_CDC & 1) && loaded_mp3;\r
\r
if (cdda_on) {\r
notaz.gp2x.de / libpicofe.git / blobdiff