diff options
| author | Burt P <pburt0@gmail.com> | 2019-06-21 10:36:50 -0500 |
|---|---|---|
| committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2019-06-22 08:45:43 -0700 |
| commit | c12d2d4b64548a0f5301f154d6eec1981cb66c9b (patch) | |
| tree | 70a5d18a0954ac16285e0e6e9a95327e7a37f541 /modules/devices.c | |
| parent | 6c3f27c5b435bccaab111d8dd32dc28473251f10 (diff) | |
DMI socket/module information moved from Processor to Memory DMI
As discussed in
https://github.com/lpereira/hardinfo/issues/345
Signed-off-by: Burt P <pburt0@gmail.com>
Diffstat (limited to 'modules/devices.c')
| -rw-r--r-- | modules/devices.c | 35 |
1 files changed, 32 insertions, 3 deletions
diff --git a/modules/devices.c b/modules/devices.c index 0056ea6e..e209ebe5 100644 --- a/modules/devices.c +++ b/modules/devices.c @@ -50,6 +50,7 @@ gchar *callback_storage(); gchar *callback_input(); gchar *callback_usb(); gchar *callback_dmi(); +gchar *callback_dmi_mem(); gchar *callback_spd(); gchar *callback_dtree(); gchar *callback_device_resources(); @@ -64,6 +65,7 @@ void scan_storage(gboolean reload); void scan_input(gboolean reload); void scan_usb(gboolean reload); void scan_dmi(gboolean reload); +void scan_dmi_mem(gboolean reload); void scan_spd(gboolean reload); void scan_dtree(gboolean reload); void scan_device_resources(gboolean reload); @@ -75,8 +77,11 @@ gchar *hi_more_info(gchar *entry); enum { ENTRY_DTREE, + ENTRY_DMI, ENTRY_PROCESSOR, ENTRY_GPU, + ENTRY_SPD, + ENTRY_DMI_MEM, ENTRY_PCI, ENTRY_USB, ENTRY_PRINTERS, @@ -84,8 +89,6 @@ enum { ENTRY_SENSORS, ENTRY_INPUT, ENTRY_STORAGE, - ENTRY_DMI, - ENTRY_SPD, ENTRY_RESOURCES }; @@ -99,8 +102,9 @@ static ModuleEntry entries[] = { [ENTRY_SENSORS] = {N_("Sensors"), "therm.png", callback_sensors, scan_sensors, MODULE_FLAG_NONE}, [ENTRY_INPUT] = {N_("Input Devices"), "inputdevices.png", callback_input, scan_input, MODULE_FLAG_NONE}, [ENTRY_STORAGE] = {N_("Storage"), "hdd.png", callback_storage, scan_storage, MODULE_FLAG_NONE}, - [ENTRY_DMI] = {N_("DMI"), "computer.png", callback_dmi, scan_dmi, MODULE_FLAG_NONE}, + [ENTRY_DMI] = {N_("System DMI"), "computer.png", callback_dmi, scan_dmi, MODULE_FLAG_NONE}, [ENTRY_SPD] = {N_("Memory SPD"), "memory.png", callback_spd, scan_spd, MODULE_FLAG_NONE}, + [ENTRY_DMI_MEM] = {N_("Memory DMI"), "memory.png", callback_dmi_mem, scan_dmi_mem, MODULE_FLAG_NONE}, #if defined(ARCH_x86) || defined(ARCH_x86_64) [ENTRY_DTREE] = {"#"}, #else @@ -120,6 +124,11 @@ gchar *storage_list = NULL; gchar *battery_list = NULL; gchar *lginterval = NULL; +/* in dmi_memory.c */ +gchar *dmi_mem_socket_info(); +gboolean dmi_mem_show_hinote(const char **msg); +gchar *dmi_mem_info = NULL; + #include <vendor.h> extern gchar *gpu_summary; @@ -524,6 +533,15 @@ void scan_dmi(gboolean reload) SCAN_END(); } +void scan_dmi_mem(gboolean reload) +{ + SCAN_START(); + if (dmi_mem_info) + g_free(dmi_mem_info); + dmi_mem_info = dmi_mem_socket_info(); + SCAN_END(); +} + void scan_spd(gboolean reload) { SCAN_START(); @@ -619,6 +637,11 @@ gchar *callback_dmi() return g_strdup(dmi_info); } +gchar *callback_dmi_mem() +{ + return g_strdup(dmi_mem_info); +} + gchar *callback_spd() { return g_strdup(spd_info); @@ -796,5 +819,11 @@ const gchar *hi_note_func(gint entry) return msg; } } + else if (entry == ENTRY_DMI_MEM){ + const char *msg; + if (dmi_mem_show_hinote(&msg)) { + return msg; + } + } return NULL; } |