diff options
author | ru <ru@FreeBSD.org> | 2006-11-16 12:27:51 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2006-11-16 12:27:51 +0000 |
commit | 9e82974459c03e26ded24a5a55bf0707a93ed127 (patch) | |
tree | 0ccfc7080538194f63a057102473650c27cc2294 | |
parent | 11bd032934459c00769d781681e7e4f71149bf1a (diff) | |
download | FreeBSD-src-9e82974459c03e26ded24a5a55bf0707a93ed127.zip FreeBSD-src-9e82974459c03e26ded24a5a55bf0707a93ed127.tar.gz |
Replace magic numbers for console bell types with defines.
-rw-r--r-- | sys/dev/syscons/syscons.c | 4 | ||||
-rw-r--r-- | usr.sbin/kbdcontrol/kbdcontrol.c | 6 |
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); } |