diff options
| author | notaz | 2011-01-25 16:51:27 +0200 |
|---|---|---|
| committer | notaz | 2011-01-26 01:59:19 +0200 |
| commit | 9f8b032dc5074e29f2e93ce06651f6da3bb70a86 (patch) | |
| tree | e35354952f7afde669dfbfbf58c3428ddb457518 /libpcsxcore/new_dynarec | |
| parent | 7de557a6f7b032bd5bb5e0e5c8a6539b856d9c20 (diff) | |
| download | pcsx_rearmed-9f8b032dc5074e29f2e93ce06651f6da3bb70a86.tar.gz pcsx_rearmed-9f8b032dc5074e29f2e93ce06651f6da3bb70a86.tar.bz2 pcsx_rearmed-9f8b032dc5074e29f2e93ce06651f6da3bb70a86.zip | |
cdrom: merge most of cdrom.c from latest pcsxr (r62214)
most changes pulled are shalma's work
Diffstat (limited to 'libpcsxcore/new_dynarec')
| -rw-r--r-- | libpcsxcore/new_dynarec/emu_if.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c index a37f7a2..0942874 100644 --- a/libpcsxcore/new_dynarec/emu_if.c +++ b/libpcsxcore/new_dynarec/emu_if.c @@ -61,6 +61,8 @@ static irq_func * const irq_funcs[] = { [PSXINT_SPUDMA] = spuInterrupt, [PSXINT_MDECINDMA] = mdec0Interrupt, [PSXINT_GPUOTCDMA] = gpuotcInterrupt, + [PSXINT_CDRDMA] = cdrDmaInterrupt, + [PSXINT_CDRLID] = cdrLidSeekInterrupt, }; /* local dupe of psxBranchTest, using event_cycles */ @@ -133,7 +135,7 @@ void new_dyna_save(void) void new_dyna_restore(void) { int i; - for (i = 0; i < PSXINT_NEWDRC_CHECK; i++) + for (i = 0; i < PSXINT_COUNT; i++) event_cycles[i] = psxRegs.intCycle[i].sCycle + psxRegs.intCycle[i].cycle; } |