From abdc5935beb7dc3fa63bffeec584921ad2a4c8bd Mon Sep 17 00:00:00 2001
From: Thomas Martitz <kugel@rockbox.org>
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/pictureflow/pictureflow.c | 41 +++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 21 deletions(-)

(limited to 'apps/plugins/pictureflow')

diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c
index 546afad217..8ad62b0238 100644
--- a/apps/plugins/pictureflow/pictureflow.c
+++ b/apps/plugins/pictureflow/pictureflow.c
@@ -27,6 +27,7 @@
 #include <albumart.h>
 #include "lib/read_image.h"
 #include "lib/pluginlib_actions.h"
+#include "lib/pluginlib_exit.h"
 #include "lib/helper.h"
 #include "lib/configfile.h"
 #include "lib/grey.h"
@@ -34,7 +35,7 @@
 #include "lib/feature_wrappers.h"
 #include "lib/buflib.h"
 
-PLUGIN_HEADER
+
 
 /******************************* Globals ***********************************/
 
@@ -2068,9 +2069,8 @@ void update_scroll_animation(void)
 /**
   Cleanup the plugin
 */
-void cleanup(void *parameter)
+void cleanup(void)
 {
-    (void) parameter;
     int i;
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ
     rb->cpu_boost(false);
@@ -2610,19 +2610,6 @@ int main(void)
     cache_version = CACHE_VERSION;
     configfile_save(CONFIG_FILE, config, CONFIG_NUM_ITEMS, CONFIG_VERSION);
 
-
-#ifdef USEGSLIB
-    long grey_buf_used;
-    if (!grey_init(buf, buf_size, GREY_BUFFERED|GREY_ON_COP,
-                   LCD_WIDTH, LCD_HEIGHT, &grey_buf_used))
-    {
-        error_wait("Greylib init failed!");
-        return PLUGIN_ERROR;
-    }
-    grey_setfont(FONT_UI);
-    buf_size -= grey_buf_used;
-    buf = (void*)(grey_buf_used + (char*)buf);
-#endif
     buflib_init(&buf_ctx, (void *)buf, buf_size);
 
     if (!(empty_slide_hid = read_pfraw(EMPTY_SLIDE, 0)))
@@ -2841,9 +2828,7 @@ int main(void)
             }
             break;
         default:
-            if (rb->default_event_handler_ex(button, cleanup, NULL)
-                == SYS_USB_CONNECTED)
-                return PLUGIN_USB_CONNECTED;
+            exit_on_usb(button);
             break;
         }
     }
@@ -2855,6 +2840,7 @@ enum plugin_status plugin_start(const void *parameter)
 {
     int ret, i;
     (void) parameter;
+    atexit(cleanup);
 
     FOR_NB_SCREENS(i)
         rb->viewportmanager_theme_enable(i, false, NULL);
@@ -2873,6 +2859,21 @@ enum plugin_status plugin_start(const void *parameter)
     }
 #endif
 #endif
+
+#ifdef USEGSLIB
+    long grey_buf_used;
+    if (!grey_init(buf, buf_size, GREY_BUFFERED|GREY_ON_COP,
+                   LCD_WIDTH, LCD_HEIGHT, &grey_buf_used))
+    {
+        error_wait("Greylib init failed!");
+        return PLUGIN_ERROR;
+    }
+    grey_setfont(FONT_UI);
+    buf_size -= grey_buf_used;
+    buf = (void*)(grey_buf_used + (char*)buf);
+#endif
+
+    atexit(cleanup);
     ret = main();
     if ( ret == PLUGIN_OK || ret == PLUGIN_GOTO_WPS) {
         if (configfile_save(CONFIG_FILE, config, CONFIG_NUM_ITEMS,
@@ -2882,7 +2883,5 @@ enum plugin_status plugin_start(const void *parameter)
             ret = PLUGIN_ERROR;
         }
     }
-
-    cleanup(NULL);
     return ret;
 }
-- 
cgit v1.2.3