X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_task.c;h=de23ea02421013e4186801b85664abb81630d99a;hb=4431f70044f4e1120d606f0ded1845349295d68e;hp=47352fc104afde937559c9ee2a31060447c62c95;hpb=658d8be170f9aea683fe62b68368736a177411a5;p=fw%2Faltos

diff --git a/src/kernel/ao_task.c b/src/kernel/ao_task.c
index 47352fc1..de23ea02 100644
--- a/src/kernel/ao_task.c
+++ b/src/kernel/ao_task.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -372,7 +373,11 @@ ao_yield(void) ao_arch_naked_define
 		if (!ao_list_is_empty(&run_queue))
 			break;
 		/* Wait for interrupts when there's nothing ready */
-		ao_arch_wait_interrupt();
+		if (ao_task_minimize_latency) {
+			ao_arch_release_interrupts();
+			ao_arch_block_interrupts();
+		} else
+			ao_arch_wait_interrupt();
 	}
 	ao_cur_task = ao_list_first_entry(&run_queue, struct ao_task, queue);
 #else
@@ -504,6 +509,8 @@ static __xdata uint8_t ao_forever;
 void
 ao_delay(uint16_t ticks)
 {
+	if (!ticks)
+		ticks = 1;
 	ao_sleep_for(&ao_forever, ticks);
 }
 
@@ -535,12 +542,15 @@ ao_task_info(void)
 {
 	uint8_t		i;
 	__xdata struct ao_task *task;
+	uint16_t	now = ao_time();
 
 	for (i = 0; i < ao_num_tasks; i++) {
 		task = ao_tasks[i];
-		printf("%12s: wchan %04x\n",
-		       task->name,
-		       (int) task->wchan);
+		printf("%2d: wchan %08x alarm %5d %s\n",
+		       task->task_id,
+		       (int) task->wchan,
+		       task->alarm ? (int16_t) (task->alarm - now) : 9999,
+		       task->name);
 	}
 #if HAS_TASK_QUEUE && DEBUG
 	ao_task_validate();