bios device is ocis from now

3 files changed, 13 insertions, 10 deletions

diff --git a/sys/arch/i386/i386/bios.c b/sys/arch/i386/i386/bios.c
index 8763d011432..64f42c4e6a3 100644
--- a/sys/arch/i386/i386/bios.c
+++ b/sys/arch/i386/i386/bios.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bios.c,v 1.5 1997/09/22 12:09:45 deraadt Exp $	*/
+/*	$OpenBSD: bios.c,v 1.6 1997/09/24 22:52:56 mickey Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael Shalayeff
@@ -256,6 +256,15 @@ biosioctl(dev, cmd, data, flag, p)
 	return 0;
 }
 
+int
+biosselect(dev, rw, p)
+	dev_t	dev;
+	int	rw;
+	struct proc *p;
+{
+	return 0;
+}
+
 void
 bioscnprobe(cn)
 	struct consdev *cn;
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index 812645d63c3..600685f5a24 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.35 1997/09/24 22:18:13 mickey Exp $	*/
+/*	$OpenBSD: conf.c,v 1.36 1997/09/24 22:52:57 mickey Exp $	*/
 /*	$NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $	*/
 
 /*
@@ -238,7 +238,7 @@ struct cdevsw	cdevsw[] =
 	cdev_random_init(1,random),	/* 45: random data source */
 	cdev_uk_init(NPCTR,pctr),	/* 46: pentium performance counters */
 	cdev_disk_init(NRD,rd),		/* 47: ram disk driver */
-	cdev_bios_init(NBIOS,bios),	/* 48: onboard BIOS PROM */
+	cdev_ocis_init(NBIOS,bios),	/* 48: onboard BIOS PROM */
 };
 int	nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
 
diff --git a/sys/arch/i386/include/conf.h b/sys/arch/i386/include/conf.h
index 25a4607a3a0..f1c91b18da5 100644
--- a/sys/arch/i386/include/conf.h
+++ b/sys/arch/i386/include/conf.h
@@ -63,12 +63,6 @@ cdev_decl(pms);
 
 cdev_decl(joy);
 
-/* open, close, ioctl, mmap */
-#define cdev_bios_init(c,n) { \
-	dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
-	(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
-	(dev_type_stop((*))) enodev, \
-	0, seltrue, (dev_type_mmap((*))) enodev }
-
 cdev_decl(bios);
+
 cdev_decl(apm);