diff options
author | Andrew Mahone <andrew.mahone@gmail.com> | 2009-01-16 10:34:40 +0000 |
---|---|---|
committer | Andrew Mahone <andrew.mahone@gmail.com> | 2009-01-16 10:34:40 +0000 |
commit | 23d9812273d9c74af72ccdc3aa4cfea971f220a4 (patch) | |
tree | 8e60c3a2a41879f8b2a52516fa416b3ab906e239 /apps/plugins/maze.c | |
parent | 35677cbc54bbe400ebbff59b489dda7ca7f04916 (diff) | |
download | rockbox-23d9812273d9c74af72ccdc3aa4cfea971f220a4.tar.gz rockbox-23d9812273d9c74af72ccdc3aa4cfea971f220a4.zip |
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
Diffstat (limited to 'apps/plugins/maze.c')
-rw-r--r-- | apps/plugins/maze.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/apps/plugins/maze.c b/apps/plugins/maze.c index 67c0623dec..881d804400 100644 --- a/apps/plugins/maze.c +++ b/apps/plugins/maze.c @@ -85,9 +85,6 @@ static const struct button_mapping *plugin_contexts[] #define BORDER_S(y) ((y) == MAZE_HEIGHT-1) #define BORDER_W(x) ((x) == 0) -/* the API */ -static const struct plugin_api* rb; - // we can and should change this to make square boxes #if ( LCD_WIDTH == 112 ) #define MAZE_WIDTH 16 @@ -493,17 +490,16 @@ static void maze_move_player_left(struct maze* maze) /**********************************/ /* this is the plugin entry point */ /**********************************/ -enum plugin_status plugin_start(const struct plugin_api* api, const void* parameter) +enum plugin_status plugin_start(const void* parameter) { int button, lastbutton = BUTTON_NONE; int quit = 0; int i; struct maze maze; (void)parameter; - rb = api; /* Turn off backlight timeout */ - backlight_force_on(rb); /* backlight control in lib/helper.c */ + backlight_force_on(); /* backlight control in lib/helper.c */ /* Seed the RNG */ rb->srand(*rb->current_tick); @@ -531,7 +527,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame while(!quit) { #ifdef __PLUGINLIB_ACTIONS_H__ - button = pluginlib_getaction(rb, TIMEOUT_BLOCK, plugin_contexts, 2); + button = pluginlib_getaction(TIMEOUT_BLOCK, plugin_contexts, 2); #else button = rb->button_get(true); #endif @@ -591,6 +587,6 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame } /* 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 ((quit == 1) ? PLUGIN_OK : PLUGIN_USB_CONNECTED); } |