From aa1f72847647c2c2d6d20451ea5f64407f350b04 Mon Sep 17 00:00:00 2001
From: notaz
Date: Tue, 8 Feb 2011 17:11:42 +0200
Subject: cdrom: backport fixes from pcsxr

shalma:
 - bios - no cd - fix hangs (diskerror)
 - fix cdlplay resume
---
 libpcsxcore/cdrom.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'libpcsxcore/cdrom.c')

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index 4ca27e2..b063fa5 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -269,11 +269,12 @@ static void Check_Shell( int Irq )
 			i = stat.Status;
 			if (CDR_getStatus(&stat) != -1)
 			{
-				if (stat.Type == 0xff)
-					cdr.Stat = DiskError;
+				// BIOS hangs + BIOS error messages
+				//if (stat.Type == 0xff)
+					//cdr.Stat = DiskError;
 
 				// case now open
-				else if (stat.Status & STATUS_SHELLOPEN)
+				if (stat.Status & STATUS_SHELLOPEN)
 				{
 					// Vib Ribbon: pre-CD swap
 					StopCdda();
@@ -1601,14 +1602,8 @@ void cdrWrite1(unsigned char rt) {
 		/*
 		   GameShark CD Player: save time for resume
 
-		   Twisted Metal - World Tour: don't save times for DATA reads
-		   - Only get 1 chance to do this right
-		   */
-		if( cdr.Play && CDR_getStatus(&stat) != -1 ) {
-			cdr.SetSectorPlay[0] = stat.Time[0];
-			cdr.SetSectorPlay[1] = stat.Time[1];
-			cdr.SetSectorPlay[2] = stat.Time[2];
-		}
+		   Twisted Metal - World Tour: don't mix Setloc / CdlPlay cursors
+		*/
 
 		StopCdda();
 		StopReading();
-- 
cgit v1.2.3