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/nim.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'apps/plugins/nim.c') diff --git a/apps/plugins/nim.c b/apps/plugins/nim.c index 460e2751e9..3301277410 100644 --- a/apps/plugins/nim.c +++ b/apps/plugins/nim.c @@ -48,7 +48,7 @@ V1.2 : 2003-07-30 take a match. Later you are obliged to take at least one.) */ -PLUGIN_HEADER + /*Pattern for the game*/ static unsigned char smile[]={0x00, 0x11, 0x04, 0x04, 0x00, 0x11, 0x0E}; /* :-) */ @@ -144,6 +144,7 @@ enum plugin_status plugin_start(const void* parameter) int x,v,min; bool ok; bool go; + atexit(nim_exit); /* if you don't use the parameter, you can do like this to avoid the compiler warning about it */ @@ -193,7 +194,6 @@ enum plugin_status plugin_start(const void* parameter) { case BUTTON_STOP|BUTTON_REL: go = true; - nim_exit(NULL); return PLUGIN_OK; break; @@ -214,9 +214,7 @@ enum plugin_status plugin_start(const void* parameter) break; default: - if (rb->default_event_handler_ex(button, nim_exit, - NULL) == SYS_USB_CONNECTED) - return PLUGIN_USB_CONNECTED; + exit_on_usb(button); break; } display_first_line(x); @@ -291,7 +289,6 @@ enum plugin_status plugin_start(const void* parameter) min=1; } } - nim_exit(NULL); return PLUGIN_OK; } #endif -- cgit v1.2.3