From cae4ae2c71ae10ff67d39a78a705136e740dc07e Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Tue, 24 Aug 2010 14:30:46 +0000 Subject: Second try: Introduce plugin_crt0.c that every plugin links. It handles exit() properly, calling the handler also when the plugin returns normally (also make 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 rb->default_event_handler_ex() 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@27873 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/jackpot.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'apps/plugins/jackpot.c') diff --git a/apps/plugins/jackpot.c b/apps/plugins/jackpot.c index 56c2910b70..abf1cf8fb2 100644 --- a/apps/plugins/jackpot.c +++ b/apps/plugins/jackpot.c @@ -22,8 +22,9 @@ #include "plugin.h" #include "lib/pluginlib_actions.h" #include "lib/picture.h" +#include "lib/pluginlib_exit.h" + -PLUGIN_HEADER const struct button_mapping* plugin_contexts[]={pla_main_ctx}; #define NB_PICTURES 9 @@ -109,9 +110,8 @@ void patterns_deinit(struct screen* display) #endif /* HAVE_LCD_CHARCELLS */ /*Call when the program exit*/ -void jackpot_exit(void *parameter) +void jackpot_exit(void) { - (void)parameter; #ifdef HAVE_LCD_CHARCELLS patterns_deinit(rb->screens[SCREEN_MAIN]); #endif /* HAVE_LCD_CHARCELLS */ @@ -298,6 +298,7 @@ enum plugin_status plugin_start(const void* parameter) int action, i; struct jackpot game; (void)parameter; + atexit(jackpot_exit); rb->srand(*rb->current_tick); #ifdef HAVE_LCD_CHARCELLS patterns_init(rb->screens[SCREEN_MAIN]); @@ -323,12 +324,9 @@ enum plugin_status plugin_start(const void* parameter) break; default: - if (rb->default_event_handler_ex(action, jackpot_exit, NULL) - == SYS_USB_CONNECTED) - return PLUGIN_USB_CONNECTED; + exit_on_usb(action); break; } } - jackpot_exit(NULL); return PLUGIN_OK; } -- cgit v1.2.3