aboutsummaryrefslogtreecommitdiff
path: root/arch/linux/ia64/processor.h
diff options
context:
space:
mode:
Diffstat (limited to 'arch/linux/ia64/processor.h')
-rw-r--r--arch/linux/ia64/processor.h30
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"