summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm/philips/hdd1630/button-hdd1630.c
diff options
context:
space:
mode:
authorSzymon Dziok <b0hoon@o2.pl>2014-11-08 21:12:24 +0100
committerSzymon Dziok <b0hoon@o2.pl>2014-11-10 21:40:47 +0100
commitbcca1114383c2147e60e73825ec68403c90bea40 (patch)
treee07dcc5f35478d20c5db328e2f2430cea997e185 /firmware/target/arm/philips/hdd1630/button-hdd1630.c
parent73a780265a25371c0d58d7784fa52946011606cc (diff)
downloadrockbox-bcca1114383c2147e60e73825ec68403c90bea40.tar.gz
rockbox-bcca1114383c2147e60e73825ec68403c90bea40.tar.bz2
rockbox-bcca1114383c2147e60e73825ec68403c90bea40.zip
HDD1630/HDD6330/SA9200: Integration of the clicker with the "Keyclick" menu.
Change-Id: Ieb26f2252c1f2613cc9bd83c8349f49113f46d87
Diffstat (limited to 'firmware/target/arm/philips/hdd1630/button-hdd1630.c')
-rw-r--r--firmware/target/arm/philips/hdd1630/button-hdd1630.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/firmware/target/arm/philips/hdd1630/button-hdd1630.c b/firmware/target/arm/philips/hdd1630/button-hdd1630.c
index df0f5afbed..faed6abb72 100644
--- a/firmware/target/arm/philips/hdd1630/button-hdd1630.c
+++ b/firmware/target/arm/philips/hdd1630/button-hdd1630.c
@@ -29,18 +29,6 @@
static int int_btn = BUTTON_NONE;
-/*
- * Generate a click sound from the player (not in headphones yet)
- * TODO: integrate this with the "key click" option
- */
-static void button_click(void)
-{
- GPO32_ENABLE |= 0x2000;
- GPO32_VAL |= 0x2000;
- udelay(1000);
- GPO32_VAL &= ~0x2000;
-}
-
#ifndef BOOTLOADER
void button_init_device(void)
{
@@ -59,7 +47,7 @@ void button_int(void)
int_btn = BUTTON_NONE;
val = touchpad_read_device(data, 4);
-
+
if (val == MEP_BUTTON_HEADER)
{
/* Buttons packet */
@@ -96,7 +84,6 @@ bool button_hold(void)
*/
int button_read_device(void)
{
- static int btn_old = BUTTON_NONE;
int btn = int_btn;
/* Hold */
@@ -111,11 +98,6 @@ int button_read_device(void)
if (!(GPIOD_INPUT_VAL & 0x20)) btn |= BUTTON_PLAYLIST;
if (!(GPIOD_INPUT_VAL & 0x40)) btn |= BUTTON_POWER;
- if ((btn != btn_old) && (btn != BUTTON_NONE))
- button_click();
-
- btn_old = btn;
-
return btn;
}