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/solitaire.c | |
| parent | 35677cbc54bbe400ebbff59b489dda7ca7f04916 (diff) | |
| download | rockbox-23d9812273d9c74af72ccdc3aa4cfea971f220a4.zip rockbox-23d9812273d9c74af72ccdc3aa4cfea971f220a4.tar.gz rockbox-23d9812273d9c74af72ccdc3aa4cfea971f220a4.tar.bz2 rockbox-23d9812273d9c74af72ccdc3aa4cfea971f220a4.tar.xz | |
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/solitaire.c')
| -rw-r--r-- | apps/plugins/solitaire.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 0a9bf99..2f5f2dc 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c @@ -30,7 +30,6 @@ PLUGIN_HEADER -static const struct plugin_api* rb; #define min(a,b) (a<b?a:b) /** @@ -795,7 +794,7 @@ int solitaire_menu(bool in_game) items[i++].desc = "Quit"; create_draw_option_string(); - m = menu_init(rb, items, i, NULL, NULL, NULL, NULL); + m = menu_init(items, i, NULL, NULL, NULL, NULL); while (result < 0) { switch (menu_show(m)) @@ -831,7 +830,7 @@ int solitaire_menu(bool in_game) break; case 3: - playback_control(rb, NULL); + playback_control(NULL); break; case 4: @@ -1904,17 +1903,15 @@ int solitaire( int skipmenu ) * 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 result; /* plugin init */ (void)parameter; - rb = api; rb->splash( HZ, "Welcome to Solitaire!" ); - configfile_init(rb); configfile_load(CONFIG_FILENAME, config, sizeof(config) / sizeof(config[0]), CFGFILE_VERSION); rb->memcpy(&sol, &sol_disk, sizeof(sol)); /* copy to running config */ |