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
This commit is contained in:
klu2
2008-03-14 01:46:44 +00:00
parent 5b4756eacc
commit 765e516c7f

View File

@ -1538,43 +1538,38 @@ typedef struct {
// //
// Portable Battery - SMBIOS Type 22 // Portable Battery - SMBIOS Type 22
// //
#define EFI_MISC_BATTERY_LOCATION_RECORD_NUMBER 0x00000010 #define EFI_MISC_PORTABLE_BATTERY_RECORD_NUMBER 0x00000010
typedef enum { typedef enum {
EfiBatteryDeviceChemistryTypeOther = 0x01, EfiPortableBatteryDeviceChemistryOther = 1,
EfiBatteryDeviceChemistryTypeUnknown = 0x02, EfiPortableBatteryDeviceChemistryUnknown = 2,
EfiBatteryDeviceChemistryTypeLeadAcid = 0x03, EfiPortableBatteryDeviceChemistryLeadAcid = 3,
EfiBatteryDeviceChemistryTypeNickelCadmium = 0x04, EfiPortableBatteryDeviceChemistryNickelCadmium = 4,
EfiBatteryDeviceChemistryTypeNickelMetalHydride = 0x05, EfiPortableBatteryDeviceChemistryNickelMetalHydride = 5,
EfiBatteryDeviceChemistryTypeLithiumIon = 0x06, EfiPortableBatteryDeviceChemistryLithiumIon = 6,
EfiBatteryDeviceChemistryTypeZincAir = 0x07, EfiPortableBatteryDeviceChemistryZincAir = 7,
EfiBatteryDeviceChemistryTypeLithiumPolymer = 0x08, EfiPortableBatteryDeviceChemistryLithiumPolymer = 8,
} EFI_MISC_BATTERY_DEVICE_CHEMISTRY; } EFI_MISC_PORTABLE_BATTERY_DEVICE_CHEMISTRY;
typedef struct { typedef struct {
UINT32 Date :5; STRING_REF Location;
UINT32 Month :4; STRING_REF Manufacturer;
UINT32 Year :7; STRING_REF ManufactureDate;
UINT32 Reserved :16; STRING_REF SerialNumber;
} EFI_MISC_BATTERY_SBDS_MANUFACTURE_DATE; STRING_REF DeviceName;
EFI_MISC_PORTABLE_BATTERY_DEVICE_CHEMISTRY DeviceChemistry;
typedef struct { UINT16 DesignCapacity;
STRING_REF BatteryLocation; UINT16 DesignVoltage;
STRING_REF BatteryManufacturer; STRING_REF SBDSVersionNumber;
STRING_REF BatteryManufactureDate; UINT8 MaximumError;
STRING_REF BatterySerialNumber; UINT16 SBDSSerialNumber;
STRING_REF BatteryDeviceName; UINT16 SBDSManufactureDate;
STRING_REF BatterySbdsVersionNumber; STRING_REF SBDSDeviceChemistry;
STRING_REF BatterySbdsDeviceChemistry; UINT8 DesignCapacityMultiplier;
EFI_MISC_BATTERY_DEVICE_CHEMISTRY BatteryDeviceChemistry; UINT32 OEMSpecific;
EFI_EXP_BASE10_DATA BatteryDesignCapacity; UINT8 BatteryNumber; // Temporary
EFI_EXP_BASE10_DATA BatteryDesignVoltage; BOOLEAN Valid; // Is entry valid - Temporary
UINT16 BatteryMaximumError; } EFI_MISC_PORTABLE_BATTERY;
UINT16 BatterySbdsSerialNumber;
EFI_MISC_BATTERY_SBDS_MANUFACTURE_DATE
BatterySbdsManufacturingDate;
UINT32 BatteryOemSpecific;
} EFI_MISC_BATTERY_LOCATION_DATA;
// //
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
@ -1921,7 +1916,7 @@ typedef struct {
} POWER_SUPPLY_CHARACTERISTICS; } POWER_SUPPLY_CHARACTERISTICS;
typedef struct { typedef struct {
UINT8 PowerUnitGroup; UINT16 PowerUnitGroup;
STRING_REF PowerSupplyLocation; STRING_REF PowerSupplyLocation;
STRING_REF PowerSupplyDeviceName; STRING_REF PowerSupplyDeviceName;
STRING_REF PowerSupplyManufacturer; STRING_REF PowerSupplyManufacturer;
@ -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; typedef EFI_MISC_BOOT_INFORMATION_STATUS_DATA EFI_MISC_BOOT_INFORMATION_STATUS;
typedef EFI_MISC_SYSTEM_POWER_SUPPLY_DATA EFI_MISC_SYSTEM_POWER_SUPPLY; typedef EFI_MISC_SYSTEM_POWER_SUPPLY_DATA EFI_MISC_SYSTEM_POWER_SUPPLY;
typedef EFI_MISC_SMBIOS_STRUCT_ENCAPSULATION_DATA EFI_MISC_SMBIOS_STRUCT_ENCAPSULATION; typedef EFI_MISC_SMBIOS_STRUCT_ENCAPSULATION_DATA EFI_MISC_SMBIOS_STRUCT_ENCAPSULATION;
typedef EFI_MISC_SCHEDULED_POWER_ON_MONTH_DATA EFI_MISC_SCHEDULED_POWER_ON_MONTH;
typedef EFI_MISC_VOLTAGE_PROBE_DESCRIPTION_DATA EFI_MISC_VOLTAGE_PROBE_DESCRIPTION;
typedef EFI_MISC_COOLING_DEVICE_TEMP_LINK_DATA EFI_MISC_COOLING_DEVICE_TEMP_LINK;
typedef EFI_MISC_TEMPERATURE_PROBE_DESCRIPTION_DATA EFI_MISC_TEMPERATURE_PROBE_DESCRIPTION;
typedef EFI_MISC_REMOTE_ACCESS_MANUFACTURER_DESCRIPTION_DATA
EFI_MISC_REMOTE_ACCESS_MANUFACTURER_DESCRIPTION;
typedef EFI_MISC_MANAGEMENT_DEVICE_DESCRIPTION_DATA EFI_MISC_MANAGEMENT_DEVICE_DESCRIPTION;
typedef EFI_MISC_ELECTRICAL_CURRENT_PROBE_DESCRIPTION_DATA EFI_MISC_ELECTRICAL_CURRENT_PROBE_DESCRIPTION;
typedef union { typedef union {
EFI_MISC_LAST_PCI_BUS_DATA LastPciBus; EFI_MISC_LAST_PCI_BUS_DATA LastPciBus;