diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-08-24 14:30:46 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-08-24 14:30:46 +0000 |
commit | cae4ae2c71ae10ff67d39a78a705136e740dc07e (patch) | |
tree | b5bb5e1879493f67d7c7ad977fba90eb49b743d7 /apps/plugins/lua | |
parent | 3478bc5d6dc0a081c3aeb4f501c8b4cb4f53a78d (diff) | |
download | rockbox-cae4ae2c71ae10ff67d39a78a705136e740dc07e.tar.gz rockbox-cae4ae2c71ae10ff67d39a78a705136e740dc07e.zip |
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
Diffstat (limited to 'apps/plugins/lua')
-rw-r--r-- | apps/plugins/lua/rocklua.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/apps/plugins/lua/rocklua.c b/apps/plugins/lua/rocklua.c index b92c274fb0..00bfd8e43e 100644 --- a/apps/plugins/lua/rocklua.c +++ b/apps/plugins/lua/rocklua.c | |||
@@ -20,7 +20,6 @@ | |||
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | 21 | ||
22 | #include "plugin.h" | 22 | #include "plugin.h" |
23 | #include "lib/pluginlib_exit.h" | ||
24 | #include "lua.h" | 23 | #include "lua.h" |
25 | #include "lauxlib.h" | 24 | #include "lauxlib.h" |
26 | #include "lualib.h" | 25 | #include "lualib.h" |
@@ -28,7 +27,7 @@ | |||
28 | #include "rockmalloc.h" | 27 | #include "rockmalloc.h" |
29 | #include "luadir.h" | 28 | #include "luadir.h" |
30 | 29 | ||
31 | PLUGIN_HEADER | 30 | |
32 | 31 | ||
33 | static const luaL_Reg lualibs[] = { | 32 | static const luaL_Reg lualibs[] = { |
34 | {"", luaopen_base}, | 33 | {"", luaopen_base}, |
@@ -148,8 +147,6 @@ enum plugin_status plugin_start(const void* parameter) | |||
148 | const char* filename; | 147 | const char* filename; |
149 | int status; | 148 | int status; |
150 | 149 | ||
151 | PLUGINLIB_EXIT_INIT | ||
152 | |||
153 | if (parameter == NULL) | 150 | if (parameter == NULL) |
154 | { | 151 | { |
155 | rb->splash(HZ, "Play a .lua file!"); | 152 | rb->splash(HZ, "Play a .lua file!"); |