Sync with NetBSD 970827. Forgot this one last time. -moj

1 files changed, 39 insertions, 19 deletions

diff --git a/sys/arch/vax/stand/conf.c b/sys/arch/vax/stand/conf.c
index 348fb27bfab..952d3060a70 100644
--- a/sys/arch/vax/stand/conf.c
+++ b/sys/arch/vax/stand/conf.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: conf.c,v 1.4 1997/05/29 00:04:19 niklas Exp $ */
-/*	$NetBSD: conf.c,v 1.6 1996/08/02 11:21:56 ragge Exp $ */
+/*	$OpenBSD: conf.c,v 1.5 1998/02/03 11:48:25 maja Exp $ */
+/*	$NetBSD: conf.c,v 1.8 1997/04/10 21:25:21 ragge Exp $ */
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -34,8 +34,13 @@
 
 #include "sys/param.h"
 
+#include <netinet/in.h>
+
+#include <machine/rpb.h>
+
 #include "lib/libsa/stand.h"
 #include "lib/libsa/ufs.h"
+#include "lib/libsa/nfs.h"
 
 #include "vaxstand.h"
 
@@ -46,30 +51,32 @@ int     tmscpopen(), tmscpstrategy();
 int     romopen(), romstrategy();
 int     mfmopen(), mfmstrategy();
 int     sdopen(), sdstrategy();
-
+int	netopen(), netstrategy(), netclose();
 
 struct	devsw devsw[]={
 	SADEV("hp",hpstrategy, hpopen, nullsys, noioctl),
-	SADEV(0 ,nullsys, nodev, nullsys, noioctl), /* ht */
-	SADEV(0 ,nullsys, nodev, nullsys, noioctl), /* up */
-	SADEV(0 ,nullsys, nodev, nullsys, noioctl), /* hk */
-	SADEV( 0  ,nullsys, nodev, nullsys, noioctl),
-	SADEV(0 ,nullsys, nodev, nullsys, noioctl), /* tm */
-	SADEV(0 ,nullsys, nodev, nullsys, noioctl), /* ts */
-	SADEV(0 ,nullsys, nodev, nullsys, noioctl), /* mt */
+	SADEV("qe",netstrategy, netopen, netclose, noioctl), /* DEQNA */
 	SADEV("ctu",ctustrategy, ctuopen, nullsys, noioctl),
 	SADEV("ra",rastrategy, raopen, nullsys, noioctl),
-	SADEV(0 ,nullsys, nodev, nullsys, noioctl), /* ut */
-	SADEV(0 ,nullsys, nodev, nullsys, noioctl), /* id */
-	SADEV(0 ,nullsys, nodev, nullsys, noioctl), /* rx */
-	SADEV(0 ,nullsys, nodev, nullsys, noioctl), /* uu */
-	SADEV(0 ,nullsys, nodev, nullsys, noioctl), /* rl */
 	SADEV("mt",tmscpstrategy, tmscpopen, nullsys, noioctl),
-	SADEV(0 ,nullsys, nodev, nullsys, noioctl), /* crx */
-        SADEV("rom",romstrategy, romopen, nullsys, noioctl),    /* 17 */
-        SADEV("mfm",mfmstrategy, mfmopen, nullsys, noioctl),    /* 18 */
-        SADEV("sd",sdstrategy, sdopen, nullsys, noioctl),       /* 18 */
+        SADEV("rom",romstrategy, romopen, nullsys, noioctl),
+        SADEV("rd",mfmstrategy, mfmopen, nullsys, noioctl),
+        SADEV("sd",sdstrategy, sdopen, nullsys, noioctl),
 	SADEV("st",sdstrategy, sdopen, nullsys, noioctl),
+	SADEV("le",netstrategy, netopen, netclose, noioctl), /* LANCE */
+};
+
+int	cnvtab[] = {
+	BDEV_HP,
+	BDEV_QE,
+	BDEV_CNSL,
+	BDEV_UDA,
+	BDEV_TK,
+	-1,
+	BDEV_RD,
+	BDEV_SD,
+	BDEV_ST,
+	BDEV_LE,
 };
 
 int     ndevs = (sizeof(devsw)/sizeof(devsw[0]));
@@ -78,5 +85,18 @@ struct fs_ops file_system[] = {
 	{ ufs_open, ufs_close, ufs_read, ufs_write, ufs_seek, ufs_stat }
 };
 
+struct fs_ops nfs_system[] = {
+	{ nfs_open, nfs_close, nfs_read, nfs_write, nfs_seek, nfs_stat },
+};
+
 int nfsys = (sizeof(file_system) / sizeof(struct fs_ops));
 
+extern struct netif_driver qe_driver;
+extern struct netif_driver le_driver;
+ 
+struct netif_driver *netif_drivers[] = {
+/*	&qe_driver,  */
+	&le_driver,
+}; 
+int     n_netif_drivers = (sizeof(netif_drivers) / sizeof(netif_drivers[0]));
+