diff options
| author | Eric Jackson <ericj@cvs.openbsd.org> | 2001-03-08 02:36:02 +0000 |
|---|---|---|
| committer | Eric Jackson <ericj@cvs.openbsd.org> | 2001-03-08 02:36:02 +0000 |
| commit | 3df93f319d4d308c8715427f2dd55c6f06aaedf3 (patch) | |
| tree | 9161cad81fcc039696b9f8d2c03fa95a7808830d /sys/arch | |
| parent | 5521df764be317e209579114baab0f0f15922cae (diff) | |
configure usb devices and raid
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/alpha/alpha/conf.c | 46 |
1 files changed, 39 insertions, 7 deletions
diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c index d876de99002..14b5c82fe57 100644 --- a/sys/arch/alpha/alpha/conf.c +++ b/sys/arch/alpha/alpha/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.22 2000/09/26 14:03:51 art Exp $ */ +/* $OpenBSD: conf.c,v 1.23 2001/03/08 02:36:01 ericj Exp $ */ /* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */ /*- @@ -53,6 +53,8 @@ bdev_decl(sw); #include "ss.h" #include "uk.h" #include "vnd.h" +#include "raid.h" +bdev_decl(raid); #include "ccd.h" #include "rd.h" bdev_decl(rd); @@ -75,6 +77,7 @@ struct bdevsw bdevsw[] = bdev_lkm_dummy(), /* 13 */ bdev_lkm_dummy(), /* 14 */ bdev_lkm_dummy(), /* 15 */ + bdev_disk_init(NRAID,raid), /* 16 */ }; int nblkdev = sizeof (bdevsw) / sizeof (bdevsw[0]); @@ -105,6 +108,7 @@ cdev_decl(com); #include "lpt.h" cdev_decl(lpt); cdev_decl(rd); +cdev_decl(raid); #ifdef IPFILTER #define NIPF 1 #else @@ -121,6 +125,20 @@ cdev_decl(xfs_dev); #include "ksyms.h" cdev_decl(ksyms); +/* USB Devices */ +#include "usb.h" +cdev_decl(usb); +#include "uhid.h" +cdev_decl(uhid); +#include "ugen.h" +cdev_decl(ugen); +#include "ulpt.h" +cdev_decl(ulpt); +#include "ucom.h" +cdev_decl(ucom); +#include "ugen.h" +cdev_decl(ugen); + struct cdevsw cdevsw[] = { cdev_cn_init(1,cn), /* 0: virtual console */ @@ -166,13 +184,13 @@ struct cdevsw cdevsw[] = cdev_notdef(), /* 40 */ cdev_notdef(), /* 41 */ cdev_notdef(), /* 42 */ - cdev_notdef(), /* 43 */ + cdev_disk_init(NRAID,raid), /* 43: RAIDframe disk driver */ cdev_notdef(), /* 44 */ - cdev_notdef(), /* 45 */ - cdev_notdef(), /* 46 */ - cdev_notdef(), /* 47 */ - cdev_notdef(), /* 48 */ - cdev_notdef(), /* 49 */ + cdev_usb_init(NUSB,usb), /* 45: USB controller */ + cdev_usbdev_init(NUHID,uhid), /* 46: USB generic HID */ + cdev_lpt_init(NULPT,ulpt), /* 47: USB printer */ + cdev_ugen_init(NUGEN,ugen), /* 48: USB generic driver */ + cdev_tty_init(NUCOM, ucom), /* 49: USB tty */ cdev_notdef(), /* 50 */ #ifdef XFS cdev_xfs_init(NXFS,xfs_dev), /* 51: xfs communication device */ @@ -264,6 +282,20 @@ static int chrtoblktbl[] = { /* 35 */ NODEV, /* 36 */ 0, /* 37 */ 4, + /* 38 */ NODEV, + /* 39 */ NODEV, + /* 40 */ NODEV, + /* 41 */ NODEV, + /* 42 */ NODEV, + /* 43 */ 16, + /* 44 */ NODEV, + /* 45 */ NODEV, + /* 46 */ NODEV, + /* 47 */ NODEV, + /* 48 */ NODEV, + /* 49 */ NODEV, + /* 50 */ NODEV, + /* 51 */ NODEV, }; /* |