summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2008-09-15 18:48:11 +0000
committerFrank Gevaerts <frank@gevaerts.be>2008-09-15 18:48:11 +0000
commit816eea85ded55cfa320d42845442ebcf2368b0c3 (patch)
tree0767c94a934e1a439232c550e4f590fe4a833a24
parentff0b9a064c1a6408ffd8aa447829605209ea3edd (diff)
downloadrockbox-816eea85ded55cfa320d42845442ebcf2368b0c3.zip
rockbox-816eea85ded55cfa320d42845442ebcf2368b0c3.tar.gz
rockbox-816eea85ded55cfa320d42845442ebcf2368b0c3.tar.bz2
rockbox-816eea85ded55cfa320d42845442ebcf2368b0c3.tar.xz
use bitwise operators to manipulate bits
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18521 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/drivers/qt1106.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/drivers/qt1106.c b/firmware/drivers/qt1106.c
index c80cfb7..2148d70 100644
--- a/firmware/drivers/qt1106.c
+++ b/firmware/drivers/qt1106.c
@@ -46,11 +46,11 @@ void init_qt1106(void)
oldval = PCON0;
//Set P0.0 and P0.1 to output, set P0.3 and P0.4 to input
- PCON0 = ((oldval & ~(3 << 0 || 3 << 2 || 3 << 6 || 3 << 8)) | (1 << 0 | 1 << 2));
+ PCON0 = ((oldval & ~(3 << 0 | 3 << 2 | 3 << 6 | 3 << 8)) | (1 << 0 | 1 << 2));
oldval = PCON1;
- //Set P1.5 to input, set P1.6 to input
- PCON1 = ((oldval & ~(0xf << 20 || 0xf << 24)) | (1 << 24));
+ //Set P1.5 to input, set P1.6 to output
+ PCON1 = ((oldval & ~(0xf << 20 | 0xf << 24)) | (1 << 24));
SETSS();