summaryrefslogtreecommitdiff
path: root/sys/arch/vax/bi/bireg.h
diff options
context:
space:
mode:
authorHugh Graham <hugh@cvs.openbsd.org>2002-06-11 09:36:25 +0000
committerHugh Graham <hugh@cvs.openbsd.org>2002-06-11 09:36:25 +0000
commit10ca5e5818bb80e596db244327a2663b6703bb18 (patch)
treec7ac330b34d73ea4e0c78d17a9eed0a3b6df63aa /sys/arch/vax/bi/bireg.h
parent180b34af9885b092bee0f67c5b2ac8577d972cfe (diff)
New boot code, mostly from ragge's work in NetBSD.
Some header syncing and a couple network drivers came along for the ride. Assembly files have been renamed from .s to .S to facilitate diffs. Kernel is backwards compat - with manual interaction. OpenBSD features have been preserved.
Diffstat (limited to 'sys/arch/vax/bi/bireg.h')
-rw-r--r--sys/arch/vax/bi/bireg.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/vax/bi/bireg.h b/sys/arch/vax/bi/bireg.h
index edc75f91ab7..6b9a68d00c1 100644
--- a/sys/arch/vax/bi/bireg.h
+++ b/sys/arch/vax/bi/bireg.h
@@ -1,5 +1,5 @@
-/* $OpenBSD: bireg.h,v 1.3 2000/04/28 03:42:39 bjc Exp $ */
-/* $NetBSD: bireg.h,v 1.6 1999/08/04 19:12:22 ragge Exp $ */
+/* $OpenBSD: bireg.h,v 1.4 2002/06/11 09:36:23 hugh Exp $ */
+/* $NetBSD: bireg.h,v 1.7 2000/07/06 17:47:02 ragge Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -45,8 +45,8 @@
/*
* BI node addresses
*/
-#define NODESIZE 0x2000 /* Size of one BI node */
-#define BI_NODE(node) (NODESIZE * (node))
+#define BI_NODESIZE 0x2000 /* Size of one BI node */
+#define BI_NODE(node) (BI_NODESIZE * (node))
#define BI_BASE(bi,nod) ((0x20000000 + (bi) * 0x2000000) + BI_NODE(nod))
#define MAXNBI 16 /* Spec says there can be 16 anyway */
#define NNODEBI 16 /* 16 nodes per BI */
@@ -60,6 +60,7 @@
*
* 990712: The structs not used anymore due to conversion to bus.h.
*/
+#ifdef notdef
struct biiregs {
u_short bi_dtype; /* device type */
u_short bi_revs; /* revisions */
@@ -101,6 +102,7 @@ struct bi_cpu {
u_long bi_xxx[63]; /* pad */
u_long bi_rxcd; /* receive console data register */
};
+#endif
#define BIREG_DTYPE 0x00
#define BIREG_VAXBICSR 0x04