Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/vax defopt VAXnnn so the make depend does the right...
details: https://anonhg.NetBSD.org/src/rev/f54eae27c97a
branches: trunk
changeset: 480647:f54eae27c97a
user: matt <matt%NetBSD.org@localhost>
date: Mon Jan 17 04:55:25 2000 +0000
description:
defopt VAXnnn so the make depend does the right thing.
diffstat:
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(-)
diffs (247 lines):
diff -r 268aa0d5a9dc -r f54eae27c97a sys/arch/vax/conf/files.vax
--- a/sys/arch/vax/conf/files.vax Mon Jan 17 04:22:59 2000 +0000
+++ b/sys/arch/vax/conf/files.vax Mon Jan 17 04:55:25 2000 +0000
@@ -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 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_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 -r 268aa0d5a9dc -r f54eae27c97a sys/arch/vax/uba/ts.c
--- a/sys/arch/vax/uba/ts.c Mon Jan 17 04:22:59 2000 +0000
+++ b/sys/arch/vax/uba/ts.c Mon Jan 17 04:55:25 2000 +0000
@@ -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 @@
#include <vax/uba/tsreg.h>
+#include "opt_vax750.h"
+
#include "ts.h"
/*
@@ -487,7 +489,7 @@
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 @@
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 -r 268aa0d5a9dc -r f54eae27c97a sys/arch/vax/vax/clock.c
--- a/sys/arch/vax/vax/clock.c Mon Jan 17 04:22:59 2000 +0000
+++ b/sys/arch/vax/vax/clock.c Mon Jan 17 04:55:25 2000 +0000
@@ -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 <machine/cpu.h>
#include <machine/uvax.h>
+#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 @@
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 -r 268aa0d5a9dc -r f54eae27c97a sys/arch/vax/vax/conf.c
--- a/sys/arch/vax/vax/conf.c Mon Jan 17 04:22:59 2000 +0000
+++ b/sys/arch/vax/vax/conf.c Mon Jan 17 04:55:25 2000 +0000
@@ -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 <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 "hp.h" /* 0 */
bdev_decl(hp);
@@ -66,7 +79,7 @@
#include "mu.h"
bdev_decl(mu);
-#if defined(VAX750)
+#if VAX750
#define NCTU 1
#else
#define NCTU 0
diff -r 268aa0d5a9dc -r f54eae27c97a sys/arch/vax/vax/gencons.h
--- a/sys/arch/vax/vax/gencons.h Mon Jan 17 04:22:59 2000 +0000
+++ b/sys/arch/vax/vax/gencons.h Mon Jan 17 04:55:25 2000 +0000
@@ -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 -r 268aa0d5a9dc -r f54eae27c97a sys/arch/vax/vax/intvec.s
--- a/sys/arch/vax/vax/intvec.s Mon Jan 17 04:22:59 2000 +0000
+++ b/sys/arch/vax/vax/intvec.s Mon Jan 17 04:55:25 2000 +0000
@@ -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 @@
.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 -r 268aa0d5a9dc -r f54eae27c97a sys/arch/vax/vax/locore.c
--- a/sys/arch/vax/vax/locore.c Mon Jan 17 04:22:59 2000 +0000
+++ b/sys/arch/vax/vax/locore.c Mon Jan 17 04:55:25 2000 +0000
@@ -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 <machine/pmap.h>
#include <machine/nexus.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"
+
void start __P((void));
void main __P((void));
Home |
Main Index |
Thread Index |
Old Index