summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Mahone <andrew.mahone@gmail.com>2009-07-11 00:22:26 +0000
committerAndrew Mahone <andrew.mahone@gmail.com>2009-07-11 00:22:26 +0000
commit1bc67c81b60539576c0073e8acd2ffa7d43ac882 (patch)
tree8e8953e0cb7926b84da228abf8476b2f2e2678ab
parent7ad3a333a3af8a6ca3d6f1b4b025b0b7245684dd (diff)
downloadrockbox-1bc67c81b60539576c0073e8acd2ffa7d43ac882.tar.gz
rockbox-1bc67c81b60539576c0073e8acd2ffa7d43ac882.tar.bz2
rockbox-1bc67c81b60539576c0073e8acd2ffa7d43ac882.zip
Fix type mismatch warnings and errors exposed when building with EABI toolchain.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21769 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/codecs/libspeex/filters_arm4.h4
-rw-r--r--apps/gui/list.h2
-rw-r--r--apps/menu.c2
-rw-r--r--apps/playlist_viewer.c3
-rw-r--r--apps/plugin.h3
-rw-r--r--apps/tree.c2
6 files changed, 9 insertions, 7 deletions
diff --git a/apps/codecs/libspeex/filters_arm4.h b/apps/codecs/libspeex/filters_arm4.h
index 886caed189..bbe4bc93f8 100644
--- a/apps/codecs/libspeex/filters_arm4.h
+++ b/apps/codecs/libspeex/filters_arm4.h
@@ -46,9 +46,9 @@ int normalize16(const spx_sig_t *x, spx_word16_t *y, spx_sig_t max_scale, int le
".normalize16loop1%=: \n"
"\tldr %4, [%0], #4 \n"
- "\tcmps %4, %1 \n"
+ "\tcmp %4, %1 \n"
"\tmovgt %1, %4 \n"
- "\tcmps %4, %3 \n"
+ "\tcmp %4, %3 \n"
"\tmovlt %3, %4 \n"
"\tsubs %2, %2, #1 \n"
diff --git a/apps/gui/list.h b/apps/gui/list.h
index c1126f257f..040002222c 100644
--- a/apps/gui/list.h
+++ b/apps/gui/list.h
@@ -168,7 +168,7 @@ extern void gui_synclist_del_item(struct gui_synclist * lists);
extern void gui_synclist_limit_scroll(struct gui_synclist * lists, bool scroll);
extern void gui_synclist_flash(struct gui_synclist * lists);
extern void gui_synclist_set_title(struct gui_synclist * lists, char * title,
- int icon);
+ enum themable_icons icon);
extern void gui_synclist_hide_selection_marker(struct gui_synclist *lists,
bool hide);
extern bool gui_synclist_item_is_onscreen(struct gui_synclist *lists,
diff --git a/apps/menu.c b/apps/menu.c
index 653dc09aec..aff84c72e3 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -131,7 +131,7 @@ static char * get_menu_item_name(int selected_item,
return P2STR(menu->callback_and_desc->desc);
}
#ifdef HAVE_LCD_BITMAP
-static int menu_get_icon(int selected_item, void * data)
+static enum themable_icons menu_get_icon(int selected_item, void * data)
{
const struct menu_item_ex *menu = (const struct menu_item_ex *)data;
int menu_icon = Icon_NOICON;
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c
index 7c4ee379cc..1e1aab8c54 100644
--- a/apps/playlist_viewer.c
+++ b/apps/playlist_viewer.c
@@ -576,7 +576,8 @@ static char *playlist_callback_name(int selected_item,
}
-static int playlist_callback_icons(int selected_item, void *data)
+static enum themable_icons playlist_callback_icons(int selected_item,
+ void *data)
{
struct playlist_viewer * local_viewer=(struct playlist_viewer *)data;
diff --git a/apps/plugin.h b/apps/plugin.h
index 253cfd0aab..d1a57129a5 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -346,7 +346,8 @@ struct plugin_api {
void (*gui_synclist_limit_scroll)(struct gui_synclist * lists, bool scroll);
bool (*gui_synclist_do_button)(struct gui_synclist * lists,
int *action, enum list_wrap wrap);
- void (*gui_synclist_set_title)(struct gui_synclist *lists, char* title, int icon);
+ void (*gui_synclist_set_title)(struct gui_synclist *lists, char* title,
+ enum themable_icons icon);
enum yesno_res (*gui_syncyesno_run)(const struct text_message * main_message,
const struct text_message * yes_message,
const struct text_message * no_message);
diff --git a/apps/tree.c b/apps/tree.c
index d1d0ec3b27..ef65c6d86c 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -173,7 +173,7 @@ static int tree_get_filecolor(int selected_item, void * data)
}
#endif
-static int tree_get_fileicon(int selected_item, void * data)
+static enum themable_icons tree_get_fileicon(int selected_item, void * data)
{
struct tree_context * local_tc=(struct tree_context *)data;
#ifdef HAVE_TAGCACHE