From abdc5935beb7dc3fa63bffeec584921ad2a4c8bd Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Mon, 23 Aug 2010 16:56:49 +0000 Subject: Introduce plugin_crt0.c that every plugin links. It handles exit() properly, calling the handler also when the plugin returns normally (also it makes exit() more standard compliant while at it). It also holds PLUGIN_HEADER, so that it doesn't need to be in each plugin anymore. To work better together with callbacks passed to rb->default_event_handler_ex introduce exit_on_usb() which will call the exit handler before showing the usb screen and exit() after it. In most cases it was passed a callback which was manually called at all other return points. This can now be done via atexit(). In future plugin_crt0.c could also handle clearing bss, initializing iram and more. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27862 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/fractals/fractal.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'apps/plugins/fractals') diff --git a/apps/plugins/fractals/fractal.c b/apps/plugins/fractals/fractal.c index 971ae506ca..179bc3e562 100644 --- a/apps/plugins/fractals/fractal.c +++ b/apps/plugins/fractals/fractal.c @@ -29,6 +29,7 @@ #include "fractal_rect.h" #include "fractal_sets.h" #include "mandelbrot_set.h" +#include "lib/pluginlib_exit.h" #ifdef USEGSLIB GREY_INFO_STRUCT @@ -41,7 +42,7 @@ static size_t gbuf_size = 0; #define REDRAW_FULL 2 #define REDRAW_FULL_OVERLAY 3 -PLUGIN_HEADER + /* returns 1 if a button has been pressed, 0 otherwise */ static int button_yield(void *ctx) @@ -85,9 +86,8 @@ static int button_yield(void *ctx) } } -static void cleanup(void *parameter) +static void cleanup(void) { - (void)parameter; #ifdef USEGSLIB grey_release(); #endif @@ -109,11 +109,13 @@ enum plugin_status plugin_start(const void* parameter) if (!grey_init(gbuf, gbuf_size, GREY_ON_COP, LCD_WIDTH, LCD_HEIGHT, NULL)) { rb->splash(HZ, "Couldn't init greyscale display"); - return 0; + return PLUGIN_ERROR; } grey_show(true); /* switch on greyscale overlay */ #endif + /* release greylib on exit */ + atexit(cleanup); #if LCD_DEPTH > 1 rb->lcd_set_backdrop(NULL); #endif @@ -161,9 +163,6 @@ enum plugin_status plugin_start(const void* parameter) case FRACTAL_RC_QUIT: #endif case FRACTAL_QUIT: -#ifdef USEGSLIB - grey_release(); -#endif return PLUGIN_OK; case FRACTAL_ZOOM_OUT: @@ -246,18 +245,13 @@ enum plugin_status plugin_start(const void* parameter) break; default: - if (rb->default_event_handler_ex(button, cleanup, NULL) - == SYS_USB_CONNECTED) - return PLUGIN_USB_CONNECTED; + exit_on_usb(button); break; } if (button != BUTTON_NONE) lastbutton = button; } -#ifdef USEGSLIB - grey_release(); -#endif return PLUGIN_OK; } -- cgit v1.2.3