summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeandro A. F. Pereira <leandro@hardinfo.org>2006-10-13 19:10:22 +0000
committerLeandro A. F. Pereira <leandro@hardinfo.org>2006-10-13 19:10:22 +0000
commitf654729f552739d2198250358667bc782524a793 (patch)
tree80ff188bbdc0b55a7d53200b4bfc006dcd95421b
parent2606eee2d0f280a54208af7f6e2ad9b6d2097eed (diff)
Misc vendor fixes
-rw-r--r--hardinfo2/arch/linux/x86/processor.h7
-rw-r--r--hardinfo2/autopackage/default.apspec2
-rw-r--r--hardinfo2/computer.c1
-rw-r--r--hardinfo2/vendor.c1
4 files changed, 8 insertions, 3 deletions
diff --git a/hardinfo2/arch/linux/x86/processor.h b/hardinfo2/arch/linux/x86/processor.h
index aba623bf..f13c9dcc 100644
--- a/hardinfo2/arch/linux/x86/processor.h
+++ b/hardinfo2/arch/linux/x86/processor.h
@@ -232,7 +232,10 @@ static struct {
gchar *
processor_get_capabilities_from_flags(gchar * strflags)
{
- /* FIXME: * Separate between processor capabilities, additional instructions and whatnot. */
+ /* FIXME:
+ * - Separate between processor capabilities, additional instructions and whatnot.
+ * - Use binary search or something faster than this O(n) cruft
+ */
gchar **flags, **old;
gchar *tmp = "";
gint i, j = 0;
@@ -283,7 +286,7 @@ processor_get_info(Processor *processor)
processor->family,
processor->model,
processor->stepping,
- processor->vendor_id,
+ vendor_get_name(processor->vendor_id),
processor->cache_size,
processor->cpu_mhz,
processor->bogomips,
diff --git a/hardinfo2/autopackage/default.apspec b/hardinfo2/autopackage/default.apspec
index ea6ffb8b..58b9ae2a 100644
--- a/hardinfo2/autopackage/default.apspec
+++ b/hardinfo2/autopackage/default.apspec
@@ -2,7 +2,7 @@
# Generated by mkapspec 0.2
[Meta]
ShortName: hardinfo
-SoftwareVersion: 0.4.1
+SoftwareVersion: 0.4.1-SVN26
DisplayName: HardInfo $SOFTWAREVERSION
RootName: @tia.mat.br/hardinfo:$SOFTWAREVERSION
Summary: System profiler and benchmark tool
diff --git a/hardinfo2/computer.c b/hardinfo2/computer.c
index 041225d5..ecc36d16 100644
--- a/hardinfo2/computer.c
+++ b/hardinfo2/computer.c
@@ -29,6 +29,7 @@
#include <iconcache.h>
#include <shell.h>
+#include <vendor.h>
#include <expr.h>
enum {
diff --git a/hardinfo2/vendor.c b/hardinfo2/vendor.c
index c534d1ff..610f33d3 100644
--- a/hardinfo2/vendor.c
+++ b/hardinfo2/vendor.c
@@ -54,6 +54,7 @@ static const Vendor vendors[] = {
{ "IBM", "IBM Corp.", "www.ibm.com" },
{ "Dell", "Dell Computer Corp.", "www.dell.com" },
{ "Logitech", "Logitech International SA", "www.logitech.com" },
+ { "FUJITSU", "Fujitsu", "www.fujitsu.com" },
{ NULL, NULL, NULL },
};