aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--hardinfo2/arch/linux/common/net.h1
-rw-r--r--hardinfo2/arch/linux/common/storage.h86
l---------hardinfo2/arch/linux/x86/net.h2
-rw-r--r--hardinfo2/arch/linux/x86/processor.h39
-rw-r--r--hardinfo2/vendor.c2
5 files changed, 97 insertions, 33 deletions
diff --git a/hardinfo2/arch/linux/common/net.h b/hardinfo2/arch/linux/common/net.h
index 2a89529c..08ef1cf3 100644
--- a/hardinfo2/arch/linux/common/net.h
+++ b/hardinfo2/arch/linux/common/net.h
@@ -108,6 +108,7 @@ static struct {
{ "ppp", "Point-to-Point", "modem" },
{ "ath", "Wireless", "wireless" },
{ "wlan", "Wireless", "wireless" },
+ { "ra", "Wireless", "wireless" },
{ "tun", "Virtual Point-to-Point (TUN)", "network-generic" },
{ "tap", "Ethernet (TAP)", "network-generic" },
{ "plip", "Parallel Line Internet Protocol", "network" },
diff --git a/hardinfo2/arch/linux/common/storage.h b/hardinfo2/arch/linux/common/storage.h
index 71c206cd..067010c7 100644
--- a/hardinfo2/arch/linux/common/storage.h
+++ b/hardinfo2/arch/linux/common/storage.h
@@ -98,8 +98,8 @@ __scan_scsi_devices(void)
{ "Direct-Access", "Disk", "hdd"},
{ "Sequential-Access", "Tape", "tape"},
{ "Printer", "Printer", "lpr"},
- { "WORM", "CD-ROM", "cd"},
- { "CD-ROM", "CD-ROM", "cd"},
+ { "WORM", "CD-ROM", "cdrom"},
+ { "CD-ROM", "CD-ROM", "cdrom"},
{ "Scanner", "Scanner", "scanner"},
{ NULL, "Generic", "scsi"}
};
@@ -116,25 +116,35 @@ __scan_scsi_devices(void)
gchar *devid = g_strdup_printf("SCSI%d", n);
storage_list = h_strdup_cprintf("$%s$%s=\n", storage_list, devid, model);
storage_icons = h_strdup_cprintf("Icon$%s$%s=%s.png\n", storage_icons, devid, model, icon);
-
+
gchar *strhash = g_strdup_printf("[Device Information]\n"
- "Model=%s\n"
- "Vendor=%s (%s)\n"
- "Type=%s\n"
- "Revision=%s\n"
- "[SCSI Controller]\n"
- "Controller=scsi%d\n"
- "Channel=%d\n"
- "ID=%d\n" "LUN=%d\n",
- model,
- vendor_get_name(model),
- vendor_get_url(model),
- type,
- revision,
- scsi_controller,
- scsi_channel,
- scsi_id,
- scsi_lun);
+ "Model=%s\n",model);
+
+ const gchar *url = vendor_get_url(model);
+ if (url) {
+ strhash = h_strdup_cprintf("Vendor=%s (%s)\n",
+ strhash,
+ vendor_get_name(model),
+ url);
+ } else {
+ strhash = h_strdup_cprintf("Vendor=%s\n",
+ strhash,
+ vendor_get_name(model));
+ }
+
+ strhash = h_strdup_cprintf("Type=%s\n"
+ "Revision=%s\n"
+ "[SCSI Controller]\n"
+ "Controller=scsi%d\n"
+ "Channel=%d\n"
+ "ID=%d\n" "LUN=%d\n",
+ strhash,
+ type,
+ revision,
+ scsi_controller,
+ scsi_channel,
+ scsi_id,
+ scsi_lun);
g_hash_table_insert(moreinfo, devid, strhash);
g_free(model);
@@ -290,19 +300,31 @@ __scan_ide_devices(void)
storage_icons = h_strdup_cprintf("Icon$%s$%s=%s.png\n", storage_icons, devid,
model, g_str_equal(media, "cdrom") ? \
"cdrom" : "hdd");
-
+
gchar *strhash = g_strdup_printf("[Device Information]\n"
- "Model=%s\n"
- "Vendor=%s (%s)\n"
- "Device Name=hd%c\n"
- "Media=%s\n"
- "Cache=%dkb\n",
- model,
- vendor_get_name(model),
- vendor_get_url(model),
- iface,
- media,
- cache);
+ "Model=%s\n",
+ model);
+
+ const gchar *url = vendor_get_url(model);
+
+ if (url) {
+ strhash = h_strdup_cprintf("Vendor=%s (%s)\n",
+ strhash,
+ vendor_get_name(model),
+ url);
+ } else {
+ strhash = h_strdup_cprintf("Vendor=%s\n",
+ strhash,
+ vendor_get_name(model));
+ }
+
+ strhash = h_strdup_cprintf("Device Name=hd%c\n"
+ "Media=%s\n"
+ "Cache=%dkb\n",
+ strhash,
+ iface,
+ media,
+ cache);
if (driver) {
strhash = h_strdup_cprintf("%s\n", strhash, driver);
diff --git a/hardinfo2/arch/linux/x86/net.h b/hardinfo2/arch/linux/x86/net.h
index 488b5ae3..72d77b26 120000
--- a/hardinfo2/arch/linux/x86/net.h
+++ b/hardinfo2/arch/linux/x86/net.h
@@ -1 +1 @@
-../../../arch/linux/common/net.h \ No newline at end of file
+../../linux/common/net.h \ No newline at end of file
diff --git a/hardinfo2/arch/linux/x86/processor.h b/hardinfo2/arch/linux/x86/processor.h
index fd8711af..a57f0e71 100644
--- a/hardinfo2/arch/linux/x86/processor.h
+++ b/hardinfo2/arch/linux/x86/processor.h
@@ -254,6 +254,45 @@ static struct {
{ "tm", "Thermal Monitor" },
{ "pbe", "Pending Break Enable" },
{ "pb", "Pending Break Enable" },
+ { "pn", "Processor serial number" },
+ { "ds", "Debug Store" },
+ { "xmm2", "Streaming SIMD Extensions-2" },
+ { "xmm3", "Streaming SIMD Extensions-3" },
+ { "selfsnoop", "CPU self snoop" },
+ { "rdtscp", "RDTSCP" },
+ { "recovery", "CPU in recovery mode" },
+ { "longrun", "Longrun power control" },
+ { "lrti", "LongRun table interface" },
+ { "cxmmx", "Cyrix MMX extensions" },
+ { "k6_mtrr", "AMD K6 nonstandard MTRRs" },
+ { "cyrix_arr", "Cyrix ARRs (= MTRRs)" },
+ { "centaur_mcr","Centaur MCRs (= MTRRs)" },
+ { "constant_tsc","TSC ticks at a constant rate" },
+ { "up", "smp kernel running on up" },
+ { "fxsave_leak","FXSAVE leaks FOP/FIP/FOP" },
+ { "arch_perfmon","Intel Architectural PerfMon" },
+ { "pebs", "Precise-Event Based Sampling" },
+ { "bts", "Branch Trace Store" },
+ { "sync_rdtsc", "RDTSC synchronizes the CPU" },
+ { "rep_good", "rep microcode works well on this CPU" },
+ { "mwait", "Monitor/Mwait support" },
+ { "ds_cpl", "CPL Qualified Debug Store" },
+ { "est", "Enhanced SpeedStep" },
+ { "tm2", "Thermal Monitor 2" },
+ { "cid", "Context ID" },
+ { "xtpr", "Send Task Priority Messages" },
+ { "xstore", "on-CPU RNG present (xstore insn)" },
+ { "xstore_en", "on-CPU RNG enabled" },
+ { "xcrypt", "on-CPU crypto (xcrypt insn)" },
+ { "xcrypt_en", "on-CPU crypto enabled" },
+ { "ace2", "Advanced Cryptography Engine v2" },
+ { "ace2_en", "ACE v2 enabled" },
+ { "phe", "PadLock Hash Engine" },
+ { "phe_en", "PHE enabled" },
+ { "pmm", "PadLock Montgomery Multiplier" },
+ { "pmm_en", "PMM enabled" },
+ { "lahf_lm", "LAHF/SAHF in long mode" },
+ { "cmp_legacy", "HyperThreading not valid" },
{ NULL, NULL },
};
diff --git a/hardinfo2/vendor.c b/hardinfo2/vendor.c
index 451c29f4..5d517acd 100644
--- a/hardinfo2/vendor.c
+++ b/hardinfo2/vendor.c
@@ -63,6 +63,8 @@ static const Vendor vendors[] = {
{"Giga-byte", "Gigabyte", "www.gigabyte.com.tw"},
{"C-Media", "C-Media Electronics", "www.cmedia.com.tw"},
{"Avermedia", "AVerMedia Technologies", "www.aver.com"},
+ {"Philips", "Philips", "www.philips.com"},
+ {"RaLink", "Ralink Technology", "www.ralinktech.com"},
{NULL, NULL, NULL},
};
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-05 22:58:40 +0000