Changeset 65069 in vbox

Timestamp:

Jan 3, 2017 11:30:52 AM (8 years ago)

Author:

vboxsync

Message:

Devices/Storage: Rename ATAPI_INQUIRY_*_ID_LENGTH to SCSI_INQUIRY_*_ID_LENGTH and move to include/VBox/scsi.h where it actually belongs

Location:

trunk

Files:

• include/VBox/scsi.h (modified) (3 diffs)
• src/VBox/Devices/Storage/DevATA.cpp (modified) (1 diff)
• src/VBox/Devices/Storage/ide.h (modified) (1 diff)
• src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp (modified) (1 diff)

trunk/include/VBox/scsi.h

@@ -228 +228 @@
  * @{
  */
+
+/** Length of the SCSI INQUIRY vendor identifier (without termination). */
+#define SCSI_INQUIRY_VENDOR_ID_LENGTH   8
+/** Length of the SCSI INQUIRY product identifier (without termination). */
+#define SCSI_INQUIRY_PRODUCT_ID_LENGTH 16
+/** Length of the SCSI INQUIRY revision identifier (without termination). */
+#define SCSI_INQUIRY_REVISION_LENGTH    4
+
 #pragma pack(1)
 typedef struct SCSIINQUIRYCDB
@@ -248 +256 @@
 typedef struct SCSIINQUIRYDATA
 {
-    unsigned u5PeripheralDeviceType : 5;    /**< 0x00 / 00 */
+    unsigned u5PeripheralDeviceType : 5;                    /**< 0x00 / 00 */
     unsigned u3PeripheralQualifier : 3;
-    unsigned u6DeviceTypeModifier : 7;      /**< 0x01 */
+    unsigned u6DeviceTypeModifier : 7;                      /**< 0x01 */
     unsigned fRMB : 1;
-    unsigned u3AnsiVersion : 3;             /**< 0x02 */
+    unsigned u3AnsiVersion : 3;                             /**< 0x02 */
     unsigned u3EcmaVersion : 3;
     unsigned u2IsoVersion : 2;
-    unsigned u4ResponseDataFormat : 4;      /**< 0x03 */
+    unsigned u4ResponseDataFormat : 4;                      /**< 0x03 */
     unsigned u2Reserved0 : 2;
     unsigned fTrmlOP : 1;
     unsigned fAEC : 1;
-    unsigned cbAdditional : 8;              /**< 0x04 */
-    unsigned u8Reserved1 : 8;               /**< 0x05 */
-    unsigned u8Reserved2 : 8;               /**< 0x06 */
-    unsigned fSftRe : 1;                    /**< 0x07 */
+    unsigned cbAdditional : 8;                              /**< 0x04 */
+    unsigned u8Reserved1 : 8;                               /**< 0x05 */
+    unsigned u8Reserved2 : 8;                               /**< 0x06 */
+    unsigned fSftRe : 1;                                    /**< 0x07 */
     unsigned fCmdQue : 1;
     unsigned fReserved3 : 1;
@@ -270 +278 @@
     unsigned fWBus32 : 1;
     unsigned fRelAdr : 1;
-    int8_t   achVendorId[8];                /**< 0x08 */
-    int8_t   achProductId[16];              /**< 0x10 */
-    int8_t   achProductLevel[4];            /**< 0x20 */
-    uint8_t  abVendorSpecific[20];          /**< 0x24/36 - Optional it seems. */
+    int8_t   achVendorId[SCSI_INQUIRY_VENDOR_ID_LENGTH];    /**< 0x08 */
+    int8_t   achProductId[SCSI_INQUIRY_PRODUCT_ID_LENGTH];  /**< 0x10 */
+    int8_t   achProductLevel[SCSI_INQUIRY_REVISION_LENGTH]; /**< 0x20 */
+    uint8_t  abVendorSpecific[20];                          /**< 0x24/36 - Optional it seems. */
     uint8_t  abReserved4[40];
-    uint8_t  abVendorSpecificParameters[1]; /**< 0x60/96 - Variable size. */
+    uint8_t  abVendorSpecificParameters[1];                 /**< 0x60/96 - Variable size. */
 } SCSIINQUIRYDATA;
 #pragma pack()

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

@@ -311 +311 @@
     char                                szModelNumber[ATA_MODEL_NUMBER_LENGTH+1];
     /** The vendor identification string for SCSI INQUIRY commands. */
-    char                                szInquiryVendorId[ATAPI_INQUIRY_VENDOR_ID_LENGTH+1];
+    char                                szInquiryVendorId[SCSI_INQUIRY_VENDOR_ID_LENGTH+1];
     /** The product identification string for SCSI INQUIRY commands. */
-    char                                szInquiryProductId[ATAPI_INQUIRY_PRODUCT_ID_LENGTH+1];
+    char                                szInquiryProductId[SCSI_INQUIRY_PRODUCT_ID_LENGTH+1];
     /** The revision string for SCSI INQUIRY commands. */
-    char                                szInquiryRevision[ATAPI_INQUIRY_REVISION_LENGTH+1];
+    char                                szInquiryRevision[SCSI_INQUIRY_REVISION_LENGTH+1];
     /** The current tracklist of the loaded medium if passthrough is used. */
     R3PTRTYPE(PTRACKLIST)               pTrackList;

trunk/src/VBox/Devices/Storage/ide.h

@@ -193 +193 @@
 #define ATAPI_INT_REASON_TAG_MASK       0xf8
 
-
-/**
- * Length of the ATAPI VPD data (without termination)
- *
- * @todo move to scsi.h
- */
-#define ATAPI_INQUIRY_VENDOR_ID_LENGTH   8
-#define ATAPI_INQUIRY_PRODUCT_ID_LENGTH 16
-#define ATAPI_INQUIRY_REVISION_LENGTH    4
-
-
 #if defined(LOG_ENABLED) && defined(IN_RING3)
 const char * ATACmdText(uint8_t uCmd);

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

@@ -885 +885 @@
     GEN_CHECK_OFF(ATADevState, szModelNumber[ATA_MODEL_NUMBER_LENGTH]);
     GEN_CHECK_OFF(ATADevState, szInquiryVendorId);
-    GEN_CHECK_OFF(ATADevState, szInquiryVendorId[ATAPI_INQUIRY_VENDOR_ID_LENGTH]);
+    GEN_CHECK_OFF(ATADevState, szInquiryVendorId[SCSI_INQUIRY_VENDOR_ID_LENGTH]);
     GEN_CHECK_OFF(ATADevState, szInquiryProductId);
-    GEN_CHECK_OFF(ATADevState, szInquiryProductId[ATAPI_INQUIRY_PRODUCT_ID_LENGTH]);
+    GEN_CHECK_OFF(ATADevState, szInquiryProductId[SCSI_INQUIRY_PRODUCT_ID_LENGTH]);
     GEN_CHECK_OFF(ATADevState, szInquiryRevision);
-    GEN_CHECK_OFF(ATADevState, szInquiryRevision[ATAPI_INQUIRY_REVISION_LENGTH]);
+    GEN_CHECK_OFF(ATADevState, szInquiryRevision[SCSI_INQUIRY_REVISION_LENGTH]);
     GEN_CHECK_OFF(ATADevState, pTrackList);
     GEN_CHECK_SIZE(ATATransferRequest);