summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2008-05-12 15:37:03 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2008-05-12 15:37:03 +0000
commite8df7c490472d68b4e088ba0b6c3670fda42bfdb (patch)
treed3a63ed82812f29686836c8765659c6445d82a69
parent70d196710b80cacc1ab8ceda7300c29c33d04632 (diff)
downloadrockbox-e8df7c490472d68b4e088ba0b6c3670fda42bfdb.tar.gz
rockbox-e8df7c490472d68b4e088ba0b6c3670fda42bfdb.zip
Undo r17470 because of regressions in some debug menus.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17472 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, 0 insertions, 6 deletions
diff --git a/firmware/target/arm/ipod/button-clickwheel.c b/firmware/target/arm/ipod/button-clickwheel.c
index 00c850bea4..f8dd818a01 100644
--- a/firmware/target/arm/ipod/button-clickwheel.c
+++ b/firmware/target/arm/ipod/button-clickwheel.c
@@ -157,9 +157,6 @@ 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;
163 160
164 if (wheel_keycode != BUTTON_NONE) 161 if (wheel_keycode != BUTTON_NONE)
165 { 162 {
diff --git a/firmware/target/arm/sandisk/sansa-e200/button-e200.c b/firmware/target/arm/sandisk/sansa-e200/button-e200.c
index ad0531d835..117b993763 100644
--- a/firmware/target/arm/sandisk/sansa-e200/button-e200.c
+++ b/firmware/target/arm/sandisk/sansa-e200/button-e200.c
@@ -131,9 +131,6 @@ 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;
137 134
138 if (btn != BUTTON_NONE) 135 if (btn != BUTTON_NONE)
139 { 136 {