Changeset 32104 in vbox

Timestamp:

Aug 30, 2010 3:07:36 PM (14 years ago)

Author:

vboxsync

Message:

ATA/Passthrough: Determine the correct sector size for the READ CD MSF command too

File:

• trunk/src/VBox/Devices/Storage/DevATA.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Storage/DevATA.cpp

@@ -3206 +3206 @@
             cSectors = ataBE2H_U16(pbPacket + 7);
             Log2(("ATAPI PT: lba %d sectors %d\n", iATAPILBA, cSectors));
-            s->cbATAPISector = 2048; /**< @todo this size is not always correct */
+            s->cbATAPISector = 2048;
             cbTransfer = cSectors * s->cbATAPISector;
             uTxDir = PDMBLOCKTXDIR_FROM_DEVICE;
@@ -3214 +3214 @@
             cSectors = ataBE2H_U32(pbPacket + 6);
             Log2(("ATAPI PT: lba %d sectors %d\n", iATAPILBA, cSectors));
-            s->cbATAPISector = 2048; /**< @todo this size is not always correct */
+            s->cbATAPISector = 2048;
             cbTransfer = cSectors * s->cbATAPISector;
             uTxDir = PDMBLOCKTXDIR_FROM_DEVICE;
@@ -3231 +3231 @@
             goto sendcmd;
         case SCSI_READ_CD:
+        case SCSI_READ_CD_MSF:
         {
             /* Get sector size based on the expected sector type field. */
@@ -3261 +3262 @@
             }
 
-            cbTransfer = ataBE2H_U24(pbPacket + 6) * s->cbATAPISector;
+            if (pbPacket[0] == SCSI_READ_CD)
+                cbTransfer = ataBE2H_U24(pbPacket + 6) * s->cbATAPISector;
+            else /* SCSI_READ_MSF */
+            {
+                cSectors = ataMSF2LBA(pbPacket + 6) - ataMSF2LBA(pbPacket + 3);
+                if (cSectors > 32)
+                    cSectors = 32; /* Limit transfer size to 64~74K. Safety first. In any case this can only harm software doing CDDA extraction. */
+                cbTransfer = cSectors * s->cbATAPISector;
+            }
             uTxDir = PDMBLOCKTXDIR_FROM_DEVICE;
             goto sendcmd;
         }
-        case SCSI_READ_CD_MSF:
-            cSectors = ataMSF2LBA(pbPacket + 6) - ataMSF2LBA(pbPacket + 3);
-            if (cSectors > 32)
-                cSectors = 32; /* Limit transfer size to 64~74K. Safety first. In any case this can only harm software doing CDDA extraction. */
-            s->cbATAPISector = 2048; /**< @todo this size is not always correct */
-            cbTransfer = cSectors * s->cbATAPISector;
-            uTxDir = PDMBLOCKTXDIR_FROM_DEVICE;
-            goto sendcmd;
         case SCSI_READ_DISC_INFORMATION:
             cbTransfer = ataBE2H_U16(pbPacket + 7);