RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sound: fix ym2612 address handling

Browse source 
I already fixed this back in 2017 with
151df6adf9, but forgot about
ym2612_write_local(). Fixes missing sounds in Overdrive2.
This commit is contained in:
notaz 2023-06-12 23:55:50 +03:00 • committed by irixxxx
parent 5864c4214a
commit 225260ba40
2 changed files with 13 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

43
pico/memory.c
View file

@ -1112,31 +1112,20 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80)
int addr; int addr;
a &= 3; a &= 3;
if (a == 1 && ym2612.OPN.ST.address == 0x2a) /* DAC data */
{
int cycles = is_from_z80 ? z80_cyclesDone() : z80_cycles_from_68k();
//elprintf(EL_STATUS, "%03i dac w %08x z80 %i", cycles, d, is_from_z80);
if (ym2612.dacen)
PsndDoDAC(cycles);
ym2612.dacout = ((int)d - 0x80) << 6;
return 0;
}
switch (a) switch (a)
{ {
case 0: /* address port 0 */ case 0: /* address port 0 */
case 2: /* address port 1 */
ym2612.OPN.ST.address = d; ym2612.OPN.ST.address = d;
ym2612.addr_A1 = 0; ym2612.addr_A1 = (a & 2) >> 1;
#ifdef __GP2X__ #ifdef __GP2X__
if (PicoIn.opt & POPT_EXT_FM) YM2612Write_940(a, d, -1); if (PicoIn.opt & POPT_EXT_FM) YM2612Write_940(a, d, -1);
#endif #endif
return 0; return 0;
case 1: /* data port 0 */ case 1: /* data port 0 */
if (ym2612.addr_A1 != 0) case 3: /* data port 1 */
return 0; addr = ym2612.OPN.ST.address | ((int)ym2612.addr_A1 << 8);
addr = ym2612.OPN.ST.address;
ym2612.REGS[addr] = d; ym2612.REGS[addr] = d;
switch (addr) switch (addr)
@ -1201,6 +1190,14 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80)
} }
return 0; return 0;
} }
case 0x2a: { /* DAC data */
int cycles = is_from_z80 ? z80_cyclesDone() : z80_cycles_from_68k();
//elprintf(EL_STATUS, "%03i dac w %08x z80 %i", cycles, d, is_from_z80);
if (ym2612.dacen)
PsndDoDAC(cycles);
ym2612.dacout = ((int)d - 0x80) << 6;
return 0;
}
case 0x2b: { /* DAC Sel (YM2612) */ case 0x2b: { /* DAC Sel (YM2612) */
ym2612.dacen = d & 0x80; ym2612.dacen = d & 0x80;
#ifdef __GP2X__ #ifdef __GP2X__
@ -1210,22 +1207,6 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80)
} }
} }
break; break;
case 2: /* address port 1 */
ym2612.OPN.ST.address = d;
ym2612.addr_A1 = 1;
#ifdef __GP2X__
if (PicoIn.opt & POPT_EXT_FM) YM2612Write_940(a, d, -1);
#endif
return 0;
case 3: /* data port 1 */
if (ym2612.addr_A1 != 1)
return 0;
addr = ym2612.OPN.ST.address | 0x100;
ym2612.REGS[addr] = d;
break;
} }
#ifdef __GP2X__ #ifdef __GP2X__

1
pico/sound/ym2612.c
View file

@ -1886,6 +1886,7 @@ int YM2612Write_(unsigned int a, unsigned int v)
switch( a & 3 ){ switch( a & 3 ){
case 0: /* address port 0 */ case 0: /* address port 0 */
case 2: /* address port 1 */ case 2: /* address port 1 */
/* reminder: this is not used, see ym2612_write_local() */
ym2612.OPN.ST.address = v; ym2612.OPN.ST.address = v;
ym2612.addr_A1 = (a & 2) >> 1; ym2612.addr_A1 = (a & 2) >> 1;
ret = 0; ret = 0;