X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao_task.c;h=f79d6e1f184aa530917f59050856a00256b61860;hp=a56fe29f90df322f976d8668d9bf2bacc6a3c796;hb=5e2393eb6b1a6d7b180bd63d5165ee7b7ff5f9e0;hpb=f3f25a1cec7d2a034aa544569cfd23bea1a996c5

diff --git a/ao_task.c b/ao_task.c
index a56fe29f..f79d6e1f 100644
--- a/ao_task.c
+++ b/ao_task.c
@@ -17,11 +17,11 @@
 
 #include "ao.h"
 
-#define AO_NO_TASK	0xff
+#define AO_NO_TASK_INDEX	0xff
 
 __xdata struct ao_task * __xdata ao_tasks[AO_NUM_TASKS];
 __data uint8_t ao_num_tasks;
-__data uint8_t ao_cur_task_id;
+__data uint8_t ao_cur_task_index;
 __xdata struct ao_task *__data ao_cur_task;
 
 void
@@ -29,8 +29,9 @@ ao_add_task(__xdata struct ao_task * task, void (*start)(void))
 {
 	uint8_t	__xdata *stack;
 	if (ao_num_tasks == AO_NUM_TASKS)
-		ao_panic(AO_ERROR_NO_TASK);
+		ao_panic(AO_PANIC_NO_TASK);
 	ao_tasks[ao_num_tasks++] = task;
+	task->task_id = ao_num_tasks;
 	/*
 	 * Construct a stack frame so that it will 'return'
 	 * to the start of the task
@@ -94,7 +95,7 @@ ao_yield(void) _naked
 		push	_bp
 	_endasm;
 	
-	if (ao_cur_task_id != AO_NO_TASK)
+	if (ao_cur_task_index != AO_NO_TASK_INDEX)
 	{
 		/* Save the current stack */
 		stack_len = SP - (AO_STACK_START - 1);
@@ -112,10 +113,10 @@ ao_yield(void) _naked
 	 * this loop will run forever, which is just fine
 	 */
 	for (;;) {
-		++ao_cur_task_id;
-		if (ao_cur_task_id == ao_num_tasks)
-			ao_cur_task_id = 0;
-		ao_cur_task = ao_tasks[ao_cur_task_id];
+		++ao_cur_task_index;
+		if (ao_cur_task_index == ao_num_tasks)
+			ao_cur_task_index = 0;
+		ao_cur_task = ao_tasks[ao_cur_task_index];
 		if (ao_cur_task->wchan == NULL)
 			break;
 	}
@@ -162,7 +163,9 @@ ao_yield(void) _naked
 int
 ao_sleep(__xdata void *wchan)
 {
+	__critical {
 	ao_cur_task->wchan = wchan;
+	}
 	ao_yield();
 }
 
@@ -179,12 +182,8 @@ ao_wakeup(__xdata void *wchan)
 void
 ao_start_scheduler(void)
 {
-	ao_timer_init();
-	ao_adc_init();
-	ao_beep_init();
-	ao_led_init();
 
-	ao_cur_task_id = AO_NO_TASK;
+	ao_cur_task_index = AO_NO_TASK_INDEX;
 	ao_cur_task = NULL;
 	ao_yield();
 }