summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2008-05-12 08:27:53 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2008-05-12 08:27:53 +0000
commit0b814052258aa51174f6113f2e3617b4de1e61b1 (patch)
tree8a99a1414c39377f15e8a9c7ab1711f8eaacc619
parent5c3d5916da7aa1bb14cd224c80523a46d57d5f3f (diff)
downloadrockbox-0b814052258aa51174f6113f2e3617b4de1e61b1.tar.gz
rockbox-0b814052258aa51174f6113f2e3617b4de1e61b1.zip
Fix for FS#5162. Being able to read scrollwheel action via button_read_device() for iPod's and e200.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17470 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/arm/ipod/button-clickwheel.c3
-rw-r--r--firmware/target/arm/sandisk/sansa-e200/button-e200.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/firmware/target/arm/ipod/button-clickwheel.c b/firmware/target/arm/ipod/button-clickwheel.c
index f8dd818a01..00c850bea4 100644
--- a/firmware/target/arm/ipod/button-clickwheel.c
+++ b/firmware/target/arm/ipod/button-clickwheel.c
@@ -157,6 +157,9 @@ static inline int ipod_4g_button_read(void)
157 wheel_keycode = BUTTON_SCROLL_BACK; 157 wheel_keycode = BUTTON_SCROLL_BACK;
158 else 158 else
159 wheel_keycode = BUTTON_NONE; 159 wheel_keycode = BUTTON_NONE;
160
161 /* be able to read wheel action via button_read_device() */
162 btn |= wheel_keycode;
160 163
161 if (wheel_keycode != BUTTON_NONE) 164 if (wheel_keycode != BUTTON_NONE)
162 { 165 {
diff --git a/firmware/target/arm/sandisk/sansa-e200/button-e200.c b/firmware/target/arm/sandisk/sansa-e200/button-e200.c
index 117b993763..ad0531d835 100644
--- a/firmware/target/arm/sandisk/sansa-e200/button-e200.c
+++ b/firmware/target/arm/sandisk/sansa-e200/button-e200.c
@@ -131,6 +131,9 @@ void clickwheel_int(void)
131 btn = BUTTON_SCROLL_FWD; 131 btn = BUTTON_SCROLL_FWD;
132 else if (old_wheel_value == wheel_tbl[1][wheel_value >> 6]) 132 else if (old_wheel_value == wheel_tbl[1][wheel_value >> 6])
133 btn = BUTTON_SCROLL_BACK; 133 btn = BUTTON_SCROLL_BACK;
134
135 /* be able to read wheel action via button_read_device() */
136 int_btn |= btn;
134 137
135 if (btn != BUTTON_NONE) 138 if (btn != BUTTON_NONE)
136 { 139 {