Code Scrub the common includes in MdePkg.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5493 6f19259b-4bc3-4df7-8a09-765794883524

6 files changed, 9 insertions, 13 deletions

diff --git a/MdePkg/Include/IndustryStandard/Atapi.h b/MdePkg/Include/IndustryStandard/Atapi.h
index 8fe065c5e0..ff6cc593bb 100644
--- a/MdePkg/Include/IndustryStandard/Atapi.h
+++ b/MdePkg/Include/IndustryStandard/Atapi.h
@@ -18,7 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _ATAPI_H

 #define _ATAPI_H

 

-#pragma pack(push, 1)

+#pragma pack(1)

 

 //

 // ATA_IDENTIFY_DATA is defined in ATA-5

@@ -369,7 +369,7 @@ typedef union {
   ATAPI_READ_FORMAT_CAP_CMD ReadFormatCapacity;

 } ATAPI_PACKET_COMMAND;

 

-#pragma pack(pop)

+#pragma pack()

 

 

 #define ATAPI_MAX_DMA_EXT_CMD_SECTORS 0x10000

diff --git a/MdePkg/Include/IndustryStandard/Pci22.h b/MdePkg/Include/IndustryStandard/Pci22.h
index 3007075282..b1c66e824e 100644
--- a/MdePkg/Include/IndustryStandard/Pci22.h
+++ b/MdePkg/Include/IndustryStandard/Pci22.h
@@ -27,7 +27,7 @@
 //

 #define PCI_VGA_PALETTE_SNOOP_DISABLED  0x20

 

-#pragma pack(push, 1)

+#pragma pack(1)

 typedef struct {

   UINT16  VendorId;

   UINT16  DeviceId;

@@ -569,6 +569,6 @@ typedef union {
   EFI_LEGACY_EXPANSION_ROM_HEADER *PcAt;

 } EFI_PCI_ROM_HEADER;

 

-#pragma pack(pop)

+#pragma pack()

 

 #endif

diff --git a/MdePkg/Include/IndustryStandard/Pci30.h b/MdePkg/Include/IndustryStandard/Pci30.h
index c4a1b64ace..0cd37c44bd 100644
--- a/MdePkg/Include/IndustryStandard/Pci30.h
+++ b/MdePkg/Include/IndustryStandard/Pci30.h
@@ -18,7 +18,7 @@
 #define PCI_CLASS_MASS_STORAGE_SATADPA   0x06

 #define PCI_CLASS_MASS_STORAGE_AHCI      PCI_CLASS_MASS_STORAGE_SATADPA

 

-#pragma pack(push, 1)

+#pragma pack(1)

 

 typedef struct {

   UINT32  Signature;    // "PCIR"

@@ -37,7 +37,7 @@ typedef struct {
   UINT16  DMTFCLPEntryPointOffset;

 } PCI_3_0_DATA_STRUCTURE;

 

-#pragma pack(pop)

+#pragma pack()

 

 

 #include <IndustryStandard/Pci23.h>

diff --git a/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h b/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h
index 6582a859b4..381bb8f7a6 100644
--- a/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h
+++ b/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h
@@ -21,9 +21,7 @@
 //

 // Ensure proper structure formats

 //

-#ifdef _MSC_EXTENSIONS

 #pragma pack(1)

-#endif

 

 //

 // SPCR Revision (defined in spec)

@@ -57,9 +55,7 @@ typedef struct {
   UINT32                                  Reserved2;

 } EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE;

 

-#ifdef _MSC_EXTENSIONS

 #pragma pack()

-#endif

 

 //

 // SPCR Definitions

diff --git a/MdePkg/Include/IndustryStandard/Tpm12.h b/MdePkg/Include/IndustryStandard/Tpm12.h
index f16a952107..11013e7876 100644
--- a/MdePkg/Include/IndustryStandard/Tpm12.h
+++ b/MdePkg/Include/IndustryStandard/Tpm12.h
@@ -406,13 +406,13 @@ typedef struct tdTPM_KEY_HANDLE_LIST {
 //

 // Part 2, section 5.10: TPM_KEY_FLAGS

 //

-enum tdTPM_KEY_FLAGS {

+typedef enum tdTPM_KEY_FLAGS {

   redirection                       = 0x00000001,

   migratable                        = 0x00000002,

   isVolatile                        = 0x00000004,

   pcrIgnoredOnRead                  = 0x00000008,

   migrateAuthority                  = 0x00000010

-};

+} TPM_KEY_FLAGS;

 

 //

 // Part 2, section 5.11: TPM_CHANGEAUTH_VALIDATE

diff --git a/MdePkg/Include/IndustryStandard/WatchdogActionTable.h b/MdePkg/Include/IndustryStandard/WatchdogActionTable.h
index c6ee91e778..e429c9a69e 100644
--- a/MdePkg/Include/IndustryStandard/WatchdogActionTable.h
+++ b/MdePkg/Include/IndustryStandard/WatchdogActionTable.h
@@ -56,7 +56,7 @@ typedef struct {
 //

 // WDAT Revision (defined in spec)

 //

-#define EFI_ACPI_WATCHDOG_ACTION_1_0_TABLE_REVISION  0x01

+#define EFI_ACPI_WATCHDOG_ACTION_1_0_TABLE_REVISION       0x01

 

 //

 // WDAT 1.0 Flags