From 5c14e753146d26249da4ecf403cfe47cb83bfd89 Mon Sep 17 00:00:00 2001 From: "R. Belmont" Date: Sun, 25 Apr 2010 18:27:52 +0000 Subject: [PATCH] cdrom: correct header length for form 2 raw sectors [R. Belmont] --- src/lib/util/cdrom.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/util/cdrom.c b/src/lib/util/cdrom.c index 4f2fa1ba52a..79bd79cea7e 100644 --- a/src/lib/util/cdrom.c +++ b/src/lib/util/cdrom.c @@ -250,15 +250,15 @@ UINT32 cdrom_read_data(cdrom_file *file, UINT32 lbasector, void *buffer, UINT32 } else { - /* return 2048 bytes of mode 1 data from a 2352 byte mode 1 or 2 raw sector */ - if ((datatype == CD_TRACK_MODE1) && ((tracktype == CD_TRACK_MODE1_RAW) || (tracktype == CD_TRACK_MODE2_RAW))) + /* return 2048 bytes of mode 1 data from a 2352 byte mode 1 raw sector */ + if ((datatype == CD_TRACK_MODE1) && (tracktype == CD_TRACK_MODE1_RAW)) { memcpy(buffer, &file->cache[(sectoroffs * CD_FRAME_SIZE) + 16], 2048); return 1; } - /* return 2048 bytes of mode 1 data from a mode2 form1 sector */ - if ((datatype == CD_TRACK_MODE1) && (tracktype == CD_TRACK_MODE2_FORM1)) + /* return 2048 bytes of mode 1 data from a mode2 form1 or raw sector */ + if ((datatype == CD_TRACK_MODE1) && ((tracktype == CD_TRACK_MODE2_FORM1)||(tracktype == CD_TRACK_MODE2_RAW))) { memcpy(buffer, &file->cache[(sectoroffs * CD_FRAME_SIZE) + 24], 2048); return 1;