altos: Configure packet size from send/recv parameters.

[fw/altos] / src / ao_task.c

diff --git a/src/ao_task.c b/src/ao_task.c
index 4a78766e2828664b1687b09f0ea28a02ac987066..35f34b491eef2a92d507756504cb47e8222c6ecc 100644 (file)
--- 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;
 }
 
@@ -224,12 +232,6 @@ ao_alarm(uint16_t delay)
                ao_cur_task->alarm = 1;
 }
 
-void
-ao_wake_task(__xdata struct ao_task *task)
-{
-       task->wchan = NULL;
-}
-
 void
 ao_exit(void) __critical
 {