summaryrefslogtreecommitdiff
path: root/firmware/drivers
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2005-11-19 02:26:54 +0000
committerDave Chapman <dave@dchapman.com>2005-11-19 02:26:54 +0000
commit97df7caceaa3f94801f1b5b5eb358ac6527db11a (patch)
tree6946006e7da2c3ff5ae0bc5dbae5cc7bf60ec1fc /firmware/drivers
parentaf324590cccc8a35fdaf72d12b16390f572da319 (diff)
downloadrockbox-97df7caceaa3f94801f1b5b5eb358ac6527db11a.zip
rockbox-97df7caceaa3f94801f1b5b5eb358ac6527db11a.tar.gz
rockbox-97df7caceaa3f94801f1b5b5eb358ac6527db11a.tar.bz2
rockbox-97df7caceaa3f94801f1b5b5eb358ac6527db11a.tar.xz
Fix button problems - disable button_flip for the iPod and disable software poweroff
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7981 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers')
-rw-r--r--firmware/drivers/button.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index 56bfaed..85faeaf 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -246,6 +246,7 @@ void button_init(void)
}
#ifdef HAVE_LCD_BITMAP /* only bitmap displays can be flipped */
+#if (CONFIG_KEYPAD != IPOD_4G_PAD) && (CONFIG_KEYPAD != IPOD_4G_PAD)
/*
* helper function to swap UP/DOWN, LEFT/RIGHT (and F1/F3 for Recorder)
*/
@@ -278,6 +279,10 @@ static int button_flip(int button)
return newbutton;
}
+#else
+/* We don't flip the iPod's keypad yet*/
+#define button_flip(x) (x)
+#endif
/*
* set the flip attribute