Changeset 36339 in vbox for trunk/src/VBox/Devices/Storage/DevATA.cpp

Timestamp:

Mar 22, 2011 12:59:48 PM (14 years ago)

Author:

vboxsync

Message:

DevATA: Adjust maximum transfer length to the new value, fixes ATAPI drives for Windows XP

File:

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

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

@@ -2451 +2451 @@
 
     Assert(s->uTxDir == PDMBLOCKTXDIR_FROM_DEVICE);
-    Assert(s->cbElementaryTransfer <= 32);
+    Assert(s->cbElementaryTransfer <= 80);
     /* Accept valid request types only, and only starting feature 0. */
     if ((s->aATAPICmd[1] & 0x03) == 3 || u16Sfn != 0)
@@ -2472 +2472 @@
     pbBuf += cbCopied;
 
-#if 0
     cbCopied = atapiGetConfigurationFillFeatureCore(s, pbBuf, cbBuf);
     cbBuf -= cbCopied;
@@ -2500 +2499 @@
     cbBuf -= cbCopied;
     pbBuf += cbCopied;
-#endif
 
     /* Set data length now - the field is not included in the final length. */
@@ -3242 +3240 @@
             /* No media change stuff here, it can confuse Linux guests. */
             cbMax = ataBE2H_U16(pbPacket + 7);
-            ataStartTransfer(s, RT_MIN(cbMax, 32), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_GET_CONFIGURATION, true);
+            ataStartTransfer(s, RT_MIN(cbMax, 80), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_GET_CONFIGURATION, true);
             break;
         case SCSI_INQUIRY: