[src/trunk]: src/sys/arch/atari/atari Use and print consistent CPU/MMU/FPU na...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bf9e1510bbd9
branches:  trunk
changeset: 368273:bf9e1510bbd9
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Jul 02 08:35:49 2022 +0000

description:
Use and print consistent CPU/MMU/FPU names.

diffstat:

 sys/arch/atari/atari/fpu_machdep.c |   8 ++++----
 sys/arch/atari/atari/machdep.c     |  14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diffs (75 lines):

diff -r f6bc6051399b -r bf9e1510bbd9 sys/arch/atari/atari/fpu_machdep.c
--- a/sys/arch/atari/atari/fpu_machdep.c        Sat Jul 02 08:33:26 2022 +0000
+++ b/sys/arch/atari/atari/fpu_machdep.c        Sat Jul 02 08:35:49 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fpu_machdep.c,v 1.1 2011/11/15 12:23:21 tsutsui Exp $  */
+/*     $NetBSD: fpu_machdep.c,v 1.2 2022/07/02 08:35:49 tsutsui Exp $  */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_machdep.c,v 1.1 2011/11/15 12:23:21 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_machdep.c,v 1.2 2022/07/02 08:35:49 tsutsui Exp $");
 
 #include "opt_fpu_emulate.h"
 
@@ -57,8 +57,8 @@
 #else
        [FPU_NONE] = " no ",
 #endif
-       [FPU_68881] = " mc68881 ",
-       [FPU_68882] = " mc68882 ",
+       [FPU_68881] = " MC68881 ",
+       [FPU_68882] = " MC68882 ",
        [FPU_68040] = "/",
        [FPU_68060] = "/",
        [FPU_UNKNOWN] = "??? "
diff -r f6bc6051399b -r bf9e1510bbd9 sys/arch/atari/atari/machdep.c
--- a/sys/arch/atari/atari/machdep.c    Sat Jul 02 08:33:26 2022 +0000
+++ b/sys/arch/atari/atari/machdep.c    Sat Jul 02 08:35:49 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.186 2022/03/13 17:50:55 andvar Exp $     */
+/*     $NetBSD: machdep.c,v 1.187 2022/07/02 08:35:49 tsutsui Exp $    */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.186 2022/03/13 17:50:55 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.187 2022/07/02 08:35:49 tsutsui Exp $");
 
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
@@ -256,22 +256,22 @@
        case CPU_68060:
                __asm(".word 0x4e7a,0x0808;"
                    "movl %%d0,%0" : "=d"(pcr) : : "d0");
-               snprintf(cputxt, sizeof(cputxt), "68%s060 rev.%d",
+               snprintf(cputxt, sizeof(cputxt), "MC68%s060 rev.%d",
                    pcr & 0x10000 ? "LC/EC" : "", (pcr >> 8) & 0xff);
                cpu = cputxt;
                mmu = "/MMU";
                break;
        case CPU_68040:
-               cpu = "m68040";
+               cpu = "MC68040";
                mmu = "/MMU";
                break;
        case CPU_68030:
-               cpu = "m68030";
+               cpu = "MC68030";
                mmu = "/MMU";
                break;
        default: /* XXX */
-               cpu = "m68020";
-               mmu = " m68851 MMU";
+               cpu = "MC68020";
+               mmu = " MC68851 MMU";
        }
        cpu_setmodel("%s (%s CPU%s%sFPU)", mach, cpu, mmu, fpu);
        printf("%s\n", cpu_getmodel());