[src/trunk]: src/sys/arch/vax Put all cputype definitions in one file instead...

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

details:   https://anonhg.NetBSD.org/src/rev/ee303e862f31
branches:  trunk
changeset: 487741:ee303e862f31
user:      ragge <ragge%NetBSD.org@localhost>
date:      Mon Jun 12 11:13:14 2000 +0000

description:
Put all cputype definitions in one file instead of separate files.
This was becoming unmaintainable.

diffstat:

 sys/arch/vax/conf/files.vax   |  41 +++++++++++++++++++++++------------------
 sys/arch/vax/include/ioa.h    |   4 ++--
 sys/arch/vax/include/nexus.h  |   7 ++-----
 sys/arch/vax/vax/clock.c      |  17 ++---------------
 sys/arch/vax/vax/conf.c       |  15 ++-------------
 sys/arch/vax/vax/intvec.s     |  10 ++--------
 sys/arch/vax/vax/ka630.c      |   4 ++--
 sys/arch/vax/vax/locore.c     |  25 +++++++++++--------------
 sys/arch/vax/vax/vm_machdep.c |   6 ++----
 9 files changed, 48 insertions(+), 81 deletions(-)

diffs (295 lines):

diff -r a2ca4580bbf7 -r ee303e862f31 sys/arch/vax/conf/files.vax
--- a/sys/arch/vax/conf/files.vax       Mon Jun 12 11:11:19 2000 +0000
+++ b/sys/arch/vax/conf/files.vax       Mon Jun 12 11:13:14 2000 +0000
@@ -1,4 +1,4 @@
-#       $NetBSD: files.vax,v 1.69 2000/06/10 14:59:39 ragge Exp $
+#       $NetBSD: files.vax,v 1.70 2000/06/12 11:13:17 ragge Exp $
 #
 # new style config file for vax architecture
 #
@@ -16,23 +16,14 @@
 device mem
 device mba { drive = -1 }
 
-defopt VAX780                          # VAX-11/780 & 785
-defopt VAX750                          # VAX-11/750
-defopt VAX730                          # VAX-11/730
-defopt VAX8200                         # VAX 8200|8300
-defopt VAX8500                         # VAX 8500|8800|8550
-defopt VAX8600                         # VAX 8600|8650
-defopt VAX410                          # VAXstation 2000, MicroVAX 200
-defopt VAX43                           # VAXstation 3100 / MicroVAX 3100
-defopt VAX46                           # VAXstation 4000/60
-defopt VAX48                           # VAXstation 4000/VLC
-defopt VAX49                           # VAXstation 4000/90 or 4000/96
-defopt VAX53                           # VAX 4000/105A
-defopt VAX630                          # MicroVAX II or VAXstation II
-defopt VAX650                          # MicroVAX III or VAXstation III
-defopt VAX660                          # VAX 4000/200
-defopt VAX670                          # VAX 4000/300
-defopt VAX680                          # VAX 4000/500
+defopt opt_cputype.h   VAX780 VAX750 VAX730 VAX8200 VAX8800 VAX8600
+       VAX6200 VAX6400 VAX6500 VAX6600 VAX410 VAX43 VAX46 VAX48
+       VAX49 VAX53 VAX630 VAX650 VAX670 VAX680
+
+# NBI on KA88
+device nmi { slot=-1 }
+attach nmi at mainbus with nmi_mainbus
+file   arch/vax/vax/nmi.c              nmi
 
 # SBI and related devices
 device sbi { tr=-1 }
@@ -122,11 +113,23 @@
 
 attach bi at mainbus with bi_mainbus
 file   arch/vax/bi/bi_mainbus.c        bi_mainbus
+attach bi at nmi with bi_nmi
+file   arch/vax/bi/bi_nmi.c            bi_nmi
 
 # VAX CPUs at BI, do not belong in MI code.
 attach cpu at bi with cpu_bi
 attach mem at bi with mem_bi
 
+# XMI bus definitions
+include        "dev/xmi/files.xmi"
+
+attach xmi at mainbus with xmi_mainbus
+file   arch/vax/vax/xmi.c              xmi_mainbus
+
+# VAX CPUs at XMI, do not belong in MI code.
+attach cpu at xmi with cpu_xmi
+attach mem at xmi with mem_xmi
+
 # TS11 at UBA
 device ts: tape
 attach ts at uba
@@ -320,6 +323,8 @@
 file   arch/vax/vax/machdep.c
 file   arch/vax/vax/ka820.c            vax8200
 file   arch/vax/vax/crx.c              vax8200
+file   arch/vax/vax/ka88.c             vax8800
+file   arch/vax/vax/ka6400.c           vax6400
 file   arch/vax/vax/ka630.c            vax630
 file   arch/vax/vax/ka410.c            vax410
 file   arch/vax/vax/ka43.c             vax43
diff -r a2ca4580bbf7 -r ee303e862f31 sys/arch/vax/include/ioa.h
--- a/sys/arch/vax/include/ioa.h        Mon Jun 12 11:11:19 2000 +0000
+++ b/sys/arch/vax/include/ioa.h        Mon Jun 12 11:13:14 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ioa.h,v 1.6 2000/01/24 02:40:32 matt Exp $     */
+/*     $NetBSD: ioa.h,v 1.7 2000/06/12 11:13:16 ragge Exp $    */
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * All rights reserved.
@@ -58,7 +58,7 @@
  *                                                             *
  ****************************************************************/
 
-#include "opt_vax8600.h"
+#include "opt_cputype.h"
 #if VAX8600
 #define        MAXNIOA         4
 #define        NIOA8600        2
diff -r a2ca4580bbf7 -r ee303e862f31 sys/arch/vax/include/nexus.h
--- a/sys/arch/vax/include/nexus.h      Mon Jun 12 11:11:19 2000 +0000
+++ b/sys/arch/vax/include/nexus.h      Mon Jun 12 11:13:14 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nexus.h,v 1.17 2000/06/04 17:58:19 ragge Exp $ */
+/*     $NetBSD: nexus.h,v 1.18 2000/06/12 11:13:16 ragge Exp $ */
 
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -41,10 +41,7 @@
 #include <machine/bus.h>
 
 #ifdef _KERNEL
-#include "opt_vax8600.h"
-#include "opt_vax780.h"
-#include "opt_vax750.h"
-#include "opt_vax730.h"
+#include "opt_cputype.h"
 #endif
 /*
  * Different definitions for nicer autoconf probing.
diff -r a2ca4580bbf7 -r ee303e862f31 sys/arch/vax/vax/clock.c
--- a/sys/arch/vax/vax/clock.c  Mon Jun 12 11:11:19 2000 +0000
+++ b/sys/arch/vax/vax/clock.c  Mon Jun 12 11:13:14 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clock.c,v 1.36 2000/06/05 00:09:20 matt Exp $   */
+/*     $NetBSD: clock.c,v 1.37 2000/06/12 11:13:15 ragge Exp $  */
 /*
  * Copyright (c) 1995 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -43,20 +43,7 @@
 #include <machine/cpu.h>
 #include <machine/uvax.h>
 
-#include "opt_vax750.h"
-#include "opt_vax780.h"
-#include "opt_vax630.h"
-#include "opt_vax650.h"
-#include "opt_vax660.h"
-#include "opt_vax670.h"
-#include "opt_vax680.h"
-#include "opt_vax8500.h"
-#include "opt_vax8200.h"
-#include "opt_vax410.h"
-#include "opt_vax43.h"
-#include "opt_vax46.h"
-#include "opt_vax48.h"
-#include "opt_vax49.h"
+#include "opt_cputype.h"
 
 int    yeartonum __P((int));
 int    numtoyear __P((int));
diff -r a2ca4580bbf7 -r ee303e862f31 sys/arch/vax/vax/conf.c
--- a/sys/arch/vax/vax/conf.c   Mon Jun 12 11:11:19 2000 +0000
+++ b/sys/arch/vax/vax/conf.c   Mon Jun 12 11:13:14 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: conf.c,v 1.46 2000/05/08 17:53:24 ragge Exp $  */
+/*     $NetBSD: conf.c,v 1.47 2000/06/12 11:13:15 ragge Exp $  */
 
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -43,18 +43,7 @@
 #include <sys/conf.h>
 #include <sys/vnode.h>
 
-#include "opt_vax8600.h"
-#include "opt_vax8200.h"
-#include "opt_vax780.h"
-#include "opt_vax750.h"
-#include "opt_vax670.h"
-#include "opt_vax650.h"
-#include "opt_vax630.h"
-#include "opt_vax410.h"
-#include "opt_vax43.h"
-#include "opt_vax46.h"
-#include "opt_vax48.h"
-#include "opt_vax49.h"
+#include "opt_cputype.h"
 
 #include "hp.h" /* 0 */
 bdev_decl(hp);
