diff options
| author | notaz | 2011-06-29 19:55:38 +0300 |
|---|---|---|
| committer | notaz | 2011-07-08 00:15:20 +0300 |
| commit | 1f77c86322bf6567909da192fdbf6c28c0596a13 (patch) | |
| tree | 53ebe1996edd59efbf3dcc4ac16de28ccffc67b5 /libpcsxcore/psxhw.h | |
| parent | ad418c19cd4ca9a80820593609b786c6993b2eda (diff) | |
| download | pcsx_rearmed-1f77c86322bf6567909da192fdbf6c28c0596a13.tar.gz pcsx_rearmed-1f77c86322bf6567909da192fdbf6c28c0596a13.tar.bz2 pcsx_rearmed-1f77c86322bf6567909da192fdbf6c28c0596a13.zip | |
dma: more accurate ICR register handling
based on tests on ther real thing.
Diffstat (limited to 'libpcsxcore/psxhw.h')
| -rw-r--r-- | libpcsxcore/psxhw.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/libpcsxcore/psxhw.h b/libpcsxcore/psxhw.h index cd4e928..1d1822f 100644 --- a/libpcsxcore/psxhw.h +++ b/libpcsxcore/psxhw.h @@ -57,11 +57,21 @@ extern "C" { #define HW_DMA_PCR (psxHu32ref(0x10f0)) #define HW_DMA_ICR (psxHu32ref(0x10f4)) -#define DMA_INTERRUPT(n) \ - if (SWAPu32(HW_DMA_ICR) & (1 << (16 + n))) { \ - HW_DMA_ICR |= SWAP32(1 << (24 + n)); \ - psxHu32ref(0x1070) |= SWAP32(8); \ - } +#define HW_DMA_ICR_BUS_ERROR (1<<15) +#define HW_DMA_ICR_GLOBAL_ENABLE (1<<23) +#define HW_DMA_ICR_IRQ_SENT (1<<31) + +#define DMA_INTERRUPT(n) { \ + u32 icr = SWAPu32(HW_DMA_ICR); \ + if (icr & (1 << (16 + n))) { \ + icr |= 1 << (24 + n); \ + if (icr & HW_DMA_ICR_GLOBAL_ENABLE && !(icr & HW_DMA_ICR_IRQ_SENT)) { \ + psxHu32ref(0x1070) |= SWAP32(8); \ + icr |= HW_DMA_ICR_IRQ_SENT; \ + } \ + HW_DMA_ICR = SWAP32(icr); \ + } \ +} void psxHwReset(); u8 psxHwRead8(u32 add); |