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-04-27 21:01:31 +0000
committerRafaël Carré <rafael.carre@gmail.com>2010-04-27 21:01:31 +0000
commit3e37460357cc446931cab7cbf7fbc844d183db0a (patch)
tree5a3c8bd075d955fa7c2b16cbe306cf7d3dff74f6 /firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c
parent621cf62702cecf13403d026c4f38fcca7a947917 (diff)
downloadrockbox-3e37460357cc446931cab7cbf7fbc844d183db0a.tar.gz
rockbox-3e37460357cc446931cab7cbf7fbc844d183db0a.zip
Fuzev2 button fixes
- remove udelay(1) and use the previous busy loop : the delay was too long for proper hold detection - remove the 2nd delay (unneeded) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25741 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.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c b/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c
index 5693ea0fa3..fa126c0a95 100644
--- a/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c
+++ b/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c
@@ -233,14 +233,13 @@ int button_read_device(void)
233 CCU_IO &= ~(1<<12); 233 CCU_IO &= ~(1<<12);
234 234
235 GPIOB_PIN(0) = 1<<0; 235 GPIOB_PIN(0) = 1<<0;
236 udelay(1); 236 for(delay = 500; delay; delay--)
237 nop;
237 238
238 gpiod6 = GPIOD_PIN(6); 239 gpiod6 = GPIOD_PIN(6);
239 240
240 GPIOB_PIN(0) = 0; 241 GPIOB_PIN(0) = 0;
241 242
242 udelay(1);
243
244 if (GPIOC_PIN(1) & 1<<1) 243 if (GPIOC_PIN(1) & 1<<1)
245 btn |= BUTTON_DOWN; 244 btn |= BUTTON_DOWN;
246 if (GPIOC_PIN(2) & 1<<2) 245 if (GPIOC_PIN(2) & 1<<2)