summaryrefslogtreecommitdiff
path: root/firmware/drivers/button.c
diff options
context:
space:
mode:
authorChristi Scarborough <christi@coraline.org>2005-06-29 12:23:09 +0000
committerChristi Scarborough <christi@coraline.org>2005-06-29 12:23:09 +0000
commit9e8918b0866b249a55c06a16a243cdd3dcdad305 (patch)
tree954d2eab9141f0a9a0777f9ce9eceb15af1b569a /firmware/drivers/button.c
parent1f45cce4262bde3f91844701085076892b4743f8 (diff)
downloadrockbox-9e8918b0866b249a55c06a16a243cdd3dcdad305.tar.gz
rockbox-9e8918b0866b249a55c06a16a243cdd3dcdad305.zip
Resume rework. With the new resume function, 'Ask' and 'Ask Once' are redundant options, since you can resume after any startup using the resume key. These have been stripped out, and the resume code has been streamlined. A small bug in button handler initialisation has been fixed.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6911 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/button.c')
-rw-r--r--firmware/drivers/button.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index e644267b19..b2de8b8157 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -220,7 +220,8 @@ void button_init(void)
220#endif /* CONFIG_KEYPAD */ 220#endif /* CONFIG_KEYPAD */
221 221
222 queue_init(&button_queue); 222 queue_init(&button_queue);
223 lastbtn = 0; 223 button_read();
224 lastbtn = button_read();
224 tick_add_task(button_tick); 225 tick_add_task(button_tick);
225 reset_poweroff_timer(); 226 reset_poweroff_timer();
226 227