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/demystify.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'apps/plugins/demystify.c') diff --git a/apps/plugins/demystify.c b/apps/plugins/demystify.c index 468f180..6a8f1eb 100644 --- a/apps/plugins/demystify.c +++ b/apps/plugins/demystify.c @@ -22,11 +22,12 @@ ****************************************************************************/ #include "plugin.h" +#include "lib/pluginlib_exit.h" #ifdef HAVE_LCD_BITMAP #include "lib/pluginlib_actions.h" #include "lib/helper.h" -PLUGIN_HEADER + #define DEFAULT_WAIT_TIME 3 #define DEFAULT_NB_POLYGONS 7 @@ -259,10 +260,8 @@ void polygons_draw(struct polygon_fifo * polygons, struct screen * display) } } -void cleanup(void *parameter) +void cleanup(void) { - (void)parameter; - backlight_use_settings(); #ifdef HAVE_REMOTE_LCD remote_backlight_use_settings(); @@ -394,7 +393,6 @@ int plugin_main(void) switch(action) { case DEMYSTIFY_QUIT: - cleanup(NULL); return PLUGIN_OK; case DEMYSTIFY_ADD_POLYGON: @@ -421,9 +419,7 @@ int plugin_main(void) break; default: - if (rb->default_event_handler_ex(action, cleanup, NULL) - == SYS_USB_CONNECTED) - return PLUGIN_USB_CONNECTED; + exit_on_usb(action); break; } } @@ -436,6 +432,8 @@ enum plugin_status plugin_start(const void* parameter) int ret; (void)parameter; + atexit(cleanup); + #if LCD_DEPTH > 1 rb->lcd_set_backdrop(NULL); #endif -- cgit v1.1