]> git.proxmox.com Git - mirror_edk2.git/commitdiff
Update the header file coding style (alignment, comment, etc.)
authorgdong1 <gdong1@6f19259b-4bc3-4df7-8a09-765794883524>
Mon, 16 Mar 2009 10:29:27 +0000 (10:29 +0000)
committergdong1 <gdong1@6f19259b-4bc3-4df7-8a09-765794883524>
Mon, 16 Mar 2009 10:29:27 +0000 (10:29 +0000)
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7893 6f19259b-4bc3-4df7-8a09-765794883524

IntelFrameworkPkg/Include/Framework/DataHubRecords.h
IntelFrameworkPkg/Include/Framework/DxeCis.h
IntelFrameworkPkg/Include/Framework/FrameworkInternalFormRepresentation.h
IntelFrameworkPkg/Include/Framework/Hob.h
IntelFrameworkPkg/Include/Framework/Legacy16.h
IntelFrameworkPkg/Include/Framework/PeiCis.h
IntelFrameworkPkg/Include/Framework/StatusCode.h

index b3d70336eeca36d1bd1e8683bff02d2ebcdbc5c7..cfb664cf162c4505061c61e88fca82f35e9b79f4 100644 (file)
 #pragma pack(1)\r
 \r
 typedef struct _USB_PORT_DEVICE_PATH {\r
-  ACPI_HID_DEVICE_PATH      PciRootBridgeDevicePath;\r
-  PCI_DEVICE_PATH           PciBusDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL  EndDevicePath;\r
+  ACPI_HID_DEVICE_PATH              PciRootBridgeDevicePath;\r
+  PCI_DEVICE_PATH                   PciBusDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL          EndDevicePath;\r
 } USB_PORT_DEVICE_PATH;\r
 \r
 //\r
 // IDE\r
 //\r
 typedef struct _IDE_DEVICE_PATH {\r
-  ACPI_HID_DEVICE_PATH      PciRootBridgeDevicePath;\r
-  PCI_DEVICE_PATH           PciBusDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL  EndDevicePath;\r
+  ACPI_HID_DEVICE_PATH              PciRootBridgeDevicePath;\r
+  PCI_DEVICE_PATH                   PciBusDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL          EndDevicePath;\r
 } IDE_DEVICE_PATH;\r
 \r
 //\r
 // RMC Connector\r
 //\r
 typedef struct _RMC_CONN_DEVICE_PATH {\r
-  ACPI_HID_DEVICE_PATH      PciRootBridgeDevicePath;\r
-  PCI_DEVICE_PATH           PciBridgeDevicePath;\r
-  PCI_DEVICE_PATH           PciBusDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL  EndDevicePath;\r
+  ACPI_HID_DEVICE_PATH              PciRootBridgeDevicePath;\r
+  PCI_DEVICE_PATH                   PciBridgeDevicePath;\r
+  PCI_DEVICE_PATH                   PciBusDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL          EndDevicePath;\r
 } RMC_CONN_DEVICE_PATH;\r
 \r
 //\r
 // RIDE\r
 //\r
 typedef struct _RIDE_DEVICE_PATH {\r
-  ACPI_HID_DEVICE_PATH      PciRootBridgeDevicePath;\r
-  PCI_DEVICE_PATH           PciBridgeDevicePath;\r
-  PCI_DEVICE_PATH           PciBusDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL  EndDevicePath;\r
+  ACPI_HID_DEVICE_PATH              PciRootBridgeDevicePath;\r
+  PCI_DEVICE_PATH                   PciBridgeDevicePath;\r
+  PCI_DEVICE_PATH                   PciBusDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL          EndDevicePath;\r
 } RIDE_DEVICE_PATH;\r
 \r
 //\r
 // Gigabit NIC\r
 //\r
 typedef struct _GB_NIC_DEVICE_PATH {\r
-  ACPI_HID_DEVICE_PATH      PciRootBridgeDevicePath;\r
-  PCI_DEVICE_PATH           PciBridgeDevicePath;\r
-  PCI_DEVICE_PATH           PciXBridgeDevicePath;\r
-  PCI_DEVICE_PATH           PciXBusDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL  EndDevicePath;\r
+  ACPI_HID_DEVICE_PATH              PciRootBridgeDevicePath;\r
+  PCI_DEVICE_PATH                   PciBridgeDevicePath;\r
+  PCI_DEVICE_PATH                   PciXBridgeDevicePath;\r
+  PCI_DEVICE_PATH                   PciXBusDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL          EndDevicePath;\r
 } GB_NIC_DEVICE_PATH;\r
 \r
 //\r
 // P/S2 Connector\r
 //\r
 typedef struct _PS2_CONN_DEVICE_PATH {\r
-  ACPI_HID_DEVICE_PATH      PciRootBridgeDevicePath;\r
-  PCI_DEVICE_PATH           LpcBridgeDevicePath;\r
-  ACPI_HID_DEVICE_PATH      LpcBusDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL  EndDevicePath;\r
+  ACPI_HID_DEVICE_PATH              PciRootBridgeDevicePath;\r
+  PCI_DEVICE_PATH                   LpcBridgeDevicePath;\r
+  ACPI_HID_DEVICE_PATH              LpcBusDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL          EndDevicePath;\r
 } PS2_CONN_DEVICE_PATH;\r
 \r
 //\r
 // Serial Port Connector\r
 //\r
 typedef struct _SERIAL_CONN_DEVICE_PATH {\r
-  ACPI_HID_DEVICE_PATH      PciRootBridgeDevicePath;\r
-  PCI_DEVICE_PATH           LpcBridgeDevicePath;\r
-  ACPI_HID_DEVICE_PATH      LpcBusDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL  EndDevicePath;\r
+  ACPI_HID_DEVICE_PATH              PciRootBridgeDevicePath;\r
+  PCI_DEVICE_PATH                   LpcBridgeDevicePath;\r
+  ACPI_HID_DEVICE_PATH              LpcBusDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL          EndDevicePath;\r
 } SERIAL_CONN_DEVICE_PATH;\r
 \r
 //\r
 // Parallel Port Connector\r
 //\r
 typedef struct _PARALLEL_CONN_DEVICE_PATH {\r
-  ACPI_HID_DEVICE_PATH      PciRootBridgeDevicePath;\r
-  PCI_DEVICE_PATH           LpcBridgeDevicePath;\r
-  ACPI_HID_DEVICE_PATH      LpcBusDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL  EndDevicePath;\r
+  ACPI_HID_DEVICE_PATH              PciRootBridgeDevicePath;\r
+  PCI_DEVICE_PATH                   LpcBridgeDevicePath;\r
+  ACPI_HID_DEVICE_PATH              LpcBusDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL          EndDevicePath;\r
 } PARALLEL_CONN_DEVICE_PATH;\r
 \r
 //\r
 // Floopy Connector\r
 //\r
 typedef struct _FLOOPY_CONN_DEVICE_PATH {\r
-  ACPI_HID_DEVICE_PATH      PciRootBridgeDevicePath;\r
-  PCI_DEVICE_PATH           LpcBridgeDevicePath;\r
-  ACPI_HID_DEVICE_PATH      LpcBusDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL  EndDevicePath;\r
+  ACPI_HID_DEVICE_PATH              PciRootBridgeDevicePath;\r
+  PCI_DEVICE_PATH                   LpcBridgeDevicePath;\r
+  ACPI_HID_DEVICE_PATH              LpcBusDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL          EndDevicePath;\r
 } FLOOPY_CONN_DEVICE_PATH;\r
 \r
 typedef union _EFI_MISC_PORT_DEVICE_PATH {\r
-  USB_PORT_DEVICE_PATH      UsbDevicePath;\r
-  IDE_DEVICE_PATH           IdeDevicePath;\r
-  RMC_CONN_DEVICE_PATH      RmcConnDevicePath;\r
-  RIDE_DEVICE_PATH          RideDevicePath;\r
-  GB_NIC_DEVICE_PATH        GbNicDevicePath;\r
-  PS2_CONN_DEVICE_PATH      Ps2ConnDevicePath;\r
-  SERIAL_CONN_DEVICE_PATH   SerialConnDevicePath;\r
-  PARALLEL_CONN_DEVICE_PATH ParallelConnDevicePath;\r
-  FLOOPY_CONN_DEVICE_PATH   FloppyConnDevicePath;\r
+  USB_PORT_DEVICE_PATH              UsbDevicePath;\r
+  IDE_DEVICE_PATH                   IdeDevicePath;\r
+  RMC_CONN_DEVICE_PATH              RmcConnDevicePath;\r
+  RIDE_DEVICE_PATH                  RideDevicePath;\r
+  GB_NIC_DEVICE_PATH                GbNicDevicePath;\r
+  PS2_CONN_DEVICE_PATH              Ps2ConnDevicePath;\r
+  SERIAL_CONN_DEVICE_PATH           SerialConnDevicePath;\r
+  PARALLEL_CONN_DEVICE_PATH         ParallelConnDevicePath;\r
+  FLOOPY_CONN_DEVICE_PATH           FloppyConnDevicePath;\r
 } EFI_MISC_PORT_DEVICE_PATH;\r
 \r
 #pragma pack()\r
