From e256fb2a0a99a7fd944d8b6f6451e011708c500f Mon Sep 17 00:00:00 2001
From: Vincent Wei <vincent@minigui.org>
Date: Sun, 14 Jul 2019 17:17:40 +0800
Subject: [PATCH] restore timer thread

---
 src/kernel/init.c  |  3 ++-
 src/kernel/timer.c | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/kernel/init.c b/src/kernel/init.c
index 93298ec2..49f7bc14 100644
--- a/src/kernel/init.c
+++ b/src/kernel/init.c
@@ -182,8 +182,9 @@ static void* EventLoop (void* data)
     while (__mg_quiting_stage > _MG_QUITING_STAGE_EVENT) {
         EXTRA_INPUT_EVENT extra;
 
+#if 0
+ndef __USE_TIMER_THREAD
         /* VM: Since 4.0.0, update timer counter in event loop */
-#ifndef __USE_TIMER_THREAD
         if (__mg_quiting_stage > _MG_QUITING_STAGE_TIMER) {
             extern void __mg_timer_action (void *data);
             __mg_timer_action (NULL);
diff --git a/src/kernel/timer.c b/src/kernel/timer.c
index 1e4dc931..f91e649d 100644
--- a/src/kernel/timer.c
+++ b/src/kernel/timer.c
@@ -79,7 +79,7 @@ static pthread_mutex_t timerLock;
 #endif
 
 /* timer action for minigui timers */
-void __mg_timer_action (void *data)
+static void __mg_timer_action (void *data)
 {
 #if defined(_MGRM_PROCESSES)
     SHAREDRES_TIMER_COUNTER = __mg_os_get_time_ms()/10;
@@ -101,7 +101,7 @@ void __mg_timer_action (void *data)
 
 static OS_TIMER_ID __mg_os_timer = 0;
 
-#elif defined(__USE_TIMER_THREAD) /* __AOS__ */
+#else /* __AOS__ */
 static void* TimerEntry (void* data)
 {
     sem_post ((sem_t*)data);
@@ -114,7 +114,7 @@ static void* TimerEntry (void* data)
     /* printf("quit from TimerEntry()\n"); */
     return NULL;
 }
-#endif /* __USE_TIMER_THREAD */
+#endif /* !__AOS__ */
 
 int __mg_timer_init (void)
 {
@@ -127,7 +127,7 @@ int __mg_timer_init (void)
     __mg_os_timer = tp_os_timer_create ("mgtimer", __mg_timer_action,
                                          NULL, AOS_TIMER_TICKT,
                                          OS_AUTO_ACTIVATE | OS_AUTO_LOAD);
-#elif defined(__USE_TIMER_THREAD) /* __AOS__ */
+#else /* __AOS__ */
     {
         sem_t wait;
         sem_init (&wait, 0, 0);
@@ -135,7 +135,7 @@ int __mg_timer_init (void)
         sem_wait (&wait);
         sem_destroy (&wait);
     }
-#endif /* __USE_TIMER_THREAD */
+#endif /* !__AOS__ */
 
     return 0;
 }