summaryrefslogtreecommitdiffstats
path: root/apps/plugin.c
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2010-08-26 23:20:02 +0000
committerThomas Martitz <kugel@rockbox.org>2010-08-26 23:20:02 +0000
commit73f057be6fcb849d5379073267e21e9526576ccd (patch)
treeb2b239517ba89f4e9969918642006a3d15faa062 /apps/plugin.c
parent55dc25fe7273bf9aa71cdaea9a68c39fa3a22f50 (diff)
downloadrockbox-73f057be6fcb849d5379073267e21e9526576ccd.tar.gz
rockbox-73f057be6fcb849d5379073267e21e9526576ccd.tar.bz2
rockbox-73f057be6fcb849d5379073267e21e9526576ccd.zip
Introduce a small api for loading code (codecs,plugins) from disk/memory.
It's a used by codec/plugin loading and vastly reduces code duplication. It's also a step forward in getting rid of libuisimulator in the application ports. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27900 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugin.c')
-rw-r--r--apps/plugin.c102
1 files changed, 31 insertions, 71 deletions
diff --git a/apps/plugin.c b/apps/plugin.c
index cc540cd988..53a05bf527 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -42,6 +42,7 @@
#include "errno.h"
#include "diacritic.h"
#include "filefuncs.h"
+#include "load_code.h"
#if CONFIG_CHARGING
#include "power.h"
@@ -75,21 +76,19 @@ static unsigned int open_files;
#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
static unsigned char pluginbuf[PLUGIN_BUFFER_SIZE];
-void *sim_plugin_load(char *plugin, void **pd);
-void sim_plugin_close(void *pd);
void sim_lcd_ex_init(unsigned long (*getpixel)(int, int));
void sim_lcd_ex_update_rect(int x, int y, int width, int height);
#else
-#define sim_plugin_close(x)
extern unsigned char pluginbuf[];
#include "bitswap.h"
#endif
/* for actual plugins only, not for codecs */
-static bool plugin_loaded = false;
static int plugin_size = 0;
static bool (*pfn_tsr_exit)(bool reenter) = NULL; /* TSR exit callback */
static char current_plugin[MAX_PATH];
+/* NULL if no plugin is loaded, otherwise the handle that lc_open() returned */
+static void *current_plugin_handle;
char *plugin_get_current_filename(void);
@@ -728,98 +727,60 @@ int plugin_load(const char* plugin, const void* parameter)
{
int rc, i;
struct plugin_header *hdr;
-#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
- void *pd;
-#else /* PLATFOR_NATIVE */
- int fd;
- ssize_t readsize;
-#if NUM_CORES > 1
- unsigned my_core;
-#endif
-#endif /* CONFIG_PLATFORM */
#if LCD_DEPTH > 1
fb_data* old_backdrop;
#endif
- if (pfn_tsr_exit != NULL) /* if we have a resident old plugin: */
- {
+ if (current_plugin_handle && pfn_tsr_exit)
+ { /* if we have a resident old plugin and a callback */
if (pfn_tsr_exit(!strcmp(current_plugin, plugin)) == false )
{
/* not allowing another plugin to load */
return PLUGIN_OK;
}
- pfn_tsr_exit = NULL;
- plugin_loaded = false;
+ lc_close(current_plugin_handle);
+ current_plugin_handle = pfn_tsr_exit = NULL;
}
splash(0, ID2P(LANG_WAIT));
strcpy(current_plugin, plugin);
-#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
- hdr = sim_plugin_load((char *)plugin, &pd);
- if (pd == NULL) {
+ current_plugin_handle = lc_open(plugin, pluginbuf, PLUGIN_BUFFER_SIZE);
+ if (current_plugin_handle == NULL) {
splashf(HZ*2, str(LANG_PLUGIN_CANT_OPEN), plugin);
return -1;
}
- if (hdr == NULL
- || hdr->magic != PLUGIN_MAGIC
- || hdr->target_id != TARGET_ID) {
- sim_plugin_close(pd);
- splash(HZ*2, str(LANG_PLUGIN_WRONG_MODEL));
- return -1;
- }
- if (hdr->api_version > PLUGIN_API_VERSION
- || hdr->api_version < PLUGIN_MIN_API_VERSION) {
- sim_plugin_close(pd);
- splash(HZ*2, str(LANG_PLUGIN_WRONG_VERSION));
- return -1;
- }
-#else
- fd = open(plugin, O_RDONLY);
- if (fd < 0) {
- splashf(HZ*2, str(LANG_PLUGIN_CANT_OPEN), plugin);
- return fd;
- }
-#if NUM_CORES > 1
- /* Make sure COP cache is flushed and invalidated before loading */
- my_core = switch_core(CURRENT_CORE ^ 1);
- cpucache_invalidate();
- switch_core(my_core);
-#endif
- readsize = read(fd, pluginbuf, PLUGIN_BUFFER_SIZE);
- close(fd);
+ hdr = lc_get_header(current_plugin_handle);
- if (readsize < 0) {
- splashf(HZ*2, str(LANG_READ_FAILED), plugin);
- return -1;
- }
- hdr = (struct plugin_header *)pluginbuf;
-
- if ((unsigned)readsize <= sizeof(struct plugin_header)
+ if (hdr == NULL
|| hdr->magic != PLUGIN_MAGIC
|| hdr->target_id != TARGET_ID
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
|| hdr->load_addr != pluginbuf
- || hdr->end_addr > pluginbuf + PLUGIN_BUFFER_SIZE) {
+ || hdr->end_addr > pluginbuf + PLUGIN_BUFFER_SIZE
+#endif
+ )
+ {
+ lc_close(current_plugin_handle);
splash(HZ*2, str(LANG_PLUGIN_WRONG_MODEL));
return -1;
}
if (hdr->api_version > PLUGIN_API_VERSION
- || hdr->api_version < PLUGIN_MIN_API_VERSION) {
+ || hdr->api_version < PLUGIN_MIN_API_VERSION)
+ {
+ lc_close(current_plugin_handle);
splash(HZ*2, str(LANG_PLUGIN_WRONG_VERSION));
return -1;
}
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
plugin_size = hdr->end_addr - pluginbuf;
-
- /* zero out bss area only, above guards end of pluginbuf */
- if (plugin_size > readsize)
- memset(pluginbuf + readsize, 0, plugin_size - readsize);
+#else
+ plugin_size = 0;
#endif
*(hdr->api) = &rockbox_api;
- plugin_loaded = true;
-
#if defined HAVE_LCD_BITMAP && LCD_DEPTH > 1
old_backdrop = lcd_get_backdrop();
@@ -834,8 +795,6 @@ int plugin_load(const char* plugin, const void* parameter)
FOR_NB_SCREENS(i)
viewportmanager_theme_enable(i, false, NULL);
-
- cpucache_invalidate();
#ifdef HAVE_TOUCHSCREEN
touchscreen_set_mode(TOUCHSCREEN_BUTTON);
@@ -847,6 +806,12 @@ int plugin_load(const char* plugin, const void* parameter)
rc = hdr->entry_point(parameter);
+ if (!pfn_tsr_exit)
+ { /* close handle if plugin is no tsr one */
+ lc_close(current_plugin_handle);
+ current_plugin_handle = NULL;
+ }
+
/* Go back to the global setting in case the plugin changed it */
#ifdef HAVE_TOUCHSCREEN
touchscreen_set_mode(global_settings.touch_mode);
@@ -887,11 +852,8 @@ int plugin_load(const char* plugin, const void* parameter)
FOR_NB_SCREENS(i)
viewportmanager_theme_undo(i, false);
- if (pfn_tsr_exit == NULL)
- plugin_loaded = false;
-
#ifdef HAVE_PLUGIN_CHECK_OPEN_CLOSE
- if(open_files != 0 && !plugin_loaded)
+ if(open_files != 0 && !current_plugin_handle)
{
int fd;
logf("Plugin '%s' leaks file handles", plugin);
@@ -909,8 +871,6 @@ int plugin_load(const char* plugin, const void* parameter)
}
#endif
- sim_plugin_close(pd);
-
if (rc == PLUGIN_ERROR)
splash(HZ*2, str(LANG_PLUGIN_ERROR));
@@ -923,7 +883,7 @@ void* plugin_get_buffer(size_t *buffer_size)
{
int buffer_pos;
- if (plugin_loaded)
+ if (current_plugin_handle)
{
if (plugin_size >= PLUGIN_BUFFER_SIZE)
return NULL;