Changeset 24173 in vbox for trunk/src/VBox

Timestamp:

Oct 29, 2009 5:53:25 PM (16 years ago)

Author:

vboxsync

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

54112

Message:

ATA: Rename macros

Location:

trunk/src/VBox/Devices

Files:

• Storage/DevATA.cpp (modified) (2 diffs)
• testcase/tstDeviceStructSizeGC.cpp (modified) (1 diff)

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

@@ -105 +105 @@
  * Length of the configurable VPD data (without termination)
  */
-#define ATA_SERIAL_NUMBER_LENGTH     20
-#define ATA_FIRMWARE_REVISION_LENGTH  8
-#define ATA_MODEL_NUMBER_LENGTH      40
-#define ATAPI_INQUIRY_VENDOR_ID      16
-#define ATAPI_INQUIRY_PRODUCT_ID     16
-#define ATAPI_INQUIRY_REVISION        4
+#define ATA_SERIAL_NUMBER_LENGTH        20
+#define ATA_FIRMWARE_REVISION_LENGTH     8
+#define ATA_MODEL_NUMBER_LENGTH         40
+#define ATAPI_INQUIRY_VENDOR_ID_LENGTH   8
+#define ATAPI_INQUIRY_PRODUCT_ID_LENGTH 16
+#define ATAPI_INQUIRY_REVISION_LENGTH    4
 
 /*******************************************************************************
@@ -294 +294 @@
     char                                szModelNumber[ATA_MODEL_NUMBER_LENGTH+1];
     /** The vendor identification string for SCSI INQUIRY commands. */
-    char                                szInquiryVendorId[ATAPI_INQUIRY_VENDOR_ID+1];
+    char                                szInquiryVendorId[ATAPI_INQUIRY_VENDOR_ID_LENGTH+1];
     /** The product identification string for SCSI INQUIRY commands. */
-    char                                szInquiryProductId[ATAPI_INQUIRY_PRODUCT_ID+1];
+    char                                szInquiryProductId[ATAPI_INQUIRY_PRODUCT_ID_LENGTH+1];
     /** The revision string for SCSI INQUIRY commands. */
-    char                                szInquiryRevision[ATAPI_INQUIRY_REVISION+1];
+    char                                szInquiryRevision[ATAPI_INQUIRY_REVISION_LENGTH+1];
 
     uint8_t                             abAlignment3[7];

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeGC.cpp

@@ -741 +741 @@
     GEN_CHECK_OFF(ATADevState, szModelNumber[ATA_MODEL_NUMBER_LENGTH]);
     GEN_CHECK_OFF(ATADevState, szInquiryVendorId);
-    GEN_CHECK_OFF(ATADevState, szInquiryVendorId[ATAPI_INQUIRY_VENDOR_ID]);
+    GEN_CHECK_OFF(ATADevState, szInquiryVendorId[ATAPI_INQUIRY_VENDOR_ID_LENGTH]);
     GEN_CHECK_OFF(ATADevState, szInquiryProductId);
-    GEN_CHECK_OFF(ATADevState, szInquiryProductId[ATAPI_INQUIRY_PRODUCT_ID]);
+    GEN_CHECK_OFF(ATADevState, szInquiryProductId[ATAPI_INQUIRY_PRODUCT_ID_LENGTH]);
     GEN_CHECK_OFF(ATADevState, szInquiryRevision);
-    GEN_CHECK_OFF(ATADevState, szInquiryRevision[ATAPI_INQUIRY_REVISION]);
+    GEN_CHECK_OFF(ATADevState, szInquiryRevision[ATAPI_INQUIRY_REVISION_LENGTH]);
     GEN_CHECK_SIZE(ATATransferRequest);
     GEN_CHECK_OFF(ATATransferRequest, iIf);