diff -r a2ca4580bbf7 -r ee303e862f31 sys/arch/vax/vax/intvec.s
--- a/sys/arch/vax/vax/intvec.s Mon Jun 12 11:11:19 2000 +0000
+++ b/sys/arch/vax/vax/intvec.s Mon Jun 12 11:13:14 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intvec.s,v 1.48 2000/06/10 05:24:46 matt Exp $   */
+/*     $NetBSD: intvec.s,v 1.49 2000/06/12 11:13:14 ragge Exp $   */
 
 /*
  * Copyright (c) 1994, 1997 Ludd, University of Lule}, Sweden.
@@ -41,13 +41,7 @@
 #include "arp.h"
 #include "ppp.h"
 
-#include "opt_vax410.h"
-#include "opt_vax46.h"
-#include "opt_vax48.h"
-#include "opt_vax49.h"
-#include "opt_vax630.h"
-#include "opt_vax650.h"
-
+#include "opt_cputype.h"
 
 #define ENTRY(name) \
        .text                   ; \
diff -r a2ca4580bbf7 -r ee303e862f31 sys/arch/vax/vax/ka630.c
--- a/sys/arch/vax/vax/ka630.c  Mon Jun 12 11:11:19 2000 +0000
+++ b/sys/arch/vax/vax/ka630.c  Mon Jun 12 11:13:14 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ka630.c,v 1.18 2000/01/27 17:06:55 bouyer Exp $        */
+/*     $NetBSD: ka630.c,v 1.19 2000/06/12 11:13:14 ragge Exp $ */
 /*-
  * Copyright (c) 1982, 1988, 1990, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -44,7 +44,7 @@
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
 
-#include "opt_vax630.h"
+#include "opt_cputype.h"
 
 #include <machine/cpu.h>
 #include <machine/pmap.h>
diff -r a2ca4580bbf7 -r ee303e862f31 sys/arch/vax/vax/locore.c
--- a/sys/arch/vax/vax/locore.c Mon Jun 12 11:11:19 2000 +0000
+++ b/sys/arch/vax/vax/locore.c Mon Jun 12 11:13:14 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.c,v 1.46 2000/05/20 13:38:59 ragge Exp $        */
+/*     $NetBSD: locore.c,v 1.47 2000/06/12 11:13:14 ragge Exp $        */
 /*
  * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -51,19 +51,7 @@
 #include <machine/nexus.h>
 #include <machine/rpb.h>
 
-#include "opt_vax780.h"
-#include "opt_vax750.h"
-#include "opt_vax8600.h"
-#include "opt_vax8200.h"
-#include "opt_vax410.h"
-#include "opt_vax43.h"
-#include "opt_vax46.h"
-#include "opt_vax48.h"
-#include "opt_vax49.h"
-#include "opt_vax630.h"
-#include "opt_vax650.h"
-#include "opt_vax660.h"
-#include "opt_vax670.h"
+#include "opt_cputype.h"
 
 void   start(struct rpb *);
 void   main(void);
@@ -80,6 +68,7 @@
 extern struct cpu_dep ka750_calls;
 extern struct cpu_dep ka860_calls;
 extern struct cpu_dep ka820_calls;
+extern struct cpu_dep ka88_calls;
 extern struct cpu_dep ka43_calls;
 extern struct cpu_dep ka46_calls;
 extern struct cpu_dep ka48_calls;
@@ -108,6 +97,7 @@
 
        findcpu(); /* Set up the CPU identifying variables */
 
+       cpu_model[0] = 0; /* Be sure */
        if (vax_confdata & 0x80)
                strcpy(cpu_model, "MicroVAX ");
        else
@@ -234,6 +224,13 @@
                strcpy(cpu_model, "VAX 8200");
                break;
 #endif
+#if VAX8800
+       case VAX_BTYP_8PS:
+       case VAX_BTYP_8800: /* Matches all other KA88-machines also */
+               strcpy(cpu_model, "VAX 8800");
+               dep_call = &ka88_calls;
+               break;
+#endif
        default:
                /* CPU not supported, just give up */
                asm("halt");
diff -r a2ca4580bbf7 -r ee303e862f31 sys/arch/vax/vax/vm_machdep.c
--- a/sys/arch/vax/vax/vm_machdep.c     Mon Jun 12 11:11:19 2000 +0000
+++ b/sys/arch/vax/vax/vm_machdep.c     Mon Jun 12 11:13:14 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vm_machdep.c,v 1.64 2000/06/04 19:03:27 matt Exp $          */
+/*     $NetBSD: vm_machdep.c,v 1.65 2000/06/12 11:13:14 ragge Exp $         */
 
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -60,9 +60,7 @@
 
 #include <sys/syscallargs.h>
 
-#include "opt_vax46.h"
-#include "opt_vax48.h"
-#include "opt_vax49.h"
+#include "opt_cputype.h"
 
 /*
  * pagemove - moves pages at virtual address from to virtual address to,