summaryrefslogtreecommitdiff
path: root/MdePkg/Include/IndustryStandard
diff options
context:
space:
mode:
authorvanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>2008-11-10 05:28:57 +0000
committervanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>2008-11-10 05:28:57 +0000
commit54569f0f8fa7cb0f11a6cbfb6d73e2a14014c6c9 (patch)
tree42666d76de2ad735a5b369af120ef4ee66ba09aa /MdePkg/Include/IndustryStandard
parent531237a5ef547f77b91721f5538add55bea308c9 (diff)
downloadedk2-platforms-54569f0f8fa7cb0f11a6cbfb6d73e2a14014c6c9.tar.xz
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
Diffstat (limited to 'MdePkg/Include/IndustryStandard')
-rw-r--r--MdePkg/Include/IndustryStandard/IScsiBootFirmwareTable.h38
-rw-r--r--MdePkg/Include/IndustryStandard/Mbr.h9
-rw-r--r--MdePkg/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h7
-rw-r--r--MdePkg/Include/IndustryStandard/Pci22.h31
-rw-r--r--MdePkg/Include/IndustryStandard/Pci23.h3
-rw-r--r--MdePkg/Include/IndustryStandard/Pci30.h4
-rw-r--r--MdePkg/Include/IndustryStandard/Sal.h26
-rw-r--r--MdePkg/Include/IndustryStandard/Scsi.h3
-rw-r--r--MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h10
-rw-r--r--MdePkg/Include/IndustryStandard/SmBios.h21
-rw-r--r--MdePkg/Include/IndustryStandard/Tpm12.h1
-rw-r--r--MdePkg/Include/IndustryStandard/Usb.h7
-rw-r--r--MdePkg/Include/IndustryStandard/WatchdogActionTable.h6
-rw-r--r--MdePkg/Include/IndustryStandard/WatchdogResourceTable.h7
14 files changed, 69 insertions, 104 deletions
diff --git a/MdePkg/Include/IndustryStandard/IScsiBootFirmwareTable.h b/MdePkg/Include/IndustryStandard/IScsiBootFirmwareTable.h
index 7fc7ac6377..cf3c4326fe 100644
--- a/MdePkg/Include/IndustryStandard/IScsiBootFirmwareTable.h
+++ b/MdePkg/Include/IndustryStandard/IScsiBootFirmwareTable.h
@@ -1,6 +1,6 @@
/** @file
- The definition for iSCSI Boot Firmware Table, it's defined in
- Microsoft iBFT document.
+ The definition for iSCSI Boot Firmware Table, it's defined in Microsoft's
+ iSCSI Boot Firmware Table(iBFT) as Defined in ACPI 3.0b Specification.
Copyright (c) 2006 - 2008, Intel Corporation
All rights reserved. This program and the accompanying materials
@@ -46,8 +46,6 @@ typedef enum {
IpPrefixOriginUnchanged = 16
} IP_PREFIX_VALUE;
-#pragma pack(1)
-
///
/// iBF Table Header
///
@@ -85,8 +83,9 @@ typedef struct {
UINT16 Target1Offset;
} EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE;
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE_VERSION 0x1
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE_FLAG_BOOT_FAILOVER 0x1
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE_VERSION 0x1
+
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE_FLAG_BOOT_FAILOVER BIT0
///
/// Initiator Structure
@@ -101,9 +100,10 @@ typedef struct {
UINT16 IScsiNameOffset;
} EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE;
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE_VERSION 0x1
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE_FLAG_BLOCK_VALID 0x1
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE_FLAG_BOOT_SELECTED 0x2
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE_VERSION 0x1
+
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE_FLAG_BLOCK_VALID BIT0
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE_FLAG_BOOT_SELECTED BIT1
///
/// NIC Structure
@@ -124,10 +124,11 @@ typedef struct {
UINT16 HostNameOffset;
} EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE;
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_VERSION 0x1
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_FLAG_BLOCK_VALID 0x1
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_FLAG_BOOT_SELECTED 0x2
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_FLAG_GLOBAL 0x4
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_VERSION 0x1
+
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_FLAG_BLOCK_VALID BIT0
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_FLAG_BOOT_SELECTED BIT1
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_FLAG_GLOBAL BIT2
///
/// Target Structure
@@ -151,13 +152,12 @@ typedef struct {
UINT16 ReverseCHAPSecretOffset;
} EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE;
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_VERSION 0x1
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_FLAG_BLOCK_VALID 0x1
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_FLAG_BOOT_SELECTED 0x2
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_FLAG_RADIUS_CHAP 0x4
-#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_FLAG_RADIUS_RCHAP 0x8
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_VERSION 0x1
-#pragma pack()
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_FLAG_BLOCK_VALID BIT0
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_FLAG_BOOT_SELECTED BIT1
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_FLAG_RADIUS_CHAP BIT2
+#define EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_FLAG_RADIUS_RCHAP BIT3
#endif
diff --git a/MdePkg/Include/IndustryStandard/Mbr.h b/MdePkg/Include/IndustryStandard/Mbr.h
index 8dd9d59f26..39120c7a21 100644
--- 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.
#define MBR_SIZE 512
-#pragma pack(1)
-//
-// MBR Partition Entry
-//
+///
+/// MBR Partition Entry
+///
typedef struct {
UINT8 BootIndicator;
UINT8 StartHead;
@@ -55,6 +54,4 @@ typedef struct {
UINT16 Signature;
} MASTER_BOOT_RECORD;
-#pragma pack()
-
#endif
diff --git a/MdePkg/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h b/MdePkg/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h
index 515a7b3001..fe4adb7c8c 100644
--- a/MdePkg/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h
+++ b/MdePkg/Include/IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h
@@ -16,11 +16,6 @@
#ifndef _MEMORY_MAPPED_CONFIGURATION_SPACE_ACCESS_TABLE_H_
#define _MEMORY_MAPPED_CONFIGURATION_SPACE_ACCESS_TABLE_H_
-//
-// Ensure proper structure formats
-//
-#pragma pack(1)
-
///
/// Memory Mapped Configuration Space Access Table (MCFG)
/// This table is a basic description table header followed by
@@ -48,6 +43,4 @@ typedef struct {
///
#define EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_SPACE_ACCESS_TABLE_REVISION 0x01
-#pragma pack()
-
#endif
diff --git a/MdePkg/Include/IndustryStandard/Pci22.h b/MdePkg/Include/IndustryStandard/Pci22.h
index d88b28f825..88f39fbae7 100644
--- a/MdePkg/Include/IndustryStandard/Pci22.h
+++ b/MdePkg/Include/IndustryStandard/Pci22.h
@@ -26,7 +26,6 @@
#define PCI_MAX_FUNC 7
-#pragma pack(1)
typedef struct {
UINT16 VendorId;
UINT16 DeviceId;
@@ -123,9 +122,9 @@ typedef struct {
UINT16 BridgeControl; ///< Bridge Control
} PCI_CARDBUS_CONTROL_REGISTER;
-///
-/// Definitions of PCI class bytes and manipulation macros.
-///
+//
+// Definitions of PCI class bytes and manipulation macros.
+//
#define PCI_CLASS_OLD 0x00
#define PCI_CLASS_OLD_OTHER 0x00
#define PCI_CLASS_OLD_VGA 0x01
@@ -350,9 +349,9 @@ typedef struct {
#define PCI_MAXGNT_OFFSET 0x3E ///< Max Grant Register
#define PCI_MAXLAT_OFFSET 0x3F ///< Max Latency Register
-///
-/// defined in PCI-to-PCI Bridge Architecture Specification
-///
+//
+// defined in PCI-to-PCI Bridge Architecture Specification
+//
#define PCI_BRIDGE_PRIMARY_BUS_REGISTER_OFFSET 0x18
#define PCI_BRIDGE_SECONDARY_BUS_REGISTER_OFFSET 0x19
#define PCI_BRIDGE_SUBORDINATE_BUS_REGISTER_OFFSET 0x1a
@@ -376,8 +375,6 @@ typedef union {
UINT32 Uint32;
} PCI_CONFIG_ACCESS_CF8;
-#pragma pack()
-
#define EFI_PCI_COMMAND_IO_SPACE BIT0 ///< 0x0001
#define EFI_PCI_COMMAND_MEMORY_SPACE BIT1 ///< 0x0002
#define EFI_PCI_COMMAND_BUS_MASTER BIT2 ///< 0x0004
@@ -389,9 +386,9 @@ typedef union {
#define EFI_PCI_COMMAND_SERR BIT8 ///< 0x0100
#define EFI_PCI_COMMAND_FAST_BACK_TO_BACK BIT9 ///< 0x0200
-///
-/// defined in PCI-to-PCI Bridge Architecture Specification
-///
+//
+// defined in PCI-to-PCI Bridge Architecture Specification
+//
#define EFI_PCI_BRIDGE_CONTROL_PARITY_ERROR_RESPONSE BIT0 ///< 0x0001
#define EFI_PCI_BRIDGE_CONTROL_SERR BIT1 ///< 0x0002
#define EFI_PCI_BRIDGE_CONTROL_ISA BIT2 ///< 0x0004
@@ -405,9 +402,9 @@ typedef union {
#define EFI_PCI_BRIDGE_CONTROL_TIMER_STATUS BIT10 ///< 0x0400
#define EFI_PCI_BRIDGE_CONTROL_DISCARD_TIMER_SERR BIT11 ///< 0x0800
-///
-/// Following are the PCI-CARDBUS bridge control bit, defined in PC Card Standard
-///
+//
+// Following are the PCI-CARDBUS bridge control bit, defined in PC Card Standard
+//
#define EFI_PCI_BRIDGE_CONTROL_IREQINT_ENABLE BIT7 ///< 0x0080
#define EFI_PCI_BRIDGE_CONTROL_RANGE0_MEMORY_TYPE BIT8 ///< 0x0100
#define EFI_PCI_BRIDGE_CONTROL_RANGE1_MEMORY_TYPE BIT9 ///< 0x0200
@@ -426,7 +423,6 @@ typedef union {
///
#define EFI_PCI_CARDBUS_BRIDGE_CAPABILITY_PTR 0x14
-#pragma pack(1)
//
// PCI Capability List IDs and records
//
@@ -436,6 +432,7 @@ typedef union {
#define EFI_PCI_CAPABILITY_ID_SLOTID 0x04
#define EFI_PCI_CAPABILITY_ID_MSI 0x05
#define EFI_PCI_CAPABILITY_ID_HOTPLUG 0x06
+
typedef struct {
UINT8 CapabilityID;
UINT8 NextItemPtr;
@@ -596,6 +593,4 @@ typedef union {
EFI_LEGACY_EXPANSION_ROM_HEADER *PcAt;
} EFI_PCI_ROM_HEADER;
-#pragma pack()
-
#endif
diff --git a/MdePkg/Include/IndustryStandard/Pci23.h b/MdePkg/Include/IndustryStandard/Pci23.h
index e1289f75c6..29d692321e 100644
--- a/MdePkg/Include/IndustryStandard/Pci23.h
+++ b/MdePkg/Include/IndustryStandard/Pci23.h
@@ -32,7 +32,6 @@
//
#define EFI_PCI_CAPABILITY_ID_PCIX 0x07
-#pragma pack(1)
///
/// Capability EFI_PCI_CAPABILITY_ID_PCIX, defined in PCI-X Addendum to the PCI Local Bus Specification
///
@@ -53,8 +52,6 @@ typedef struct {
UINT32 SplitTransCtrlRegDn;
} EFI_PCI_CAPABILITY_PCIX_BRDG;
-#pragma pack()
-
#define PCI_CODE_TYPE_EFI_IMAGE 0x03
#endif
diff --git a/MdePkg/Include/IndustryStandard/Pci30.h b/MdePkg/Include/IndustryStandard/Pci30.h
index 3bcf2327f1..04bded621c 100644
--- a/MdePkg/Include/IndustryStandard/Pci30.h
+++ b/MdePkg/Include/IndustryStandard/Pci30.h
@@ -30,8 +30,6 @@
///
#define EFI_PCI_CAPABILITY_ID_PCIEXP 0x10
-#pragma pack(1)
-
///
/// defined in PCI Firmware Specification
///
@@ -52,6 +50,4 @@ typedef struct {
UINT16 DMTFCLPEntryPointOffset;
} PCI_3_0_DATA_STRUCTURE;
-#pragma pack()
-
#endif
diff --git a/MdePkg/Include/IndustryStandard/Sal.h b/MdePkg/Include/IndustryStandard/Sal.h
index b792df6f6e..37e7dbe71b 100644
--- a/MdePkg/Include/IndustryStandard/Sal.h
+++ b/MdePkg/Include/IndustryStandard/Sal.h
@@ -341,7 +341,6 @@ typedef struct _SAL_UPDATE_PAL_INFO_BLOCK {
///
/// SAL System Table Definitions
///
-#pragma pack(1)
typedef struct {
///
/// The ASCII string representation of "SST_" which confirms the presence of the table.
@@ -392,7 +391,6 @@ typedef struct {
///
UINT8 Reserved2[8];
} SAL_SYSTEM_TABLE_HEADER;
-#pragma pack()
#define EFI_SAL_ST_HEADER_SIGNATURE "SST_"
#define EFI_SAL_REVISION 0x0320
@@ -416,7 +414,6 @@ typedef struct {
#define EFI_SAL_ST_PTC_SIZE 16
#define EFI_SAL_ST_AP_WAKEUP_SIZE 16
-#pragma pack(1)
///
/// Format Entrypoint Descriptor Entry
///
@@ -429,7 +426,6 @@ typedef struct {
UINT64 Reserved2[2];
} SAL_ST_ENTRY_POINT_DESCRIPTOR;
-#pragma pack(1)
///
/// Format Platform Features Descriptor Entry
///
@@ -438,7 +434,7 @@ typedef struct {
UINT8 PlatformFeatures;
UINT8 Reserved[14];
} SAL_ST_PLATFORM_FEATURES;
-#pragma pack()
+
//
// Value of Platform Feature List
//
@@ -446,7 +442,6 @@ typedef struct {
#define SAL_PLAT_FEAT_PLAT_IPI_HINT 0x02
#define SAL_PLAT_FEAT_PROC_IPI_HINT 0x04
-#pragma pack(1)
///
/// Format of Translation Register Descriptor Entry
///
@@ -459,14 +454,13 @@ typedef struct {
UINT64 EncodedPageSize;
UINT64 Reserved1;
} SAL_ST_TR_DECRIPTOR;
-#pragma pack()
+
//
// Type of Translation Register
//
#define EFI_SAL_ST_TR_USAGE_INSTRUCTION 00
#define EFI_SAL_ST_TR_USAGE_DATA 01
-#pragma pack(1)
///
/// Definition of Coherence Domain Information
///
@@ -474,9 +468,7 @@ typedef struct {
UINT64 NumberOfProcessors;
UINT64 LocalIDRegister;
} SAL_COHERENCE_DOMAIN_INFO;
-#pragma pack()
-#pragma pack(1)
///
/// Format of Purge Translation Cache Coherence Domain Entry
///
@@ -486,9 +478,7 @@ typedef struct {
UINT32 NumberOfDomains;
SAL_COHERENCE_DOMAIN_INFO *DomainInformation;
} SAL_ST_CACHE_COHERENCE_DECRIPTOR;
-#pragma pack()
-#pragma pack(1)
///
/// Format of Application Processor Wake-Up Descriptor Entry
///
@@ -498,7 +488,6 @@ typedef struct {
UINT8 Reserved[6];
UINT64 ExternalInterruptVector;
} SAL_ST_AP_WAKEUP_DECRIPTOR;
-#pragma pack()
///
/// Format of Firmware Interface Table (FIT) Entry
@@ -648,6 +637,9 @@ typedef struct {
#define PROC_CR_LID_VALID_BIT_MASK 0x4
#define PROC_STATIC_STRUCT_VALID_BIT_MASK 0x8
#define CPU_INFO_VALID_BIT_MASK 0x1000000
+
+#pragma pack(1)
+
///
/// Definition of Processor Machine Check Error Record
///
@@ -666,6 +658,8 @@ typedef struct {
PSI_STATIC_STRUCT PsiValidData;
} SAL_PROCESSOR_ERROR_RECORD;
+#pragma pack()
+
///
/// GUID of Platform Memory Device Error Info
///
@@ -791,6 +785,7 @@ typedef struct {
UINT8 SegmentNumber;
UINT8 Reserved[5];
} PCI_COMP_INFO;
+
///
/// Definition of Platform PCI Component Error Info
///
@@ -824,6 +819,8 @@ typedef struct {
#define SEL_EVENT_DATA1_VALID_BIT_MASK 0x80;
#define SEL_EVENT_DATA2_VALID_BIT_MASK 0x100;
#define SEL_EVENT_DATA3_VALID_BIT_MASK 0x200;
+
+#pragma pack(1)
///
/// Definition of Platform SEL Device Error Info Record
///
@@ -842,6 +839,7 @@ typedef struct {
UINT8 Data2;
UINT8 Data3;
} SAL_SEL_DEVICE_ERROR_RECORD;
+#pragma pack()
///
/// GUID of Platform SMBIOS Device Error Info
@@ -915,6 +913,4 @@ typedef union {
UINT8 *Raw;
} SAL_ERROR_RECORDS_POINTERS;
-#pragma pack()
-
#endif
diff --git a/MdePkg/Include/IndustryStandard/Scsi.h b/MdePkg/Include/IndustryStandard/Scsi.h
index ccb3590bdf..8b7c3d4855 100644
--- a/MdePkg/Include/IndustryStandard/Scsi.h
+++ b/MdePkg/Include/IndustryStandard/Scsi.h
@@ -191,7 +191,6 @@
//
#define EFI_SCSI_TYPE_UNKNOWN 0x1F ///< Unknown or no device type
-#pragma pack(1)
///
/// Standard INQUIRY data format
///
@@ -237,8 +236,6 @@ typedef struct {
UINT8 BlockSize0;
} EFI_SCSI_DISK_CAPACITY_DATA;
-#pragma pack()
-
//
// Sense Key
//
diff --git a/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h b/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h
index b6f6140ee6..297e7b31a7 100644
--- a/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h
+++ b/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h
@@ -18,16 +18,15 @@
#include <IndustryStandard/Acpi.h>
-//
-// Ensure proper structure formats
-//
-#pragma pack(1)
-
///
/// SPCR Revision (defined in spec)
///
#define EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_REVISION 0x01
+//
+// Ensure proper structure formats
+//
+#pragma pack(1)
///
/// Serial Port Console Redirection Table Format
///
@@ -54,7 +53,6 @@ typedef struct {
UINT8 PciSegment;
UINT32 Reserved2;
} EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE;
-
#pragma pack()
//
diff --git a/MdePkg/Include/IndustryStandard/SmBios.h b/MdePkg/Include/IndustryStandard/SmBios.h
index e44e239f6f..4926e5c8b2 100644
--- a/MdePkg/Include/IndustryStandard/SmBios.h
+++ b/MdePkg/Include/IndustryStandard/SmBios.h
@@ -17,7 +17,6 @@
///
/// Smbios Table Entry Point Structure
///
-#pragma pack(1)
typedef struct {
UINT8 AnchorString[4];
UINT8 EntryPointStructureChecksum;
@@ -46,6 +45,7 @@ typedef struct {
typedef UINT8 SMBIOS_TABLE_STRING;
+#pragma pack(1)
///
/// BIOS Information (Type 0)
///
@@ -63,6 +63,7 @@ typedef struct {
UINT8 EmbeddedControllerFirmwareMajorRelease;
UINT8 EmbeddedControllerFirmwareMinorRelease;
} SMBIOS_TABLE_TYPE0;
+#pragma pack()
///
/// System Information (Type 1)
@@ -79,6 +80,7 @@ typedef struct {
SMBIOS_TABLE_STRING Family;
} SMBIOS_TABLE_TYPE1;
+#pragma pack(1)
///
/// Base Board (or Module) Information (Type 2)
///
@@ -96,6 +98,7 @@ typedef struct {
UINT8 NumberOfContainedObjectHandles;
UINT16 ContainedObjectHandles[1];
} SMBIOS_TABLE_TYPE2;
+#pragma pack()
typedef struct {
UINT8 ContainedElementType;
@@ -161,6 +164,7 @@ typedef struct {
UINT16 ProcessorFamily2;
} SMBIOS_TABLE_TYPE4;
+#pragma pack(1)
///
/// Memory Controller Information (Type 5, Obsolete)
///
@@ -208,6 +212,7 @@ typedef struct {
UINT8 SystemCacheType;
UINT8 Associativity;
} SMBIOS_TABLE_TYPE7;
+#pragma pack()
///
/// Port Connector Information (Type 8)
@@ -221,6 +226,7 @@ typedef struct {
UINT8 PortType;
} SMBIOS_TABLE_TYPE8;
+#pragma pack(1)
///
/// System Slots (Type 9)
///
@@ -241,6 +247,7 @@ typedef struct {
UINT8 BusNum;
UINT8 DevFuncNum;
} SMBIOS_TABLE_TYPE9;
+#pragma pack()
typedef struct {
UINT8 DeviceType;
@@ -282,6 +289,7 @@ typedef struct {
SMBIOS_TABLE_STRING CurrentLanguages;
} SMBIOS_TABLE_TYPE13;
+#pragma pack(1)
typedef struct {
UINT8 ItemType;
UINT16 ItemHandle;
@@ -372,6 +380,7 @@ typedef struct {
UINT32 DeviceErrorAddress;
UINT32 ErrorResolution;
} SMBIOS_TABLE_TYPE18;
+#pragma pack()
///
/// Memory Array Mapped Address (Type 19)
@@ -408,6 +417,7 @@ typedef struct {
UINT8 NumberOfButtons;
} SMBIOS_TABLE_TYPE21;
+#pragma pack(1)
///
/// Portable Battery (Type 22)
///
@@ -441,6 +451,7 @@ typedef struct {
UINT16 TimerInterval;
UINT16 Timeout;
} SMBIOS_TABLE_TYPE23;
+#pragma pack()
///
/// Hardware Security (Type 24)
@@ -554,6 +565,7 @@ typedef struct {
UINT8 BootStatus[1];
} SMBIOS_TABLE_TYPE32;
+#pragma pack(1)
///
/// 64-bit Memory Error Information (Type 33)
///
@@ -589,6 +601,7 @@ typedef struct {
UINT16 ComponentHandle;
UINT16 ThresholdHandle;
} SMBIOS_TABLE_TYPE35;
+#pragma pack()
///
/// Management Device Threshold Data (Type 36)
@@ -603,6 +616,7 @@ typedef struct {
UINT16 UpperThresholdNonRecoverable;
} SMBIOS_TABLE_TYPE36;
+#pragma pack(1)
typedef struct {
UINT8 DeviceLoad;
UINT16 DeviceHandle;
@@ -618,6 +632,7 @@ typedef struct {
UINT8 MemoryDeviceCount;
MEMORY_DEVICE MemoryDevice[1];
} SMBIOS_TABLE_TYPE37;
+#pragma pack()
///
/// IPMI Device Information (Type 38)
@@ -653,6 +668,7 @@ typedef struct {
UINT16 InputCurrentProbeHandle;
} SMBIOS_TABLE_TYPE39;
+#pragma pack(1)
typedef struct {
UINT8 EntryLength;
UINT16 ReferencedHandle;
@@ -682,6 +698,7 @@ typedef struct {
UINT8 BusNum;
UINT8 DevFuncNum;
} SMBIOS_TABLE_TYPE41;
+#pragma pack()
///
/// Inactive (Type 126)
@@ -749,6 +766,4 @@ typedef union {
UINT8 *Raw;
} SMBIOS_STRUCTURE_POINTER;
-#pragma pack()
-
#endif
diff --git a/MdePkg/Include/IndustryStandard/Tpm12.h b/MdePkg/Include/IndustryStandard/Tpm12.h
index 0c5fac2f97..a0fc4562aa 100644
--- a/MdePkg/Include/IndustryStandard/Tpm12.h
+++ b/MdePkg/Include/IndustryStandard/Tpm12.h
@@ -24,7 +24,6 @@
//
// Structures are all packed on 1-byte alignment
//
-
#pragma pack (1)
//
diff --git a/MdePkg/Include/IndustryStandard/Usb.h b/MdePkg/Include/IndustryStandard/Usb.h
index ec86d8b794..419b1b375d 100644
--- a/MdePkg/Include/IndustryStandard/Usb.h
+++ b/MdePkg/Include/IndustryStandard/Usb.h
@@ -62,7 +62,6 @@
//
// USB standard descriptors and reqeust
//
-#pragma pack(1)
///
/// Format of Setup Data for USB Device Requests
@@ -151,9 +150,6 @@ typedef struct {
CHAR16 String[1];
} EFI_USB_STRING_DESCRIPTOR;
-#pragma pack()
-
-
typedef enum {
//
// USB request type
@@ -339,6 +335,7 @@ typedef struct hid_class_descriptor {
UINT8 DescriptorType;
UINT16 DescriptorLength;
} EFI_USB_HID_CLASS_DESCRIPTOR;
+#pragma pack()
///
/// The HID descriptor identifies the length and type
@@ -353,6 +350,4 @@ typedef struct hid_descriptor {
EFI_USB_HID_CLASS_DESCRIPTOR HidClassDesc[1];
} EFI_USB_HID_DESCRIPTOR;
-#pragma pack()
-
#endif
diff --git a/MdePkg/Include/IndustryStandard/WatchdogActionTable.h b/MdePkg/Include/IndustryStandard/WatchdogActionTable.h
index f2026ecd87..e94061383d 100644
--- a/MdePkg/Include/IndustryStandard/WatchdogActionTable.h
+++ b/MdePkg/Include/IndustryStandard/WatchdogActionTable.h
@@ -18,10 +18,6 @@
#include <IndustryStandard/Acpi.h>
-//
-// Ensure proper structure formats
-//
-#pragma pack(1)
///
/// Watchdog Action Table definition.
///
@@ -53,8 +49,6 @@ typedef struct {
UINT32 Mask;
} EFI_ACPI_WATCHDOG_ACTION_1_0_WATCHDOG_ACTION_INSTRUCTION_ENTRY;
-#pragma pack()
-
///
/// WDAT Revision (defined in spec)
///
diff --git a/MdePkg/Include/IndustryStandard/WatchdogResourceTable.h b/MdePkg/Include/IndustryStandard/WatchdogResourceTable.h
index 90154b3d3e..d1dba4f479 100644
--- a/MdePkg/Include/IndustryStandard/WatchdogResourceTable.h
+++ b/MdePkg/Include/IndustryStandard/WatchdogResourceTable.h
@@ -17,11 +17,6 @@
#include <IndustryStandard/Acpi.h>
-//
-// Ensure proper structure formats
-//
-#pragma pack(1)
-
///
/// Watchdog Resource Table definition.
///
@@ -39,8 +34,6 @@ typedef struct {
UINT8 Units;
} EFI_ACPI_WATCHDOG_RESOURCE_1_0_TABLE;
-#pragma pack()
-
//
// WDRT Revision (defined in spec)
//