summaryrefslogtreecommitdiff
path: root/sys/arch/i386/isa
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2006-02-12 19:55:40 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2006-02-12 19:55:40 +0000
commit7390c7303f567bb38f5609a913aca5725be9d2f6 (patch)
treed87945e3784a65a5f57028f0b2a394f0cbb4d9aa /sys/arch/i386/isa
parente0638ab9700b53c881989a247b308f88f7b0a2a0 (diff)
Remove dead sysbeep driver and unused sysbeep() routine. No functional change.
Diffstat (limited to 'sys/arch/i386/isa')
-rw-r--r--sys/arch/i386/isa/clock.c54
-rw-r--r--sys/arch/i386/isa/isa_machdep.h8
2 files changed, 2 insertions, 60 deletions
diff --git a/sys/arch/i386/isa/clock.c b/sys/arch/i386/isa/clock.c
index 7d12127563f..af7ce370ac3 100644
--- a/sys/arch/i386/isa/clock.c
+++ b/sys/arch/i386/isa/clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clock.c,v 1.33 2006/01/02 05:21:30 brad Exp $ */
+/* $OpenBSD: clock.c,v 1.34 2006/02/12 19:55:39 miod Exp $ */
/* $NetBSD: clock.c,v 1.39 1996/05/12 23:11:54 mycroft Exp $ */
/*-
@@ -105,30 +105,10 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <i386/isa/nvram.h>
#include <i386/isa/timerreg.h>
-#include "pcppi.h"
-#if (NPCPPI > 0)
-#include <dev/isa/pcppivar.h>
-
-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);
void findcpuspeed(void);
int clockintr(void *);
int gettick(void);
-void sysbeep(int, int);
int rtcget(mc_todregs *);
void rtcput(mc_todregs *);
int hexdectodec(int);
@@ -378,38 +358,6 @@ i8254_delay(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
diff --git a/sys/arch/i386/isa/isa_machdep.h b/sys/arch/i386/isa/isa_machdep.h
index 9847f0e4db6..40493393d6d 100644
--- a/sys/arch/i386/isa/isa_machdep.h
+++ b/sys/arch/i386/isa/isa_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: isa_machdep.h,v 1.20 2005/11/23 09:32:46 mickey Exp $ */
+/* $OpenBSD: isa_machdep.h,v 1.21 2006/02/12 19:55:39 miod Exp $ */
/* $NetBSD: isa_machdep.h,v 1.7 1997/06/06 23:28:42 thorpej Exp $ */
/*-
@@ -216,10 +216,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 */