Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/luna68k/luna68k - Add raidframe and wsmux.



details:   https://anonhg.NetBSD.org/src/rev/17e37c3f52b3
branches:  trunk
changeset: 480444:17e37c3f52b3
user:      nisimura <nisimura%NetBSD.org@localhost>
date:      Thu Jan 13 01:04:33 2000 +0000

description:
- Add raidframe and wsmux.
- Fix off-by-one error of scsibus.

diffstat:

 sys/arch/luna68k/luna68k/conf.c |  22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diffs (72 lines):

diff -r a6b01ed4c192 -r 17e37c3f52b3 sys/arch/luna68k/luna68k/conf.c
--- a/sys/arch/luna68k/luna68k/conf.c   Thu Jan 13 00:18:27 2000 +0000
+++ b/sys/arch/luna68k/luna68k/conf.c   Thu Jan 13 01:04:33 2000 +0000
@@ -1,5 +1,4 @@
-/* $NetBSD: conf.c,v 1.1 2000/01/05 08:49:02 nisimura Exp $ */
-/*     $NetBSD: conf.c,v 1.1 2000/01/05 08:49:02 nisimura Exp $        */
+/* $NetBSD: conf.c,v 1.2 2000/01/13 01:04:33 nisimura Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -39,7 +38,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.1 2000/01/05 08:49:02 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.2 2000/01/13 01:04:33 nisimura Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -62,6 +61,8 @@
 bdev_decl(ccd);
 #include "md.h"
 bdev_decl(md);
+#include "raid.h"
+bdev_decl(raid);
 
 struct bdevsw  bdevsw[] =
 {
@@ -79,6 +80,7 @@
        bdev_lkm_dummy(),               /* 11 */
        bdev_lkm_dummy(),               /* 12 */
        bdev_lkm_dummy(),               /* 13 */
+       bdev_disk_init(NRAID,raid),     /* 14: RAIDframe disk driver */
 };
 int    nblkdev = sizeof (bdevsw) / sizeof (bdevsw[0]);
 
@@ -129,6 +131,11 @@
 #include "scsibus.h"
 cdev_decl(scsibus);
 
+cdev_decl(raid);
+
+#include "wsmux.h"
+cdev_decl(wsmux);
+
 struct cdevsw  cdevsw[] =
 {
        cdev_cn_init(1,cn),             /* 0: virtual console */
@@ -162,9 +169,11 @@
        cdev_lkm_dummy(),               /* 26 */
        cdev_lkm_dummy(),               /* 27 */
        cdev_lkm_dummy(),               /* 28 */
+       cdev_lkm_dummy(),               /* 29 */
        cdev_lkm_dummy(),               /* 30 */
-       cdev_lkm_dummy(),               /* 31 */
-       cdev_scsibus_init(NSCSIBUS,scsibus), /* 32: SCSI bus */
+       cdev_scsibus_init(NSCSIBUS,scsibus), /* 31: SCSI bus */
+       cdev_disk_init(NRAID,raid),     /* 32: RAIDframe disk driver */
+       cdev_disk_init(NWSMUX,wsmux),   /* 33: ws multiplexor */
 };
 int    nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);
 
@@ -235,7 +244,8 @@
        /* 29 */        NODEV,
        /* 30 */        NODEV,
        /* 31 */        NODEV,
-       /* 32 */        NODEV,
+       /* 32 */        14,     /* raid */
+       /* 33 */        NODEV,
 };
 
 /*



Home | Main Index | Thread Index | Old Index