diff options
| author | Agney Lopes Roth Ferraz <agney@debian.org> | 2006-10-13 13:24:15 -0300 |
|---|---|---|
| committer | Simon Quigley <tsimonq2@ubuntu.com> | 2017-06-19 14:38:38 -0500 |
| commit | e07ad3711f92f52f2ec315712a6360f62475b007 (patch) | |
| tree | 64d18a54702102f59eb5e2962ef129f2419c19d4 /arch | |
| parent | fe52c0d1c1fd03de59be5f15047b2f23207e32fb (diff) | |
Import Debian changes 0.4.1-4
hardinfo (0.4.1-4) unstable; urgency=low
* Fixed FTBFS on alphaand ia64.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/linux/alpha/processor.h | 17 | ||||
| -rw-r--r-- | arch/linux/ia64/processor.h | 30 |
2 files changed, 12 insertions, 35 deletions
diff --git a/arch/linux/alpha/processor.h b/arch/linux/alpha/processor.h index ef73c922..88f58589 100644 --- a/arch/linux/alpha/processor.h +++ b/arch/linux/alpha/processor.h @@ -35,20 +35,15 @@ 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_int("page size [bytes]", processor->page_size); - get_int("cycle frequency [Hz]", processor->cycle_frequency); - get_int("timer frequency [Hz]", processor->timer_frequency); get_float("BogoMIPS", processor->bogomips); - get_float("platform string", processor->plataform); + get_str("platform string", processor->strmodel); } g_strfreev(tmp); } - gchar *tmp = g_strconcat(processor->model, processor->model_name, NULL); - g_free(processor->model); + gchar *tmp = g_strconcat("Alpha", processor->model_name, NULL); g_free(processor->model_name); processor->model_name = tmp; @@ -60,18 +55,12 @@ computer_get_processor(void) static gchar * processor_get_info(Processor *processor) { - return g_strdup_printf("[Processor]\n" - "Page Size=%s\n" + return g_strdup_printf("[Processor] %s\n" "Plataform String=%s\n" - "Cycle Frequency=%.2fMHz\n" - "Timer Frequency=%.2fMHz\n" "BogoMips=%.2f" "Byte Order=%s\n", processor->model_name, - 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 9cbc3377..9cad3b24 100644 --- a/arch/linux/ia64/processor.h +++ b/arch/linux/ia64/processor.h @@ -35,23 +35,15 @@ computer_get_processor(void) tmp[0] = g_strstrip(tmp[0]); tmp[1] = g_strstrip(tmp[1]); - 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_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, processor->arch, NULL); - g_free(processor->vendor); - g_free(processor->arch); - processor->model_name = tmp; - fclose(cpuinfo); return processor; @@ -60,18 +52,14 @@ computer_get_processor(void) static gchar * processor_get_info(Processor *processor) { - return g_strdup_printf("[Processor]\n" - "Family=%s\n" - "Features=%.2f\n" - "CPU Mhz=%.2fMHz\n" - "ITC MHz=%.2f" - "BogoMips=%.2f" + return g_strdup_printf("[Processor] %s\n" + "Arch=%s\n" + "Family=%sMHz\n" + "BogoMips=%s\n" "Byte Order=%s\n", processor->model_name, - processor->family; - processor->features, - processor->cpu_mhz, - processor->itc_mhz, + processor->vendor_id, + processor->strmodel, processor->bogomips, #if G_BYTE_ORDER == G_LITTLE_ENDIAN "Little Endian" |