Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove some inconsistent guarding around cpucache_* functions to fix a test_codec crash on coldfire, breaks plugin api compatibility so sorted and bumped version numbers.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28287 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nils Wallménius 2010-10-16 12:30:06 +00:00
parent 44780475bc
commit 8123dffaea
3 changed files with 19 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/plugin.c
View file

@ -344,6 +344,7 @@ static const struct plugin_api rockbox_api = {
mkdir,
rmdir,
dir_exists,
dir_get_info,
/* kernel/ system */
#if defined(CPU_ARM) && CONFIG_PLATFORM & PLATFORM_NATIVE
@ -384,12 +385,15 @@ static const struct plugin_api rockbox_api = {
trigger_cpu_boost,
cancel_cpu_boost,
#endif
#ifdef HAVE_CPUCACHE_FLUSH
cpucache_flush,
#endif
#ifdef HAVE_CPUCACHE_INVALIDATE
cpucache_invalidate,
#endif
lc_open,
lc_open_from_mem,
lc_get_header,
lc_close,
timer_register,
timer_unregister,
timer_set_period,
@ -722,12 +726,6 @@ static const struct plugin_api rockbox_api = {
/* new stuff at the end, sort into place next time
the API gets incompatible */
dir_get_info,
lc_open,
lc_open_from_mem,
lc_get_header,
lc_close,
};
int plugin_load(const char* plugin, const void* parameter)

24
apps/plugin.h
View file

@ -147,12 +147,12 @@ void* plugin_get_buffer(size_t *buffer_size);
#define PLUGIN_MAGIC 0x526F634B /* RocK */
/* increase this every time the api struct changes */
#define PLUGIN_API_VERSION 193
#define PLUGIN_API_VERSION 194
/* update this to latest version if a change to the api struct breaks
backwards compatibility (and please take the opportunity to sort in any
new function which are "waiting" at the end of the function table) */
#define PLUGIN_MIN_API_VERSION 192
#define PLUGIN_MIN_API_VERSION 194
/* plugin return codes */
/* internal returns start at 0x100 to make exit(1..255) work */
@ -454,6 +454,7 @@ struct plugin_api {
int (*mkdir)(const char *name);
int (*rmdir)(const char *name);
bool (*dir_exists)(const char *path);
struct dirinfo (*dir_get_info)(DIR* parent, struct dirent *entry);
/* kernel/ system */
#if defined(CPU_ARM) && CONFIG_PLATFORM & PLATFORM_NATIVE
@ -498,12 +499,16 @@ struct plugin_api {
void (*trigger_cpu_boost)(void);
void (*cancel_cpu_boost)(void);
#endif
#ifdef HAVE_CPUCACHE_FLUSH
void (*cpucache_flush)(void);
#endif
#ifdef HAVE_CPUCACHE_INVALIDATE
void (*cpucache_invalidate)(void);
#endif
/* load code api for overlay */
void* (*lc_open)(const char *filename, unsigned char *buf, size_t buf_size);
void* (*lc_open_from_mem)(void* addr, size_t blob_size);
void* (*lc_get_header)(void *handle);
void (*lc_close)(void *handle);
bool (*timer_register)(int reg_prio, void (*unregister_callback)(void),
long cycles, void (*timer_callback)(void)
IF_COP(, int core));
@ -894,13 +899,6 @@ struct plugin_api {
/* new stuff at the end, sort into place next time
the API gets incompatible */
struct dirinfo (*dir_get_info)(DIR* parent, struct dirent *entry);
/* load code api for overlay */
void* (*lc_open)(const char *filename, unsigned char *buf, size_t buf_size);
void* (*lc_open_from_mem)(void* addr, size_t blob_size);
void* (*lc_get_header)(void *handle);
void (*lc_close)(void *handle);
};
/* plugin header */

2
apps/plugins/test_codec.c
View file

@ -601,10 +601,8 @@ static void init_ci(void)
ci.profile_func_exit = rb->profile_func_exit;
#endif
#if NUM_CORES > 1
ci.cpucache_invalidate = rb->cpucache_invalidate;
ci.cpucache_flush = rb->cpucache_flush;
#endif
#if NUM_CORES > 1
ci.create_thread = rb->create_thread;