From: Michael McMaster <michael@codesrc.com>
Date: Thu, 19 Dec 2019 08:57:47 +0000 (+1000)
Subject: Fix invalid CDROM TOC responses (thanks Simon Gander)
X-Git-Tag: v6.2.14~2
X-Git-Url: http://git.codesrc.com/gitweb.cgi?a=commitdiff_plain;h=3badc185f9a1cb5a6ec2399c98b42b3932c74877;p=SCSI2SD-V6.git

Fix invalid CDROM TOC responses (thanks Simon Gander)
---

diff --git a/CHANGELOG b/CHANGELOG
index c16aa75a..8328ca41 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+2020XXXX		XXXXX
+	- Fix for invalid CDROM READ TOC responses (Thanks Simon Gander)
+
 20191208		6.2.9
 	- Fix to prevent sending floppy geometry mode page when not configured as
 	a floppy (Thanks Landon Rodgers)
diff --git a/src/firmware/cdrom.c b/src/firmware/cdrom.c
index 220389a5..c2dc148f 100755
--- a/src/firmware/cdrom.c
+++ b/src/firmware/cdrom.c
@@ -170,14 +170,14 @@ static void doReadTOC(int MSF, uint8_t track, uint16_t allocationLength)
 		// Replace start of leadout track
 		if (MSF)
 		{
-			LBA2MSF(capacity, scsiDev.data + 0x0E);
+			LBA2MSF(capacity, scsiDev.data + 0x10);
 		}
 		else
 		{
-			scsiDev.data[0x0E] = capacity >> 24;
-			scsiDev.data[0x0F] = capacity >> 16;
-			scsiDev.data[0x10] = capacity >> 8;
-			scsiDev.data[0x11] = capacity;
+			scsiDev.data[0x10] = capacity >> 24;
+			scsiDev.data[0x11] = capacity >> 16;
+			scsiDev.data[0x12] = capacity >> 8;
+			scsiDev.data[0x13] = capacity;
 		}
 
 		if (len > allocationLength)