sync netbsd bi-related header files

3 files changed, 68 insertions, 25 deletions

diff --git a/sys/arch/vax/bi/bireg.h b/sys/arch/vax/bi/bireg.h
index 94ab718a849..edc75f91ab7 100644
--- a/sys/arch/vax/bi/bireg.h
+++ b/sys/arch/vax/bi/bireg.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: bireg.h,v 1.2 1997/05/29 00:04:16 niklas Exp $	*/
-/*	$NetBSD: bireg.h,v 1.1 1996/07/19 14:26:53 ragge Exp $	*/
+/*	$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 $	*/
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
@@ -45,7 +45,9 @@
 /*
  * BI node addresses
  */
-#define	BI_BASE(bi)	(0x20000000 + (bi) * 0x2000000)
+#define	NODESIZE	0x2000	/* Size of one BI node */
+#define	BI_NODE(node)	(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 */
 
@@ -55,6 +57,8 @@
  * These are followed with interface-specific registers.
  *
  * NB: This structure does NOT include the four GPRs (not anymore!)
+ *
+ * 990712: The structs not used anymore due to conversion to bus.h.
  */
 struct biiregs {
 	u_short	bi_dtype;	/* device type */
@@ -98,22 +102,43 @@ struct bi_cpu {
 	u_long	bi_rxcd;	/* receive console data register */
 };
 
+#define	BIREG_DTYPE		0x00
+#define	BIREG_VAXBICSR		0x04
+#define	BIREG_BER		0x08
+#define	BIREG_EINTRCSR		0x0c
+#define	BIREG_INTRDES		0x10
+#define	BIREG_IPINTRMSK		0x14
+#define	BIREG_FIPSDES		0x18
+#define	BIREG_IPINTRSRC		0x1c
+#define	BIREG_SADR		0x20
+#define	BIREG_EADR		0x24
+#define	BIREG_BCICSR		0x28
+#define	BIREG_WSTAT		0x2c
+#define	BIREG_FIPSCMD		0x30
+#define	BIREG_UINTRCSR		0x40
+
 /* device types */
 #define	BIDT_MS820	0x0001	/* MS820 memory board */
-#define	BIDT_DRB32	0x0101	/* DRB32 Supercomputer gateway */
+#define	BIDT_DRB32	0x0101	/* DRB32 (MFA) Supercomputer gateway */
 #define	BIDT_DWBUA	0x0102	/* DWBUA Unibus adapter */
-#define	BIDT_KLESI	0x0103	/* KLESI-B adapter */
+#define	BIDT_KLESI	0x0103	/* KLESI-B (DWBLA) adapter */
+#define	BIDT_HSB70	0x4104	/* HSB70 */
 #define	BIDT_KA820	0x0105	/* KA820 cpu */
-#define	BIDT_DB88	0x0106	/* DB88 adapter */
+#define	BIDT_DB88	0x0106	/* DB88 (NBI) adapter */
+#define	BIDT_DWMBA	0x2107	/* XMI-BI (XBI) adapter */
+#define	BIDT_DWMBB	0x0107	/* XMI-BI (XBI) adapter */
 #define	BIDT_CIBCA	0x0108	/* Computer Interconnect adapter */
-#define	BIDT_DMB32	0x0109	/* DMB32 adapter */
+#define	BIDT_DMB32	0x0109	/* DMB32 (COMB) adapter */
+#define	BIDT_BAA	0x010a	/* BAA */
 #define	BIDT_CIBCI	0x010b	/* Computer Interconnect adapter (old) */
-#define	BIDT_KA800	0x010c	/* KA800 slave processor */
-#define	BIDT_KDB50	0x010e	/* KDB50 disk controller */
-#define	BIDT_DWMBA	0x2107	/* XMI - BI adapter */
+#define	BIDT_DEBNT	0x410b	/* (AIE_TK70) Ethernet+TK50/TBK70  */
+#define	BIDT_KA800	0x010c	/* KA800 (ACP) slave processor */
 #define	BIDT_KFBTA	0x410d	/* RD/RX disk controller */
-#define	BIDT_DEBNK	0x410e	/* BI Ethernet (Lance) + TK50 */
-#define	BIDT_DEBNA	0x410f	/* BI Ethernet (Lance) adapter */
+#define	BIDT_KDB50	0x010e	/* KDB50 (BDA) disk controller */
+#define	BIDT_DEBNK	0x410e	/* (AIE_TK) BI Ethernet (Lance) + TK50 */
+#define	BIDT_DEBNA	0x410f	/* (AIE) BI Ethernet (Lance) adapter */
+#define	BIDT_DEBNI	0x0118	/* (XNA) BI Ethernet adapter */
+
 
 /* bits in bi_csr */
 #define	BICSR_IREV(x)	((u_char)((x) >> 24))	/* VAXBI interface rev */
@@ -218,7 +243,7 @@ struct bi_cpu {
 #define	BIW_GPR1	0x20000000	/* gpr 1 was written */
 #define	BIW_GPR0	0x10000000	/* gpr 0 was written */
 
-/* bits in force-bit ipintr/stop command register 8/
+/* bits in force-bit ipintr/stop command register */
 #define	BIFIPSC_CMDMASK	0x0000f000	/* command */
 #define	BIFIPSC_MIDEN	0x00000800	/* master ID enable */
 
diff --git a/sys/arch/vax/bi/bivar.h b/sys/arch/vax/bi/bivar.h
index 57960ce2aa4..6ee0c4cf91b 100644
--- a/sys/arch/vax/bi/bivar.h
+++ b/sys/arch/vax/bi/bivar.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: bivar.h,v 1.2 1997/05/29 00:04:17 niklas Exp $ */
-/*	$NetBSD: bivar.h,v 1.1 1996/07/19 14:26:54 ragge Exp $ */
+/*	$OpenBSD: bivar.h,v 1.3 2000/04/28 03:42:39 bjc Exp $ */
+/*	$NetBSD: bivar.h,v 1.5 2000/03/26 11:45:04 ragge Exp $ */
 /*
- * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
+ * Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -14,8 +14,8 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *      This product includes software developed at Ludd, University of 
- *      Lule}, Sweden and its contributors.
+ *	This product includes software developed at Ludd, University of 
+ *	Lule}, Sweden and its contributors.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission
  *
@@ -37,17 +37,27 @@
  * per-BI-adapter state.
  */
 struct bi_softc {
-        struct device bi_dev;
-        struct bi_node *bi_base;
+	struct device sc_dev;
+	bus_space_tag_t sc_iot;		/* Space tag for the BI bus */
+	bus_dma_tag_t sc_dmat;
+	bus_addr_t sc_addr;		/* Address base address for this bus */
+	int sc_busnr;			/* (Physical) number of this bus */
+	int sc_lastiv;			/* last available interrupt vector */
+	int sc_intcpu;
 };
 
 /*
  * Struct used for autoconfiguration; attaching of BI nodes.
  */
 struct bi_attach_args {
-        struct bi_node *ba_node;
-        int ba_nodenr;
+	bus_space_tag_t ba_iot;
+	bus_space_handle_t ba_ioh;	/* Base address for this node */
+	bus_dma_tag_t ba_dmat;
+	int ba_busnr;
+	int ba_nodenr;
 	int ba_intcpu;	/* Mask of which cpus to interrupt */
+	int ba_ivec;	/* Interrupt vector to use */
+	void *ba_icookie;
 };
 
 /*
@@ -55,6 +65,10 @@ struct bi_attach_args {
  */
 struct bi_list {
 	u_short bl_nr;		/* Unit ID# */
-	u_short bl_havedriver;	/* Have device driver */
+	u_short bl_havedriver;	/* Have device driver (informal) */
 	char *bl_name;		/* DEC name */
 };
+
+/* Prototype */
+void	bi_attach __P((struct bi_softc *));
+void	bi_intr_establish __P((void *, int, void (*)(void *), void *));
diff --git a/sys/arch/vax/bi/kdbreg.h b/sys/arch/vax/bi/kdbreg.h
index c3e9603c6d3..c92bd0bf732 100644
--- a/sys/arch/vax/bi/kdbreg.h
+++ b/sys/arch/vax/bi/kdbreg.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: kdbreg.h,v 1.2 1997/05/29 00:04:17 niklas Exp $	*/
-/*	$NetBSD: kdbreg.h,v 1.1 1996/07/19 14:26:56 ragge Exp $	*/
+/*	$OpenBSD: kdbreg.h,v 1.3 2000/04/28 03:42:39 bjc Exp $	*/
+/*	$NetBSD: kdbreg.h,v 1.3 1999/11/03 21:57:40 ragge Exp $	*/
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
@@ -50,6 +50,10 @@ struct	kdb_regs {
 	short	kdb_sw;		/* status & address (w/o half) */
 };
 
+#define	KDB_IP	0xf2
+#define	KDB_SA	0xf4
+#define	KDB_SW	0xf6
+
 #define KDBSR_BITS \
 "\20\20ERR\17STEP4\16STEP3\15STEP2\14STEP1\13oldNV\12oldQB\11DI\10IE\1GO"