mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-10-13 18:17:39 -04:00
root_menu() can't return, tell gcc about it
Since it can't return, app_main() can't either, tell gcc about it. Remove dead archos code (present if root_menu() would return erroneously), and rename app_main() to main() on target git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23494 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
9b46960baf
commit
bb9808b8af
3 changed files with 3 additions and 15 deletions
15
apps/main.c
15
apps/main.c
|
@ -127,7 +127,8 @@ static void init(void);
|
||||||
#ifdef SIMULATOR
|
#ifdef SIMULATOR
|
||||||
void app_main(void)
|
void app_main(void)
|
||||||
#else
|
#else
|
||||||
static void app_main(void)
|
int main(void) __attribute__((noreturn));
|
||||||
|
int main(void)
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
@ -640,17 +641,5 @@ void cop_main(void)
|
||||||
}
|
}
|
||||||
#endif /* CPU_PP */
|
#endif /* CPU_PP */
|
||||||
|
|
||||||
int main(void)
|
|
||||||
{
|
|
||||||
app_main();
|
|
||||||
|
|
||||||
while(1) {
|
|
||||||
#if (CONFIG_LED == LED_REAL)
|
|
||||||
led(true); sleep(HZ/10);
|
|
||||||
led(false); sleep(HZ/10);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -595,5 +595,4 @@ void root_menu(void)
|
||||||
break;
|
break;
|
||||||
} /* switch() */
|
} /* switch() */
|
||||||
}
|
}
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
#ifndef __ROOT_MENU_H__
|
#ifndef __ROOT_MENU_H__
|
||||||
#define __ROOT_MENU_H__
|
#define __ROOT_MENU_H__
|
||||||
|
|
||||||
void root_menu(void);
|
void root_menu(void) __attribute__((noreturn));
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
/* from old menu api, but still required*/
|
/* from old menu api, but still required*/
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue