Changeset 56579 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Jun 22, 2015 4:08:08 PM (10 years ago)

Author:

vboxsync

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

101206

Message:

Storage/ATA: fixed returned device strings from INQUIRY command (were byte swapped) caused by r101000

File:

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

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

@@ -2222 +2222 @@
                  *             invisible as possible to the guest. */
                 Log3(("ATAPI PT inquiry data before (%d): %.*Rhxs\n", cbTransfer, cbTransfer, s->CTX_SUFF(pbIOBuffer)));
-                ataR3PadString(s->CTX_SUFF(pbIOBuffer) + 8, "VBOX", 8);
-                ataR3PadString(s->CTX_SUFF(pbIOBuffer) + 16, "CD-ROM", 16);
-                ataR3PadString(s->CTX_SUFF(pbIOBuffer) + 32, "1.0", 4);
+                ataR3SCSIPadStr(s->CTX_SUFF(pbIOBuffer) + 8, "VBOX", 8);
+                ataR3SCSIPadStr(s->CTX_SUFF(pbIOBuffer) + 16, "CD-ROM", 16);
+                ataR3SCSIPadStr(s->CTX_SUFF(pbIOBuffer) + 32, "1.0", 4);
             }
 
@@ -2779 +2779 @@
     pbBuf[6] = 0; /* reserved */
     pbBuf[7] = 0; /* reserved */
-    ataR3PadString(pbBuf + 8, s->szInquiryVendorId, 8);
-    ataR3PadString(pbBuf + 16, s->szInquiryProductId, 16);
-    ataR3PadString(pbBuf + 32, s->szInquiryRevision, 4);
+    ataR3SCSIPadStr(pbBuf + 8, s->szInquiryVendorId, 8);
+    ataR3SCSIPadStr(pbBuf + 16, s->szInquiryProductId, 16);
+    ataR3SCSIPadStr(pbBuf + 32, s->szInquiryRevision, 4);
     s->iSourceSink = ATAFN_SS_NULL;
     atapiR3CmdOK(s);