diff options
Diffstat (limited to 'firmware/target/arm/iriver/h10/button-h10.c')
-rw-r--r-- | firmware/target/arm/iriver/h10/button-h10.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/firmware/target/arm/iriver/h10/button-h10.c b/firmware/target/arm/iriver/h10/button-h10.c index 7979a52976..2a5983e97a 100644 --- a/firmware/target/arm/iriver/h10/button-h10.c +++ b/firmware/target/arm/iriver/h10/button-h10.c | |||
@@ -33,7 +33,7 @@ | |||
33 | 33 | ||
34 | void button_init_device(void) | 34 | void button_init_device(void) |
35 | { | 35 | { |
36 | /* No hardware initialisation required as it is done by the bootloader */ | 36 | /* No hardware initialisation required as it is done by the bootloader */ |
37 | } | 37 | } |
38 | 38 | ||
39 | bool button_hold(void) | 39 | bool button_hold(void) |
@@ -47,8 +47,8 @@ bool button_hold(void) | |||
47 | int button_read_device(void) | 47 | int button_read_device(void) |
48 | { | 48 | { |
49 | int btn = BUTTON_NONE; | 49 | int btn = BUTTON_NONE; |
50 | unsigned char state; | 50 | unsigned char state; |
51 | static bool hold_button = false; | 51 | static bool hold_button = false; |
52 | 52 | ||
53 | #if 0 | 53 | #if 0 |
54 | /* light handling */ | 54 | /* light handling */ |
@@ -59,25 +59,25 @@ int button_read_device(void) | |||
59 | #endif | 59 | #endif |
60 | 60 | ||
61 | hold_button = button_hold(); | 61 | hold_button = button_hold(); |
62 | if (!hold_button) | 62 | if (!hold_button) |
63 | { | 63 | { |
64 | /* Read normal buttons */ | 64 | /* Read normal buttons */ |
65 | state = GPIOA_INPUT_VAL & 0xf8; | 65 | state = GPIOA_INPUT_VAL & 0xf8; |
66 | if ((state & 0x8) == 0) btn |= BUTTON_FF; | 66 | if ((state & 0x8) == 0) btn |= BUTTON_FF; |
67 | if ((state & 0x10) == 0) btn |= BUTTON_PLAY; | 67 | if ((state & 0x10) == 0) btn |= BUTTON_PLAY; |
68 | if ((state & 0x20) == 0) btn |= BUTTON_REW; | 68 | if ((state & 0x20) == 0) btn |= BUTTON_REW; |
69 | if ((state & 0x40) == 0) btn |= BUTTON_RIGHT; | 69 | if ((state & 0x40) == 0) btn |= BUTTON_RIGHT; |
70 | if ((state & 0x80) == 0) btn |= BUTTON_LEFT; | 70 | if ((state & 0x80) == 0) btn |= BUTTON_LEFT; |
71 | 71 | ||
72 | /* Read power button */ | 72 | /* Read power button */ |
73 | if ((GPIOB_INPUT_VAL & 0x1) == 0) btn |= BUTTON_POWER; | 73 | if ((GPIOB_INPUT_VAL & 0x1) == 0) btn |= BUTTON_POWER; |
74 | 74 | ||
75 | /* Read scroller */ | 75 | /* Read scroller */ |
76 | if ( ((GPIOC_INPUT_VAL & 0x4)==1) && ((GPIOD_INPUT_VAL & 0x10)==1) ) | 76 | if ( ((GPIOC_INPUT_VAL & 0x4)==1) && ((GPIOD_INPUT_VAL & 0x10)==1) ) |
77 | { | 77 | { |
78 | /* Scroller is pressed */ | 78 | /* Scroller is pressed */ |
79 | } | 79 | } |
80 | } | 80 | } |
81 | 81 | ||
82 | return btn; | 82 | return btn; |
83 | } | 83 | } |