aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/benchmark.c3
-rw-r--r--modules/computer/ubuntu_flavors.c6
-rw-r--r--modules/devices/arm/arm_data.c112
-rw-r--r--modules/devices/arm/arm_data.h5
-rw-r--r--modules/devices/arm/processor.c11
-rw-r--r--modules/devices/devicetree.c5
-rw-r--r--modules/devices/dmi_memory.c25
-rw-r--r--modules/devices/inputdevices.c3
-rw-r--r--modules/devices/usb.c37
-rw-r--r--modules/devices/x86/processor.c6
10 files changed, 91 insertions, 122 deletions
diff --git a/modules/benchmark.c b/modules/benchmark.c
index 60b3e9f4..dc71be90 100644
--- a/modules/benchmark.c
+++ b/modules/benchmark.c
@@ -322,10 +322,11 @@ gchar *hi_get_field(gchar * field)
}
static void br_mi_add(char **results_list, bench_result *b, gboolean select) {
+ static unsigned int ri = 0; /* to ensure key is unique */
gchar *ckey, *rkey;
ckey = hardinfo_clean_label(b->machine->cpu_name, 0);
- rkey = strdup(b->machine->mid);
+ rkey = g_strdup_printf("%s__%d", b->machine->mid, ri++);
*results_list = h_strdup_cprintf("$%s%s$%s=%.2f|%s\n", *results_list,
select ? "*" : "", rkey, ckey,
diff --git a/modules/computer/ubuntu_flavors.c b/modules/computer/ubuntu_flavors.c
index ff64eb56..20e83c82 100644
--- a/modules/computer/ubuntu_flavors.c
+++ b/modules/computer/ubuntu_flavors.c
@@ -19,9 +19,7 @@
#include <hardinfo.h>
#include "distro_flavors.h"
-
-#include "dt_util.h" /* for appf() */
-#define SEQ(s,m) (g_strcmp0(s, m) == 0)
+#include "util_sysobj.h" /* for appfsp() */
static const UbuntuFlavor ubuntu_flavors[] = {
{ "Vanilla Server", "distros/ubuntu.svg", "https://ubuntu.org", "ubuntu-server" },
@@ -59,7 +57,7 @@ GSList *ubuntu_flavors_scan(void) {
gchar *cmd_line = g_strdup("apt-cache policy");
int i;
for(i = 0; ubuntu_flavors[i].base.name; i++) {
- cmd_line = appf(cmd_line, "%s", ubuntu_flavors[i].package);
+ cmd_line = appfsp(cmd_line, "%s", ubuntu_flavors[i].package);
}
if (!i)
return NULL;
diff --git a/modules/devices/arm/arm_data.c b/modules/devices/arm/arm_data.c
index 60e8ea34..4ca77be9 100644
--- a/modules/devices/arm/arm_data.c
+++ b/modules/devices/arm/arm_data.c
@@ -82,47 +82,6 @@ static struct {
};
static struct {
- int code; char *name;
-} tab_arm_implementer[] = {
- { 0x41, "ARM" },
- { 0x44, "Intel (formerly DEC) StrongARM" },
- { 0x4e, "nVidia" },
- { 0x54, "Texas Instruments" },
- { 0x56, "Marvell" },
- { 0x69, "Intel XScale" },
- { 0, NULL},
-};
-
-static struct {
- /* source: t = tested, d = official docs, f = web */
- int code; char *part_desc;
-} tab_arm_arm_part[] = { /* only valid for implementer 0x41 ARM */
- /*d */ { 0x920, "ARM920" },
- /*d */ { 0x926, "ARM926" },
- /*d */ { 0x946, "ARM946" },
- /*d */ { 0x966, "ARM966" },
- /*d */ { 0xb02, "ARM11 MPCore" },
- /*d */ { 0xb36, "ARM1136" },
- /*d */ { 0xb56, "ARM1156" },
- /*dt*/ { 0xb76, "ARM1176" },
- /*dt*/ { 0xc05, "Cortex-A5" },
- /*d */ { 0xc07, "Cortex-A7 MPCore" },
- /*dt*/ { 0xc08, "Cortex-A8" },
- /*dt*/ { 0xc09, "Cortex-A9" },
- /*d */ { 0xc0e, "Cortex-A17 MPCore" },
- /*d */ { 0xc0f, "Cortex-A15" },
- /*d */ { 0xd01, "Cortex-A32" },
- /*dt*/ { 0xd03, "Cortex-A53" },
- /*d */ { 0xd04, "Cortex-A35" },
- /*d */ { 0xd05, "Cortex-A55" },
- /*d */ { 0xd07, "Cortex-A57 MPCore" },
- /*d */ { 0xd08, "Cortex-A72" },
- /*d */ { 0xd09, "Cortex-A73" },
- /*d */ { 0xd0a, "Cortex-A75" },
- { 0, NULL},
-};
-
-static struct {
char *code; char *name; char *more;
} tab_arm_arch[] = {
{ "7", "AArch32", "AArch32 (ARMv7)" },
@@ -161,37 +120,47 @@ const char *arm_flag_meaning(const char *flag) {
return NULL;
}
-static int code_match(int c0, const char* code1) {
- int c1;
- if (code1 == NULL) return 0;
- c1 = strtol(code1, NULL, 0);
- return (c0 == c1) ? 1 : 0;
-}
-
-const char *arm_implementer(const char *code) {
- int i = 0;
- if (code)
- while(tab_arm_implementer[i].code) {
- if (code_match(tab_arm_implementer[i].code, code))
- return tab_arm_implementer[i].name;
- i++;
+#include "util_ids.h"
+
+gchar *arm_ids_file = NULL;
+
+void find_arm_ids_file() {
+ if (arm_ids_file) return;
+ char *file_search_order[] = {
+ g_build_filename(g_get_user_config_dir(), "hardinfo", "arm.ids", NULL),
+ g_build_filename(params.path_data, "arm.ids", NULL),
+ NULL
+ };
+ int n;
+ for(n = 0; file_search_order[n]; n++) {
+ if (!arm_ids_file && !access(file_search_order[n], R_OK))
+ arm_ids_file = (gchar*) auto_free_on_exit( file_search_order[n] );
+ else
+ g_free(file_search_order[n]);
}
- return NULL;
}
-const char *arm_part(const char *imp_code, const char *part_code) {
- int i = 0;
- if (imp_code && part_code) {
- if (code_match(0x41, imp_code)) {
- /* 0x41=ARM parts */
- while(tab_arm_arm_part[i].code) {
- if (code_match(tab_arm_arm_part[i].code, part_code))
- return tab_arm_arm_part[i].part_desc;
- i++;
- }
- }
- }
- return NULL;
+void arm_part(const char *imp_code, const char *part_code, char **imp, char **part) {
+ gchar *qpath = NULL;
+ ids_query_result result = {};
+ unsigned int i,p;
+
+ if (!arm_ids_file)
+ find_arm_ids_file();
+
+ i = strtol(imp_code, NULL, 0);
+ p = strtol(part_code, NULL, 0);
+ qpath = g_strdup_printf("%02x/%03x", i, p);
+ scan_ids_file(arm_ids_file, qpath, &result, -1);
+ g_free(qpath);
+ if (imp)
+ *imp = result.results[0]
+ ? g_strdup(result.results[0])
+ : NULL;
+ if (part)
+ *part = result.results[1]
+ ? g_strdup(result.results[1])
+ : NULL;
}
const char *arm_arch(const char *cpuinfo_arch_str) {
@@ -229,8 +198,7 @@ char *arm_decoded_name(const char *imp, const char *part, const char *var, const
* variant and revision can be rendered r{variant}p{revision} */
r = strtol(var, NULL, 0);
p = strtol(rev, NULL, 0);
- imp_name = (char*) arm_implementer(imp);
- part_desc = (char*) arm_part(imp, part);
+ arm_part(imp, part, &imp_name, &part_desc);
arch_name = (char*) arm_arch(arch);
if (imp_name || part_desc) {
if (arch_name != arch)
@@ -251,6 +219,8 @@ char *arm_decoded_name(const char *imp, const char *part, const char *var, const
(part_desc) ? part_desc : part,
r, p, arch);
}
+ g_free(imp_name);
+ g_free(part_desc);
} else {
/* prolly not ARM arch at all */
if (model_name)
diff --git a/modules/devices/arm/arm_data.h b/modules/devices/arm/arm_data.h
index 63b3c906..0e93d323 100644
--- a/modules/devices/arm/arm_data.h
+++ b/modules/devices/arm/arm_data.h
@@ -22,13 +22,12 @@
#define _ARMDATA_H_
/* table lookups */
-const char *arm_implementer(const char *code);
-const char *arm_part(const char *imp_code, const char *part_code);
+void arm_part(const char *imp_code, const char *part_code, char **imp, char **part);
const char *arm_arch(const char *cpuinfo_arch_str);
const char *arm_arch_more(const char *cpuinfo_arch_str);
/* cpu_implementer, cpu_part, cpu_variant, cpu_revision, cpu_architecture from /proc/cpuinfo
- * model_name is returned as a fallback if not enough data is known */
+ * strdup(model_name) is returned as a fallback if not enough data is known */
char *arm_decoded_name(
const char *imp, const char *part, const char *var, const char *rev,
const char *arch, const char *model_name);
diff --git a/modules/devices/arm/processor.c b/modules/devices/arm/processor.c
index 87200335..a1b7f81a 100644
--- a/modules/devices/arm/processor.c
+++ b/modules/devices/arm/processor.c
@@ -311,10 +311,10 @@ gchar *clocks_summary(GSList * processors)
gchar *
processor_get_detailed_info(Processor *processor)
{
- gchar *tmp_flags, *tmp_imp, *tmp_part, *tmp_arch, *tmp_cpufreq, *tmp_topology, *ret;
+ gchar *tmp_flags, *tmp_imp = NULL, *tmp_part = NULL,
+ *tmp_arch, *tmp_cpufreq, *tmp_topology, *ret;
tmp_flags = processor_get_capabilities_from_flags(processor->flags);
- tmp_imp = (char*)arm_implementer(processor->cpu_implementer);
- tmp_part = (char*)arm_part(processor->cpu_implementer, processor->cpu_part);
+ arm_part(processor->cpu_implementer, processor->cpu_part, &tmp_imp, &tmp_part);
tmp_arch = (char*)arm_arch_more(processor->cpu_architecture);
tmp_topology = cputopo_section_str(processor->cputopo);
@@ -375,9 +375,10 @@ gchar *processor_name(GSList *processors) {
char *vendor;
char *soc;
} dt_compat_searches[] = {
- { "brcm,bcm2837", "Broadcom", "BCM2837" }, // RPi 1
+ { "brcm,bcm2838", "Broadcom", "BCM2838" }, // RPi 4
+ { "brcm,bcm2837", "Broadcom", "BCM2837" }, // RPi 3
{ "brcm,bcm2836", "Broadcom", "BCM2836" }, // RPi 2
- { "brcm,bcm2835", "Broadcom", "BCM2835" }, // RPi 3
+ { "brcm,bcm2835", "Broadcom", "BCM2835" }, // RPi 1
{ "rockchip,rk3288", "Rockchip", "RK3288" }, // Asus Tinkerboard
{ "rockchip,rk3328", "Rockchip", "RK3328" }, // Firefly Renegade
{ "rockchip,rk3399", "Rockchip", "RK3399" }, // Firefly Renegade Elite
diff --git a/modules/devices/devicetree.c b/modules/devices/devicetree.c
index 1f2549dd..4fd52cbb 100644
--- a/modules/devices/devicetree.c
+++ b/modules/devices/devicetree.c
@@ -28,6 +28,7 @@
#include "devices.h"
#include "cpu_util.h"
#include "dt_util.h"
+#include "appf.h"
gchar *dtree_info = NULL;
const char *dtree_mem_str = NULL; /* used by memory devices when nothing else is available */
@@ -267,12 +268,12 @@ static void add_keys(dtr *dt, char *np) {
static char *msg_section(dtr *dt, int dump) {
gchar *aslbl = NULL;
gchar *messages = dtr_messages(dt);
- gchar *ret = g_strdup_printf("[%s]\n", _("Messages"));
+ gchar *ret = g_strdup_printf("[%s]", _("Messages"));
gchar **lines = g_strsplit(messages, "\n", 0);
int i = 0;
while(lines[i] != NULL) {
aslbl = hardinfo_clean_label(lines[i], 0);
- ret = appf(ret, "%s=\n", aslbl);
+ ret = appfnl(ret, "%s=", aslbl);
g_free(aslbl);
i++;
}
diff --git a/modules/devices/dmi_memory.c b/modules/devices/dmi_memory.c
index 33181de2..8e9e25c3 100644
--- a/modules/devices/dmi_memory.c
+++ b/modules/devices/dmi_memory.c
@@ -26,7 +26,7 @@
extern const char *dtree_mem_str; /* in devicetree.c */
-#include "dt_util.h" /* for appf() */
+#include "util_sysobj.h" /* for appfsp() */
#define dmi_spd_msg(...) /* fprintf (stderr, __VA_ARGS__) */
typedef uint64_t dmi_mem_size;
@@ -51,7 +51,6 @@ static const char empty_icon[] = "module.png";
#define UNKIFNULL2(f) ((f) ? f : _("(Unknown)"))
#define UNKIFEMPTY2(f) ((*f) ? f : _("(Unknown)"))
-#define SEQ(s,m) (g_strcmp0(s, m) == 0)
#define STR_IGNORE(str, ignore) if (SEQ(str, ignore)) { *str = 0; null_if_empty(&str); }
const char *problem_marker() {
@@ -682,7 +681,7 @@ gchar *memory_devices_get_info() {
for(i = 1; i < N_RAM_TYPES; i++) {
int bit = 1 << (i-1);
if (a->ram_types & bit)
- types_str = appf(types_str, "%s", GET_RAM_TYPE_STR(i));
+ types_str = appfsp(types_str, "%s", GET_RAM_TYPE_STR(i));
}
gchar *details = g_strdup_printf("[%s]\n"
@@ -824,7 +823,7 @@ gchar *memory_devices_get_info() {
for(i = 1; i < N_RAM_TYPES; i++) {
int bit = 1 << (i-1);
if (mem->spd_ram_types & bit)
- types_str = appf(types_str, "%s", GET_RAM_TYPE_STR(i));
+ types_str = appfsp(types_str, "%s", GET_RAM_TYPE_STR(i));
}
gchar *details = g_strdup_printf("[%s]\n"
@@ -924,7 +923,7 @@ gchar *memory_devices_get_system_memory_types_str() {
for(i = 1; i < N_RAM_TYPES; i++) {
int bit = 1 << (i-1);
if (rtypes & bit)
- types_str = appf(types_str, "%s", GET_RAM_TYPE_STR(i));
+ types_str = appfsp(types_str, "%s", GET_RAM_TYPE_STR(i));
}
ret = g_strdup(UNKIFNULL2(types_str));
g_free(types_str);
@@ -954,9 +953,9 @@ static gchar *note_state = NULL;
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");
- gchar *want_eeprom = _(" <b><i>eeprom</i></b> module loaded (for SDR, DDR, DDR2, DDR3)\n");
+ gchar *want_dmi = _(" <b><i>dmidecode</i></b> utility available");
+ gchar *want_root = _(" ... <i>and</i> HardInfo running with superuser privileges");
+ gchar *want_eeprom = _(" <b><i>eeprom</i></b> module loaded (for SDR, DDR, DDR2, DDR3)");
gchar *want_ee1004 = _(" ... <i>or</i> <b><i>ee1004</i></b> module loaded <b>and configured!</b> (for DDR4)");
gboolean has_root = (getuid() == 0);
@@ -968,11 +967,11 @@ gboolean memory_devices_hinote(const char **msg) {
char *bullet_no = "<big><b>\u2022<tt> </tt></b></big>";
g_free(note_state);
- note_state = g_strdup(_("Memory information requires <b>one or both</b> of the following:\n"));
- note_state = appf(note_state, "<tt>1. </tt>%s%s", has_dmi ? bullet_yes : bullet_no, want_dmi);
- note_state = appf(note_state, "<tt> </tt>%s%s", has_root ? bullet_yes : bullet_no, want_root);
- note_state = appf(note_state, "<tt>2. </tt>%s%s", has_eeprom ? bullet_yes : bullet_no, want_eeprom);
- note_state = appf(note_state, "<tt> </tt>%s%s", has_ee1004 ? bullet_yes : bullet_no, want_ee1004);
+ note_state = g_strdup(_("Memory information requires <b>one or both</b> of the following:"));
+ note_state = appfnl(note_state, "<tt>1. </tt>%s%s", has_dmi ? bullet_yes : bullet_no, want_dmi);
+ note_state = appfnl(note_state, "<tt> </tt>%s%s", has_root ? bullet_yes : bullet_no, want_root);
+ note_state = appfnl(note_state, "<tt>2. </tt>%s%s", has_eeprom ? bullet_yes : bullet_no, want_eeprom);
+ note_state = appfnl(note_state, "<tt> </tt>%s%s", has_ee1004 ? bullet_yes : bullet_no, want_ee1004);
gboolean ddr3_ee1004 = ((dmi_ram_types & (1<<DDR3_SDRAM)) && has_ee1004);
diff --git a/modules/devices/inputdevices.c b/modules/devices/inputdevices.c
index f3bacf5e..58fb2117 100644
--- a/modules/devices/inputdevices.c
+++ b/modules/devices/inputdevices.c
@@ -96,7 +96,8 @@ __scan_input_devices(void)
input_devices[d].icon);
gchar *v_str = vendor_get_link(name);
- v_str = hardinfo_clean_value(v_str, 1);
+ if (g_strcmp0(v_str, name) == 0)
+ v_str = hardinfo_clean_value(v_str, 1);
name = hardinfo_clean_value(name, 1);
gchar *strhash = g_strdup_printf("[%s]\n"
diff --git a/modules/devices/usb.c b/modules/devices/usb.c
index f01bee5a..d0f16247 100644
--- a/modules/devices/usb.c
+++ b/modules/devices/usb.c
@@ -25,7 +25,7 @@
gchar *usb_list = NULL;
gchar *usb_icons = NULL;
-#define UNKIFNULL_AC(f) (f != NULL) ? f : _("(Unknown)");
+#define UNKIFNULL_AC(f) (f != NULL) ? f : _("(Unknown)")
#define IARR_END -2
#define IARR_ANY -1
@@ -98,10 +98,8 @@ static const char* get_usbdev_icon(const usbd *u) {
}
static void _usb_dev(const usbd *u) {
- gchar *name, *key, *v_str, *label, *str, *speed;
- gchar *product, *vendor, *dev_class_str, *dev_subclass_str; /* don't free */
- gchar *manufacturer, *device, *if_driver, *if_class_str; /* don't free */
- gchar *if_subclass_str, *if_protocol_str; /* don't free */
+ gchar *name, *key, *v_str, *mv_str, *label, *str, *speed;
+ gchar *product, *vendor, *manufacturer, *device; /* don't free */
gchar *interfaces = strdup("");
usbi *i;
const char* icon;
@@ -110,8 +108,6 @@ static void _usb_dev(const usbd *u) {
product = UNKIFNULL_AC(u->product);
manufacturer = UNKIFNULL_AC(u->manufacturer);
device = UNKIFNULL_AC(u->device);
- dev_class_str = UNKIFNULL_AC(u->dev_class_str);
- dev_subclass_str = UNKIFNULL_AC(u->dev_subclass_str);
name = g_strdup_printf("%s %s", u->vendor? vendor: manufacturer, u->product? product: device);
key = g_strdup_printf("USB%03d:%03d:%03d", u->bus, u->dev, 0);
@@ -122,15 +118,11 @@ static void _usb_dev(const usbd *u) {
usb_icons = h_strdup_cprintf("Icon$%s$%s=%s.png\n", usb_icons, key, label, icon ? icon: "usb");
v_str = vendor_get_link(vendor);
+ mv_str = vendor_get_link(manufacturer);
if (u->if_list != NULL) {
i = u->if_list;
while (i != NULL){
- if_class_str = UNKIFNULL_AC(i->if_class_str);
- if_subclass_str = UNKIFNULL_AC(i->if_subclass_str);
- if_protocol_str = UNKIFNULL_AC(i->if_protocol_str);
- if_driver = UNKIFNULL_AC(i->driver);
-
interfaces = h_strdup_cprintf("[%s %d %s]\n"
/* Class */ "%s=[%d] %s\n"
/* Sub-class */ "%s=[%d] %s\n"
@@ -138,10 +130,10 @@ static void _usb_dev(const usbd *u) {
/* Driver */ "%s=%s\n",
interfaces,
_("Interface"), i->if_number, i->if_label? i->if_label: "",
- _("Class"), i->if_class, if_class_str,
- _("Sub-class"), i->if_subclass, if_subclass_str,
- _("Protocol"), i->if_protocol, if_protocol_str,
- _("Driver"), if_driver
+ _("Class"), i->if_class, UNKIFNULL_AC(i->if_class_str),
+ _("Sub-class"), i->if_subclass, UNKIFNULL_AC(i->if_subclass_str),
+ _("Protocol"), i->if_protocol, UNKIFNULL_AC(i->if_protocol_str),
+ _("Driver"), UNKIFNULL_AC(i->driver)
);
i = i->next;
}
@@ -164,7 +156,9 @@ static void _usb_dev(const usbd *u) {
/* Speed */ "%s=%s\n"
/* Class */ "%s=[%d] %s\n"
/* Sub-class */ "%s=[%d] %s\n"
+ /* Protocol */ "%s=[%d] %s\n"
/* Dev Version */ "%s=%s\n"
+ /* Serial */ "%s=%s\n"
"[%s]\n"
/* Bus */ "%s=%03d\n"
/* Device */ "%s=%03d\n"
@@ -173,13 +167,15 @@ static void _usb_dev(const usbd *u) {
_("Product"), u->product_id, product,
_("Vendor"), u->vendor_id, v_str,
_("Device"), device,
- _("Manufacturer"), manufacturer,
+ _("Manufacturer"), mv_str,
_("Max Current"), u->max_curr_ma, _("mA"),
_("USB Version"), u->usb_version,
_("Speed"), speed,
- _("Class"), u->dev_class, dev_class_str,
- _("Sub-class"), u->dev_subclass, dev_subclass_str,
- _("Device Version"), u->device_version,
+ _("Class"), u->dev_class, UNKIFNULL_AC(u->dev_class_str),
+ _("Sub-class"), u->dev_subclass, UNKIFNULL_AC(u->dev_subclass_str),
+ _("Protocol"), u->dev_protocol, UNKIFNULL_AC(u->dev_protocol_str),
+ _("Device Version"), UNKIFNULL_AC(u->device_version),
+ _("Serial Number"), UNKIFNULL_AC(u->serial),
_("Connection"),
_("Bus"), u->bus,
_("Device"), u->dev,
@@ -190,6 +186,7 @@ static void _usb_dev(const usbd *u) {
g_free(speed);
g_free(v_str);
+ g_free(mv_str);
g_free(name);
g_free(key);
g_free(label);
diff --git a/modules/devices/x86/processor.c b/modules/devices/x86/processor.c
index 768a70fa..538206c1 100644
--- a/modules/devices/x86/processor.c
+++ b/modules/devices/x86/processor.c
@@ -19,7 +19,7 @@
#include "hardinfo.h"
#include "devices.h"
#include "cpu_util.h"
-
+#include "nice_name.h"
#include "x86_data.h"
#include "x86_data.c"
@@ -567,6 +567,8 @@ GSList *processor_scan(void)
if (processor->cpufreq->cpukhz_max)
processor->cpu_mhz = processor->cpufreq->cpukhz_max / 1000;
+
+ nice_name_x86_cpuid_model_string(processor->model_name);
}
return procs;
@@ -648,7 +650,7 @@ gchar *processor_get_detailed_info(Processor * processor)
processor->model,
processor->stepping,
processor->strmodel,
- _("Vendor"), idle_free(vendor_get_link(processor->vendor_id)),
+ _("Vendor"), (char*)idle_free(vendor_get_link(processor->vendor_id)),
_("Microcode Version"), processor->microcode,
_("Configuration"),
_("Cache Size"), processor->cache_size, _("kb"),
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-06 18:59:44 +0000