Hopefully clean up some errors

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11528 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Karl Kurbjun 2006-11-15 06:46:35 +00:00
parent cd73d8bf02
commit 1a9442c001
19 changed files with 38 additions and 7 deletions

View file

@ -467,7 +467,9 @@ static const struct plugin_api rockbox_api = {
#endif /* HAVE_RECORDING */ #endif /* HAVE_RECORDING */
#endif /* CONFIG_CODEC == SWCODEC */ #endif /* CONFIG_CODEC == SWCODEC */
#if LCD_DEPTH > 1
lcd_set_backdrop, lcd_set_backdrop,
#endif
}; };

View file

@ -579,7 +579,9 @@ struct plugin_api {
#endif /* HAVE_RECORDING */ #endif /* HAVE_RECORDING */
#endif /* CONFIG_CODEC == SWCODEC */ #endif /* CONFIG_CODEC == SWCODEC */
#if LCD_DEPTH > 1
void (*lcd_set_backdrop)(fb_data* backdrop); void (*lcd_set_backdrop)(fb_data* backdrop);
#endif
}; };
/* plugin header */ /* plugin header */

View file

@ -480,7 +480,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
rb = api; rb = api;
len = rb->strlen(SS_TITLE); len = rb->strlen(SS_TITLE);
#if LCD_DEPTH > 1
rb->lcd_set_backdrop(NULL); rb->lcd_set_backdrop(NULL);
#endif
rb->lcd_setfont(FONT_SYSFIXED); rb->lcd_setfont(FONT_SYSFIXED);
rb->lcd_getstringsize((unsigned char *)SS_TITLE, &w, &h); rb->lcd_getstringsize((unsigned char *)SS_TITLE, &w, &h);

View file

@ -1943,6 +1943,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
rb = api; rb = api;
rb->lcd_setfont(FONT_SYSFIXED); rb->lcd_setfont(FONT_SYSFIXED);
#if LCD_DEPTH > 1
rb->lcd_set_backdrop(NULL);
#endif
/* Permanently enable the backlight (unless the user has turned it off) */ /* Permanently enable the backlight (unless the user has turned it off) */
if (rb->global_settings->backlight_timeout > 0) if (rb->global_settings->backlight_timeout > 0)
rb->backlight_set_timeout(1); rb->backlight_set_timeout(1);

View file

