Remove dead isabeep driver and unused isabeep() function.

3 files changed, 3 insertions, 57 deletions

diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 2caf1e44ed5..b79e0ee6521 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.163 2006/02/10 09:40:21 brad Exp $
+#	$OpenBSD: GENERIC,v 1.164 2006/02/12 21:09:06 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -284,7 +284,6 @@ isapnp0	at	isa?
 mcclock* at isa? port 0x70
 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)
diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha
index d2ccdae22de..df882248552 100644
--- a/sys/arch/alpha/conf/files.alpha
+++ b/sys/arch/alpha/conf/files.alpha
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.alpha,v 1.69 2005/12/27 23:18:59 deraadt Exp $
+#	$OpenBSD: files.alpha,v 1.70 2006/02/12 21:09:06 miod Exp $
 #	$NetBSD: files.alpha,v 1.32 1996/11/25 04:03:21 cgd Exp $
 #
 # alpha-specific configuration info
@@ -134,9 +134,6 @@ file	arch/alpha/isa/isa_machdep.c		isa
 define	isadma_bounce
 file	arch/alpha/isa/isadma_bounce.c		isadma_bounce & isa_dma
 
-device	isabeep
-attach	isabeep at pcppi
-
 include	"dev/pckbc/files.pckbc"
 
 # Floppy disk controller
diff --git a/sys/arch/alpha/isa/isa_machdep.c b/sys/arch/alpha/isa/isa_machdep.c
index a522c2f12fb..646daa0b514 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.12 2002/03/14 01:26:27 millert Exp $ */
+/* $OpenBSD: isa_machdep.c,v 1.13 2006/02/12 21:09:08 miod Exp $ */
 /* $NetBSD: isa_machdep.c,v 1.12 1998/08/07 10:26:39 drochner Exp $ */
 
 /*
@@ -50,26 +50,6 @@
 #include <dev/isa/vga_isavar.h>
 #endif
 
-#include "pcppi.h"
-#if (NPCPPI > 0)
-#include <dev/isa/pcppivar.h>
-
-int isabeepmatch(struct device *, void *, void *);
-void isabeepattach(struct device *, struct device *, void *);
-void isabeep(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 */
-
 int
 isa_display_console(iot, memt)
 	bus_space_tag_t iot, memt;
@@ -82,33 +62,3 @@ isa_display_console(iot, memt)
 #endif
 	return(res);
 }
-
-#if (NPCPPI > 0)
-int
-isabeepmatch(parent, match, aux)
-	struct device *parent;
-	void *match;
-	void *aux;
-{
-	return (!ppi_attached);
-}
-
-void
-isabeepattach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
-{
-	printf("\n");
-
-	ppicookie = ((struct pcppi_attach_args *)aux)->pa_cookie;
-	ppi_attached = 1;
-}
-
-void
-isabeep(pitch, period)
-	int pitch, period;
-{
-	if (ppi_attached)
-		pcppi_bell(ppicookie, pitch, period, 0);
-}
-#endif