summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/plugin.c2
-rw-r--r--apps/plugin.h6
-rw-r--r--apps/plugins/test_fps.c4
3 files changed, 8 insertions, 4 deletions
diff --git a/apps/plugin.c b/apps/plugin.c
index c4e5a0bb0f..20c7a3733c 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -126,11 +126,13 @@ static const struct plugin_api rockbox_api = {
126#if LCD_DEPTH == 16 126#if LCD_DEPTH == 16
127 lcd_bitmap_transparent_part, 127 lcd_bitmap_transparent_part,
128 lcd_bitmap_transparent, 128 lcd_bitmap_transparent,
129#if MEMORYSIZE > 2
129 lcd_blit_yuv, 130 lcd_blit_yuv,
130#if defined(TOSHIBA_GIGABEAT_F) || defined(SANSA_E200) || defined(SANSA_C200) \ 131#if defined(TOSHIBA_GIGABEAT_F) || defined(SANSA_E200) || defined(SANSA_C200) \
131 || defined(IRIVER_H10) || defined(COWON_D2) || defined(PHILIPS_HDD1630) || defined(SANSA_FUZE) || defined(SANSA_E200V2) 132 || defined(IRIVER_H10) || defined(COWON_D2) || defined(PHILIPS_HDD1630) || defined(SANSA_FUZE) || defined(SANSA_E200V2)
132 lcd_yuv_set_options, 133 lcd_yuv_set_options,
133#endif 134#endif
135#endif /* MEMORYSIZE > 2 */
134#elif (LCD_DEPTH < 4) && !defined(SIMULATOR) 136#elif (LCD_DEPTH < 4) && !defined(SIMULATOR)
135 lcd_blit_mono, 137 lcd_blit_mono,
136 lcd_blit_grey_phase, 138 lcd_blit_grey_phase,
diff --git a/apps/plugin.h b/apps/plugin.h
index 105be0bfe2..2a5b6829c0 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -128,12 +128,12 @@ void* plugin_get_buffer(size_t *buffer_size);
128#define PLUGIN_MAGIC 0x526F634B /* RocK */ 128#define PLUGIN_MAGIC 0x526F634B /* RocK */
129 129
130/* increase this every time the api struct changes */ 130/* increase this every time the api struct changes */
131#define PLUGIN_API_VERSION 155 131#define PLUGIN_API_VERSION 156
132 132
133/* update this to latest version if a change to the api struct breaks 133/* update this to latest version if a change to the api struct breaks
134 backwards compatibility (and please take the opportunity to sort in any 134 backwards compatibility (and please take the opportunity to sort in any
135 new function which are "waiting" at the end of the function table) */ 135 new function which are "waiting" at the end of the function table) */
136#define PLUGIN_MIN_API_VERSION 151 136#define PLUGIN_MIN_API_VERSION 156
137 137
138/* plugin return codes */ 138/* plugin return codes */
139enum plugin_status { 139enum plugin_status {
@@ -205,6 +205,7 @@ struct plugin_api {
205 int x, int y, int width, int height); 205 int x, int y, int width, int height);
206 void (*lcd_bitmap_transparent)(const fb_data *src, int x, int y, 206 void (*lcd_bitmap_transparent)(const fb_data *src, int x, int y,
207 int width, int height); 207 int width, int height);
208#if MEMORYSIZE > 2
208 void (*lcd_blit_yuv)(unsigned char * const src[3], 209 void (*lcd_blit_yuv)(unsigned char * const src[3],
209 int src_x, int src_y, int stride, 210 int src_x, int src_y, int stride,
210 int x, int y, int width, int height); 211 int x, int y, int width, int height);
@@ -212,6 +213,7 @@ struct plugin_api {
212 || defined(IRIVER_H10) || defined(COWON_D2) || defined(PHILIPS_HDD1630) || defined(SANSA_FUZE) || defined(SANSA_E200V2) 213 || defined(IRIVER_H10) || defined(COWON_D2) || defined(PHILIPS_HDD1630) || defined(SANSA_FUZE) || defined(SANSA_E200V2)
213 void (*lcd_yuv_set_options)(unsigned options); 214 void (*lcd_yuv_set_options)(unsigned options);
214#endif 215#endif
216#endif /* MEMORYSIZE > 2 */
215#elif (LCD_DEPTH < 4) && !defined(SIMULATOR) 217#elif (LCD_DEPTH < 4) && !defined(SIMULATOR)
216 void (*lcd_blit_mono)(const unsigned char *data, int x, int by, int width, 218 void (*lcd_blit_mono)(const unsigned char *data, int x, int by, int width,
217 int bheight, int stride); 219 int bheight, int stride);
diff --git a/apps/plugins/test_fps.c b/apps/plugins/test_fps.c
index cba08f28d1..ddbd51c00b 100644
--- a/apps/plugins/test_fps.c
+++ b/apps/plugins/test_fps.c
@@ -132,7 +132,7 @@ static void time_main_update(void)
132 log_text(str); 132 log_text(str);
133} 133}
134 134
135#ifdef HAVE_LCD_COLOR 135#if defined(HAVE_LCD_COLOR) && (MEMORYSIZE > 2)
136 136
137#if LCD_WIDTH >= LCD_HEIGHT 137#if LCD_WIDTH >= LCD_HEIGHT
138#define YUV_WIDTH LCD_WIDTH 138#define YUV_WIDTH LCD_WIDTH
@@ -353,7 +353,7 @@ enum plugin_status plugin_start(const void* parameter)
353 353
354 log_text("Main LCD Update"); 354 log_text("Main LCD Update");
355 time_main_update(); 355 time_main_update();
356#ifdef HAVE_LCD_COLOR 356#if defined(HAVE_LCD_COLOR) && (MEMORYSIZE > 2)
357 log_text("Main LCD YUV"); 357 log_text("Main LCD YUV");
358 time_main_yuv(); 358 time_main_yuv();
359#endif 359#endif