extern volatile unsigned short *gp2x_memregs; /* from minimal library rlyeh */\r
extern volatile unsigned long *gp2x_memregl;\r
\r
+extern int reset_timing;\r
static unsigned char *shared_mem = 0;\r
static _940_data_t *shared_data = 0;\r
_940_ctl_t *shared_ctl = 0;\r
\r
\r
/* OPN Mode Register Write */\r
-static void set_timers( int v )\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
/* b2 = timer enable a */\r
/* b1 = load b */\r
/* b0 = load a */\r
+ change = (ST_mode ^ v) & 0xc0;\r
ST_mode = v;\r
\r
/* reset Timer b flag */\r
/* reset Timer a flag */\r
if( v & 0x10 )\r
ST_status &= ~1;\r
+\r
+ return change;\r
}\r
\r
/* YM2612 write */\r
/* returns 1 if sample affecting state changed */\r
int YM2612Write_940(unsigned int a, unsigned int v)\r
{\r
- int addr; //, ret=1;\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
(v == 0x24 || v == 0x25 || v == 0x26 || v == 0x2a))\r
return 0;\r
addr_A1 = 0;\r
- //ret=0;\r
+ upd = 0;\r
break;\r
\r
case 1: /* data port 0 */\r
}\r
return 0;\r
case 0x27: /* mode, timer control */\r
- set_timers( v );\r
- break; // other side needs ST.mode for 3slot mode\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
return 0;\r
ST_address = v;\r
addr_A1 = 1;\r
- //ret=0;\r
+ upd = 0;\r
break;\r
\r
case 3: /* data port 1 */\r
break;\r
}\r
\r
+ //printf("ym pass\n");\r
+\r
if(currentConfig.EmuOpt & 4) {\r
- /* queue this write for 940 */\r
- if (writebuff_ptr < 2047) {\r
- if (shared_ctl->writebuffsel == 1) {\r
- shared_ctl->writebuff0[writebuff_ptr++] = (a<<8)|v;\r
- } else {\r
- shared_ctl->writebuff1[writebuff_ptr++] = (a<<8)|v;\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
+ 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
+ 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
}\r
+ }\r
+\r
+ /* queue this write for 940 */\r
+ if ((writebuff_ptr&0xffff) < 2047) {\r
+ writebuff[writebuff_ptr++ & 0xffff] = (a<<8)|v;\r
} else {\r
printf("warning: writebuff_ptr > 2047 ([%i] %02x)\n", a, v);\r
}\r
\r
addr_A1 = old_A1;\r
\r
- add_job_940(JOB940_PICOSTATELOAD);\r
+// add_job_940(JOB940_PICOSTATELOAD);\r
}\r
\r
\r
else memset32(buffer, 0, length<<stereo);\r
\r
if (shared_ctl->writebuffsel == 1) {\r
- shared_ctl->writebuff0[writebuff_ptr] = 0xffff;\r
+ shared_ctl->writebuff0[writebuff_ptr & 0xffff] = 0xffff;\r
} else {\r
- shared_ctl->writebuff1[writebuff_ptr] = 0xffff;\r
+ shared_ctl->writebuff1[writebuff_ptr & 0xffff] = 0xffff;\r
}\r
writebuff_ptr = 0;\r
\r
if (CHECK_BUSY(JOB940_MP3DECODE)) wait_busy_940(JOB940_MP3DECODE);\r
add_job_940(JOB940_INVALIDATE_DCACHE);\r
}\r
+ reset_timing = 1;\r
}\r
\r
// seek..\r