summaryrefslogtreecommitdiffstats
path: root/apps/plugins/cube.c
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2010-08-23 16:56:49 +0000
committerThomas Martitz <kugel@rockbox.org>2010-08-23 16:56:49 +0000
commitabdc5935beb7dc3fa63bffeec584921ad2a4c8bd (patch)
tree3eb3ca86063d0fff58ca8ed2c49dbb0af0792570 /apps/plugins/cube.c
parent8106c9dc646bbb26131896eb12d23edb26cba476 (diff)
downloadrockbox-abdc5935beb7dc3fa63bffeec584921ad2a4c8bd.tar.gz
rockbox-abdc5935beb7dc3fa63bffeec584921ad2a4c8bd.tar.bz2
rockbox-abdc5935beb7dc3fa63bffeec584921ad2a4c8bd.zip
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
Diffstat (limited to 'apps/plugins/cube.c')
-rw-r--r--apps/plugins/cube.c24
1 files changed, 8 insertions, 16 deletions
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;
}