diff options
| -rw-r--r-- | dmidecodemodule.h | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/dmidecodemodule.h b/dmidecodemodule.h index 0be61b3..1738d69 100644 --- a/dmidecodemodule.h +++ b/dmidecodemodule.h @@ -10,7 +10,6 @@ #include "types.h" #include "util.h" #include "dmidecode.h" -#include "dmiopt.h" #include "dmioem.h" #define EFI_NOT_FOUND (-1) @@ -18,13 +17,39 @@ #include "dmihelper.h" -extern const char *dmi_dump(struct dmi_header *h, char *_); //extern void dmi_decode(struct dmi_header *h, u16 ver, PyObject* pydata); +extern PyObject *dmi_dump(struct dmi_header *h); extern PyObject* dmi_decode(struct dmi_header *h, u16 ver); -extern int address_from_efi(size_t *address, char *_); +extern int address_from_efi(size_t *address); extern void to_dmi_header(struct dmi_header *h, u8 *data); extern void dmi_table(u32 base, u16 len, u16 num, u16 ver, const char *devmem); extern int smbios_decode(u8 *buf, const char *devmem, PyObject* pydata); extern int legacy_decode(u8 *buf, const char *devmem, PyObject* pydata); extern void *mem_chunk(size_t base, size_t len, const char *devmem); + extern u8 *parse_opt_type(u8 *p, const char *arg); +static const u8 opt_type_bios[] = { 0, 13, 255 }; +static const u8 opt_type_system[] = { 1, 12, 15, 23, 32, 255 }; +static const u8 opt_type_baseboard[] = { 2, 10, 255 }; +static const u8 opt_type_chassis[] = { 3, 255 }; +static const u8 opt_type_processor[] = { 4, 255 }; +static const u8 opt_type_memory[] = { 5, 6, 16, 17, 255 }; +static const u8 opt_type_cache[] = { 7, 255 }; +static const u8 opt_type_connector[] = { 8, 255 }; +static const u8 opt_type_slot[] = { 9, 255 }; +struct type_keyword { + const char *keyword; + const u8 *type; +}; + +static const struct type_keyword opt_type_keyword[] = { + { "bios", opt_type_bios }, + { "system", opt_type_system }, + { "baseboard", opt_type_baseboard }, + { "chassis", opt_type_chassis }, + { "processor", opt_type_processor }, + { "memory", opt_type_memory }, + { "cache", opt_type_cache }, + { "connector", opt_type_connector }, + { "slot", opt_type_slot }, +}; |