summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2006-05-11 18:50:20 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2006-05-11 18:50:20 +0000
commit3ff0b5dbaa46fef6d538a01bff628a97ebaeac1b (patch)
tree0b2b572898f9484226275e7eaf9b306a2d0248fe
parent31a8ce0983528c21838a3566918d20926690957d (diff)
if (!foo & BAR) bad, if (!(foo & BAR)) better, and I'll have a cookie per
file.
-rw-r--r--sys/dev/isa/aria.c6
-rw-r--r--sys/dev/usb/if_atu.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/isa/aria.c b/sys/dev/isa/aria.c
index 6b5bc65dd19..5330eea255f 100644
--- a/sys/dev/isa/aria.c
+++ b/sys/dev/isa/aria.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aria.c,v 1.12 2006/03/14 19:26:30 miod Exp $ */
+/* $OpenBSD: aria.c,v 1.13 2006/05/11 18:50:18 miod Exp $ */
/*
* Copyright (c) 1995, 1996 Roland C. Dowdeswell. All rights reserved.
@@ -1061,12 +1061,12 @@ aria_cont(addr)
DPRINTF(("aria_cont\n"));
- if (!sc->sc_record&(1<<0) && (sc->sc_open&ARIAR_OPEN_RECORD)) {
+ if (!(sc->sc_record&(1<<0)) && (sc->sc_open&ARIAR_OPEN_RECORD)) {
aria_sendcmd(sc->sc_iobase, ARIADSPC_START_REC, ARIAR_RECORD_CHAN, -1, -1);
sc->sc_record |= ~(1<<ARIAR_RECORD_CHAN);
}
- if (!sc->sc_play&(1<<ARIAR_PLAY_CHAN) && (sc->sc_open&ARIAR_OPEN_PLAY)) {
+ if (!(sc->sc_play&(1<<ARIAR_PLAY_CHAN)) && (sc->sc_open&ARIAR_OPEN_PLAY)) {
aria_sendcmd(sc->sc_iobase, ARIADSPC_START_PLAY, 1, -1, -1);
sc->sc_play |= ~(1<<ARIAR_PLAY_CHAN);
}
diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c
index 4f98057d1aa..f4949aa3532 100644
--- a/sys/dev/usb/if_atu.c
+++ b/sys/dev/usb/if_atu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_atu.c,v 1.69 2006/03/25 22:41:46 djm Exp $ */
+/* $OpenBSD: if_atu.c,v 1.70 2006/05/11 18:50:19 miod Exp $ */
/*
* Copyright (c) 2003, 2004
* Daan Vreeken <Danovitsch@Vitsch.net>. All rights reserved.
@@ -963,7 +963,7 @@ atu_internal_firmware(void *arg)
DPRINTFN(15, ("%s: sending remap\n", USBDEVNAME(sc->atu_dev)));
err = atu_usb_request(sc, DFU_REMAP, 0, 0, 0, NULL);
- if ((err) && (! sc->atu_quirk & ATU_QUIRK_NO_REMAP)) {
+ if ((err) && (!ISSET(sc->atu_quirk, ATU_QUIRK_NO_REMAP))) {
DPRINTF(("%s: remap failed!\n", USBDEVNAME(sc->atu_dev)));
return;
}