Add majors and devsw entries for the missing scsi devices on mvme*8k.

1 files changed, 68 insertions, 66 deletions

diff --git a/sys/arch/mvme88k/mvme88k/conf.c b/sys/arch/mvme88k/mvme88k/conf.c
index 83de6cdf31d..2a19bf8fab6 100644
--- a/sys/arch/mvme88k/mvme88k/conf.c
+++ b/sys/arch/mvme88k/mvme88k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.27 2003/09/23 16:51:11 millert Exp $	*/
+/*	$OpenBSD: conf.c,v 1.28 2003/09/26 06:58:04 miod Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -45,11 +45,13 @@
 #include "tun.h"
 #include "vnd.h"
 #include "ccd.h"
+#include "rd.h"
+#include "cd.h"
 #include "ch.h"
 #include "sd.h"
+#include "ss.h"
 #include "st.h"
-#include "cd.h"
-#include "rd.h"
+#include "uk.h"
 
 #ifdef XFS
 #include <xfs/nxfs.h>
@@ -129,79 +131,79 @@ int	nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
 
 struct cdevsw	cdevsw[] =
 {
-	cdev_cn_init(1,cn),              /* 0: virtual console */
-	cdev_ctty_init(1,ctty),          /* 1: controlling terminal */
-	cdev_mm_init(1,mm),              /* 2: /dev/{null,mem,kmem,...} */
-	cdev_swap_init(1,sw),            /* 3: /dev/drum (swap pseudo-device) */
-	cdev_tty_init(NPTY,pts),         /* 4: pseudo-tty slave */
-	cdev_ptc_init(NPTY,ptc),         /* 5: pseudo-tty master */
-	cdev_log_init(1,log),            /* 6: /dev/klog */
-	cdev_mdev_init(NSRAM,sram),      /* 7: /dev/sramX */
-	cdev_disk_init(NSD,sd),          /* 8: SCSI disk */
-	cdev_disk_init(NCD,cd),          /* 9: SCSI CD-ROM */
-	cdev_mdev_init(NNVRAM,nvram),    /* 10: /dev/nvramX */
+	cdev_cn_init(1,cn),		/* 0: virtual console */
+	cdev_ctty_init(1,ctty),		/* 1: controlling terminal */
+	cdev_mm_init(1,mm),		/* 2: /dev/{null,mem,kmem,...} */
+	cdev_swap_init(1,sw),		/* 3: /dev/drum (swap pseudo-device) */
+	cdev_tty_init(NPTY,pts),	/* 4: pseudo-tty slave */
+	cdev_ptc_init(NPTY,ptc),	/* 5: pseudo-tty master */
+	cdev_log_init(1,log),		/* 6: /dev/klog */
+	cdev_mdev_init(NSRAM,sram),	/* 7: /dev/sramX */
+	cdev_disk_init(NSD,sd),		/* 8: SCSI disk */
+	cdev_disk_init(NCD,cd),		/* 9: SCSI CD-ROM */
+	cdev_mdev_init(NNVRAM,nvram),	/* 10: /dev/nvramX */
 #ifdef notyet
-	cdev_mdev_init(NFLASH,flash),    /* 11: /dev/flashX */
+	cdev_mdev_init(NFLASH,flash),	/* 11: /dev/flashX */
 #else
-	cdev_notdef(),                   /* 11: */
+	cdev_notdef(),			/* 11: */
 #endif /* notyet */
-	cdev_tty_init(NDART,dart),       /* 12: MVME188 serial (tty[a-b]) */
-	cdev_tty_init(NCL,cl),           /* 13: CL-CD1400 serial (tty0[0-3]) */
-	cdev_tty_init(NBUGTTY,bugtty),   /* 14: BUGtty (ttyB) */
-	cdev_tty_init(NVX,vx),           /* 15: MVME332XT serial/lpt ttyv[0-7][a-i] */
-	cdev_notdef(),                   /* 16 */
-	cdev_disk_init(NCCD,ccd),        /* 17: concatenated disk */
-	cdev_disk_init(NRD,rd),          /* 18: ramdisk disk */
-	cdev_disk_init(NVND,vnd),        /* 19: vnode disk */
-	cdev_tape_init(NST,st),          /* 20: SCSI tape */
-	cdev_fd_init(1,filedesc),        /* 21: file descriptor pseudo-dev */
-	cdev_bpftun_init(NBPFILTER,bpf), /* 22: berkeley packet filter */
-	cdev_bpftun_init(NTUN,tun),      /* 23: network tunnel */
-	cdev_lkm_init(NLKM,lkm),         /* 24: loadable module driver */
-	cdev_notdef(),                   /* 25 */
+	cdev_tty_init(NDART,dart),	/* 12: MVME188 serial (tty[a-b]) */
+	cdev_tty_init(NCL,cl),		/* 13: CL-CD1400 serial (tty0[0-3]) */
+	cdev_tty_init(NBUGTTY,bugtty),	/* 14: BUGtty (ttyB) */
+	cdev_tty_init(NVX,vx),		/* 15: MVME332XT serial/lpt ttyv[0-7][a-i] */
+	cdev_notdef(),			/* 16 */
+	cdev_disk_init(NCCD,ccd),	/* 17: concatenated disk */
+	cdev_disk_init(NRD,rd),		/* 18: ramdisk disk */
+	cdev_disk_init(NVND,vnd),	/* 19: vnode disk */
+	cdev_tape_init(NST,st),		/* 20: SCSI tape */
+	cdev_fd_init(1,filedesc),	/* 21: file descriptor pseudo-dev */
+	cdev_bpftun_init(NBPFILTER,bpf),/* 22: berkeley packet filter */
+	cdev_bpftun_init(NTUN,tun),	/* 23: network tunnel */
+	cdev_lkm_init(NLKM,lkm),	/* 24: loadable module driver */
+	cdev_notdef(),			/* 25 */
 #ifdef notyet