@ -2699,7 +2699,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) {
rb->lcd_clear_display(); rb->lcd_clear_display();
/* start app */ /* start app */
#if LCD_DEPTH > 1
rb->lcd_set_backdrop(NULL); rb->lcd_set_backdrop(NULL);
#endif
rb->lcd_setfont(FONT_SYSFIXED); rb->lcd_setfont(FONT_SYSFIXED);
while(!exit) { while(!exit) {

View file

@ -643,7 +643,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) {
/* plugin init */ /* plugin init */
(void)parameter; (void)parameter;
rb = api; rb = api;
#if LCD_DEPTH > 1
rb->lcd_set_backdrop(NULL); rb->lcd_set_backdrop(NULL);
#endif
/* end of plugin init */ /* end of plugin init */
/* load opening book, soon */ /* load opening book, soon */

View file

@ -445,7 +445,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
int ret; int ret;
rb = api; /* copy to global api pointer */ rb = api; /* copy to global api pointer */
#if LCD_DEPTH > 1
rb->lcd_set_backdrop(NULL); rb->lcd_set_backdrop(NULL);
#endif
(void)parameter; (void)parameter;
if (rb->global_settings->backlight_timeout > 0) if (rb->global_settings->backlight_timeout > 0)
{ {

View file

@ -409,7 +409,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
rb = api; // copy to global api pointer rb = api; // copy to global api pointer
(void)parameter; (void)parameter;
#if LCD_DEPTH > 1
rb->lcd_set_backdrop(NULL); rb->lcd_set_backdrop(NULL);
#endif
if (rb->global_settings->backlight_timeout > 0) if (rb->global_settings->backlight_timeout > 0)
rb->backlight_set_timeout(1);/* keep the light on */ rb->backlight_set_timeout(1);/* keep the light on */

View file

@ -469,7 +469,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
rb->lcd_set_foreground(LCD_BLACK); rb->lcd_set_foreground(LCD_BLACK);
#endif #endif
#if LCD_DEPTH > 1
rb->lcd_set_backdrop(NULL); rb->lcd_set_backdrop(NULL);
#endif
rb->splash(HZ, true, "FlipIt!"); rb->splash(HZ, true, "FlipIt!");

View file

@ -1562,7 +1562,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) {
jewels_loadscores(&bj); jewels_loadscores(&bj);
rb->lcd_setfont(FONT_SYSFIXED); rb->lcd_setfont(FONT_SYSFIXED);
#if LCD_DEPTH > 1
rb->lcd_set_backdrop(NULL); rb->lcd_set_backdrop(NULL);
#endif
jewels_setcolors(); jewels_setcolors();
while(!exit) { while(!exit) {

View file

@ -546,7 +546,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
xlcd_init(rb); xlcd_init(rb);
#endif #endif
#if LCD_DEPTH > 1
rb->lcd_set_backdrop(NULL); rb->lcd_set_backdrop(NULL);
#endif
init_mandelbrot_set(); init_mandelbrot_set();

View file

@ -657,7 +657,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
(void)parameter; (void)parameter;
rb = api; rb = api;
#if LCD_DEPTH > 1
rb->lcd_set_backdrop(NULL); rb->lcd_set_backdrop(NULL);
#endif
while( !exit ) while( !exit )
{ {

View file

@ -348,7 +348,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
rb = api; /* copy to global api pointer */ rb = api; /* copy to global api pointer */
(void)parameter; (void)parameter;
#if LCD_DEPTH > 1
rb->lcd_set_backdrop(NULL); rb->lcd_set_backdrop(NULL);
#endif
if (rb->global_settings->backlight_timeout > 0) if (rb->global_settings->backlight_timeout > 0)
rb->backlight_set_timeout(1);/* keep the light on */ rb->backlight_set_timeout(1);/* keep the light on */

View file

@ -910,7 +910,9 @@ enum plugin_status plugin_start (struct plugin_api *api, void *parameter)
rb = api; rb = api;
rb->srand (*rb->current_tick); rb->srand (*rb->current_tick);
#if LCD_DEPTH > 1
rb->lcd_set_backdrop(NULL); rb->lcd_set_backdrop(NULL);
#endif
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
rb->lcd_setfont (FONT_SYSFIXED); rb->lcd_setfont (FONT_SYSFIXED);

View file

@ -170,12 +170,6 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
rb->lcd_setfont(0); rb->lcd_setfont(0);
rb->lcd_set_backdrop(NULL);
#if defined(HAVE_LCD_COLOR)
rb->lcd_set_foreground(LCD_WHITE);
rb->lcd_set_background(LCD_BLACK);
#endif
rb->lcd_clear_display(); rb->lcd_clear_display();
if (!parameter) if (!parameter)

View file

@ -1326,7 +1326,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
/* Lets use the default font */ /* Lets use the default font */
rb->lcd_setfont(FONT_SYSFIXED); rb->lcd_setfont(FONT_SYSFIXED);
#if LCD_DEPTH > 1
rb->lcd_set_backdrop(NULL); rb->lcd_set_backdrop(NULL);
#endif
#ifdef HAVE_LCD_COLOR #ifdef HAVE_LCD_COLOR
rb->lcd_set_foreground(LCD_BLACK); rb->lcd_set_foreground(LCD_BLACK);
rb->lcd_set_background(LCD_WHITE); rb->lcd_set_background(LCD_WHITE);

View file

@ -1675,7 +1675,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
game_state = ATTRACT_MODE; game_state = ATTRACT_MODE;
/* universal font */ /* universal font */
#if LCD_DEPTH > 1
rb->lcd_set_backdrop(NULL); rb->lcd_set_backdrop(NULL);
#endif
rb->lcd_setfont(FONT_SYSFIXED); rb->lcd_setfont(FONT_SYSFIXED);
rb->backlight_set_timeout(1); rb->backlight_set_timeout(1);
iohiscore(); iohiscore();

View file

@ -1125,8 +1125,10 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
/* plugin init */ /* plugin init */
rb = api; rb = api;
/* end of plugin init */ /* end of plugin init */
#if LCD_DEPTH > 1
rb->lcd_set_backdrop(NULL); rb->lcd_set_backdrop(NULL);
#endif
clear_state(&state); clear_state(&state);

View file

@ -2355,7 +2355,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
rb->lcd_set_background(COLOR_BG); rb->lcd_set_background(COLOR_BG);
#endif #endif
#if LCD_DEPTH > 1
rb->lcd_set_backdrop(NULL); rb->lcd_set_backdrop(NULL);
#endif
#ifdef DEBUG_WORMLET #ifdef DEBUG_WORMLET
testline_in_rect(); testline_in_rect();