[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[dmidecode] [PATCH 1/4] Update references to match SMBIOS 2.7.0
|
From: |
Jean Delvare |
|
Subject: |
[dmidecode] [PATCH 1/4] Update references to match SMBIOS 2.7.0 |
|
Date: |
Sat, 13 Nov 2010 20:46:15 +0100 |
Update all references to the SMBIOS specification to match the new
numbering in version 2.7.0 of the document.
---
dmidecode.c | 294 +++++++++++++++++++++++++++++------------------------------
1 file changed, 147 insertions(+), 147 deletions(-)
--- dmidecode.orig/dmidecode.c 2010-11-11 22:13:26.000000000 +0100
+++ dmidecode/dmidecode.c 2010-11-13 10:22:41.000000000 +0100
@@ -2,7 +2,7 @@
* DMI Decode
*
* Copyright (C) 2000-2002 Alan Cox <address@hidden>
- * Copyright (C) 2002-2008 Jean Delvare <address@hidden>
+ * Copyright (C) 2002-2010 Jean Delvare <address@hidden>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -25,8 +25,8 @@
* are deemed to be part of the source code.
*
* Unless specified otherwise, all references are aimed at the "System
- * Management BIOS Reference Specification, Version 2.6.1" document,
- * available from http://www.dmtf.org/standards/smbios/.
+ * Management BIOS Reference Specification, Version 2.7.0" document,
+ * available from http://www.dmtf.org/standards/smbios.
*
* Note to contributors:
* Please reference every value you add or modify, especially if the
@@ -215,7 +215,7 @@ static void dmi_dump(const struct dmi_he
}
/*
- * 3.3.1 BIOS Information (Type 0)
+ * 7.1 BIOS Information (Type 0)
*/
static void dmi_bios_runtime_size(u32 code)
@@ -228,7 +228,7 @@ static void dmi_bios_runtime_size(u32 co
static void dmi_bios_characteristics(u64 code, const char *prefix)
{
- /* 3.3.1.1 */
+ /* 7.1.1 */
static const char *characteristics[] = {
"BIOS characteristics not supported", /* 3 */
"ISA is supported",
@@ -280,7 +280,7 @@ static void dmi_bios_characteristics(u64
static void dmi_bios_characteristics_x1(u8 code, const char *prefix)
{
- /* 3.3.1.2.1 */
+ /* 7.1.2.1 */
static const char *characteristics[] = {
"ACPI is supported", /* 0 */
"USB legacy is supported",
@@ -301,7 +301,7 @@ static void dmi_bios_characteristics_x1(
static void dmi_bios_characteristics_x2(u8 code, const char *prefix)
{
- /* 3.3.1.2.2 */
+ /* 37.1.2.2 */
static const char *characteristics[] = {
"BIOS boot specification is supported", /* 0 */
"Function key-initiated network boot is supported",
@@ -316,7 +316,7 @@ static void dmi_bios_characteristics_x2(
}
/*
- * 3.3.2 System Information (Type 1)
+ * 7.2 System Information (Type 1)
*/
static void dmi_system_uuid(const u8 *p, u16 ver)
@@ -361,7 +361,7 @@ static void dmi_system_uuid(const u8 *p,
static const char *dmi_system_wake_up_type(u8 code)
{
- /* 3.3.2.2 */
+ /* 7.2.2 */
static const char *type[] = {
"Reserved", /* 0x00 */
"Other",
@@ -380,12 +380,12 @@ static const char *dmi_system_wake_up_ty
}
/*
- * 3.3.3 Base Board Information (Type 2)
+ * 7.3 Base Board Information (Type 2)
*/
static void dmi_base_board_features(u8 code, const char *prefix)
{
- /* 3.3.3.1 */
+ /* 7.3.1 */
static const char *features[] = {
"Board is a hosting board", /* 0 */
"Board requires at least one daughter board",
@@ -410,7 +410,7 @@ static void dmi_base_board_features(u8 c
static const char *dmi_base_board_type(u8 code)
{
- /* 3.3.3.2 */
+ /* 7.3.2 */
static const char *type[] = {
"Unknown", /* 0x01 */
"Other",
@@ -444,12 +444,12 @@ static void dmi_base_board_handles(u8 co
}
/*
- * 3.3.4 Chassis Information (Type 3)
+ * 7.4 Chassis Information (Type 3)
*/
static const char *dmi_chassis_type(u8 code)
{
- /* 3.3.4.1 */
+ /* 7.4.1 */
static const char *type[] = {
"Other", /* 0x01 */
"Unknown",
@@ -499,7 +499,7 @@ static const char *dmi_chassis_lock(u8 c
static const char *dmi_chassis_state(u8 code)
{
- /* 3.3.4.2 */
+ /* 7.4.2 */
static const char *state[] = {
"Other", /* 0x01 */
"Unknown",
@@ -516,7 +516,7 @@ static const char *dmi_chassis_state(u8
static const char *dmi_chassis_security_status(u8 code)
{
- /* 3.3.4.3 */
+ /* 7.4.3 */
static const char *status[] = {
"Other", /* 0x01 */
"Unknown",
@@ -570,12 +570,12 @@ static void dmi_chassis_elements(u8 coun
}
/*
- * 3.3.5 Processor Information (Type 4)
+ * 7.5 Processor Information (Type 4)
*/
static const char *dmi_processor_type(u8 code)
{
- /* 3.3.5.1 */
+ /* 7.5.1 */
static const char *type[] = {
"Other", /* 0x01 */
"Unknown",
@@ -596,7 +596,7 @@ static const char *dmi_processor_family(
unsigned int i, low, high;
u16 code;
- /* 3.3.5.2 */
+ /* 7.5.2 */
static struct {
int value;
const char *name;
@@ -984,7 +984,7 @@ static void dmi_processor_id(u8 type, co
static void dmi_processor_voltage(u8 code)
{
- /* 3.3.5.4 */
+ /* 7.5.4 */
static const char *voltage[] = {
"5.0 V", /* 0 */
"3.3 V",
@@ -1033,7 +1033,7 @@ static const char *dmi_processor_status(
static const char *dmi_processor_upgrade(u8 code)
{
- /* 3.3.5.5 */
+ /* 7.5.5 */
static const char *upgrade[] = {
"Other", /* 0x01 */
"Unknown",
@@ -1082,7 +1082,7 @@ static void dmi_processor_cache(u16 code
static void dmi_processor_characteristics(u16 code, const char *prefix)
{
- /* 3.3.5.9 */
+ /* 7.5.9 */
static const char *characteristics[] = {
"64-bit capable" /* 2 */
};
@@ -1101,12 +1101,12 @@ static void dmi_processor_characteristic
}
/*
- * 3.3.6 Memory Controller Information (Type 5)
+ * 7.6 Memory Controller Information (Type 5)
*/
static const char *dmi_memory_controller_ed_method(u8 code)
{
- /* 3.3.6.1 */
+ /* 7.6.1 */
static const char *method[] = {
"Other", /* 0x01 */
"Unknown",
@@ -1125,7 +1125,7 @@ static const char *dmi_memory_controller
static void dmi_memory_controller_ec_capabilities(u8 code, const char *prefix)
{
- /* 3.3.6.2 */
+ /* 7.6.2 */
static const char *capabilities[] = {
"Other", /* 0 */
"Unknown",
@@ -1150,7 +1150,7 @@ static void dmi_memory_controller_ec_cap
static const char *dmi_memory_controller_interleave(u8 code)
{
- /* 3.3.6.3 */
+ /* 7.6.3 */
static const char *interleave[] = {
"Other", /* 0x01 */
"Unknown",
@@ -1168,7 +1168,7 @@ static const char *dmi_memory_controller
static void dmi_memory_controller_speeds(u16 code, const char *prefix)
{
- /* 3.3.6.4 */
+ /* 7.6.4 */
const char *speeds[] = {
"Other", /* 0 */
"Unknown",
@@ -1202,12 +1202,12 @@ static void dmi_memory_controller_slots(
}
/*
- * 3.3.7 Memory Module Information (Type 6)
+ * 7.7 Memory Module Information (Type 6)
*/
static void dmi_memory_module_types(u16 code, const char *sep)
{
- /* 3.3.7.1 */
+ /* 7.7.1 */
static const char *types[] = {
"Other", /* 0 */
"Unknown",
@@ -1257,7 +1257,7 @@ static void dmi_memory_module_speed(u8 c
static void dmi_memory_module_size(u8 code)
{
- /* 3.3.7.2 */
+ /* 7.7.2 */
switch (code & 0x7F)
{
case 0x7D:
@@ -1294,7 +1294,7 @@ static void dmi_memory_module_error(u8 c
}
/*
- * 3.3.8 Cache Information (Type 7)
+ * 7.8 Cache Information (Type 7)
*/
static const char *dmi_cache_mode(u8 code)
@@ -1332,7 +1332,7 @@ static void dmi_cache_size(u16 code)
static void dmi_cache_types(u16 code, const char *sep)
{
- /* 3.3.8.2 */
+ /* 7.8.2 */
static const char *types[] = {
"Other", /* 0 */
"Unknown",
@@ -1357,7 +1357,7 @@ static void dmi_cache_types(u16 code, co
static const char *dmi_cache_ec_type(u8 code)
{
- /* 3.3.8.3 */
+ /* 7.8.3 */
static const char *type[] = {
"Other", /* 0x01 */
"Unknown",
@@ -1374,7 +1374,7 @@ static const char *dmi_cache_ec_type(u8
static const char *dmi_cache_type(u8 code)
{
- /* 3.3.8.4 */
+ /* 7.8.4 */
static const char *type[] = {
"Other", /* 0x01 */
"Unknown",
@@ -1390,7 +1390,7 @@ static const char *dmi_cache_type(u8 cod
static const char *dmi_cache_associativity(u8 code)
{
- /* 3.3.8.5 */
+ /* 7.8.5 */
static const char *type[] = {
"Other", /* 0x01 */
"Unknown",
@@ -1413,12 +1413,12 @@ static const char *dmi_cache_associativi
}
/*
- * 3.3.9 Port Connector Information (Type 8)
+ * 7.9 Port Connector Information (Type 8)
*/
static const char *dmi_port_connector_type(u8 code)
{
- /* 3.3.9.2 */
+ /* 7.9.2 */
static const char *type[] = {
"None", /* 0x00 */
"Centronics",
@@ -1475,7 +1475,7 @@ static const char *dmi_port_connector_ty
static const char *dmi_port_type(u8 code)
{
- /* 3.3.9.3 */
+ /* 7.9.3 */
static const char *type[] = {
"None", /* 0x00 */
"Parallel Port XT/AT Compatible",
@@ -1527,12 +1527,12 @@ static const char *dmi_port_type(u8 code
}
/*
- * 3.3.10 System Slots (Type 9)
+ * 7.10 System Slots (Type 9)
*/
static const char *dmi_slot_type(u8 code)
{
- /* 3.3.10.1 */
+ /* 7.10.1 */
static const char *type[] = {
"Other", /* 0x01 */
"Unknown",
@@ -1583,7 +1583,7 @@ static const char *dmi_slot_type(u8 code
static const char *dmi_slot_bus_width(u8 code)
{
- /* 3.3.10.2 */
+ /* 7.10.2 */
static const char *width[] = {
"", /* 0x01, "Other" */
"", /* "Unknown" */
@@ -1608,7 +1608,7 @@ static const char *dmi_slot_bus_width(u8
static const char *dmi_slot_current_usage(u8 code)
{
- /* 3.3.10.3 */
+ /* 7.10.3 */
static const char *usage[] = {
"Other", /* 0x01 */
"Unknown",
@@ -1623,7 +1623,7 @@ static const char *dmi_slot_current_usag
static const char *dmi_slot_length(u8 code)
{
- /* 3.3.1O.4 */
+ /* 7.1O.4 */
static const char *length[] = {
"Other", /* 0x01 */
"Unknown",
@@ -1638,7 +1638,7 @@ static const char *dmi_slot_length(u8 co
static void dmi_slot_id(u8 code1, u8 code2, u8 type, const char *prefix)
{
- /* 3.3.10.5 */
+ /* 7.10.5 */
switch (type)
{
case 0x04: /* MCA */
@@ -1665,7 +1665,7 @@ static void dmi_slot_id(u8 code1, u8 cod
static void dmi_slot_characteristics(u8 code1, u8 code2, const char *prefix)
{
- /* 3.3.10.6 */
+ /* 7.10.6 */
static const char *characteristics1[] = {
"5.0 V is provided", /* 1 */
"3.3 V is provided",
@@ -1675,7 +1675,7 @@ static void dmi_slot_characteristics(u8
"Zoom Video is supported",
"Modem ring resume is supported" /* 7 */
};
- /* 3.3.10.7 */
+ /* 7.10.7 */
static const char *characteristics2[] = {
"PME signal is supported", /* 0 */
"Hot-plug devices are supported",
@@ -1702,19 +1702,19 @@ static void dmi_slot_characteristics(u8
static void dmi_slot_segment_bus_func(u16 code1, u8 code2, u8 code3, const
char *prefix)
{
- /* 3.3.10.8 */
+ /* 7.10.8 */
if (!(code1 == 0xFFFF && code2 == 0xFF && code3 == 0xFF))
printf("%sBus Address: %04x:%02x:%02x.%x\n",
prefix, code1, code2, code3 >> 3, code3 & 0x7);
}
/*
- * 3.3.11 On Board Devices Information (Type 10)
+ * 7.11 On Board Devices Information (Type 10)
*/
static const char *dmi_on_board_devices_type(u8 code)
{
- /* 3.3.11.1 and 3.3.42.2 */
+ /* 7.11.1 and 7.42.2 */
static const char *type[] = {
"Other", /* 0x01 */
"Unknown",
@@ -1757,7 +1757,7 @@ static void dmi_on_board_devices(const s
}
/*
- * 3.3.12 OEM Strings (Type 11)
+ * 7.12 OEM Strings (Type 11)
*/
static void dmi_oem_strings(const struct dmi_header *h, const char *prefix)
@@ -1772,7 +1772,7 @@ static void dmi_oem_strings(const struct
}
/*
- * 3.3.13 System Configuration Options (Type 12)
+ * 7.13 System Configuration Options (Type 12)
*/
static void dmi_system_configuration_options(const struct dmi_header *h, const
char *prefix)
@@ -1787,7 +1787,7 @@ static void dmi_system_configuration_opt
}
/*
- * 3.3.14 BIOS Language Information (Type 13)
+ * 7.14 BIOS Language Information (Type 13)
*/
static void dmi_bios_languages(const struct dmi_header *h, const char *prefix)
@@ -1802,7 +1802,7 @@ static void dmi_bios_languages(const str
}
/*
- * 3.3.15 Group Associations (Type 14)
+ * 7.15 Group Associations (Type 14)
*/
static void dmi_group_associations_items(u8 count, const u8 *p, const char
*prefix)
@@ -1818,7 +1818,7 @@ static void dmi_group_associations_items
}
/*
- * 3.3.16 System Event Log (Type 15)
+ * 7.16 System Event Log (Type 15)
*/
static const char *dmi_event_log_method(u8 code)
@@ -1855,7 +1855,7 @@ static void dmi_event_log_status(u8 code
static void dmi_event_log_address(u8 method, const u8 *p)
{
- /* 3.3.16.3 */
+ /* 7.16.3 */
switch (method)
{
case 0x00:
@@ -1890,7 +1890,7 @@ static const char *dmi_event_log_header_
static const char *dmi_event_log_descriptor_type(u8 code)
{
- /* 3.3.16.6.1 */
+ /* 7.16.6.1 */
static const char *type[] = {
NULL, /* 0x00 */
"Single-bit ECC memory error",
@@ -1929,7 +1929,7 @@ static const char *dmi_event_log_descrip
static const char *dmi_event_log_descriptor_format(u8 code)
{
- /* 3.3.16.6.2 */
+ /* 7.16.6.2 */
static const char *format[] = {
"None", /* 0x00 */
"Handle",
@@ -1949,7 +1949,7 @@ static const char *dmi_event_log_descrip
static void dmi_event_log_descriptors(u8 count, u8 len, const u8 *p, const
char *prefix)
{
- /* 3.3.16.1 */
+ /* 7.16.1 */
int i;
for (i = 0; i < count; i++)
@@ -1965,12 +1965,12 @@ static void dmi_event_log_descriptors(u8
}
/*
- * 3.3.17 Physical Memory Array (Type 16)
+ * 7.17 Physical Memory Array (Type 16)
*/
static const char *dmi_memory_array_location(u8 code)
{
- /* 3.3.17.1 */
+ /* 7.17.1 */
static const char *location[] = {
"Other", /* 0x01 */
"Unknown",
@@ -1999,7 +1999,7 @@ static const char *dmi_memory_array_loca
static const char *dmi_memory_array_use(u8 code)
{
- /* 3.3.17.2 */
+ /* 7.17.2 */
static const char *use[] = {
"Other", /* 0x01 */
"Unknown",
@@ -2017,7 +2017,7 @@ static const char *dmi_memory_array_use(
static const char *dmi_memory_array_ec_type(u8 code)
{
- /* 3.3.17.3 */
+ /* 7.17.3 */
static const char *type[] = {
"Other", /* 0x01 */
"Unknown",
@@ -2059,7 +2059,7 @@ static void dmi_memory_array_error_handl
}
/*
- * 3.3.18 Memory Device (Type 17)
+ * 7.18 Memory Device (Type 17)
*/
static void dmi_memory_device_width(u16 code)
@@ -2090,7 +2090,7 @@ static void dmi_memory_device_size(u16 c
static const char *dmi_memory_device_form_factor(u8 code)
{
- /* 3.3.18.1 */
+ /* 7.18.1 */
static const char *form_factor[] = {
"Other", /* 0x01 */
"Unknown",
@@ -2126,7 +2126,7 @@ static void dmi_memory_device_set(u8 cod
static const char *dmi_memory_device_type(u8 code)
{
- /* 3.3.18.2 */
+ /* 7.18.2 */
static const char *type[] = {
"Other", /* 0x01 */
"Unknown",
@@ -2162,7 +2162,7 @@ static const char *dmi_memory_device_typ
static void dmi_memory_device_type_detail(u16 code)
{
- /* 3.3.18.3 */
+ /* 7.18.3 */
static const char *detail[] = {
"Other", /* 1 */
"Unknown",
@@ -2199,12 +2199,12 @@ static void dmi_memory_device_speed(u16
}
/*
- * 3.3.19 32-bit Memory Error Information (Type 18)
+ * 7.19 32-bit Memory Error Information (Type 18)
*/
static const char *dmi_memory_error_type(u8 code)
{
- /* 3.3.19.1 */
+ /* 7.19.1 */
static const char *type[] = {
"Other", /* 0x01 */
"Unknown",
@@ -2229,7 +2229,7 @@ static const char *dmi_memory_error_type
static const char *dmi_memory_error_granularity(u8 code)
{
- /* 3.3.19.2 */
+ /* 7.19.2 */
static const char *granularity[] = {
"Other", /* 0x01 */
"Unknown",
@@ -2244,7 +2244,7 @@ static const char *dmi_memory_error_gran
static const char *dmi_memory_error_operation(u8 code)
{
- /* 3.3.19.3 */
+ /* 7.19.3 */
static const char *operation[] = {
"Other", /* 0x01 */
"Unknown",
@@ -2275,7 +2275,7 @@ static void dmi_32bit_memory_error_addre
}
/*
- * 3.3.20 Memory Array Mapped Address (Type 19)
+ * 7.20 Memory Array Mapped Address (Type 19)
*/
static void dmi_mapped_address_size(u32 code)
@@ -2291,7 +2291,7 @@ static void dmi_mapped_address_size(u32
}
/*
- * 3.3.21 Memory Device Mapped Address (Type 20)
+ * 7.21 Memory Device Mapped Address (Type 20)
*/
static void dmi_mapped_address_row_position(u8 code)
@@ -2331,12 +2331,12 @@ static void dmi_mapped_address_interleav
}
/*
- * 3.3.22 Built-in Pointing Device (Type 21)
+ * 7.22 Built-in Pointing Device (Type 21)
*/
static const char *dmi_pointing_device_type(u8 code)
{
- /* 3.3.22.1 */
+ /* 7.22.1 */
static const char *type[] = {
"Other", /* 0x01 */
"Unknown",
@@ -2356,7 +2356,7 @@ static const char *dmi_pointing_device_t
static const char *dmi_pointing_device_interface(u8 code)
{
- /* 3.3.22.2 */
+ /* 7.22.2 */
static const char *interface[] = {
"Other", /* 0x01 */
"Unknown",
@@ -2381,12 +2381,12 @@ static const char *dmi_pointing_device_i
}
/*
- * 3.3.23 Portable Battery (Type 22)
+ * 7.23 Portable Battery (Type 22)
*/
static const char *dmi_battery_chemistry(u8 code)
{
- /* 3.3.23.1 */
+ /* 7.23.1 */
static const char *chemistry[] = {
"Other", /* 0x01 */
"Unknown",
@@ -2428,7 +2428,7 @@ static void dmi_battery_maximum_error(u8
}
/*
- * 3.3.24 System Reset (Type 23)
+ * 7.24 System Reset (Type 23)
*/
/* code is assumed to be a 2-bit value */
@@ -2461,7 +2461,7 @@ static void dmi_system_reset_timer(u16 c
}
/*
- * 3.3.25 Hardware Security (Type 24)
+ * 7.25 Hardware Security (Type 24)
*/
static const char *dmi_hardware_security_status(u8 code)
@@ -2477,12 +2477,12 @@ static const char *dmi_hardware_security
}
/*
- * 3.3.26 System Power Controls (Type 25)
+ * 7.26 System Power Controls (Type 25)
*/
static void dmi_power_controls_power_on(const u8 *p)
{
- /* 3.3.26.1 */
+ /* 7.26.1 */
if (dmi_bcd_range(p[0], 0x01, 0x12))
printf(" %02X", p[0]);
else
@@ -2506,12 +2506,12 @@ static void dmi_power_controls_power_on(
}
/*
- * 3.3.27 Voltage Probe (Type 26)
+ * 7.27 Voltage Probe (Type 26)
*/
static const char *dmi_voltage_probe_location(u8 code)
{
- /* 3.3.27.1 */
+ /* 7.27.1 */
static const char *location[] = {
"Other", /* 0x01 */
"Unknown",
@@ -2533,7 +2533,7 @@ static const char *dmi_voltage_probe_loc
static const char *dmi_probe_status(u8 code)
{
- /* 3.3.27.1 */
+ /* 7.27.1 */
static const char *status[] = {
"Other", /* 0x01 */
"Unknown",
@@ -2573,12 +2573,12 @@ static void dmi_probe_accuracy(u16 code)
}
/*
- * 3.3.28 Cooling Device (Type 27)
+ * 7.28 Cooling Device (Type 27)
*/
static const char *dmi_cooling_device_type(u8 code)
{
- /* 3.3.28.1 */
+ /* 7.28.1 */
static const char *type[] = {
"Other", /* 0x01 */
"Unknown",
@@ -2611,12 +2611,12 @@ static void dmi_cooling_device_speed(u16
}
/*
- * 3.3.29 Temperature Probe (Type 28)
+ * 7.29 Temperature Probe (Type 28)
*/
static const char *dmi_temperature_probe_location(u8 code)
{
- /* 3.3.29.1 */
+ /* 7.29.1 */
static const char *location[] = {
"Other", /* 0x01 */
"Unknown",
@@ -2657,7 +2657,7 @@ static void dmi_temperature_probe_resolu
}
/*
- * 3.3.30 Electrical Current Probe (Type 29)
+ * 7.30 Electrical Current Probe (Type 29)
*/
static void dmi_current_probe_value(u16 code)
@@ -2677,7 +2677,7 @@ static void dmi_current_probe_resolution
}
/*
- * 3.3.33 System Boot Information (Type 32)
+ * 7.33 System Boot Information (Type 32)
*/
static const char *dmi_system_boot_status(u8 code)
@@ -2704,7 +2704,7 @@ static const char *dmi_system_boot_statu
}
/*
- * 3.3.34 64-bit Memory Error Information (Type 33)
+ * 7.34 64-bit Memory Error Information (Type 33)
*/
static void dmi_64bit_memory_error_address(u64 code)
@@ -2716,12 +2716,12 @@ static void dmi_64bit_memory_error_addre
}
/*
- * 3.3.35 Management Device (Type 34)
+ * 7.35 Management Device (Type 34)
*/
static const char *dmi_management_device_type(u8 code)
{
- /* 3.3.35.1 */
+ /* 7.35.1 */
static const char *type[] = {
"Other", /* 0x01 */
"Unknown",
@@ -2745,7 +2745,7 @@ static const char *dmi_management_device
static const char *dmi_management_device_address_type(u8 code)
{
- /* 3.3.35.2 */
+ /* 7.35.2 */
static const char *type[] = {
"Other", /* 0x01 */
"Unknown",
@@ -2760,12 +2760,12 @@ static const char *dmi_management_device
}
/*
- * 3.3.38 Memory Channel (Type 37)
+ * 7.38 Memory Channel (Type 37)
*/
static const char *dmi_memory_channel_type(u8 code)
{
- /* 3.3.38.1 */
+ /* 7.38.1 */
static const char *type[] = {
"Other", /* 0x01 */
"Unknown",
@@ -2793,12 +2793,12 @@ static void dmi_memory_channel_devices(u
}
/*
- * 3.3.39 IPMI Device Information (Type 38)
+ * 7.39 IPMI Device Information (Type 38)
*/
static const char *dmi_ipmi_interface_type(u8 code)
{
- /* 3.3.39.1 and IPMI 2.0, appendix C1, table C1-2 */
+ /* 7.39.1 and IPMI 2.0, appendix C1, table C1-2 */
static const char *type[] = {
"Unknown", /* 0x00 */
"KCS (Keyboard Control Style)",
@@ -2841,7 +2841,7 @@ static const char *dmi_ipmi_register_spa
}
/*
- * 3.3.40 System Power Supply (Type 39)
+ * 7.40 System Power Supply (Type 39)
*/
static void dmi_power_supply_power(u16 code)
@@ -2854,7 +2854,7 @@ static void dmi_power_supply_power(u16 c
static const char *dmi_power_supply_type(u8 code)
{
- /* 3.3.40.1 */
+ /* 7.40.1 */
static const char *type[] = {
"Other", /* 0x01 */
"Unknown",
@@ -2873,7 +2873,7 @@ static const char *dmi_power_supply_type
static const char *dmi_power_supply_status(u8 code)
{
- /* 3.3.40.1 */
+ /* 7.40.1 */
static const char *status[] = {
"Other", /* 0x01 */
"Unknown",
@@ -2889,7 +2889,7 @@ static const char *dmi_power_supply_stat
static const char *dmi_power_supply_range_switching(u8 code)
{
- /* 3.3.40.1 */
+ /* 7.40.1 */
static const char *switching[] = {
"Other", /* 0x01 */
"Unknown",
@@ -2905,7 +2905,7 @@ static const char *dmi_power_supply_rang
}
/*
- * 3.3.41 Additional Information (Type 40)
+ * 7.41 Additional Information (Type 40)
*
* Proper support of this entry type would require redesigning a large part of
* the code, so I am waiting to see actual implementations of it to decide
@@ -2971,7 +2971,7 @@ static void dmi_decode(const struct dmi_
*/
switch (h->type)
{
- case 0: /* 3.3.1 BIOS Information */
+ case 0: /* 7.1 BIOS Information */
printf("BIOS Information\n");
if (h->length < 0x12) break;
printf("\tVendor: %s\n",
@@ -3010,7 +3010,7 @@ static void dmi_decode(const struct dmi_
data[0x16], data[0x17]);
break;
- case 1: /* 3.3.2 System Information */
+ case 1: /* 7.2 System Information */
printf("System Information\n");
if (h->length < 0x08) break;
printf("\tManufacturer: %s\n",
@@ -3034,7 +3034,7 @@ static void dmi_decode(const struct dmi_
dmi_string(h, data[0x1A]));
break;
- case 2: /* 3.3.3 Base Board Information */
+ case 2: /* 7.3 Base Board Information */
printf("Base Board Information\n");
if (h->length < 0x08) break;
printf("\tManufacturer: %s\n",
@@ -3064,7 +3064,7 @@ static void dmi_decode(const struct dmi_
dmi_base_board_handles(data[0x0E], data + 0x0F,
"\t");
break;
- case 3: /* 3.3.4 Chassis Information */
+ case 3: /* 7.4 Chassis Information */
printf("Chassis Information\n");
if (h->length < 0x09) break;
printf("\tManufacturer: %s\n",
@@ -3103,7 +3103,7 @@ static void dmi_decode(const struct dmi_
dmi_chassis_elements(data[0x13], data[0x14], data +
0x15, "\t");
break;
- case 4: /* 3.3.5 Processor Information */
+ case 4: /* 7.5 Processor Information */
printf("Processor Information\n");
if (h->length < 0x1A) break;
printf("\tSocket Designation: %s\n",
@@ -3167,7 +3167,7 @@ static void dmi_decode(const struct dmi_
dmi_processor_characteristics(WORD(data + 0x26),
"\t\t");
break;
- case 5: /* 3.3.6 Memory Controller Information */
+ case 5: /* 7.6 Memory Controller Information */
printf("Memory Controller Information\n");
if (h->length < 0x0F) break;
printf("\tError Detecting Method: %s\n",
@@ -3197,7 +3197,7 @@ static void dmi_decode(const struct dmi_
dmi_memory_controller_ec_capabilities(data[0x0F +
data[0x0E] * sizeof(u16)], "\t\t");
break;
- case 6: /* 3.3.7 Memory Module Information */
+ case 6: /* 7.7 Memory Module Information */
printf("Memory Module Information\n");
if (h->length < 0x0C) break;
printf("\tSocket Designation: %s\n",
@@ -3221,7 +3221,7 @@ static void dmi_decode(const struct dmi_
dmi_memory_module_error(data[0x0B], "\t\t");
break;
- case 7: /* 3.3.8 Cache Information */
+ case 7: /* 7.8 Cache Information */
printf("Cache Information\n");
if (h->length < 0x0F) break;
printf("\tSocket Designation: %s\n",
@@ -3258,7 +3258,7 @@ static void dmi_decode(const struct dmi_
dmi_cache_associativity(data[0x12]));
break;
- case 8: /* 3.3.9 Port Connector Information */
+ case 8: /* 7.9 Port Connector Information */
printf("Port Connector Information\n");
if (h->length < 0x09) break;
printf("\tInternal Reference Designator: %s\n",
@@ -3273,7 +3273,7 @@ static void dmi_decode(const struct dmi_
dmi_port_type(data[0x08]));
break;
- case 9: /* 3.3.10 System Slots */
+ case 9: /* 7.10 System Slots */
printf("System Slot Information\n");
if (h->length < 0x0C) break;
printf("\tDesignation: %s\n",
@@ -3295,23 +3295,23 @@ static void dmi_decode(const struct dmi_
dmi_slot_segment_bus_func(WORD(data + 0x0D),
data[0x0F], data[0x10], "\t");
break;
- case 10: /* 3.3.11 On Board Devices Information */
+ case 10: /* 7.11 On Board Devices Information */
dmi_on_board_devices(h, "");
break;
- case 11: /* 3.3.12 OEM Strings */
+ case 11: /* 7.12 OEM Strings */
printf("OEM Strings\n");
if (h->length < 0x05) break;
dmi_oem_strings(h, "\t");
break;
- case 12: /* 3.3.13 System Configuration Options */
+ case 12: /* 7.13 System Configuration Options */
printf("System Configuration Options\n");
if (h->length < 0x05) break;
dmi_system_configuration_options(h, "\t");
break;
- case 13: /* 3.3.14 BIOS Language Information */
+ case 13: /* 7.14 BIOS Language Information */
printf("BIOS Language Information\n");
if (h->length < 0x16) break;
printf("\tInstallable Languages: %u\n", data[0x04]);
@@ -3320,7 +3320,7 @@ static void dmi_decode(const struct dmi_
dmi_string(h, data[0x15]));
break;
- case 14: /* 3.3.15 Group Associations */
+ case 14: /* 7.15 Group Associations */
printf("Group Associations\n");
if (h->length < 0x05) break;
printf("\tName: %s\n",
@@ -3330,7 +3330,7 @@ static void dmi_decode(const struct dmi_
dmi_group_associations_items((h->length - 0x05) / 3,
data + 0x05, "\t\t");
break;
- case 15: /* 3.3.16 System Event Log */
+ case 15: /* 7.16 System Event Log */
printf("System Event Log\n");
if (h->length < 0x14) break;
printf("\tArea Length: %u bytes\n",
@@ -3362,7 +3362,7 @@ static void dmi_decode(const struct dmi_
dmi_event_log_descriptors(data[0x15], data[0x16], data
+ 0x17, "\t");
break;
- case 16: /* 3.3.17 Physical Memory Array */
+ case 16: /* 7.17 Physical Memory Array */
printf("Physical Memory Array\n");
if (h->length < 0x0F) break;
printf("\tLocation: %s\n",
@@ -3384,7 +3384,7 @@ static void dmi_decode(const struct dmi_
WORD(data + 0x0D));
break;
- case 17: /* 3.3.18 Memory Device */
+ case 17: /* 7.18 Memory Device */
printf("Memory Device\n");
if (h->length < 0x15) break;
if (!(opt.flags & FLAG_QUIET))
@@ -3440,7 +3440,7 @@ static void dmi_decode(const struct dmi_
printf("\n");
break;
- case 18: /* 3.3.19 32-bit Memory Error Information */
+ case 18: /* 7.19 32-bit Memory Error Information */
printf("32-bit Memory Error Information\n");
if (h->length < 0x17) break;
printf("\tType: %s\n",
@@ -3463,7 +3463,7 @@ static void dmi_decode(const struct dmi_
printf("\n");
break;
- case 19: /* 3.3.20 Memory Array Mapped Address */
+ case 19: /* 7.20 Memory Array Mapped Address */
printf("Memory Array Mapped Address\n");
if (h->length < 0x0F) break;
printf("\tStarting Address: 0x%08X%03X\n",
@@ -3480,7 +3480,7 @@ static void dmi_decode(const struct dmi_
data[0x0F]);
break;
- case 20: /* 3.3.21 Memory Device Mapped Address */
+ case 20: /* 7.21 Memory Device Mapped Address */
printf("Memory Device Mapped Address\n");
if (h->length < 0x13) break;
printf("\tStarting Address: 0x%08X%03X\n",
@@ -3504,7 +3504,7 @@ static void dmi_decode(const struct dmi_
dmi_mapped_address_interleaved_data_depth(data[0x12],
"\t");
break;
- case 21: /* 3.3.22 Built-in Pointing Device */
+ case 21: /* 7.22 Built-in Pointing Device */
printf("Built-in Pointing Device\n");
if (h->length < 0x07) break;
printf("\tType: %s\n",
@@ -3515,7 +3515,7 @@ static void dmi_decode(const struct dmi_
data[0x06]);
break;
- case 22: /* 3.3.23 Portable Battery */
+ case 22: /* 7.23 Portable Battery */
printf("Portable Battery\n");
if (h->length < 0x10) break;
printf("\tLocation: %s\n",
@@ -3563,7 +3563,7 @@ static void dmi_decode(const struct dmi_
DWORD(data + 0x16));
break;
- case 23: /* 3.3.24 System Reset */
+ case 23: /* 7.24 System Reset */
printf("System Reset\n");
if (h->length < 0x0D) break;
printf("\tStatus: %s\n",
@@ -3590,7 +3590,7 @@ static void dmi_decode(const struct dmi_
printf("\n");
break;
- case 24: /* 3.3.25 Hardware Security */
+ case 24: /* 7.25 Hardware Security */
printf("Hardware Security\n");
if (h->length < 0x05) break;
printf("\tPower-On Password Status: %s\n",
@@ -3603,7 +3603,7 @@ static void dmi_decode(const struct dmi_
dmi_hardware_security_status(data[0x04] & 0x3));
break;
- case 25: /* 3.3.26 System Power Controls */
+ case 25: /* 7.26 System Power Controls */
printf("\tSystem Power Controls\n");
if (h->length < 0x09) break;
printf("\tNext Scheduled Power-on:");
@@ -3611,7 +3611,7 @@ static void dmi_decode(const struct dmi_
printf("\n");
break;
- case 26: /* 3.3.27 Voltage Probe */
+ case 26: /* 7.27 Voltage Probe */
printf("Voltage Probe\n");
if (h->length < 0x14) break;
printf("\tDescription: %s\n",
@@ -3643,7 +3643,7 @@ static void dmi_decode(const struct dmi_
printf("\n");
break;
- case 27: /* 3.3.28 Cooling Device */
+ case 27: /* 7.28 Cooling Device */
printf("Cooling Device\n");
if (h->length < 0x0C) break;
if (!(opt.flags & FLAG_QUIET) && WORD(data + 0x04) !=
0xFFFF)
@@ -3664,7 +3664,7 @@ static void dmi_decode(const struct dmi_
printf("\n");
break;
- case 28: /* 3.3.29 Temperature Probe */
+ case 28: /* 7.29 Temperature Probe */
printf("Temperature Probe\n");
if (h->length < 0x14) break;
printf("\tDescription: %s\n",
@@ -3696,7 +3696,7 @@ static void dmi_decode(const struct dmi_
printf("\n");
break;
- case 29: /* 3.3.30 Electrical Current Probe */
+ case 29: /* 7.30 Electrical Current Probe */
printf("Electrical Current Probe\n");
if (h->length < 0x14) break;
printf("\tDescription: %s\n",
@@ -3728,7 +3728,7 @@ static void dmi_decode(const struct dmi_
printf("\n");
break;
- case 30: /* 3.3.31 Out-of-band Remote Access */
+ case 30: /* 7.31 Out-of-band Remote Access */
printf("Out-of-band Remote Access\n");
if (h->length < 0x06) break;
printf("\tManufacturer Name: %s\n",
@@ -3739,7 +3739,7 @@ static void dmi_decode(const struct dmi_
data[0x05] & (1 << 1) ? "Enabled" : "Disabled");
break;
- case 31: /* 3.3.32 Boot Integrity Services Entry Point */
+ case 31: /* 7.32 Boot Integrity Services Entry Point */
printf("Boot Integrity Services Entry Point\n");
if (h->length < 0x1C) break;
printf("\tChecksum: %s\n",
@@ -3751,14 +3751,14 @@ static void dmi_decode(const struct dmi_
DWORD(data + 0x0C));
break;
- case 32: /* 3.3.33 System Boot Information */
+ case 32: /* 7.33 System Boot Information */
printf("System Boot Information\n");
if (h->length < 0x0B) break;
printf("\tStatus: %s\n",
dmi_system_boot_status(data[0x0A]));
break;
- case 33: /* 3.3.34 64-bit Memory Error Information */
+ case 33: /* 7.34 64-bit Memory Error Information */
if (h->length < 0x1F) break;
printf("64-bit Memory Error Information\n");
printf("\tType: %s\n",
@@ -3781,7 +3781,7 @@ static void dmi_decode(const struct dmi_
printf("\n");
break;
- case 34: /* 3.3.35 Management Device */
+ case 34: /* 7.35 Management Device */
printf("Management Device\n");
if (h->length < 0x0B) break;
printf("\tDescription: %s\n",
@@ -3794,7 +3794,7 @@ static void dmi_decode(const struct dmi_
dmi_management_device_address_type(data[0x0A]));
break;
- case 35: /* 3.3.36 Management Device Component */
+ case 35: /* 7.36 Management Device Component */
printf("Management Device Component\n");
if (h->length < 0x0B) break;
printf("\tDescription: %s\n",
@@ -3811,7 +3811,7 @@ static void dmi_decode(const struct dmi_
}
break;
- case 36: /* 3.3.37 Management Device Threshold Data */
+ case 36: /* 7.37 Management Device Threshold Data */
printf("Management Device Threshold Data\n");
if (h->length < 0x10) break;
if (WORD(data + 0x04) != 0x8000)
@@ -3834,7 +3834,7 @@ static void dmi_decode(const struct dmi_
(i16)WORD(data + 0x0E));
break;
- case 37: /* 3.3.38 Memory Channel */
+ case 37: /* 7.38 Memory Channel */
printf("Memory Channel\n");
if (h->length < 0x07) break;
printf("\tType: %s\n",
@@ -3847,7 +3847,7 @@ static void dmi_decode(const struct dmi_
dmi_memory_channel_devices(data[0x06], data + 0x07,
"\t");
break;
- case 38: /* 3.3.39 IPMI Device Information */
+ case 38: /* 7.39 IPMI Device Information */
/*
* We use the word "Version" instead of "Revision",
conforming to
* the IPMI specification.
@@ -3889,7 +3889,7 @@ static void dmi_decode(const struct dmi_
}
break;
- case 39: /* 3.3.40 System Power Supply */
+ case 39: /* 7.40 System Power Supply */
printf("System Power Supply\n");
if (h->length < 0x10) break;
if (data[0x04] != 0x00)
@@ -3942,13 +3942,13 @@ static void dmi_decode(const struct dmi_
}
break;
- case 40: /* 3.3.41 Additional Information */
+ case 40: /* 7.41 Additional Information */
if (h->length < 0x0B) break;
if (!(opt.flags & FLAG_QUIET))
dmi_additional_info(h, "");
break;
- case 41: /* 3.3.42 Onboard Device Extended Information */
+ case 41: /* 7.42 Onboard Device Extended Information */
printf("Onboard Device\n");
if (h->length < 0x0B) break;
printf("\tReference Designation: %s\n", dmi_string(h,
data[0x04]));
@@ -3960,11 +3960,11 @@ static void dmi_decode(const struct dmi_
dmi_slot_segment_bus_func(WORD(data + 0x07),
data[0x09], data[0x0A], "\t");
break;
- case 126: /* 3.3.43 Inactive */
+ case 126: /* 7.44 Inactive */
printf("Inactive\n");
break;
- case 127: /* 3.3.44 End Of Table */
+ case 127: /* 7.45 End Of Table */
printf("End Of Table\n");
break;
--
Jean Delvare
- [dmidecode] [PATCH 0/4] SMBIOS 2.7.0 support, Jean Delvare, 2010/11/13
- [dmidecode] [PATCH 1/4] Update references to match SMBIOS 2.7.0,
Jean Delvare <=
- [dmidecode] [PATCH 2/4] Add support SMBIOS 2.7.0: BIOS, chassis and processor, Jean Delvare, 2010/11/13
- [dmidecode] [PATCH 3/4] Add support for SMBIOS 2.7.0: memory, Jean Delvare, 2010/11/13
- [dmidecode] [PATCH 4/4] Add support for SMBIOS 2.7.0: cooling device, IPMI, Jean Delvare, 2010/11/13
- [dmidecode] Re: [PATCH 0/4] SMBIOS 2.7.0 support, Jean Delvare, 2010/11/24