diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | includes/devices.h | 4 | ||||
| -rw-r--r-- | modules/devices.c | 16 | ||||
| -rw-r--r-- | modules/devices/dmi_memory.c | 6 | ||||
| -rw-r--r-- | modules/devices/spd-decode.c (renamed from modules/devices/spd-decode2.c) | 0 |
5 files changed, 13 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 39acca1c..103359df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -155,7 +155,7 @@ set(MODULE_devices_SOURCES modules/devices/printers.c modules/devices/resources.c modules/devices/sensors.c -# modules/devices/spd-decode2.c +# modules/devices/spd-decode.c modules/devices/storage.c modules/devices/usb.c ) @@ -201,7 +201,7 @@ set_source_files_properties( set_source_files_properties( modules/devices/dmi_memory.c -# modules/devices/spd-decode2.c +# modules/devices/spd-decode.c PROPERTIES COMPILE_FLAGS "-std=c99 -Wno-deprecated-declarations" ) diff --git a/includes/devices.h b/includes/devices.h index ee47283e..03d4587b 100644 --- a/includes/devices.h +++ b/includes/devices.h @@ -65,9 +65,6 @@ void scan_sensors_do(void); void sensors_init(void); void sensors_shutdown(void); -/* SPD */ -void scan_spd_do(void); - extern gchar *battery_list; extern gchar *input_icons; extern gchar *input_list; @@ -87,7 +84,6 @@ extern GHashTable *sensor_labels; extern GModule *cups; extern gchar *dmi_info; - extern gchar *dtree_info; extern gchar *gpu_list; extern gchar *gpu_summary; diff --git a/modules/devices.c b/modules/devices.c index 3780ac3d..ca31f803 100644 --- a/modules/devices.c +++ b/modules/devices.c @@ -121,9 +121,9 @@ 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; +gchar *memory_devices_get_info(); +gboolean memory_devices_hinote(const char **msg); +gchar *memory_devices_info = NULL; #include <vendor.h> @@ -536,9 +536,9 @@ void scan_dmi(gboolean reload) void scan_dmi_mem(gboolean reload) { SCAN_START(); - if (dmi_mem_info) - g_free(dmi_mem_info); - dmi_mem_info = dmi_mem_socket_info(); + if (memory_devices_info) + g_free(memory_devices_info); + memory_devices_info = memory_devices_get_info(); SCAN_END(); } @@ -632,7 +632,7 @@ gchar *callback_dmi() gchar *callback_dmi_mem() { - return g_strdup(dmi_mem_info); + return g_strdup(memory_devices_info); } gchar *callback_dtree() @@ -803,7 +803,7 @@ const gchar *hi_note_func(gint entry) } else if (entry == ENTRY_DMI_MEM){ const char *msg; - if (dmi_mem_show_hinote(&msg)) { + if (memory_devices_hinote(&msg)) { return msg; } } diff --git a/modules/devices/dmi_memory.c b/modules/devices/dmi_memory.c index 7280d328..1bdf07ce 100644 --- a/modules/devices/dmi_memory.c +++ b/modules/devices/dmi_memory.c @@ -24,7 +24,7 @@ #include "dt_util.h" /* for appf() */ -#include "spd-decode2.c" +#include "spd-decode.c" gboolean no_handles = FALSE; gboolean sketchy_info = FALSE; @@ -439,7 +439,7 @@ gchar *make_spd_section(spd_data *spd) { return ret; } -gchar *dmi_mem_socket_info() { +gchar *memory_devices_get_info() { gchar *ret = g_strdup_printf( "[$ShellParam$]\nViewType=1\n" "ColumnTitle$TextValue=%s\n" /* Locator */ @@ -680,7 +680,7 @@ gchar *dmi_mem_socket_info() { static gchar *note_state = NULL; -gboolean dmi_mem_show_hinote(const char **msg) { +gboolean memory_devices_hinote(const char **msg) { gchar *want_dmi = _(" <b><i>dmidecode</i></b> utility available\n"); gchar *want_root = _(" ... <i>and</i> HardInfo running with superuser privileges\n"); diff --git a/modules/devices/spd-decode2.c b/modules/devices/spd-decode.c index bd2356bd..bd2356bd 100644 --- a/modules/devices/spd-decode2.c +++ b/modules/devices/spd-decode.c |