Changeset 32076 in vbox for trunk/src

Timestamp:

Aug 30, 2010 7:18:36 AM (14 years ago)

Author:

vboxsync

Message:

CD/Passthrough: READ CD requires the numbers of blocks to read and not the number of bytes

Location:

trunk/src/VBox/Devices/Storage

Files:

• DevAHCI.cpp (modified) (2 diffs)
• DevATA.cpp (modified) (1 diff)

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

@@ -3518 +3518 @@
             default:
                 AssertMsgFailed(("Don't know how to split command %#04x\n", pAhciPortTaskState->aATAPICmd[0]));
-                //if (s->cErrors++ < MAX_LOG_REL_ERRORS)
-                LogRel(("AHCI: LUN#%d: CD-ROM passthrough split error\n", pAhciPort->iLUN));
+                if (pAhciPort->cErrors++ < MAX_LOG_REL_ERRORS)
+                    LogRel(("AHCI: LUN#%d: CD-ROM passthrough split error\n", pAhciPort->iLUN));
                 atapiCmdErrorSimple(pAhciPort, pAhciPortTaskState, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_ILLEGAL_OPCODE);
                 return false;
@@ -3547 +3547 @@
                 case SCSI_READ_CD:
                     ataH2BE_U32(aATAPICmd + 2, iATAPILBA);
-                    ataH2BE_U24(aATAPICmd + 6, cbCurrTX);
+                    ataH2BE_U24(aATAPICmd + 6, cReqSectors);
                     break;
                 case SCSI_READ_CD_MSF:

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

@@ -1977 +1977 @@
                 case SCSI_READ_CD:
                     ataH2BE_U32(aATAPICmd + 2, iATAPILBA);
-                    ataH2BE_U24(aATAPICmd + 6, cbCurrTX);
+                    ataH2BE_U24(aATAPICmd + 6, cReqSectors);
                     break;
                 case SCSI_READ_CD_MSF: