diff options
Diffstat (limited to 'arch/linux/ia64/processor.h')
| -rw-r--r-- | arch/linux/ia64/processor.h | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/arch/linux/ia64/processor.h b/arch/linux/ia64/processor.h index 6359ba36..bc1d7f08 100644 --- a/arch/linux/ia64/processor.h +++ b/arch/linux/ia64/processor.h @@ -16,8 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -static Processor * -computer_get_processor(void) +struct _Processor { + gchar *model_name; + gchar *vendor_id; + gfloat bogomips; + gchar *strmodel; +}; + +static GSList * +__scan_processors(void) { Processor *processor; FILE *cpuinfo; @@ -35,38 +42,34 @@ computer_get_processor(void) tmp[0] = g_strstrip(tmp[0]); tmp[1] = g_strstrip(tmp[1]); - get_str("vendor", processor->vendor_id); - get_str("arch", processor->bug_fdiv); - get_str("family", processor->has_fpu); - get_str("features", processor->flags); - get_float("cpu MHz", processor->cpu_mhz); + get_str("vendor", processor->model_name); + get_str("arch", processor->vendor_id); + get_str("family", processor->strmodel); get_float("BogoMIPS", processor->bogomips); } g_strfreev(tmp); } - gchar *tmp = g_strconcat(processor->vendor_id, processor->bug_fdiv, NULL); - processor->model_name = tmp; fclose(cpuinfo); - return processor; + return g_slist_append(NULL, processor); } static gchar * -processor_get_info(Processor *processor) +processor_get_info(GSList *processors) { + Processor *processor = (Processor *)processors->data; + return g_strdup_printf("[Processor]\n" - "Name=%s\n" - "Family=%s\n" - "Features=%s\n" - "CPU Mhz=%.2fMHz\n" - "BogoMips=%.2f" + "Model=%s\n" + "Architecture=%s\n" + "Family=%sMHz\n" + "BogoMIPS=%s\n" "Byte Order=%s\n", processor->model_name, - processor->has_fpu, - processor->flags, - processor->cpu_mhz, + processor->vendor_id, + processor->strmodel, processor->bogomips, #if G_BYTE_ORDER == G_LITTLE_ENDIAN "Little Endian" |