diff options
| author | Burt P <pburt0@gmail.com> | 2017-08-07 08:33:03 -0500 |
|---|---|---|
| committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2017-08-09 02:09:10 -0700 |
| commit | f42c07153865afcacb61b2e36b50f8fc88851601 (patch) | |
| tree | 73ce8ffa50815834d8ea5d063aa687d4e49a014a | |
| parent | ed3f06ac01735c3c1434e10d79dacbc5821a9ca4 (diff) | |
arm: use decoded name instead of generic linux name for model_name
Signed-off-by: Burt P <pburt0@gmail.com>
| -rw-r--r-- | includes/arm/processor-platform.h | 2 | ||||
| -rw-r--r-- | modules/devices/arm/processor.c | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/includes/arm/processor-platform.h b/includes/arm/processor-platform.h index 00ebf6b7..0ffdac24 100644 --- a/includes/arm/processor-platform.h +++ b/includes/arm/processor-platform.h @@ -23,7 +23,7 @@ struct _Processor { gchar *model_name; - gchar *decoded_name; + gchar *linux_name; gchar *flags; gfloat bogomips; diff --git a/modules/devices/arm/processor.c b/modules/devices/arm/processor.c index 24c99812..e4712f56 100644 --- a/modules/devices/arm/processor.c +++ b/modules/devices/arm/processor.c @@ -73,7 +73,7 @@ processor_scan(void) processor->id = atol(tmp[1]); if (rep_pname) - processor->model_name = g_strdup(rep_pname); + processor->linux_name = g_strdup(rep_pname); g_strfreev(tmp); continue; @@ -89,11 +89,11 @@ processor_scan(void) processor->id = 0; if (rep_pname) - processor->model_name = g_strdup(rep_pname); + processor->linux_name = g_strdup(rep_pname); } if (processor) { - get_str("model name", processor->model_name); + get_str("model name", processor->linux_name); get_str("Features", processor->flags); get_float("BogoMIPS", processor->bogomips); @@ -138,7 +138,7 @@ processor_scan(void) processor = (Processor *) pi->data; /* strings can't be null or segfault later */ - STRIFNULL(processor->model_name, _("ARM Processor") ); + STRIFNULL(processor->linux_name, _("ARM Processor") ); EMPIFNULL(processor->flags); UNKIFNULL(processor->cpu_implementer); UNKIFNULL(processor->cpu_architecture); @@ -146,11 +146,11 @@ processor_scan(void) UNKIFNULL(processor->cpu_part); UNKIFNULL(processor->cpu_revision); - processor->decoded_name = arm_decoded_name( + processor->model_name = arm_decoded_name( processor->cpu_implementer, processor->cpu_part, processor->cpu_variant, processor->cpu_revision, - processor->cpu_architecture, processor->model_name); - UNKIFNULL(processor->decoded_name); + processor->cpu_architecture, processor->linux_name); + UNKIFNULL(processor->model_name); /* topo & freq */ processor->cpufreq = cpufreq_new(processor->id); @@ -233,8 +233,8 @@ processor_get_detailed_info(Processor *processor) "%s" "%s", /* empty */ _("Processor"), - _("Linux Name"), processor->model_name, - _("Decoded Name"), processor->decoded_name, + _("Linux Name"), processor->linux_name, + _("Decoded Name"), processor->model_name, _("Mode"), arm_mode_str[processor->mode], _("Frequency"), processor->cpu_mhz, _("MHz"), _("BogoMips"), processor->bogomips, |