diff options
| author | Agney Lopes Roth Ferraz <agney@debian.org> | 2006-12-10 18:38:14 -0200 |
|---|---|---|
| committer | Simon Quigley <tsimonq2@ubuntu.com> | 2017-06-19 14:38:39 -0500 |
| commit | 0bc4fab4f6b85b7eef2898aff2ab39f8d0282404 (patch) | |
| tree | 764044181de766f7ea779e8e9bc0861da7e18971 /arch/linux/ia64 | |
| parent | 4c52aebc47fb3ee110149cca245ae1fbbf9e774e (diff) | |
Import Debian changes 0.4.1-6
hardinfo (0.4.1-6) unstable; urgency=low
* Changed configure script to reconize m68k machines
Diffstat (limited to 'arch/linux/ia64')
| -rw-r--r-- | arch/linux/ia64/processor.h | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/arch/linux/ia64/processor.h b/arch/linux/ia64/processor.h index 9cad3b24..9cbc3377 100644 --- a/arch/linux/ia64/processor.h +++ b/arch/linux/ia64/processor.h @@ -35,15 +35,23 @@ computer_get_processor(void) tmp[0] = g_strstrip(tmp[0]); tmp[1] = g_strstrip(tmp[1]); - get_str("vendor", processor->model_name); - get_str("arch", processor->vendor_id); - get_str("family", processor->strmodel); + get_str("vendor", processor->vendor); + get_str("arch", processor->arch); + get_str("family", processor->family); + get_str("features", processor->features); + get_str("cpu MHz", processor->cpu_mhz); + get_str("itc MHz", processor->itc_mhz); get_float("BogoMIPS", processor->bogomips); } g_strfreev(tmp); } + gchar *tmp = g_strconcat(processor->vendor, processor->arch, NULL); + g_free(processor->vendor); + g_free(processor->arch); + processor->model_name = tmp; + fclose(cpuinfo); return processor; @@ -52,14 +60,18 @@ computer_get_processor(void) static gchar * processor_get_info(Processor *processor) { - return g_strdup_printf("[Processor] %s\n" - "Arch=%s\n" - "Family=%sMHz\n" - "BogoMips=%s\n" + return g_strdup_printf("[Processor]\n" + "Family=%s\n" + "Features=%.2f\n" + "CPU Mhz=%.2fMHz\n" + "ITC MHz=%.2f" + "BogoMips=%.2f" "Byte Order=%s\n", processor->model_name, - processor->vendor_id, - processor->strmodel, + processor->family; + processor->features, + processor->cpu_mhz, + processor->itc_mhz, processor->bogomips, #if G_BYTE_ORDER == G_LITTLE_ENDIAN "Little Endian" |