len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pass plugin api pointer to funtion directly, fixes crashes when doing incremental builds. Fix incorrect backlight changes in rockblox introduced recently.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14373 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Peter D'Hoye 2007-08-16 23:01:18 +00:00
parent 735ab889d2
commit 767c0ec589
20 changed files with 54 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/plugins/brickmania.c
View file

@ -2031,7 +2031,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
rb->lcd_set_backdrop(NULL); rb->lcd_set_backdrop(NULL);
#endif #endif
/* Turn off backlight timeout */ /* Turn off backlight timeout */
backlight_force_on(); /* backlight control in lib/helper.c */ backlight_force_on(rb); /* backlight control in lib/helper.c */
/* now go ahead and have fun! */ /* now go ahead and have fun! */
while (game_loop()!=1); while (game_loop()!=1);
@ -2041,7 +2041,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
/* Restore user's original backlight setting */ /* Restore user's original backlight setting */
rb->lcd_setfont(FONT_UI); rb->lcd_setfont(FONT_UI);
/* Turn on backlight timeout (revert to settings) */ /* Turn on backlight timeout (revert to settings) */
backlight_use_settings(); /* backlight control in lib/helper.c */ backlight_use_settings(rb); /* backlight control in lib/helper.c */
return PLUGIN_OK; return PLUGIN_OK;
} }

4
apps/plugins/chopper.c
View file

@ -949,7 +949,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
#endif #endif
/* Turn off backlight timeout */ /* Turn off backlight timeout */
backlight_force_on(); /* backlight control in lib/helper.c */ backlight_force_on(rb); /* backlight control in lib/helper.c */
rb->srand( *rb->current_tick ); rb->srand( *rb->current_tick );
@ -964,7 +964,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
rb->lcd_setfont(FONT_UI); rb->lcd_setfont(FONT_UI);
/* Turn on backlight timeout (revert to settings) */ /* Turn on backlight timeout (revert to settings) */
backlight_use_settings(); /* backlight control in lib/helper.c */ backlight_use_settings(rb); /* backlight control in lib/helper.c */
return ret; return ret;
} }

4
apps/plugins/credits.c
View file

@ -37,7 +37,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
rb = api; rb = api;
/* Turn off backlight timeout */ /* Turn off backlight timeout */
backlight_force_on(); /* backlight control in lib/helper.c */ backlight_force_on(rb); /* backlight control in lib/helper.c */
rb->show_logo(); rb->show_logo();
#ifdef HAVE_LCD_CHARCELLS #ifdef HAVE_LCD_CHARCELLS
@ -57,7 +57,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
end_of_proc: end_of_proc:
/* Turn on backlight timeout (revert to settings) */ /* Turn on backlight timeout (revert to settings) */
backlight_use_settings(); /* backlight control in lib/helper.c */ backlight_use_settings(rb); /* backlight control in lib/helper.c */
return PLUGIN_OK; return PLUGIN_OK;
} }

4
apps/plugins/fire.c
View file

@ -332,7 +332,7 @@ void cleanup(void *parameter)
gray_release(); gray_release();
#endif #endif
/* Turn on backlight timeout (revert to settings) */ /* Turn on backlight timeout (revert to settings) */
backlight_use_settings(); /* backlight control in lib/helper.c */ backlight_use_settings(rb); /* backlight control in lib/helper.c */
} }
/* /*
@ -423,7 +423,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
rb->lcd_set_backdrop(NULL); rb->lcd_set_backdrop(NULL);
#endif #endif
/* Turn off backlight timeout */ /* Turn off backlight timeout */
backlight_force_on(); /* backlight control in lib/helper.c */ backlight_force_on(rb); /* backlight control in lib/helper.c */
ret = main(); ret = main();

4
apps/plugins/fireworks.c
View file

