Updates for SCSI scanner and SCSI unknown devices.

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

4 files changed, 30 insertions, 5 deletions

diff --git a/etc/etc.sparc/MAKEDEV b/etc/etc.sparc/MAKEDEV
index e3e9e5e86ed..a7637d29e11 100644
--- a/etc/etc.sparc/MAKEDEV
+++ b/etc/etc.sparc/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.10 1996/11/06 01:34:02 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.11 1996/11/11 23:30:25 kstailey Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -45,6 +45,8 @@
 #	cd*	SCSI cdrom drives
 #	st*	SCSI tape
 #	ch*	SCSI changer
+#	uk*	unknown SCSI
+#	ss*	SCSI scanners
 #	xy*	Xylogic 450/451 disks
 #	xd*	Xylogic 753/7053 disks
 #	fd*	Floppies
@@ -81,6 +83,8 @@ case $i in
 all)
 	sh MAKEDEV std sd0 sd1 sd2 sd3 sd4 xd0 xd1 xd2 xd3 xy0 xy1 xy2 xy3
 	sh MAKEDEV cd0 st0 st1 fd0
+	sh MAKEDEV uk0 uk1
+	sh MAKEDEV ss0 ss1
 	sh MAKEDEV pty0 vnd0 vnd1 vnd2 vnd3 audio tun0 tun1 tun2 tun3
 	sh MAKEDEV ccd0 ccd1 ccd2 ccd3
 	sh MAKEDEV bpf0 bpf1 bpf2 bpf3 ipl bwtwo0 cgthree0 cgfour0 cgsix0
@@ -360,6 +364,25 @@ random|srandom|urandom|prandom|arandom)
 	chmod 644 random srandom urandom prandom arandom
 	;;
 
+uk*)
+	unit=`expr $i : 'uk\(.*\)'`
+	rm -f uk$unit
+	mknod uk$unit c 98 $unit
+	chown root.operator uk$unit
+	chmod 640 uk$unit
+	;;
+
+ss*)
+	unit=`expr $i : 'ss\(.*\)'`
+	rm -f ss$unit
+	mknod ss$unit c 99 $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
+	;;
+
 local)
 	umask 0
 	sh MAKEDEV.local
diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index a02afd9983d..6ffc467bb35 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -217,6 +217,8 @@ sd*	at scsibus? target ? lun ?		# SCSI disks
 st*	at scsibus? target ? lun ?		# SCSI tapes
 cd*	at scsibus? target ? lun ?		# SCSI CD-ROMs
 ch*	at scsibus? target ? lun ?		# SCSI changer devices
+ss*	at scsibus? target ? lun ?		# SCSI scanners
+uk*	at scsibus? target ? lun ?		# unknown SCSI devices
 
 # Floppy controller and drive found on SPARCstations.
 fdc0	at mainbus0				# sun4c controller
diff --git a/sys/arch/sparc/include/conf.h b/sys/arch/sparc/include/conf.h
index 0db858ca427..7d63e4f375c 100644
--- a/sys/arch/sparc/include/conf.h
+++ b/sys/arch/sparc/include/conf.h
@@ -1,4 +1,5 @@
 /*	$NetBSD: conf.h,v 1.1 1996/03/30 21:17:55 christos Exp $	*/
+/*	$OpenBSD: conf.h,v 1.3 1996/11/11 23:30:27 kstailey Exp $	*/
 
 /*
  * Copyright (c) 1996 Christos Zoulas.  All rights reserved.
@@ -42,8 +43,6 @@ cdev_decl(mm);
 
 cdev_decl(openprom);
 
-cdev_decl(cn);
-
 cdev_decl(zs);
 
 bdev_decl(fd);
@@ -79,5 +78,3 @@ cdev_decl(xy);
 
 bdev_decl(sw);
 cdev_decl(sw);
-
-cdev_decl(random);
diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c
index 9cbca7042cb..891d58a7a46 100644
--- a/sys/arch/sparc/sparc/conf.c
+++ b/sys/arch/sparc/sparc/conf.c
@@ -62,6 +62,7 @@
 #include "ccd.h"
 #include "ch.h"
 #include "ss.h"
+#include "uk.h"
 #include "sd.h"
 #include "st.h"
 #include "cd.h"
@@ -228,6 +229,8 @@ struct cdevsw	cdevsw[] =
 	cdev_lkm_dummy(),		/* 117 */
 	cdev_lkm_dummy(),		/* 118 */
 	cdev_random_init(1,random),	/* 119: random generator */
+	cdev_uk_init(NUK,uk),		/* 120: unknown SCSI */
+	cdev_ss_init(NSS,ss),           /* 121: SCSI scanner */
 };
 int	nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);