diff options
Diffstat (limited to 'firmware/target/arm/olympus/mrobe-100/button-mr100.c')
-rw-r--r-- | firmware/target/arm/olympus/mrobe-100/button-mr100.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/firmware/target/arm/olympus/mrobe-100/button-mr100.c b/firmware/target/arm/olympus/mrobe-100/button-mr100.c index 141a6d5b0c..49561cb8d7 100644 --- a/firmware/target/arm/olympus/mrobe-100/button-mr100.c +++ b/firmware/target/arm/olympus/mrobe-100/button-mr100.c | |||
@@ -27,10 +27,6 @@ | |||
27 | #include "backlight-target.h" | 27 | #include "backlight-target.h" |
28 | #include "system.h" | 28 | #include "system.h" |
29 | 29 | ||
30 | void button_int(void) | ||
31 | { | ||
32 | } | ||
33 | |||
34 | void button_init_device(void) | 30 | void button_init_device(void) |
35 | { | 31 | { |
36 | /* taken from the mr-100 bootloader (offset 0x1e72) */ | 32 | /* taken from the mr-100 bootloader (offset 0x1e72) */ |
@@ -46,12 +42,17 @@ void button_init_device(void) | |||
46 | */ | 42 | */ |
47 | int button_read_device(void) | 43 | int button_read_device(void) |
48 | { | 44 | { |
49 | return BUTTON_NONE; | 45 | int btn = BUTTON_NONE; |
46 | |||
47 | if(~GPIOA_INPUT_VAL & 0x40) | ||
48 | btn |= BUTTON_POWER; | ||
49 | |||
50 | return btn; | ||
50 | } | 51 | } |
51 | 52 | ||
52 | bool button_hold(void) | 53 | bool button_hold(void) |
53 | { | 54 | { |
54 | return (GPIOD_INPUT_VAL & BUTTON_HOLD) ? false : true; | 55 | return (GPIOD_INPUT_VAL & 0x10) ? false : true; |
55 | } | 56 | } |
56 | 57 | ||
57 | bool headphones_inserted(void) | 58 | bool headphones_inserted(void) |