diff options
| -rw-r--r-- | modules/devices/mips/processor.c | 10 | ||||
| -rw-r--r-- | modules/devices/parisc/processor.c | 2 | ||||
| -rw-r--r-- | test/data/mips_loongson_cpuinfo | 13 | ||||
| -rw-r--r-- | test/test.sh | 4 |
4 files changed, 22 insertions, 7 deletions
diff --git a/modules/devices/mips/processor.c b/modules/devices/mips/processor.c index ca9f44bb..2bf0e44e 100644 --- a/modules/devices/mips/processor.c +++ b/modules/devices/mips/processor.c @@ -50,8 +50,8 @@ processor_scan(void) tmp[0] = g_strstrip(tmp[0]); tmp[1] = g_strstrip(tmp[1]); - get_str("system type", processor->model_name); - get_str("cpu model", processor->vendor_id); + get_str("system type", processor->vendor_id); + get_str("cpu model", processor->model_name); get_float("cpu MHz", processor->cpu_mhz); get_float("BogoMIPS", processor->bogomips); } @@ -75,9 +75,9 @@ processor_get_info(GSList *processors) "%s=%.2f\n" /* bogomips */ "%s=%s\n", /* byte order */ _("Processor"), - _("System Type"), processor->model_name, - _("Model"), processor->vendor_id, - _("Frequency"), processor->cpu_mhz _("MHz"), + _("Model"), processor->model_name, + _("System Type"), processor->vendor_id, + _("Frequency"), processor->cpu_mhz, _("MHz"), _("BogoMips"), processor->bogomips, _("Byte Order"), byte_order_str() ); diff --git a/modules/devices/parisc/processor.c b/modules/devices/parisc/processor.c index 99248e9e..b08baff5 100644 --- a/modules/devices/parisc/processor.c +++ b/modules/devices/parisc/processor.c @@ -88,7 +88,7 @@ processor_get_info(GSList *processors) processor->model_name, processor->vendor_id, _("Model Name"), processor->strmodel, - _("Frequency"), processor->cpu_mhz _("MHz"), + _("Frequency"), processor->cpu_mhz, _("MHz"), _("BogoMips"), processor->bogomips, _("Byte Order"), byte_order_str(), _("Cache"), diff --git a/test/data/mips_loongson_cpuinfo b/test/data/mips_loongson_cpuinfo new file mode 100644 index 00000000..f2ee0e90 --- /dev/null +++ b/test/data/mips_loongson_cpuinfo @@ -0,0 +1,13 @@ +system type : gdium +processor : 0 +cpu model : ICT Loongson-2 V0.3 FPU V0.1 +BogoMIPS : 598.60 +wait instruction : no +microsecond timers : yes +tlb_entries : 64 +extra interrupt vector : no +hardware watchpoint : no +ASEs implemented : +shadow register sets : 1 +VCED exceptions : not available +VCEI exceptions : not available diff --git a/test/test.sh b/test/test.sh index 28d16dfa..7a05a79b 100644 --- a/test/test.sh +++ b/test/test.sh @@ -13,4 +13,6 @@ do_test() { #do_test ppc data/ppc_g5_cpuinfo #do_test ppc data/power8_cpuinfo #do_test arm data/arm_rpi3_aarch64_cpuinfo -do_test sparc data/sparc_m7_cpuinfo +#do_test arm data/arm_jetsontx2_cpuinfo +#do_test sparc data/sparc_m7_cpuinfo +#do_test mips data/mips_loongson_cpuinfo |