diff options
author | Ben Basha <benbasha@rockbox.org> | 2006-02-01 20:06:25 +0000 |
---|---|---|
committer | Ben Basha <benbasha@rockbox.org> | 2006-02-01 20:06:25 +0000 |
commit | b42ef68a83ad817bd05fa65da0d290835e1f999b (patch) | |
tree | 42ba95675a60f5556ad770c501ca3c31b5c9c08a | |
parent | db83601b3cab310b9fdcdb3d56bd37e800f824d5 (diff) | |
download | rockbox-b42ef68a83ad817bd05fa65da0d290835e1f999b.tar.gz rockbox-b42ef68a83ad817bd05fa65da0d290835e1f999b.zip |
Fix warnings at h1xx.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8527 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugin.c | 6 | ||||
-rw-r--r-- | 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 = { | |||
119 | lcd_get_background, | 119 | lcd_get_background, |
120 | lcd_bitmap_part, | 120 | lcd_bitmap_part, |
121 | lcd_bitmap, | 121 | lcd_bitmap, |
122 | lcd_bitmap_transparent_part, | ||
123 | lcd_bitmap_transparent, | ||
124 | #endif | 122 | #endif |
125 | lcd_putsxy, | 123 | lcd_putsxy, |
126 | lcd_puts_style, | 124 | lcd_puts_style, |
@@ -382,6 +380,10 @@ static const struct plugin_api rockbox_api = { | |||
382 | queue_post, | 380 | queue_post, |
383 | queue_wait_w_tmo, | 381 | queue_wait_w_tmo, |
384 | usb_acknowledge, | 382 | usb_acknowledge, |
383 | #if LCD_DEPTH == 16 | ||
384 | lcd_bitmap_transparent_part, | ||
385 | lcd_bitmap_transparent, | ||
386 | #endif | ||
385 | }; | 387 | }; |
386 | 388 | ||
387 | int plugin_load(const char* plugin, void* parameter) | 389 | 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 @@ | |||
97 | #define PLUGIN_MAGIC 0x526F634B /* RocK */ | 97 | #define PLUGIN_MAGIC 0x526F634B /* RocK */ |
98 | 98 | ||
99 | /* increase this every time the api struct changes */ | 99 | /* increase this every time the api struct changes */ |
100 | #define PLUGIN_API_VERSION 4 | 100 | #define PLUGIN_API_VERSION 5 |
101 | 101 | ||
102 | /* update this to latest version if a change to the api struct breaks | 102 | /* update this to latest version if a change to the api struct breaks |
103 | backwards compatibility (and please take the opportunity to sort in any | 103 | backwards compatibility (and please take the opportunity to sort in any |
@@ -161,10 +161,6 @@ struct plugin_api { | |||
161 | int stride, int x, int y, int width, int height); | 161 | int stride, int x, int y, int width, int height); |
162 | void (*lcd_bitmap)(const fb_data *src, int x, int y, int width, | 162 | void (*lcd_bitmap)(const fb_data *src, int x, int y, int width, |
163 | int height); | 163 | int height); |
164 | void (*lcd_bitmap_transparent_part)(const fb_data *src, int src_x, int src_y, | ||
165 | int stride, int x, int y, int width, int height); | ||
166 | void (*lcd_bitmap_transparent)(const fb_data *src, int x, int y, | ||
167 | int width, int height); | ||
168 | #endif | 164 | #endif |
169 | void (*lcd_putsxy)(int x, int y, const unsigned char *string); | 165 | void (*lcd_putsxy)(int x, int y, const unsigned char *string); |
170 | void (*lcd_puts_style)(int x, int y, const unsigned char *str, int style); | 166 | void (*lcd_puts_style)(int x, int y, const unsigned char *str, int style); |
@@ -449,6 +445,12 @@ struct plugin_api { | |||
449 | void (*queue_post)(struct event_queue *q, long id, void *data); | 445 | void (*queue_post)(struct event_queue *q, long id, void *data); |
450 | void (*queue_wait_w_tmo)(struct event_queue *q, struct event *ev, int ticks); | 446 | void (*queue_wait_w_tmo)(struct event_queue *q, struct event *ev, int ticks); |
451 | void (*usb_acknowledge)(long id); | 447 | void (*usb_acknowledge)(long id); |
448 | #if LCD_DEPTH == 16 | ||
449 | void (*lcd_bitmap_transparent_part)(const fb_data *src, int src_x, int src_y, | ||
450 | int stride, int x, int y, int width, int height); | ||
451 | void (*lcd_bitmap_transparent)(const fb_data *src, int x, int y, | ||
452 | int width, int height); | ||
453 | #endif | ||
452 | }; | 454 | }; |
453 | 455 | ||
454 | /* plugin header */ | 456 | /* plugin header */ |