@@ -135,115 +135,104 @@ typedef union _EFI_MISC_PORT_DEVICE_PATH {
 //\r
 // String Token Definition\r
 //\r
-#define EFI_STRING_TOKEN    UINT16\r
+#define EFI_STRING_TOKEN          UINT16\r
 \r
 typedef struct {\r
-  UINT32    Version;\r
-  UINT32    HeaderSize;\r
-  UINT16    Instance;\r
-  UINT16    SubInstance;\r
-  UINT32    RecordType;\r
+  UINT32                            Version;\r
+  UINT32                            HeaderSize;\r
+  UINT16                            Instance;\r
+  UINT16                            SubInstance;\r
+  UINT32                            RecordType;\r
 } EFI_SUBCLASS_TYPE1_HEADER;\r
 \r
 typedef struct {\r
-  EFI_GUID    ProducerName;\r
-  UINT16      Instance;\r
-  UINT16      SubInstance;\r
+  EFI_GUID                          ProducerName;\r
+  UINT16                            Instance;\r
+  UINT16                            SubInstance;\r
 } EFI_INTER_LINK_DATA;\r
 \r
-\r
 //\r
 // EXP data\r
 //\r
 \r
 typedef struct {\r
-  UINT16    Value;\r
-  UINT16    Exponent;\r
+  UINT16                            Value;\r
+  UINT16                            Exponent;\r
 } EFI_EXP_BASE2_DATA;\r
 \r
-\r
 typedef struct {\r
-  UINT16    Value;\r
-  UINT16    Exponent;\r
+  UINT16                            Value;\r
+  UINT16                            Exponent;\r
 } EFI_EXP_BASE10_DATA;\r
 \r
-typedef EFI_EXP_BASE10_DATA   EFI_PROCESSOR_MAX_CORE_FREQUENCY_DATA;\r
-\r
-typedef EFI_EXP_BASE10_DATA   EFI_PROCESSOR_MAX_FSB_FREQUENCY_DATA;\r
-\r
-typedef EFI_EXP_BASE10_DATA   EFI_PROCESSOR_CORE_FREQUENCY_DATA;\r
-\r
-typedef EFI_EXP_BASE10_DATA  *EFI_PROCESSOR_CORE_FREQUENCY_LIST_DATA;\r
-\r
-typedef EFI_EXP_BASE10_DATA  *EFI_PROCESSOR_FSB_FREQUENCY_LIST_DATA;\r
-\r
-typedef EFI_EXP_BASE10_DATA   EFI_PROCESSOR_FSB_FREQUENCY_DATA;\r
-\r
-typedef STRING_REF            EFI_PROCESSOR_VERSION_DATA;\r
-\r
-typedef STRING_REF            EFI_PROCESSOR_MANUFACTURER_DATA;\r
-\r
-typedef STRING_REF            EFI_PROCESSOR_SERIAL_NUMBER_DATA;\r
-\r
-typedef STRING_REF            EFI_PROCESSOR_ASSET_TAG_DATA;\r
-\r
-typedef struct {\r
-  UINT32  ProcessorSteppingId:4;\r
-  UINT32  ProcessorModel:     4;\r
-  UINT32  ProcessorFamily:    4;\r
-  UINT32  ProcessorType:      2;\r
-  UINT32  ProcessorReserved1: 2;\r
-  UINT32  ProcessorXModel:    4;\r
-  UINT32  ProcessorXFamily:   8;\r
-  UINT32  ProcessorReserved2: 4;\r
+typedef EFI_EXP_BASE10_DATA        EFI_PROCESSOR_MAX_CORE_FREQUENCY_DATA;\r
+typedef EFI_EXP_BASE10_DATA        EFI_PROCESSOR_MAX_FSB_FREQUENCY_DATA;\r
+typedef EFI_EXP_BASE10_DATA        EFI_PROCESSOR_CORE_FREQUENCY_DATA;\r
+typedef EFI_EXP_BASE10_DATA        *EFI_PROCESSOR_CORE_FREQUENCY_LIST_DATA;\r
+typedef EFI_EXP_BASE10_DATA        *EFI_PROCESSOR_FSB_FREQUENCY_LIST_DATA;\r
+typedef EFI_EXP_BASE10_DATA        EFI_PROCESSOR_FSB_FREQUENCY_DATA;\r
+typedef STRING_REF                 EFI_PROCESSOR_VERSION_DATA;\r
+typedef STRING_REF                 EFI_PROCESSOR_MANUFACTURER_DATA;\r
+typedef STRING_REF                 EFI_PROCESSOR_SERIAL_NUMBER_DATA;\r
+typedef STRING_REF                 EFI_PROCESSOR_ASSET_TAG_DATA;\r
+\r
+typedef struct {\r
+  UINT32                            ProcessorSteppingId:4;\r
+  UINT32                            ProcessorModel:     4;\r
+  UINT32                            ProcessorFamily:    4;\r
+  UINT32                            ProcessorType:      2;\r
+  UINT32                            ProcessorReserved1: 2;\r
+  UINT32                            ProcessorXModel:    4;\r
+  UINT32                            ProcessorXFamily:   8;\r
+  UINT32                            ProcessorReserved2: 4;\r
 } EFI_PROCESSOR_SIGNATURE;\r
 \r
 typedef struct {\r
-  UINT32  ProcessorBrandIndex :8;\r
-  UINT32  ProcessorClflush    :8;\r
-  UINT32  ProcessorReserved   :8;\r
-  UINT32  ProcessorDfltApicId :8;\r
+  UINT32                            ProcessorBrandIndex :8;\r
+  UINT32                            ProcessorClflush    :8;\r
+  UINT32                            ProcessorReserved   :8;\r
+  UINT32                            ProcessorDfltApicId :8;\r
 } EFI_PROCESSOR_MISC_INFO;\r
 \r
 typedef struct {\r
-  UINT32  ProcessorFpu:       1;\r
-  UINT32  ProcessorVme:       1;\r
-  UINT32  ProcessorDe:        1;\r
-  UINT32  ProcessorPse:       1;\r
-  UINT32  ProcessorTsc:       1;\r
-  UINT32  ProcessorMsr:       1;\r
-  UINT32  ProcessorPae:       1;\r
-  UINT32  ProcessorMce:       1;\r
-  UINT32  ProcessorCx8:       1;\r
-  UINT32  ProcessorApic:      1;\r
-  UINT32  ProcessorReserved1: 1;\r
-  UINT32  ProcessorSep:       1;\r
-  UINT32  ProcessorMtrr:      1;\r
-  UINT32  ProcessorPge:       1;\r
-  UINT32  ProcessorMca:       1;\r
-  UINT32  ProcessorCmov:      1;\r
-  UINT32  ProcessorPat:       1;\r
-  UINT32  ProcessorPse36:     1;\r
-  UINT32  ProcessorPsn:       1;\r
-  UINT32  ProcessorClfsh:     1;\r
-  UINT32  ProcessorReserved2: 1;\r
-  UINT32  ProcessorDs:        1;\r
-  UINT32  ProcessorAcpi:      1;\r
-  UINT32  ProcessorMmx:       1;\r
-  UINT32  ProcessorFxsr:      1;\r
-  UINT32  ProcessorSse:       1;\r
-  UINT32  ProcessorSse2:      1;\r
-  UINT32  ProcessorSs:        1;\r
-  UINT32  ProcessorReserved3: 1;\r
-  UINT32  ProcessorTm:        1;\r
-  UINT32  ProcessorReserved4: 2;\r
+  UINT32                            ProcessorFpu:       1;\r
+  UINT32                            ProcessorVme:       1;\r
+  UINT32                            ProcessorDe:        1;\r
+  UINT32                            ProcessorPse:       1;\r
+  UINT32                            ProcessorTsc:       1;\r
+  UINT32                            ProcessorMsr:       1;\r
+  UINT32                            ProcessorPae:       1;\r
+  UINT32                            ProcessorMce:       1;\r
+  UINT32                            ProcessorCx8:       1;\r
+  UINT32                            ProcessorApic:      1;\r
+  UINT32                            ProcessorReserved1: 1;\r
+  UINT32                            ProcessorSep:       1;\r
+  UINT32                            ProcessorMtrr:      1;\r
+  UINT32                            ProcessorPge:       1;\r
+  UINT32                            ProcessorMca:       1;\r
+  UINT32                            ProcessorCmov:      1;\r
+  UINT32                            ProcessorPat:       1;\r
+  UINT32                            ProcessorPse36:     1;\r
+  UINT32                            ProcessorPsn:       1;\r
+  UINT32                            ProcessorClfsh:     1;\r
+  UINT32                            ProcessorReserved2: 1;\r
+  UINT32                            ProcessorDs:        1;\r
+  UINT32                            ProcessorAcpi:      1;\r
+  UINT32                            ProcessorMmx:       1;\r
+  UINT32                            ProcessorFxsr:      1;\r
+  UINT32                            ProcessorSse:       1;\r
+  UINT32                            ProcessorSse2:      1;\r
+  UINT32                            ProcessorSs:        1;\r
+  UINT32                            ProcessorReserved3: 1;\r
+  UINT32                            ProcessorTm:        1;\r
+  UINT32                            ProcessorReserved4: 2;\r
 } EFI_PROCESSOR_FEATURE_FLAGS;\r
 \r
 typedef struct {\r
-  EFI_PROCESSOR_SIGNATURE     Signature;\r
-  EFI_PROCESSOR_MISC_INFO     MiscInfo;\r
-  UINT32                      Reserved;\r
-  EFI_PROCESSOR_FEATURE_FLAGS FeatureFlags;\r
+  EFI_PROCESSOR_SIGNATURE           Signature;\r
+  EFI_PROCESSOR_MISC_INFO           MiscInfo;\r
+  UINT32                            Reserved;\r
+  EFI_PROCESSOR_FEATURE_FLAGS       FeatureFlags;\r
 } EFI_PROCESSOR_ID_DATA;\r
 \r
 typedef enum {\r
@@ -324,13 +313,10 @@ typedef enum {
   EfiProcessorFamilyi960                = 0xFB\r
 } EFI_PROCESSOR_FAMILY_DATA;\r
 \r
-typedef EFI_EXP_BASE10_DATA EFI_PROCESSOR_VOLTAGE_DATA;\r
-\r
-typedef EFI_PHYSICAL_ADDRESS EFI_PROCESSOR_APIC_BASE_ADDRESS_DATA;\r
-\r
-typedef UINT32 EFI_PROCESSOR_APIC_ID_DATA;\r
-\r
-typedef UINT32 EFI_PROCESSOR_APIC_VERSION_NUMBER_DATA;\r
+typedef EFI_EXP_BASE10_DATA         EFI_PROCESSOR_VOLTAGE_DATA;\r
+typedef EFI_PHYSICAL_ADDRESS        EFI_PROCESSOR_APIC_BASE_ADDRESS_DATA;\r
+typedef UINT32                      EFI_PROCESSOR_APIC_ID_DATA;\r
+typedef UINT32                      EFI_PROCESSOR_APIC_VERSION_NUMBER_DATA;\r
 \r
 typedef enum {\r
   EfiProcessorIa32Microcode    = 1,\r
@@ -339,18 +325,18 @@ typedef enum {
 } EFI_PROCESSOR_MICROCODE_TYPE;\r
 \r
 typedef struct {\r
-  EFI_PROCESSOR_MICROCODE_TYPE  ProcessorMicrocodeType;\r
-  UINT32                        ProcessorMicrocodeRevisionNumber;\r
+  EFI_PROCESSOR_MICROCODE_TYPE      ProcessorMicrocodeType;\r
+  UINT32                            ProcessorMicrocodeRevisionNumber;\r
 } EFI_PROCESSOR_MICROCODE_REVISION_DATA;\r
 \r
 typedef struct {\r
-  UINT32      CpuStatus                 :3;\r
-  UINT32      Reserved1                 :3;\r
-  UINT32      SocketPopulated           :1;\r
-  UINT32      Reserved2                 :1;\r
-  UINT32      ApicEnable                :1;\r
-  UINT32      BootApplicationProcessor  :1;\r
-  UINT32      Reserved3                 :22;\r
+  UINT32                            CpuStatus                 :3;\r
+  UINT32                            Reserved1                 :3;\r
+  UINT32                            SocketPopulated           :1;\r
+  UINT32                            Reserved2                 :1;\r
+  UINT32                            ApicEnable                :1;\r
+  UINT32                            BootApplicationProcessor  :1;\r
+  UINT32                            Reserved3                 :22;\r
 } EFI_PROCESSOR_STATUS_DATA;\r
 \r
 typedef enum {\r
@@ -387,9 +373,8 @@ typedef enum {
 \r
 } EFI_PROCESSOR_SOCKET_TYPE_DATA;\r
 \r
-typedef STRING_REF EFI_PROCESSOR_SOCKET_NAME_DATA;\r
-\r
-typedef EFI_INTER_LINK_DATA EFI_CACHE_ASSOCIATION_DATA;\r
+typedef STRING_REF                  EFI_PROCESSOR_SOCKET_NAME_DATA;\r
+typedef EFI_INTER_LINK_DATA         EFI_CACHE_ASSOCIATION_DATA;\r
 \r
 typedef enum {\r
   EfiProcessorHealthy        = 1,\r
@@ -397,8 +382,7 @@ typedef enum {
   EfiProcessorFuncRestricted = 3\r
 } EFI_PROCESSOR_HEALTH_STATUS;\r
 \r
-typedef UINTN   EFI_PROCESSOR_PACKAGE_NUMBER_DATA;\r
-\r
+typedef UINTN                       EFI_PROCESSOR_PACKAGE_NUMBER_DATA;\r
 \r
 typedef enum {\r
   ProcessorCoreFrequencyRecordType     = 1,\r
@@ -454,32 +438,29 @@ typedef union {
 } EFI_CPU_VARIABLE_RECORD;\r
 \r
 typedef struct {\r
-  EFI_SUBCLASS_TYPE1_HEADER      DataRecordHeader;\r
-  EFI_CPU_VARIABLE_RECORD        VariableRecord;\r
+  EFI_SUBCLASS_TYPE1_HEADER         DataRecordHeader;\r
+  EFI_CPU_VARIABLE_RECORD           VariableRecord;\r
 } EFI_CPU_DATA_RECORD;\r
 \r
 #define EFI_CACHE_SUBCLASS_VERSION    0x00010000\r
 \r
-typedef EFI_EXP_BASE2_DATA  EFI_CACHE_SIZE_DATA;\r
-\r
-typedef EFI_EXP_BASE2_DATA  EFI_MAXIMUM_CACHE_SIZE_DATA;\r
-\r
-typedef EFI_EXP_BASE10_DATA EFI_CACHE_SPEED_DATA;\r
-\r
-typedef STRING_REF          EFI_CACHE_SOCKET_DATA;\r
+typedef EFI_EXP_BASE2_DATA          EFI_CACHE_SIZE_DATA;\r
+typedef EFI_EXP_BASE2_DATA          EFI_MAXIMUM_CACHE_SIZE_DATA;\r
+typedef EFI_EXP_BASE10_DATA         EFI_CACHE_SPEED_DATA;\r
+typedef STRING_REF                  EFI_CACHE_SOCKET_DATA;\r
 \r
 typedef struct {\r
-  UINT32  Other         :1;\r
-  UINT32  Unknown       :1;\r
-  UINT32  NonBurst      :1;\r
-  UINT32  Burst         :1;\r
-  UINT32  PipelineBurst :1;\r
-  UINT32  Asynchronous  :1;\r
-  UINT32  Synchronous   :1;\r
-  UINT32  Reserved      :25;\r
+  UINT32                            Other         :1;\r
+  UINT32                            Unknown       :1;\r
+  UINT32                            NonBurst      :1;\r
+  UINT32                            Burst         :1;\r
+  UINT32                            PipelineBurst :1;\r
+  UINT32                            Asynchronous  :1;\r
+  UINT32                            Synchronous   :1;\r
+  UINT32                            Reserved      :25;\r
 } EFI_CACHE_SRAM_TYPE_DATA;\r
 \r
-typedef EFI_CACHE_SRAM_TYPE_DATA EFI_CACHE_SRAM_INSTALL_DATA;\r
+typedef EFI_CACHE_SRAM_TYPE_DATA    EFI_CACHE_SRAM_INSTALL_DATA;\r
 \r
 typedef enum {\r
   EfiCacheErrorOther     = 1,\r
@@ -511,20 +492,20 @@ typedef enum {
 } EFI_CACHE_ASSOCIATIVITY_DATA;\r
 \r
 typedef struct {\r
-  UINT32    Level           :3;\r
-  UINT32    Socketed        :1;\r
-  UINT32    Reserved2       :1;\r
-  UINT32    Location        :2;\r
-  UINT32    Enable          :1;\r
-  UINT32    OperationalMode :2;\r
-  UINT32    Reserved1       :22;\r
+  UINT32                            Level           :3;\r
+  UINT32                            Socketed        :1;\r
+  UINT32                            Reserved2       :1;\r
+  UINT32                            Location        :2;\r
+  UINT32                            Enable          :1;\r
+  UINT32                            OperationalMode :2;\r
+  UINT32                            Reserved1       :22;\r
 } EFI_CACHE_CONFIGURATION_DATA;\r
 \r
-#define EFI_CACHE_L1      1\r
-#define EFI_CACHE_L2      2\r
-#define EFI_CACHE_L3      3\r
-#define EFI_CACHE_L4      4\r
-#define EFI_CACHE_LMAX    EFI_CACHE_L4\r
+#define EFI_CACHE_L1            1\r
+#define EFI_CACHE_L2            2\r
+#define EFI_CACHE_L3            3\r
+#define EFI_CACHE_L4            4\r
+#define EFI_CACHE_LMAX          EFI_CACHE_L4\r
 \r
 #define EFI_CACHE_SOCKETED      1\r
 #define EFI_CACHE_NOT_SOCKETED  0\r
@@ -536,8 +517,8 @@ typedef enum {
   EfiCacheUnknown  = 3\r
 } EFI_CACHE_LOCATION;\r
 \r
-#define EFI_CACHE_ENABLED    1\r
-#define EFI_CACHE_DISABLED   0\r
+#define EFI_CACHE_ENABLED       1\r
+#define EFI_CACHE_DISABLED      0\r
 \r
 typedef enum {\r
   EfiCacheWriteThrough = 0,\r
@@ -563,47 +544,45 @@ typedef enum {
 \r
 \r
 typedef union {\r
-  EFI_CACHE_SIZE_DATA             CacheSize;\r
-  EFI_MAXIMUM_CACHE_SIZE_DATA     MaximumCacheSize;\r
-  EFI_CACHE_SPEED_DATA            CacheSpeed;\r
-  EFI_CACHE_SOCKET_DATA           CacheSocket;\r
-  EFI_CACHE_SRAM_TYPE_DATA        CacheSramType;\r
-  EFI_CACHE_SRAM_TYPE_DATA        CacheInstalledSramType;\r
-  EFI_CACHE_ERROR_TYPE_DATA       CacheErrorType;\r
-  EFI_CACHE_TYPE_DATA             CacheType;\r
-  EFI_CACHE_ASSOCIATIVITY_DATA    CacheAssociativity;\r
-  EFI_CACHE_CONFIGURATION_DATA    CacheConfig;\r
-  EFI_CACHE_ASSOCIATION_DATA      CacheAssociation;\r
+  EFI_CACHE_SIZE_DATA               CacheSize;\r
+  EFI_MAXIMUM_CACHE_SIZE_DATA       MaximumCacheSize;\r
+  EFI_CACHE_SPEED_DATA              CacheSpeed;\r
+  EFI_CACHE_SOCKET_DATA             CacheSocket;\r
+  EFI_CACHE_SRAM_TYPE_DATA          CacheSramType;\r
+  EFI_CACHE_SRAM_TYPE_DATA          CacheInstalledSramType;\r
+  EFI_CACHE_ERROR_TYPE_DATA         CacheErrorType;\r
+  EFI_CACHE_TYPE_DATA               CacheType;\r
+  EFI_CACHE_ASSOCIATIVITY_DATA      CacheAssociativity;\r
+  EFI_CACHE_CONFIGURATION_DATA      CacheConfig;\r
+  EFI_CACHE_ASSOCIATION_DATA        CacheAssociation;\r
 } EFI_CACHE_VARIABLE_RECORD;\r
 \r
 typedef struct {\r
-   EFI_SUBCLASS_TYPE1_HEADER      DataRecordHeader;\r
-   EFI_CACHE_VARIABLE_RECORD      VariableRecord;\r
+   EFI_SUBCLASS_TYPE1_HEADER        DataRecordHeader;\r
+   EFI_CACHE_VARIABLE_RECORD        VariableRecord;\r
 } EFI_CACHE_DATA_RECORD;\r
 \r
 #define EFI_MEMORY_SUBCLASS_VERSION     0x0100\r
-\r
-\r
-#define EFI_MEMORY_SIZE_RECORD_NUMBER                 0x00000001\r
+#define EFI_MEMORY_SIZE_RECORD_NUMBER   0x00000001\r
 \r
 typedef enum _EFI_MEMORY_REGION_TYPE {\r
-  EfiMemoryRegionMemory                       = 0x01,\r
-  EfiMemoryRegionReserved                     = 0x02,\r
-  EfiMemoryRegionAcpi                         = 0x03,\r
-  EfiMemoryRegionNvs                          = 0x04\r
+  EfiMemoryRegionMemory             = 0x01,\r
+  EfiMemoryRegionReserved           = 0x02,\r
+  EfiMemoryRegionAcpi               = 0x03,\r
+  EfiMemoryRegionNvs                = 0x04\r
 } EFI_MEMORY_REGION_TYPE;\r
 \r
 typedef struct {\r
-  UINT32                      ProcessorNumber;\r
-  UINT16                      StartBusNumber;\r
-  UINT16                      EndBusNumber;\r
-  EFI_MEMORY_REGION_TYPE      MemoryRegionType;\r
-  EFI_EXP_BASE2_DATA          MemorySize;\r
-  EFI_PHYSICAL_ADDRESS        MemoryStartAddress;\r
+  UINT32                            ProcessorNumber;\r
+  UINT16                            StartBusNumber;\r
+  UINT16                            EndBusNumber;\r
+  EFI_MEMORY_REGION_TYPE            MemoryRegionType;\r
+  EFI_EXP_BASE2_DATA                MemorySize;\r
+  EFI_PHYSICAL_ADDRESS              MemoryStartAddress;\r
 } EFI_MEMORY_SIZE_DATA;\r
 \r
 \r
-#define EFI_MEMORY_ARRAY_LOCATION_RECORD_NUMBER       0x00000002\r
+#define EFI_MEMORY_ARRAY_LOCATION_RECORD_NUMBER    0x00000002\r
 \r
 typedef enum _EFI_MEMORY_ARRAY_LOCATION {\r
   EfiMemoryArrayLocationOther                 = 0x01,\r
@@ -643,15 +622,15 @@ typedef enum _EFI_MEMORY_ERROR_CORRECTION {
 } EFI_MEMORY_ERROR_CORRECTION;\r
 \r
 typedef struct {\r
-  EFI_MEMORY_ARRAY_LOCATION   MemoryArrayLocation;\r
-  EFI_MEMORY_ARRAY_USE        MemoryArrayUse;\r
-  EFI_MEMORY_ERROR_CORRECTION MemoryErrorCorrection;\r
-  EFI_EXP_BASE2_DATA          MaximumMemoryCapacity;\r
-  UINT16                      NumberMemoryDevices;\r
+  EFI_MEMORY_ARRAY_LOCATION         MemoryArrayLocation;\r
+  EFI_MEMORY_ARRAY_USE              MemoryArrayUse;\r
+  EFI_MEMORY_ERROR_CORRECTION       MemoryErrorCorrection;\r
+  EFI_EXP_BASE2_DATA                MaximumMemoryCapacity;\r
+  UINT16                            NumberMemoryDevices;\r
 } EFI_MEMORY_ARRAY_LOCATION_DATA;\r
 \r
 \r
-#define EFI_MEMORY_ARRAY_LINK_RECORD_NUMBER           0x00000003\r
+#define EFI_MEMORY_ARRAY_LINK_RECORD_NUMBER    0x00000003\r
 \r
 typedef enum _EFI_MEMORY_FORM_FACTOR {\r
   EfiMemoryFormFactorOther                    = 0x01,\r
@@ -695,20 +674,20 @@ typedef enum _EFI_MEMORY_ARRAY_TYPE {
 } EFI_MEMORY_ARRAY_TYPE;\r
 \r
 typedef struct {\r
-  UINT32                      Reserved        :1;\r
-  UINT32                      Other           :1;\r
-  UINT32                      Unknown         :1;\r
-  UINT32                      FastPaged       :1;\r
-  UINT32                      StaticColumn    :1;\r
-  UINT32                      PseudoStatic    :1;\r
-  UINT32                      Rambus          :1;\r
-  UINT32                      Synchronous     :1;\r
-  UINT32                      Cmos            :1;\r
-  UINT32                      Edo             :1;\r
-  UINT32                      WindowDram      :1;\r
-  UINT32                      CacheDram       :1;\r
-  UINT32                      Nonvolatile     :1;\r
-  UINT32                      Reserved1       :19;\r
+  UINT32                            Reserved        :1;\r
+  UINT32                            Other           :1;\r
+  UINT32                            Unknown         :1;\r
+  UINT32                            FastPaged       :1;\r
+  UINT32                            StaticColumn    :1;\r
+  UINT32                            PseudoStatic    :1;\r
+  UINT32                            Rambus          :1;\r
+  UINT32                            Synchronous     :1;\r
+  UINT32                            Cmos            :1;\r
+  UINT32                            Edo             :1;\r
+  UINT32                            WindowDram      :1;\r
+  UINT32                            CacheDram       :1;\r
+  UINT32                            Nonvolatile     :1;\r
+  UINT32                            Reserved1       :19;\r
 } EFI_MEMORY_TYPE_DETAIL;\r
 \r
 typedef enum {\r
@@ -722,46 +701,46 @@ typedef enum {
 } EFI_MEMORY_STATE;\r
 \r
 typedef struct {\r
-  STRING_REF                  MemoryDeviceLocator;\r
-  STRING_REF                  MemoryBankLocator;\r
-  STRING_REF                  MemoryManufacturer;\r
-  STRING_REF                  MemorySerialNumber;\r
-  STRING_REF                  MemoryAssetTag;\r
-  STRING_REF                  MemoryPartNumber;\r
-  EFI_INTER_LINK_DATA         MemoryArrayLink;\r
-  EFI_INTER_LINK_DATA         MemorySubArrayLink;\r
-  UINT16                      MemoryTotalWidth;\r
-  UINT16                      MemoryDataWidth;\r
-  EFI_EXP_BASE2_DATA          MemoryDeviceSize;\r
-  EFI_MEMORY_FORM_FACTOR      MemoryFormFactor;\r
-  UINT8                       MemoryDeviceSet;\r
-  EFI_MEMORY_ARRAY_TYPE       MemoryType;\r
-  EFI_MEMORY_TYPE_DETAIL      MemoryTypeDetail;\r
-  EFI_EXP_BASE10_DATA         MemorySpeed;\r
-  EFI_MEMORY_STATE            MemoryState;\r
+  STRING_REF                        MemoryDeviceLocator;\r
+  STRING_REF                        MemoryBankLocator;\r
+  STRING_REF                        MemoryManufacturer;\r
+  STRING_REF                        MemorySerialNumber;\r
+  STRING_REF                        MemoryAssetTag;\r
+  STRING_REF                        MemoryPartNumber;\r
+  EFI_INTER_LINK_DATA               MemoryArrayLink;\r
+  EFI_INTER_LINK_DATA               MemorySubArrayLink;\r
+  UINT16                            MemoryTotalWidth;\r
+  UINT16                            MemoryDataWidth;\r
+  EFI_EXP_BASE2_DATA                MemoryDeviceSize;\r
+  EFI_MEMORY_FORM_FACTOR            MemoryFormFactor;\r
+  UINT8                             MemoryDeviceSet;\r
+  EFI_MEMORY_ARRAY_TYPE             MemoryType;\r
+  EFI_MEMORY_TYPE_DETAIL            MemoryTypeDetail;\r
+  EFI_EXP_BASE10_DATA               MemorySpeed;\r
+  EFI_MEMORY_STATE                  MemoryState;\r
 } EFI_MEMORY_ARRAY_LINK_DATA;\r
 \r
 \r
-#define EFI_MEMORY_ARRAY_START_ADDRESS_RECORD_NUMBER  0x00000004\r
+#define EFI_MEMORY_ARRAY_START_ADDRESS_RECORD_NUMBER    0x00000004\r
 \r
 typedef struct {\r
-  EFI_PHYSICAL_ADDRESS        MemoryArrayStartAddress;\r
-  EFI_PHYSICAL_ADDRESS        MemoryArrayEndAddress;\r
-  EFI_INTER_LINK_DATA         PhysicalMemoryArrayLink;\r
-  UINT16                      MemoryArrayPartitionWidth;\r
+  EFI_PHYSICAL_ADDRESS              MemoryArrayStartAddress;\r
+  EFI_PHYSICAL_ADDRESS              MemoryArrayEndAddress;\r
+  EFI_INTER_LINK_DATA               PhysicalMemoryArrayLink;\r
+  UINT16                            MemoryArrayPartitionWidth;\r
 } EFI_MEMORY_ARRAY_START_ADDRESS_DATA;\r
 \r
 \r
-#define EFI_MEMORY_DEVICE_START_ADDRESS_RECORD_NUMBER 0x00000005\r
+#define EFI_MEMORY_DEVICE_START_ADDRESS_RECORD_NUMBER    0x00000005\r
 \r
 typedef struct {\r
-  EFI_PHYSICAL_ADDRESS        MemoryDeviceStartAddress;\r
-  EFI_PHYSICAL_ADDRESS        MemoryDeviceEndAddress;\r
-  EFI_INTER_LINK_DATA         PhysicalMemoryDeviceLink;\r
-  EFI_INTER_LINK_DATA         PhysicalMemoryArrayLink;\r
-  UINT8                       MemoryDevicePartitionRowPosition;\r
-  UINT8                       MemoryDeviceInterleavePosition;\r
-  UINT8                       MemoryDeviceInterleaveDataDepth;\r
+  EFI_PHYSICAL_ADDRESS              MemoryDeviceStartAddress;\r
+  EFI_PHYSICAL_ADDRESS              MemoryDeviceEndAddress;\r
+  EFI_INTER_LINK_DATA               PhysicalMemoryDeviceLink;\r
+  EFI_INTER_LINK_DATA               PhysicalMemoryArrayLink;\r
+  UINT8                             MemoryDevicePartitionRowPosition;\r
+  UINT8                             MemoryDeviceInterleavePosition;\r
+  UINT8                             MemoryDeviceInterleaveDataDepth;\r
 } EFI_MEMORY_DEVICE_START_ADDRESS_DATA;\r
 \r
 \r
@@ -769,7 +748,7 @@ typedef struct {
 //  Memory. Channel Device Type -  SMBIOS Type 37\r
 //\r
 \r
-#define EFI_MEMORY_CHANNEL_TYPE_RECORD_NUMBER         0x00000006\r
+#define EFI_MEMORY_CHANNEL_TYPE_RECORD_NUMBER    0x00000006\r
 \r
 typedef enum _EFI_MEMORY_CHANNEL_TYPE {\r
   EfiMemoryChannelTypeOther                   = 1,\r
@@ -779,23 +758,23 @@ typedef enum _EFI_MEMORY_CHANNEL_TYPE {
 } EFI_MEMORY_CHANNEL_TYPE;\r
 \r
 typedef struct {\r
-  EFI_MEMORY_CHANNEL_TYPE     MemoryChannelType;\r
-  UINT8                       MemoryChannelMaximumLoad;\r
-  UINT8                       MemoryChannelDeviceCount;\r
+  EFI_MEMORY_CHANNEL_TYPE           MemoryChannelType;\r
+  UINT8                             MemoryChannelMaximumLoad;\r
+  UINT8                             MemoryChannelDeviceCount;\r
 } EFI_MEMORY_CHANNEL_TYPE_DATA;\r
 \r
-#define EFI_MEMORY_CHANNEL_DEVICE_RECORD_NUMBER       0x00000007\r
+#define EFI_MEMORY_CHANNEL_DEVICE_RECORD_NUMBER    0x00000007\r
 \r
 typedef struct {\r
-  UINT8                       DeviceId;\r
-  EFI_INTER_LINK_DATA         DeviceLink;\r
-  UINT8                       MemoryChannelDeviceLoad;\r
+  UINT8                             DeviceId;\r
+  EFI_INTER_LINK_DATA               DeviceLink;\r
+  UINT8                             MemoryChannelDeviceLoad;\r
 } EFI_MEMORY_CHANNEL_DEVICE_DATA;\r
 \r
 //\r
 //  Memory. Controller Information - SMBIOS Type 5\r
 //\r
-#define EFI_MEMORY_CONTROLLER_INFORMATION_RECORD_NUMBER 0x00000008\r
+#define EFI_MEMORY_CONTROLLER_INFORMATION_RECORD_NUMBER    0x00000008\r
 \r
 typedef enum {  \r
   EfiErrorDetectingMethodOther   = 1,\r
@@ -809,13 +788,13 @@ typedef enum {
 } EFI_MEMORY_ERROR_DETECT_METHOD_TYPE;\r
 \r
 typedef struct {\r
-  UINT8  Other                 :1;\r
-  UINT8  Unknown               :1;\r
-  UINT8  None                  :1;\r
-  UINT8  SingleBitErrorCorrect :1;\r
-  UINT8  DoubleBitErrorCorrect :1;\r
-  UINT8  ErrorScrubbing        :1;\r
-  UINT8  Reserved              :2;\r
+  UINT8                             Other                 :1;\r
+  UINT8                             Unknown               :1;\r
+  UINT8                             None                  :1;\r
+  UINT8                             SingleBitErrorCorrect :1;\r
+  UINT8                             DoubleBitErrorCorrect :1;\r
+  UINT8                             ErrorScrubbing        :1;\r
+  UINT8                             Reserved              :2;\r
 } EFI_MEMORY_ERROR_CORRECT_CAPABILITY;\r
 \r
 typedef enum {  \r
@@ -829,54 +808,54 @@ typedef enum {
 } EFI_MEMORY_SUPPORT_INTERLEAVE_TYPE;\r
 \r
 typedef struct {\r
-  UINT16  Other                 :1;\r
-  UINT16  Unknown               :1;\r
-  UINT16  SeventyNs             :1;\r
-  UINT16  SixtyNs               :1;\r
-  UINT16  FiftyNs               :1;\r
-  UINT16  Reserved              :11;\r
+  UINT16                            Other    :1;\r
+  UINT16                            Unknown  :1;\r
+  UINT16                            SeventyNs:1;\r
+  UINT16                            SixtyNs  :1;\r
+  UINT16                            FiftyNs  :1;\r
+  UINT16                            Reserved :11;\r
 } EFI_MEMORY_SPEED_TYPE;\r
 \r
 typedef struct {\r
-  UINT16  Other                 :1;\r
-  UINT16  Unknown               :1;\r
-  UINT16  Standard              :1;\r
-  UINT16  FastPageMode          :1;\r
-  UINT16  EDO                   :1;\r
-  UINT16  Parity                :1;\r
-  UINT16  ECC                   :1;\r
-  UINT16  SIMM                  :1;\r
-  UINT16  DIMM                  :1;\r
-  UINT16  BurstEdo              :1;\r
-  UINT16  SDRAM                 :1;\r
-  UINT16  Reserved              :5;\r
+  UINT16                            Other       :1;\r
+  UINT16                            Unknown     :1;\r
+  UINT16                            Standard    :1;\r
+  UINT16                            FastPageMode:1;\r
+  UINT16                            EDO         :1;\r
+  UINT16                            Parity      :1;\r
+  UINT16                            ECC         :1;\r
+  UINT16                            SIMM        :1;\r
+  UINT16                            DIMM        :1;\r
+  UINT16                            BurstEdo    :1;\r
+  UINT16                            SDRAM       :1;\r
+  UINT16                            Reserved    :5;\r
 } EFI_MEMORY_SUPPORTED_TYPE;\r
 \r
 typedef struct {\r
-  UINT8  Five                  :1;\r
-  UINT8  There                 :1;\r
-  UINT8  Two                   :1;\r
-  UINT8  Reserved              :5;\r
+  UINT8                             Five    :1;\r
+  UINT8                             There   :1;\r
+  UINT8                             Two     :1;\r
+  UINT8                             Reserved:5;\r
 } EFI_MEMORY_MODULE_VOLTAGE_TYPE;\r
 \r
 typedef struct {\r
-  EFI_MEMORY_ERROR_DETECT_METHOD_TYPE   ErrorDetectingMethod;\r
-  EFI_MEMORY_ERROR_CORRECT_CAPABILITY   ErrorCorrectingCapability;\r
-  EFI_MEMORY_SUPPORT_INTERLEAVE_TYPE    MemorySupportedInterleave;\r
-  EFI_MEMORY_SUPPORT_INTERLEAVE_TYPE    MemoryCurrentInterleave;\r
-  UINT8                                 MaxMemoryModuleSize;\r
-  EFI_MEMORY_SPEED_TYPE                 MemorySpeedType;\r
-  EFI_MEMORY_SUPPORTED_TYPE             MemorySupportedType;\r
-  EFI_MEMORY_MODULE_VOLTAGE_TYPE        MemoryModuleVoltage;\r
-  UINT8                                 NumberofMemorySlot;\r
-  EFI_MEMORY_ERROR_CORRECT_CAPABILITY   EnabledCorrectingCapability;\r
-  UINT16                                *MemoryModuleConfigHandles;\r
+  EFI_MEMORY_ERROR_DETECT_METHOD_TYPE ErrorDetectingMethod;\r
+  EFI_MEMORY_ERROR_CORRECT_CAPABILITY ErrorCorrectingCapability;\r
+  EFI_MEMORY_SUPPORT_INTERLEAVE_TYPE  MemorySupportedInterleave;\r
+  EFI_MEMORY_SUPPORT_INTERLEAVE_TYPE  MemoryCurrentInterleave;\r
+  UINT8                               MaxMemoryModuleSize;\r
+  EFI_MEMORY_SPEED_TYPE               MemorySpeedType;\r
+  EFI_MEMORY_SUPPORTED_TYPE           MemorySupportedType;\r
+  EFI_MEMORY_MODULE_VOLTAGE_TYPE      MemoryModuleVoltage;\r
+  UINT8                               NumberofMemorySlot;\r
+  EFI_MEMORY_ERROR_CORRECT_CAPABILITY EnabledCorrectingCapability;\r
+  UINT16                              *MemoryModuleConfigHandles;\r
 } EFI_MEMORY_CONTROLLER_INFORMATION;\r
 \r
 //\r
 //  Memory. Error Information - SMBIOS Type 18\r
 //\r
-#define EFI_MEMORY_32BIT_ERROR_INFORMATION_RECORD_NUMBER 0x00000009\r
+#define EFI_MEMORY_32BIT_ERROR_INFORMATION_RECORD_NUMBER    0x00000009\r
 \r
 typedef enum {  \r
   EfiMemoryErrorOther             = 1,\r
@@ -923,128 +902,124 @@ typedef struct {
 //\r
 //  Memory. Error Information - SMBIOS Type 33\r
 //\r
-#define EFI_MEMORY_64BIT_ERROR_INFORMATION_RECORD_NUMBER 0x0000000A\r
+#define EFI_MEMORY_64BIT_ERROR_INFORMATION_RECORD_NUMBER    0x0000000A\r
 \r
 typedef struct {\r
-  EFI_MEMORY_ERROR_TYPE               MemoryErrorType;\r
-  EFI_MEMORY_ERROR_GRANULARITY_TYPE   MemoryErrorGranularity;\r
-  EFI_MEMORY_ERROR_OPERATION_TYPE     MemoryErrorOperation;\r
-  UINT32                              VendorSyndrome;\r
-  UINT64                              MemoryArrayErrorAddress;\r
-  UINT64                              DeviceErrorAddress;\r
-  UINT32                              DeviceErrorResolution;\r
+  EFI_MEMORY_ERROR_TYPE             MemoryErrorType;\r
+  EFI_MEMORY_ERROR_GRANULARITY_TYPE MemoryErrorGranularity;\r
+  EFI_MEMORY_ERROR_OPERATION_TYPE   MemoryErrorOperation;\r
+  UINT32                            VendorSyndrome;\r
+  UINT64                            MemoryArrayErrorAddress;\r
+  UINT64                            DeviceErrorAddress;\r
+  UINT32                            DeviceErrorResolution;\r
 } EFI_MEMORY_64BIT_ERROR_INFORMATION;\r
 \r
 typedef union _EFI_MEMORY_SUBCLASS_RECORDS {\r
-  EFI_MEMORY_SIZE_DATA                  SizeData;\r
-  EFI_MEMORY_ARRAY_LOCATION_DATA        ArrayLocationData;\r
-  EFI_MEMORY_ARRAY_LINK_DATA            ArrayLink;\r
-  EFI_MEMORY_ARRAY_START_ADDRESS_DATA   ArrayStartAddress;\r
-  EFI_MEMORY_DEVICE_START_ADDRESS_DATA  DeviceStartAddress;\r
-  EFI_MEMORY_CHANNEL_TYPE_DATA          ChannelTypeData;\r
-  EFI_MEMORY_CHANNEL_DEVICE_DATA        ChannelDeviceData;\r
-  EFI_MEMORY_CONTROLLER_INFORMATION     MemoryControllerInfo;\r
-  EFI_MEMORY_32BIT_ERROR_INFORMATION    Memory32bitErrorInfo;\r
-  EFI_MEMORY_64BIT_ERROR_INFORMATION    Memory64bitErrorInfo;\r
+  EFI_MEMORY_SIZE_DATA                 SizeData;\r
+  EFI_MEMORY_ARRAY_LOCATION_DATA       ArrayLocationData;\r
+  EFI_MEMORY_ARRAY_LINK_DATA           ArrayLink;\r
+  EFI_MEMORY_ARRAY_START_ADDRESS_DATA  ArrayStartAddress;\r
+  EFI_MEMORY_DEVICE_START_ADDRESS_DATA DeviceStartAddress;\r
+  EFI_MEMORY_CHANNEL_TYPE_DATA         ChannelTypeData;\r
+  EFI_MEMORY_CHANNEL_DEVICE_DATA       ChannelDeviceData;\r
+  EFI_MEMORY_CONTROLLER_INFORMATION    MemoryControllerInfo;\r
+  EFI_MEMORY_32BIT_ERROR_INFORMATION   Memory32bitErrorInfo;\r
+  EFI_MEMORY_64BIT_ERROR_INFORMATION   Memory64bitErrorInfo;\r
 } EFI_MEMORY_SUBCLASS_RECORDS;\r
 \r
 typedef struct {\r
-  EFI_SUBCLASS_TYPE1_HEADER             Header;\r
-  EFI_MEMORY_SUBCLASS_RECORDS           Record;\r
+  EFI_SUBCLASS_TYPE1_HEADER         Header;\r
+  EFI_MEMORY_SUBCLASS_RECORDS       Record;\r
 } EFI_MEMORY_SUBCLASS_DRIVER_DATA;\r
 \r
 #define EFI_MISC_SUBCLASS_VERSION     0x0100\r
 \r
 #pragma pack(1)\r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
+\r
 //\r
 // Last PCI Bus Number\r
 //\r
-#define EFI_MISC_LAST_PCI_BUS_RECORD_NUMBER  0x00000001\r
+#define EFI_MISC_LAST_PCI_BUS_RECORD_NUMBER    0x00000001\r
 \r
 typedef struct {\r
-  UINT8   LastPciBus;\r
+  UINT8                             LastPciBus;\r
 } EFI_MISC_LAST_PCI_BUS_DATA;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Misc. BIOS Vendor - SMBIOS Type 0\r
 //\r
-#define EFI_MISC_BIOS_VENDOR_RECORD_NUMBER  0x00000002\r
-\r
-typedef struct {\r
-  UINT64  Reserved1                         :2;\r
-  UINT64  Unknown                           :1;\r
-  UINT64  BiosCharacteristicsNotSupported   :1;\r
-  UINT64  IsaIsSupported                    :1;\r
-  UINT64  McaIsSupported                    :1;\r
-  UINT64  EisaIsSupported                   :1;\r
-  UINT64  PciIsSupported                    :1;\r
-  UINT64  PcmciaIsSupported                 :1;\r
-  UINT64  PlugAndPlayIsSupported            :1;\r
-  UINT64  ApmIsSupported                    :1;\r
-  UINT64  BiosIsUpgradable                  :1;\r
-  UINT64  BiosShadowingAllowed              :1;\r
-  UINT64  VlVesaIsSupported                 :1;\r
-  UINT64  EscdSupportIsAvailable            :1;\r
-  UINT64  BootFromCdIsSupported             :1;\r
-  UINT64  SelectableBootIsSupported         :1;\r
-  UINT64  RomBiosIsSocketed                 :1;\r
-  UINT64  BootFromPcmciaIsSupported         :1;\r
-  UINT64  EDDSpecificationIsSupported       :1;\r
-  UINT64  JapaneseNecFloppyIsSupported      :1;\r
-  UINT64  JapaneseToshibaFloppyIsSupported  :1;\r
-  UINT64  Floppy525_360IsSupported          :1;\r
-  UINT64  Floppy525_12IsSupported           :1;\r
-  UINT64  Floppy35_720IsSupported           :1;\r
-  UINT64  Floppy35_288IsSupported           :1;\r
-  UINT64  PrintScreenIsSupported            :1;\r
-  UINT64  Keyboard8042IsSupported           :1;\r
-  UINT64  SerialIsSupported                 :1;\r
-  UINT64  PrinterIsSupported                :1;\r
-  UINT64  CgaMonoIsSupported                :1;\r
-  UINT64  NecPc98                           :1;\r
-  UINT64  AcpiIsSupported                   :1;\r
-  UINT64  UsbLegacyIsSupported              :1;\r
-  UINT64  AgpIsSupported                    :1;\r
-  UINT64  I20BootIsSupported                :1;\r
-  UINT64  Ls120BootIsSupported              :1;\r
-  UINT64  AtapiZipDriveBootIsSupported      :1;\r
-  UINT64  Boot1394IsSupported               :1;\r
-  UINT64  SmartBatteryIsSupported           :1;\r
-  UINT64  BiosBootSpecIsSupported           :1;\r
-  UINT64  FunctionKeyNetworkBootIsSupported :1;\r
-  UINT64  Reserved                          :22;\r
+#define EFI_MISC_BIOS_VENDOR_RECORD_NUMBER    0x00000002\r
+\r
+typedef struct {\r
+  UINT64                            Reserved1                         :2;\r
+  UINT64                            Unknown                           :1;\r
+  UINT64                            BiosCharacteristicsNotSupported   :1;\r
+  UINT64                            IsaIsSupported                    :1;\r
+  UINT64                            McaIsSupported                    :1;\r
+  UINT64                            EisaIsSupported                   :1;\r
+  UINT64                            PciIsSupported                    :1;\r
+  UINT64                            PcmciaIsSupported                 :1;\r
+  UINT64                            PlugAndPlayIsSupported            :1;\r
+  UINT64                            ApmIsSupported                    :1;\r
+  UINT64                            BiosIsUpgradable                  :1;\r
+  UINT64                            BiosShadowingAllowed              :1;\r
+  UINT64                            VlVesaIsSupported                 :1;\r
+  UINT64                            EscdSupportIsAvailable            :1;\r
+  UINT64                            BootFromCdIsSupported             :1;\r
+  UINT64                            SelectableBootIsSupported         :1;\r
+  UINT64                            RomBiosIsSocketed                 :1;\r
+  UINT64                            BootFromPcmciaIsSupported         :1;\r
+  UINT64                            EDDSpecificationIsSupported       :1;\r
+  UINT64                            JapaneseNecFloppyIsSupported      :1;\r
+  UINT64                            JapaneseToshibaFloppyIsSupported  :1;\r
+  UINT64                            Floppy525_360IsSupported          :1;\r
+  UINT64                            Floppy525_12IsSupported           :1;\r
+  UINT64                            Floppy35_720IsSupported           :1;\r
+  UINT64                            Floppy35_288IsSupported           :1;\r
+  UINT64                            PrintScreenIsSupported            :1;\r
+  UINT64                            Keyboard8042IsSupported           :1;\r
+  UINT64                            SerialIsSupported                 :1;\r
+  UINT64                            PrinterIsSupported                :1;\r
+  UINT64                            CgaMonoIsSupported                :1;\r
+  UINT64                            NecPc98                           :1;\r
+  UINT64                            AcpiIsSupported                   :1;\r
+  UINT64                            UsbLegacyIsSupported              :1;\r
+  UINT64                            AgpIsSupported                    :1;\r
+  UINT64                            I20BootIsSupported                :1;\r
+  UINT64                            Ls120BootIsSupported              :1;\r
+  UINT64                            AtapiZipDriveBootIsSupported      :1;\r
+  UINT64                            Boot1394IsSupported               :1;\r
+  UINT64                            SmartBatteryIsSupported           :1;\r
+  UINT64                            BiosBootSpecIsSupported           :1;\r
+  UINT64                            FunctionKeyNetworkBootIsSupported :1;\r
+  UINT64                            Reserved                          :22;\r
 } EFI_MISC_BIOS_CHARACTERISTICS;\r
 \r
 typedef struct {\r
-  UINT64  BiosReserved                      :16;\r
-  UINT64  SystemReserved                    :16;\r
-  UINT64  Reserved                          :32;\r
+  UINT64                            BiosReserved  :16;\r
+  UINT64                            SystemReserved:16;\r
+  UINT64                            Reserved      :32;\r
 } EFI_MISC_BIOS_CHARACTERISTICS_EXTENSION;\r
 \r
 typedef struct {\r
-  STRING_REF                      BiosVendor;\r
-  STRING_REF                      BiosVersion;\r
-  STRING_REF                      BiosReleaseDate;\r
-  EFI_PHYSICAL_ADDRESS            BiosStartingAddress;\r
-  EFI_EXP_BASE2_DATA              BiosPhysicalDeviceSize;\r
-  EFI_MISC_BIOS_CHARACTERISTICS   BiosCharacteristics1;\r
-  EFI_MISC_BIOS_CHARACTERISTICS_EXTENSION  BiosCharacteristics2;\r
-  UINT8                           BiosMajorRelease;\r
-  UINT8                           BiosMinorRelease;\r
-  UINT8                           BiosEmbeddedFirmwareMajorRelease;\r
-  UINT8                           BiosEmbeddedFirmwareMinorRelease;\r
+  STRING_REF                        BiosVendor;\r
+  STRING_REF                        BiosVersion;\r
+  STRING_REF                        BiosReleaseDate;\r
+  EFI_PHYSICAL_ADDRESS              BiosStartingAddress;\r
+  EFI_EXP_BASE2_DATA                BiosPhysicalDeviceSize;\r
+  EFI_MISC_BIOS_CHARACTERISTICS     BiosCharacteristics1;\r
+  EFI_MISC_BIOS_CHARACTERISTICS_EXTENSION  \r
+                                    BiosCharacteristics2;\r
+  UINT8                             BiosMajorRelease;\r
+  UINT8                             BiosMinorRelease;\r
+  UINT8                             BiosEmbeddedFirmwareMajorRelease;\r
+  UINT8                             BiosEmbeddedFirmwareMinorRelease;\r
 } EFI_MISC_BIOS_VENDOR_DATA;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Misc. System Manufacturer - SMBIOS Type 1\r
 //\r
-#define EFI_MISC_SYSTEM_MANUFACTURER_RECORD_NUMBER 0x00000003\r
+#define EFI_MISC_SYSTEM_MANUFACTURER_RECORD_NUMBER    0x00000003\r
 \r
 typedef enum {\r
   EfiSystemWakeupTypeReserved        = 0,\r
@@ -1059,30 +1034,28 @@ typedef enum {
 } EFI_MISC_SYSTEM_WAKEUP_TYPE;\r
 \r
 typedef struct {\r
-  STRING_REF                      SystemManufacturer;\r
-  STRING_REF                      SystemProductName;\r
-  STRING_REF                      SystemVersion;\r
-  STRING_REF                      SystemSerialNumber;\r
-  EFI_GUID                        SystemUuid;\r
-  EFI_MISC_SYSTEM_WAKEUP_TYPE     SystemWakeupType;\r
-  STRING_REF                      SystemSKUNumber;\r
-  STRING_REF                      SystemFamily;\r
+  STRING_REF                        SystemManufacturer;\r
+  STRING_REF                        SystemProductName;\r
+  STRING_REF                        SystemVersion;\r
+  STRING_REF                        SystemSerialNumber;\r
+  EFI_GUID                          SystemUuid;\r
+  EFI_MISC_SYSTEM_WAKEUP_TYPE       SystemWakeupType;\r
+  STRING_REF                        SystemSKUNumber;\r
+  STRING_REF                        SystemFamily;\r
 } EFI_MISC_SYSTEM_MANUFACTURER_DATA;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Misc. Base Board Manufacturer - SMBIOS Type 2\r
 //\r
-#define EFI_MISC_BASE_BOARD_MANUFACTURER_RECORD_NUMBER 0x00000004\r
+#define EFI_MISC_BASE_BOARD_MANUFACTURER_RECORD_NUMBER    0x00000004\r
 \r
 typedef struct {\r
-  UINT32  Motherboard           :1;\r
-  UINT32  RequiresDaughterCard  :1;\r
-  UINT32  Removable             :1;\r
-  UINT32  Replaceable           :1;\r
-  UINT32  HotSwappable          :1;\r
-  UINT32  Reserved              :27;\r
+  UINT32                            Motherboard           :1;\r
+  UINT32                            RequiresDaughterCard  :1;\r
+  UINT32                            Removable             :1;\r
+  UINT32                            Replaceable           :1;\r
+  UINT32                            HotSwappable          :1;\r
+  UINT32                            Reserved              :27;\r
 } EFI_BASE_BOARD_FEATURE_FLAGS;\r
 \r
 typedef enum {\r
@@ -1102,25 +1075,23 @@ typedef enum {
 } EFI_BASE_BOARD_TYPE;\r
 \r
 typedef struct {\r
-  STRING_REF                      BaseBoardManufacturer;\r
-  STRING_REF                      BaseBoardProductName;\r
-  STRING_REF                      BaseBoardVersion;\r
-  STRING_REF                      BaseBoardSerialNumber;\r
-  STRING_REF                      BaseBoardAssetTag;\r
-  STRING_REF                      BaseBoardChassisLocation;\r
-  EFI_BASE_BOARD_FEATURE_FLAGS    BaseBoardFeatureFlags;\r
-  EFI_BASE_BOARD_TYPE             BaseBoardType;\r
-  EFI_INTER_LINK_DATA             BaseBoardChassisLink;\r
-  UINT32                          BaseBoardNumberLinks;\r
-  EFI_INTER_LINK_DATA             LinkN;\r
+  STRING_REF                        BaseBoardManufacturer;\r
+  STRING_REF                        BaseBoardProductName;\r
+  STRING_REF                        BaseBoardVersion;\r
+  STRING_REF                        BaseBoardSerialNumber;\r
+  STRING_REF                        BaseBoardAssetTag;\r
+  STRING_REF                        BaseBoardChassisLocation;\r
+  EFI_BASE_BOARD_FEATURE_FLAGS      BaseBoardFeatureFlags;\r
+  EFI_BASE_BOARD_TYPE               BaseBoardType;\r
+  EFI_INTER_LINK_DATA               BaseBoardChassisLink;\r
+  UINT32                            BaseBoardNumberLinks;\r
+  EFI_INTER_LINK_DATA               LinkN;\r
 } EFI_MISC_BASE_BOARD_MANUFACTURER_DATA;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Misc. System/Chassis Enclosure - SMBIOS Type 3\r
 //\r
-#define EFI_MISC_CHASSIS_MANUFACTURER_RECORD_NUMBER  0x00000005\r
+#define EFI_MISC_CHASSIS_MANUFACTURER_RECORD_NUMBER    0x00000005\r
 \r
 typedef enum {\r
   EfiMiscChassisTypeOther               = 0x1,\r
@@ -1151,9 +1122,9 @@ typedef enum {
 } EFI_MISC_CHASSIS_TYPE;\r
 \r
 typedef struct {\r
-  UINT32  ChassisType       :16;\r
-  UINT32  ChassisLockPresent:1;\r
-  UINT32  Reserved          :15;\r
+  UINT32                            ChassisType       :16;\r
+  UINT32                            ChassisLockPresent:1;\r
+  UINT32                            Reserved          :15;\r
 } EFI_MISC_CHASSIS_STATUS;\r
 \r
 typedef enum {\r
@@ -1174,42 +1145,40 @@ typedef enum {
 } EFI_MISC_CHASSIS_SECURITY_STATE;\r
 \r
 typedef struct {\r
-  UINT32  RecordType  :1;\r
-  UINT32  Reserved    :24;\r
+  UINT32                            RecordType:1;\r
+  UINT32                            Reserved:24;\r
 } EFI_MISC_ELEMENT_TYPE;\r
 \r
 typedef struct {\r
-  EFI_MISC_ELEMENT_TYPE   ChassisElementType;\r
-  EFI_INTER_LINK_DATA     ChassisElementStructure;\r
-  EFI_BASE_BOARD_TYPE     ChassisBaseBoard;\r
-  UINT32                  ChassisElementMinimum;\r
-  UINT32                  ChassisElementMaximum;\r
+  EFI_MISC_ELEMENT_TYPE             ChassisElementType;\r
+  EFI_INTER_LINK_DATA               ChassisElementStructure;\r
+  EFI_BASE_BOARD_TYPE               ChassisBaseBoard;\r
+  UINT32                            ChassisElementMinimum;\r
+  UINT32                            ChassisElementMaximum;\r
 } EFI_MISC_ELEMENTS;\r
 \r
 typedef struct {\r
-  STRING_REF                      ChassisManufacturer;\r
-  STRING_REF                      ChassisVersion;\r
-  STRING_REF                      ChassisSerialNumber;\r
-  STRING_REF                      ChassisAssetTag;\r
-  EFI_MISC_CHASSIS_STATUS         ChassisType;\r
-  EFI_MISC_CHASSIS_STATE          ChassisBootupState;\r
-  EFI_MISC_CHASSIS_STATE          ChassisPowerSupplyState;\r
-  EFI_MISC_CHASSIS_STATE          ChassisThermalState;\r
-  EFI_MISC_CHASSIS_SECURITY_STATE ChassisSecurityState;\r
-  UINT32                          ChassisOemDefined;\r
-  UINT32                          ChassisHeight;\r
-  UINT32                          ChassisNumberPowerCords;\r
-  UINT32                          ChassisElementCount;\r
-  UINT32                          ChassisElementRecordLength;//\r
-  EFI_MISC_ELEMENTS               ChassisElements;\r
+  STRING_REF                        ChassisManufacturer;\r
+  STRING_REF                        ChassisVersion;\r
+  STRING_REF                        ChassisSerialNumber;\r
+  STRING_REF                        ChassisAssetTag;\r
+  EFI_MISC_CHASSIS_STATUS           ChassisType;\r
+  EFI_MISC_CHASSIS_STATE            ChassisBootupState;\r
+  EFI_MISC_CHASSIS_STATE            ChassisPowerSupplyState;\r
+  EFI_MISC_CHASSIS_STATE            ChassisThermalState;\r
+  EFI_MISC_CHASSIS_SECURITY_STATE   ChassisSecurityState;\r
+  UINT32                            ChassisOemDefined;\r
+  UINT32                            ChassisHeight;\r
+  UINT32                            ChassisNumberPowerCords;\r
+  UINT32                            ChassisElementCount;\r
+  UINT32                            ChassisElementRecordLength;\r
+  EFI_MISC_ELEMENTS                 ChassisElements;\r
 } EFI_MISC_CHASSIS_MANUFACTURER_DATA;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Misc. Port Connector Information - SMBIOS Type 8\r
 //\r
-#define EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_RECORD_NUMBER 0x00000006\r
+#define EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_RECORD_NUMBER    0x00000006\r
 \r
 typedef enum {\r
   EfiPortConnectorTypeNone                   = 0x00,\r
@@ -1293,20 +1262,18 @@ typedef enum {
 } EFI_MISC_PORT_TYPE;\r
 \r
 typedef struct {\r
-  STRING_REF                    PortInternalConnectorDesignator;\r
-  STRING_REF                    PortExternalConnectorDesignator;\r
-  EFI_MISC_PORT_CONNECTOR_TYPE  PortInternalConnectorType;\r
-  EFI_MISC_PORT_CONNECTOR_TYPE  PortExternalConnectorType;\r
-  EFI_MISC_PORT_TYPE            PortType;\r
-  EFI_MISC_PORT_DEVICE_PATH     PortPath;\r
+  STRING_REF                        PortInternalConnectorDesignator;\r
+  STRING_REF                        PortExternalConnectorDesignator;\r
+  EFI_MISC_PORT_CONNECTOR_TYPE      PortInternalConnectorType;\r
+  EFI_MISC_PORT_CONNECTOR_TYPE      PortExternalConnectorType;\r
+  EFI_MISC_PORT_TYPE                PortType;\r
+  EFI_MISC_PORT_DEVICE_PATH         PortPath;\r
 } EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Misc. System Slots - SMBIOS Type 9\r
 //\r
-#define EFI_MISC_SYSTEM_SLOT_DESIGNATION_RECORD_NUMBER 0x00000007\r
+#define EFI_MISC_SYSTEM_SLOT_DESIGNATION_RECORD_NUMBER    0x00000007\r
 \r
 typedef enum {\r
   EfiSlotTypeOther                        = 0x01,\r
@@ -1361,37 +1328,35 @@ typedef enum {
 } EFI_MISC_SLOT_LENGTH;\r
 \r
 typedef struct {\r
-  UINT32  CharacteristicsUnknown  :1;\r
-  UINT32  Provides50Volts         :1;\r
-  UINT32  Provides33Volts         :1;\r
-  UINT32  SharedSlot              :1;\r
-  UINT32  PcCard16Supported       :1;\r
-  UINT32  CardBusSupported        :1;\r
-  UINT32  ZoomVideoSupported      :1;\r
-  UINT32  ModemRingResumeSupported:1;\r
-  UINT32  PmeSignalSupported      :1;\r
-  UINT32  HotPlugDevicesSupported :1;\r
-  UINT32  SmbusSignalSupported    :1;\r
-  UINT32  Reserved                :21;\r
+  UINT32                            CharacteristicsUnknown  :1;\r
+  UINT32                            Provides50Volts         :1;\r
+  UINT32                            Provides33Volts         :1;\r
+  UINT32                            SharedSlot              :1;\r
+  UINT32                            PcCard16Supported       :1;\r
+  UINT32                            CardBusSupported        :1;\r
+  UINT32                            ZoomVideoSupported      :1;\r
+  UINT32                            ModemRingResumeSupported:1;\r
+  UINT32                            PmeSignalSupported      :1;\r
+  UINT32                            HotPlugDevicesSupported :1;\r
+  UINT32                            SmbusSignalSupported    :1;\r
+  UINT32                            Reserved                :21;\r
 } EFI_MISC_SLOT_CHARACTERISTICS;\r
 \r
 typedef struct {\r
-  STRING_REF                    SlotDesignation;\r
-  EFI_MISC_SLOT_TYPE            SlotType;\r
-  EFI_MISC_SLOT_DATA_BUS_WIDTH  SlotDataBusWidth;\r
-  EFI_MISC_SLOT_USAGE           SlotUsage;\r
-  EFI_MISC_SLOT_LENGTH          SlotLength;\r
-  UINT16                        SlotId;\r
-  EFI_MISC_SLOT_CHARACTERISTICS SlotCharacteristics;\r
-  EFI_DEVICE_PATH_PROTOCOL      SlotDevicePath;\r
+  STRING_REF                        SlotDesignation;\r
+  EFI_MISC_SLOT_TYPE                SlotType;\r
+  EFI_MISC_SLOT_DATA_BUS_WIDTH      SlotDataBusWidth;\r
+  EFI_MISC_SLOT_USAGE               SlotUsage;\r
+  EFI_MISC_SLOT_LENGTH              SlotLength;\r
+  UINT16                            SlotId;\r
+  EFI_MISC_SLOT_CHARACTERISTICS     SlotCharacteristics;\r
+  EFI_DEVICE_PATH_PROTOCOL          SlotDevicePath;\r
 } EFI_MISC_SYSTEM_SLOT_DESIGNATION_DATA;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Misc. Onboard Device - SMBIOS Type 10\r
 //\r
-#define EFI_MISC_ONBOARD_DEVICE_RECORD_NUMBER 0x00000008\r
+#define EFI_MISC_ONBOARD_DEVICE_RECORD_NUMBER    0x00000008\r
 \r
 typedef enum {\r
   EfiOnBoardDeviceTypeOther          = 1,\r
@@ -1404,102 +1369,88 @@ typedef enum {
 } EFI_MISC_ONBOARD_DEVICE_TYPE;\r
 \r
 typedef struct {\r
-  UINT32  DeviceType    :16;\r
-  UINT32  DeviceEnabled :1;\r
-  UINT32  Reserved      :15;\r
+  UINT32                            DeviceType    :16;\r
+  UINT32                            DeviceEnabled :1;\r
+  UINT32                            Reserved      :15;\r
 } EFI_MISC_ONBOARD_DEVICE_STATUS;\r
 \r
 typedef struct {\r
-  STRING_REF                           OnBoardDeviceDescription;\r
-  EFI_MISC_ONBOARD_DEVICE_STATUS       OnBoardDeviceStatus;\r
-  EFI_DEVICE_PATH_PROTOCOL             OnBoardDevicePath;\r
+  STRING_REF                        OnBoardDeviceDescription;\r
+  EFI_MISC_ONBOARD_DEVICE_STATUS    OnBoardDeviceStatus;\r
+  EFI_DEVICE_PATH_PROTOCOL          OnBoardDevicePath;\r
 } EFI_MISC_ONBOARD_DEVICE_DATA;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Misc. BIOS Language Information - SMBIOS Type 11\r
 //\r
-#define EFI_MISC_OEM_STRING_RECORD_NUMBER 0x00000009\r
+#define EFI_MISC_OEM_STRING_RECORD_NUMBER    0x00000009\r
 \r
 typedef struct {\r
-  STRING_REF                          OemStringRef[1];\r
+  STRING_REF                        OemStringRef[1];\r
 } EFI_MISC_OEM_STRING_DATA;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Misc. System Options - SMBIOS Type 12\r
 //\r
 typedef struct {\r
-  STRING_REF                          SystemOptionStringRef[1];\r
+  STRING_REF                        SystemOptionStringRef[1];\r
 } EFI_MISC_SYSTEM_OPTION_STRING_DATA;\r
 \r
-#define EFI_MISC_SYSTEM_OPTION_STRING_RECORD_NUMBER 0x0000000A\r
+#define EFI_MISC_SYSTEM_OPTION_STRING_RECORD_NUMBER    0x0000000A\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Misc. Number of Installable Languages - SMBIOS Type 13\r
 //\r
-#define EFI_MISC_NUMBER_OF_INSTALLABLE_LANGUAGES_RECORD_NUMBER 0x0000000B\r
+#define EFI_MISC_NUMBER_OF_INSTALLABLE_LANGUAGES_RECORD_NUMBER    0x0000000B\r
 \r
 typedef struct {\r
-  UINT32                              AbbreviatedLanguageFormat :1;\r
-  UINT32                              Reserved                  :31;\r
+  UINT32                            AbbreviatedLanguageFormat :1;\r
+  UINT32                            Reserved                  :31;\r
 } EFI_MISC_LANGUAGE_FLAGS;\r
 \r
 typedef struct {\r
-  UINT16                              NumberOfInstallableLanguages;\r
-  EFI_MISC_LANGUAGE_FLAGS             LanguageFlags;\r
-  UINT16                              CurrentLanguageNumber;\r
+  UINT16                            NumberOfInstallableLanguages;\r
+  EFI_MISC_LANGUAGE_FLAGS           LanguageFlags;\r
+  UINT16                            CurrentLanguageNumber;\r
 } EFI_MISC_NUMBER_OF_INSTALLABLE_LANGUAGES_DATA;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Misc. System Language String\r
 //\r
-#define EFI_MISC_SYSTEM_LANGUAGE_STRING_RECORD_NUMBER 0x0000000C\r
+#define EFI_MISC_SYSTEM_LANGUAGE_STRING_RECORD_NUMBER    0x0000000C\r
 \r
 typedef struct {\r
-  UINT16                              LanguageId;\r
-  STRING_REF                          SystemLanguageString;\r
+  UINT16                            LanguageId;\r
+  STRING_REF                        SystemLanguageString;\r
 } EFI_MISC_SYSTEM_LANGUAGE_STRING_DATA;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Group Associations - SMBIOS Type 14\r
 //\r
-#define EFI_MISC_GROUP_NAME_RECORD_NUMBER          0x0000000D\r
+#define EFI_MISC_GROUP_NAME_RECORD_NUMBER    0x0000000D\r
 \r
 typedef struct {\r
-  STRING_REF               GroupName;\r
-  UINT16                   NumberGroupItems;\r
-  UINT16                   GroupId;\r
+  STRING_REF                        GroupName;\r
+  UINT16                            NumberGroupItems;\r
+  UINT16                            GroupId;\r
 } EFI_MISC_GROUP_NAME_DATA;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Group Item Set Element\r
 //\r
-#define EFI_MISC_GROUP_ITEM_SET_RECORD_NUMBER      0x0000000E\r
+#define EFI_MISC_GROUP_ITEM_SET_RECORD_NUMBER    0x0000000E\r
 \r
 typedef struct {\r
-  EFI_GUID                 SubClass;\r
-  EFI_INTER_LINK_DATA      GroupLink;\r
-  UINT16                   GroupId;\r
-  UINT16                   GroupElementId;\r
+  EFI_GUID                          SubClass;\r
+  EFI_INTER_LINK_DATA               GroupLink;\r
+  UINT16                            GroupId;\r
+  UINT16                            GroupElementId;\r
 } EFI_MISC_GROUP_ITEM_SET_DATA;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 //  Misc. Pointing Device Type - SMBIOS Type 21\r
 //\r
-#define EFI_MISC_POINTING_DEVICE_TYPE_RECORD_NUMBER 0x0000000F\r
+#define EFI_MISC_POINTING_DEVICE_TYPE_RECORD_NUMBER    0x0000000F\r
 \r
 typedef enum {\r
   EfiPointingDeviceTypeOther         = 0x01,\r
@@ -1534,12 +1485,10 @@ typedef struct {
   EFI_DEVICE_PATH_PROTOCOL            PointingDevicePath;\r
 } EFI_MISC_PORTING_DEVICE_TYPE_DATA;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Portable Battery - SMBIOS Type 22\r
 //\r
-#define EFI_MISC_PORTABLE_BATTERY_RECORD_NUMBER 0x00000010\r
+#define EFI_MISC_PORTABLE_BATTERY_RECORD_NUMBER    0x00000010\r
 \r
 typedef enum {  \r
   EfiPortableBatteryDeviceChemistryOther = 1,\r
@@ -1553,38 +1502,37 @@ typedef enum {
 } EFI_MISC_PORTABLE_BATTERY_DEVICE_CHEMISTRY;\r
 \r
 typedef struct {\r
-  STRING_REF                                  Location;\r
-  STRING_REF                                  Manufacturer;\r
-  STRING_REF                                  ManufactureDate;\r
-  STRING_REF                                  SerialNumber;\r
-  STRING_REF                                  DeviceName;\r
-  EFI_MISC_PORTABLE_BATTERY_DEVICE_CHEMISTRY  DeviceChemistry;\r
-  UINT16                                      DesignCapacity;\r
-  UINT16                                      DesignVoltage;\r
-  STRING_REF                                  SBDSVersionNumber;\r
-  UINT8                                       MaximumError;\r
-  UINT16                                      SBDSSerialNumber;\r
-  UINT16                                      SBDSManufactureDate;\r
-  STRING_REF                                  SBDSDeviceChemistry;\r
-  UINT8                                       DesignCapacityMultiplier;\r
-  UINT32                                      OEMSpecific;  \r
-  UINT8                                       BatteryNumber; // Temporary   \r
-  BOOLEAN                                     Valid; // Is entry valid - Temporary\r
+  STRING_REF                        Location;\r
+  STRING_REF                        Manufacturer;\r
+  STRING_REF                        ManufactureDate;\r
+  STRING_REF                        SerialNumber;\r
+  STRING_REF                        DeviceName;\r
+  EFI_MISC_PORTABLE_BATTERY_DEVICE_CHEMISTRY  \r
+                                    DeviceChemistry;\r
+  UINT16                            DesignCapacity;\r
+  UINT16                            DesignVoltage;\r
+  STRING_REF                        SBDSVersionNumber;\r
+  UINT8                             MaximumError;\r
+  UINT16                            SBDSSerialNumber;\r
+  UINT16                            SBDSManufactureDate;\r
+  STRING_REF                        SBDSDeviceChemistry;\r
+  UINT8                             DesignCapacityMultiplier;\r
+  UINT32                            OEMSpecific;  \r
+  UINT8                             BatteryNumber; // Temporary   \r
+  BOOLEAN                           Valid; // Is entry valid - Temporary\r
 } EFI_MISC_PORTABLE_BATTERY;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Misc. Reset Capabilities - SMBIOS Type 23\r
 //\r
-#define EFI_MISC_RESET_CAPABILITIES_RECORD_NUMBER 0x00000011\r
+#define EFI_MISC_RESET_CAPABILITIES_RECORD_NUMBER    0x00000011\r
 \r
 typedef struct {\r
-  UINT32  Status              :1;\r
-  UINT32  BootOption          :2;\r
-  UINT32  BootOptionOnLimit   :2;\r
-  UINT32  WatchdogTimerPresent:1;\r
-  UINT32  Reserved            :26;\r
+  UINT32                            Status              :1;\r
+  UINT32                            BootOption          :2;\r
+  UINT32                            BootOptionOnLimit   :2;\r
+  UINT32                            WatchdogTimerPresent:1;\r
+  UINT32                            Reserved            :26;\r
 } EFI_MISC_RESET_CAPABILITIES_TYPE;\r
 \r
 typedef struct {\r
@@ -1596,19 +1544,17 @@ typedef struct {
 } EFI_MISC_RESET_CAPABILITIES;\r
 \r
 typedef struct {\r
-    EFI_MISC_RESET_CAPABILITIES   ResetCapabilities;\r
-    UINT16                        ResetCount;\r
-    UINT16                        ResetLimit;\r
-    UINT16                        ResetTimerInterval;\r
-    UINT16                        ResetTimeout;\r
+    EFI_MISC_RESET_CAPABILITIES     ResetCapabilities;\r
+    UINT16                          ResetCount;\r
+    UINT16                          ResetLimit;\r
+    UINT16                          ResetTimerInterval;\r
+    UINT16                          ResetTimeout;\r
 } EFI_MISC_RESET_CAPABILITIES_DATA;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Misc. Hardware Security - SMBIOS Type 24\r
 //\r
-#define EFI_MISC_HARDWARE_SECURITY_SETTINGS_DATA_RECORD_NUMBER 0x00000012\r
+#define EFI_MISC_HARDWARE_SECURITY_SETTINGS_DATA_RECORD_NUMBER    0x00000012\r
 \r
 typedef enum {\r
   EfiHardwareSecurityStatusDisabled       = 0,\r
@@ -1618,185 +1564,169 @@ typedef enum {
 } EFI_MISC_HARDWARE_SECURITY_STATUS;\r
 \r
 typedef struct {\r
-  EFI_MISC_HARDWARE_SECURITY_STATUS   FrontPanelResetStatus       :2;\r
-  EFI_MISC_HARDWARE_SECURITY_STATUS   AdministratorPasswordStatus :2;\r
-  EFI_MISC_HARDWARE_SECURITY_STATUS   KeyboardPasswordStatus      :2;\r
-  EFI_MISC_HARDWARE_SECURITY_STATUS   PowerOnPasswordStatus       :2;\r
-  EFI_MISC_HARDWARE_SECURITY_STATUS   Reserved                    :24;\r
+  EFI_MISC_HARDWARE_SECURITY_STATUS FrontPanelResetStatus       :2;\r
+  EFI_MISC_HARDWARE_SECURITY_STATUS AdministratorPasswordStatus :2;\r
+  EFI_MISC_HARDWARE_SECURITY_STATUS KeyboardPasswordStatus      :2;\r
+  EFI_MISC_HARDWARE_SECURITY_STATUS PowerOnPasswordStatus       :2;\r
+  EFI_MISC_HARDWARE_SECURITY_STATUS Reserved                    :24;\r
 } EFI_MISC_HARDWARE_SECURITY_SETTINGS;\r
 \r
 typedef struct {\r
   EFI_MISC_HARDWARE_SECURITY_SETTINGS HardwareSecuritySettings;\r
 } EFI_MISC_HARDWARE_SECURITY_SETTINGS_DATA;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // System Power Controls - SMBIOS Type 25\r
 //\r
-#define EFI_MISC_SCHEDULED_POWER_ON_MONTH_RECORD_NUMBER  0x00000013\r
+#define EFI_MISC_SCHEDULED_POWER_ON_MONTH_RECORD_NUMBER    0x00000013\r
 \r
 typedef struct {\r
-  UINT16             ScheduledPoweronMonth;\r
-  UINT16             ScheduledPoweronDayOfMonth;\r
-  UINT16             ScheduledPoweronHour;\r
-  UINT16             ScheduledPoweronMinute;\r
-  UINT16             ScheduledPoweronSecond;\r
+  UINT16                            ScheduledPoweronMonth;\r
+  UINT16                            ScheduledPoweronDayOfMonth;\r
+  UINT16                            ScheduledPoweronHour;\r
+  UINT16                            ScheduledPoweronMinute;\r
+  UINT16                            ScheduledPoweronSecond;\r
 } EFI_MISC_SCHEDULED_POWER_ON_MONTH_DATA;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Voltage Probe - SMBIOS Type 26\r
 //\r
-#define EFI_MISC_VOLTAGE_PROBE_DESCRIPTION_RECORD_NUMBER  0x00000014\r
+#define EFI_MISC_VOLTAGE_PROBE_DESCRIPTION_RECORD_NUMBER    0x00000014\r
 \r
 typedef struct {\r
-  UINT32 VoltageProbeSite        :5;\r
-  UINT32 VoltageProbeStatus      :3;\r
-  UINT32 Reserved                :24;\r
+  UINT32                            VoltageProbeSite        :5;\r
+  UINT32                            VoltageProbeStatus      :3;\r
+  UINT32                            Reserved                :24;\r
 } EFI_MISC_VOLTAGE_PROBE_LOCATION;\r
 \r
 typedef struct {\r
-  STRING_REF                      VoltageProbeDescription;\r
-  EFI_MISC_VOLTAGE_PROBE_LOCATION VoltageProbeLocation;\r
-  EFI_EXP_BASE10_DATA             VoltageProbeMaximumValue;\r
-  EFI_EXP_BASE10_DATA             VoltageProbeMinimumValue;\r
-  EFI_EXP_BASE10_DATA             VoltageProbeResolution;\r
-  EFI_EXP_BASE10_DATA             VoltageProbeTolerance;\r
-  EFI_EXP_BASE10_DATA             VoltageProbeAccuracy;\r
-  EFI_EXP_BASE10_DATA             VoltageProbeNominalValue;\r
-  EFI_EXP_BASE10_DATA             MDLowerNoncriticalThreshold;\r
-  EFI_EXP_BASE10_DATA             MDUpperNoncriticalThreshold;\r
-  EFI_EXP_BASE10_DATA             MDLowerCriticalThreshold;\r
-  EFI_EXP_BASE10_DATA             MDUpperCriticalThreshold;\r
-  EFI_EXP_BASE10_DATA             MDLowerNonrecoverableThreshold;\r
-  EFI_EXP_BASE10_DATA             MDUpperNonrecoverableThreshold;\r
-  UINT32                          VoltageProbeOemDefined;\r
+  STRING_REF                        VoltageProbeDescription;\r
+  EFI_MISC_VOLTAGE_PROBE_LOCATION   VoltageProbeLocation;\r
+  EFI_EXP_BASE10_DATA               VoltageProbeMaximumValue;\r
+  EFI_EXP_BASE10_DATA               VoltageProbeMinimumValue;\r
+  EFI_EXP_BASE10_DATA               VoltageProbeResolution;\r
+  EFI_EXP_BASE10_DATA               VoltageProbeTolerance;\r
+  EFI_EXP_BASE10_DATA               VoltageProbeAccuracy;\r
+  EFI_EXP_BASE10_DATA               VoltageProbeNominalValue;\r
+  EFI_EXP_BASE10_DATA               MDLowerNoncriticalThreshold;\r
+  EFI_EXP_BASE10_DATA               MDUpperNoncriticalThreshold;\r
+  EFI_EXP_BASE10_DATA               MDLowerCriticalThreshold;\r
+  EFI_EXP_BASE10_DATA               MDUpperCriticalThreshold;\r
+  EFI_EXP_BASE10_DATA               MDLowerNonrecoverableThreshold;\r
+  EFI_EXP_BASE10_DATA               MDUpperNonrecoverableThreshold;\r
+  UINT32                            VoltageProbeOemDefined;\r
 } EFI_MISC_VOLTAGE_PROBE_DESCRIPTION_DATA;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Cooling Device - SMBIOS Type 27\r
 //\r
-#define EFI_MISC_COOLING_DEVICE_TEMP_LINK_RECORD_NUMBER   0x00000015\r
+#define EFI_MISC_COOLING_DEVICE_TEMP_LINK_RECORD_NUMBER    0x00000015\r
 \r
 typedef struct {\r
-  UINT32 CoolingDevice                 :5;\r
-  UINT32 CoolingDeviceStatus           :3;\r
-  UINT32 Reserved                      :24;\r
+  UINT32                            CoolingDevice       :5;\r
+  UINT32                            CoolingDeviceStatus :3;\r
+  UINT32                            Reserved            :24;\r
 } EFI_MISC_COOLING_DEVICE_TYPE;\r
 \r
 typedef struct {\r
-  EFI_MISC_COOLING_DEVICE_TYPE   CoolingDeviceType;\r
-  EFI_INTER_LINK_DATA            CoolingDeviceTemperatureLink;\r
-  UINT16                         CoolingDeviceUnitGroup;\r
-  EFI_EXP_BASE10_DATA            CoolingDeviceNominalSpeed;\r
-  UINT32                         CoolingDeviceOemDefined;\r
+  EFI_MISC_COOLING_DEVICE_TYPE      CoolingDeviceType;\r
+  EFI_INTER_LINK_DATA               CoolingDeviceTemperatureLink;\r
+  UINT16                            CoolingDeviceUnitGroup;\r
+  EFI_EXP_BASE10_DATA               CoolingDeviceNominalSpeed;\r
+  UINT32                            CoolingDeviceOemDefined;\r
 } EFI_MISC_COOLING_DEVICE_TEMP_LINK_DATA;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Temperature Probe - SMBIOS Type 28\r
 //\r
-#define EFI_MISC_TEMPERATURE_PROBE_DESCRIPTION_RECORD_NUMBER   0x00000016\r
+#define EFI_MISC_TEMPERATURE_PROBE_DESCRIPTION_RECORD_NUMBER    0x00000016\r
 \r
 typedef struct {\r
-  UINT32 TemperatureProbeSite          :5;\r
-  UINT32 TemperatureProbeStatus        :3;\r
-  UINT32 Reserved                      :24;\r
+  UINT32                            TemperatureProbeSite   :5;\r
+  UINT32                            TemperatureProbeStatus :3;\r
+  UINT32                            Reserved               :24;\r
 } EFI_MISC_TEMPERATURE_PROBE_LOCATION;\r
 \r
 typedef struct {\r
-  STRING_REF               TemperatureProbeDescription;\r
+  STRING_REF                        TemperatureProbeDescription;\r
   EFI_MISC_TEMPERATURE_PROBE_LOCATION\r
-                           TemperatureProbeLocation;\r
-  EFI_EXP_BASE10_DATA      TemperatureProbeMaximumValue;\r
-  EFI_EXP_BASE10_DATA      TemperatureProbeMinimumValue;\r
-  EFI_EXP_BASE10_DATA      TemperatureProbeResolution;\r
-  EFI_EXP_BASE10_DATA      TemperatureProbeTolerance;\r
-  EFI_EXP_BASE10_DATA      TemperatureProbeAccuracy;\r
-  EFI_EXP_BASE10_DATA      TemperatureProbeNominalValue;\r
-  EFI_EXP_BASE10_DATA      MDLowerNoncriticalThreshold;\r
-  EFI_EXP_BASE10_DATA      MDUpperNoncriticalThreshold;\r
-  EFI_EXP_BASE10_DATA      MDLowerCriticalThreshold;\r
-  EFI_EXP_BASE10_DATA      MDUpperCriticalThreshold;\r
-  EFI_EXP_BASE10_DATA      MDLowerNonrecoverableThreshold;\r
-  EFI_EXP_BASE10_DATA      MDUpperNonrecoverableThreshold;\r
-  UINT32                   TemperatureProbeOemDefined;\r
+                                    TemperatureProbeLocation;\r
+  EFI_EXP_BASE10_DATA               TemperatureProbeMaximumValue;\r
+  EFI_EXP_BASE10_DATA               TemperatureProbeMinimumValue;\r
+  EFI_EXP_BASE10_DATA               TemperatureProbeResolution;\r
+  EFI_EXP_BASE10_DATA               TemperatureProbeTolerance;\r
+  EFI_EXP_BASE10_DATA               TemperatureProbeAccuracy;\r
+  EFI_EXP_BASE10_DATA               TemperatureProbeNominalValue;\r
+  EFI_EXP_BASE10_DATA               MDLowerNoncriticalThreshold;\r
+  EFI_EXP_BASE10_DATA               MDUpperNoncriticalThreshold;\r
+  EFI_EXP_BASE10_DATA               MDLowerCriticalThreshold;\r
+  EFI_EXP_BASE10_DATA               MDUpperCriticalThreshold;\r
+  EFI_EXP_BASE10_DATA               MDLowerNonrecoverableThreshold;\r
+  EFI_EXP_BASE10_DATA               MDUpperNonrecoverableThreshold;\r
+  UINT32                            TemperatureProbeOemDefined;\r
 } EFI_MISC_TEMPERATURE_PROBE_DESCRIPTION_DATA;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Electrical Current Probe - SMBIOS Type 29\r
 //\r
 \r
-#define EFI_MISC_ELECTRICAL_CURRENT_PROBE_DESCRIPTION_RECORD_NUMBER  0x00000017\r
+#define EFI_MISC_ELECTRICAL_CURRENT_PROBE_DESCRIPTION_RECORD_NUMBER    0x00000017\r
 \r
 typedef struct {\r
-  UINT32 ElectricalCurrentProbeSite    :5;\r
-  UINT32 ElectricalCurrentProbeStatus  :3;\r
-  UINT32 Reserved                      :24;\r
+  UINT32                            ElectricalCurrentProbeSite    :5;\r
+  UINT32                            ElectricalCurrentProbeStatus  :3;\r
+  UINT32                            Reserved                      :24;\r
 } EFI_MISC_ELECTRICAL_CURRENT_PROBE_LOCATION;\r
 \r
 typedef struct {\r
-  STRING_REF               ElectricalCurrentProbeDescription;\r
+  STRING_REF                        ElectricalCurrentProbeDescription;\r
   EFI_MISC_ELECTRICAL_CURRENT_PROBE_LOCATION\r
-                           ElectricalCurrentProbeLocation;\r
-  EFI_EXP_BASE10_DATA      ElectricalCurrentProbeMaximumValue;\r
-  EFI_EXP_BASE10_DATA      ElectricalCurrentProbeMinimumValue;\r
-  EFI_EXP_BASE10_DATA      ElectricalCurrentProbeResolution;\r
-  EFI_EXP_BASE10_DATA      ElectricalCurrentProbeTolerance;\r
-  EFI_EXP_BASE10_DATA      ElectricalCurrentProbeAccuracy;\r
-  EFI_EXP_BASE10_DATA      ElectricalCurrentProbeNominalValue;\r
-  EFI_EXP_BASE10_DATA      MDLowerNoncriticalThreshold;\r
-  EFI_EXP_BASE10_DATA      MDUpperNoncriticalThreshold;\r
-  EFI_EXP_BASE10_DATA      MDLowerCriticalThreshold;\r
-  EFI_EXP_BASE10_DATA      MDUpperCriticalThreshold;\r
-  EFI_EXP_BASE10_DATA      MDLowerNonrecoverableThreshold;\r
-  EFI_EXP_BASE10_DATA      MDUpperNonrecoverableThreshold;\r
-  UINT32                   ElectricalCurrentProbeOemDefined;\r
+                                    ElectricalCurrentProbeLocation;\r
+  EFI_EXP_BASE10_DATA               ElectricalCurrentProbeMaximumValue;\r
+  EFI_EXP_BASE10_DATA               ElectricalCurrentProbeMinimumValue;\r
+  EFI_EXP_BASE10_DATA               ElectricalCurrentProbeResolution;\r
+  EFI_EXP_BASE10_DATA               ElectricalCurrentProbeTolerance;\r
+  EFI_EXP_BASE10_DATA               ElectricalCurrentProbeAccuracy;\r
+  EFI_EXP_BASE10_DATA               ElectricalCurrentProbeNominalValue;\r
+  EFI_EXP_BASE10_DATA               MDLowerNoncriticalThreshold;\r
+  EFI_EXP_BASE10_DATA               MDUpperNoncriticalThreshold;\r
+  EFI_EXP_BASE10_DATA               MDLowerCriticalThreshold;\r
+  EFI_EXP_BASE10_DATA               MDUpperCriticalThreshold;\r
+  EFI_EXP_BASE10_DATA               MDLowerNonrecoverableThreshold;\r
+  EFI_EXP_BASE10_DATA               MDUpperNonrecoverableThreshold;\r
+  UINT32                            ElectricalCurrentProbeOemDefined;\r
 } EFI_MISC_ELECTRICAL_CURRENT_PROBE_DESCRIPTION_DATA;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Out-of-Band Remote Access - SMBIOS Type 30\r
 //\r
 \r
-#define EFI_MISC_REMOTE_ACCESS_MANUFACTURER_DESCRIPTION_RECORD_NUMBER  0x00000018\r
+#define EFI_MISC_REMOTE_ACCESS_MANUFACTURER_DESCRIPTION_RECORD_NUMBER    0x00000018\r
 \r
 typedef struct  {\r
-  UINT32 InboundConnectionEnabled            :1;\r
-  UINT32 OutboundConnectionEnabled           :1;\r
-  UINT32 Reserved                            :30;\r
+  UINT32                            InboundConnectionEnabled  :1;\r
+  UINT32                            OutboundConnectionEnabled :1;\r
+  UINT32                            Reserved                  :30;\r
 } EFI_MISC_REMOTE_ACCESS_CONNECTIONS;\r
 \r
 typedef struct {\r
-  STRING_REF                             RemoteAccessManufacturerNameDescription;\r
-  EFI_MISC_REMOTE_ACCESS_CONNECTIONS     RemoteAccessConnections;\r
+  STRING_REF                         RemoteAccessManufacturerNameDescription;\r
+  EFI_MISC_REMOTE_ACCESS_CONNECTIONS RemoteAccessConnections;\r
 } EFI_MISC_REMOTE_ACCESS_MANUFACTURER_DESCRIPTION_DATA;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Misc. BIS Entry Point - SMBIOS Type 31\r
 //\r
-#define EFI_MISC_BIS_ENTRY_POINT_RECORD_NUMBER          0x00000019\r
+#define EFI_MISC_BIS_ENTRY_POINT_RECORD_NUMBER    0x00000019\r
 \r
 typedef struct {\r
-  EFI_PHYSICAL_ADDRESS       BisEntryPoint;\r
+  EFI_PHYSICAL_ADDRESS              BisEntryPoint;\r
 } EFI_MISC_BIS_ENTRY_POINT_DATA;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Misc. Boot Information - SMBIOS Type 32\r
 //\r
-#define EFI_MISC_BOOT_INFORMATION_STATUS_RECORD_NUMBER  0x0000001A\r
+#define EFI_MISC_BOOT_INFORMATION_STATUS_RECORD_NUMBER    0x0000001A\r
 \r
 typedef enum {\r
   EfiBootInformationStatusNoError                  = 0x00,\r
@@ -1818,12 +1748,10 @@ typedef struct {
   UINT8                                      BootInformationData[9];\r
 } EFI_MISC_BOOT_INFORMATION_STATUS_DATA;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Management Device - SMBIOS Type 34\r
 //\r
-#define EFI_MISC_MANAGEMENT_DEVICE_DESCRIPTION_RECORD_NUMBER   0x0000001B\r
+#define EFI_MISC_MANAGEMENT_DEVICE_DESCRIPTION_RECORD_NUMBER    0x0000001B\r
 \r
 typedef enum {\r
   EfiManagementDeviceTypeOther      = 0x01,\r
@@ -1850,30 +1778,26 @@ typedef enum {
 } EFI_MISC_MANAGEMENT_DEVICE_ADDRESS_TYPE;\r
 \r
 typedef struct {\r
-  STRING_REF                       ManagementDeviceDescription;\r
-  EFI_MISC_MANAGEMENT_DEVICE_TYPE  ManagementDeviceType;\r
-  UINTN                            ManagementDeviceAddress;\r
+  STRING_REF                        ManagementDeviceDescription;\r
+  EFI_MISC_MANAGEMENT_DEVICE_TYPE   ManagementDeviceType;\r
+  UINTN                             ManagementDeviceAddress;\r
   EFI_MISC_MANAGEMENT_DEVICE_ADDRESS_TYPE\r
-                                   ManagementDeviceAddressType;\r
+                                    ManagementDeviceAddressType;\r
 } EFI_MISC_MANAGEMENT_DEVICE_DESCRIPTION_DATA;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Management Device Component - SMBIOS Type 35\r
 //\r
 \r
-#define EFI_MISC_MANAGEMENT_DEVICE_COMPONENT_DESCRIPTION_RECORD_NUMBER  0x0000001C\r
+#define EFI_MISC_MANAGEMENT_DEVICE_COMPONENT_DESCRIPTION_RECORD_NUMBER    0x0000001C\r
 \r
 typedef struct {\r
-  STRING_REF               ManagementDeviceComponentDescription;\r
-  EFI_INTER_LINK_DATA      ManagementDeviceLink;\r
-  EFI_INTER_LINK_DATA      ManagementDeviceComponentLink;\r
-  EFI_INTER_LINK_DATA      ManagementDeviceThresholdLink;\r
+  STRING_REF                        ManagementDeviceComponentDescription;\r
+  EFI_INTER_LINK_DATA               ManagementDeviceLink;\r
+  EFI_INTER_LINK_DATA               ManagementDeviceComponentLink;\r
+  EFI_INTER_LINK_DATA               ManagementDeviceThresholdLink;\r
 } EFI_MISC_MANAGEMENT_DEVICE_COMPONENT_DESCRIPTION_DATA;\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // IPMI Data Record - SMBIOS Type 38\r
 //\r
@@ -1885,91 +1809,85 @@ typedef enum {
 } EFI_MISC_IPMI_INTERFACE_TYPE;\r
 \r
 typedef struct {\r
-  UINT16  IpmiSpecLeastSignificantDigit:4;\r
-  UINT16  IpmiSpecMostSignificantDigit: 4;\r
-  UINT16  Reserved:                     8;\r
+  UINT16                            IpmiSpecLeastSignificantDigit:4;\r
+  UINT16                            IpmiSpecMostSignificantDigit: 4;\r
+  UINT16                            Reserved:                     8;\r
 } EFI_MISC_IPMI_SPECIFICATION_REVISION;\r
 \r
 typedef struct {\r
-  EFI_MISC_IPMI_INTERFACE_TYPE          IpmiInterfaceType;\r
-  EFI_MISC_IPMI_SPECIFICATION_REVISION  IpmiSpecificationRevision;\r
-  UINT16                                IpmiI2CSlaveAddress;\r
-  UINT16                                IpmiNvDeviceAddress;\r
-  UINT64                                IpmiBaseAddress;\r
-  EFI_DEVICE_PATH_PROTOCOL              IpmiDevicePath;\r
+  EFI_MISC_IPMI_INTERFACE_TYPE      IpmiInterfaceType;\r
+  EFI_MISC_IPMI_SPECIFICATION_REVISION  \r
+                                    IpmiSpecificationRevision;\r
+  UINT16                            IpmiI2CSlaveAddress;\r
+  UINT16                            IpmiNvDeviceAddress;\r
+  UINT64                            IpmiBaseAddress;\r
+  EFI_DEVICE_PATH_PROTOCOL          IpmiDevicePath;\r
 } EFI_MISC_IPMI_INTERFACE_TYPE_DATA;\r
 \r
-#define EFI_MISC_IPMI_INTERFACE_TYPE_RECORD_NUMBER  0x0000001D\r
+#define EFI_MISC_IPMI_INTERFACE_TYPE_RECORD_NUMBER    0x0000001D\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 //System Power supply Record - SMBIOS Type 39\r
 //\r
 typedef struct {\r
-  UINT16  PowerSupplyHotReplaceable  :1;\r
-  UINT16  PowerSupplyPresent         :1;\r
-  UINT16  PowerSupplyUnplugged       :1;\r
-  UINT16  InputVoltageRangeSwitch    :4;\r
-  UINT16  PowerSupplyStatus          :3;\r
-  UINT16  PowerSupplyType            :4;\r
-  UINT16  Reserved                   :2;\r
+  UINT16                            PowerSupplyHotReplaceable:1;\r
+  UINT16                            PowerSupplyPresent       :1;\r
+  UINT16                            PowerSupplyUnplugged     :1;\r
+  UINT16                            InputVoltageRangeSwitch  :4;\r
+  UINT16                            PowerSupplyStatus        :3;\r
+  UINT16                            PowerSupplyType          :4;\r
+  UINT16                            Reserved                 :2;\r
 } POWER_SUPPLY_CHARACTERISTICS;\r
 \r
 typedef struct {\r
-  UINT16                          PowerUnitGroup;\r
-  STRING_REF                      PowerSupplyLocation;\r
-  STRING_REF                      PowerSupplyDeviceName;\r
-  STRING_REF                      PowerSupplyManufacturer;\r
-  STRING_REF                      PowerSupplySerialNumber;\r
-  STRING_REF                      PowerSupplyAssetTagNumber;\r
-  STRING_REF                      PowerSupplyModelPartNumber;\r
-  STRING_REF                      PowerSupplyRevisionLevel;\r
-  UINT16                          PowerSupplyMaxPowerCapacity;\r
-  POWER_SUPPLY_CHARACTERISTICS    PowerSupplyCharacteristics;\r
-  EFI_INTER_LINK_DATA             PowerSupplyInputVoltageProbeLink;\r
-  EFI_INTER_LINK_DATA             PowerSupplyCoolingDeviceLink;\r
-  EFI_INTER_LINK_DATA             PowerSupplyInputCurrentProbeLink;\r
+  UINT16                            PowerUnitGroup;\r
+  STRING_REF                        PowerSupplyLocation;\r
+  STRING_REF                        PowerSupplyDeviceName;\r
+  STRING_REF                        PowerSupplyManufacturer;\r
+  STRING_REF                        PowerSupplySerialNumber;\r
+  STRING_REF                        PowerSupplyAssetTagNumber;\r
+  STRING_REF                        PowerSupplyModelPartNumber;\r
+  STRING_REF                        PowerSupplyRevisionLevel;\r
+  UINT16                            PowerSupplyMaxPowerCapacity;\r
+  POWER_SUPPLY_CHARACTERISTICS      PowerSupplyCharacteristics;\r
+  EFI_INTER_LINK_DATA               PowerSupplyInputVoltageProbeLink;\r
+  EFI_INTER_LINK_DATA               PowerSupplyCoolingDeviceLink;\r
+  EFI_INTER_LINK_DATA               PowerSupplyInputCurrentProbeLink;\r
 } EFI_MISC_SYSTEM_POWER_SUPPLY_DATA;\r
 \r
-#define EFI_MISC_SYSTEM_POWER_SUPPLY_RECORD_NUMBER 0x0000001E\r
+#define EFI_MISC_SYSTEM_POWER_SUPPLY_RECORD_NUMBER    0x0000001E\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 // OEM Data Record - SMBIOS Type 0x80-0xFF\r
 //\r
 typedef struct {\r
-  UINT8       Type;\r
-  UINT8       Length;\r
-  UINT16      Handle;\r
+  UINT8                             Type;\r
+  UINT8                             Length;\r
+  UINT16                            Handle;\r
 } SMBIOS_STRUCTURE_HDR;\r
 \r
 typedef struct {\r
-  SMBIOS_STRUCTURE_HDR          Header;\r
-  UINT8                         RawData[1];\r
+  SMBIOS_STRUCTURE_HDR              Header;\r
+  UINT8                             RawData[1];\r
 } EFI_MISC_SMBIOS_STRUCT_ENCAPSULATION_DATA;\r
 \r
-#define EFI_MISC_SMBIOS_STRUCT_ENCAP_RECORD_NUMBER  0x0000001F\r
+#define EFI_MISC_SMBIOS_STRUCT_ENCAP_RECORD_NUMBER    0x0000001F\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 //  Misc. System Event Log  - SMBIOS Type 15\r
 //\r
-#define EFI_MISC_SYSTEM_EVENT_LOG_RECORD_NUMBER 0x00000020\r
-typedef struct {\r
-  //SMBIOS_STRUCTURE_HDR  Header;\r
-  UINT16                LogAreaLength;\r
-  UINT16                LogHeaderStartOffset;\r
-  UINT16                LogDataStartOffset;\r
-  UINT8                 AccessMethod;\r
-  UINT8                 LogStatus;\r
-  UINT32                LogChangeToken;\r
-  UINT32                AccessMethodAddress;\r
-  UINT8                 LogHeaderFormat;\r
-  UINT8                 NumberOfSupportedLogType;\r
-  UINT8                 LengthOfLogDescriptor;\r
+#define EFI_MISC_SYSTEM_EVENT_LOG_RECORD_NUMBER    0x00000020\r
+typedef struct {\r
+  UINT16                            LogAreaLength;\r
+  UINT16                            LogHeaderStartOffset;\r
+  UINT16                            LogDataStartOffset;\r
+  UINT8                             AccessMethod;\r
+  UINT8                             LogStatus;\r
+  UINT32                            LogChangeToken;\r
+  UINT32                            AccessMethodAddress;\r
+  UINT8                             LogHeaderFormat;\r
+  UINT8                             NumberOfSupportedLogType;\r
+  UINT8                             LengthOfLogDescriptor;\r
 } EFI_MISC_SYSTEM_EVENT_LOG_DATA;\r
 \r
 //\r
@@ -1984,20 +1902,18 @@ typedef struct {
 #define ACCESS_MEMORY_MAPPED                  0x03\r
 #define ACCESS_GPNV                           0x04\r
 \r
-//\r
-//////////////////////////////////////////////////////////////////////////////\r
 //\r
 //Management Device Threshold Data Record - SMBIOS Type 36\r
 //\r
-#define EFI_MISC_MANAGEMENT_DEVICE_THRESHOLD_RECORD_NUMBER  0x00000021\r
+#define EFI_MISC_MANAGEMENT_DEVICE_THRESHOLD_RECORD_NUMBER    0x00000021\r
 \r
 typedef struct {\r
-  UINT16                          LowerThresNonCritical;\r
-  UINT16                          UpperThresNonCritical;\r
-  UINT16                          LowerThresCritical;\r
-  UINT16                          UpperThresCritical;\r
-  UINT16                          LowerThresNonRecover;\r
-  UINT16                          UpperThresNonRecover;\r
+  UINT16                            LowerThresNonCritical;\r
+  UINT16                            UpperThresNonCritical;\r
+  UINT16                            LowerThresCritical;\r
+  UINT16                            UpperThresCritical;\r
+  UINT16                            LowerThresNonRecover;\r
+  UINT16                            UpperThresNonRecover;\r
 } EFI_MISC_MANAGEMENT_DEVICE_THRESHOLD;\r
 \r
 //\r
@@ -2071,8 +1987,8 @@ typedef union {
 //\r
 //\r
 typedef struct {\r
-  EFI_SUBCLASS_TYPE1_HEADER       Header;\r
-  EFI_MISC_SUBCLASS_RECORDS       Record;\r
+  EFI_SUBCLASS_TYPE1_HEADER         Header;\r
+  EFI_MISC_SUBCLASS_RECORDS         Record;\r
 } EFI_MISC_SUBCLASS_DRIVER_DATA;\r
 \r
 #pragma pack()\r
index 0a4ae2171ca2ae3913b7d52622cef8f7a8c300cd..570c2bc7d7b350bc6b9b809973f7bad22f5b4f1b 100644 (file)
 typedef\r
 VOID\r
 (EFIAPI *EFI_AP_PROCEDURE)(\r
-  IN  VOID                              *Buffer\r
+  IN  VOID                          *Buffer\r
   );\r
 \r
 typedef struct {\r
-  EFI_TABLE_HEADER              Hdr;\r
-\r
+  EFI_TABLE_HEADER                  Hdr;\r
   //\r
   // Time services\r
   //\r
-  EFI_GET_TIME                  GetTime;\r
-  EFI_SET_TIME                  SetTime;\r
-  EFI_GET_WAKEUP_TIME           GetWakeupTime;\r
-  EFI_SET_WAKEUP_TIME           SetWakeupTime;\r
-\r
+  EFI_GET_TIME                      GetTime;\r
+  EFI_SET_TIME                      SetTime;\r
+  EFI_GET_WAKEUP_TIME               GetWakeupTime;\r
+  EFI_SET_WAKEUP_TIME               SetWakeupTime;\r
   //\r
   // Virtual memory services\r
   //\r
-  EFI_SET_VIRTUAL_ADDRESS_MAP   SetVirtualAddressMap;\r
-  EFI_CONVERT_POINTER           ConvertPointer;\r
-\r
+  EFI_SET_VIRTUAL_ADDRESS_MAP       SetVirtualAddressMap;\r
+  EFI_CONVERT_POINTER               ConvertPointer;\r
   //\r
   // Variable services\r
   //\r
-  EFI_GET_VARIABLE              GetVariable;\r
-  EFI_GET_NEXT_VARIABLE_NAME    GetNextVariableName;\r
-  EFI_SET_VARIABLE              SetVariable;\r
-\r
+  EFI_GET_VARIABLE                  GetVariable;\r
+  EFI_GET_NEXT_VARIABLE_NAME        GetNextVariableName;\r
+  EFI_SET_VARIABLE                  SetVariable;\r
   //\r
   // Misc\r
   //\r
-  EFI_GET_NEXT_HIGH_MONO_COUNT  GetNextHighMonotonicCount;\r
-  EFI_RESET_SYSTEM              ResetSystem;\r
-\r
+  EFI_GET_NEXT_HIGH_MONO_COUNT      GetNextHighMonotonicCount;\r
+  EFI_RESET_SYSTEM                  ResetSystem;\r
   //\r
   // Framework extension to UEFI 2.0 runtime table\r
   // It was moved to a protocol to not conflict with UEFI 2.0\r
   //\r
-  EFI_REPORT_STATUS_CODE        ReportStatusCode;\r
+  EFI_REPORT_STATUS_CODE            ReportStatusCode;\r
 } FRAMEWORK_EFI_RUNTIME_SERVICES;\r
 \r
 #define EFI_EVENT_RUNTIME_CONTEXT       0x20000000\r
@@ -77,18 +72,16 @@ typedef struct {
 #define EFI_EVENT_SIGNAL_READY_TO_BOOT  0x00000203\r
 #define EFI_EVENT_SIGNAL_LEGACY_BOOT    0x00000204\r
 \r
-\r
 typedef struct {\r
-  EFI_DEVICE_PATH_PROTOCOL  Header;\r
-  EFI_GUID                  TianoSpecificDevicePath;\r
-  UINT32                    Type;\r
+  EFI_DEVICE_PATH_PROTOCOL          Header;\r
+  EFI_GUID                          TianoSpecificDevicePath;\r
+  UINT32                            Type;\r
 } TIANO_DEVICE_PATH;\r
 \r
-#define TIANO_MEDIA_FW_VOL_FILEPATH_DEVICE_PATH_TYPE         0x01\r
+#define TIANO_MEDIA_FW_VOL_FILEPATH_DEVICE_PATH_TYPE    0x01\r
 typedef struct {\r
-  TIANO_DEVICE_PATH     Tiano;\r
-  EFI_GUID              NameGuid;\r
+  TIANO_DEVICE_PATH                 Tiano;\r
+  EFI_GUID                          NameGuid;\r
 } FRAMEWORK_MEDIA_FW_VOL_FILEPATH_DEVICE_PATH;\r
 \r
-\r
 #endif\r
index 7c257c69ded737eb04af0779f57e6130cfb88692..7f7512a59f10fe1203834a00b18e6829f829dd2e 100644 (file)
 // Define values for the flags fields in some VFR opcodes. These are\r
 // bitmasks.\r
 //\r
-#define FRAMEWORK_EFI_IFR_FLAG_DEFAULT              0x01\r
-#define FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING        0x02\r
-#define FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE          0x04\r
-#define FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS            0x08\r
-#define FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED       0x10\r
-#define FRAMEWORK_EFI_IFR_FLAG_LATE_CHECK           0x20\r
+#define FRAMEWORK_EFI_IFR_FLAG_DEFAULT            0x01\r
+#define FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING      0x02\r
+#define FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE        0x04\r
+#define FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS          0x08\r
+#define FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED     0x10\r
+#define FRAMEWORK_EFI_IFR_FLAG_LATE_CHECK         0x20\r
 \r
 #define EFI_NON_DEVICE_CLASS              0x00  // Useful when you do not want something in the Device Manager\r
 #define EFI_DISK_DEVICE_CLASS             0x01\r
 // IFR Structure definitions\r
 //\r
 typedef struct {\r
-  UINT8 OpCode;\r
-  UINT8 Length;\r
+  UINT8                             OpCode;\r
+  UINT8                             Length;\r
 } FRAMEWORK_EFI_IFR_OP_HEADER;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER     Header;\r
-  EFI_GUID              Guid;\r
-  STRING_REF            FormSetTitle;\r
-  STRING_REF            Help;\r
-  EFI_PHYSICAL_ADDRESS  CallbackHandle;\r
-  UINT16                Class;\r
-  UINT16                SubClass;\r
-  UINT16                NvDataSize; // set once, size of the NV data as defined in the script\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  EFI_GUID                          Guid;\r
+  STRING_REF                        FormSetTitle;\r
+  STRING_REF                        Help;\r
+  EFI_PHYSICAL_ADDRESS              CallbackHandle;\r
+  UINT16                            Class;\r
+  UINT16                            SubClass;\r
+  UINT16                            NvDataSize; // set once, size of the NV data as defined in the script\r
 } FRAMEWORK_EFI_IFR_FORM_SET;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-  UINT16            FormId;\r
-  STRING_REF        FormTitle;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  UINT16                            FormId;\r
+  STRING_REF                        FormTitle;\r
 } FRAMEWORK_EFI_IFR_FORM;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-  UINT16            LabelId;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  UINT16                            LabelId;\r
 } FRAMEWORK_EFI_IFR_LABEL;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-  STRING_REF        SubTitle;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  STRING_REF                        SubTitle;\r
 } FRAMEWORK_EFI_IFR_SUBTITLE;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-  STRING_REF        Help;\r
-  STRING_REF        Text;\r
-  STRING_REF        TextTwo;\r
-  UINT8             Flags;          // This is included solely for purposes of interactive/dynamic support.\r
-  UINT16            Key;            // Value to be passed to caller to identify this particular op-code\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  STRING_REF                        Help;\r
+  STRING_REF                        Text;\r
+  STRING_REF                        TextTwo;\r
+  UINT8                             Flags;  // This is included solely for purposes of interactive/dynamic support.\r
+  UINT16                            Key;    // Value to be passed to caller to identify this particular op-code\r
 } FRAMEWORK_EFI_IFR_TEXT;\r
 \r
 //\r
 // goto\r
 //\r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-  UINT16            FormId;\r
-  STRING_REF        Prompt;\r
-  STRING_REF        Help;   // The string Token for the context-help\r
-  UINT8             Flags;  // This is included solely for purposes of interactive/dynamic support.\r
-  UINT16            Key;    // Value to be passed to caller to identify this particular op-code\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  UINT16                            FormId;\r
+  STRING_REF                        Prompt;\r
+  STRING_REF                        Help;   // The string Token for the context-help\r
+  UINT8                             Flags;  // This is included solely for purposes of interactive/dynamic support.\r
+  UINT16                            Key;    // Value to be passed to caller to identify this particular op-code\r
 } FRAMEWORK_EFI_IFR_REF;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
 } FRAMEWORK_EFI_IFR_END_FORM;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
 } FRAMEWORK_EFI_IFR_END_FORM_SET;\r
 \r
 //\r
-// Also notice that the IFR_ONE_OF and IFR_CHECK_BOX are identical in structure......code assumes this to be true, if this ever\r
-// changes we need to revisit the InitializeTagStructures code\r
+// Also notice that the IFR_ONE_OF and IFR_CHECK_BOX are identical in structure......\r
+// code assumes this to be true, if this ever changes we need to revisit the InitializeTagStructures code\r
 //\r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-  UINT16            QuestionId; // The ID designating what the question is about...sucked in from a #define, likely in the form of a variable name\r
-  UINT8             Width;      // The Size of the Data being saved\r
-  STRING_REF        Prompt;     // The String Token for the Prompt\r
-  STRING_REF        Help;       // The string Token for the context-help\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  UINT16                            QuestionId; // The ID designating what the question is about...\r
+  UINT8                             Width;      // The Size of the Data being saved\r
+  STRING_REF                        Prompt;     // The String Token for the Prompt\r
+  STRING_REF                        Help;       // The string Token for the context-help\r
 } FRAMEWORK_EFI_IFR_ONE_OF;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-  UINT16            QuestionId; // The offset in NV for storage of the data\r
-  UINT8             MaxEntries; // The maximum number of options in the ordered list (=size of NVStore)\r
-  STRING_REF        Prompt;     // The string token for the prompt\r
-  STRING_REF        Help;       // The string token for the context-help\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  UINT16                            QuestionId; // The offset in NV for storage of the data\r
+  UINT8                             MaxEntries; // The maximum number of options in the ordered list (=size of NVStore)\r
+  STRING_REF                        Prompt;     // The string token for the prompt\r
+  STRING_REF                        Help;       // The string token for the context-help\r
 } FRAMEWORK_EFI_IFR_ORDERED_LIST;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-  UINT16            QuestionId; // The ID designating what the question is about...sucked in from a #define, likely in the form of a variable name\r
-  UINT8             Width;      // The Size of the Data being saved\r
-  STRING_REF        Prompt;     // The String Token for the Prompt\r
-  STRING_REF        Help;       // The string Token for the context-help\r
-  UINT8             Flags;      // For now, if non-zero, means that it is the default option, - further definition likely\r
-  UINT16            Key;        // Value to be passed to caller to identify this particular op-code\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  UINT16                            QuestionId; // The ID designating what the question is about...\r
+  UINT8                             Width;      // The Size of the Data being saved\r
+  STRING_REF                        Prompt;     // The String Token for the Prompt\r
+  STRING_REF                        Help;       // The string Token for the context-help\r
+  UINT8                             Flags;      // If non-zero, means that it is the default option\r
+  UINT16                            Key;        // Value to be passed to caller to identify this particular op-code\r
 } FRAMEWORK_EFI_IFR_CHECKBOX, FRAMEWORK_EFI_IFR_CHECK_BOX;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-  STRING_REF        Option;     // The string token describing the option\r
-  UINT16            Value;      // The value associated with this option that is stored in the NVRAM if chosen\r
-  UINT8             Flags;      // For now, if non-zero, means that it is the default option, - further definition likely above\r
-  UINT16            Key;        // Value to be passed to caller to identify this particular op-code\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  STRING_REF                        Option; // The string token describing the option\r
+  UINT16                            Value;  // The value associated with this option that is stored in the NVRAM\r
+  UINT8                             Flags;  // If non-zero, means that it is the default option\r
+  UINT16                            Key;    // Value to be passed to caller to identify this particular op-code\r
 } FRAMEWORK_EFI_IFR_ONE_OF_OPTION;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-  UINT16            QuestionId; // The ID designating what the question is about...sucked in from a #define, likely in the form of a variable name\r
-  UINT8             Width;      // The Size of the Data being saved\r
-  STRING_REF        Prompt;     // The String Token for the Prompt\r
-  STRING_REF        Help;       // The string Token for the context-help\r
-  UINT8             Flags;      // This is included solely for purposes of interactive/dynamic support.\r
-  UINT16            Key;        // Value to be passed to caller to identify this particular op-code\r
-  UINT16            Minimum;\r
-  UINT16            Maximum;\r
-  UINT16            Step;       // If step is 0, then manual input is specified, otherwise, left/right arrow selection is called for\r
-  UINT16            Default;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  UINT16                            QuestionId; // The ID designating what the question is about...\r
+  UINT8                             Width;      // The Size of the Data being saved\r
+  STRING_REF                        Prompt;     // The String Token for the Prompt\r
+  STRING_REF                        Help;       // The string Token for the context-help\r
+  UINT8                             Flags;      // This is included solely for purposes of interactive/dynamic support.\r
+  UINT16                            Key;        // Value to be passed to caller to identify this particular op-code\r
+  UINT16                            Minimum;\r
+  UINT16                            Maximum;\r
+  UINT16                            Step;       // Zero means manual input, otherwise, arrow selection is called for\r
+  UINT16                            Default;\r
 } FRAMEWORK_EFI_IFR_NUMERIC;\r
 \r
 //\r
-// There is an interesting twist with regards to Time and Date.  This is one of the few items which can accept input from\r
-// a user, however may or may not need to use storage in the NVRAM space.  The decided method for determining if NVRAM space\r
-// will be used (only for a TimeOp or DateOp) is:  If .QuestionId == 0 && .Width == 0 (normally an impossibility) then use system\r
-// resources to store the data away and not NV resources.  In other words, the setup engine will call gRT->SetTime, and gRT->SetDate\r
-// for the saving of data, and the values displayed will be from the gRT->GetXXXX series of calls.\r
+// There is an interesting twist with regards to Time and Date.  This is one of the few items which can accept input\r
+// from a user, however may or may not need to use storage in the NVRAM space.  The decided method for determining \r
+// if NVRAM space will be used (only for a TimeOp or DateOp) is:  If .QuestionId == 0 && .Width == 0 (normally an \r
+// impossibility) then use system resources to store the data away and not NV resources.  In other words, the setup\r
+// engine will call gRT->SetTime, and gRT->SetDate for the saving of data, and the values displayed will be from the\r
+// gRT->GetXXXX series of calls.\r
 //\r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_NUMERIC Hour;\r
-  FRAMEWORK_EFI_IFR_NUMERIC Minute;\r
-  FRAMEWORK_EFI_IFR_NUMERIC Second;\r
+  FRAMEWORK_EFI_IFR_NUMERIC         Hour;\r
+  FRAMEWORK_EFI_IFR_NUMERIC         Minute;\r
+  FRAMEWORK_EFI_IFR_NUMERIC         Second;\r
 } FRAMEWORK_EFI_IFR_TIME;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_NUMERIC Year;\r
-  FRAMEWORK_EFI_IFR_NUMERIC Month;\r
-  FRAMEWORK_EFI_IFR_NUMERIC Day;\r
+  FRAMEWORK_EFI_IFR_NUMERIC         Year;\r
+  FRAMEWORK_EFI_IFR_NUMERIC         Month;\r
+  FRAMEWORK_EFI_IFR_NUMERIC         Day;\r
 } FRAMEWORK_EFI_IFR_DATE;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-  UINT16            QuestionId;   // The ID designating what the question is about...sucked in from a #define, likely in the form of a variable name\r
-  UINT8             Width;        // The Size of the Data being saved  @bug -- remove someday\r
-  STRING_REF        Prompt;       // The String Token for the Prompt\r
-  STRING_REF        Help;         // The string Token for the context-help\r
-  UINT8             Flags;        // This is included solely for purposes of interactive/dynamic support.\r
-  UINT16            Key;          // Value to be passed to caller to identify this particular op-code\r
-  UINT8             MinSize;      // Minimum allowable sized password\r
-  UINT8             MaxSize;      // Maximum allowable sized password\r
-  UINT16            Encoding;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  UINT16                            QuestionId;// The ID designating what the question is about...\r
+  UINT8                             Width;     // The Size of the Data being saved\r
+  STRING_REF                        Prompt;    // The String Token for the Prompt\r
+  STRING_REF                        Help;      // The string Token for the context-help\r
+  UINT8                             Flags;     // This is included solely for purposes of interactive/dynamic support.\r
+  UINT16                            Key;       // Value to be passed to caller to identify this particular op-code\r
+  UINT8                             MinSize;   // Minimum allowable sized password\r
+  UINT8                             MaxSize;   // Maximum allowable sized password\r
+  UINT16                            Encoding;\r
 } FRAMEWORK_EFI_IFR_PASSWORD;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-  UINT16            QuestionId;   // The ID designating what the question is about...sucked in from a #define, likely in the form of a variable name\r
-  UINT8             Width;        // The Size of the Data being saved  @bug -- remove someday\r
-  STRING_REF        Prompt;       // The String Token for the Prompt\r
-  STRING_REF        Help;         // The string Token for the context-help\r
-  UINT8             Flags;        // This is included solely for purposes of interactive/dynamic support.\r
-  UINT16            Key;          // Value to be passed to caller to identify this particular op-code\r
-  UINT8             MinSize;      // Minimum allowable sized password\r
-  UINT8             MaxSize;      // Maximum allowable sized password\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  UINT16                            QuestionId; // The ID designating what the question is about...\r
+  UINT8                             Width;      // The Size of the Data being saved \r
+  STRING_REF                        Prompt;     // The String Token for the Prompt\r
+  STRING_REF                        Help;       // The string Token for the context-help\r
+  UINT8                             Flags;      // This is included solely for purposes of interactive/dynamic support.\r
+  UINT16                            Key;        // Value to be passed to caller to identify this particular op-code\r
+  UINT8                             MinSize;    // Minimum allowable sized password\r
+  UINT8                             MaxSize;    // Maximum allowable sized password\r
 } FRAMEWORK_EFI_IFR_STRING;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
 } FRAMEWORK_EFI_IFR_END_ONE_OF;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-  UINT16            Value;\r
-  UINT16            Key;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  UINT16                            Value;\r
+  UINT16                            Key;\r
 } FRAMEWORK_EFI_IFR_HIDDEN;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-  UINT8             Flags;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  UINT8                             Flags;\r
 } FRAMEWORK_EFI_IFR_SUPPRESS;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-  UINT8             Flags;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  UINT8                             Flags;\r
 } FRAMEWORK_EFI_IFR_GRAY_OUT;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-  STRING_REF        Popup;\r
-  UINT8             Flags;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  STRING_REF                        Popup;\r
+  UINT8                             Flags;\r
 } FRAMEWORK_EFI_IFR_INCONSISTENT;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-  UINT16            QuestionId;   // offset into variable storage\r
-  UINT8             Width;        // size of variable storage\r
-  UINT16            Value;        // value to compare against\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  UINT16                            QuestionId;   // offset into variable storage\r
+  UINT8                             Width;        // size of variable storage\r
+  UINT16                            Value;        // value to compare against\r
 } FRAMEWORK_EFI_IFR_EQ_ID_VAL;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-  UINT16            QuestionId;   // offset into variable storage\r
-  UINT8             Width;        // size of variable storage\r
-  UINT16            ListLength;\r
-  UINT16            ValueList[1];\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  UINT16                            QuestionId;   // offset into variable storage\r
+  UINT8                             Width;        // size of variable storage\r
+  UINT16                            ListLength;\r
+  UINT16                            ValueList[1];\r
 } FRAMEWORK_EFI_IFR_EQ_ID_LIST;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-  UINT16            QuestionId1;  // offset into variable storage for first value to compare\r
-  UINT8             Width;        // size of variable storage (must be same for both)\r
-  UINT16            QuestionId2;  // offset into variable storage for second value to compare\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  UINT16                            QuestionId1;  // offset into variable storage for first value to compare\r
+  UINT8                             Width;        // size of variable storage (must be same for both)\r
+  UINT16                            QuestionId2;  // offset into variable storage for second value to compare\r
 } FRAMEWORK_EFI_IFR_EQ_ID_ID;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-  UINT16            VariableId;   // offset into variable storage\r
-  UINT16            Value;        // value to compare against\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  UINT16                            VariableId;   // offset into variable storage\r
+  UINT16                            Value;        // value to compare against\r
 } FRAMEWORK_EFI_IFR_EQ_VAR_VAL;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
 } FRAMEWORK_EFI_IFR_AND;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
 } FRAMEWORK_EFI_IFR_OR;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
 } FRAMEWORK_EFI_IFR_NOT;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
 } FRAMEWORK_EFI_IFR_END_EXPR, FRAMEWORK_EFI_IFR_END_IF;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-  UINT16            FormId;\r
-  STRING_REF        Prompt;\r
-  STRING_REF        Help;\r
-  UINT8             Flags;\r
-  UINT16            Key;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  UINT16                            FormId;\r
+  STRING_REF                        Prompt;\r
+  STRING_REF                        Help;\r
+  UINT8                             Flags;\r
+  UINT16                            Key;\r
 } FRAMEWORK_EFI_IFR_SAVE_DEFAULTS;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-  STRING_REF        Help;\r
-  STRING_REF        Text;\r
-  STRING_REF        TextTwo;      // optional text\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  STRING_REF                        Help;\r
+  STRING_REF                        Text;\r
+  STRING_REF                        TextTwo; // optional text\r
 } FRAMEWORK_EFI_IFR_INVENTORY;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-  EFI_GUID          Guid;         // GUID for the variable\r
-  UINT16            VarId;        // variable store ID, as referenced elsewhere in the form\r
-  UINT16            Size;         // size of the variable storage\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  EFI_GUID                          Guid;    // GUID for the variable\r
+  UINT16                            VarId;   // variable store ID, as referenced elsewhere in the form\r
+  UINT16                            Size;    // size of the variable storage\r
 } FRAMEWORK_EFI_IFR_VARSTORE;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-  UINT16            VarId;        // variable store ID, as referenced elsewhere in the form\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  UINT16                            VarId;   // variable store ID, as referenced elsewhere in the form\r
 } FRAMEWORK_EFI_IFR_VARSTORE_SELECT;\r
 \r
 //\r
@@ -372,25 +373,25 @@ typedef struct {
 // IFR opcodes use the VarId as defined here.\r
 //\r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-  UINT16            VarId;          // variable store ID, as referenced elsewhere in the form\r
-  UINT16            SecondaryVarId; // variable store ID, as referenced elsewhere in the form\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  UINT16                            VarId;          // variable store ID, as referenced elsewhere in the form\r
+  UINT16                            SecondaryVarId; // variable store ID, as referenced elsewhere in the form\r
 } FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
 } FRAMEWORK_EFI_IFR_TRUE;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
 } FRAMEWORK_EFI_IFR_FALSE;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
 } FRAMEWORK_EFI_IFR_GT;\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
 } FRAMEWORK_EFI_IFR_GE;\r
 \r
 //\r
