From 23d9812273d9c74af72ccdc3aa4cfea971f220a4 Mon Sep 17 00:00:00 2001 From: Andrew Mahone Date: Fri, 16 Jan 2009 10:34:40 +0000 Subject: 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 --- apps/plugins/test_fps.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'apps/plugins/test_fps.c') diff --git a/apps/plugins/test_fps.c b/apps/plugins/test_fps.c index 6d34773..c688a54 100644 --- a/apps/plugins/test_fps.c +++ b/apps/plugins/test_fps.c @@ -41,8 +41,6 @@ PLUGIN_IRAM_DECLARE PLUGIN_HEADER -static const struct plugin_api* rb; - /* Screen logging */ static int line; static int max_line; @@ -286,7 +284,7 @@ static void time_greyscale(void) int fps, load; gbuf = (unsigned char *) rb->plugin_get_buffer(&gbuf_size); - if (!grey_init(rb, gbuf, gbuf_size, GREY_ON_COP, + if (!grey_init(gbuf, gbuf_size, GREY_ON_COP, LCD_WIDTH, LCD_HEIGHT, NULL)) { log_text("greylib: out of memory."); @@ -334,7 +332,7 @@ static void time_greyscale(void) #endif /* plugin entry point */ -enum plugin_status plugin_start(const struct plugin_api* api, const void* parameter) +enum plugin_status plugin_start(const void* parameter) { #ifndef SIMULATOR char str[32]; @@ -342,15 +340,14 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame #endif /* standard stuff */ - PLUGIN_IRAM_INIT(api) + PLUGIN_IRAM_INIT(rb) (void)parameter; - rb = api; log_init(); #ifndef SIMULATOR cpu_freq = *rb->cpu_frequency; /* remember CPU frequency */ #endif - backlight_force_on(rb); /* backlight control in lib/helper.c */ + backlight_force_on(); /* backlight control in lib/helper.c */ log_text("Main LCD Update"); time_main_update(); @@ -375,7 +372,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame (cpu_freq + 500000) / 1000000); log_text(str); #endif - backlight_use_settings(rb); /* backlight control in lib/helper.c */ + backlight_use_settings(); /* backlight control in lib/helper.c */ /* wait until user closes plugin */ while (rb->button_get(true) != FPS_QUIT); -- cgit v1.1