X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao_task.c;h=043b3df2d8c9032c044561447b475b33c494ea38;hp=0e976d7c4247e5e341c40684c2d62a8e2c59018c;hb=5be13b76a2e29b84cd6d1eec065e3354b0dafce5;hpb=823f4f92de0c1f8dd7a644a8e56ffe9822bee6e2

diff --git a/ao_task.c b/ao_task.c
index 0e976d7c..043b3df2 100644
--- a/ao_task.c
+++ b/ao_task.c
@@ -17,20 +17,22 @@
 
 #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
-ao_add_task(__xdata struct ao_task * task, void (*start)(void))
+ao_add_task(__xdata struct ao_task * task, void (*start)(void), __code char *name)
 {
 	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;
+	task->name = name;
 	/*
 	 * Construct a stack frame so that it will 'return'
 	 * to the start of the task
@@ -64,9 +66,6 @@ ao_add_task(__xdata struct ao_task * task, void (*start)(void))
 void
 ao_yield(void) _naked
 {
-	static uint8_t __data stack_len;
-	static __data uint8_t * __data stack_ptr;
-	static __xdata uint8_t * __data save_ptr;
 
 	/* Save current context */
 	_asm
@@ -94,15 +93,19 @@ ao_yield(void) _naked
 		push	_bp
 	_endasm;
 	
-	if (ao_cur_task_id != AO_NO_TASK)
+	if (ao_cur_task_index != AO_NO_TASK_INDEX)
 	{
+		uint8_t stack_len;
+		__data uint8_t *stack_ptr;
+		__xdata uint8_t *save_ptr;
 		/* Save the current stack */
 		stack_len = SP - (AO_STACK_START - 1);
 		ao_cur_task->stack_count = stack_len;
 		stack_ptr = (uint8_t __data *) AO_STACK_START;
 		save_ptr = (uint8_t __xdata *) ao_cur_task->stack;
-		while (stack_len--)
+		do
 			*save_ptr++ = *stack_ptr++;
+		while (--stack_len);
 	}
 	
 	/* Empty the stack; might as well let interrupts have the whole thing */
@@ -112,22 +115,29 @@ 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;
 	}
 
-	/* Restore the old stack */
-	stack_len = ao_cur_task->stack_count;
-	SP = AO_STACK_START - 1 + stack_len;
+	{
+		uint8_t stack_len;
+		__data uint8_t *stack_ptr;
+		__xdata uint8_t *save_ptr;
 
-	stack_ptr = (uint8_t __data *) AO_STACK_START;
-	save_ptr = (uint8_t __xdata *) ao_cur_task->stack;
-	while (stack_len--)
-		*stack_ptr++ = *save_ptr++;
+		/* Restore the old stack */
+		stack_len = ao_cur_task->stack_count;
+		SP = AO_STACK_START - 1 + stack_len;
+	
+		stack_ptr = (uint8_t __data *) AO_STACK_START;
+		save_ptr = (uint8_t __xdata *) ao_cur_task->stack;
+		do
+			*stack_ptr++ = *save_ptr++;
+		while (--stack_len);
+	}
 
 	_asm
 		pop		_bp
@@ -162,7 +172,9 @@ ao_yield(void) _naked
 int
 ao_sleep(__xdata void *wchan)
 {
+	__critical {
 	ao_cur_task->wchan = wchan;
+	}
 	ao_yield();
 }
 
@@ -176,11 +188,25 @@ ao_wakeup(__xdata void *wchan)
 			ao_tasks[i]->wchan = NULL;
 }
 
+void
+ao_task_info(void)
+{
+	uint8_t	i;
+	uint8_t pc_loc;
+
+	for (i = 0; i < ao_num_tasks; i++) {
+		pc_loc = ao_tasks[i]->stack_count - 17;
+		printf("%-8s: wchan %04x pc %04x\n",
+		       ao_tasks[i]->name,
+		       (int16_t) ao_tasks[i]->wchan,
+		       (ao_tasks[i]->stack[pc_loc]) | (ao_tasks[i]->stack[pc_loc+1] << 8));
+	}
+}
+
 void
 ao_start_scheduler(void)
 {
-	ao_cur_task_id = AO_NO_TASK;
+	ao_cur_task_index = AO_NO_TASK_INDEX;
 	ao_cur_task = NULL;
-	ao_timer_init();
 	ao_yield();
 }