diff options
author | Andrew Mahone <andrew.mahone@gmail.com> | 2009-07-11 00:22:26 +0000 |
---|---|---|
committer | Andrew Mahone <andrew.mahone@gmail.com> | 2009-07-11 00:22:26 +0000 |
commit | 1bc67c81b60539576c0073e8acd2ffa7d43ac882 (patch) | |
tree | 8e8953e0cb7926b84da228abf8476b2f2e2678ab /apps | |
parent | 7ad3a333a3af8a6ca3d6f1b4b025b0b7245684dd (diff) | |
download | rockbox-1bc67c81b60539576c0073e8acd2ffa7d43ac882.tar.gz 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
Diffstat (limited to 'apps')
-rw-r--r-- | apps/codecs/libspeex/filters_arm4.h | 4 | ||||
-rw-r--r-- | apps/gui/list.h | 2 | ||||
-rw-r--r-- | apps/menu.c | 2 | ||||
-rw-r--r-- | apps/playlist_viewer.c | 3 | ||||
-rw-r--r-- | apps/plugin.h | 3 | ||||
-rw-r--r-- | apps/tree.c | 2 |
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 | |||
46 | ".normalize16loop1%=: \n" | 46 | ".normalize16loop1%=: \n" |
47 | 47 | ||
48 | "\tldr %4, [%0], #4 \n" | 48 | "\tldr %4, [%0], #4 \n" |
49 | "\tcmps %4, %1 \n" | 49 | "\tcmp %4, %1 \n" |
50 | "\tmovgt %1, %4 \n" | 50 | "\tmovgt %1, %4 \n" |
51 | "\tcmps %4, %3 \n" | 51 | "\tcmp %4, %3 \n" |
52 | "\tmovlt %3, %4 \n" | 52 | "\tmovlt %3, %4 \n" |
53 | 53 | ||
54 | "\tsubs %2, %2, #1 \n" | 54 | "\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); | |||
168 | extern void gui_synclist_limit_scroll(struct gui_synclist * lists, bool scroll); | 168 | extern void gui_synclist_limit_scroll(struct gui_synclist * lists, bool scroll); |
169 | extern void gui_synclist_flash(struct gui_synclist * lists); | 169 | extern void gui_synclist_flash(struct gui_synclist * lists); |
170 | extern void gui_synclist_set_title(struct gui_synclist * lists, char * title, | 170 | extern void gui_synclist_set_title(struct gui_synclist * lists, char * title, |
171 | int icon); | 171 | enum themable_icons icon); |
172 | extern void gui_synclist_hide_selection_marker(struct gui_synclist *lists, | 172 | extern void gui_synclist_hide_selection_marker(struct gui_synclist *lists, |
173 | bool hide); | 173 | bool hide); |
174 | extern bool gui_synclist_item_is_onscreen(struct gui_synclist *lists, | 174 | 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, | |||
131 | return P2STR(menu->callback_and_desc->desc); | 131 | return P2STR(menu->callback_and_desc->desc); |
132 | } | 132 | } |
133 | #ifdef HAVE_LCD_BITMAP | 133 | #ifdef HAVE_LCD_BITMAP |
134 | static int menu_get_icon(int selected_item, void * data) | 134 | static enum themable_icons menu_get_icon(int selected_item, void * data) |
135 | { | 135 | { |
136 | const struct menu_item_ex *menu = (const struct menu_item_ex *)data; | 136 | const struct menu_item_ex *menu = (const struct menu_item_ex *)data; |
137 | int menu_icon = Icon_NOICON; | 137 | 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, | |||
576 | } | 576 | } |
577 | 577 | ||
578 | 578 | ||
579 | static int playlist_callback_icons(int selected_item, void *data) | 579 | static enum themable_icons playlist_callback_icons(int selected_item, |
580 | void *data) | ||
580 | { | 581 | { |
581 | struct playlist_viewer * local_viewer=(struct playlist_viewer *)data; | 582 | struct playlist_viewer * local_viewer=(struct playlist_viewer *)data; |
582 | 583 | ||
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 { | |||
346 | void (*gui_synclist_limit_scroll)(struct gui_synclist * lists, bool scroll); | 346 | void (*gui_synclist_limit_scroll)(struct gui_synclist * lists, bool scroll); |
347 | bool (*gui_synclist_do_button)(struct gui_synclist * lists, | 347 | bool (*gui_synclist_do_button)(struct gui_synclist * lists, |
348 | int *action, enum list_wrap wrap); | 348 | int *action, enum list_wrap wrap); |
349 | void (*gui_synclist_set_title)(struct gui_synclist *lists, char* title, int icon); | 349 | void (*gui_synclist_set_title)(struct gui_synclist *lists, char* title, |
350 | enum themable_icons icon); | ||
350 | enum yesno_res (*gui_syncyesno_run)(const struct text_message * main_message, | 351 | enum yesno_res (*gui_syncyesno_run)(const struct text_message * main_message, |
351 | const struct text_message * yes_message, | 352 | const struct text_message * yes_message, |
352 | const struct text_message * no_message); | 353 | 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) | |||
173 | } | 173 | } |
174 | #endif | 174 | #endif |
175 | 175 | ||
176 | static int tree_get_fileicon(int selected_item, void * data) | 176 | static enum themable_icons tree_get_fileicon(int selected_item, void * data) |
177 | { | 177 | { |
178 | struct tree_context * local_tc=(struct tree_context *)data; | 178 | struct tree_context * local_tc=(struct tree_context *)data; |
179 | #ifdef HAVE_TAGCACHE | 179 | #ifdef HAVE_TAGCACHE |