Updates for SCSI scanner and SCSI unknown devices.

Removed MI *dev_decl() stuff that is now in sys/conf.h

2 files changed, 19 insertions, 28 deletions

diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index e1e27b35bca..c048ef89a65 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.31 1996/11/10 21:39:18 downsj Exp $
+#	$OpenBSD: MAKEDEV,v 1.32 1996/11/11 20:47:21 kstailey Exp $
 #	$NetBSD: MAKEDEV,v 1.40 1996/03/31 00:50:47 perry Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -80,6 +80,7 @@
 #	pcmcia*	PCMCIA card drivers
 #	*random	inkernel random number generator
 #	uk*	"unknown SCSI" devices
+#	ss*	SCSI scanners
 #
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
@@ -95,7 +96,7 @@ all)
 	sh MAKEDEV lpt0 lpt1 lpt2 ttyC0 ttyC1 ttyC2 bpf0 bpf1 bpf2 bpf3
 	sh MAKEDEV ipl tun0 tun1 tun2
 	sh MAKEDEV speaker lkm mms0 lms0 pms0 audio joy0 joy1 apm pcmcia local
-	sh MAKEDEV random uk0 uk1 pctr
+	sh MAKEDEV random uk0 uk1 ss0 ss1 pctr
 # MISSING:
 #	sh MAKEDEV mouse-?
 	;;
@@ -440,6 +441,17 @@ uk*)
 	chmod 640 uk$unit
 	;;
 
+ss*)
+	unit=`expr $i : 'ss\(.*\)'`
+	rm -f ss$unit
+	mknod ss$unit c 19 $unit
+	chown root.operator ss$unit
+	chmod 440 ss$unit
+#	backwards compatibility with older PINTs
+	rm -f scan$unit
+	ln -s ss$unit scan$unit
+	;;
+
 pctr)
 	rm -f pctr;
 	mknod pctr c 46 0
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index 74796a2a103..73f5bcb301b 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.28 1996/11/10 21:31:52 downsj Exp $	*/
+/*	$OpenBSD: conf.c,v 1.29 1996/11/11 20:47:24 kstailey Exp $	*/
 /*	$NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $	*/
 
 /*
@@ -47,23 +47,17 @@ bdev_decl(fd);
 #include "wt.h"
 bdev_decl(wt);
 #include "sd.h"
-bdev_decl(sd);
 #include "st.h"
-bdev_decl(st);
 #include "cd.h"
-bdev_decl(cd);
 #include "uk.h"
-cdev_decl(uk);
 #include "acd.h"
 bdev_decl(acd);
 #include "mcd.h"
 bdev_decl(mcd);
 #include "vnd.h"
-bdev_decl(vnd);
 #include "scd.h"
 bdev_decl(scd);
 #include "ccd.h"
-bdev_decl(ccd);
 #include "rd.h"
 bdev_decl(rd);
 /* no cdev for rd */
@@ -124,21 +118,12 @@ int	nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
         (dev_type_stop((*))) enodev, 0,  dev_init(c,n,select), \
         (dev_type_mmap((*))) enodev, 0 }
 
-cdev_decl(cn);
-cdev_decl(ctty);
 #define	mmread	mmrw
 #define	mmwrite	mmrw
 cdev_decl(mm);
 cdev_decl(wd);
 cdev_decl(sw);
 #include "pty.h"
-#define	ptstty		ptytty
-#define	ptsioctl	ptyioctl
-cdev_decl(pts);
-#define	ptctty		ptytty
-#define	ptcioctl	ptyioctl
-cdev_decl(ptc);
-cdev_decl(log);
 #include "com.h"
 #include "pccom.h"
 cdev_decl(com);
@@ -148,11 +133,7 @@ cdev_decl(scd);
 #include "pc.h"
 #include "vt.h"
 cdev_decl(pc);
-cdev_decl(sd);
-cdev_decl(st);
 #include "ss.h"
-cdev_decl(ss);
-cdev_decl(cd);
 cdev_decl(acd);
 #include "lpt.h"
 cdev_decl(lpt);
@@ -160,12 +141,10 @@ cdev_decl(lpt);
 cdev_decl(ch);
 dev_decl(filedesc,open);
 #include "bpfilter.h"
-cdev_decl(bpf);
 #include "pcmcia.h"
 cdev_decl(pcmcia);
 #include "spkr.h"
 cdev_decl(spkr);
-cdev_decl(lkm);
 #include "mms.h"
 cdev_decl(mms);
 #include "lms.h"
@@ -176,17 +155,13 @@ cdev_decl(pms);
 cdev_decl(cy);
 cdev_decl(mcd);
 #include "tun.h"
-cdev_decl(tun);
-cdev_decl(vnd);
 #include "audio.h"
 cdev_decl(audio);
 cdev_decl(svr4_net);
-cdev_decl(ccd);
 #include "joy.h"
 cdev_decl(joy);
 #include "apm.h"
 cdev_decl(apm);
-cdev_decl(random);
 #include "pctr.h"
 cdev_decl(pctr);
 
@@ -201,6 +176,10 @@ cdev_decl(ipl);
 #if (NCOM > 0) && (NPCCOM > 0)
 #error com and pccom are mutually exclusive.  Sorry.
 #endif
+#if (NVT > 0) && (NPC > 0)
+#error vt and pc are mutually exclusive.  Sorry.
+#endif
+
 
 struct cdevsw	cdevsw[] =
 {