X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcore%2Fao_task.c;h=bafb49439d4441022be1b9159947f30a9f8d7bff;hb=e76948d382cf6980c3a5b6c48405d71c8811780b;hp=9cb074b5220a2c6279353d1b4ab5371be2dd5385;hpb=6fa1ec0dbf2a4eda8d061c67b3779b83b88f29f0;p=fw%2Faltos

diff --git a/src/core/ao_task.c b/src/core/ao_task.c
index 9cb074b5..bafb4943 100644
--- a/src/core/ao_task.c
+++ b/src/core/ao_task.c
@@ -109,6 +109,8 @@ ao_task_validate_alarm_queue(void)
 				ao_panic(3);
 		}
 	}
+	if (ao_task_alarm_tick != ao_list_first_entry(&alarm_queue, struct ao_task, alarm_queue)->alarm)
+		ao_panic(4);
 }
 #else
 #define ao_task_validate_alarm_queue()
@@ -123,6 +125,7 @@ ao_task_to_alarm_queue(struct ao_task *task)
 	ao_list_for_each_entry(alarm, &alarm_queue, struct ao_task, alarm_queue) {
 		if ((int16_t) (alarm->alarm - task->alarm) >= 0) {
 			ao_list_insert(&task->alarm_queue, alarm->alarm_queue.prev);
+			ao_task_alarm_tick = ao_list_first_entry(&alarm_queue, struct ao_task, alarm_queue)->alarm;
 			ao_task_validate_alarm_queue();
 			return;
 		}
@@ -420,7 +423,7 @@ ao_sleep(__xdata void *wchan)
 }
 
 void
-ao_wakeup(__xdata void *wchan)
+ao_wakeup(__xdata void *wchan) __reentrant
 {
 #if HAS_TASK_QUEUE
 	struct ao_task	*sleep, *next;
@@ -512,6 +515,7 @@ ao_exit(void)
 	/* we'll never get back here */
 }
 
+#if HAS_TASK_INFO
 void
 ao_task_info(void)
 {
@@ -528,6 +532,7 @@ ao_task_info(void)
 	ao_task_validate();
 #endif
 }
+#endif
 
 void
 ao_start_scheduler(void)
@@ -536,5 +541,8 @@ ao_start_scheduler(void)
 	ao_cur_task_index = AO_NO_TASK_INDEX;
 #endif
 	ao_cur_task = NULL;
+#if HAS_ARCH_START_SCHEDULER
+	ao_arch_start_scheduler();
+#endif
 	ao_yield();
 }