diff options
author | Twinaphex | 2014-12-20 20:43:18 +0100 |
---|---|---|
committer | Twinaphex | 2014-12-20 20:43:18 +0100 |
commit | 247fc699be6b3bd95fd9126541e0804cc8dffdd4 (patch) | |
tree | d38e169e68e48a3ccbf8a3805f9cb87197ed894a /libpcsxcore/psxhw.c | |
parent | 3e5b01fcef8ef20dacca45ea7a7b0c461e6bd666 (diff) | |
parent | 7931825ed8ef51dab3e37475d8126103ebc9fb6f (diff) | |
download | pcsx_rearmed-247fc699be6b3bd95fd9126541e0804cc8dffdd4.tar.gz pcsx_rearmed-247fc699be6b3bd95fd9126541e0804cc8dffdd4.tar.bz2 pcsx_rearmed-247fc699be6b3bd95fd9126541e0804cc8dffdd4.zip |
Merge pull request #11 from notaz/upstream_merge
Upstream merge
Diffstat (limited to 'libpcsxcore/psxhw.c')
-rw-r--r-- | libpcsxcore/psxhw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libpcsxcore/psxhw.c b/libpcsxcore/psxhw.c index 6b9125d..c90f8c7 100644 --- a/libpcsxcore/psxhw.c +++ b/libpcsxcore/psxhw.c @@ -493,7 +493,7 @@ void psxHwWrite16(u32 add, u16 value) { default: if (add>=0x1f801c00 && add<0x1f801e00) { - SPU_writeRegister(add, value); + SPU_writeRegister(add, value, psxRegs.cycle); return; } @@ -747,8 +747,8 @@ void psxHwWrite32(u32 add, u32 value) { default: // Dukes of Hazard 2 - car engine noise if (add>=0x1f801c00 && add<0x1f801e00) { - SPU_writeRegister(add, value&0xffff); - SPU_writeRegister(add + 2, value>>16); + SPU_writeRegister(add, value&0xffff, psxRegs.cycle); + SPU_writeRegister(add + 2, value>>16, psxRegs.cycle); return; } |