Changeset 42958 in vbox for trunk/src/VBox/Devices

Timestamp:

Aug 23, 2012 6:17:28 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

80283

Message:

ATAPI/Passthrough: Don't try to detect the medium type if a READ TOC/PMA/ATIP command with the CD-Text format is sent and reduce the number of required bytes of the reply to 4. This is enough to detect the data type on a medium. Fixes audio CD passthrough with certain media players like vlc, kaffeine and amarok

File:

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

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

@@ -2294 +2294 @@
                 ataSCSIPadStr(s->CTX_SUFF(pbIOBuffer) + 32, "1.0", 4);
             }
-            else if (s->aATAPICmd[0] == SCSI_READ_TOC_PMA_ATIP)
+            else if (   s->aATAPICmd[0] == SCSI_READ_TOC_PMA_ATIP
+                     && (s->aATAPICmd[2] & 0xf) != 0x05)
             {
                 /* Set the media type if we can detect it. */
@@ -2300 +2301 @@
 
                 /** @todo: Implemented only for formatted TOC now. */
-                if (   (s->aATAPICmd[1] & 0xf) == 0
-                    && cbTransfer >= 6)
+                if (   (s->aATAPICmd[2] & 0xf) == 0
+                    && cbTransfer >= 4)
                 {
                     uint32_t NewMediaType;