diff options
author | Szymon Dziok <b0hoon@o2.pl> | 2014-11-08 21:12:24 +0100 |
---|---|---|
committer | Szymon Dziok <b0hoon@o2.pl> | 2014-11-10 21:40:47 +0100 |
commit | bcca1114383c2147e60e73825ec68403c90bea40 (patch) | |
tree | e07dcc5f35478d20c5db328e2f2430cea997e185 /firmware/target/arm/philips/sa9200 | |
parent | 73a780265a25371c0d58d7784fa52946011606cc (diff) | |
download | rockbox-bcca1114383c2147e60e73825ec68403c90bea40.tar.gz rockbox-bcca1114383c2147e60e73825ec68403c90bea40.zip |
HDD1630/HDD6330/SA9200: Integration of the clicker with the "Keyclick" menu.
Change-Id: Ieb26f2252c1f2613cc9bd83c8349f49113f46d87
Diffstat (limited to 'firmware/target/arm/philips/sa9200')
-rw-r--r-- | firmware/target/arm/philips/sa9200/button-sa9200.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/firmware/target/arm/philips/sa9200/button-sa9200.c b/firmware/target/arm/philips/sa9200/button-sa9200.c index c02d1088dc..bef5be7522 100644 --- a/firmware/target/arm/philips/sa9200/button-sa9200.c +++ b/firmware/target/arm/philips/sa9200/button-sa9200.c | |||
@@ -29,19 +29,6 @@ | |||
29 | 29 | ||
30 | static int int_btn = BUTTON_NONE; | 30 | static int int_btn = BUTTON_NONE; |
31 | 31 | ||
32 | /* | ||
33 | * Generate a click sound from the player (not in headphones yet) | ||
34 | * TODO: integrate this with the "key click" option | ||
35 | */ | ||
36 | static void button_click(void) | ||
37 | { | ||
38 | GPIOF_ENABLE |= 0x08; | ||
39 | GPIOF_OUTPUT_VAL |= 0x08; | ||
40 | GPIOF_OUTPUT_EN |= 0x08; | ||
41 | udelay(1000); | ||
42 | GPIOF_OUTPUT_VAL &= ~0x08; | ||
43 | } | ||
44 | |||
45 | #ifndef BOOTLOADER | 32 | #ifndef BOOTLOADER |
46 | static bool hold_button_old = false; | 33 | static bool hold_button_old = false; |
47 | 34 | ||
@@ -148,7 +135,6 @@ bool button_hold(void) | |||
148 | */ | 135 | */ |
149 | int button_read_device(void) | 136 | int button_read_device(void) |
150 | { | 137 | { |
151 | static int btn_old = BUTTON_NONE; | ||
152 | int btn = int_btn; | 138 | int btn = int_btn; |
153 | bool hold = !(GPIOL_INPUT_VAL & 0x40); | 139 | bool hold = !(GPIOL_INPUT_VAL & 0x40); |
154 | 140 | ||
@@ -168,9 +154,6 @@ int button_read_device(void) | |||
168 | if (!(GPIOF_INPUT_VAL & 0x10)) btn |= BUTTON_VOL_UP; | 154 | if (!(GPIOF_INPUT_VAL & 0x10)) btn |= BUTTON_VOL_UP; |
169 | if (!(GPIOF_INPUT_VAL & 0x04)) btn |= BUTTON_VOL_DOWN; | 155 | if (!(GPIOF_INPUT_VAL & 0x04)) btn |= BUTTON_VOL_DOWN; |
170 | 156 | ||
171 | if ((btn != btn_old) && (btn != BUTTON_NONE)) button_click(); | ||
172 | btn_old = btn; | ||
173 | |||
174 | return btn; | 157 | return btn; |
175 | } | 158 | } |
176 | 159 | ||