From abdc5935beb7dc3fa63bffeec584921ad2a4c8bd Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Mon, 23 Aug 2010 16:56:49 +0000 Subject: Introduce plugin_crt0.c that every plugin links. It handles exit() properly, calling the handler also when the plugin returns normally (also it makes 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 it 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@27862 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/oscilloscope.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'apps/plugins/oscilloscope.c') diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index 4195d96..e9c21ff 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c @@ -23,12 +23,13 @@ #include "plugin.h" #include "lib/helper.h" +#include "lib/pluginlib_exit.h" #ifdef HAVE_LCD_BITMAP #include "lib/xlcd.h" #include "lib/configfile.h" -PLUGIN_HEADER + /* variable button definitions */ #if CONFIG_KEYPAD == RECORDER_PAD @@ -751,9 +752,8 @@ void anim_vertical(int cur_left, int cur_right) last_pos = cur_y; } -void cleanup(void *parameter) +void cleanup(void) { - (void)parameter; #if LCD_DEPTH > 1 rb->lcd_set_foreground(LCD_DEFAULT_FG); rb->lcd_set_background(LCD_DEFAULT_BG); @@ -772,6 +772,7 @@ enum plugin_status plugin_start(const void* parameter) (void)parameter; + atexit(cleanup); configfile_load(cfg_filename, disk_config, sizeof(disk_config) / sizeof(disk_config[0]), CFGFILE_MINVERSION); @@ -892,9 +893,7 @@ enum plugin_status plugin_start(const void* parameter) break; default: - if (rb->default_event_handler_ex(button, cleanup, NULL) - == SYS_USB_CONNECTED) - return PLUGIN_USB_CONNECTED; + exit_on_usb(button); break; } if (button != BUTTON_NONE) @@ -908,7 +907,6 @@ enum plugin_status plugin_start(const void* parameter) displaymsg = true; } } - cleanup(NULL); if (rb->memcmp(&osc, &osc_disk, sizeof(osc))) /* save settings if changed */ { rb->memcpy(&osc_disk, &osc, sizeof(osc)); -- cgit v1.1