diff options
| -rw-r--r-- | modules/devices/arm/processor.c | 35 | ||||
| -rw-r--r-- | modules/devices/ppc/processor.c | 8 | ||||
| -rw-r--r-- | modules/devices/x86/processor.c | 26 |
3 files changed, 36 insertions, 33 deletions
diff --git a/modules/devices/arm/processor.c b/modules/devices/arm/processor.c index d7b3ff52..61dd3068 100644 --- a/modules/devices/arm/processor.c +++ b/modules/devices/arm/processor.c @@ -294,27 +294,27 @@ processor_get_detailed_info(Processor *processor) } ret = g_strdup_printf("[%s]\n" - "Linux Name=%s\n" - "Decoded Name=%s\n" - "Mode=%s\n" + "%s=%s\n" /* linux name */ + "%s=%s\n" /* decoded name */ + "%s=%s\n" /* mode */ "%s=%.2f %s\n" /* frequency */ "%s=%.2f\n" /* bogomips */ "%s=%s\n" /* byte order */ "%s" /* topology */ "%s" /* frequency scaling */ - "[ARM]\n" - "Implementer=[%s] %s\n" - "Part=[%s] %s\n" - "Architecture=[%s] %s\n" - "Variant=%s\n" - "Revision=%s\n" + "[%s]\n" /* ARM */ + "%s=[%s] %s\n" /* implementer */ + "%s=[%s] %s\n" /* architecture */ + "%s=[%s] %s\n" /* part */ + "%s=%s\n" /* variant */ + "%s=%s\n" /* revision */ "[%s]\n" /* flags */ "%s" "%s", /* empty */ _("Processor"), - processor->model_name, - processor->decoded_name, - arm_mode_str[processor->mode], + _("Linux Name"), processor->model_name, + _("Decoded Name"), processor->decoded_name, + _("Mode"), arm_mode_str[processor->mode], _("Frequency"), processor->cpu_mhz, _("MHz"), _("BogoMips"), processor->bogomips, _("Byte Order"), @@ -325,11 +325,12 @@ processor_get_detailed_info(Processor *processor) #endif tmp_topology, tmp_cpufreq, - processor->cpu_implementer, (tmp_imp) ? tmp_imp : "", - processor->cpu_part, (tmp_part) ? tmp_part : "", - processor->cpu_architecture, (tmp_arch) ? tmp_arch : "", - processor->cpu_variant, - processor->cpu_revision, + _("ARM"), + _("Implementer"), processor->cpu_implementer, (tmp_imp) ? tmp_imp : "", + _("Architecture"), processor->cpu_architecture, (tmp_arch) ? tmp_arch : "", + _("Part"), processor->cpu_part, (tmp_part) ? tmp_part : "", + _("Variant"), processor->cpu_variant, + _("Revision"), processor->cpu_revision, _("Capabilities"), tmp_flags, ""); g_free(tmp_flags); diff --git a/modules/devices/ppc/processor.c b/modules/devices/ppc/processor.c index 4a9d6dfc..ed34855b 100644 --- a/modules/devices/ppc/processor.c +++ b/modules/devices/ppc/processor.c @@ -206,8 +206,8 @@ processor_get_detailed_info(Processor *processor) } ret = g_strdup_printf("[%s]\n" - "Model=%s\n" - "Revision=%s\n" + "%s=%s\n" /* model */ + "%s=%s\n" /* revision */ "%s=%.2f %s\n" /* frequency */ "%s=%.2f\n" /* bogomips */ "%s=%s\n" /* byte order */ @@ -215,8 +215,8 @@ processor_get_detailed_info(Processor *processor) "%s" /* frequency scaling */ "%s",/* empty */ _("Processor"), - processor->model_name, - processor->revision, + _("Model"), processor->model_name, + _("Revision"), processor->revision, _("Frequency"), processor->cpu_mhz, _("MHz"), _("BogoMips"), processor->bogomips, _("Byte Order"), diff --git a/modules/devices/x86/processor.c b/modules/devices/x86/processor.c index a062e947..3e0a8026 100644 --- a/modules/devices/x86/processor.c +++ b/modules/devices/x86/processor.c @@ -794,17 +794,17 @@ gchar *processor_get_detailed_info(Processor * processor) } ret = g_strdup_printf("[%s]\n" - "Name=%s\n" - "Family, model, stepping=%d, %d, %d (%s)\n" - "Vendor=%s\n" - "[Configuration]\n" - "Cache Size=%dkb\n" + "%s=%s\n" + "%s=%d, %d, %d (%s)\n" /* family, model, stepping (decoded name) */ + "%s=%s\n" /* vendor */ + "[%s]\n" /* configuration */ + "%s=%d %s\n" /* cache size (from cpuinfo) */ "%s=%.2f %s\n" /* frequency */ "%s=%.2f\n" /* bogomips */ "%s=%s\n" /* byte order */ - "%s" /* topology */ - "%s" /* frequency scaling */ - "[Cache]\n" + "%s" /* topology */ + "%s" /* frequency scaling */ + "[%s]\n" /* cache */ "%s\n" "[%s]\n" /* pm */ "%s" @@ -813,13 +813,15 @@ gchar *processor_get_detailed_info(Processor * processor) "[%s]\n" /* flags */ "%s", _("Processor"), - processor->model_name, + _("Model Name"), processor->model_name, + _("Family, model, stepping"), processor->family, processor->model, processor->stepping, processor->strmodel, - vendor_get_name(processor->vendor_id), - processor->cache_size, + _("Vendor"), vendor_get_name(processor->vendor_id), + _("Configuration"), + _("Cache Size"), processor->cache_size, _("kb"), _("Frequency"), processor->cpu_mhz, _("MHz"), _("BogoMips"), processor->bogomips, _("Byte Order"), @@ -830,7 +832,7 @@ gchar *processor_get_detailed_info(Processor * processor) #endif tmp_topology, tmp_cpufreq, - cache_info, + _("Cache"), cache_info, _("Power Management"), tmp_pm, _("Bug Workarounds"), tmp_bugs, _("Capabilities"), tmp_flags ); |