diff options
| author | imp <imp@FreeBSD.org> | 1999-12-02 19:46:41 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 1999-12-02 19:46:41 +0000 |
| commit | 396ff7b9636f6de7a332fa5f54a6a89bcea2890e (patch) | |
| tree | 9282760469304b249c5a939b9dc4efb75fce2756 /sys/pccard/pccard_beep.c | |
| parent | 5b399fe673183b7f76758d4016e4d52a210d4501 (diff) | |
| download | FreeBSD-src-396ff7b9636f6de7a332fa5f54a6a89bcea2890e.zip FreeBSD-src-396ff7b9636f6de7a332fa5f54a6a89bcea2890e.tar.gz | |
Make pccardc beep actually work. The kernel was doing the wrong thing
with the beep information it had (like ignoring it).
Submitted by: sanpei@sanpei.org (MIHIRA-san Yoshiro)
Add $FreeBSD$ to pccard_beep.c while I'm here.
Diffstat (limited to 'sys/pccard/pccard_beep.c')
| -rw-r--r-- | sys/pccard/pccard_beep.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sys/pccard/pccard_beep.c b/sys/pccard/pccard_beep.c index 5c1ceb7..98b58ca 100644 --- a/sys/pccard/pccard_beep.c +++ b/sys/pccard/pccard_beep.c @@ -3,6 +3,7 @@ * Nate Williams, October 1997. * This file is in the public domain. */ +/* $FreeBSD$ */ #include <sys/param.h> #include <sys/kernel.h> @@ -33,14 +34,14 @@ static void enable_beep(void *dummy) /* Should never be needed */ untimeout(enable_beep, (void *)NULL, beeptimeout_ch); - allow_beep = 1; + allow_beep = BEEP_ON; } void pccard_insert_beep(void) { if (allow_beep == BEEP_ON) { sysbeep(PCCARD_BEEP_PITCH0, PCCARD_BEEP_DURATION0); - allow_beep = 0; + allow_beep = BEEP_OFF; beeptimeout_ch = timeout(enable_beep, (void *)NULL, hz / 5); } } @@ -49,19 +50,23 @@ void pccard_remove_beep(void) { if (allow_beep == BEEP_ON) { sysbeep(PCCARD_BEEP_PITCH0, PCCARD_BEEP_DURATION0); - allow_beep = 0; + allow_beep = BEEP_OFF; beeptimeout_ch = timeout(enable_beep, (void *)NULL, hz / 5); } } void pccard_success_beep(void) { - sysbeep(PCCARD_BEEP_PITCH1, PCCARD_BEEP_DURATION1); + if (allow_beep == BEEP_ON) { + sysbeep(PCCARD_BEEP_PITCH1, PCCARD_BEEP_DURATION1); + } } void pccard_failure_beep(void) { - sysbeep(PCCARD_BEEP_PITCH2, PCCARD_BEEP_DURATION2); + if (allow_beep == BEEP_ON) { + sysbeep(PCCARD_BEEP_PITCH2, PCCARD_BEEP_DURATION2); + } } int pccard_beep_select(enum beepstate state) |
