summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2009-11-03 12:20:54 +0000
committerRafaël Carré <rafael.carre@gmail.com>2009-11-03 12:20:54 +0000
commitbb9808b8afe1e95b0d7734840e64a91a0da3fe9b (patch)
tree8ee51ee9ae284f5dc3f87ac7348083fd3614d5f0
parent9b46960baf2e19290f0761020609f78b82457263 (diff)
downloadrockbox-bb9808b8afe1e95b0d7734840e64a91a0da3fe9b.tar.gz
rockbox-bb9808b8afe1e95b0d7734840e64a91a0da3fe9b.tar.bz2
rockbox-bb9808b8afe1e95b0d7734840e64a91a0da3fe9b.zip
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
-rw-r--r--apps/main.c15
-rw-r--r--apps/root_menu.c1
-rw-r--r--apps/root_menu.h2
3 files changed, 3 insertions, 15 deletions
diff --git a/apps/main.c b/apps/main.c
index 677eeb5b21..1eed068f14 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -127,7 +127,8 @@ static void init(void);
#ifdef SIMULATOR
void app_main(void)
#else
-static void app_main(void)
+int main(void) __attribute__((noreturn));
+int main(void)
#endif
{
int i;
@@ -640,17 +641,5 @@ void cop_main(void)
}
#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
diff --git a/apps/root_menu.c b/apps/root_menu.c
index 3ca4510ae4..b02d2a1be8 100644
--- a/apps/root_menu.c
+++ b/apps/root_menu.c
@@ -595,5 +595,4 @@ void root_menu(void)
break;
} /* switch() */
}
- return;
}
diff --git a/apps/root_menu.h b/apps/root_menu.h
index 584e048a53..10904829d1 100644
--- a/apps/root_menu.h
+++ b/apps/root_menu.h
@@ -22,7 +22,7 @@
#ifndef __ROOT_MENU_H__
#define __ROOT_MENU_H__
-void root_menu(void);
+void root_menu(void) __attribute__((noreturn));
enum {
/* from old menu api, but still required*/