diff options
author | Robert Kukla <roolku@rockbox.org> | 2008-03-05 21:52:45 +0000 |
---|---|---|
committer | Robert Kukla <roolku@rockbox.org> | 2008-03-05 21:52:45 +0000 |
commit | d6c23b4dd4b887bac02ba88cff6f3b52e87e16ac (patch) | |
tree | 61968eb97571027545e05e21b864a26b1bc6b642 /firmware | |
parent | 5a75184c4abfd2c8fa2a3ee705b94fc800d7b918 (diff) | |
download | rockbox-d6c23b4dd4b887bac02ba88cff6f3b52e87e16ac.tar.gz rockbox-d6c23b4dd4b887bac02ba88cff6f3b52e87e16ac.zip |
m:robe 100:
- don't compile touchpad driver for bootloader
- honour hold switch
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16531 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/target/arm/olympus/mrobe-100/button-mr100.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/firmware/target/arm/olympus/mrobe-100/button-mr100.c b/firmware/target/arm/olympus/mrobe-100/button-mr100.c index 43db2c5f6d..a03259f7b2 100644 --- a/firmware/target/arm/olympus/mrobe-100/button-mr100.c +++ b/firmware/target/arm/olympus/mrobe-100/button-mr100.c | |||
@@ -30,6 +30,9 @@ | |||
30 | #define LOGF_ENABLE | 30 | #define LOGF_ENABLE |
31 | #include "logf.h" | 31 | #include "logf.h" |
32 | 32 | ||
33 | static int int_btn = BUTTON_NONE; | ||
34 | |||
35 | #ifndef BOOTLOADER | ||
33 | /* Driver for the Synaptics Touchpad based on the "Synaptics Modular Embedded | 36 | /* Driver for the Synaptics Touchpad based on the "Synaptics Modular Embedded |
34 | Protocol: 3-Wire Interface Specification" documentation */ | 37 | Protocol: 3-Wire Interface Specification" documentation */ |
35 | 38 | ||
@@ -59,7 +62,6 @@ | |||
59 | #define ABSOLUTE_HEADER 0x0b | 62 | #define ABSOLUTE_HEADER 0x0b |
60 | 63 | ||
61 | static int syn_status = 0; | 64 | static int syn_status = 0; |
62 | static int int_btn = BUTTON_NONE; | ||
63 | 65 | ||
64 | static int syn_wait_clk_change(unsigned int val) | 66 | static int syn_wait_clk_change(unsigned int val) |
65 | { | 67 | { |
@@ -584,6 +586,9 @@ void button_int(void) | |||
584 | GPIOD_INT_EN |= 0x2; | 586 | GPIOD_INT_EN |= 0x2; |
585 | } | 587 | } |
586 | } | 588 | } |
589 | #else | ||
590 | void button_init_device(void){} | ||
591 | #endif /* bootloader */ | ||
587 | 592 | ||
588 | /* | 593 | /* |
589 | * Get button pressed from hardware | 594 | * Get button pressed from hardware |
@@ -592,6 +597,9 @@ int button_read_device(void) | |||
592 | { | 597 | { |
593 | int btn = int_btn; | 598 | int btn = int_btn; |
594 | 599 | ||
600 | if(button_hold()) | ||
601 | return BUTTON_NONE; | ||
602 | |||
595 | if (~GPIOA_INPUT_VAL & 0x40) | 603 | if (~GPIOA_INPUT_VAL & 0x40) |
596 | btn |= BUTTON_POWER; | 604 | btn |= BUTTON_POWER; |
597 | 605 | ||