[src/trunk]: src/sys/arch/next68k Add and check machine type NeXT_CUBE_TURBO ...

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

details:   https://anonhg.NetBSD.org/src/rev/9e4258de254f
branches:  trunk
changeset: 373442:9e4258de254f
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Feb 11 02:33:27 2023 +0000

description:
Add and check machine type NeXT_CUBE_TURBO (type 8).

Info from Andreas Grabher on port-next68k@.

diffstat:

 sys/arch/next68k/dev/nextcons.c    |   7 ++++---
 sys/arch/next68k/dev/nextdisplay.c |   7 ++++---
 sys/arch/next68k/next68k/nextrom.c |  13 ++++++++++---
 sys/arch/next68k/next68k/nextrom.h |   3 ++-
 sys/arch/next68k/stand/boot/boot.c |   6 ++++--
 5 files changed, 24 insertions(+), 12 deletions(-)

diffs (134 lines):

diff -r 3b0d06210a23 -r 9e4258de254f sys/arch/next68k/dev/nextcons.c
--- a/sys/arch/next68k/dev/nextcons.c   Sat Feb 11 02:31:34 2023 +0000
+++ b/sys/arch/next68k/dev/nextcons.c   Sat Feb 11 02:33:27 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nextcons.c,v 1.13 2023/02/04 14:38:09 tsutsui Exp $    */
+/*     $NetBSD: nextcons.c,v 1.14 2023/02/11 02:33:27 tsutsui Exp $    */
 
 /*
  * Copyright (c) 1999 Darrin B. Jewell
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nextcons.c,v 1.13 2023/02/04 14:38:09 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nextcons.c,v 1.14 2023/02/11 02:33:27 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -67,7 +67,8 @@
            rom_machine_type == NeXT_X15 ||
            rom_machine_type == NeXT_WARP9C ||
            rom_machine_type == NeXT_TURBO_MONO ||
-           rom_machine_type == NeXT_TURBO_COLOR)
+           rom_machine_type == NeXT_TURBO_COLOR ||
+           rom_machine_type == NeXT_CUBE_TURBO)
                cp->cn_pri = CN_INTERNAL;
        else
                cp->cn_pri = CN_DEAD;
diff -r 3b0d06210a23 -r 9e4258de254f sys/arch/next68k/dev/nextdisplay.c
--- a/sys/arch/next68k/dev/nextdisplay.c        Sat Feb 11 02:31:34 2023 +0000
+++ b/sys/arch/next68k/dev/nextdisplay.c        Sat Feb 11 02:33:27 2023 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nextdisplay.c,v 1.28 2023/02/11 02:31:34 tsutsui Exp $ */
+/* $NetBSD: nextdisplay.c,v 1.29 2023/02/11 02:33:27 tsutsui Exp $ */
 
 /*
  * Copyright (c) 1998 Matt DeBergalis
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nextdisplay.c,v 1.28 2023/02/11 02:31:34 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nextdisplay.c,v 1.29 2023/02/11 02:33:27 tsutsui Exp $");
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
@@ -147,7 +147,8 @@
            rom_machine_type == NeXT_X15 ||
            rom_machine_type == NeXT_WARP9C ||
            rom_machine_type == NeXT_TURBO_MONO ||
-           rom_machine_type == NeXT_TURBO_COLOR)
+           rom_machine_type == NeXT_TURBO_COLOR ||
+           rom_machine_type == NeXT_CUBE_TURBO)
                return 1;
        else
                return 0;
diff -r 3b0d06210a23 -r 9e4258de254f sys/arch/next68k/next68k/nextrom.c
--- a/sys/arch/next68k/next68k/nextrom.c        Sat Feb 11 02:31:34 2023 +0000
+++ b/sys/arch/next68k/next68k/nextrom.c        Sat Feb 11 02:33:27 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nextrom.c,v 1.28 2023/02/11 02:31:34 tsutsui Exp $     */
+/*     $NetBSD: nextrom.c,v 1.29 2023/02/11 02:33:27 tsutsui Exp $     */
 /*
  * Copyright (c) 1998 Darrin B. Jewell
  * All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nextrom.c,v 1.28 2023/02/11 02:31:34 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nextrom.c,v 1.29 2023/02/11 02:33:27 tsutsui Exp $");
 
 #include "opt_ddb.h"
 #include "opt_serial.h"
@@ -261,6 +261,11 @@
                        msize4  =  0x800000;
                        msize1  =  0x200000;
                        ROM_PUTS("Looks like a NeXT_TURBO_MONO\r\n");
+               } else if (MONRELOC(char, MG_machine_type) == NeXT_CUBE_TURBO) {
+                       msize16 = 0x2000000;
+                       msize4  =  0x800000;
+                       msize1  =  0x200000;
+                       ROM_PUTS("Looks like a NeXT_CUBE_TURBO\r\n");
                } else {
                        msize16 = 0x100000;
                        msize4  = 0x100000;
@@ -270,7 +275,9 @@
 
                mach = MONRELOC(char, MG_machine_type);
                RELOC(rom_machine_type, char) = mach;
-               if (mach == NeXT_TURBO_MONO || mach == NeXT_TURBO_COLOR)
+               if (mach == NeXT_TURBO_MONO ||
+                   mach == NeXT_TURBO_COLOR ||
+                   mach == NeXT_CUBE_TURBO)
                        turbo_l = 1;
                else
                        turbo_l = 0;
diff -r 3b0d06210a23 -r 9e4258de254f sys/arch/next68k/next68k/nextrom.h
--- a/sys/arch/next68k/next68k/nextrom.h        Sat Feb 11 02:31:34 2023 +0000
+++ b/sys/arch/next68k/next68k/nextrom.h        Sat Feb 11 02:33:27 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nextrom.h,v 1.12 2022/05/18 13:56:32 andvar Exp $      */
+/*     $NetBSD: nextrom.h,v 1.13 2023/02/11 02:33:27 tsutsui Exp $     */
 /*
  * Copyright (c) 1998 Darrin B. Jewell
  * All rights reserved.
@@ -233,6 +233,7 @@
 #define        NeXT_WARP9C     3
 #define NeXT_TURBO_MONO        4
 #define NeXT_TURBO_COLOR 5                     /* probed witnessed */
+#define NeXT_CUBE_TURBO        8
 
 #define        ROM_STACK_SIZE  (8192 - 2048)
 
diff -r 3b0d06210a23 -r 9e4258de254f sys/arch/next68k/stand/boot/boot.c
--- a/sys/arch/next68k/stand/boot/boot.c        Sat Feb 11 02:31:34 2023 +0000
+++ b/sys/arch/next68k/stand/boot/boot.c        Sat Feb 11 02:33:27 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: boot.c,v 1.12 2016/06/11 06:35:00 dholland Exp $       */
+/*     $NetBSD: boot.c,v 1.13 2023/02/11 02:33:27 tsutsui Exp $        */
 /*
  * Copyright (c) 1994 Rolf Grossmann
  * All rights reserved.
@@ -84,7 +84,9 @@
 #endif
 
        machine = MON(char, MG_machine_type);
-       if (machine == NeXT_TURBO_MONO || machine == NeXT_TURBO_COLOR)
+       if (machine == NeXT_TURBO_MONO ||
+           machine == NeXT_TURBO_COLOR ||
+           machine == NeXT_CUBE_TURBO)
                turbo = 1;
        else
                turbo = 0;