-	cdev_disk_init(NXD,xd),          /* 26: XD disk */
+	cdev_disk_init(NXD,xd),		/* 26: XD disk */
 #else
-	cdev_notdef(),                   /* 26: XD disk */
+	cdev_notdef(),			/* 26: XD disk */
 #endif /* notyet */
-	cdev_notdef(),                   /* 27 */
+	cdev_notdef(),			/* 27 */
 #ifdef notyet
-	cdev_lp_init(NLP,lp),            /* 28: lp */
-	cdev_lp_init(NLPTWO,lptwo),      /* 29: lptwo */
-#else                      
-	cdev_notdef(),                   /* 28: lp */
-	cdev_notdef(),                   /* 29: lptwo */
+	cdev_lp_init(NLP,lp),		/* 28: lp */
+	cdev_lp_init(NLPTWO,lptwo),	/* 29: lptwo */
+#else
+	cdev_notdef(),			/* 28: lp */
+	cdev_notdef(),			/* 29: lptwo */
 #endif /* notyet */
-	cdev_notdef(),                   /* 30 */
-	cdev_mdev_init(NVMEL,vmel),      /* 31: /dev/vmelX */
-	cdev_mdev_init(NVMES,vmes),      /* 32: /dev/vmesX */
-	cdev_lkm_dummy(),                /* 33 */
-	cdev_lkm_dummy(),                /* 34 */
-	cdev_lkm_dummy(),                /* 35 */
-	cdev_lkm_dummy(),                /* 36 */
-	cdev_lkm_dummy(),                /* 37 */
-	cdev_lkm_dummy(),                /* 38 */
-	cdev_pf_init(NPF,pf),		 /* 39: packet filter */
-	cdev_random_init(1,random),	 /* 40: random data source */
-	cdev_notdef(),                   /* 41 */
-	cdev_notdef(),                   /* 42 */
-	cdev_ksyms_init(NKSYMS,ksyms),	 /* 43: Kernel symbols device */
-	cdev_notdef(),                   /* 44 */
-	cdev_notdef(),                   /* 45 */
-	cdev_notdef(),                   /* 46 */
-	cdev_notdef(),                   /* 47 */
-	cdev_notdef(),                   /* 48 */
-	cdev_notdef(),                   /* 49 */
+	cdev_notdef(),			/* 30 */
+	cdev_mdev_init(NVMEL,vmel),	/* 31: /dev/vmelX */
+	cdev_mdev_init(NVMES,vmes),	/* 32: /dev/vmesX */
+	cdev_lkm_dummy(),		/* 33 */
+	cdev_lkm_dummy(),		/* 34 */
+	cdev_lkm_dummy(),		/* 35 */
+	cdev_lkm_dummy(),		/* 36 */
+	cdev_lkm_dummy(),		/* 37 */
+	cdev_lkm_dummy(),		/* 38 */
+	cdev_pf_init(NPF,pf),		/* 39: packet filter */
+	cdev_random_init(1,random),	/* 40: random data source */
+	cdev_uk_init(NUK,uk),		/* 41 */
+	cdev_ss_init(NSS,ss),		/* 42 */
+	cdev_ksyms_init(NKSYMS,ksyms),	/* 43: Kernel symbols device */
+	cdev_ch_init(NCH,ch),		/* 44: SCSI autochanger */
+	cdev_notdef(),			/* 45 */
+	cdev_notdef(),			/* 46 */
+	cdev_notdef(),			/* 47 */
+	cdev_notdef(),			/* 48 */
+	cdev_notdef(),			/* 49 */
 	cdev_systrace_init(NSYSTRACE,systrace),	/* 50 system call tracing */
 #ifdef XFS
-	cde_xfs_init(NXFS,xfs_dev),      /* 51: xfs communication device */
+	cde_xfs_init(NXFS,xfs_dev),	/* 51: xfs communication device */
 #else
-	cdev_notdef(),                   /* 51 */
+	cdev_notdef(),			/* 51 */
 #endif
 };
 int	nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
 
-int	mem_no = 2; 	/* major device number of memory special file */
+int	mem_no = 2;	/* major device number of memory special file */
 
 /*
  * Swapdev is a fake device implemented
@@ -253,8 +255,8 @@ int chrtoblktbl[] = {
 	/*  5 */	NODEV,
 	/*  6 */	NODEV,
 	/*  7 */	NODEV,
-	/*  8 */	4,    /* SCSI disk */
-	/*  9 */	6,    /* SCSI CD-ROM */
+	/*  8 */	4,	/* SCSI disk */
+	/*  9 */	6,	/* SCSI CD-ROM */
 	/* 10 */	NODEV,
 	/* 11 */	NODEV,
 	/* 12 */	NODEV,
@@ -263,15 +265,15 @@ int chrtoblktbl[] = {
 	/* 15 */	NODEV,
 	/* 16 */	NODEV,
 	/* 17 */	NODEV,
-	/* 18 */	7,    /* ram disk */
-	/* 19 */	8,    /* vnode disk */
+	/* 18 */	7,	/* ram disk */
+	/* 19 */	8,	/* vnode disk */
 	/* 20 */	NODEV,
 	/* 21 */	NODEV,
 	/* 22 */	NODEV,
 	/* 23 */	NODEV,
 	/* 24 */	NODEV,
 	/* 25 */	NODEV,
-	/* 26 */	10,   /* XD disk */
+	/* 26 */	10,	/* XD disk */
 };
 int nchrtoblktbl = sizeof(chrtoblktbl) / sizeof(chrtoblktbl[0]);