From b701322fea42c809092f50e252f45ddfc38293c3 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Fri, 27 Jul 2007 09:57:27 +0000 Subject: Rockbox compiles and boots now on the 2nd gen, but doesn't work properly yet. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14021 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/zxbox/keymaps.h | 4 ++-- apps/plugins/zxbox/zxbox.c | 8 ++++---- apps/plugins/zxbox/zxbox_keyb.c | 4 +++- 3 files changed, 9 insertions(+), 7 deletions(-) (limited to 'apps/plugins/zxbox') diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index 9bac747..603869d 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h @@ -1,8 +1,8 @@ #ifndef KEYMAPS_H #define KEYMAPS_H -#if (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) +#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define ZX_UP BUTTON_MENU #define ZX_DOWN BUTTON_PLAY diff --git a/apps/plugins/zxbox/zxbox.c b/apps/plugins/zxbox/zxbox.c index 1faec08..c7e3d0a 100644 --- a/apps/plugins/zxbox/zxbox.c +++ b/apps/plugins/zxbox/zxbox.c @@ -125,8 +125,8 @@ void spkb_process_events( int evenframe ) if(evenframe){ int ki; -#if (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) +#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) if (rb->button_hold()) { #if defined(HAVE_ADJUSTABLE_CPU_FREQ) @@ -143,8 +143,8 @@ void spkb_process_events( int evenframe ) if ( buttons == previous_state ) return; previous_state = buttons; -#if (CONFIG_KEYPAD != IPOD_4G_PAD) && \ - (CONFIG_KEYPAD != IPOD_3G_PAD) +#if (CONFIG_KEYPAD != IPOD_4G_PAD) && (CONFIG_KEYPAD != IPOD_3G_PAD) && \ + (CONFIG_KEYPAD != IPOD_1G2G_PAD) if (buttons & ZX_MENU) { #if defined(HAVE_ADJUSTABLE_CPU_FREQ) diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index 39cbaa9..5bea491 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c @@ -48,7 +48,9 @@ #define KBD_UP BUTTON_UP #define KBD_DOWN BUTTON_DOWN -#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ + (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define KBD_SELECT BUTTON_SELECT #define KBD_ABORT BUTTON_MENU -- cgit v1.1