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/euroconverter.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'apps/plugins/euroconverter.c') diff --git a/apps/plugins/euroconverter.c b/apps/plugins/euroconverter.c index f85ee798c4..24cebe69d1 100644 --- a/apps/plugins/euroconverter.c +++ b/apps/plugins/euroconverter.c @@ -45,7 +45,7 @@ To do: - The Irish currency needs 6 digits after the . to have sufficient precision on big number */ -PLUGIN_HEADER + /* Name and path of the config file*/ static const char cfg_filename[] = "euroconverter.cfg"; @@ -387,10 +387,8 @@ static int euro_menu(void) /* Call when the program end */ -static void euro_exit(void *parameter) +static void euro_exit(void) { - (void)parameter; - //Restore the old pattern (i don't find another way to do this. An idea?) rb->lcd_unlock_pattern(heuro); rb->lcd_unlock_pattern(hhome); @@ -411,6 +409,7 @@ enum plugin_status plugin_start(const void* parameter) /* if you don't use the parameter, you can do like this to avoid the compiler warning about it */ (void)parameter; + atexit(euro_exit); /*Get the pattern handle*/ heuro=rb->lcd_get_locked_pattern(); @@ -587,9 +586,7 @@ enum plugin_status plugin_start(const void* parameter) break; default: - if (rb->default_event_handler_ex(button, euro_exit, NULL) - == SYS_USB_CONNECTED) - return PLUGIN_USB_CONNECTED; + exit_on_usb(button); break; } /*Display*/ @@ -599,7 +596,6 @@ enum plugin_status plugin_start(const void* parameter) e=mydiv(h,currency[country]); display(e,h,pos); } - euro_exit(NULL); return PLUGIN_OK; } -- cgit v1.2.3