Updates for SCSI scanner and SCSI unknown devices.

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

3 files changed, 6 insertions, 4 deletions

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]);