Changeset 81872 in vbox

Timestamp:

Nov 15, 2019 1:31:39 PM (5 years ago)

Author:

vboxsync

Message:

DevAHCI: Dropped unnecessary pragma pack(1). bugref:9218

File:

• trunk/src/VBox/Devices/Storage/DevAHCI.cpp (modified) (8 diffs)

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

@@ -138 +138 @@
  * Command Header.
  */
-#pragma pack(1)
 typedef struct
 {
@@ -152 +151 @@
     uint32_t           u32Reserved[4];
 } CmdHdr;
-#pragma pack()
 AssertCompileSize(CmdHdr, 32);
 
@@ -448 +446 @@
 
 } AHCIPort;
+AssertCompileSizeAlignment(AHCIPort, 8);
 /** Pointer to the state of an AHCI port. */
 typedef AHCIPort *PAHCIPort;
 
-AssertCompileSizeAlignment(AHCIPort, 8);
 
 /**
@@ -593 +591 @@
     R3R0PTRTYPE(PSUPDRVSESSION)     pSupDrvSession;
 } AHCI;
+AssertCompileMemberAlignment(AHCI, ahciPort, 8);
 /** Pointer to the state of an AHCI device. */
 typedef AHCI *PAHCI;
 
-AssertCompileMemberAlignment(AHCI, ahciPort, 8);
 
 /**
@@ -629 +627 @@
  *                   cbCopy < *pcbSkip or 0 otherwise.
  */
-typedef DECLCALLBACK(void) AHCIR3MEMCOPYCALLBACK(PAHCI pThis, RTGCPHYS GCPhys, PRTSGBUF pSgBuf, size_t cbCopy,
-                                                 size_t *pcbSkip);
+typedef DECLCALLBACK(void) AHCIR3MEMCOPYCALLBACK(PAHCI pThis, RTGCPHYS GCPhys, PRTSGBUF pSgBuf, size_t cbCopy, size_t *pcbSkip);
 /** Pointer to a memory copy buffer callback. */
 typedef AHCIR3MEMCOPYCALLBACK *PAHCIR3MEMCOPYCALLBACK;
@@ -835 +832 @@
 } AHCIPORTOPREG;
 
+
+/*********************************************************************************************************************************
+*   Internal Functions                                                                                                           *
+*********************************************************************************************************************************/
 #ifndef VBOX_DEVICE_STRUCT_TESTCASE
 RT_C_DECLS_BEGIN
@@ -847 +848 @@
 RT_C_DECLS_END
 
+
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
 #define PDMIBASE_2_PAHCIPORT(pInterface)         ( (PAHCIPort)((uintptr_t)(pInterface) - RT_UOFFSETOF(AHCIPort, IBase)) )
 #define PDMIMEDIAPORT_2_PAHCIPORT(pInterface)    ( (PAHCIPort)((uintptr_t)(pInterface) - RT_UOFFSETOF(AHCIPort, IPort)) )
@@ -885 +890 @@
 
 #endif
+
+
 
 /**