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/sudoku/sudoku.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/sudoku/sudoku.c')
-rw-r--r-- | apps/plugins/sudoku/sudoku.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/apps/plugins/sudoku/sudoku.c b/apps/plugins/sudoku/sudoku.c index de90de360c..88fd0bd8ec 100644 --- a/apps/plugins/sudoku/sudoku.c +++ b/apps/plugins/sudoku/sudoku.c @@ -78,12 +78,6 @@ Example ".ss" file, and one with a saved state: PLUGIN_HEADER -/* here is a global api struct pointer. while not strictly necessary, - it's nice not to have to pass the api pointer in all function calls - in the plugin */ - -const struct plugin_api* rb; - /* Default game - used to initialise sudoku.ss if it doesn't exist. */ static const char default_game[9][9] = { @@ -1191,14 +1185,14 @@ bool sudoku_menu(struct sudoku_state_t* state) [SM_QUIT] = { "Quit", NULL }, }; - m = menu_init(rb,items, sizeof(items) / sizeof(*items), + m = menu_init(items, sizeof(items) / sizeof(*items), NULL, NULL, NULL, NULL); result=menu_show(m); switch (result) { case SM_AUDIO_PLAYBACK: - playback_control(rb, NULL); + playback_control(NULL); break; #ifdef HAVE_LCD_COLOR @@ -1263,7 +1257,7 @@ int sudoku_edit_menu(struct sudoku_state_t* state) { "Quit", NULL }, }; - m = menu_init(rb,items, sizeof(items) / sizeof(*items), + m = menu_init(items, sizeof(items) / sizeof(*items), NULL, NULL, NULL, NULL); result=menu_show(m); @@ -1314,7 +1308,7 @@ void move_cursor(struct sudoku_state_t* state, int newx, int newy) } /* plugin entry point */ -enum plugin_status plugin_start(const struct plugin_api* api, const void* parameter) +enum plugin_status plugin_start(const void* parameter) { bool exit; int button; @@ -1323,13 +1317,8 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame int rc = PLUGIN_OK; long ticks; struct sudoku_state_t state; - - /* plugin init */ - rb = api; - /* end of plugin init */ #if defined(HAVE_LCD_COLOR) || defined(SUDOKU_BUTTON_POSSIBLE) - configfile_init(rb); configfile_load(cfg_filename, disk_config, sizeof(disk_config) / sizeof(disk_config[0]), CFGFILE_MINVERSION); |