diff options
-rw-r--r-- | apps/plugin.c | 2 | ||||
-rw-r--r-- | apps/plugin.h | 2 | ||||
-rw-r--r-- | uisimulator/common/lcd-common.c | 11 |
3 files changed, 2 insertions, 13 deletions
diff --git a/apps/plugin.c b/apps/plugin.c index aa6b65a34a..57f836c5d2 100644 --- a/apps/plugin.c +++ b/apps/plugin.c | |||
@@ -122,7 +122,7 @@ static const struct plugin_api rockbox_api = { | |||
122 | || defined (IRIVER_H10) | 122 | || defined (IRIVER_H10) |
123 | lcd_yuv_set_options, | 123 | lcd_yuv_set_options, |
124 | #endif | 124 | #endif |
125 | #elif (LCD_DEPTH < 4) || !defined(SIMULATOR) | 125 | #elif (LCD_DEPTH < 4) && !defined(SIMULATOR) |
126 | lcd_blit_mono, | 126 | lcd_blit_mono, |
127 | lcd_blit_grey_phase, | 127 | lcd_blit_grey_phase, |
128 | #endif /* LCD_DEPTH */ | 128 | #endif /* LCD_DEPTH */ |
diff --git a/apps/plugin.h b/apps/plugin.h index 1563ed3aec..cd426564ba 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -201,7 +201,7 @@ struct plugin_api { | |||
201 | || defined (IRIVER_H10) | 201 | || defined (IRIVER_H10) |
202 | void (*lcd_yuv_set_options)(unsigned options); | 202 | void (*lcd_yuv_set_options)(unsigned options); |
203 | #endif | 203 | #endif |
204 | #elif (LCD_DEPTH < 4) || !defined(SIMULATOR) | 204 | #elif (LCD_DEPTH < 4) && !defined(SIMULATOR) |
205 | void (*lcd_blit_mono)(const unsigned char *data, int x, int by, int width, | 205 | void (*lcd_blit_mono)(const unsigned char *data, int x, int by, int width, |
206 | int bheight, int stride); | 206 | int bheight, int stride); |
207 | void (*lcd_blit_grey_phase)(unsigned char *values, unsigned char *phases, | 207 | void (*lcd_blit_grey_phase)(unsigned char *values, unsigned char *phases, |
diff --git a/uisimulator/common/lcd-common.c b/uisimulator/common/lcd-common.c index eaadb20489..00a456507d 100644 --- a/uisimulator/common/lcd-common.c +++ b/uisimulator/common/lcd-common.c | |||
@@ -24,17 +24,6 @@ | |||
24 | #include "lcd.h" | 24 | #include "lcd.h" |
25 | #include "lcd-sdl.h" | 25 | #include "lcd-sdl.h" |
26 | 26 | ||
27 | void lcd_blit_mono(const unsigned char *data, int x, int y, int width, int height, | ||
28 | int stride) | ||
29 | { | ||
30 | (void)data; | ||
31 | (void)x; | ||
32 | (void)y; | ||
33 | (void)width; | ||
34 | (void)height; | ||
35 | (void)stride; | ||
36 | } | ||
37 | |||
38 | void lcd_set_flip(bool yesno) | 27 | void lcd_set_flip(bool yesno) |
39 | { | 28 | { |
40 | (void)yesno; | 29 | (void)yesno; |