summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Kurbjun <kkurbjun@gmail.com>2010-01-04 05:38:04 +0000
committerKarl Kurbjun <kkurbjun@gmail.com>2010-01-04 05:38:04 +0000
commit2f2fa0ffa6a494aae96c1c8ce1ed61c382859973 (patch)
tree01cf6c7e82a808e7785c089a3c97ee33587f8b14
parent86c1360169fa0fd502c348a2730d9ba5433d346b (diff)
downloadrockbox-2f2fa0ffa6a494aae96c1c8ce1ed61c382859973.tar.gz
rockbox-2f2fa0ffa6a494aae96c1c8ce1ed61c382859973.tar.bz2
rockbox-2f2fa0ffa6a494aae96c1c8ce1ed61c382859973.zip
Commit FS#10594 - Remove duplicated buttonlight code for Gigabeat F/X.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24175 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--docs/CREDITS1
-rw-r--r--firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c3
2 files changed, 1 insertions, 3 deletions
diff --git a/docs/CREDITS b/docs/CREDITS
index 9b65e5792f..08ad3c24e3 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -511,6 +511,7 @@ Viktor Varga
Juliusz Chroboczek
Christian Beier
Giovanni Zilli
+Shiloh Hawley
The libmad team
The wavpack team
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c
index 55fdad1159..1d13a21b22 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c
@@ -109,7 +109,6 @@ int button_read_device(void)
/* if the buttons dont agree twice in a row, then its none */
lastbutton = btn;
btn = BUTTON_NONE;
- buttonlight_on();
}
/* Check for hold first - exit if asserted with no button pressed */
@@ -121,7 +120,6 @@ int button_read_device(void)
if (buttons)
{
btn |= buttons;
- buttonlight_on();
}
/* the touchpad - only watch the lines we actually read */
@@ -152,7 +150,6 @@ int button_read_device(void)
if (touchpad & ((1 << 9) | (1 << 8) | (1 << 7)))
btn |= BUTTON_LEFT;
- buttonlight_on();
}
/* the cradle buttons */