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/text_viewer/text_viewer.c | 13 ++++++------- apps/plugins/text_viewer/tv_action.c | 4 +--- apps/plugins/text_viewer/tv_action.h | 5 +---- 3 files changed, 8 insertions(+), 14 deletions(-) (limited to 'apps/plugins/text_viewer') diff --git a/apps/plugins/text_viewer/text_viewer.c b/apps/plugins/text_viewer/text_viewer.c index eae85213ac..5d06d4b477 100644 --- a/apps/plugins/text_viewer/text_viewer.c +++ b/apps/plugins/text_viewer/text_viewer.c @@ -21,11 +21,12 @@ * ****************************************************************************/ #include "plugin.h" +#include "lib/pluginlib_exit.h" #include "tv_action.h" #include "tv_button.h" #include "tv_preferences.h" -PLUGIN_HEADER + enum plugin_status plugin_start(const void* file) { @@ -56,6 +57,7 @@ enum plugin_status plugin_start(const void* file) return PLUGIN_ERROR; } + atexit(tv_exit); while (!done) { #ifdef HAVE_LCD_BITMAP if (rb->global_settings->statusbar != STATUSBAR_OFF && preferences->statusbar) @@ -79,12 +81,12 @@ enum plugin_status plugin_start(const void* file) if (res != TV_MENU_RESULT_EXIT_MENU) { - tv_exit(NULL); - done = true; if (res == TV_MENU_RESULT_ATTACHED_USB) return PLUGIN_USB_CONNECTED; else if (res == TV_MENU_RESULT_ERROR) return PLUGIN_ERROR; + else + done = true; } } break; @@ -195,7 +197,6 @@ enum plugin_status plugin_start(const void* file) #ifdef TV_QUIT2 case TV_QUIT2: #endif - tv_exit(NULL); done = true; break; @@ -204,9 +205,7 @@ enum plugin_status plugin_start(const void* file) break; default: - if (rb->default_event_handler_ex(button, tv_exit, NULL) - == SYS_USB_CONNECTED) - return PLUGIN_USB_CONNECTED; + exit_on_usb(button); display_update = false; break; } diff --git a/apps/plugins/text_viewer/tv_action.c b/apps/plugins/text_viewer/tv_action.c index c95ece0649..1e5473b438 100644 --- a/apps/plugins/text_viewer/tv_action.c +++ b/apps/plugins/text_viewer/tv_action.c @@ -47,10 +47,8 @@ static void tv_finalize_action(void) tv_finalize_window(); } -void tv_exit(void *parameter) +void tv_exit(void) { - (void)parameter; - /* save preference and bookmarks */ if (!tv_save_settings()) rb->splash(HZ, "Can't save preferences and bookmarks"); diff --git a/apps/plugins/text_viewer/tv_action.h b/apps/plugins/text_viewer/tv_action.h index fba008dbe9..5b3571db30 100644 --- a/apps/plugins/text_viewer/tv_action.h +++ b/apps/plugins/text_viewer/tv_action.h @@ -58,11 +58,8 @@ bool tv_init_action(unsigned char **buf, size_t *bufsize); /* * finalize modules - * - * [In] parameter - * this argument does not use */ -void tv_exit(void *parameter); +void tv_exit(void); /* * load the file -- cgit v1.2.3