From b8223d908bb96486f4e49463cc906246f4cdb7cd Mon Sep 17 00:00:00 2001 From: Andree Buschmann Date: Fri, 28 Oct 2011 17:23:40 +0000 Subject: Fix FS#12351: The poweroff timer was not reset on scroll wheel activity for e200 and simulator. Thanks to Nick Peskett. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30847 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/as3525/scrollwheel-as3525.c | 2 ++ firmware/target/hosted/sdl/button-sdl.c | 2 ++ 2 files changed, 4 insertions(+) (limited to 'firmware') diff --git a/firmware/target/arm/as3525/scrollwheel-as3525.c b/firmware/target/arm/as3525/scrollwheel-as3525.c index d67e097ae8..c66f8e091a 100644 --- a/firmware/target/arm/as3525/scrollwheel-as3525.c +++ b/firmware/target/arm/as3525/scrollwheel-as3525.c @@ -23,6 +23,7 @@ #include "button.h" #include "kernel.h" #include "backlight.h" +#include "powermgmt.h" void scrollwheel(unsigned int wheel_value) { @@ -108,6 +109,7 @@ void scrollwheel(unsigned int wheel_value) { buttonlight_on(); backlight_on(); + reset_poweroff_timer(); queue_post(&button_queue, btn, ((wheel_delta+1)<<24)); /* message posted - reset count and remember post */ counter = 0; diff --git a/firmware/target/hosted/sdl/button-sdl.c b/firmware/target/hosted/sdl/button-sdl.c index 3d6a3797cf..ca1f2e5eb1 100644 --- a/firmware/target/hosted/sdl/button-sdl.c +++ b/firmware/target/hosted/sdl/button-sdl.c @@ -33,6 +33,7 @@ #include "sim_tasks.h" #include "buttonmap.h" #include "debug.h" +#include "powermgmt.h" #ifdef HAVE_TOUCHSCREEN #include "touchscreen.h" @@ -418,6 +419,7 @@ static void button_event(int key, bool pressed) #ifdef HAVE_BUTTON_LIGHT buttonlight_on(); #endif + reset_poweroff_timer(); queue_post(&button_queue, new_btn, 1<<24); new_btn &= ~(BUTTON_SCROLL_FWD | BUTTON_SCROLL_BACK); } -- cgit v1.2.3