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/greyscale.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'apps/plugins/greyscale.c') diff --git a/apps/plugins/greyscale.c b/apps/plugins/greyscale.c index 73dd98b..3325443 100644 --- a/apps/plugins/greyscale.c +++ b/apps/plugins/greyscale.c @@ -27,7 +27,7 @@ #if defined(HAVE_LCD_BITMAP) && (LCD_DEPTH < 4) #include "lib/grey.h" -PLUGIN_HEADER + /* variable button definitions */ #if CONFIG_KEYPAD == RECORDER_PAD @@ -316,9 +316,7 @@ int main(void) button = rb->button_get(true); - if (rb->default_event_handler_ex(button, cleanup, NULL) - == SYS_USB_CONNECTED) - return PLUGIN_USB_CONNECTED; + exit_on_usb(button); if (button & GREYSCALE_SHIFT) { @@ -369,8 +367,6 @@ int main(void) case GREYSCALE_RC_OFF: #endif case GREYSCALE_OFF: - - cleanup(NULL); return PLUGIN_OK; } } @@ -382,6 +378,7 @@ enum plugin_status plugin_start(const void* parameter) { (void)parameter; + atexit(cleanup); return main(); } -- cgit v1.1