Fix invalid CDROM TOC responses (thanks Simon Gander)

diff --git a/CHANGELOG b/CHANGELOG
index c16aa75a21c74c3be37525cdcd13d2f208618d75..8328ca41083d455305f5d7abbc159e8198b84758 100644 (file)
--- 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 220389a5902e37081cad9301e6bca810b0c81e6d..c2dc148f82da2c55679402dce2f74a492875082d 100755 (executable)
--- 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)