diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/linux/alpha/processor.h | 19 | ||||
| -rw-r--r-- | arch/linux/ia64/processor.h | 30 |
2 files changed, 36 insertions, 13 deletions
diff --git a/arch/linux/alpha/processor.h b/arch/linux/alpha/processor.h index fa02ea05..99ccc32f 100644 --- a/arch/linux/alpha/processor.h +++ b/arch/linux/alpha/processor.h @@ -35,15 +35,20 @@ computer_get_processor(void) tmp[0] = g_strstrip(tmp[0]); tmp[1] = g_strstrip(tmp[1]); + get_str("cpu", processor->model); get_str("cpu model", processor->model_name); + get_str("page size [bytes]", processor->page_size); + get_srt("cycle frequency [Hz]", processor->cycle_frequency); + get_str("timer frequency [Hz]", processor->timer_frequency); get_float("BogoMIPS", processor->bogomips); - get_str("platform string", processor->strmodel); + get_str("platform string", processor->plataform); } g_strfreev(tmp); } - gchar *tmp = g_strconcat("Alpha", processor->model_name, NULL); + gchar *tmp = g_strconcat(processor->model, processor->model_name, NULL); + g_free(processor->model); g_free(processor->model_name); processor->model_name = tmp; @@ -55,12 +60,18 @@ computer_get_processor(void) static gchar * processor_get_info(Processor *processor) { - return g_strdup_printf("[Processor] %s\n" + return g_strdup_printf("[Processor]\n" + "Page Size=%s\n" "Plataform String=%s\n" + "Cycle Frequency=%.2fMHz\n" + "Timer Frequency=%.2fMHz\n" "BogoMips=%.2f" "Byte Order=%s\n", processor->model_name, - processor->strmodel, + processor->page_size, + processor->plataform, + processor->cycle_frequency, + processor->timer_frequency, processor->bogomips, #if G_BYTE_ORDER == G_LITTLE_ENDIAN "Little Endian" 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" |