X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_task.c;h=35f34b491eef2a92d507756504cb47e8222c6ecc;hp=4664163d6a1a7ccdd6801575f2b182d58e8d3f6a;hb=d794ef9e0fbe4d13259db1bbd69f01717c14400b;hpb=7db9d86178ecfd58cc1c17ac9fcbdcfd2f13aaec

diff --git a/src/ao_task.c b/src/ao_task.c
index 4664163d..35f34b49 100644
--- a/src/ao_task.c
+++ b/src/ao_task.c
@@ -28,10 +28,19 @@ void
 ao_add_task(__xdata struct ao_task * task, void (*start)(void), __code char *name) __reentrant
 {
 	uint8_t	__xdata *stack;
+	uint8_t task_id;
+	uint8_t t;
 	if (ao_num_tasks == AO_NUM_TASKS)
 		ao_panic(AO_PANIC_NO_TASK);
+	for (task_id = 1; task_id != 0; task_id++) {
+		for (t = 0; t < ao_num_tasks; t++)
+			if (ao_tasks[t]->task_id == task_id)
+				break;
+		if (t == ao_num_tasks)
+			break;
+	}
 	ao_tasks[ao_num_tasks++] = task;
-	task->task_id = ao_num_tasks;
+	task->task_id = task_id;
 	task->name = name;
 	/*
 	 * Construct a stack frame so that it will 'return'
@@ -195,12 +204,11 @@ ao_sleep(__xdata void *wchan)
 		ao_cur_task->wchan = wchan;
 	}
 	ao_yield();
+	ao_cur_task->alarm = 0;
 	if (ao_cur_task->wchan) {
 		ao_cur_task->wchan = NULL;
-		ao_cur_task->alarm = 0;
 		return 1;
 	}
-	ao_cur_task->alarm = 0;
 	return 0;
 }
 
@@ -217,16 +225,13 @@ ao_wakeup(__xdata void *wchan)
 void
 ao_alarm(uint16_t delay)
 {
-	if (!(ao_cur_task->alarm = ao_time() + delay))
+	/* Make sure we sleep *at least* delay ticks, which means adding
+	 * one to account for the fact that we may be close to the next tick
+	 */
+	if (!(ao_cur_task->alarm = ao_time() + delay + 1))
 		ao_cur_task->alarm = 1;
 }
 
-void
-ao_wake_task(__xdata struct ao_task *task)
-{
-	task->wchan = NULL;
-}
-
 void
 ao_exit(void) __critical
 {