diff options
| author | Burt P <pburt0@gmail.com> | 2019-06-26 22:58:57 -0500 |
|---|---|---|
| committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2019-06-28 07:04:04 -0700 |
| commit | 91af75547e7d494a82f8af8d17b4b9acb0af938d (patch) | |
| tree | 79937af68b1b37d88bf26dc5865c3aaf15e1c11b /modules/devices.c | |
| parent | 495481a4f2c9b21acb7bcecd793b4b6e9078399a (diff) | |
Combine Memory DMI and Memory SPD into "Memory Devices"
Combines the information from DMI and SPD into a single
Memory Devices section.
Signed-off-by: Burt P <pburt0@gmail.com>
Diffstat (limited to 'modules/devices.c')
| -rw-r--r-- | modules/devices.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/modules/devices.c b/modules/devices.c index f3c5addf..3780ac3d 100644 --- a/modules/devices.c +++ b/modules/devices.c @@ -51,7 +51,6 @@ gchar *callback_input(); gchar *callback_usb(); gchar *callback_dmi(); gchar *callback_dmi_mem(); -gchar *callback_spd(); gchar *callback_dtree(); gchar *callback_device_resources(); @@ -66,7 +65,6 @@ 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); @@ -80,7 +78,6 @@ enum { ENTRY_DMI, ENTRY_PROCESSOR, ENTRY_GPU, - ENTRY_SPD, ENTRY_DMI_MEM, ENTRY_PCI, ENTRY_USB, @@ -103,8 +100,7 @@ static ModuleEntry entries[] = { [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_("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}, + [ENTRY_DMI_MEM] = {N_("Memory Devices"), "memory.png", callback_dmi_mem, scan_dmi_mem, MODULE_FLAG_NONE}, #if defined(ARCH_x86) || defined(ARCH_x86_64) [ENTRY_DTREE] = {"#"}, #else @@ -546,13 +542,6 @@ void scan_dmi_mem(gboolean reload) SCAN_END(); } -void scan_spd(gboolean reload) -{ - SCAN_START(); - scan_spd_do(); - SCAN_END(); -} - void scan_dtree(gboolean reload) { SCAN_START(); @@ -646,11 +635,6 @@ gchar *callback_dmi_mem() return g_strdup(dmi_mem_info); } -gchar *callback_spd() -{ - return g_strdup(spd_info); -} - gchar *callback_dtree() { return g_strdup_printf("%s" @@ -817,12 +801,6 @@ const gchar *hi_note_func(gint entry) "<b><i>udisksd</i></b> is required for NVMe devices.")); } } - else if (entry == ENTRY_SPD){ - const char *msg; - if (spd_decode_show_hinote(&msg)) { - return msg; - } - } else if (entry == ENTRY_DMI_MEM){ const char *msg; if (dmi_mem_show_hinote(&msg)) { |