@@ -399,10 +400,10 @@ typedef struct {
 #define FRAMEWORK_EFI_IFR_RESTORE_DEFAULTS  FRAMEWORK_EFI_IFR_SAVE_DEFAULTS\r
 \r
 typedef struct {\r
-  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-  STRING_REF        Title;        // The string token for the banner title\r
-  UINT16            LineNumber;   // 1-based line number\r
-  UINT8             Alignment;    // left, center, or right-aligned\r
+  FRAMEWORK_EFI_IFR_OP_HEADER       Header;\r
+  STRING_REF                        Title;        // The string token for the banner title\r
+  UINT16                            LineNumber;   // 1-based line number\r
+  UINT8                             Alignment;    // left, center, or right-aligned\r
 } FRAMEWORK_EFI_IFR_BANNER;\r
 \r
 #define FRAMEWORK_EFI_IFR_BANNER_ALIGN_LEFT   0\r
index cdc419d0ea6bef4549a272ee6479d354e9ec9f11..193451e49316c7135df36ef8077f85cd06463dfe 100644 (file)
 //\r
 // Capsule volume HOB -- identical to a firmware volume\r
 //\r
-#define EFI_HOB_TYPE_CV 0x0008\r
+#define EFI_HOB_TYPE_CV           0x0008\r
 \r
 typedef struct {\r
-  EFI_HOB_GENERIC_HEADER  Header;\r
-  EFI_PHYSICAL_ADDRESS    BaseAddress;\r
-  UINT64                  Length;\r
+  EFI_HOB_GENERIC_HEADER            Header;\r
+  EFI_PHYSICAL_ADDRESS              BaseAddress;\r
+  UINT64                            Length;\r
 } EFI_HOB_CAPSULE_VOLUME;\r
 \r
 #endif\r
index 186c63bf32988071efea16ffbdabdc917052e03e..e31844249aa36411d453877dd4ba0fd92c97c7f2 100644 (file)
 \r
 #include <Base.h>\r
 \r
-//\r
-// All structures defined in this header file are packed on byte boundary\r
-//\r
 #pragma pack(1)\r
 \r
-typedef UINT8 SERIAL_MODE;\r
-typedef UINT8 PARALLEL_MODE;\r
+typedef UINT8                       SERIAL_MODE;\r
+typedef UINT8                       PARALLEL_MODE;\r
 \r
-///////////////////////////////////////////////////////////////////////////////\r
+//\r
 // EFI_COMPATIBILITY16_TABLE is located at a 16-byte boundary starting with the\r
 // signature "$EFI"\r
-///////////////////////////////////////////////////////////////////////////////\r
-\r
+//\r
 #define EFI_COMPATIBILITY16_TABLE_SIGNATURE SIGNATURE_32 ('I', 'F', 'E', '$')\r
-\r
 typedef struct {\r
-  UINT32  Signature;      // "$EFI"\r
-  UINT8   TableChecksum;\r
-  UINT8   TableLength;\r
-  UINT8   EfiMajorRevision;\r
-  UINT8   EfiMinorRevision;\r
-  UINT8   TableMajorRevision;\r
-  UINT8   TableMinorRevision;\r
-  UINT16  Reserved;\r
-  UINT16  Compatibility16CallSegment;\r
-  UINT16  Compatibility16CallOffset;\r
-  UINT16  PnPInstallationCheckSegment;\r
-  UINT16  PnPInstallationCheckOffset;\r
-  UINT32  EfiSystemTable; // The physical address of EFI_SYSTEM_TABLE\r
-  UINT32  OemIdStringPointer;\r
-  UINT32  AcpiRsdPtrPointer;\r
-  UINT16  OemRevision;\r
-  UINT32  E820Pointer;\r
-  UINT32  E820Length;\r
-  UINT32  IrqRoutingTablePointer;\r
-  UINT32  IrqRoutingTableLength;\r
-  UINT32  MpTablePtr;\r
-  UINT32  MpTableLength;\r
-  UINT16  OemIntSegment;\r
-  UINT16  OemIntOffset;\r
-  UINT16  Oem32Segment;\r
-  UINT16  Oem32Offset;\r
-  UINT16  Oem16Segment;\r
-  UINT16  Oem16Offset;\r
-  UINT16  TpmSegment;\r
-  UINT16  TpmOffset;\r
-  UINT32  IbvPointer;\r
-  UINT32  PciExpressBase;\r
-  UINT8   LastPciBus;\r
+  UINT32                            Signature;\r
+  UINT8                             TableChecksum;\r
+  UINT8                             TableLength;\r
+  UINT8                             EfiMajorRevision;\r
+  UINT8                             EfiMinorRevision;\r
+  UINT8                             TableMajorRevision;\r
+  UINT8                             TableMinorRevision;\r
+  UINT16                            Reserved;\r
+  UINT16                            Compatibility16CallSegment;\r
+  UINT16                            Compatibility16CallOffset;\r
+  UINT16                            PnPInstallationCheckSegment;\r
+  UINT16                            PnPInstallationCheckOffset;\r
+  UINT32                            EfiSystemTable; // The physical address of EFI_SYSTEM_TABLE\r
+  UINT32                            OemIdStringPointer;\r
+  UINT32                            AcpiRsdPtrPointer;\r
+  UINT16                            OemRevision;\r
+  UINT32                            E820Pointer;\r
+  UINT32                            E820Length;\r
+  UINT32                            IrqRoutingTablePointer;\r
+  UINT32                            IrqRoutingTableLength;\r
+  UINT32                            MpTablePtr;\r
+  UINT32                            MpTableLength;\r
+  UINT16                            OemIntSegment;\r
+  UINT16                            OemIntOffset;\r
+  UINT16                            Oem32Segment;\r
+  UINT16                            Oem32Offset;\r
+  UINT16                            Oem16Segment;\r
+  UINT16                            Oem16Offset;\r
+  UINT16                            TpmSegment;\r
+  UINT16                            TpmOffset;\r
+  UINT32                            IbvPointer;\r
+  UINT32                            PciExpressBase;\r
+  UINT8                             LastPciBus;\r
 } EFI_COMPATIBILITY16_TABLE;\r
 \r
-///////////////////////////////////////////////////////////////////////////////\r
+//\r
 // Functions provided by the CSM binary\r
-///////////////////////////////////////////////////////////////////////////////\r
+//\r
 typedef enum {\r
   Legacy16InitializeYourself    = 0x0000,\r
   Legacy16UpdateBbs             = 0x0001,\r
@@ -91,34 +86,34 @@ typedef enum {
   Legacy16InstallPciHandler     = 0x0008\r
 } EFI_COMPATIBILITY_FUNCTIONS;\r
 \r
-///////////////////////////////////////////////////////////////////////////////\r
+//\r
 // EFI_TO_COMPATIBILITY16_INIT_TABLE\r
-///////////////////////////////////////////////////////////////////////////////\r
+//\r
 typedef struct {\r
-  UINT32  BiosLessThan1MB;\r
-  UINT32  HiPmmMemory;\r
-  UINT32  HiPmmMemorySizeInBytes;\r
-  UINT16  ReverseThunkCallSegment;\r
-  UINT16  ReverseThunkCallOffset;\r
-  UINT32  NumberE820Entries;\r
-  UINT32  OsMemoryAbove1Mb;\r
-  UINT32  ThunkStart;\r
-  UINT32  ThunkSizeInBytes;\r
-  UINT32  LowPmmMemory;\r
-  UINT32  LowPmmMemorySizeInBytes;\r
+  UINT32                            BiosLessThan1MB;\r
+  UINT32                            HiPmmMemory;\r
+  UINT32                            HiPmmMemorySizeInBytes;\r
+  UINT16                            ReverseThunkCallSegment;\r
+  UINT16                            ReverseThunkCallOffset;\r
+  UINT32                            NumberE820Entries;\r
+  UINT32                            OsMemoryAbove1Mb;\r
+  UINT32                            ThunkStart;\r
+  UINT32                            ThunkSizeInBytes;\r
+  UINT32                            LowPmmMemory;\r
+  UINT32                            LowPmmMemorySizeInBytes;\r
 } EFI_TO_COMPATIBILITY16_INIT_TABLE;\r
 \r
-///////////////////////////////////////////////////////////////////////////////\r
+//\r
 // EFI_TO_COMPATIBILITY16_BOOT_TABLE\r
-///////////////////////////////////////////////////////////////////////////////\r
+//\r
 \r
 //\r
 // DEVICE_PRODUCER_SERIAL & its modes\r
 //\r
 typedef struct {\r
-  UINT16      Address;\r
-  UINT8       Irq;\r
-  SERIAL_MODE Mode;\r
+  UINT16                            Address;\r
+  UINT8                             Irq;\r
+  SERIAL_MODE                       Mode;\r
 } DEVICE_PRODUCER_SERIAL;\r
 \r
 #define DEVICE_SERIAL_MODE_NORMAL               0x00\r
@@ -131,10 +126,10 @@ typedef struct {
 // DEVICE_PRODUCER_PARALLEL & its modes\r
 //\r
 typedef struct {\r
-  UINT16        Address;\r
-  UINT8         Irq;\r
-  UINT8         Dma;\r
-  PARALLEL_MODE Mode;\r
+  UINT16                            Address;\r
+  UINT8                             Irq;\r
+  UINT8                             Dma;\r
+  PARALLEL_MODE                     Mode;\r
 } DEVICE_PRODUCER_PARALLEL;\r
 \r
 #define DEVICE_PARALLEL_MODE_MODE_OUTPUT_ONLY   0x00\r
@@ -146,52 +141,52 @@ typedef struct {
 // DEVICE_PRODUCER_FLOPPY\r
 //\r
 typedef struct {\r
-  UINT16  Address;\r
-  UINT8   Irq;\r
-  UINT8   Dma;\r
-  UINT8   NumberOfFloppy;\r
+  UINT16                            Address;\r
+  UINT8                             Irq;\r
+  UINT8                             Dma;\r
+  UINT8                             NumberOfFloppy;\r
 } DEVICE_PRODUCER_FLOPPY;\r
 \r
 //\r
 // LEGACY_DEVICE_FLAGS\r
 //\r
 typedef struct {\r
-  UINT32  A20Kybd : 1;\r
-  UINT32  A20Port90 : 1;\r
-  UINT32  Reserved : 30;\r
+  UINT32                            A20Kybd : 1;\r
+  UINT32                            A20Port90 : 1;\r
+  UINT32                            Reserved : 30;\r
 } LEGACY_DEVICE_FLAGS;\r
 \r
 //\r
 // DEVICE_PRODUCER_DATA_HEADER\r
 //\r
 typedef struct {\r
-  DEVICE_PRODUCER_SERIAL    Serial[4];\r
-  DEVICE_PRODUCER_PARALLEL  Parallel[3];\r
-  DEVICE_PRODUCER_FLOPPY    Floppy;\r
-  UINT8                     MousePresent;\r
-  LEGACY_DEVICE_FLAGS       Flags;\r
+  DEVICE_PRODUCER_SERIAL            Serial[4];\r
+  DEVICE_PRODUCER_PARALLEL          Parallel[3];\r
+  DEVICE_PRODUCER_FLOPPY            Floppy;\r
+  UINT8                             MousePresent;\r
+  LEGACY_DEVICE_FLAGS               Flags;\r
 } DEVICE_PRODUCER_DATA_HEADER;\r
 \r
 //\r
 // ATAPI_IDENTIFY\r
 //\r
 typedef struct {\r
-  UINT16  Raw[256];\r
+  UINT16                            Raw[256];\r
 } ATAPI_IDENTIFY;\r
 \r
 //\r
 // HDD_INFO & its status\r
 //\r
 typedef struct {\r
-  UINT16          Status;\r
-  UINT32          Bus;\r
-  UINT32          Device;\r
-  UINT32          Function;\r
-  UINT16          CommandBaseAddress;\r
-  UINT16          ControlBaseAddress;\r
-  UINT16          BusMasterAddress;\r
-  UINT8           HddIrq;\r
-  ATAPI_IDENTIFY  IdentifyDrive[2];\r
+  UINT16                            Status;\r
+  UINT32                            Bus;\r
+  UINT32                            Device;\r
+  UINT32                            Function;\r
+  UINT16                            CommandBaseAddress;\r
+  UINT16                            ControlBaseAddress;\r
+  UINT16                            BusMasterAddress;\r
+  UINT8                             HddIrq;\r
+  ATAPI_IDENTIFY                    IdentifyDrive[2];\r
 } HDD_INFO;\r
 \r
 #define HDD_PRIMARY               0x01\r
@@ -207,52 +202,52 @@ typedef struct {
 // BBS_STATUS_FLAGS\r
 //\r
 typedef struct {\r
-  UINT16  OldPosition : 4;\r
-  UINT16  Reserved1 : 4;\r
-  UINT16  Enabled : 1;\r
-  UINT16  Failed : 1;\r
-  UINT16  MediaPresent : 2;\r
-  UINT16  Reserved2 : 4;\r
+  UINT16                            OldPosition : 4;\r
+  UINT16                            Reserved1 : 4;\r
+  UINT16                            Enabled : 1;\r
+  UINT16                            Failed : 1;\r
+  UINT16                            MediaPresent : 2;\r
+  UINT16                            Reserved2 : 4;\r
 } BBS_STATUS_FLAGS;\r
 \r
 //\r
 // BBS_TABLE, device type values & boot priority values\r
 //\r
 typedef struct {\r
-  UINT16            BootPriority;\r
-  UINT32            Bus;\r
-  UINT32            Device;\r
-  UINT32            Function;\r
-  UINT8             Class;\r
-  UINT8             SubClass;\r
-  UINT16            MfgStringOffset;\r
-  UINT16            MfgStringSegment;\r
-  UINT16            DeviceType;\r
-  BBS_STATUS_FLAGS  StatusFlags;\r
-  UINT16            BootHandlerOffset;\r
-  UINT16            BootHandlerSegment;\r
-  UINT16            DescStringOffset;\r
-  UINT16            DescStringSegment;\r
-  UINT32            InitPerReserved;\r
-  UINT32            AdditionalIrq13Handler;\r
-  UINT32            AdditionalIrq18Handler;\r
-  UINT32            AdditionalIrq19Handler;\r
-  UINT32            AdditionalIrq40Handler;\r
-  UINT8             AssignedDriveNumber;\r
-  UINT32            AdditionalIrq41Handler;\r
-  UINT32            AdditionalIrq46Handler;\r
-  UINT32            IBV1;\r
-  UINT32            IBV2;\r
+  UINT16                            BootPriority;\r
+  UINT32                            Bus;\r
+  UINT32                            Device;\r
+  UINT32                            Function;\r
+  UINT8                             Class;\r
+  UINT8                             SubClass;\r
+  UINT16                            MfgStringOffset;\r
+  UINT16                            MfgStringSegment;\r
+  UINT16                            DeviceType;\r
+  BBS_STATUS_FLAGS                  StatusFlags;\r
+  UINT16                            BootHandlerOffset;\r
+  UINT16                            BootHandlerSegment;\r
+  UINT16                            DescStringOffset;\r
+  UINT16                            DescStringSegment;\r
+  UINT32                            InitPerReserved;\r
+  UINT32                            AdditionalIrq13Handler;\r
+  UINT32                            AdditionalIrq18Handler;\r
+  UINT32                            AdditionalIrq19Handler;\r
+  UINT32                            AdditionalIrq40Handler;\r
+  UINT8                             AssignedDriveNumber;\r
+  UINT32                            AdditionalIrq41Handler;\r
+  UINT32                            AdditionalIrq46Handler;\r
+  UINT32                            IBV1;\r
+  UINT32                            IBV2;\r
 } BBS_TABLE;\r
 \r
-#define BBS_FLOPPY        0x01\r
-#define BBS_HARDDISK      0x02\r
-#define BBS_CDROM         0x03\r
-#define BBS_PCMCIA        0x04\r
-#define BBS_USB           0x05\r
-#define BBS_EMBED_NETWORK 0x06\r
-#define BBS_BEV_DEVICE    0x80\r
-#define BBS_UNKNOWN       0xff\r
+#define BBS_FLOPPY              0x01\r
+#define BBS_HARDDISK            0x02\r
+#define BBS_CDROM               0x03\r
+#define BBS_PCMCIA              0x04\r
+#define BBS_USB                 0x05\r
+#define BBS_EMBED_NETWORK       0x06\r
+#define BBS_BEV_DEVICE          0x80\r
+#define BBS_UNKNOWN             0xff\r
 \r
 #define BBS_DO_NOT_BOOT_FROM    0xFFFC\r
 #define BBS_LOWEST_PRIORITY     0xFFFD\r
@@ -263,10 +258,10 @@ typedef struct {
 // SMM_ATTRIBUTES & relating type, port and data size constants\r
 //\r
 typedef struct {\r
-  UINT16  Type : 3;\r
-  UINT16  PortGranularity : 3;\r
-  UINT16  DataGranularity : 3;\r
-  UINT16  Reserved : 7;\r
+  UINT16                            Type : 3;\r
+  UINT16                            PortGranularity : 3;\r
+  UINT16                            DataGranularity : 3;\r
+  UINT16                            Reserved : 7;\r
 } SMM_ATTRIBUTES;\r
 \r
 #define STANDARD_IO       0x00\r
@@ -286,8 +281,8 @@ typedef struct {
 // SMM_FUNCTION & relating constants\r
 //\r
 typedef struct {\r
-  UINT16  Function : 15;\r
-  UINT16  Owner : 1;\r
+  UINT16                            Function : 15;\r
+  UINT16                            Owner : 1;\r
 } SMM_FUNCTION;\r
 \r
 #define INT15_D042        0x0000\r
@@ -304,41 +299,41 @@ typedef struct {
 // properly to reflect that assumption.\r
 //\r
 typedef struct {\r
-  SMM_ATTRIBUTES  SmmAttributes;\r
-  SMM_FUNCTION    SmmFunction;\r
-  UINT8           SmmPort;\r
-  UINT8           SmmData;\r
+  SMM_ATTRIBUTES                    SmmAttributes;\r
+  SMM_FUNCTION                      SmmFunction;\r
+  UINT8                             SmmPort;\r
+  UINT8                             SmmData;\r
 } SMM_ENTRY;\r
 \r
 //\r
 // SMM_TABLE\r
 //\r
 typedef struct {\r
-  UINT16    NumSmmEntries;\r
-  SMM_ENTRY SmmEntry;\r
+  UINT16                            NumSmmEntries;\r
+  SMM_ENTRY                         SmmEntry;\r
 } SMM_TABLE;\r
 \r
 //\r
 // UDC_ATTRIBUTES\r
 //\r
 typedef struct {\r
-  UINT8 DirectoryServiceValidity : 1;\r
-  UINT8 RabcaUsedFlag : 1;\r
-  UINT8 ExecuteHddDiagnosticsFlag : 1;\r
-  UINT8 Reserved : 5;\r
+  UINT8                             DirectoryServiceValidity : 1;\r
+  UINT8                             RabcaUsedFlag : 1;\r
+  UINT8                             ExecuteHddDiagnosticsFlag : 1;\r
+  UINT8                             Reserved : 5;\r
 } UDC_ATTRIBUTES;\r
 \r
 //\r
 // UD_TABLE\r
 //\r
 typedef struct {\r
-  UDC_ATTRIBUTES  Attributes;\r
-  UINT8           DeviceNumber;\r
-  UINT8           BbsTableEntryNumberForParentDevice;\r
-  UINT8           BbsTableEntryNumberForBoot;\r
-  UINT8           BbsTableEntryNumberForHddDiag;\r
-  UINT8           BeerData[128];\r
-  UINT8           ServiceAreaData[64];\r
+  UDC_ATTRIBUTES                    Attributes;\r
+  UINT8                             DeviceNumber;\r
+  UINT8                             BbsTableEntryNumberForParentDevice;\r
+  UINT8                             BbsTableEntryNumberForBoot;\r
+  UINT8                             BbsTableEntryNumberForHddDiag;\r
+  UINT8                             BeerData[128];\r
+  UINT8                             ServiceAreaData[64];\r
 } UD_TABLE;\r
 \r
 //\r
@@ -349,61 +344,55 @@ typedef struct {
 #define MAX_IDE_CONTROLLER          8\r
 \r
 typedef struct {\r
-  UINT16                      MajorVersion;\r
-  UINT16                      MinorVersion;\r
-  UINT32                      AcpiTable;   // 4 GB range\r
-  UINT32                      SmbiosTable; // 4 GB range\r
-  UINT32                      SmbiosTableLength;\r
-\r
+  UINT16                            MajorVersion;\r
+  UINT16                            MinorVersion;\r
+  UINT32                            AcpiTable;   // 4 GB range\r
+  UINT32                            SmbiosTable; // 4 GB range\r
+  UINT32                            SmbiosTableLength;\r
   //\r
   // Legacy SIO state\r
   //\r
-  DEVICE_PRODUCER_DATA_HEADER SioData;\r
-\r
-  UINT16                      DevicePathType;\r
-  UINT16                      PciIrqMask;\r
-  UINT32                      NumberE820Entries;\r
-\r
+  DEVICE_PRODUCER_DATA_HEADER       SioData;\r
+  UINT16                            DevicePathType;\r
+  UINT16                            PciIrqMask;\r
+  UINT32                            NumberE820Entries;\r
   //\r
   // Controller & Drive Identify[2] per controller information\r
   //\r
-  HDD_INFO                    HddInfo[MAX_IDE_CONTROLLER];\r
-\r
-  UINT32                      NumberBbsEntries;\r
-  UINT32                      BbsTable;\r
-  UINT32                      SmmTable;\r
-  UINT32                      OsMemoryAbove1Mb;\r
-  UINT32                      UnconventionalDeviceTable;\r
+  HDD_INFO                          HddInfo[MAX_IDE_CONTROLLER];\r
+  UINT32                            NumberBbsEntries;\r
+  UINT32                            BbsTable;\r
+  UINT32                            SmmTable;\r
+  UINT32                            OsMemoryAbove1Mb;\r
+  UINT32                            UnconventionalDeviceTable;\r
 } EFI_TO_COMPATIBILITY16_BOOT_TABLE;\r
 \r
-///////////////////////////////////////////////////////////////////////////////\r
+//\r
 // EFI_LEGACY_INSTALL_PCI_HANDLER\r
-///////////////////////////////////////////////////////////////////////////////\r
+//\r
 typedef struct {\r
-  UINT8   PciBus;\r
-  UINT8   PciDeviceFun;\r
-  UINT8   PciSegment;\r
-  UINT8   PciClass;\r
-  UINT8   PciSubclass;\r
-  UINT8   PciInterface;\r
-\r
+  UINT8                             PciBus;\r
+  UINT8                             PciDeviceFun;\r
+  UINT8                             PciSegment;\r
+  UINT8                             PciClass;\r
+  UINT8                             PciSubclass;\r
+  UINT8                             PciInterface;\r
   //\r
   // Primary section\r
   //\r
-  UINT8   PrimaryIrq;\r
-  UINT8   PrimaryReserved;\r
-  UINT16  PrimaryControl;\r
-  UINT16  PrimaryBase;\r
-  UINT16  PrimaryBusMaster;\r
-\r
+  UINT8                             PrimaryIrq;\r
+  UINT8                             PrimaryReserved;\r
+  UINT16                            PrimaryControl;\r
+  UINT16                            PrimaryBase;\r
+  UINT16                            PrimaryBusMaster;\r
   //\r
   // Secondary Section\r
   //\r
-  UINT8   SecondaryIrq;\r
-  UINT8   SecondaryReserved;\r
-  UINT16  SecondaryControl;\r
-  UINT16  SecondaryBase;\r
-  UINT16  SecondaryBusMaster;\r
+  UINT8                             SecondaryIrq;\r
+  UINT8                             SecondaryReserved;\r
+  UINT16                            SecondaryControl;\r
+  UINT16                            SecondaryBase;\r
+  UINT16                            SecondaryBusMaster;\r
 } EFI_LEGACY_INSTALL_PCI_HANDLER;\r
 \r
 //\r
index 60d182c456ded13b686ec9ed391f3a64592c719e..bcaf54e9e9066266d256afff856fc28c11b1cb96 100644 (file)
@@ -36,8 +36,8 @@ typedef struct _FRAMEWORK_EFI_PEI_SERVICES FRAMEWORK_EFI_PEI_SERVICES;
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEIM_ENTRY_POINT)(\r
-  IN EFI_FFS_FILE_HEADER       *FfsHeader,\r
-  IN EFI_PEI_SERVICES          **PeiServices\r
+  IN EFI_FFS_FILE_HEADER            *FfsHeader,\r
+  IN EFI_PEI_SERVICES               **PeiServices\r
   );\r
   \r
 /**\r
@@ -58,9 +58,9 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_FFS_FIND_NEXT_VOLUME)(\r
-  IN FRAMEWORK_EFI_PEI_SERVICES      **PeiServices,\r
-  IN UINTN                           Instance,\r
-  IN OUT EFI_FIRMWARE_VOLUME_HEADER  **FwVolHeader\r
+  IN FRAMEWORK_EFI_PEI_SERVICES     **PeiServices,\r
+  IN UINTN                          Instance,\r
+  IN OUT EFI_FIRMWARE_VOLUME_HEADER **FwVolHeader\r
   );\r
     \r
 /**\r
@@ -76,18 +76,18 @@ EFI_STATUS
   @param  FileHeader       Pointer to the current file from which to begin searching.This pointer will be \r
                            updated upon return to reflect the file found.\r
 \r
-  @retval EFI_SUCCESS           The file was found.\r
-  @retval EFI_NOT_FOUND         The file was not found.\r
-  @retval EFI_NOT_FOUND         The header checksum was not zero.\r
+  @retval EFI_SUCCESS      The file was found.\r
+  @retval EFI_NOT_FOUND    The file was not found.\r
+  @retval EFI_NOT_FOUND    The header checksum was not zero.\r
 \r
 **/\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_FFS_FIND_NEXT_FILE)(\r
-  IN FRAMEWORK_EFI_PEI_SERVICES  **PeiServices,\r
-  IN EFI_FV_FILETYPE             SearchType,\r
-  IN EFI_FIRMWARE_VOLUME_HEADER  *FwVolHeader,\r
-  IN OUT EFI_FFS_FILE_HEADER     **FileHeader\r
+  IN FRAMEWORK_EFI_PEI_SERVICES     **PeiServices,\r
+  IN EFI_FV_FILETYPE                SearchType,\r
+  IN EFI_FIRMWARE_VOLUME_HEADER     *FwVolHeader,\r
+  IN OUT EFI_FFS_FILE_HEADER        **FileHeader\r
   );\r
 \r
 /**\r
@@ -99,72 +99,73 @@ EFI_STATUS
   @param  FfsFileHeader    A pointer to the file header that contains the set of sections to be searched.\r
   @param  SectionData      A pointer to the discovered section, if successful.\r
 \r
-  @retval EFI_SUCCESS           The section was found.\r
-  @retval EFI_NOT_FOUND         The section was not found.\r
+  @retval EFI_SUCCESS      The section was found.\r
+  @retval EFI_NOT_FOUND    The section was not found.\r
 \r
 **/\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_PEI_FFS_FIND_SECTION_DATA)(\r
-  IN FRAMEWORK_EFI_PEI_SERVICES  **PeiServices,\r
-  IN EFI_SECTION_TYPE            SectionType,\r
-  IN EFI_FFS_FILE_HEADER         *FfsFileHeader,\r
-  IN OUT VOID                    **SectionData\r
+  IN FRAMEWORK_EFI_PEI_SERVICES     **PeiServices,\r
+  IN EFI_SECTION_TYPE               SectionType,\r
+  IN EFI_FFS_FILE_HEADER            *FfsFileHeader,\r
+  IN OUT VOID                       **SectionData\r
   );\r
         \r
 struct _FRAMEWORK_EFI_PEI_SERVICES {\r
-  EFI_TABLE_HEADER            Hdr;\r
+  EFI_TABLE_HEADER                  Hdr;\r
   //\r
   // PPI Functions\r
   //\r
-  EFI_PEI_INSTALL_PPI         InstallPpi;\r
-  EFI_PEI_REINSTALL_PPI       ReInstallPpi;\r
-  EFI_PEI_LOCATE_PPI          LocatePpi;\r
-  EFI_PEI_NOTIFY_PPI          NotifyPpi;\r
+  EFI_PEI_INSTALL_PPI               InstallPpi;\r
+  EFI_PEI_REINSTALL_PPI             ReInstallPpi;\r
+  EFI_PEI_LOCATE_PPI                LocatePpi;\r
+  EFI_PEI_NOTIFY_PPI                NotifyPpi;\r
   //\r
   // Boot Mode Functions\r
   //\r
-  EFI_PEI_GET_BOOT_MODE       GetBootMode;\r
-  EFI_PEI_SET_BOOT_MODE       SetBootMode;\r
+  EFI_PEI_GET_BOOT_MODE             GetBootMode;\r
+  EFI_PEI_SET_BOOT_MODE             SetBootMode;\r
   //\r
   // HOB Functions\r
   //\r
-  EFI_PEI_GET_HOB_LIST        GetHobList;\r
-  EFI_PEI_CREATE_HOB          CreateHob;\r
+  EFI_PEI_GET_HOB_LIST              GetHobList;\r
+  EFI_PEI_CREATE_HOB                CreateHob;\r
   //\r
   // Firmware Volume Functions\r
   //\r
-  EFI_PEI_FFS_FIND_NEXT_VOLUME   FfsFindNextVolume;\r
-  EFI_PEI_FFS_FIND_NEXT_FILE     FfsFindNextFile;\r
-  EFI_PEI_FFS_FIND_SECTION_DATA  FfsFindSectionData;\r
+  EFI_PEI_FFS_FIND_NEXT_VOLUME      FfsFindNextVolume;\r
+  EFI_PEI_FFS_FIND_NEXT_FILE        FfsFindNextFile;\r
+  EFI_PEI_FFS_FIND_SECTION_DATA     FfsFindSectionData;\r
   //\r
   // PEI Memory Functions\r
   //\r
-  EFI_PEI_INSTALL_PEI_MEMORY  InstallPeiMemory;\r
-  EFI_PEI_ALLOCATE_PAGES      AllocatePages;\r
-  EFI_PEI_ALLOCATE_POOL       AllocatePool;\r
-  EFI_PEI_COPY_MEM            CopyMem;\r
-  EFI_PEI_SET_MEM             SetMem;\r
+  EFI_PEI_INSTALL_PEI_MEMORY        InstallPeiMemory;\r
+  EFI_PEI_ALLOCATE_PAGES            AllocatePages;\r
+  EFI_PEI_ALLOCATE_POOL             AllocatePool;\r
+  EFI_PEI_COPY_MEM                  CopyMem;\r
+  EFI_PEI_SET_MEM                   SetMem;\r
   //\r
   // Status Code\r
-  EFI_PEI_REPORT_STATUS_CODE  ReportStatusCode;\r
+  //\r
+  EFI_PEI_REPORT_STATUS_CODE        ReportStatusCode;\r
   //\r
   // Reset\r
   //\r
-  EFI_PEI_RESET_SYSTEM        ResetSystem;\r
+  EFI_PEI_RESET_SYSTEM              ResetSystem;\r
   //\r
   // (the following interfaces are installed by publishing PEIM)\r
   //\r
   // I/O Abstractions\r
   //\r
-  EFI_PEI_CPU_IO_PPI          *CpuIo;\r
-  EFI_PEI_PCI_CFG_PPI        *PciCfg;\r
+  EFI_PEI_CPU_IO_PPI                *CpuIo;\r
+  EFI_PEI_PCI_CFG_PPI               *PciCfg;\r
 };\r
 \r
 typedef struct {\r
-  UINTN                   BootFirmwareVolume;\r
-  UINTN                   SizeOfCacheAsRam;\r
-  EFI_PEI_PPI_DESCRIPTOR  *DispatchTable;\r
+  UINTN                             BootFirmwareVolume;\r
+  UINTN                             SizeOfCacheAsRam;\r
+  EFI_PEI_PPI_DESCRIPTOR            *DispatchTable;\r
 } EFI_PEI_STARTUP_DESCRIPTOR;\r
 \r
 #endif  \r
index 91b9d08a080852e25a7f798f9cb1eb2c7fa1f784..0f2d3de067744cadad5a3b867cc87f469cc9e3f1 100644 (file)
@@ -6,13 +6,12 @@
 \r
 <pre>\r
   Section:    Contents:\r
-  1           General Status Code Definitions\r
-  2           Class definitions\r
-  3           Computing Unit Subclasses, Progress and Error Codes\r
-  4           Peripheral Subclasses, Progress and Error Codes.\r
-  5           IO Bus Subclasses, Progress and Error Codes.\r
-  6           Software Subclasses, Progress and Error Codes.\r
-  7           Debug Codes\r
+  1           Class definitions\r
+  2           Computing Unit Subclasses, Progress and Error Codes\r
+  3           Peripheral Subclasses, Progress and Error Codes.\r
+  4           IO Bus Subclasses, Progress and Error Codes.\r
+  5           Software Subclasses, Progress and Error Codes.\r
+  6           Debug Codes\r
 </pre>\r
 \r
   Copyright (c) 2007, Intel Corporation\r
 #include <PiPei.h>\r
 \r
 //\r
-// /////////////////////////////////////////////////////////////////////////////\r
 // Section 1\r
-///////////////////////////////////////////////////////////////////////////////\r
-//\r
 // Class definitions\r
 // Values of 4-127 are reserved for future use by this\r
 // specification.\r
 #define EFI_SUBCLASS_SPECIFIC 0x1000\r
 #define EFI_OEM_SPECIFIC      0x8000\r
 \r
-//\r
-// /////////////////////////////////////////////////////////////////////////////\r
+// \r
 // Section 2\r
-///////////////////////////////////////////////////////////////////////////////\r
-//\r
 // Computing Unit Subclass definitions.\r
 // Values of 8-127 are reserved for future use by this\r
 // specification.\r
 // Computing Unit Chipset Subclass Error Code definitions.\r
 //\r
 \r
-///////////////////////////////////////////////////////////////////////////////\r
-// Section 4\r
-///////////////////////////////////////////////////////////////////////////////\r
 //\r
+// Section 3\r
 // Peripheral Subclass definitions.\r
 // Values of 12-127 are reserved for future use by this\r
 // specification.\r
 // Peripheral Class Network Subclass Error Code definitions.\r
 //\r
 \r
-///////////////////////////////////////////////////////////////////////////////\r
-// Section 5\r
-///////////////////////////////////////////////////////////////////////////////\r
 //\r
+// Section 4\r
 // IO Bus Subclass definitions.\r
 // Values of 14-127 are reserved for future use by this\r
 // specification.\r
 // IO Bus Class I2C Subclass Error Code definitions.\r
 //\r
 \r
-///////////////////////////////////////////////////////////////////////////////\r
-// Section 6\r
-///////////////////////////////////////////////////////////////////////////////\r
 //\r
+// Section 5\r
 // Software Subclass definitions.\r
 // Values of 14-127 are reserved for future use by this\r
 // specification.\r
 // Software Class EFI DXE Service Subclass Error Code definitions.\r
 //\r
 \r
-///////////////////////////////////////////////////////////////////////////////\r
-// Section 7\r
-///////////////////////////////////////////////////////////////////////////////\r
 //\r
+// Section 6\r
 // Debug Code definitions for all classes and subclass\r
 // Only one debug code is defined at this point and should\r
 // be used for anything that gets sent to debug stream.\r