dynamic task allocation

[mTask.git] / client / task.c

diff --git a/client/task.c b/client/task.c
index 12789ce..b420c19 100644 (file)
--- a/client/task.c
+++ b/client/task.c
@@ -10,12 +10,10 @@
 uint8_t taskspace[TASKSPACE] = {0};
 uint8_t *spacepointer = (uint8_t *)&taskspace;
 uint8_t taskid = 0;
-struct task *head = NULL;
 
 void task_init(void)
 {
        memset(&taskspace, 0, TASKSPACE);
-       head = NULL;
 }
 
 void task_register(void)
@@ -27,9 +25,6 @@ void task_register(void)
 
        //We haven't had a task before, therefore we initialize head
        struct task *t = (struct task *)spacepointer;
-       if(head == NULL) {
-               head = t;
-       }
 
        //Read interval
        t->interval = read16();
@@ -48,12 +43,15 @@ void task_register(void)
                die("Out of memory... Not enough to allocate bytes");
        }
 
+       spacepointer += sizeof(struct task);
+       t->bc = spacepointer;
        spacepointer += t->tasklength;
 
        //Read task bytecode
        for(i = 0; i<t->tasklength; i++){
                t->bc[i] = read_byte();
        }
+
        //Return the task number for later removal
        debug("Received a task of length %d", t->tasklength);
        t->lastrun = 0L;
@@ -78,32 +76,31 @@ bool had_interrupt(struct task* t)
 
 struct task *task_head(void)
 {
-       return head;
+       return spacepointer == (uint8_t *)&taskspace ? NULL
+               : (struct task *)&taskspace;
 }
 
 struct task *task_next(struct task *t)
 {
-       if(t == NULL){
-               return NULL;
-       }
-
        uint8_t *next = (uint8_t *)t;
        next += sizeof(struct task);
        next += t->tasklength;
 
-       return next > spacepointer ? NULL : (struct task *)next;
+       return next >= spacepointer ? NULL : (struct task *)next;
 }
 
-void task_delete(void)
+void task_delete(uint8_t c)
 {
-       uint8_t c = read16();
-       struct task *t = NULL;
+       debug("Going to delete task: %i", c);
+       debug("spacepointer: %p", spacepointer);
+       struct task *t = task_head();
        while(t != NULL){
                if(t->taskid == c){
                        break;
                }
                t = task_next(t);
        }
+
        if(t != NULL){
                //We found the task, now we move everything from the end of the task up
                //to the spacepointer right
@@ -116,14 +113,6 @@ void task_delete(void)
 
                //Decrement the spacepointer
                spacepointer -= end-start;
-
-               if(t == head){
-                       head = task_next(t);
-               }
-
-               //Write acknowledgement
-               write_byte('d');
-               write16(c);
-               write_byte('\n');
        }
+       debug("spacepointer: %p", spacepointer);
 }