summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsanpei <sanpei@FreeBSD.org>2000-10-31 03:28:02 +0000
committersanpei <sanpei@FreeBSD.org>2000-10-31 03:28:02 +0000
commit935fc5d4c2ffdc2410bf71eabcdf10ed4f97469d (patch)
treecf66904bd53f8f6c78d13b40ba736cd832bedb1e
parentcee4034456967e46ced4ff64ed385774d34cf273 (diff)
downloadFreeBSD-src-935fc5d4c2ffdc2410bf71eabcdf10ed4f97469d.zip
FreeBSD-src-935fc5d4c2ffdc2410bf71eabcdf10ed4f97469d.tar.gz
Oops, in previous commit(rev.1.4), I replaced
pitch and duration only in ``struct'', I forgot to replace these in sysbeep and timeout, sorry.
-rw-r--r--sys/pccard/pccard_beep.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/pccard/pccard_beep.c b/sys/pccard/pccard_beep.c
index 587eb6b..87d5129 100644
--- a/sys/pccard/pccard_beep.c
+++ b/sys/pccard/pccard_beep.c
@@ -73,9 +73,9 @@ pccard_beep_sub(void *arg)
struct tone *melody;
melody = (struct tone *)arg;
- if (melody->duration != NULL) {
- sysbeep(melody->duration, melody->pitch);
- timeout(pccard_beep_sub, ++melody, melody->pitch);
+ if (melody->pitch != NULL) {
+ sysbeep(melody->pitch, melody->duration);
+ timeout(pccard_beep_sub, ++melody, melody->duration);
} else
allow_beep = BEEP_ON;
}
@@ -86,10 +86,10 @@ pccard_beep_start(void *arg)
struct tone *melody;
melody = (struct tone *)arg;
- if (allow_beep == BEEP_ON && melody->duration != NULL) {
+ if (allow_beep == BEEP_ON && melody->pitch != NULL) {
allow_beep = BEEP_OFF;
- sysbeep(melody->duration, melody->pitch);
- timeout(pccard_beep_sub, ++melody, melody->pitch);
+ sysbeep(melody->pitch, melody->duration);
+ timeout(pccard_beep_sub, ++melody, melody->duration);
}
}
OpenPOWER on IntegriCloud