From 11b06f042364e810f4ee5226dde2690682c66c4c Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Thu, 18 Jan 2007 22:10:29 +0000 Subject: 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 --- firmware/target/arm/ipod/button-clickwheel.c | 7 ++++--- 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) int new_wheel_value = (status << 9) >> 25; whl = new_wheel_value; backlight_on(); + reset_poweroff_timer(); /* The queue should have no other events when scrolling */ if (queue_empty(&button_queue) && old_wheel_value >= 0) { @@ -137,9 +138,9 @@ static inline int ipod_4g_button_read(void) if (send_events) #endif { - data = (wheel_delta << 16) | new_wheel_value; - queue_post(&button_queue, wheel_keycode | wheel_repeat, - data); + data = (wheel_delta << 16) | new_wheel_value; + queue_post(&button_queue, wheel_keycode | wheel_repeat, + data); } 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) } else if (!was_hold) { backlight_on(); + reset_poweroff_timer(); if (++count == 6) { /* reduce sensitivity */ count = 0; switch (direction) { -- cgit v1.2.3