From b42ef68a83ad817bd05fa65da0d290835e1f999b Mon Sep 17 00:00:00 2001 From: Ben Basha Date: Wed, 1 Feb 2006 20:06:25 +0000 Subject: [PATCH] Fix warnings at h1xx. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8527 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugin.c | 6 ++++-- apps/plugin.h | 12 +++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/apps/plugin.c b/apps/plugin.c index d9433d7bff..32412bc2ee 100644 --- a/apps/plugin.c +++ b/apps/plugin.c @@ -119,8 +119,6 @@ static const struct plugin_api rockbox_api = { lcd_get_background, lcd_bitmap_part, lcd_bitmap, - lcd_bitmap_transparent_part, - lcd_bitmap_transparent, #endif lcd_putsxy, lcd_puts_style, @@ -382,6 +380,10 @@ static const struct plugin_api rockbox_api = { queue_post, queue_wait_w_tmo, usb_acknowledge, +#if LCD_DEPTH == 16 + lcd_bitmap_transparent_part, + lcd_bitmap_transparent, +#endif }; int plugin_load(const char* plugin, void* parameter) diff --git a/apps/plugin.h b/apps/plugin.h index 61a3219893..1998bcf315 100644 --- a/apps/plugin.h +++ b/apps/plugin.h @@ -97,7 +97,7 @@ #define PLUGIN_MAGIC 0x526F634B /* RocK */ /* increase this every time the api struct changes */ -#define PLUGIN_API_VERSION 4 +#define PLUGIN_API_VERSION 5 /* update this to latest version if a change to the api struct breaks backwards compatibility (and please take the opportunity to sort in any @@ -161,10 +161,6 @@ struct plugin_api { int stride, int x, int y, int width, int height); void (*lcd_bitmap)(const fb_data *src, int x, int y, int width, int height); - void (*lcd_bitmap_transparent_part)(const fb_data *src, int src_x, int src_y, - int stride, int x, int y, int width, int height); - void (*lcd_bitmap_transparent)(const fb_data *src, int x, int y, - int width, int height); #endif void (*lcd_putsxy)(int x, int y, const unsigned char *string); void (*lcd_puts_style)(int x, int y, const unsigned char *str, int style); @@ -449,6 +445,12 @@ struct plugin_api { void (*queue_post)(struct event_queue *q, long id, void *data); void (*queue_wait_w_tmo)(struct event_queue *q, struct event *ev, int ticks); void (*usb_acknowledge)(long id); +#if LCD_DEPTH == 16 + void (*lcd_bitmap_transparent_part)(const fb_data *src, int src_x, int src_y, + int stride, int x, int y, int width, int height); + void (*lcd_bitmap_transparent)(const fb_data *src, int x, int y, + int width, int height); +#endif }; /* plugin header */