real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

smbios: add support for structures 34,35,36,39,41 (found on rather new BIOS)

Browse Source 
This was SVN commit r9377.
This commit is contained in:
janwas 2011-05-01 12:18:45 +00:00
parent f88c61911b
commit 88c44c7d73
2 changed files with 147 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/lib/sysdep/smbios.cpp
View File

@ -358,6 +358,24 @@ void Fixup<TemperatureProbe>(TemperatureProbe& p)
p.status = (Status)bits(p.locationAndStatus, 5, 7);
}
template<>
void Fixup<SystemPowerSupply>(SystemPowerSupply& p)
{
p.type = (SystemPowerSupplyType)bits(p.characteristics, 10, 13);
p.status = (Status)bits(p.characteristics, 7, 9);
p.inputSwitching = (SystemPowerSupplyInputSwitching)bits(p.characteristics, 3, 6);
p.characteristics = bits(p.characteristics, 0, 2);
}
template<>
void Fixup<OnboardDevices2>(OnboardDevices2& p)
{
p.enabled = IsBitSet(p.type, 7);
p.type = (OnBoardDeviceType)bits(p.type, 0, 6);
p.deviceNumber = bits(p.functionAndDeviceNumber, 3, 7);
p.functionNumber = bits(p.functionAndDeviceNumber, 0, 2);
}
//-----------------------------------------------------------------------------
// InitStructures

135
source/lib/sysdep/smbios.h
View File

@ -72,8 +72,12 @@ namespace SMBIOS {
ENUMERATION(VoltageProbeLocation, u8)\
ENUMERATION(CoolingDeviceType, u8)\
ENUMERATION(TemperatureProbeLocation, u8)\
ENUMERATION(SystemBootStatus, u8)
ENUMERATION(SystemBootStatus, u8)\
ENUMERATION(ManagementDeviceType, u8)\
ENUMERATION(ManagementDeviceAddressType, u8)\
ENUMERATION(SystemPowerSupplyCharacteristics, u16)\
ENUMERATION(SystemPowerSupplyType, u8)\
ENUMERATION(SystemPowerSupplyInputSwitching, u8)
// to introduce another structure:
// 1) add its name and ID here
@ -103,10 +107,14 @@ namespace SMBIOS {
STRUCTURE(CoolingDevice, 27)\
STRUCTURE(TemperatureProbe, 28)\
/* ElectricalCurrentProbe (29), OutOfBandRemoteAccess (30), BootIntegrityServices (31) are optional */\
STRUCTURE(SystemBoot, 32)
/* MemoryError64 (33), ManagementDevice (34), ManagementDeviceComponent (35), ManagementDeviceThreshold (36) are optional */
/* MemoryChannel (37), IpmiDevice (38), SystemPowerSupply (39), Additional (40), OnboardDevices2 (41) are optional */
/* ManagementControllerHostInterface (42) is optional */
STRUCTURE(SystemBoot, 32)\
STRUCTURE(ManagementDevice, 34)\
STRUCTURE(ManagementDeviceComponent, 35)\
STRUCTURE(ManagementDeviceThreshold, 36)\
STRUCTURE(SystemPowerSupply, 39)\
STRUCTURE(OnboardDevices2, 41)\
/* MemoryError64 (33), MemoryChannel (37), IpmiDevice (38) are optional */
/* Additional (40), ManagementControllerHostInterface (42) are optional */
//-----------------------------------------------------------------------------
@ -1033,6 +1041,121 @@ struct Handle
FIELD(0, SystemBootStatus, status, "")\
//----------------------------------------------------------------------------
// ManagementDevice
#define ManagementDeviceType_ENUMERATORS\
ENUM(other, 1)\
ENUM(unknown, 2)\
ENUM(LM75, 3)\
ENUM(LM78, 4)\
ENUM(LM79, 5)\
ENUM(LM80, 6)\
ENUM(LM81, 7)\
ENUM(ADM9240, 8)\
ENUM(DS1780, 9)\
ENUM(M1617, 0xA)\
ENUM(GL518SM, 0xB)\
ENUM(W83781D, 0xC)\
ENUM(HT82H791, 0xD)\
#define ManagementDeviceAddressType_ENUMERATORS\
ENUM(other, 1)\
ENUM(unknown, 2)\
ENUM(port, 3)\
ENUM(memory, 4)\
ENUM(smbus, 5)
#define ManagementDevice_FIELDS\
FIELD(0, const char*, description, "")\
FIELD(0, ManagementDeviceType, type, "")\
FIELD(0, u32, address, "")\
FIELD(0, ManagementDeviceAddressType, addressType, "")
//----------------------------------------------------------------------------
// ManagementDeviceComponent
#define ManagementDeviceComponent_FIELDS\
FIELD(0, const char*, description, "")\
FIELD(0, Handle, hDevice, "")\
FIELD(0, Handle, hComponent, "")\
FIELD(0, Handle, hThreshold, "")
//----------------------------------------------------------------------------
// ManagementDeviceThreshold
#define ManagementDeviceThreshold_FIELDS\
FIELD(0, i16, nonCriticalLo, "")\
FIELD(0, i16, nonCriticalHi, "")\
FIELD(0, i16, criticalLo, "")\
FIELD(0, i16, criticalHi, "")\
FIELD(0, i16, nonrecoverableLo, "")\
FIELD(0, i16, nonrecoverableHi, "")
//----------------------------------------------------------------------------
// SystemPowerSupply
#define SystemPowerSupplyCharacteristics_ENUMERATORS\
ENUM(hot_replaceable, 1)\
ENUM(present, 2)\
ENUM(unplugged, 4)
#define SystemPowerSupplyType_ENUMERATORS\
ENUM(other, 1)\
ENUM(unknown, 2)\
ENUM(linear, 3)\
ENUM(switching, 4)\
ENUM(battery, 5)\
ENUM(ups, 6)\
ENUM(converter, 7)\
ENUM(regulator, 8)
#define SystemPowerSupplyInputSwitching_ENUMERATORS\
ENUM(other, 1)\
ENUM(unknown, 2)\
ENUM(manual, 3)\
ENUM(auto_switch, 4)\
ENUM(wide_range, 5)\
ENUM(none, 6)
#define SystemPowerSupply_FIELDS\
FIELD(0, u8, group, "")\
FIELD(0, const char*, location, "")\
FIELD(0, const char*, deviceName, "")\
FIELD(0, const char*, manufacturer, "")\
FIELD(0, const char*, serialNumber, "")\
FIELD(0, const char*, assetTag, "")\
FIELD(0, const char*, partNumber, "")\
FIELD(0, const char*, revisionLevel, "")\
FIELD(0, i16, maxPower, " mW")\
FIELD(0, SystemPowerSupplyCharacteristics, characteristics, "")\
FIELD(0, Handle, hVoltageProbe, "")\
FIELD(0, Handle, hCoolingDevice, "")\
FIELD(0, Handle, hCurrentProbe, "")\
FIELD(F_DERIVED, SystemPowerSupplyType, type, "")\
FIELD(F_DERIVED, Status, status, "")\
FIELD(F_DERIVED, SystemPowerSupplyInputSwitching, inputSwitching, "")\
//----------------------------------------------------------------------------
// OnboardDevices2
#define OnboardDevices2_FIELDS\
FIELD(0, const char*, referenceDesignation, "")\
FIELD(0, const char*, deviceName, "")\
FIELD(0, OnBoardDeviceType, type, "")\
FIELD(0, u8, instance, "")\
FIELD(0, u16, groupNumber, "")\
FIELD(0, u8, busNumber, "")\
FIELD(F_INTERNAL, u8, functionAndDeviceNumber, "")\
FIELD(F_DERIVED, bool, enabled, "")\
FIELD(F_DERIVED, u8, deviceNumber, "")\
FIELD(F_DERIVED, u8, functionNumber, "")\
//-----------------------------------------------------------------------------
struct Header