diff options
-rw-r--r-- | apps/gui/backdrop.h | 13 | ||||
-rw-r--r-- | 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 @@ | |||
28 | #include "bmp.h" | 28 | #include "bmp.h" |
29 | 29 | ||
30 | #define LCD_BACKDROP_BYTES (LCD_FBHEIGHT*LCD_FBWIDTH*sizeof(fb_data)) | 30 | #define LCD_BACKDROP_BYTES (LCD_FBHEIGHT*LCD_FBWIDTH*sizeof(fb_data)) |
31 | #if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 | ||
32 | #define REMOTE_LCD_BACKDROP_BYTES \ | ||
33 | (LCD_REMOTE_FBHEIGHT*LCD_REMOTE_FBWIDTH*sizeof(fb_remote_data)) | ||
34 | #else | ||
35 | #define REMOTE_LCD_BACKDROP_BYTES 0 | ||
36 | #endif | ||
37 | |||
38 | bool backdrop_load(const char *filename, char* backdrop_buffer); | 31 | bool backdrop_load(const char *filename, char* backdrop_buffer); |
39 | void backdrop_show(char* backdrop_buffer); | 32 | void backdrop_show(char* backdrop_buffer); |
40 | 33 | ||
@@ -42,9 +35,13 @@ void backdrop_show(char* backdrop_buffer); | |||
42 | #define LCD_BACKDROP_BYTES 0 | 35 | #define LCD_BACKDROP_BYTES 0 |
43 | #endif | 36 | #endif |
44 | 37 | ||
45 | #if defined(HAVE_REMOTE_LCD) | 38 | #if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 && !defined(__PCTOOL__) |
39 | #define REMOTE_LCD_BACKDROP_BYTES \ | ||
40 | (LCD_REMOTE_FBHEIGHT*LCD_REMOTE_FBWIDTH*sizeof(fb_remote_data)) | ||
46 | bool remote_backdrop_load(const char *filename, char* backdrop_buffer); | 41 | bool remote_backdrop_load(const char *filename, char* backdrop_buffer); |
47 | void remote_backdrop_show(char* backdrop_buffer); | 42 | void remote_backdrop_show(char* backdrop_buffer); |
43 | #else | ||
44 | #define REMOTE_LCD_BACKDROP_BYTES 0 | ||
48 | #endif | 45 | #endif |
49 | 46 | ||
50 | #endif /* _BACKDROP_H */ | 47 | #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; } | |||
183 | int remote_getheight(void) { return LCD_REMOTE_HEIGHT; } | 183 | int remote_getheight(void) { return LCD_REMOTE_HEIGHT; } |
184 | #endif | 184 | #endif |
185 | 185 | ||
186 | static inline bool backdrop_load(enum backdrop_type bdrop, const char* filename) | 186 | static inline bool backdrop_load(const char *filename, char* backdrop_buffer) |
187 | { | 187 | { |
188 | (void)filename; (void)bdrop; return true; | 188 | (void)filename; (void)backdrop_buffer; return true; |
189 | } | 189 | } |
190 | 190 | ||
191 | struct screen screens[NB_SCREENS] = | 191 | struct screen screens[NB_SCREENS] = |