From cae4ae2c71ae10ff67d39a78a705136e740dc07e Mon Sep 17 00:00:00 2001
From: Thomas Martitz <kugel@rockbox.org>
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/cube.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

(limited to 'apps/plugins/cube.c')

diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c
index 2b1e00d690..7dec822d56 100644
--- a/apps/plugins/cube.c
+++ b/apps/plugins/cube.c
@@ -22,6 +22,7 @@
 ***************************************************************************/
 #include "plugin.h"
 #include "lib/playergfx.h"
+#include "lib/pluginlib_exit.h"
 #if LCD_DEPTH > 1
 #include "lib/mylcd.h" /* MYLCD_CFG_RB_XLCD or MYLCD_CFG_PGFX */
 #include "lib/grey.h"
@@ -32,8 +33,6 @@
 #include "lib/xlcd.h"
 #include "lib/fixedpoint.h"
 
-PLUGIN_HEADER
-
 /* Loops that the values are displayed */
 #define DISP_TIME 30
 
@@ -611,10 +610,8 @@ static void cube_draw(void)
     }
 }
 
-void cleanup(void *parameter)
+void cleanup(void)
 {
-    (void)parameter;
-
 #ifdef USEGSLIB
     grey_release();
 #elif defined HAVE_LCD_CHARCELLS
@@ -638,7 +635,7 @@ enum plugin_status plugin_start(const void* parameter)
     bool highspeed = false;
     bool paused = false;
     bool redraw = true;
-    bool exit = false;
+    bool quit = false;
 
     (void)(parameter);
 
@@ -651,6 +648,7 @@ enum plugin_status plugin_start(const void* parameter)
         rb->splash(HZ, "Couldn't init greyscale display");
         return PLUGIN_ERROR;
     }
+
     /* init lcd_ function pointers */
     lcdfuncs.update =        rb->lcd_update;
     lcdfuncs.clear_display = rb->lcd_clear_display;
@@ -673,7 +671,8 @@ enum plugin_status plugin_start(const void* parameter)
     pgfx_display(0, 0);
 #endif
 
-    while(!exit)
+    atexit(cleanup);
+    while(!quit)
     {
         if (redraw)
         {
@@ -830,24 +829,17 @@ enum plugin_status plugin_start(const void* parameter)
             case CUBE_RC_QUIT:
 #endif
             case CUBE_QUIT:
-                exit = true;
+                exit(EXIT_SUCCESS);
                 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)
             lastbutton = button;
     }
 
-#ifdef USEGSLIB
-    grey_release();
-#elif defined(HAVE_LCD_CHARCELLS)
-    pgfx_release();
-#endif
     return PLUGIN_OK;
 }
 
-- 
cgit v1.2.3