From 49a0a945ac5ee6598a2ff15c3b806e5fa0a727be Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Tue, 22 Nov 2005 01:15:31 +0000 Subject: Win32 simulator now supports iPod Color. Fixed screendump() to correctly work for iPod simulators on big endian machines. Removed duplicate button definitions. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8035 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/gwps.h | 12 ++++++------ apps/misc.c | 2 +- apps/recorder/keyboard.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'apps') diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h index 7dcbcca76b..dfae7c34e2 100644 --- a/apps/gui/gwps.h +++ b/apps/gui/gwps.h @@ -176,12 +176,12 @@ /* TODO: Check WPS button assignments */ -#define WPS_NEXT (BUTTON_NEXT | BUTTON_REL) -#define WPS_NEXT_PRE BUTTON_PREV -#define WPS_PREV (BUTTON_PREV | BUTTON_REL) -#define WPS_PREV_PRE BUTTON_PREV -#define WPS_FFWD (BUTTON_NEXT | BUTTON_REPEAT) -#define WPS_REW (BUTTON_PREV | BUTTON_REPEAT) +#define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) +#define WPS_NEXT_PRE BUTTON_RIGHT +#define WPS_PREV (BUTTON_LEFT | BUTTON_REL) +#define WPS_PREV_PRE BUTTON_LEFT +#define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT) +#define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT) #define WPS_INCVOL BUTTON_SCROLL_FWD #define WPS_DECVOL BUTTON_SCROLL_BACK #define WPS_PAUSE BUTTON_PLAY | BUTTON_REL diff --git a/apps/misc.c b/apps/misc.c index 152914e4f0..8525904cc4 100644 --- a/apps/misc.c +++ b/apps/misc.c @@ -381,7 +381,7 @@ void screen_dump(void) { #if (LCD_PIXELFORMAT == RGB565SWAPPED) /* iPod LCD data is big endian although the CPU is not */ - *dst++ = swap16(*src++); + *dst++ = htobe16(*src++); #else *dst++ = htole16(*src++); #endif diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c index 31c0643e3c..fc3d1686a4 100644 --- a/apps/recorder/keyboard.c +++ b/apps/recorder/keyboard.c @@ -106,8 +106,8 @@ #define KBD_DONE (BUTTON_SELECT | BUTTON_REPEAT) #define KBD_ABORT BUTTON_MENU -#define KBD_LEFT BUTTON_PREV -#define KBD_RIGHT BUTTON_NEXT +#define KBD_LEFT BUTTON_LEFT +#define KBD_RIGHT BUTTON_RIGHT #define KBD_UP BUTTON_SCROLL_BACK #define KBD_DOWN BUTTON_SCROLL_FWD -- cgit v1.2.3