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.

1 files changed, 12 insertions, 9 deletions

diff --git a/sys/arch/vax/mba/mbavar.h b/sys/arch/vax/mba/mbavar.h
index d1b51450027..0dca256e5c2 100644
--- a/sys/arch/vax/mba/mbavar.h
+++ b/sys/arch/vax/mba/mbavar.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: mbavar.h,v 1.5 2002/03/14 01:26:48 millert Exp $ */
-/*	$NetBSD: mbavar.h,v 1.5 2000/01/21 23:39:56 thorpej Exp $ */
+/*	$OpenBSD: mbavar.h,v 1.6 2002/06/11 09:36:24 hugh Exp $	*/
+/*	$NetBSD: mbavar.h,v 1.7 2000/06/04 18:04:39 ragge Exp $ */
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden
  * All rights reserved.
@@ -31,6 +31,7 @@
  */
 
 #include <sys/device.h>
+#include <machine/scb.h>
 
 #define MBCR_INIT	1
 #define	MBCR_IE		(1<<2)
@@ -78,10 +79,12 @@ enum	xfer_action {
  * Info passed do unit device driver during autoconfig.
  */
 struct	mba_attach_args {
-	int	unit;
-        int	type;
-	char	*name;
-	enum	mb_devices devtyp;
+	int	ma_unit;
+        int	ma_type;
+	char	*ma_name;
+	enum	mb_devices ma_devtyp;
+	bus_space_tag_t ma_iot;
+	bus_space_handle_t ma_ioh;
 };
 
 /*
@@ -103,11 +106,11 @@ struct	mba_device {
 
 struct	mba_softc {
 	struct  device sc_dev;
-	struct  ivec_dsp sc_dsp;	/* Interrupt catch routine */
-	struct  mba_regs *sc_mbareg;
+	bus_space_tag_t sc_iot;
+	bus_space_handle_t sc_ioh;
+	struct	evcnt sc_intrcnt;
 	struct	mba_device *sc_first, *sc_last;
 	enum    sc_state sc_state;
-	int	sc_physnr;		/* Physical number of this mba */
 	struct	mba_device *sc_md[MAXMBADEV];
 };