1
0
Fork 0
forked from len0rd/rockbox

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
This commit is contained in:
Thomas Martitz 2010-08-24 14:30:46 +00:00
parent 3478bc5d6d
commit cae4ae2c71
142 changed files with 372 additions and 341 deletions

View file

@ -22,6 +22,7 @@
#include "plugin.h"
#include "time.h"
#include "lib/pluginlib_actions.h"
#include "lib/pluginlib_exit.h"
#include "lib/xlcd.h"
#include "clock.h"
@ -30,7 +31,7 @@
#include "clock_menu.h"
#include "clock_settings.h"
PLUGIN_HEADER
/* Keymaps */
const struct button_mapping* plugin_contexts[]={
@ -56,9 +57,8 @@ const struct button_mapping* plugin_contexts[]={
/**************************
* Cleanup on plugin return
*************************/
void cleanup(void *parameter)
void cleanup(void)
{
(void)parameter;
clock_draw_restore_colors();
if(clock_settings.general.save_settings == 1)
save_settings();
@ -115,6 +115,7 @@ enum plugin_status plugin_start(const void* parameter){
struct counter counter;
bool exit_clock = false;
(void)parameter;
atexit(cleanup);
#if LCD_DEPTH > 1
rb->lcd_set_backdrop(NULL);
@ -174,9 +175,7 @@ enum plugin_status plugin_start(const void* parameter){
exit_clock=main_menu();
break;
default:
if(rb->default_event_handler_ex(button, cleanup, NULL)
== SYS_USB_CONNECTED)
return PLUGIN_USB_CONNECTED;
exit_on_usb(button);
if(time.second != last_second){
last_second=time.second;
redraw=true;
@ -193,6 +192,5 @@ enum plugin_status plugin_start(const void* parameter){
}
}
cleanup(NULL);
return PLUGIN_OK;
}