remove un-necessary #pragma pack(1) and clean up doxgen format.

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

diff --git a/MdePkg/Include/IndustryStandard/IScsiBootFirmwareTable.h b/MdePkg/Include/IndustryStandard/IScsiBootFirmwareTable.h
index 7fc7ac63776d54e5929b38fd317bad8bdcff40df..cf3c4326feb7d27a1c269586566f361d2c6e90c4 100644 (file)
--- a/MdePkg/Include/IndustryStandard/IScsiBootFirmwareTable.h
+++ b/MdePkg/Include/IndustryStandard/IScsiBootFirmwareTable.h
@@ -1,6 +1,6 @@
 /** @file\r
-  The definition for iSCSI Boot Firmware Table, it's defined in\r
-  Microsoft iBFT document. \r
+  The definition for iSCSI Boot Firmware Table, it's defined in Microsoft's\r
+  iSCSI Boot Firmware Table(iBFT) as Defined in ACPI 3.0b Specification. \r
   \r
   Copyright (c) 2006 - 2008, Intel Corporation\r
   All rights reserved. This program and the accompanying materials                          \r
@@ -46,8 +46,6 @@ typedef enum {
   IpPrefixOriginUnchanged = 16\r
 } IP_PREFIX_VALUE;\r
 \r
-#pragma pack(1)\r
-\r
 ///\r
 /// iBF Table Header\r
 ///\r
@@ -85,8 +83,9 @@ typedef struct {
   UINT16                                               Target1Offset;  \r
 } EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE;\r
 \r
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE_VERSION            0x1\r
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE_FLAG_BOOT_FAILOVER 0x1\r
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE_VERSION              0x1\r
+\r
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE_FLAG_BOOT_FAILOVER   BIT0\r
 \r
 ///\r
 /// Initiator Structure\r
@@ -101,9 +100,10 @@ typedef struct {
   UINT16                                               IScsiNameOffset;\r
 } EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE;\r
 \r
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE_VERSION            0x1\r
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE_FLAG_BLOCK_VALID   0x1 \r
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE_FLAG_BOOT_SELECTED 0x2 \r
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE_VERSION             0x1\r
+\r
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE_FLAG_BLOCK_VALID    BIT0 \r
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE_FLAG_BOOT_SELECTED  BIT1 \r
 \r
 ///\r
 /// NIC Structure\r
@@ -124,10 +124,11 @@ typedef struct {
   UINT16                                               HostNameOffset;\r
 } EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE;\r
 \r
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_VERSION            0x1\r
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_FLAG_BLOCK_VALID   0x1\r
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_FLAG_BOOT_SELECTED 0x2\r
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_FLAG_GLOBAL        0x4\r
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_VERSION                 0x1\r
+\r
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_FLAG_BLOCK_VALID        BIT0\r
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_FLAG_BOOT_SELECTED      BIT1\r
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_FLAG_GLOBAL             BIT2\r
 \r
 ///\r
 /// Target Structure\r
@@ -151,13 +152,12 @@ typedef struct {
   UINT16                                               ReverseCHAPSecretOffset;\r
 } EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE;\r
 \r
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_VERSION            0x1\r
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_FLAG_BLOCK_VALID   0x1\r
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_FLAG_BOOT_SELECTED 0x2\r
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_FLAG_RADIUS_CHAP   0x4\r
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_FLAG_RADIUS_RCHAP  0x8\r
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_VERSION               0x1\r
 \r
-#pragma pack()\r
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_FLAG_BLOCK_VALID      BIT0\r
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_FLAG_BOOT_SELECTED    BIT1\r
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_FLAG_RADIUS_CHAP      BIT2\r
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_FLAG_RADIUS_RCHAP     BIT3\r
 \r
 #endif\r
 \r

diff --git a/MdePkg/Include/IndustryStandard/Mbr.h b/MdePkg/Include/IndustryStandard/Mbr.h
index 8dd9d59f267beac180816861d1f80350002180f1..39120c7a210ff6fa4b0c2007461fd0db05ed7523 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Mbr.h
+++ b/MdePkg/Include/IndustryStandard/Mbr.h
@@ -27,10 +27,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #define MBR_SIZE                    512\r
 \r
-#pragma pack(1)\r
-//\r
-// MBR Partition Entry\r
-//\r
+///\r
+/// MBR Partition Entry\r
+///\r
 typedef struct {\r
   UINT8 BootIndicator;\r
   UINT8 StartHead;\r
@@ -55,6 +54,4 @@ typedef struct {
   UINT16                Signature;\r
 } MASTER_BOOT_RECORD;\r
 \r
-#pragma pack()\r
-\r
 #endif\r

diff --git a/MdePkg/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h b/MdePkg/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h
index 515a7b3001b6f80cce76577e203a95bc6c4a3932..fe4adb7c8c94eff7fb01fe4b7c36bea292658607 100644 (file)
--- a/MdePkg/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h
+++ b/MdePkg/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h
@@ -16,11 +16,6 @@
 #ifndef _MEMORY_MAPPED_CONFIGURATION_SPACE_ACCESS_TABLE_H_\r
 #define _MEMORY_MAPPED_CONFIGURATION_SPACE_ACCESS_TABLE_H_\r
 \r
-//\r
-// Ensure proper structure formats\r
-//\r
-#pragma pack(1)\r
-\r
 ///\r
 /// Memory Mapped Configuration Space Access Table (MCFG)\r
 /// This table is a basic description table header followed by\r
@@ -48,6 +43,4 @@ typedef struct {
 ///\r
 #define EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_SPACE_ACCESS_TABLE_REVISION  0x01\r
 \r
-#pragma pack()\r
-\r
 #endif\r

diff --git a/MdePkg/Include/IndustryStandard/Pci22.h b/MdePkg/Include/IndustryStandard/Pci22.h
index d88b28f82557b696c92858d6a47dfb93aefaf57c..88f39fbae7c03bb935333ff560cd9c5f54700ae0 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Pci22.h
+++ b/MdePkg/Include/IndustryStandard/Pci22.h
@@ -26,7 +26,6 @@
 #define PCI_MAX_FUNC    7\r
 \r
 \r
-#pragma pack(1)\r
 typedef struct {\r
   UINT16  VendorId;\r
   UINT16  DeviceId;\r
@@ -123,9 +122,9 @@ typedef struct {
   UINT16  BridgeControl;        ///< Bridge Control\r
 } PCI_CARDBUS_CONTROL_REGISTER;\r
 \r
-///\r
-/// Definitions of PCI class bytes and manipulation macros.\r
-///\r
+//\r
+// Definitions of PCI class bytes and manipulation macros.\r
+//\r
 #define PCI_CLASS_OLD                 0x00\r
 #define   PCI_CLASS_OLD_OTHER           0x00\r
 #define   PCI_CLASS_OLD_VGA             0x01\r
@@ -350,9 +349,9 @@ typedef struct {
 #define PCI_MAXGNT_OFFSET                           0x3E ///< Max Grant Register\r
 #define PCI_MAXLAT_OFFSET                           0x3F ///< Max Latency Register\r
 \r
-///\r
-/// defined in PCI-to-PCI Bridge Architecture Specification\r
-///\r
+//\r
+// defined in PCI-to-PCI Bridge Architecture Specification\r
+//\r
 #define PCI_BRIDGE_PRIMARY_BUS_REGISTER_OFFSET      0x18   \r
 #define PCI_BRIDGE_SECONDARY_BUS_REGISTER_OFFSET    0x19   \r
 #define PCI_BRIDGE_SUBORDINATE_BUS_REGISTER_OFFSET  0x1a   \r
@@ -376,8 +375,6 @@ typedef union {
   UINT32  Uint32;\r
 } PCI_CONFIG_ACCESS_CF8;\r
 \r
-#pragma pack()\r
-\r
 #define EFI_PCI_COMMAND_IO_SPACE                        BIT0   ///< 0x0001\r
 #define EFI_PCI_COMMAND_MEMORY_SPACE                    BIT1   ///< 0x0002\r
 #define EFI_PCI_COMMAND_BUS_MASTER                      BIT2   ///< 0x0004\r
@@ -389,9 +386,9 @@ typedef union {
 #define EFI_PCI_COMMAND_SERR                            BIT8   ///< 0x0100\r
 #define EFI_PCI_COMMAND_FAST_BACK_TO_BACK               BIT9   ///< 0x0200\r
 \r
-///\r
-/// defined in PCI-to-PCI Bridge Architecture Specification\r
-///\r
+//\r
+// defined in PCI-to-PCI Bridge Architecture Specification\r
+//\r
 #define EFI_PCI_BRIDGE_CONTROL_PARITY_ERROR_RESPONSE    BIT0   ///< 0x0001\r
 #define EFI_PCI_BRIDGE_CONTROL_SERR                     BIT1   ///< 0x0002\r
 #define EFI_PCI_BRIDGE_CONTROL_ISA                      BIT2   ///< 0x0004\r
@@ -405,9 +402,9 @@ typedef union {
 #define EFI_PCI_BRIDGE_CONTROL_TIMER_STATUS             BIT10  ///< 0x0400\r
 #define EFI_PCI_BRIDGE_CONTROL_DISCARD_TIMER_SERR       BIT11  ///< 0x0800\r
 \r
-///\r
-/// Following are the PCI-CARDBUS bridge control bit, defined in PC Card Standard\r
-///\r
+//\r
+// Following are the PCI-CARDBUS bridge control bit, defined in PC Card Standard\r
+//\r
 #define EFI_PCI_BRIDGE_CONTROL_IREQINT_ENABLE           BIT7   ///< 0x0080\r
 #define EFI_PCI_BRIDGE_CONTROL_RANGE0_MEMORY_TYPE       BIT8   ///< 0x0100\r
 #define EFI_PCI_BRIDGE_CONTROL_RANGE1_MEMORY_TYPE       BIT9   ///< 0x0200\r
@@ -426,7 +423,6 @@ typedef union {
 ///\r
 #define EFI_PCI_CARDBUS_BRIDGE_CAPABILITY_PTR 0x14\r
 \r
-#pragma pack(1)\r
 //\r
 // PCI Capability List IDs and records\r
 //\r
@@ -436,6 +432,7 @@ typedef union {
 #define EFI_PCI_CAPABILITY_ID_SLOTID  0x04\r
 #define EFI_PCI_CAPABILITY_ID_MSI     0x05\r
 #define EFI_PCI_CAPABILITY_ID_HOTPLUG 0x06\r
+\r
 typedef struct {\r
   UINT8 CapabilityID;\r
   UINT8 NextItemPtr;\r
@@ -596,6 +593,4 @@ typedef union {
   EFI_LEGACY_EXPANSION_ROM_HEADER *PcAt;\r
 } EFI_PCI_ROM_HEADER;\r
 \r
-#pragma pack()\r
-\r
 #endif\r

diff --git a/MdePkg/Include/IndustryStandard/Pci23.h b/MdePkg/Include/IndustryStandard/Pci23.h
index e1289f75c610127546ead10bf64e07197afd55d6..29d692321e89f5ecbc54af8b4d4fd298832b4e41 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Pci23.h
+++ b/MdePkg/Include/IndustryStandard/Pci23.h
@@ -32,7 +32,6 @@
 //\r
 #define EFI_PCI_CAPABILITY_ID_PCIX    0x07\r
 \r
-#pragma pack(1)\r
 ///\r
 /// Capability EFI_PCI_CAPABILITY_ID_PCIX, defined in PCI-X Addendum to the PCI Local Bus Specification\r
 ///\r
@@ -53,8 +52,6 @@ typedef struct {
   UINT32                  SplitTransCtrlRegDn;\r
 } EFI_PCI_CAPABILITY_PCIX_BRDG;\r
 \r
-#pragma pack()\r
-\r
 #define PCI_CODE_TYPE_EFI_IMAGE       0x03\r
 \r
 #endif\r

diff --git a/MdePkg/Include/IndustryStandard/Pci30.h b/MdePkg/Include/IndustryStandard/Pci30.h
index 3bcf2327f143e15832727feb1bf8269115642406..04bded621c0f4f5e15aeba5e9b99b95f450e2f5b 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Pci30.h
+++ b/MdePkg/Include/IndustryStandard/Pci30.h
@@ -30,8 +30,6 @@
 ///\r
 #define EFI_PCI_CAPABILITY_ID_PCIEXP  0x10\r
 \r
-#pragma pack(1)\r
-\r
 ///\r
 /// defined in PCI Firmware Specification\r
 ///\r
@@ -52,6 +50,4 @@ typedef struct {
   UINT16  DMTFCLPEntryPointOffset;\r
 } PCI_3_0_DATA_STRUCTURE;\r
 \r
-#pragma pack()\r
-\r
 #endif\r

diff --git a/MdePkg/Include/IndustryStandard/Sal.h b/MdePkg/Include/IndustryStandard/Sal.h
index b792df6f6e453bb165a6eb1cf77716920e55c076..37e7dbe71b947c61d80cac0dafd71ba414784440 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Sal.h
+++ b/MdePkg/Include/IndustryStandard/Sal.h
@@ -341,7 +341,6 @@ typedef struct _SAL_UPDATE_PAL_INFO_BLOCK {
 ///\r
 /// SAL System Table Definitions\r
 ///\r
-#pragma pack(1)\r
 typedef struct {\r
   ///\r
   /// The ASCII string representation of "SST_" which confirms the presence of the table. \r
@@ -392,7 +391,6 @@ typedef struct {
   ///\r
   UINT8   Reserved2[8];\r
 } SAL_SYSTEM_TABLE_HEADER;\r
-#pragma pack()\r
 \r
 #define EFI_SAL_ST_HEADER_SIGNATURE "SST_"\r
 #define EFI_SAL_REVISION            0x0320\r
@@ -416,7 +414,6 @@ typedef struct {
 #define EFI_SAL_ST_PTC_SIZE                16\r
 #define EFI_SAL_ST_AP_WAKEUP_SIZE          16\r
 \r
-#pragma pack(1)\r
 ///\r
 /// Format Entrypoint Descriptor Entry\r
 ///\r
@@ -429,7 +426,6 @@ typedef struct {
   UINT64  Reserved2[2];\r
 } SAL_ST_ENTRY_POINT_DESCRIPTOR;\r
 \r
-#pragma pack(1)\r
 ///\r
 /// Format Platform Features Descriptor Entry\r
 ///\r
@@ -438,7 +434,7 @@ typedef struct {
   UINT8 PlatformFeatures;\r
   UINT8 Reserved[14];\r
 } SAL_ST_PLATFORM_FEATURES;\r
-#pragma pack()\r
+\r
 //\r
 // Value of Platform Feature List\r
 //\r
@@ -446,7 +442,6 @@ typedef struct {
 #define SAL_PLAT_FEAT_PLAT_IPI_HINT 0x02\r
 #define SAL_PLAT_FEAT_PROC_IPI_HINT 0x04\r
 \r
-#pragma pack(1)\r
 ///\r
 /// Format of Translation Register Descriptor Entry\r
 ///\r
@@ -459,14 +454,13 @@ typedef struct {
   UINT64  EncodedPageSize;\r
   UINT64  Reserved1;\r
 } SAL_ST_TR_DECRIPTOR;\r
-#pragma pack()\r
+\r
 //\r
 // Type of Translation Register\r
 //\r
 #define EFI_SAL_ST_TR_USAGE_INSTRUCTION 00\r
 #define EFI_SAL_ST_TR_USAGE_DATA        01\r
 \r
-#pragma pack(1)\r
 ///\r
 /// Definition of Coherence Domain Information\r
 ///\r
@@ -474,9 +468,7 @@ typedef struct {
   UINT64  NumberOfProcessors;\r
   UINT64  LocalIDRegister;\r
 } SAL_COHERENCE_DOMAIN_INFO;\r
-#pragma pack()\r
 \r
-#pragma pack(1)\r
 ///\r
 /// Format of Purge Translation Cache Coherence Domain Entry\r
 ///\r
@@ -486,9 +478,7 @@ typedef struct {
   UINT32                    NumberOfDomains;\r
   SAL_COHERENCE_DOMAIN_INFO *DomainInformation;\r
 } SAL_ST_CACHE_COHERENCE_DECRIPTOR;\r
-#pragma pack()\r
 \r
-#pragma pack(1)\r
 ///\r
 /// Format of Application Processor Wake-Up Descriptor Entry\r
 ///\r
@@ -498,7 +488,6 @@ typedef struct {
   UINT8   Reserved[6];\r
   UINT64  ExternalInterruptVector;\r
 } SAL_ST_AP_WAKEUP_DECRIPTOR;\r
-#pragma pack()\r
 \r
 ///\r
 /// Format of Firmware Interface Table (FIT) Entry\r
@@ -648,6 +637,9 @@ typedef struct {
 #define PROC_CR_LID_VALID_BIT_MASK          0x4\r
 #define PROC_STATIC_STRUCT_VALID_BIT_MASK   0x8\r
 #define CPU_INFO_VALID_BIT_MASK             0x1000000\r
+\r
+#pragma pack(1)\r
+\r
 ///\r
 /// Definition of Processor Machine Check Error Record\r
 ///\r
@@ -666,6 +658,8 @@ typedef struct {
   PSI_STATIC_STRUCT PsiValidData;\r
 } SAL_PROCESSOR_ERROR_RECORD;\r
 \r
+#pragma pack()\r
+\r
 ///\r
 /// GUID of Platform Memory Device Error Info\r
 ///\r
@@ -791,6 +785,7 @@ typedef struct {
   UINT8   SegmentNumber;\r
   UINT8   Reserved[5];\r
 } PCI_COMP_INFO;\r
+\r
 ///\r
 /// Definition of Platform PCI Component Error Info\r
 ///\r
@@ -824,6 +819,8 @@ typedef struct {
 #define SEL_EVENT_DATA1_VALID_BIT_MASK    0x80;\r
 #define SEL_EVENT_DATA2_VALID_BIT_MASK    0x100;\r
 #define SEL_EVENT_DATA3_VALID_BIT_MASK    0x200;\r
+\r
+#pragma pack(1)\r
 ///\r
 /// Definition of Platform SEL Device Error Info Record\r
 ///\r
@@ -842,6 +839,7 @@ typedef struct {
   UINT8           Data2;\r
   UINT8           Data3;\r
 } SAL_SEL_DEVICE_ERROR_RECORD;\r
+#pragma pack()\r
 \r
 ///\r
 /// GUID of Platform SMBIOS Device Error Info\r
@@ -915,6 +913,4 @@ typedef union {
   UINT8                               *Raw;\r
 } SAL_ERROR_RECORDS_POINTERS;\r
 \r
-#pragma pack()\r
-\r
 #endif\r

diff --git a/MdePkg/Include/IndustryStandard/Scsi.h b/MdePkg/Include/IndustryStandard/Scsi.h
index ccb3590bdf28d6a100ad669a71c591c2f269f17d..8b7c3d48557e6cf1607e26187900178cc2a0c13a 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Scsi.h
+++ b/MdePkg/Include/IndustryStandard/Scsi.h
@@ -191,7 +191,6 @@
 //\r
 #define EFI_SCSI_TYPE_UNKNOWN       0x1F  ///< Unknown or no device type\r
 \r
-#pragma pack(1)\r
 ///\r
 /// Standard INQUIRY data format\r
 ///\r
@@ -237,8 +236,6 @@ typedef struct {
   UINT8 BlockSize0;\r
 } EFI_SCSI_DISK_CAPACITY_DATA;\r
 \r
-#pragma pack()\r
-\r
 //\r
 // Sense Key\r
 //\r

diff --git a/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h b/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h
index b6f6140ee69acccd69d2e18d11d9ab5820cf6220..297e7b31a777143709f2356f5e7e51406b5a9791 100644 (file)
--- a/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h
+++ b/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h
@@ -18,16 +18,15 @@
 \r
 #include <IndustryStandard/Acpi.h>\r
 \r
-//\r
-// Ensure proper structure formats\r
-//\r
-#pragma pack(1)\r
-\r
 ///\r
 /// SPCR Revision (defined in spec)\r
 ///\r
 #define EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_REVISION 0x01\r
 \r
+//\r
+// Ensure proper structure formats\r
+//\r
+#pragma pack(1)\r
 ///\r
 /// Serial Port Console Redirection Table Format\r
 ///\r
@@ -54,7 +53,6 @@ typedef struct {
   UINT8                                   PciSegment;\r
   UINT32                                  Reserved2;\r
 } EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE;\r
-\r
 #pragma pack()\r
 \r
 //\r

diff --git a/MdePkg/Include/IndustryStandard/SmBios.h b/MdePkg/Include/IndustryStandard/SmBios.h
index e44e239f6f84c42f984eff4e904184fcce8be096..4926e5c8b2849c79971edc05a7c35472fd10e861 100644 (file)
--- a/MdePkg/Include/IndustryStandard/SmBios.h
+++ b/MdePkg/Include/IndustryStandard/SmBios.h
@@ -17,7 +17,6 @@
 ///\r
 /// Smbios Table Entry Point Structure\r
 ///\r
-#pragma pack(1)\r
 typedef struct {\r
   UINT8   AnchorString[4];\r
   UINT8   EntryPointStructureChecksum;\r
@@ -46,6 +45,7 @@ typedef struct {
 \r
 typedef UINT8 SMBIOS_TABLE_STRING;\r
 \r
+#pragma pack(1)\r
 ///\r
 /// BIOS Information (Type 0)\r
 ///\r
@@ -63,6 +63,7 @@ typedef struct {
   UINT8                 EmbeddedControllerFirmwareMajorRelease;\r
   UINT8                 EmbeddedControllerFirmwareMinorRelease;\r
 } SMBIOS_TABLE_TYPE0;\r
+#pragma pack()\r
 \r
 ///\r
 /// System Information (Type 1)\r
@@ -79,6 +80,7 @@ typedef struct {
   SMBIOS_TABLE_STRING   Family;\r
 } SMBIOS_TABLE_TYPE1;\r
 \r
+#pragma pack(1)\r
 ///\r
 /// Base Board (or Module) Information (Type 2)\r
 ///\r
@@ -96,6 +98,7 @@ typedef struct {
   UINT8                 NumberOfContainedObjectHandles;\r
   UINT16                ContainedObjectHandles[1];\r
 } SMBIOS_TABLE_TYPE2;\r
+#pragma pack()\r
 \r
 typedef struct {\r
   UINT8                 ContainedElementType;\r
@@ -161,6 +164,7 @@ typedef struct {
   UINT16                ProcessorFamily2;\r
 } SMBIOS_TABLE_TYPE4;\r
 \r
+#pragma pack(1)\r
 ///\r
 /// Memory Controller Information (Type 5, Obsolete)\r
 ///\r
@@ -208,6 +212,7 @@ typedef struct {
   UINT8                 SystemCacheType;\r
   UINT8                 Associativity;\r
 } SMBIOS_TABLE_TYPE7;\r
+#pragma pack()\r
 \r
 ///\r
 /// Port Connector Information (Type 8)\r
@@ -221,6 +226,7 @@ typedef struct {
   UINT8                 PortType;\r
 } SMBIOS_TABLE_TYPE8;\r
 \r
+#pragma pack(1)\r
 ///\r
 /// System Slots (Type 9)\r
 ///\r
@@ -241,6 +247,7 @@ typedef struct {
   UINT8                 BusNum;\r
   UINT8                 DevFuncNum;\r
 } SMBIOS_TABLE_TYPE9;\r
+#pragma pack()\r
 \r
 typedef struct {\r
   UINT8                 DeviceType;\r
@@ -282,6 +289,7 @@ typedef struct {
   SMBIOS_TABLE_STRING   CurrentLanguages;\r
 } SMBIOS_TABLE_TYPE13;\r
 \r
+#pragma pack(1)\r
 typedef struct {\r
   UINT8                 ItemType;\r
   UINT16                ItemHandle;\r
@@ -372,6 +380,7 @@ typedef struct {
   UINT32                DeviceErrorAddress;\r
   UINT32                ErrorResolution;\r
 } SMBIOS_TABLE_TYPE18;\r
+#pragma pack()\r
 \r
 ///\r
 /// Memory Array Mapped Address (Type 19)\r
@@ -408,6 +417,7 @@ typedef struct {
   UINT8                 NumberOfButtons;\r
 } SMBIOS_TABLE_TYPE21;\r
 \r
+#pragma pack(1)\r
 ///\r
 /// Portable Battery (Type 22)\r
 ///\r
@@ -441,6 +451,7 @@ typedef struct {
   UINT16                TimerInterval;\r
   UINT16                Timeout;\r
 } SMBIOS_TABLE_TYPE23;\r
+#pragma pack()\r
 \r
 ///\r
 /// Hardware Security (Type 24)\r
@@ -554,6 +565,7 @@ typedef struct {
   UINT8                 BootStatus[1];\r
 } SMBIOS_TABLE_TYPE32;\r
 \r
+#pragma pack(1)\r
 ///\r
 /// 64-bit Memory Error Information (Type 33)\r
 ///\r
@@ -589,6 +601,7 @@ typedef struct {
   UINT16                ComponentHandle;\r
   UINT16                ThresholdHandle;\r
 } SMBIOS_TABLE_TYPE35;\r
+#pragma pack()\r
 \r
 ///\r
 /// Management Device Threshold Data (Type 36)\r
@@ -603,6 +616,7 @@ typedef struct {
   UINT16                UpperThresholdNonRecoverable;\r
 } SMBIOS_TABLE_TYPE36;\r
 \r
+#pragma pack(1)\r
 typedef struct {\r
   UINT8                 DeviceLoad;\r
   UINT16                DeviceHandle;\r
@@ -618,6 +632,7 @@ typedef struct {
   UINT8                 MemoryDeviceCount;\r
   MEMORY_DEVICE         MemoryDevice[1];\r
 } SMBIOS_TABLE_TYPE37;\r
+#pragma pack()\r
 \r
 ///\r
 /// IPMI Device Information (Type 38)\r
@@ -653,6 +668,7 @@ typedef struct {
   UINT16                InputCurrentProbeHandle;\r
 } SMBIOS_TABLE_TYPE39;\r
 \r
+#pragma pack(1)\r
 typedef struct {                       \r
   UINT8                   EntryLength; \r
   UINT16                  ReferencedHandle;\r
@@ -682,6 +698,7 @@ typedef struct {
   UINT8                   BusNum;\r
   UINT8                   DevFuncNum;  \r
 } SMBIOS_TABLE_TYPE41;\r
+#pragma pack()\r
 \r
 ///\r
 /// Inactive (Type 126)\r
@@ -749,6 +766,4 @@ typedef union {
   UINT8                 *Raw;\r
 } SMBIOS_STRUCTURE_POINTER;\r
 \r
-#pragma pack()\r
-\r
 #endif\r

diff --git a/MdePkg/Include/IndustryStandard/Tpm12.h b/MdePkg/Include/IndustryStandard/Tpm12.h
index 0c5fac2f9797db4c87477dca35bf70697e5af06f..a0fc4562aab20d36d8704ac7b1e525d53b76e647 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Tpm12.h
+++ b/MdePkg/Include/IndustryStandard/Tpm12.h
@@ -24,7 +24,6 @@
 //\r
 // Structures are all packed on 1-byte alignment\r
 //\r
-\r
 #pragma pack (1)\r
 \r
 //\r

diff --git a/MdePkg/Include/IndustryStandard/Usb.h b/MdePkg/Include/IndustryStandard/Usb.h
index ec86d8b794034439f33f6ac1382975083842b321..419b1b375d032a77171eb59f2486afab1e514814 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Usb.h
+++ b/MdePkg/Include/IndustryStandard/Usb.h
@@ -62,7 +62,6 @@
 //\r
 // USB standard descriptors and reqeust\r
 //\r
-#pragma pack(1)\r
 \r
 ///\r
 /// Format of Setup Data for USB Device Requests\r
@@ -151,9 +150,6 @@ typedef struct {
   CHAR16          String[1];\r
 } EFI_USB_STRING_DESCRIPTOR;\r
 \r
-#pragma pack()\r
-\r
-\r
 typedef enum {\r
   //\r
   // USB request type\r
@@ -339,6 +335,7 @@ typedef struct hid_class_descriptor {
   UINT8   DescriptorType;\r
   UINT16  DescriptorLength;\r
 } EFI_USB_HID_CLASS_DESCRIPTOR;\r
+#pragma pack()\r
 \r
 ///\r
 /// The HID descriptor identifies the length and type\r
@@ -353,6 +350,4 @@ typedef struct hid_descriptor {
   EFI_USB_HID_CLASS_DESCRIPTOR  HidClassDesc[1];\r
 } EFI_USB_HID_DESCRIPTOR;\r
 \r
-#pragma pack()\r
-\r
 #endif\r

diff --git a/MdePkg/Include/IndustryStandard/WatchdogActionTable.h b/MdePkg/Include/IndustryStandard/WatchdogActionTable.h
index f2026ecd874e78b5ff21e98d4b772ae3381e6d19..e94061383dcb423c9a05cb5fbae64cba4dfb0b8f 100644 (file)
--- a/MdePkg/Include/IndustryStandard/WatchdogActionTable.h
+++ b/MdePkg/Include/IndustryStandard/WatchdogActionTable.h
@@ -18,10 +18,6 @@
 \r
 #include <IndustryStandard/Acpi.h>\r
 \r
-//\r
-// Ensure proper structure formats\r
-//\r
-#pragma pack(1)\r
 ///\r
 /// Watchdog Action Table definition.\r
 ///\r
@@ -53,8 +49,6 @@ typedef struct {
   UINT32                                  Mask;\r
 } EFI_ACPI_WATCHDOG_ACTION_1_0_WATCHDOG_ACTION_INSTRUCTION_ENTRY;\r
 \r
-#pragma pack()\r
-\r
 ///\r
 /// WDAT Revision (defined in spec)\r
 ///\r

diff --git a/MdePkg/Include/IndustryStandard/WatchdogResourceTable.h b/MdePkg/Include/IndustryStandard/WatchdogResourceTable.h
index 90154b3d3e1e11f232183ac80797832a30cb640d..d1dba4f4798b377d00fc040a916c6b88ead8d97e 100644 (file)
--- a/MdePkg/Include/IndustryStandard/WatchdogResourceTable.h
+++ b/MdePkg/Include/IndustryStandard/WatchdogResourceTable.h
@@ -17,11 +17,6 @@
 \r
 #include <IndustryStandard/Acpi.h>\r
 \r
-//\r
-// Ensure proper structure formats\r
-//\r
-#pragma pack(1)\r
-\r
 ///\r
 /// Watchdog Resource Table definition.\r
 ///\r
@@ -39,8 +34,6 @@ typedef struct {
   UINT8                                   Units;\r
 } EFI_ACPI_WATCHDOG_RESOURCE_1_0_TABLE;\r
 \r
-#pragma pack()\r
-\r
 //\r
 // WDRT Revision (defined in spec)\r
 //\r