From 805dced32cbb2eef1f2b639100faef3bb0482e29 Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Wed, 1 Apr 2009 16:10:55 +0200 Subject: Added indenting tool for C code and reindented *.[ch] files --- src/dmihelper.h | 151 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 76 insertions(+), 75 deletions(-) (limited to 'src/dmihelper.h') diff --git a/src/dmihelper.h b/src/dmihelper.h index a056eb2..ac82916 100644 --- a/src/dmihelper.h +++ b/src/dmihelper.h @@ -14,100 +14,101 @@ #define MAXVAL 1024 static const int map_maj[] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, - 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, - 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, - 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, - 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, - 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, - 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, - 120, 121, 122, 123, 124, 125, 126, 127, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, + 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, + 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, + 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, + 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, + 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, + 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, + 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, + 120, 121, 122, 123, 124, 125, 126, 127, }; typedef struct _dmi_codes_major { - const unsigned short code; - const char *id; - const char *desc; + const unsigned short code; + const char *id; + const char *desc; } dmi_codes_major; static const dmi_codes_major dmiCodesMajor[] = { - { 0, "3.3.1", "BIOS Information" }, - { 1, "3.3.2", "System Information" }, - { 2, "3.3.3", "Base Board Information" }, - { 3, "3.3.4", "Chassis Information" }, - { 4, "3.3.5", "Processor Information" }, - { 5, "3.3.6", "Memory Controller Information" }, - { 6, "3.3.7", "Memory Module Information" }, - { 7, "3.3.8", "Cache Information" }, - { 8, "3.3.9", "Port Connector Information" }, - { 9, "3.3.10", "System Slots" }, - { 10, "3.3.11", "On Board Devices Information" }, - { 11, "3.3.12", "OEM Strings" }, - { 12, "3.3.13", "System Configuration Options" }, - { 13, "3.3.14", "BIOS Language Information" }, - { 14, "3.3.15", "Group Associations" }, - { 15, "3.3.16", "System Event Log" }, - { 16, "3.3.17", "Physical Memory Array" }, - { 17, "3.3.18", "Memory Device" }, - { 18, "3.3.19", "32-bit Memory Error Information" }, - { 19, "3.3.20", "Memory Array Mapped Address" }, - { 20, "3.3.21", "Memory Device Mapped Address" }, - { 21, "3.3.22", "Built-in Pointing Device" }, - { 22, "3.3.23", "Portable Battery" }, - { 23, "3.3.24", "System Reset" }, - { 24, "3.3.25", "Hardware Security" }, - { 25, "3.3.26", "System Power Controls" }, - { 26, "3.3.27", "Voltage Probe" }, - { 27, "3.3.28", "Cooling Device" }, - { 28, "3.3.29", "Temperature Probe" }, - { 29, "3.3.30", "Electrical Current Probe" }, - { 30, "3.3.31", "Out-of-band Remote Access" }, - { 31, "3.3.32", "Boot Integrity Services Entry Point" }, - { 32, "3.3.33", "System Boot Information" }, - { 33, "3.3.34", "64-bit Memory Error Information" }, - { 34, "3.3.35", "Management Device" }, - { 35, "3.3.36", "Management Device Component" }, - { 36, "3.3.37", "Management Device Threshold Data" }, - { 37, "3.3.38", "Memory Channel" }, - { 38, "3.3.39", "IPMI Device Information" }, - { 39, "3.3.40", "System Power Supply" }, - { 40, "3.3.41", "-------------------" }, - { 41, "3.3.42", "-------------------" }, - { 126, "3.3.41", "Inactive" }, - { 127, "3.3.42", "End Of Table" }, + {0, "3.3.1", "BIOS Information"}, + {1, "3.3.2", "System Information"}, + {2, "3.3.3", "Base Board Information"}, + {3, "3.3.4", "Chassis Information"}, + {4, "3.3.5", "Processor Information"}, + {5, "3.3.6", "Memory Controller Information"}, + {6, "3.3.7", "Memory Module Information"}, + {7, "3.3.8", "Cache Information"}, + {8, "3.3.9", "Port Connector Information"}, + {9, "3.3.10", "System Slots"}, + {10, "3.3.11", "On Board Devices Information"}, + {11, "3.3.12", "OEM Strings"}, + {12, "3.3.13", "System Configuration Options"}, + {13, "3.3.14", "BIOS Language Information"}, + {14, "3.3.15", "Group Associations"}, + {15, "3.3.16", "System Event Log"}, + {16, "3.3.17", "Physical Memory Array"}, + {17, "3.3.18", "Memory Device"}, + {18, "3.3.19", "32-bit Memory Error Information"}, + {19, "3.3.20", "Memory Array Mapped Address"}, + {20, "3.3.21", "Memory Device Mapped Address"}, + {21, "3.3.22", "Built-in Pointing Device"}, + {22, "3.3.23", "Portable Battery"}, + {23, "3.3.24", "System Reset"}, + {24, "3.3.25", "Hardware Security"}, + {25, "3.3.26", "System Power Controls"}, + {26, "3.3.27", "Voltage Probe"}, + {27, "3.3.28", "Cooling Device"}, + {28, "3.3.29", "Temperature Probe"}, + {29, "3.3.30", "Electrical Current Probe"}, + {30, "3.3.31", "Out-of-band Remote Access"}, + {31, "3.3.32", "Boot Integrity Services Entry Point"}, + {32, "3.3.33", "System Boot Information"}, + {33, "3.3.34", "64-bit Memory Error Information"}, + {34, "3.3.35", "Management Device"}, + {35, "3.3.36", "Management Device Component"}, + {36, "3.3.37", "Management Device Threshold Data"}, + {37, "3.3.38", "Memory Channel"}, + {38, "3.3.39", "IPMI Device Information"}, + {39, "3.3.40", "System Power Supply"}, + {40, "3.3.41", "-------------------"}, + {41, "3.3.42", "-------------------"}, + {126, "3.3.41", "Inactive"}, + {127, "3.3.42", "End Of Table"}, }; typedef struct _dmi_minor { - long id; - dmi_codes_major* major; - char *key; - char value[MAXVAL]; - struct _dmi_minor* next; + long id; + dmi_codes_major *major; + char *key; + char value[MAXVAL]; + struct _dmi_minor *next; } dmi_minor; -void dmiAppendData(PyObject *pydata, const int count); -int dmiSetItem(PyObject* dict, const char *key, const char *format, ...); +void dmiAppendData(PyObject * pydata, const int count); +int dmiSetItem(PyObject * dict, const char *key, const char *format, ...); + //dmi_minor* dmiAppendObject(long code, char const *key, const char *format, ...); /*** dmiopt.h ***/ struct string_keyword { - const char *keyword; - u8 type; - u8 offset; + const char *keyword; + u8 type; + u8 offset; }; /*** dmiopt.h ***/ typedef struct _options { - const char *devmem; - unsigned int flags; - u8 *type; - const struct string_keyword *string; - PyObject *dumpfile; + const char *devmem; + unsigned int flags; + u8 *type; + const struct string_keyword *string; + PyObject *dumpfile; } options; extern options opt; -- cgit From 38c943db697b13e5f9be020a0729f58b7366e932 Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Fri, 10 Apr 2009 13:52:47 +0200 Subject: Cleaned up the XML data --- src/dmihelper.h | 90 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 46 insertions(+), 44 deletions(-) (limited to 'src/dmihelper.h') diff --git a/src/dmihelper.h b/src/dmihelper.h index ac82916..6c0b854 100644 --- a/src/dmihelper.h +++ b/src/dmihelper.h @@ -33,53 +33,55 @@ typedef struct _dmi_codes_major { const unsigned short code; const char *id; const char *desc; + const char *tagname; } dmi_codes_major; static const dmi_codes_major dmiCodesMajor[] = { - {0, "3.3.1", "BIOS Information"}, - {1, "3.3.2", "System Information"}, - {2, "3.3.3", "Base Board Information"}, - {3, "3.3.4", "Chassis Information"}, - {4, "3.3.5", "Processor Information"}, - {5, "3.3.6", "Memory Controller Information"}, - {6, "3.3.7", "Memory Module Information"}, - {7, "3.3.8", "Cache Information"}, - {8, "3.3.9", "Port Connector Information"}, - {9, "3.3.10", "System Slots"}, - {10, "3.3.11", "On Board Devices Information"}, - {11, "3.3.12", "OEM Strings"}, - {12, "3.3.13", "System Configuration Options"}, - {13, "3.3.14", "BIOS Language Information"}, - {14, "3.3.15", "Group Associations"}, - {15, "3.3.16", "System Event Log"}, - {16, "3.3.17", "Physical Memory Array"}, - {17, "3.3.18", "Memory Device"}, - {18, "3.3.19", "32-bit Memory Error Information"}, - {19, "3.3.20", "Memory Array Mapped Address"}, - {20, "3.3.21", "Memory Device Mapped Address"}, - {21, "3.3.22", "Built-in Pointing Device"}, - {22, "3.3.23", "Portable Battery"}, - {23, "3.3.24", "System Reset"}, - {24, "3.3.25", "Hardware Security"}, - {25, "3.3.26", "System Power Controls"}, - {26, "3.3.27", "Voltage Probe"}, - {27, "3.3.28", "Cooling Device"}, - {28, "3.3.29", "Temperature Probe"}, - {29, "3.3.30", "Electrical Current Probe"}, - {30, "3.3.31", "Out-of-band Remote Access"}, - {31, "3.3.32", "Boot Integrity Services Entry Point"}, - {32, "3.3.33", "System Boot Information"}, - {33, "3.3.34", "64-bit Memory Error Information"}, - {34, "3.3.35", "Management Device"}, - {35, "3.3.36", "Management Device Component"}, - {36, "3.3.37", "Management Device Threshold Data"}, - {37, "3.3.38", "Memory Channel"}, - {38, "3.3.39", "IPMI Device Information"}, - {39, "3.3.40", "System Power Supply"}, - {40, "3.3.41", "-------------------"}, - {41, "3.3.42", "-------------------"}, - {126, "3.3.41", "Inactive"}, - {127, "3.3.42", "End Of Table"}, + {0, "3.3.1", "BIOS Information", "BIOSinfo"}, + {1, "3.3.2", "System Information", "SystemInfo"}, + {2, "3.3.3", "Base Board Information", "BaseBoardInfo"}, + {3, "3.3.4", "Chassis Information", "ChassisInfo"}, + {4, "3.3.5", "Processor Information", "ProcessorInfo"}, + {5, "3.3.6", "Memory Controller Information", "MemoryCtrlInfo"}, + {6, "3.3.7", "Memory Module Information", "MemoryModuleInfo"}, + {7, "3.3.8", "Cache Information", "CacheInfo"}, + {8, "3.3.9", "Port Connector Information", "PortConnectorInfo"}, + {9, "3.3.10", "System Slots", "SystemSlots"}, + {10, "3.3.11", "On Board Devices Information", "OnBoardDevicesInfo"}, + {11, "3.3.12", "OEM Strings", "OEMstrings"}, + {12, "3.3.13", "System Configuration Options", "SysConfigOptions"}, + {13, "3.3.14", "BIOS Language Information", "BIOSlanguage"}, + {14, "3.3.15", "Group Associations", "GroupAssoc"}, + {15, "3.3.16", "System Event Log", "SysEventLog"}, + {16, "3.3.17", "Physical Memory Array", "PhysicalMemoryArray"}, + {17, "3.3.18", "Memory Device", "MemoryDevice"}, + {18, "3.3.19", "32-bit Memory Error Information", "MemoryErrorInfo"}, + {19, "3.3.20", "Memory Array Mapped Address", "MemoryArrayMappedAddress"}, + {20, "3.3.21", "Memory Device Mapped Address", "MemoryDeviceMappedAddress"}, + {21, "3.3.22", "Built-in Pointing Device", "BuiltIntPointingDevice"}, + {22, "3.3.23", "Portable Battery", "PortableBattery"}, + {23, "3.3.24", "System Reset", "SystemReset"}, + {24, "3.3.25", "Hardware Security", "HardwareSecurity"}, + {25, "3.3.26", "System Power Controls", "SystemPowerCtrls"}, + {26, "3.3.27", "Voltage Probe", "Probe"}, + {27, "3.3.28", "Cooling Device", "CoolingDevice"}, + {28, "3.3.29", "Temperature Probe", "Probe"}, + {29, "3.3.30", "Electrical Current Probe", "Probe"}, + {30, "3.3.31", "Out-of-band Remote Access", "RemoteAccess"}, + {31, "3.3.32", "Boot Integrity Services Entry Point", "BootIntegrity"}, + {32, "3.3.33", "System Boot Information", "SystemBootInfo"}, + {33, "3.3.34", "64-bit Memory Error Information", "MemoryErrorInfo"}, + {34, "3.3.35", "Management Device", "ManagementDevice"}, + {35, "3.3.36", "Management Device Component", "ManagementDevice"}, + {36, "3.3.37", "Management Device Threshold Data", "ManagementDevice"}, + {37, "3.3.38", "Memory Channel", "MemoryChannel"}, + {38, "3.3.39", "IPMI Device Information", "IPMIdeviceInfo"}, + {39, "3.3.40", "System Power Supply", "SystemPowerSupply"}, + {40, "3.3.41", "-------------------", "Unknown"}, + {41, "3.3.42", "-------------------", "Unknown"}, + {126, "3.3.41", "Inactive", "Inactive"}, + {127, "3.3.42", "End Of Table", "EndOfTable"}, + {-1, NULL, NULL, NULL} }; typedef struct _dmi_minor { -- cgit From 27b3d2281f4b7677e908ef2505bd649305b5ac78 Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Thu, 30 Apr 2009 18:24:49 +0200 Subject: Began completing the rewrite of needed dmidecodemodule changes --- src/dmihelper.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/dmihelper.h') diff --git a/src/dmihelper.h b/src/dmihelper.h index 6c0b854..50cb185 100644 --- a/src/dmihelper.h +++ b/src/dmihelper.h @@ -9,6 +9,8 @@ #include #include +#include + #include "types.h" #define MAXVAL 1024 @@ -110,6 +112,8 @@ typedef struct _options { unsigned int flags; u8 *type; const struct string_keyword *string; + xmlDoc *mappingxml; + xmlNode *dmiversion_n; PyObject *dumpfile; } options; extern options opt; -- cgit From 1bf1da9fa4ad24148fe18c1c5baa9a4ec931402c Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Thu, 30 Apr 2009 19:38:25 +0200 Subject: Improved setting of pythonmap.xml The default file is now set to /usr/share/python-dmidecode/pythonmap.xml (defined in config.h) and can be overridden with the dmidecode.pythonmap() function in Python. --- src/dmihelper.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/dmihelper.h') diff --git a/src/dmihelper.h b/src/dmihelper.h index 50cb185..33da699 100644 --- a/src/dmihelper.h +++ b/src/dmihelper.h @@ -115,6 +115,7 @@ typedef struct _options { xmlDoc *mappingxml; xmlNode *dmiversion_n; PyObject *dumpfile; + char *python_xml_map; } options; extern options opt; -- cgit From cf468c3ceaf268da0ba17286bef85e4bdafcbc7e Mon Sep 17 00:00:00 2001 From: Nima Talebi Date: Sun, 24 May 2009 03:45:10 +1000 Subject: Loading in the new the new `type' XML file --- src/dmihelper.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/dmihelper.h') diff --git a/src/dmihelper.h b/src/dmihelper.h index 33da699..57ad7ab 100644 --- a/src/dmihelper.h +++ b/src/dmihelper.h @@ -113,9 +113,11 @@ typedef struct _options { u8 *type; const struct string_keyword *string; xmlDoc *mappingxml; + xmlDoc *typemappingxml; + char *python_xml_map; + char *python_xml_typemap; xmlNode *dmiversion_n; PyObject *dumpfile; - char *python_xml_map; } options; extern options opt; -- cgit From 13ff9d7e48ab1574b36473f75701cc7f7c1e461a Mon Sep 17 00:00:00 2001 From: Nima Talebi Date: Wed, 27 May 2009 00:11:54 +1000 Subject: WIP commit Merged the two XML files into one, and amended relevant code. I still want to modify the XML tag names, but not yet. The calls to dmidecode.type() not function as expected, but the others are broken - this is next. --- src/dmihelper.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/dmihelper.h') diff --git a/src/dmihelper.h b/src/dmihelper.h index 57ad7ab..82a936d 100644 --- a/src/dmihelper.h +++ b/src/dmihelper.h @@ -113,9 +113,7 @@ typedef struct _options { u8 *type; const struct string_keyword *string; xmlDoc *mappingxml; - xmlDoc *typemappingxml; char *python_xml_map; - char *python_xml_typemap; xmlNode *dmiversion_n; PyObject *dumpfile; } options; -- cgit From 62ae0e75016b31aa3062f296ed070e0610f0b98f Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Wed, 3 Jun 2009 15:22:23 +0200 Subject: Removed some dead code --- src/dmihelper.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/dmihelper.h') diff --git a/src/dmihelper.h b/src/dmihelper.h index 82a936d..6dccd94 100644 --- a/src/dmihelper.h +++ b/src/dmihelper.h @@ -94,10 +94,6 @@ typedef struct _dmi_minor { struct _dmi_minor *next; } dmi_minor; -void dmiAppendData(PyObject * pydata, const int count); -int dmiSetItem(PyObject * dict, const char *key, const char *format, ...); - -//dmi_minor* dmiAppendObject(long code, char const *key, const char *format, ...); /*** dmiopt.h ***/ struct string_keyword { -- cgit From a05daf8fde753404511e9f247ab4e9ac9a75bf1a Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Wed, 3 Jun 2009 20:40:47 +0200 Subject: Rewrote bigger parts to avoid global variables as much as possible --- src/dmihelper.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/dmihelper.h') diff --git a/src/dmihelper.h b/src/dmihelper.h index 6dccd94..bd2b7c9 100644 --- a/src/dmihelper.h +++ b/src/dmihelper.h @@ -111,8 +111,7 @@ typedef struct _options { xmlDoc *mappingxml; char *python_xml_map; xmlNode *dmiversion_n; - PyObject *dumpfile; + char *dumpfile; } options; -extern options opt; #endif -- cgit From 63e6c57e448d9dcc795cb14e89de6eb51f1033f6 Mon Sep 17 00:00:00 2001 From: Nima Talebi Date: Thu, 4 Jun 2009 09:49:56 +1000 Subject: Removal of more deprecated/unused code. --- src/dmihelper.h | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'src/dmihelper.h') diff --git a/src/dmihelper.h b/src/dmihelper.h index bd2b7c9..70f35ad 100644 --- a/src/dmihelper.h +++ b/src/dmihelper.h @@ -15,29 +15,6 @@ #define MAXVAL 1024 -static const int map_maj[] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, - 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, - 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, - 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, - 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, - 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, - 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, - 120, 121, 122, 123, 124, 125, 126, 127, -}; - -typedef struct _dmi_codes_major { - const unsigned short code; - const char *id; - const char *desc; - const char *tagname; -} dmi_codes_major; - static const dmi_codes_major dmiCodesMajor[] = { {0, "3.3.1", "BIOS Information", "BIOSinfo"}, {1, "3.3.2", "System Information", "SystemInfo"}, -- cgit From 97ba1cbc0842897f5459a75ef1cd2ecbb3cab136 Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Thu, 4 Jun 2009 10:09:39 +0200 Subject: Resurrected struct _dmi_codes_major This got removed in commit 63e6c57e448d9dcc795cb14e89de6eb51f1033f6, but is needed for the following struct in dmihelper.h, and in dmidecode.c::dmi_decode():3694 --- src/dmihelper.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/dmihelper.h') diff --git a/src/dmihelper.h b/src/dmihelper.h index 70f35ad..e888639 100644 --- a/src/dmihelper.h +++ b/src/dmihelper.h @@ -15,6 +15,13 @@ #define MAXVAL 1024 +typedef struct _dmi_codes_major { + const unsigned short code; + const char *id; + const char *desc; + const char *tagname; +} dmi_codes_major; + static const dmi_codes_major dmiCodesMajor[] = { {0, "3.3.1", "BIOS Information", "BIOSinfo"}, {1, "3.3.2", "System Information", "SystemInfo"}, -- cgit From 2cf4f28f6fc671478003b31c03b93e070eee9942 Mon Sep 17 00:00:00 2001 From: Nima Talebi Date: Fri, 5 Jun 2009 01:42:07 +1000 Subject: Further removal of deprecated functions Removed the `dmi_table_string' function, and `const struct string_keyword *string' from the `options' struct. Also modified the function calls that are now free of this, namely, `legacy_decode' and `smbios_decode'. --- src/dmihelper.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/dmihelper.h') diff --git a/src/dmihelper.h b/src/dmihelper.h index e888639..ccf840d 100644 --- a/src/dmihelper.h +++ b/src/dmihelper.h @@ -91,7 +91,6 @@ typedef struct _options { const char *devmem; unsigned int flags; u8 *type; - const struct string_keyword *string; xmlDoc *mappingxml; char *python_xml_map; xmlNode *dmiversion_n; -- cgit From 842f44f4efff348367ff9be5972def06d899b77b Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Thu, 4 Jun 2009 17:40:01 +0200 Subject: Fixed compiling issues after commit 2cf4f28f6fc671478003b31c03b93e070eee9942 Also cleaned up a little bit more, removed more unneeded stuff. --- src/dmihelper.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/dmihelper.h') diff --git a/src/dmihelper.h b/src/dmihelper.h index ccf840d..b0816b7 100644 --- a/src/dmihelper.h +++ b/src/dmihelper.h @@ -78,14 +78,6 @@ typedef struct _dmi_minor { struct _dmi_minor *next; } dmi_minor; - -/*** dmiopt.h ***/ -struct string_keyword { - const char *keyword; - u8 type; - u8 offset; -}; - /*** dmiopt.h ***/ typedef struct _options { const char *devmem; -- cgit From bfbac44bd8c0fcddcdcfade6a15313560c9cc6eb Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Tue, 9 Jun 2009 16:48:15 +0200 Subject: Big rewrite again, simplified the usage of opt->type Instead of building up an u8 array with 255 cells where we only use one cell at the time now, just pass the type id value as an int the whole way through. --- src/dmihelper.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dmihelper.h') diff --git a/src/dmihelper.h b/src/dmihelper.h index b0816b7..6607dc5 100644 --- a/src/dmihelper.h +++ b/src/dmihelper.h @@ -82,7 +82,7 @@ typedef struct _dmi_minor { typedef struct _options { const char *devmem; unsigned int flags; - u8 *type; + int type; xmlDoc *mappingxml; char *python_xml_map; xmlNode *dmiversion_n; -- cgit From a8257055f3d5f474d601cb3a5cbcbdb44e2b707d Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Thu, 11 Jun 2009 13:34:26 +0200 Subject: Made sure copyright is in place and right people get their deserved credit --- src/dmihelper.h | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'src/dmihelper.h') diff --git a/src/dmihelper.h b/src/dmihelper.h index 6607dc5..d89c024 100644 --- a/src/dmihelper.h +++ b/src/dmihelper.h @@ -1,3 +1,44 @@ +/*. ******* coding:utf-8 AUTOHEADER START v1.1 ******* + *. vim: fileencoding=utf-8 syntax=c sw=8 ts=8 et + *. + *. © 2007-2009 Nima Talebi + *. © 2009 David Sommerseth + *. © 2002-2008 Jean Delvare + *. © 2000-2002 Alan Cox + *. + *. This file is part of Python DMI-Decode. + *. + *. Python DMI-Decode is free software: you can redistribute it and/or modify + *. it under the terms of the GNU General Public License as published by + *. the Free Software Foundation, either version 2 of the License, or + *. (at your option) any later version. + *. + *. Python DMI-Decode is distributed in the hope that it will be useful, + *. but WITHOUT ANY WARRANTY; without even the implied warranty of + *. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + *. GNU General Public License for more details. + *. + *. You should have received a copy of the GNU General Public License + *. along with Python DMI-Decode. If not, see . + *. + *. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + *. WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + *. MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO + *. EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + *. INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + *. LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + *. PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + *. LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + *. OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + *. ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + *. + *. ADAPTED M. STONE & T. PARKER DISCLAIMER: THIS SOFTWARE COULD RESULT IN INJURY + *. AND/OR DEATH, AND AS SUCH, IT SHOULD NOT BE BUILT, INSTALLED OR USED BY ANYONE. + *. + *. $AutoHeaderSerial::20090522 $ + *. ******* AUTOHEADER END v1.1 ******* */ + + #ifndef HELPER #define HELPER 1 -- cgit