From 9f8b032dc5074e29f2e93ce06651f6da3bb70a86 Mon Sep 17 00:00:00 2001
From: notaz
Date: Tue, 25 Jan 2011 16:51:27 +0200
Subject: cdrom: merge most of cdrom.c from latest pcsxr (r62214)

most changes pulled are shalma's work
---
 libpcsxcore/new_dynarec/emu_if.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'libpcsxcore/new_dynarec')

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;
 }
 
-- 
cgit v1.2.3