summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/dev/syscons/syscons.c4
-rw-r--r--usr.sbin/kbdcontrol/kbdcontrol.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 403f527..7dae3ea 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -769,11 +769,11 @@ scioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td)
return 0;
case CONS_BELLTYPE: /* set bell type sound/visual */
- if ((*(int *)data) & 0x01)
+ if ((*(int *)data) & CONS_VISUAL_BELL)
sc->flags |= SC_VISUAL_BELL;
else
sc->flags &= ~SC_VISUAL_BELL;
- if ((*(int *)data) & 0x02)
+ if ((*(int *)data) & CONS_QUIET_BELL)
sc->flags |= SC_QUIET_BELL;
else
sc->flags &= ~SC_QUIET_BELL;
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c
index f9fee14..c800233 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.c
+++ b/usr.sbin/kbdcontrol/kbdcontrol.c
@@ -907,11 +907,11 @@ set_bell_values(char *opt)
bell = 0;
if (!strncmp(opt, "quiet.", 6)) {
- bell = 2;
+ bell = CONS_QUIET_BELL;
opt += 6;
}
if (!strcmp(opt, "visual"))
- bell |= 1;
+ bell |= CONS_VISUAL_BELL;
else if (!strcmp(opt, "normal"))
duration = 5, pitch = 800;
else if (!strcmp(opt, "off"))
@@ -936,7 +936,7 @@ badopt:
}
ioctl(0, CONS_BELLTYPE, &bell);
- if ((bell & ~2) == 0)
+ if (!(bell & CONS_VISUAL_BELL))
fprintf(stderr, "[=%d;%dB", pitch, duration);
}
OpenPOWER on IntegriCloud