From 2665d4b7c68a8320cfc2bb2d16898eea84f355c8 Mon Sep 17 00:00:00 2001 From: matt Date: Mon, 17 Jan 2000 04:55:25 +0000 Subject: [PATCH] defopt VAXnnn so the make depend does the right thing. --- sys/arch/vax/conf/files.vax | 24 +++++++++++++++++++++--- sys/arch/vax/uba/ts.c | 8 +++++--- sys/arch/vax/vax/clock.c | 12 ++++++++++-- sys/arch/vax/vax/conf.c | 17 +++++++++++++++-- sys/arch/vax/vax/gencons.h | 10 ++++------ sys/arch/vax/vax/intvec.s | 10 ++++++++-- sys/arch/vax/vax/locore.c | 16 +++++++++++++++- 7 files changed, 78 insertions(+), 19 deletions(-) diff --git a/sys/arch/vax/conf/files.vax b/sys/arch/vax/conf/files.vax index bb4202a6f98b..4da30920bf7c 100644 --- a/sys/arch/vax/conf/files.vax +++ b/sys/arch/vax/conf/files.vax @@ -1,4 +1,4 @@ -# $NetBSD: files.vax,v 1.61 2000/01/10 02:35:35 matt Exp $ +# $NetBSD: files.vax,v 1.62 2000/01/17 04:55:28 matt Exp $ # # new style config file for vax architecture # @@ -16,6 +16,24 @@ device cpu device mem device mba { drive = -1 } +#defopt opt_newintr.h NEWIDSPTCH + +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 VAX630 # MicroVAX II or VAXstation II +defopt VAX650 # MicroVAX III or VAXstation III +defopt VAX660 # VAX 4000/200 +defopt VAX670 # VAX 4000/300 + # SBI and related devices device sbi { tr=-1 } attach sbi at mainbus with sbi_mainbus @@ -327,11 +345,11 @@ file arch/vax/vax/db_machdep.c ddb file arch/vax/vax/db_disasm.c ddb file arch/vax/uba/uba_dma.c uba -include "compat/ultrix/files.ultrix" - include "compat/ibcs2/files.ibcs2" file arch/vax/vax/ibcs2_machdep.c compat_ibcs2 +include "compat/ultrix/files.ultrix" + include "compat/vax1k/files.vax1k" # Dom h{ra f}r vara kvar s} l{nge f}r vi se vilka vi beh|ver... diff --git a/sys/arch/vax/uba/ts.c b/sys/arch/vax/uba/ts.c index 7a1a095aaec8..8b6e9fbe7287 100644 --- a/sys/arch/vax/uba/ts.c +++ b/sys/arch/vax/uba/ts.c @@ -1,4 +1,4 @@ -/* $NetBSD: ts.c,v 1.13 1999/04/12 20:57:52 pk Exp $ */ +/* $NetBSD: ts.c,v 1.14 2000/01/17 04:55:28 matt Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -142,6 +142,8 @@ int tstrace = 1; #include +#include "opt_vax750.h" + #include "ts.h" /* @@ -487,7 +489,7 @@ tsstart (sc, bp) goto do_cmd; return (-1); /* ??? */ } -#if defined(VAX750) +#if VAX750 if (vax_cputype == VAX_750) itmp = i & 0xfffffff; /* mask off bdp */ else @@ -918,7 +920,7 @@ tsintr(ctlr) ubarelse((struct uba_softc *) sc->sc_dev.dv_parent, (int *)&bp->b_ubinfo); -#if defined(VAX750) +#if VAX750 if (vax_cputype == VAX_750 && sc->sc_unit.uu_ubinfo != 0) ubarelse((struct uba_softc *) diff --git a/sys/arch/vax/vax/clock.c b/sys/arch/vax/vax/clock.c index 4f04af11ef89..bf2196f135a0 100644 --- a/sys/arch/vax/vax/clock.c +++ b/sys/arch/vax/vax/clock.c @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.28 1999/05/01 16:13:43 ragge Exp $ */ +/* $NetBSD: clock.c,v 1.29 2000/01/17 04:55:26 matt Exp $ */ /* * Copyright (c) 1995 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -43,6 +43,14 @@ #include #include +#include "opt_vax750.h" +#include "opt_vax780.h" +#include "opt_vax650.h" +#include "opt_vax670.h" +#include "opt_vax8500.h" +#include "opt_vax8200.h" +#include "opt_vax46.h" + int yeartonum __P((int)); int numtoyear __P((int)); @@ -62,7 +70,7 @@ microtime(tvp) bcopy((caddr_t)&time, tvp, sizeof(struct timeval)); switch (vax_boardtype) { -#ifdef VAX46 +#if VAX46 case VAX_BTYP_46: { extern struct vs_cpu *ka46_cpu; i = *(volatile int *)(&ka46_cpu->vc_diagtimu); diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c index d67f9f5208ac..b7b65192e647 100644 --- a/sys/arch/vax/vax/conf.c +++ b/sys/arch/vax/vax/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.44 1999/10/27 16:38:54 ragge Exp $ */ +/* $NetBSD: conf.c,v 1.45 2000/01/17 04:55:25 matt Exp $ */ /*- * Copyright (c) 1982, 1986 The Regents of the University of California. @@ -43,6 +43,19 @@ #include #include +#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 "hp.h" /* 0 */ bdev_decl(hp); @@ -66,7 +79,7 @@ bdev_decl(ts); #include "mu.h" bdev_decl(mu); -#if defined(VAX750) +#if VAX750 #define NCTU 1 #else #define NCTU 0 diff --git a/sys/arch/vax/vax/gencons.h b/sys/arch/vax/vax/gencons.h index 087be385ed52..81d63c92e062 100644 --- a/sys/arch/vax/vax/gencons.h +++ b/sys/arch/vax/vax/gencons.h @@ -1,4 +1,4 @@ -/* $NetBSD: gencons.h,v 1.7 1999/01/19 21:04:48 ragge Exp $ */ +/* $NetBSD: gencons.h,v 1.8 2000/01/17 04:55:26 matt Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden. @@ -32,7 +32,7 @@ */ /* All bugs are subject to removal without further notice */ - +#include "opt_vax8600.h" /* * Some definitions for generic console interface (PR 32-35) @@ -41,10 +41,8 @@ /* PR_TXCS */ #define GC_RDY 0x80 /* Console ready to xmit chr */ #define GC_TIE 0x40 /* xmit interrupt enable */ -#if VAX8600 -#define GC_LT 0x80000 /* Enable logical terminal */ -#define GC_WRT 0x8000 /* Allow mtpr's to console */ -#endif +#define GC_LT 0x80000 /* VAX8600: Enable logical terminal */ +#define GC_WRT 0x8000 /* VAX8600: Allow mtpr's to console */ /* PR_RXCS */ #define GC_DON 0x80 /* character received */ diff --git a/sys/arch/vax/vax/intvec.s b/sys/arch/vax/vax/intvec.s index 4a27783dcb91..d7cd59947fa8 100644 --- a/sys/arch/vax/vax/intvec.s +++ b/sys/arch/vax/vax/intvec.s @@ -1,4 +1,4 @@ -/* $NetBSD: intvec.s,v 1.39 1999/06/28 08:20:48 itojun Exp $ */ +/* $NetBSD: intvec.s,v 1.40 2000/01/17 04:55:26 matt Exp $ */ /* * Copyright (c) 1994, 1997 Ludd, University of Lule}, Sweden. @@ -40,6 +40,12 @@ #include "arp.h" #include "ppp.h" +#include "opt_vax410.h" +#include "opt_vax46.h" +#include "opt_vax630.h" +#include "opt_vax650.h" + + #define ENTRY(name) \ .text ; \ .align 2 ; \ @@ -311,7 +317,7 @@ ENTRY(netint) .globl hardclock hardclock: mtpr $0xc1,$PR_ICCS # Reset interrupt flag pushr $0x3f -#ifdef VAX46 +#if VAX46 cmpl _vax_boardtype,$VAX_BTYP_46 bneq 1f movl _ka46_cpu,r0 diff --git a/sys/arch/vax/vax/locore.c b/sys/arch/vax/vax/locore.c index 2916a72dbff5..48507732867b 100644 --- a/sys/arch/vax/vax/locore.c +++ b/sys/arch/vax/vax/locore.c @@ -1,4 +1,4 @@ -/* $NetBSD: locore.c,v 1.41 1999/10/20 20:42:29 ragge Exp $ */ +/* $NetBSD: locore.c,v 1.42 2000/01/17 04:55:26 matt Exp $ */ /* * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -49,6 +49,20 @@ #include #include +#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" + void start __P((void)); void main __P((void));