summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-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);
127#ifdef SIMULATOR 127#ifdef SIMULATOR
128void app_main(void) 128void app_main(void)
129#else 129#else
130static void app_main(void) 130int main(void) __attribute__((noreturn));
131int main(void)
131#endif 132#endif
132{ 133{
133 int i; 134 int i;
@@ -640,17 +641,5 @@ void cop_main(void)
640} 641}
641#endif /* CPU_PP */ 642#endif /* CPU_PP */
642 643
643int main(void)
644{
645 app_main();
646
647 while(1) {
648#if (CONFIG_LED == LED_REAL)
649 led(true); sleep(HZ/10);
650 led(false); sleep(HZ/10);
651#endif
652 }
653 return 0;
654}
655#endif 644#endif
656 645
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)
595 break; 595 break;
596 } /* switch() */ 596 } /* switch() */
597 } 597 }
598 return;
599} 598}
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 @@
22#ifndef __ROOT_MENU_H__ 22#ifndef __ROOT_MENU_H__
23#define __ROOT_MENU_H__ 23#define __ROOT_MENU_H__
24 24
25void root_menu(void); 25void root_menu(void) __attribute__((noreturn));
26 26
27enum { 27enum {
28 /* from old menu api, but still required*/ 28 /* from old menu api, but still required*/