4 files changed, 4 insertions, 73 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 9fbbb784a7f..370d2c83095 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.110 2006/02/10 08:32:54 brad Exp $
+#	$OpenBSD: GENERIC,v 1.111 2006/02/12 19:55:36 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -201,7 +201,6 @@ wsmouse*	at pms? mux 0
 wsmouse*	at pmsi? mux 0
 
 pcppi0		at isa?
-sysbeep0	at pcppi?
 
 com0	at isa? port 0x3f8 irq 4	# standard PC serial ports
 com1	at isa? port 0x2f8 irq 3
diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64
index a037af47783..7d40cbcf4a3 100644
--- a/sys/arch/amd64/conf/files.amd64
+++ b/sys/arch/amd64/conf/files.amd64
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.amd64,v 1.18 2006/01/29 17:29:29 marco Exp $
+#	$OpenBSD: files.amd64,v 1.19 2006/02/12 19:55:36 miod Exp $
 
 maxpartitions 16
 maxusers 2 16 128
@@ -147,9 +147,6 @@ include	"dev/pckbc/files.pckbc"
 
 file	arch/amd64/amd64/wscons_machdep.c	wsdisplay
 
-device	sysbeep
-attach	sysbeep at pcppi
-
 # Floppy disk controller
 device	fdc {[drive = -1]}
 attach	fdc at isa
diff --git a/sys/arch/amd64/include/isa_machdep.h b/sys/arch/amd64/include/isa_machdep.h
index 9b7107dd161..42e647dffdb 100644
--- a/sys/arch/amd64/include/isa_machdep.h
+++ b/sys/arch/amd64/include/isa_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isa_machdep.h,v 1.4 2005/12/13 00:18:19 jsg Exp $	*/
+/*	$OpenBSD: isa_machdep.h,v 1.5 2006/02/12 19:55:38 miod Exp $	*/
 /*	$NetBSD: isa_machdep.h,v 1.2 2003/05/09 23:51:28 fvdl Exp $	*/
 
 /*-
@@ -201,10 +201,4 @@ extern u_long atdevbase;           /* kernel virtual address of "hole" */
  */
 #define ISA_HOLE_VADDR(p)  ((void *) ((u_long)(p) - IOM_BEGIN + atdevbase))
 
-
-/*
- * Miscellanous functions.
- */
-void sysbeep(int, int);		/* beep with the system speaker */
-
 #endif /* _I386_ISA_MACHDEP_H_ XXX */
diff --git a/sys/arch/amd64/isa/clock.c b/sys/arch/amd64/isa/clock.c
index a44d65b9966..92bcb8b40c5 100644
--- a/sys/arch/amd64/isa/clock.c
+++ b/sys/arch/amd64/isa/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.8 2005/12/13 00:18:19 jsg Exp $	*/
+/*	$OpenBSD: clock.c,v 1.9 2006/02/12 19:55:38 miod Exp $	*/
 /*	$NetBSD: clock.c,v 1.1 2003/04/26 18:39:50 fvdl Exp $	*/
 
 /*-
@@ -109,37 +109,10 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <dev/clock_subr.h>
 #include <machine/specialreg.h> 
 
-#include "pcppi.h"
-#if (NPCPPI > 0)
-#include <dev/isa/pcppivar.h>
-
-#ifdef CLOCKDEBUG
-int clock_debug = 0;
-#define DPRINTF(arg) if (clock_debug) printf arg
-#else
-#define DPRINTF(arg)
-#endif
-
-int sysbeepmatch(struct device *, void *, void *);
-void sysbeepattach(struct device *, struct device *, void *);
-
-struct cfattach sysbeep_ca = {
-	sizeof(struct device), sysbeepmatch, sysbeepattach
-};
-
-struct cfdriver sysbeep_cd = {
-	NULL, "sysbeep", DV_DULL
-};
-
-static int ppi_attached;
-static pcppi_tag_t ppicookie;
-#endif /* PCPPI */
-
 void	spinwait(int);
 int	clockintr(void *);
 int	rtcintr(void *);
 int	gettick(void);
-void	sysbeep(int, int);
 void	rtcdrain(void *v);
 int	rtcget(mc_todregs *);
 void	rtcput(mc_todregs *);
@@ -412,38 +385,6 @@ i8254_delay(int n)
 	}
 }
 
-#if (NPCPPI > 0)
-int
-sysbeepmatch(parent, match, aux)
-	struct device *parent;
-	void *match;
-	void *aux;
-{
-	return (!ppi_attached);
-}
-
-void
-sysbeepattach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
-{
-	printf("\n");
-
-	ppicookie = ((struct pcppi_attach_args *)aux)->pa_cookie;
-	ppi_attached = 1;
-}
-#endif
-
-void
-sysbeep(pitch, period)
-	int pitch, period;
-{
-#if (NPCPPI > 0)
-	if (ppi_attached)
-		pcppi_bell(ppicookie, pitch, period, 0);
-#endif
-}
-
 unsigned int delaycount;        /* calibrated loop variable (1 millisecond) */
 
 #define FIRST_GUESS   0x2000