git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@30228 e17a0e51-4ae3-4d35-97c3-1a29b211df97

2 files changed, 9 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 84e0d5e3..4cf2a63c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+September 21, 2009 Wei Mingzhi <weimingzhi@gmail.com>
+
+ * libpcsxcore/cdrom.c: Reverted the previous change as the CD change problem
+   can be fixed in the cdrSapu plugin.
+
 September 20, 2009 Wei Mingzhi <weimingzhi@gmail.com>
 
  * win32/glue/sys/mman.h: Use VirtualAlloc() and VirtualFree() instead of
diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index 31446ef4..9d2eb62a 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -156,8 +156,8 @@ void AddIrqQueue(unsigned char irq, unsigned long ecycle) {
 	} else {
 		CDR_INT(ecycle);
 	}
-}

-

+}
+
 void cdrInterrupt() {
 	int i;
 	unsigned char Irq = cdr.Irq;
@@ -190,14 +190,9 @@ void cdrInterrupt() {
 					cdr.Result[0] |= 0x11;
 					cdr.Result[0] &= ~0x02;
 				}
-				else if (i & 0x10) {

-					extern void *hCDRDriver;

+				else if (i & 0x10) {
 					cdr.StatP |= 0x2;
-					cdr.Result[0] |= 0x2;

-					if (hCDRDriver != NULL) {

-						CDR_close();

-						CDR_open();

-					}
+					cdr.Result[0] |= 0x2;
 					CheckCdrom();
 				}
 			}