@ -380,7 +380,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
/* set everything up.. no BL timeout, no backdrop, /* set everything up.. no BL timeout, no backdrop,
white-text-on-black-background. */ white-text-on-black-background. */
backlight_force_on(); /* backlight control in lib/helper.c */ backlight_force_on(rb); /* backlight control in lib/helper.c */
#if LCD_DEPTH > 1 #if LCD_DEPTH > 1
rb->lcd_set_backdrop(NULL); rb->lcd_set_backdrop(NULL);
rb->lcd_set_background(LCD_BLACK); rb->lcd_set_background(LCD_BLACK);
@ -537,7 +537,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
} }
} }
/* Turn on backlight timeout (revert to settings) */ /* Turn on backlight timeout (revert to settings) */
backlight_use_settings(); /* backlight control in lib/helper.c */ backlight_use_settings(rb); /* backlight control in lib/helper.c */
#ifdef HAVE_ADJUSTABLE_CPU_FREQ #ifdef HAVE_ADJUSTABLE_CPU_FREQ
rb->cpu_boost(true); rb->cpu_boost(true);

4
apps/plugins/grayscale.c
View file

@ -87,7 +87,7 @@ void cleanup(void *parameter)
gray_release(); /* switch off overlay and deinitialize */ gray_release(); /* switch off overlay and deinitialize */
/* Turn on backlight timeout (revert to settings) */ /* Turn on backlight timeout (revert to settings) */
backlight_use_settings(); /* backlight control in lib/helper.c */ backlight_use_settings(rb); /* backlight control in lib/helper.c */
} }
/* this is only a demo of what the framework can do */ /* this is only a demo of what the framework can do */
@ -172,7 +172,7 @@ int main(void)
}; };
/* Turn off backlight timeout */ /* Turn off backlight timeout */
backlight_force_on(); /* backlight control in lib/helper.c */ backlight_force_on(rb); /* backlight control in lib/helper.c */
rb->lcd_setfont(FONT_SYSFIXED); /* select default font */ rb->lcd_setfont(FONT_SYSFIXED); /* select default font */

4
apps/plugins/invadrox.c
View file

@ -1766,7 +1766,7 @@ enum plugin_status plugin_start(struct plugin_api* api, UNUSED void* parameter)
rb->lcd_setfont(FONT_SYSFIXED); rb->lcd_setfont(FONT_SYSFIXED);
/* Turn off backlight timeout */ /* Turn off backlight timeout */
backlight_force_on(); /* backlight control in lib/helper.c */ backlight_force_on(rb); /* backlight control in lib/helper.c */
/* now go ahead and have fun! */ /* now go ahead and have fun! */
game_loop(); game_loop();
@ -1784,7 +1784,7 @@ enum plugin_status plugin_start(struct plugin_api* api, UNUSED void* parameter)
/* Restore user's original backlight setting */ /* Restore user's original backlight setting */
rb->lcd_setfont(FONT_UI); rb->lcd_setfont(FONT_UI);
/* Turn on backlight timeout (revert to settings) */ /* Turn on backlight timeout (revert to settings) */
backlight_use_settings(); /* backlight control in lib/helper.c */ backlight_use_settings(rb); /* backlight control in lib/helper.c */
return PLUGIN_OK; return PLUGIN_OK;
} }

4
apps/plugins/jpeg.c
View file

@ -3311,7 +3311,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
buf_images = buf; buf_images_size = buf_size; buf_images = buf; buf_images_size = buf_size;
/* Turn off backlight timeout */ /* Turn off backlight timeout */
backlight_force_on(); /* backlight control in lib/helper.c */ backlight_force_on(rb); /* backlight control in lib/helper.c */
do do
{ {
@ -3335,7 +3335,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
#endif #endif
/* Turn on backlight timeout (revert to settings) */ /* Turn on backlight timeout (revert to settings) */
backlight_use_settings(); /* backlight control in lib/helper.c */ backlight_use_settings(rb); /* backlight control in lib/helper.c */
#ifdef USEGSLIB #ifdef USEGSLIB
gray_release(); /* deinitialize */ gray_release(); /* deinitialize */

9
apps/plugins/lib/helper.c
View file

@ -19,16 +19,14 @@
#include "plugin.h" #include "plugin.h"
/* the plugin must declare the plugin_api struct pointer itself */
extern struct plugin_api* rb;
/* /*
* force the backlight on * force the backlight on
* now enabled regardless of HAVE_BACKLIGHT because it is not needed to * now enabled regardless of HAVE_BACKLIGHT because it is not needed to
* build and makes modded targets easier to update * build and makes modded targets easier to update
*/ */
void backlight_force_on(void) void backlight_force_on(struct plugin_api* rb)
{ {
if(!rb) return;
/* #ifdef HAVE_BACKLIGHT */ /* #ifdef HAVE_BACKLIGHT */
if (rb->global_settings->backlight_timeout > 1) if (rb->global_settings->backlight_timeout > 1)
rb->backlight_set_timeout(1); rb->backlight_set_timeout(1);
@ -44,8 +42,9 @@ void backlight_force_on(void)
* now enabled regardless of HAVE_BACKLIGHT because it is not needed to * now enabled regardless of HAVE_BACKLIGHT because it is not needed to
* build and makes modded targets easier to update * build and makes modded targets easier to update
*/ */
void backlight_use_settings(void) void backlight_use_settings(struct plugin_api* rb)
{ {
if(!rb) return;
/* #ifdef HAVE_BACKLIGHT */ /* #ifdef HAVE_BACKLIGHT */
rb->backlight_set_timeout(rb->global_settings->backlight_timeout); rb->backlight_set_timeout(rb->global_settings->backlight_timeout);
#if CONFIG_CHARGING #if CONFIG_CHARGING

4
apps/plugins/lib/helper.h
View file

@ -24,7 +24,7 @@
/** /**
* Backlight on/off operations * Backlight on/off operations
*/ */
void backlight_force_on(void); void backlight_force_on(struct plugin_api* rb);
void backlight_use_settings(void); void backlight_use_settings(struct plugin_api* rb);
#endif #endif

4
apps/plugins/mpegplayer/mpegplayer.c
View file

@ -1858,7 +1858,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
rb->lcd_update(); rb->lcd_update();
/* Turn off backlight timeout */ /* Turn off backlight timeout */
backlight_force_on(); /* backlight control in lib/helper.c */ backlight_force_on(rb); /* backlight control in lib/helper.c */
#ifdef HAVE_ADJUSTABLE_CPU_FREQ #ifdef HAVE_ADJUSTABLE_CPU_FREQ
rb->cpu_boost(true); rb->cpu_boost(true);
@ -1996,7 +1996,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
rb->pcm_set_frequency(HW_SAMPR_DEFAULT); rb->pcm_set_frequency(HW_SAMPR_DEFAULT);
/* Turn on backlight timeout (revert to settings) */ /* Turn on backlight timeout (revert to settings) */
backlight_use_settings(); /* backlight control in lib/helper.c */ backlight_use_settings(rb); /* backlight control in lib/helper.c */
return status; return status;
} }

4
apps/plugins/oscilloscope.c
View file

@ -564,7 +564,7 @@ void cleanup(void *parameter)
rb->lcd_set_background(LCD_DEFAULT_BG); rb->lcd_set_background(LCD_DEFAULT_BG);
#endif #endif
/* Turn on backlight timeout (revert to settings) */ /* Turn on backlight timeout (revert to settings) */
backlight_use_settings(); /* backlight control in lib/helper.c */ backlight_use_settings(rb); /* backlight control in lib/helper.c */
} }
enum plugin_status plugin_start(struct plugin_api* api, void* parameter) enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
@ -595,7 +595,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
#endif #endif
/* Turn off backlight timeout */ /* Turn off backlight timeout */
backlight_force_on(); /* backlight control in lib/helper.c */ backlight_force_on(rb); /* backlight control in lib/helper.c */
rb->lcd_getstringsize("A", NULL, &font_height); rb->lcd_getstringsize("A", NULL, &font_height);

4
apps/plugins/plasma.c
View file

@ -172,7 +172,7 @@ void cleanup(void *parameter)
gray_release(); gray_release();
#endif #endif
/* Turn on backlight timeout (revert to settings) */ /* Turn on backlight timeout (revert to settings) */
backlight_use_settings(); /* backlight control in lib/helper.c */ backlight_use_settings(rb); /* backlight control in lib/helper.c */
} }
/* /*
@ -302,7 +302,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
rb->lcd_set_backdrop(NULL); rb->lcd_set_backdrop(NULL);
#endif #endif
/* Turn off backlight timeout */ /* Turn off backlight timeout */
backlight_force_on(); /* backlight control in lib/helper.c */ backlight_force_on(rb); /* backlight control in lib/helper.c */
ret = main(); ret = main();

10
apps/plugins/rockblox.c
View file

@ -855,13 +855,13 @@ static int rockblox_loop (void)
#ifdef HAS_BUTTON_HOLD #ifdef HAS_BUTTON_HOLD
if (rb->button_hold ()) { if (rb->button_hold ()) {
/* Turn on backlight timeout (revert to settings) */ /* Turn on backlight timeout (revert to settings) */
backlight_use_settings(); /* backlight control in lib/helper.c */ backlight_use_settings(rb); /* backlight control in lib/helper.c */
rb->splash(0, "Paused"); rb->splash(0, "Paused");
while (rb->button_hold ()) while (rb->button_hold ())
rb->sleep(HZ/10); rb->sleep(HZ/10);
/* Turn on backlight timeout (revert to settings) */ /* Turn off backlight timeout */
backlight_use_settings(); /* backlight control in lib/helper.c */ backlight_force_on(rb); /* backlight control in lib/helper.c */
/* get rid of the splash text */ /* get rid of the splash text */
rb->lcd_bitmap (rockblox_background, 0, 0, LCD_WIDTH, LCD_HEIGHT); rb->lcd_bitmap (rockblox_background, 0, 0, LCD_WIDTH, LCD_HEIGHT);
@ -1029,8 +1029,8 @@ enum plugin_status plugin_start (struct plugin_api *api, void *parameter)
return PLUGIN_OK; return PLUGIN_OK;
} }
#endif #endif
/* Turn on backlight timeout (revert to settings) */ /* Turn off backlight timeout */
backlight_use_settings(); /* backlight control in lib/helper.c */ backlight_force_on(rb); /* backlight control in lib/helper.c */
init_rockblox (); init_rockblox ();
ret = rockblox_loop (); ret = rockblox_loop ();

16
apps/plugins/spacerocks.c
View file

@ -490,6 +490,11 @@ void iohiscore(void)
rb->memset(phscore, 0, sizeof(phscore)); rb->memset(phscore, 0, sizeof(phscore));
fd = rb->open(HISCORE_FILE,O_RDWR | O_CREAT); fd = rb->open(HISCORE_FILE,O_RDWR | O_CREAT);
if(fd < 0)
{
rb->splash(HZ, "Highscore file read error");
return;
}
/* highscore used to %d, is now %d\n /* highscore used to %d, is now %d\n
Deal with no file or bad file */ Deal with no file or bad file */
@ -497,7 +502,8 @@ void iohiscore(void)
compare = rb->atoi(phscore); compare = rb->atoi(phscore);
if(high_score > compare){ if(high_score > compare)
{
rb->lseek(fd,0,SEEK_SET); rb->lseek(fd,0,SEEK_SET);
rb->fdprintf(fd, "%d\n", high_score); rb->fdprintf(fd, "%d\n", high_score);
} }
@ -1926,25 +1932,23 @@ enum plugin_status start_game(void)
enum plugin_status plugin_start(struct plugin_api* api, void* parameter) enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
{ {
enum plugin_status retval; enum plugin_status retval;
(void)(parameter); (void)(parameter);
rb = api; rb = api;
game_state = ATTRACT_MODE; game_state = ATTRACT_MODE;
/* universal font */
#if LCD_DEPTH > 1 #if LCD_DEPTH > 1
rb->lcd_set_backdrop(NULL); rb->lcd_set_backdrop(NULL);
#endif #endif
/* universal font */
rb->lcd_setfont(FONT_SYSFIXED); rb->lcd_setfont(FONT_SYSFIXED);
/* Turn off backlight timeout */ /* Turn off backlight timeout */
backlight_force_on(); /* backlight control in lib/helper.c */ backlight_force_on(rb); /* backlight control in lib/helper.c */
iohiscore(); iohiscore();
retval = start_game(); retval = start_game();
iohiscore(); iohiscore();
rb->lcd_setfont(FONT_UI); rb->lcd_setfont(FONT_UI);
/* Turn on backlight timeout (revert to settings) */ /* Turn on backlight timeout (revert to settings) */
backlight_use_settings(); /* backlight control in lib/helper.c */ backlight_use_settings(rb); /* backlight control in lib/helper.c */
return retval; return retval;
} }

4
apps/plugins/starfield.c
View file

