diff options
| author | notaz | 2015-02-06 01:29:00 +0200 |
|---|---|---|
| committer | notaz | 2015-02-06 01:29:00 +0200 |
| commit | 2af7e74feec67c0a798ac190774cb4b3e925be76 (patch) | |
| tree | 27a148679e25f6edb7a2dd85c54514139bb72450 /libpcsxcore/cdrom.c | |
| parent | cebb70f24ab54693b12aaa27b85a52689e26e1ff (diff) | |
| parent | 1e0eac2348343c8a046f7a75d460f087556cf7f6 (diff) | |
| download | pcsx_rearmed-2af7e74feec67c0a798ac190774cb4b3e925be76.tar.gz pcsx_rearmed-2af7e74feec67c0a798ac190774cb4b3e925be76.tar.bz2 pcsx_rearmed-2af7e74feec67c0a798ac190774cb4b3e925be76.zip | |
Merge branch 'upstream' into libretro
Diffstat (limited to 'libpcsxcore/cdrom.c')
| -rw-r--r-- | libpcsxcore/cdrom.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index 3a2eb1f..556b512 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -1413,13 +1413,15 @@ void psxDma3(u32 madr, u32 bcr, u32 chcr) { psxCpu->Clear(madr, cdsize / 4); pTransfer += cdsize; - - // burst vs normal if( chcr == 0x11400100 ) { + HW_DMA3_MADR = SWAPu32(madr + cdsize); CDRDMA_INT( (cdsize/4) / 4 ); } else if( chcr == 0x11000000 ) { - CDRDMA_INT( (cdsize/4) * 1 ); + // CDRDMA_INT( (cdsize/4) * 1 ); + // halted + psxRegs.cycle += (cdsize/4) * 24/2; + CDRDMA_INT(16); } return; |