diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2011-04-18 21:13:40 +0000 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2011-04-18 21:13:40 +0000 |
commit | 8d1d2f8982a8c68a7572a82ebc8409e257e77994 (patch) | |
tree | 5709cdff442a1976079993bacbd616db366233f4 /firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c | |
parent | 79c6aca566198c3fd5f80cfd9f53f1ad73d8227d (diff) | |
download | rockbox-8d1d2f8982a8c68a7572a82ebc8409e257e77994.tar.gz rockbox-8d1d2f8982a8c68a7572a82ebc8409e257e77994.zip |
AMS: consistently use bitclr32/bitset32/bitmod32 for register CCU_IO (instead of using |= or &= )
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29748 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c')
-rw-r--r-- | firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c b/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c index 30f2c0df16..7f82b692c7 100644 --- a/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c +++ b/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c | |||
@@ -226,7 +226,7 @@ int button_read_device(void) | |||
226 | while(delay--) nop; | 226 | while(delay--) nop; |
227 | 227 | ||
228 | bool ccu_io_bit12 = CCU_IO & (1<<12); | 228 | bool ccu_io_bit12 = CCU_IO & (1<<12); |
229 | CCU_IO &= ~(1<<12); | 229 | bitclr32(&CCU_IO, 1<<12); |
230 | 230 | ||
231 | /* B1 is shared with FM i2c */ | 231 | /* B1 is shared with FM i2c */ |
232 | bool gpiob_pin0_dir = GPIOB_DIR & (1<<1); | 232 | bool gpiob_pin0_dir = GPIOB_DIR & (1<<1); |
@@ -256,7 +256,7 @@ int button_read_device(void) | |||
256 | GPIOB_DIR |= 1<<1; | 256 | GPIOB_DIR |= 1<<1; |
257 | 257 | ||
258 | if(ccu_io_bit12) | 258 | if(ccu_io_bit12) |
259 | CCU_IO |= 1<<12; | 259 | bitset32(&CCU_IO, 1<<12); |
260 | 260 | ||
261 | #ifdef HAS_BUTTON_HOLD | 261 | #ifdef HAS_BUTTON_HOLD |
262 | #ifndef BOOTLOADER | 262 | #ifndef BOOTLOADER |