@ -366,7 +366,7 @@ int plugin_main(void)
case(STARFIELD_QUIT): case(STARFIELD_QUIT):
case(SYS_USB_CONNECTED): case(SYS_USB_CONNECTED):
/* Turn on backlight timeout (revert to settings) */ /* Turn on backlight timeout (revert to settings) */
backlight_use_settings(); /* backlight control in lib/helper.c*/ backlight_use_settings(rb); /* backlight control in lib/helper.c*/
return PLUGIN_OK; return PLUGIN_OK;
break; break;
} }
@ -382,7 +382,7 @@ 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;
/* Turn off backlight timeout */ /* Turn off backlight timeout */
backlight_force_on(); /* backlight control in lib/helper.c */ backlight_force_on(rb); /* backlight control in lib/helper.c */
ret = plugin_main(); ret = plugin_main();

4
apps/plugins/test_disk.c
View file

@ -439,7 +439,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
rb->srand(*rb->current_tick); rb->srand(*rb->current_tick);
/* Turn off backlight timeout */ /* Turn off backlight timeout */
backlight_force_on(); /* backlight control in lib/helper.c */ backlight_force_on(rb); /* backlight control in lib/helper.c */
m = menu_init(rb, items, sizeof(items) / sizeof(*items), NULL, m = menu_init(rb, items, sizeof(items) / sizeof(*items), NULL,
NULL, NULL, NULL); NULL, NULL, NULL);
@ -447,7 +447,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
menu_exit(m); menu_exit(m);
/* Turn on backlight timeout (revert to settings) */ /* Turn on backlight timeout (revert to settings) */
backlight_use_settings(); /* backlight control in lib/helper.c */ backlight_use_settings(rb); /* backlight control in lib/helper.c */
rb->rmdir(testbasedir); rb->rmdir(testbasedir);

4
apps/plugins/video.c
View file

@ -561,7 +561,7 @@ void Cleanup(void *fd)
rb->mp3_play_stop(); /* stop audio ISR */ rb->mp3_play_stop(); /* stop audio ISR */
/* Turn on backlight timeout (revert to settings) */ /* Turn on backlight timeout (revert to settings) */
backlight_use_settings(); /* backlight control in lib/helper.c */ backlight_use_settings(rb); /* backlight control in lib/helper.c */
/* restore normal contrast */ /* restore normal contrast */
rb->lcd_set_contrast(rb->global_settings->contrast); rb->lcd_set_contrast(rb->global_settings->contrast);
@ -926,7 +926,7 @@ int main(char* filename)
{ {
gPlay.bHasVideo = true; gPlay.bHasVideo = true;
/* Turn off backlight timeout */ /* Turn off backlight timeout */
backlight_force_on(); /* backlight control in lib/helper.c */ backlight_force_on(rb); /* backlight control in lib/helper.c */
} }
/* prepare audio playback, if contained */ /* prepare audio playback, if contained */

4
apps/plugins/wormlet.c
View file

@ -2334,7 +2334,7 @@ bool launch_wormlet(void)
rb->lcd_clear_display(); rb->lcd_clear_display();
/* Turn off backlight timeout */ /* Turn off backlight timeout */
backlight_force_on(); /* backlight control in lib/helper.c */ backlight_force_on(rb); /* backlight control in lib/helper.c */
/* start the game */ /* start the game */
while (game_result == 1) while (game_result == 1)
@ -2344,7 +2344,7 @@ bool launch_wormlet(void)
{ {
case 2: case 2:
/* Turn on backlight timeout (revert to settings) */ /* Turn on backlight timeout (revert to settings) */
backlight_use_settings(); /* backlight control in lib/helper.c */ backlight_use_settings(rb); /* backlight control in lib/helper.c */
return false; return false;
break; break;
} }

4
apps/plugins/xobox.c
View file

@ -934,7 +934,7 @@ enum plugin_status plugin_start (struct plugin_api *api, void *parameter)
#endif #endif
/* Turn off backlight timeout */ /* Turn off backlight timeout */
backlight_force_on(); /* backlight control in lib/helper.c */ backlight_force_on(rb); /* backlight control in lib/helper.c */
quit = false; quit = false;
@ -945,7 +945,7 @@ enum plugin_status plugin_start (struct plugin_api *api, void *parameter)
} }
/* Turn on backlight timeout (revert to settings) */ /* Turn on backlight timeout (revert to settings) */
backlight_use_settings(); /* backlight control in lib/helper.c */ backlight_use_settings(rb); /* backlight control in lib/helper.c */
rb->lcd_setfont (FONT_UI); rb->lcd_setfont (FONT_UI);
return ret; return ret;