diff options
author | Jens Arnold <amiconn@rockbox.org> | 2007-01-18 22:10:29 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2007-01-18 22:10:29 +0000 |
commit | 11b06f042364e810f4ee5226dde2690682c66c4c (patch) | |
tree | 59ab3d5e625b81b8c554452063f2a2477b97b2f6 /firmware | |
parent | 9848bf6159cc184878c89364731fbb07f669eb21 (diff) | |
download | rockbox-11b06f042364e810f4ee5226dde2690682c66c4c.tar.gz rockbox-11b06f042364e810f4ee5226dde2690682c66c4c.zip |
iPods: Touching the wheel now resets the poweroff timer, so the iPod no longer shuts down unexpectedly while operating the wheel only, e.g. in the text viewer.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12068 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/target/arm/ipod/button-clickwheel.c | 7 | ||||
-rw-r--r-- | firmware/target/arm/ipod/button-mini1g.c | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/firmware/target/arm/ipod/button-clickwheel.c b/firmware/target/arm/ipod/button-clickwheel.c index 79107884c5..15f3cdd43c 100644 --- a/firmware/target/arm/ipod/button-clickwheel.c +++ b/firmware/target/arm/ipod/button-clickwheel.c | |||
@@ -114,6 +114,7 @@ static inline int ipod_4g_button_read(void) | |||
114 | int new_wheel_value = (status << 9) >> 25; | 114 | int new_wheel_value = (status << 9) >> 25; |
115 | whl = new_wheel_value; | 115 | whl = new_wheel_value; |
116 | backlight_on(); | 116 | backlight_on(); |
117 | reset_poweroff_timer(); | ||
117 | /* The queue should have no other events when scrolling */ | 118 | /* The queue should have no other events when scrolling */ |
118 | if (queue_empty(&button_queue) && old_wheel_value >= 0) { | 119 | if (queue_empty(&button_queue) && old_wheel_value >= 0) { |
119 | 120 | ||
@@ -137,9 +138,9 @@ static inline int ipod_4g_button_read(void) | |||
137 | if (send_events) | 138 | if (send_events) |
138 | #endif | 139 | #endif |
139 | { | 140 | { |
140 | data = (wheel_delta << 16) | new_wheel_value; | 141 | data = (wheel_delta << 16) | new_wheel_value; |
141 | queue_post(&button_queue, wheel_keycode | wheel_repeat, | 142 | queue_post(&button_queue, wheel_keycode | wheel_repeat, |
142 | data); | 143 | data); |
143 | } | 144 | } |
144 | 145 | ||
145 | if (!wheel_repeat) wheel_repeat = BUTTON_REPEAT; | 146 | if (!wheel_repeat) wheel_repeat = BUTTON_REPEAT; |
diff --git a/firmware/target/arm/ipod/button-mini1g.c b/firmware/target/arm/ipod/button-mini1g.c index 4a9a9ee310..242f06c071 100644 --- a/firmware/target/arm/ipod/button-mini1g.c +++ b/firmware/target/arm/ipod/button-mini1g.c | |||
@@ -70,6 +70,7 @@ void handle_scroll_wheel(int new_scroll, int was_hold, int reverse) | |||
70 | } | 70 | } |
71 | else if (!was_hold) { | 71 | else if (!was_hold) { |
72 | backlight_on(); | 72 | backlight_on(); |
73 | reset_poweroff_timer(); | ||
73 | if (++count == 6) { /* reduce sensitivity */ | 74 | if (++count == 6) { /* reduce sensitivity */ |
74 | count = 0; | 75 | count = 0; |
75 | switch (direction) { | 76 | switch (direction) { |