diff options
| author | Robert Nagy <robert@cvs.openbsd.org> | 2005-11-15 14:36:50 +0000 |
|---|---|---|
| committer | Robert Nagy <robert@cvs.openbsd.org> | 2005-11-15 14:36:50 +0000 |
| commit | ea6713fa2dd19f4d775cad2a534eb46e8d460b16 (patch) | |
| tree | 3872be1fdced099f5fe29c59df0e80a69f137e12 | |
| parent | 2a2cfa409663436621e27b552e460463acee8bab (diff) | |
enable bktr(4) and radio(4) on alpha
ok deraadt@ mickey@
| -rw-r--r-- | etc/etc.alpha/MAKEDEV.md | 5 | ||||
| -rw-r--r-- | sys/arch/alpha/alpha/conf.c | 6 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/GENERIC | 7 |
3 files changed, 15 insertions, 3 deletions
diff --git a/etc/etc.alpha/MAKEDEV.md b/etc/etc.alpha/MAKEDEV.md index a0597ef3348..0f59faa42ff 100644 --- a/etc/etc.alpha/MAKEDEV.md +++ b/etc/etc.alpha/MAKEDEV.md @@ -1,5 +1,5 @@ vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.27 2005/08/01 22:22:12 deraadt Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.28 2005/11/15 14:36:48 robert Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org> @@ -61,6 +61,7 @@ _DEV(ulpt, 47) _DEV(usb, 45) _TITLE(spec) _DEV(au, 24) +_DEV(bktr, 58) _DEV(bpf, 11) _DEV(cry, 57) _DEV(fdesc, 10) @@ -70,12 +71,14 @@ _DEV(lkm, 16) _DEV(music, 42) _DEV(pci, 52) _DEV(pf, 35) +_DEV(radio, 59) _DEV(rmidi, 41) _DEV(rnd, 34) _DEV(speak, 40) _DEV(ss, 32) _DEV(systrace, 50) _DEV(tun, 7) +_DEV(tuner, 58) _DEV(uk, 33) _DEV(xfs, 51) dnl diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c index 1546c17587f..9e45d42607f 100644 --- a/sys/arch/alpha/alpha/conf.c +++ b/sys/arch/alpha/alpha/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.50 2004/06/18 20:35:50 miod Exp $ */ +/* $OpenBSD: conf.c,v 1.51 2005/11/15 14:36:48 robert Exp $ */ /* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */ /*- @@ -55,6 +55,8 @@ bdev_decl(fd); #include "raid.h" #include "ccd.h" #include "rd.h" +#include "bktr.h" +#include "radio.h" struct bdevsw bdevsw[] = { @@ -198,6 +200,8 @@ struct cdevsw cdevsw[] = cdev_ptm_init(NPTY,ptm), /* 55: pseudo-tty ptm device */ cdev_hotplug_init(NHOTPLUG,hotplug), /* 56: devices hot plugging */ cdev_crypto_init(NCRYPTO,crypto), /* 57: /dev/crypto */ + cdev_bktr_init(NBKTR,bktr), /* 58: Bt848 video capture device */ + cdev_radio_init(NRADIO,radio), /* 59: generic radio I/O */ }; int nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]); diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index 9e4fa65f2dd..eb55cb70c12 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.157 2005/11/15 03:08:24 brad Exp $ +# $OpenBSD: GENERIC,v 1.158 2005/11/15 14:36:49 robert Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -356,6 +356,11 @@ audio* at fms? audio* at auvia? audio* at uaudio? +bktr0 at pci? + +# FM-Radio support +radio* at bktr? + # Workstation Console attachments #wsdisplay* at cfb? #wsdisplay* at sfb? |