summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2004-07-20 21:37:36 +0000
committerJens Arnold <amiconn@rockbox.org>2004-07-20 21:37:36 +0000
commit398e40184e2f3060105fbd8e75300d395a5b91c3 (patch)
treecc1b43deff631871d22c03b07c734ef7d8ceef7d
parentc50a069e6e4425a47643dd961b172b5993e9bc8e (diff)
Next round of const policeing
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4902 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugin.c5
-rw-r--r--firmware/system.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/apps/plugin.c b/apps/plugin.c
index a53618d93c..251d433d76 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -78,7 +78,7 @@ static void (*pfn_tsr_exit)(void) = NULL; /* TSR exit callback */
static int plugin_test(int api_version, int model, int memsize);
-static struct plugin_api rockbox_api = {
+static const struct plugin_api rockbox_api = {
PLUGIN_API_VERSION,
plugin_test,
@@ -331,7 +331,8 @@ int plugin_load(char* plugin, void* parameter)
#endif
plugin_loaded = true;
- rc = plugin_start(&rockbox_api, parameter);
+ rc = plugin_start((struct plugin_api*) &rockbox_api, parameter);
+ /* explicitly casting the pointer here to avoid touching every plugin. */
plugin_loaded = false;
switch (rc) {
diff --git a/firmware/system.c b/firmware/system.c
index 41358a6776..33d5fbf74a 100644
--- a/firmware/system.c
+++ b/firmware/system.c
@@ -33,7 +33,7 @@
extern void reset_pc (void);
extern void reset_sp (void);
-static const char* irqname[] = {
+static const char* const irqname[] = {
"", "", "", "", "IllInstr", "", "IllSltIn","","",
"CPUAdrEr", "DMAAdrEr", "NMI", "UserBrk",
"","","","","","","","","","","","","","","","","","","",