summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2005-05-13 22:54:01 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2005-05-13 22:54:01 +0000
commitaff79de2e4923508f3db9fde28d8e537ad1d8801 (patch)
treec7ce8d3f05fa0c3456bd0388c5bc48a026569a84 /sys/arch
parent56ba7311be71cf76eab686062bcfac6c70915f0a (diff)
/dev/speaker node on cats.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/arm/arm/conf.c9
-rw-r--r--sys/arch/arm/include/conf.h3
-rw-r--r--sys/arch/cats/include/conf.h3
3 files changed, 12 insertions, 3 deletions
diff --git a/sys/arch/arm/arm/conf.c b/sys/arch/arm/arm/conf.c
index 23c2bc78cd2..b715fa9534c 100644
--- a/sys/arch/arm/arm/conf.c
+++ b/sys/arch/arm/arm/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.10 2005/01/19 02:02:33 uwe Exp $ */
+/* $OpenBSD: conf.c,v 1.11 2005/05/13 22:54:00 miod Exp $ */
/* $NetBSD: conf.c,v 1.10 2002/04/19 01:04:38 wiz Exp $ */
/*
@@ -278,6 +278,12 @@ cdev_decl(xfs_dev);
#include "hotplug.h"
+#ifdef CONF_HAVE_SPKR
+#include "spkr.h"
+#else
+#define NSPKR 0
+#endif
+
struct cdevsw cdevsw[] = {
cdev_cn_init(1,cn), /* 0: virtual console */
cdev_ctty_init(1,ctty), /* 1: controlling terminal */
@@ -382,6 +388,7 @@ struct cdevsw cdevsw[] = {
cdev_notdef(), /* 96: removed device */
cdev_radio_init(NRADIO,radio), /* 97: generic radio I/O */
cdev_ptm_init(NPTY,ptm), /* 98: pseudo-tty ptm device */
+ cdev_spkr_init(NSPKR,spkr), /* 99: PC speaker */
};
int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
diff --git a/sys/arch/arm/include/conf.h b/sys/arch/arm/include/conf.h
index df40ca2ef1a..c6db3f7be7e 100644
--- a/sys/arch/arm/include/conf.h
+++ b/sys/arch/arm/include/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.3 2005/01/22 04:04:32 uwe Exp $ */
+/* $OpenBSD: conf.h,v 1.4 2005/05/13 22:54:00 miod Exp $ */
/* $NetBSD: conf.h,v 1.7 2002/04/19 01:04:39 wiz Exp $ */
/*
@@ -121,5 +121,6 @@ cdev_decl(mlx);
cdev_decl(mly);
cdev_decl(plcom);
cdev_decl(apm);
+cdev_decl(spkr);
#endif /* _ARM_CONF_H_ */
diff --git a/sys/arch/cats/include/conf.h b/sys/arch/cats/include/conf.h
index 77d49b1825b..54010b008cc 100644
--- a/sys/arch/cats/include/conf.h
+++ b/sys/arch/cats/include/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.2 2005/01/04 14:13:06 drahn Exp $ */
+/* $OpenBSD: conf.h,v 1.3 2005/05/13 22:54:00 miod Exp $ */
/* $NetBSD: conf.h,v 1.8 2002/02/10 12:26:03 chris Exp $ */
#ifndef _CATS_CONF_H
@@ -12,6 +12,7 @@
#define CONF_HAVE_SCSIPI
#define CONF_HAVE_WSCONS
#define CONF_HAVE_FCOM
+#define CONF_HAVE_SPKR
#include <arm/conf.h>