From 349bf08ed1b31611b6d03694ca044cc296592f66 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Fri, 29 Jan 2010 08:13:40 +0000 Subject: fix reds git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24367 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/backdrop.h | 13 +++++-------- tools/checkwps/checkwps.c | 4 ++-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/apps/gui/backdrop.h b/apps/gui/backdrop.h index 735a884606..22cdceb28e 100644 --- a/apps/gui/backdrop.h +++ b/apps/gui/backdrop.h @@ -28,13 +28,6 @@ #include "bmp.h" #define LCD_BACKDROP_BYTES (LCD_FBHEIGHT*LCD_FBWIDTH*sizeof(fb_data)) -#if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 -#define REMOTE_LCD_BACKDROP_BYTES \ - (LCD_REMOTE_FBHEIGHT*LCD_REMOTE_FBWIDTH*sizeof(fb_remote_data)) -#else -#define REMOTE_LCD_BACKDROP_BYTES 0 -#endif - bool backdrop_load(const char *filename, char* backdrop_buffer); void backdrop_show(char* backdrop_buffer); @@ -42,9 +35,13 @@ void backdrop_show(char* backdrop_buffer); #define LCD_BACKDROP_BYTES 0 #endif -#if defined(HAVE_REMOTE_LCD) +#if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 && !defined(__PCTOOL__) +#define REMOTE_LCD_BACKDROP_BYTES \ + (LCD_REMOTE_FBHEIGHT*LCD_REMOTE_FBWIDTH*sizeof(fb_remote_data)) bool remote_backdrop_load(const char *filename, char* backdrop_buffer); void remote_backdrop_show(char* backdrop_buffer); +#else +#define REMOTE_LCD_BACKDROP_BYTES 0 #endif #endif /* _BACKDROP_H */ diff --git a/tools/checkwps/checkwps.c b/tools/checkwps/checkwps.c index 92d1443bb8..38a650a878 100644 --- a/tools/checkwps/checkwps.c +++ b/tools/checkwps/checkwps.c @@ -183,9 +183,9 @@ int remote_getwidth(void) { return LCD_REMOTE_WIDTH; } int remote_getheight(void) { return LCD_REMOTE_HEIGHT; } #endif -static inline bool backdrop_load(enum backdrop_type bdrop, const char* filename) +static inline bool backdrop_load(const char *filename, char* backdrop_buffer) { - (void)filename; (void)bdrop; return true; + (void)filename; (void)backdrop_buffer; return true; } struct screen screens[NB_SCREENS] = -- cgit v1.2.3