summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1999-07-18 17:07:50 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1999-07-18 17:07:50 +0000
commit4ebabb9303a01a2a29e4e6589e44fe734415a281 (patch)
tree55638f656ca7b9da559c3f5bedfc0505d8990ea2
parent5089db537a556919936d46d559bbf279c1277830 (diff)
rf support; m4@umn.edu
-rw-r--r--etc/etc.sparc/MAKEDEV7
-rw-r--r--sys/arch/sparc/sparc/conf.c5
2 files changed, 9 insertions, 3 deletions
diff --git a/etc/etc.sparc/MAKEDEV b/etc/etc.sparc/MAKEDEV
index 3fa445e367c..aa85894acd4 100644
--- a/etc/etc.sparc/MAKEDEV
+++ b/etc/etc.sparc/MAKEDEV
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $OpenBSD: MAKEDEV,v 1.57 1999/05/26 21:56:13 jason Exp $
+# $OpenBSD: MAKEDEV,v 1.58 1999/07/18 17:07:48 deraadt Exp $
#
# Copyright (c) 1990 The Regents of the University of California.
# All rights reserved.
@@ -55,6 +55,7 @@
# fd* Floppy disk drives (3 1/2", 5 1/4")
# vnd* "file" pseudo-disks
# ccd* concatenated disk devices
+# raid* RAIDframe disk devices
#
# Pseudo terminals:
# pty* set of 16 master and slave pseudo terminals
@@ -201,6 +202,7 @@ all)
sh $this ss0 ss1
sh $this pty0 vnd0 vnd1 vnd2 vnd3 audio tun0 tun1 tun2 tun3
sh $this ccd0 ccd1 ccd2 ccd3
+ sh $this raid0 raid1 raid2 raid3
sh $this bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
sh $this ipl
sh $this bwtwo0 cgtwo0 cgthree0 cgfour0 cgsix0
@@ -408,7 +410,7 @@ fd*)
umask 77
;;
-ccd*|sd*|xd*|xy*|cd*)
+ccd*|sd*|xd*|xy*|cd*|raid*)
umask 2
unit=`unt $i`
if [ 0$unit -gt 15 ]
@@ -418,6 +420,7 @@ ccd*|sd*|xd*|xy*|cd*)
fi
case $i in
ccd*) name=ccd; blk=9; chr=23;;
+ raid*) name=raid; blk=25; chr=123;;
sd*) name=sd; blk=7; chr=17;;
xd*) name=xd; blk=10; chr=42;;
xy*) name=xy; blk=3; chr=9;;
diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c
index 9860c9de645..7ef3f7abcea 100644
--- a/sys/arch/sparc/sparc/conf.c
+++ b/sys/arch/sparc/sparc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.21 1999/02/01 00:30:43 jason Exp $ */
+/* $OpenBSD: conf.c,v 1.22 1999/07/18 17:07:49 deraadt Exp $ */
/* $NetBSD: conf.c,v 1.40 1996/04/11 19:20:03 thorpej Exp $ */
/*
@@ -61,6 +61,7 @@
#include "audio.h"
#include "vnd.h"
#include "ccd.h"
+#include "raid.h"
#include "ch.h"
#include "ss.h"
#include "uk.h"
@@ -118,6 +119,7 @@ struct bdevsw bdevsw[] =
bdev_lkm_dummy(), /* 22 */
bdev_lkm_dummy(), /* 23 */
bdev_lkm_dummy(), /* 24 */
+ bdev_disk_init(NRAID,raid), /* 25: RAIDframe disk driver */
};
int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
@@ -250,6 +252,7 @@ struct cdevsw cdevsw[] =
cdev_uk_init(NUK,uk), /* 120: unknown SCSI */
cdev_ss_init(NSS,ss), /* 121: SCSI scanner */
cdev_ksyms_init(NKSYMS,ksyms), /* 122: Kernel symbols device */
+ cdev_disk_init(NRAID,raid), /* 123: RAIDframe disk driver */
};
int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);