Revert "Introduce plugin_crt0.c that every plugin links."

Too much errors and no time to fix them now.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27863 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 7 insertions, 5 deletions

diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c
index e9c21ff119..4195d96d5f 100644
--- a/apps/plugins/oscilloscope.c
+++ b/apps/plugins/oscilloscope.c
@@ -23,13 +23,12 @@
 
 #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
@@ -752,8 +751,9 @@ void anim_vertical(int cur_left, int cur_right)
     last_pos = cur_y;
 }
 
-void cleanup(void)
+void cleanup(void *parameter)
 {
+    (void)parameter;
 #if LCD_DEPTH > 1
     rb->lcd_set_foreground(LCD_DEFAULT_FG);
     rb->lcd_set_background(LCD_DEFAULT_BG);
@@ -772,7 +772,6 @@ 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);
@@ -893,7 +892,9 @@ enum plugin_status plugin_start(const void* parameter)
                 break;
 
             default:
-                exit_on_usb(button);
+                if (rb->default_event_handler_ex(button, cleanup, NULL)
+                    == SYS_USB_CONNECTED)
+                    return PLUGIN_USB_CONNECTED;
                 break;
         }
         if (button != BUTTON_NONE)
@@ -907,6 +908,7 @@ 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));