Modify the structure name to follows spec.

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

diff --git a/IntelFrameworkPkg/Include/Framework/DataHubRecords.h b/IntelFrameworkPkg/Include/Framework/DataHubRecords.h
index 474cf85748cad3461259f201c846a92b7586d2b8..1c2e598359aefb293e4c0c64f3497342785ba729 100644 (file)
--- a/IntelFrameworkPkg/Include/Framework/DataHubRecords.h
+++ b/IntelFrameworkPkg/Include/Framework/DataHubRecords.h
@@ -1,4 +1,4 @@
-/** @file\r
+  /** @file\r
   This file defines GUIDs and associated data structures for records posted to the Data Hub.\r
   The producers of these records use these definitions to construct records.\r
   The consumers of these records use these definitions to retrieve, filter and parse records.\r
@@ -1538,43 +1538,38 @@ typedef struct {
 //\r
 // Portable Battery - SMBIOS Type 22\r
 //\r
-#define EFI_MISC_BATTERY_LOCATION_RECORD_NUMBER  0x00000010\r
+#define EFI_MISC_PORTABLE_BATTERY_RECORD_NUMBER 0x00000010\r
 \r
-typedef enum {\r
-  EfiBatteryDeviceChemistryTypeOther               = 0x01,\r
-  EfiBatteryDeviceChemistryTypeUnknown             = 0x02,\r
-  EfiBatteryDeviceChemistryTypeLeadAcid            = 0x03,\r
-  EfiBatteryDeviceChemistryTypeNickelCadmium       = 0x04,\r
-  EfiBatteryDeviceChemistryTypeNickelMetalHydride  = 0x05,\r
-  EfiBatteryDeviceChemistryTypeLithiumIon          = 0x06,\r
-  EfiBatteryDeviceChemistryTypeZincAir             = 0x07,\r
-  EfiBatteryDeviceChemistryTypeLithiumPolymer      = 0x08,\r
-} EFI_MISC_BATTERY_DEVICE_CHEMISTRY;\r
-\r
-typedef struct  {\r
-  UINT32 Date              :5;\r
-  UINT32 Month             :4;\r
-  UINT32 Year              :7;\r
-  UINT32 Reserved          :16;\r
-} EFI_MISC_BATTERY_SBDS_MANUFACTURE_DATE;\r
-\r
-typedef struct {\r
-  STRING_REF                         BatteryLocation;\r
-  STRING_REF                         BatteryManufacturer;\r
-  STRING_REF                         BatteryManufactureDate;\r
-  STRING_REF                         BatterySerialNumber;\r
-  STRING_REF                         BatteryDeviceName;\r
-  STRING_REF                         BatterySbdsVersionNumber;\r
-  STRING_REF                         BatterySbdsDeviceChemistry;\r
-  EFI_MISC_BATTERY_DEVICE_CHEMISTRY  BatteryDeviceChemistry;\r
-  EFI_EXP_BASE10_DATA                BatteryDesignCapacity;\r
-  EFI_EXP_BASE10_DATA                BatteryDesignVoltage;\r
-  UINT16                             BatteryMaximumError;\r
-  UINT16                             BatterySbdsSerialNumber;\r
-  EFI_MISC_BATTERY_SBDS_MANUFACTURE_DATE\r
-                                     BatterySbdsManufacturingDate;\r
-  UINT32                             BatteryOemSpecific;\r
-} EFI_MISC_BATTERY_LOCATION_DATA;\r
+typedef enum {  \r
+  EfiPortableBatteryDeviceChemistryOther = 1,\r
+  EfiPortableBatteryDeviceChemistryUnknown = 2,\r
+  EfiPortableBatteryDeviceChemistryLeadAcid = 3,\r
+  EfiPortableBatteryDeviceChemistryNickelCadmium = 4,\r
+  EfiPortableBatteryDeviceChemistryNickelMetalHydride = 5,\r
+  EfiPortableBatteryDeviceChemistryLithiumIon = 6,\r
+  EfiPortableBatteryDeviceChemistryZincAir = 7,\r
+  EfiPortableBatteryDeviceChemistryLithiumPolymer = 8,\r
+} 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
+} EFI_MISC_PORTABLE_BATTERY;\r
 \r
 //\r
 //////////////////////////////////////////////////////////////////////////////\r
@@ -1921,7 +1916,7 @@ typedef struct {
 } POWER_SUPPLY_CHARACTERISTICS;\r
 \r
 typedef struct {\r
-  UINT8                           PowerUnitGroup;\r
+  UINT16                          PowerUnitGroup;\r
   STRING_REF                      PowerSupplyLocation;\r
   STRING_REF                      PowerSupplyDeviceName;\r
   STRING_REF                      PowerSupplyManufacturer;\r
@@ -2025,6 +2020,14 @@ typedef EFI_MISC_BIS_ENTRY_POINT_DATA                     EFI_MISC_BIS_ENTRY_POI
 typedef EFI_MISC_BOOT_INFORMATION_STATUS_DATA             EFI_MISC_BOOT_INFORMATION_STATUS;\r
 typedef EFI_MISC_SYSTEM_POWER_SUPPLY_DATA                 EFI_MISC_SYSTEM_POWER_SUPPLY;\r
 typedef EFI_MISC_SMBIOS_STRUCT_ENCAPSULATION_DATA         EFI_MISC_SMBIOS_STRUCT_ENCAPSULATION;\r
+typedef EFI_MISC_SCHEDULED_POWER_ON_MONTH_DATA            EFI_MISC_SCHEDULED_POWER_ON_MONTH;\r
+typedef EFI_MISC_VOLTAGE_PROBE_DESCRIPTION_DATA           EFI_MISC_VOLTAGE_PROBE_DESCRIPTION;\r
+typedef EFI_MISC_COOLING_DEVICE_TEMP_LINK_DATA            EFI_MISC_COOLING_DEVICE_TEMP_LINK;\r
+typedef EFI_MISC_TEMPERATURE_PROBE_DESCRIPTION_DATA       EFI_MISC_TEMPERATURE_PROBE_DESCRIPTION;\r
+typedef EFI_MISC_REMOTE_ACCESS_MANUFACTURER_DESCRIPTION_DATA \r
+                                                          EFI_MISC_REMOTE_ACCESS_MANUFACTURER_DESCRIPTION;\r
+typedef EFI_MISC_MANAGEMENT_DEVICE_DESCRIPTION_DATA       EFI_MISC_MANAGEMENT_DEVICE_DESCRIPTION;\r
+typedef EFI_MISC_ELECTRICAL_CURRENT_PROBE_DESCRIPTION_DATA EFI_MISC_ELECTRICAL_CURRENT_PROBE_DESCRIPTION;\r
 \r
 typedef union {\r
   EFI_MISC_LAST_PCI_BUS_DATA                         LastPciBus;\r