summaryrefslogtreecommitdiff
path: root/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2010-05-05 04:13:15 +0000
committerRafaël Carré <rafael.carre@gmail.com>2010-05-05 04:13:15 +0000
commit145135f99f9453af8593c8a9e1cae8556abde3de (patch)
treed44346988365ba9757108b8e8b72e5e6342557c1 /firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c
parenta69e1c4a4425a69a920f7a85c45b1ac6de717a07 (diff)
downloadrockbox-145135f99f9453af8593c8a9e1cae8556abde3de.tar.gz
rockbox-145135f99f9453af8593c8a9e1cae8556abde3de.zip
Fuzev2: don't disable interrupts in fm code, allow button tick to run
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25819 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.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c b/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c
index fcda5226ca..4486af95b1 100644
--- a/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c
+++ b/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c
@@ -230,6 +230,7 @@ int button_read_device(void)
230 int delay = 30; 230 int delay = 30;
231 while(delay--) nop; 231 while(delay--) nop;
232 232
233 bool ccu_io_bit12 = CCU_IO & (1<<12);
233 CCU_IO &= ~(1<<12); 234 CCU_IO &= ~(1<<12);
234 235
235 /* B1 is shared with FM i2c */ 236 /* B1 is shared with FM i2c */
@@ -273,7 +274,8 @@ int button_read_device(void)
273 if(gpiob_pin0_dir) 274 if(gpiob_pin0_dir)
274 GPIOB_DIR |= 1<<1; 275 GPIOB_DIR |= 1<<1;
275 276
276 CCU_IO |= 1<<12; 277 if(ccu_io_bit12)
278 CCU_IO |= 1<<12;
277 279
278#ifdef HAS_BUTTON_HOLD 280#ifdef HAS_BUTTON_HOLD
279#ifndef BOOTLOADER 281#ifndef BOOTLOADER