From 97df7caceaa3f94801f1b5b5eb358ac6527db11a Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Sat, 19 Nov 2005 02:26:54 +0000 Subject: [PATCH] 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 --- firmware/drivers/button.c | 5 +++++ firmware/export/config-ipodcolor.h | 2 +- firmware/export/config-ipodnano.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index 56bfaed6da..85faeafc25 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 diff --git a/firmware/export/config-ipodcolor.h b/firmware/export/config-ipodcolor.h index dfce0e7ead..1b556a26f8 100644 --- a/firmware/export/config-ipodcolor.h +++ b/firmware/export/config-ipodcolor.h @@ -27,7 +27,7 @@ #define CONFIG_CODEC SWCODEC /* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF +//#define HAVE_SW_POWEROFF /* The number of bytes reserved for loadable codecs */ #define CODEC_SIZE 0x80000 diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h index c8ea590464..56928e3ff4 100644 --- a/firmware/export/config-ipodnano.h +++ b/firmware/export/config-ipodnano.h @@ -27,7 +27,7 @@ #define CONFIG_CODEC SWCODEC /* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF +//#define HAVE_SW_POWEROFF /* The number of bytes reserved for loadable codecs */ #define CODEC_SIZE 0x80000