loader-initialized global plugin API:

struct plugin_api *rb is declared in PLUGIN_HEADER, and pointed to by
__header.api

the loader uses this pointer to initialize rb before calling entry_point

entry_point is no longer passed a pointer to the plugin API

all plugins, and pluginlib functions, are modified to refer to the
global rb

pluginlib functions which only served to copy the API pointer are
removed

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19776 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 3 insertions, 8 deletions

diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c
index 0d50c67e73..718cb032cc 100644
--- a/apps/plugins/invadrox.c
+++ b/apps/plugins/invadrox.c
@@ -611,8 +611,6 @@ unsigned char fire_sprite[FIRE_HEIGHT] = {
 #define CYCLETIME 40
 
 
-static const struct plugin_api* rb;
-
 /* Physical x is at PLAYFIELD_X + LIVES_X + x * ALIEN_SPEED
  * Physical y is at y * ALIEN_HEIGHT
  */
@@ -1600,7 +1598,6 @@ void init_invadrox(void)
     rb->lcd_set_background(LCD_BLACK);
     rb->lcd_set_foreground(LCD_BLACK);
 
-    highscore_init(rb);
     if (highscore_load(HISCOREFILE, &hiscore, 1) < 0) {
         /* Init hiscore to 0 */
         rb->strncpy(hiscore.name, "Invader", sizeof(hiscore.name));
@@ -1801,13 +1798,11 @@ void game_loop(void)
 
 
 /* this is the plugin entry point */
-enum plugin_status plugin_start(const struct plugin_api* api, UNUSED const void* parameter)
+enum plugin_status plugin_start(UNUSED const void* parameter)
 {
-    rb = api;
-
     rb->lcd_setfont(FONT_SYSFIXED);
     /* Turn off backlight timeout */
-    backlight_force_on(rb); /* backlight control in lib/helper.c */
+    backlight_force_on(); /* backlight control in lib/helper.c */
 
     /* now go ahead and have fun! */
     game_loop();
@@ -1825,7 +1820,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, UNUSED const void*
     /* Restore user's original backlight setting */
     rb->lcd_setfont(FONT_UI);
     /* Turn on backlight timeout (revert to settings) */
-    backlight_use_settings(rb); /* backlight control in lib/helper.c */
+    backlight_use_settings(); /* backlight control in lib/helper.c */
 
     return PLUGIN_OK;
 }