enable spkr, isabeep devices

3 files changed, 19 insertions, 10 deletions

diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index e6cda9791b5..c7602d7bdf9 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.35 2001/12/11 23:18:59 miod Exp $	*/
+/*	$OpenBSD: conf.c,v 1.36 2002/01/23 05:06:39 ericj Exp $	*/
 /*	$NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $	*/
 
 /*-
@@ -102,6 +102,10 @@ cdev_decl(com);
 #include "wsdisplay.h"
 #include "wskbd.h"
 #include "wsmouse.h"
+
+#include "spkr.h"
+cdev_decl(spkr);
+
 #include "lpt.h"
 cdev_decl(lpt);
 cdev_decl(prom);			/* XXX XXX XXX */
@@ -180,7 +184,7 @@ struct cdevsw	cdevsw[] =
         cdev_tty_init(NCY,cy),          /* 38: Cyclom serial port */
 	cdev_ksyms_init(NKSYMS,ksyms),	/* 39: Kernel symbols device */
 	cdev_notdef(),			/* 40 */
-	cdev_notdef(),			/* 41 */
+	cdev_spkr_init(NSPKR,spkr),	/* 41: PC speaker */
 	cdev_notdef(),			/* 42 */
 	cdev_disk_init(NRAID,raid),	/* 43: RAIDframe disk driver */
 	cdev_notdef(),			/* 44 */
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index d9881baefbf..7385a6ace42 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.94 2002/01/23 03:20:41 ericj Exp $
+#	$OpenBSD: GENERIC,v 1.95 2002/01/23 05:06:39 ericj Exp $
 #	$NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
 
 machine	alpha
@@ -212,8 +212,10 @@ isapnp0	at	isa?
 
 # ISA devices
 mcclock* at	isa? port 0x70
-#pcppi*	at	isa?				# PC prog. periph. interface
-#spkr0	at	pcppi?
+pcppi*	at	isa?				# PC prog. periph. interface
+spkr0	at	pcppi?				# IBM BASIC emulation
+isabeep0 at	pcppi?				# "keyboard" beep
+midi*	at	pcppi?
 pckbc*	at	isa?				# PC keyboard controller
 pckbd*	at	pckbc?				# PC keyboard (kbd port)
 pms*	at	pckbc?				# PS/2-style mouse (aux port)
diff --git a/sys/arch/alpha/isa/isa_machdep.c b/sys/arch/alpha/isa/isa_machdep.c
index 5c9f998e46c..31738f99091 100644
--- a/sys/arch/alpha/isa/isa_machdep.c
+++ b/sys/arch/alpha/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isa_machdep.c,v 1.9 2001/11/06 19:53:13 miod Exp $ */
+/* $OpenBSD: isa_machdep.c,v 1.10 2002/01/23 05:06:40 ericj Exp $ */
 /* $NetBSD: isa_machdep.c,v 1.12 1998/08/07 10:26:39 drochner Exp $ */
 
 /*
@@ -54,13 +54,18 @@
 #if (NPCPPI > 0)
 #include <dev/isa/pcppivar.h>
 
-int isabeepmatch __P((struct device *, struct cfdata *, void *));
+int isabeepmatch __P((struct device *, void *, void *));
 void isabeepattach __P((struct device *, struct device *, void *));
+void isabeep __P((int, int));
 
 struct cfattach isabeep_ca = {
 	sizeof(struct device), isabeepmatch, isabeepattach
 };
 
+struct cfdriver isabeep_cd = {
+	NULL, "isabeep", DV_DULL
+};
+
 static int ppi_attached;
 static pcppi_tag_t ppicookie;
 #endif /* PCPPI */
@@ -82,7 +87,7 @@ isa_display_console(iot, memt)
 int
 isabeepmatch(parent, match, aux)
 	struct device *parent;
-	struct cfdata *match;
+	void *match;
 	void *aux;
 {
 	return (!ppi_attached);
@@ -100,7 +105,6 @@ isabeepattach(parent, self, aux)
 }
 #endif
 
-#if 0
 void
 isabeep(pitch, period)
 	int pitch, period;
@@ -110,4 +114,3 @@ isabeep(pitch, period)
 		pcppi_bell(ppicookie, pitch, period, 0);
 #endif
 }
-#endif