diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-02-11 16:37:12 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-02-11 16:37:12 +0000 |
commit | 548109084f739cf74d2263cbd136f82eb67ea9d5 (patch) | |
tree | 65038ab71d12e0ee6cb236b518b0ccf3bb531c8c /apps | |
parent | f2d5c3532fd21c04e77aa86732742b578283b697 (diff) | |
download | rockbox-548109084f739cf74d2263cbd136f82eb67ea9d5.tar.gz rockbox-548109084f739cf74d2263cbd136f82eb67ea9d5.zip |
Increase codec and plugin API version (due to changes it r19971), and sort the recently added things
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19973 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/codecs.c | 6 | ||||
-rw-r--r-- | apps/codecs.h | 10 | ||||
-rw-r--r-- | apps/plugin.c | 8 | ||||
-rw-r--r-- | apps/plugin.h | 12 |
4 files changed, 18 insertions, 18 deletions
diff --git a/apps/codecs.c b/apps/codecs.c index 4fcf9ce02f..565adcf203 100644 --- a/apps/codecs.c +++ b/apps/codecs.c | |||
@@ -101,6 +101,9 @@ struct codec_api ci = { | |||
101 | NULL, /* configure */ | 101 | NULL, /* configure */ |
102 | 102 | ||
103 | /* kernel/ system */ | 103 | /* kernel/ system */ |
104 | #ifdef CPU_ARM | ||
105 | __div0, | ||
106 | #endif | ||
104 | PREFIX(sleep), | 107 | PREFIX(sleep), |
105 | yield, | 108 | yield, |
106 | 109 | ||
@@ -169,9 +172,6 @@ struct codec_api ci = { | |||
169 | 172 | ||
170 | /* new stuff at the end, sort into place next time | 173 | /* new stuff at the end, sort into place next time |
171 | the API gets incompatible */ | 174 | the API gets incompatible */ |
172 | #ifdef CPU_ARM | ||
173 | __div0, | ||
174 | #endif | ||
175 | }; | 175 | }; |
176 | 176 | ||
177 | void codec_get_full_path(char *path, const char *codec_root_fn) | 177 | void codec_get_full_path(char *path, const char *codec_root_fn) |
diff --git a/apps/codecs.h b/apps/codecs.h index c2358e1750..631cf58a77 100644 --- a/apps/codecs.h +++ b/apps/codecs.h | |||
@@ -75,12 +75,12 @@ | |||
75 | #define CODEC_ENC_MAGIC 0x52454E43 /* RENC */ | 75 | #define CODEC_ENC_MAGIC 0x52454E43 /* RENC */ |
76 | 76 | ||
77 | /* increase this every time the api struct changes */ | 77 | /* increase this every time the api struct changes */ |
78 | #define CODEC_API_VERSION 31 | 78 | #define CODEC_API_VERSION 32 |
79 | 79 | ||
80 | /* update this to latest version if a change to the api struct breaks | 80 | /* update this to latest version if a change to the api struct breaks |
81 | backwards compatibility (and please take the opportunity to sort in any | 81 | backwards compatibility (and please take the opportunity to sort in any |
82 | new function which are "waiting" at the end of the function table) */ | 82 | new function which are "waiting" at the end of the function table) */ |
83 | #define CODEC_MIN_API_VERSION 30 | 83 | #define CODEC_MIN_API_VERSION 32 |
84 | 84 | ||
85 | /* codec return codes */ | 85 | /* codec return codes */ |
86 | enum codec_status { | 86 | enum codec_status { |
@@ -153,6 +153,9 @@ struct codec_api { | |||
153 | void (*configure)(int setting, intptr_t value); | 153 | void (*configure)(int setting, intptr_t value); |
154 | 154 | ||
155 | /* kernel/ system */ | 155 | /* kernel/ system */ |
156 | #ifdef CPU_ARM | ||
157 | void (*__div0)(void); | ||
158 | #endif | ||
156 | void (*sleep)(int ticks); | 159 | void (*sleep)(int ticks); |
157 | void (*yield)(void); | 160 | void (*yield)(void); |
158 | 161 | ||
@@ -233,9 +236,6 @@ struct codec_api { | |||
233 | 236 | ||
234 | /* new stuff at the end, sort into place next time | 237 | /* new stuff at the end, sort into place next time |
235 | the API gets incompatible */ | 238 | the API gets incompatible */ |
236 | #ifdef CPU_ARM | ||
237 | void (*__div0)(void); | ||
238 | #endif | ||
239 | }; | 239 | }; |
240 | 240 | ||
241 | /* codec header */ | 241 | /* codec header */ |
diff --git a/apps/plugin.c b/apps/plugin.c index f9f1c53617..856dd6e1cb 100644 --- a/apps/plugin.c +++ b/apps/plugin.c | |||
@@ -282,6 +282,7 @@ static const struct plugin_api rockbox_api = { | |||
282 | reload_directory, | 282 | reload_directory, |
283 | create_numbered_filename, | 283 | create_numbered_filename, |
284 | file_exists, | 284 | file_exists, |
285 | strip_extension, | ||
285 | 286 | ||
286 | /* dir */ | 287 | /* dir */ |
287 | opendir, | 288 | opendir, |
@@ -292,6 +293,9 @@ static const struct plugin_api rockbox_api = { | |||
292 | dir_exists, | 293 | dir_exists, |
293 | 294 | ||
294 | /* kernel/ system */ | 295 | /* kernel/ system */ |
296 | #ifdef CPU_ARM | ||
297 | __div0, | ||
298 | #endif | ||
295 | PREFIX(sleep), | 299 | PREFIX(sleep), |
296 | yield, | 300 | yield, |
297 | ¤t_tick, | 301 | ¤t_tick, |
@@ -627,10 +631,6 @@ static const struct plugin_api rockbox_api = { | |||
627 | appsversion, | 631 | appsversion, |
628 | /* new stuff at the end, sort into place next time | 632 | /* new stuff at the end, sort into place next time |
629 | the API gets incompatible */ | 633 | the API gets incompatible */ |
630 | #ifdef CPU_ARM | ||
631 | __div0, | ||
632 | #endif | ||
633 | strip_extension | ||
634 | }; | 634 | }; |
635 | 635 | ||
636 | int plugin_load(const char* plugin, const void* parameter) | 636 | int plugin_load(const char* plugin, const void* parameter) |
diff --git a/apps/plugin.h b/apps/plugin.h index 715f2ec512..50598d5309 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -127,12 +127,12 @@ void* plugin_get_buffer(size_t *buffer_size); | |||
127 | #define PLUGIN_MAGIC 0x526F634B /* RocK */ | 127 | #define PLUGIN_MAGIC 0x526F634B /* RocK */ |
128 | 128 | ||
129 | /* increase this every time the api struct changes */ | 129 | /* increase this every time the api struct changes */ |
130 | #define PLUGIN_API_VERSION 142 | 130 | #define PLUGIN_API_VERSION 143 |
131 | 131 | ||
132 | /* update this to latest version if a change to the api struct breaks | 132 | /* update this to latest version if a change to the api struct breaks |
133 | backwards compatibility (and please take the opportunity to sort in any | 133 | backwards compatibility (and please take the opportunity to sort in any |
134 | new function which are "waiting" at the end of the function table) */ | 134 | new function which are "waiting" at the end of the function table) */ |
135 | #define PLUGIN_MIN_API_VERSION 142 | 135 | #define PLUGIN_MIN_API_VERSION 143 |
136 | 136 | ||
137 | /* plugin return codes */ | 137 | /* plugin return codes */ |
138 | enum plugin_status { | 138 | enum plugin_status { |
@@ -389,6 +389,7 @@ struct plugin_api { | |||
389 | const char *prefix, const char *suffix, | 389 | const char *prefix, const char *suffix, |
390 | int numberlen IF_CNFN_NUM_(, int *num)); | 390 | int numberlen IF_CNFN_NUM_(, int *num)); |
391 | bool (*file_exists)(const char *file); | 391 | bool (*file_exists)(const char *file); |
392 | char* (*strip_extension)(char* buffer, int buffer_size, const char *filename); | ||
392 | 393 | ||
393 | 394 | ||
394 | /* dir */ | 395 | /* dir */ |
@@ -400,6 +401,9 @@ struct plugin_api { | |||
400 | bool (*dir_exists)(const char *path); | 401 | bool (*dir_exists)(const char *path); |
401 | 402 | ||
402 | /* kernel/ system */ | 403 | /* kernel/ system */ |
404 | #ifdef CPU_ARM | ||
405 | void (*__div0)(void); | ||
406 | #endif | ||
403 | void (*sleep)(int ticks); | 407 | void (*sleep)(int ticks); |
404 | void (*yield)(void); | 408 | void (*yield)(void); |
405 | volatile long* current_tick; | 409 | volatile long* current_tick; |
@@ -783,10 +787,6 @@ struct plugin_api { | |||
783 | const char *appsversion; | 787 | const char *appsversion; |
784 | /* new stuff at the end, sort into place next time | 788 | /* new stuff at the end, sort into place next time |
785 | the API gets incompatible */ | 789 | the API gets incompatible */ |
786 | #ifdef CPU_ARM | ||
787 | void (*__div0)(void); | ||
788 | #endif | ||
789 | char* (*strip_extension)(char* buffer, int buffer_size, const char *filename); | ||
790 | }; | 790 | }; |
791 | 791 | ||
792 | /* plugin header */ | 792 | /* plugin header */ |