a stab at turning on rudimentary logging for telefiretwo

[fw/altos] / src / kernel / ao_task.h

diff --git a/src/kernel/ao_task.h b/src/kernel/ao_task.h
index c6bec0e397dccba3f1625160330ff4af049f27fa..30b018ffe36aff064afb91b0a8fe1c41e1a20483 100644 (file)
--- a/src/kernel/ao_task.h
+++ b/src/kernel/ao_task.h
@@ -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
@@ -25,6 +26,17 @@
 #define HAS_TASK_INFO 1
 #endif
 
+/* arm stacks must be 32-bit aligned */
+#ifdef __arm__
+#define AO_STACK_ALIGNMENT __attribute__ ((aligned(4)))
+#endif
+#ifdef SDCC
+#define AO_STACK_ALIGNMENT
+#endif
+#ifdef __AVR__
+#define AO_STACK_ALIGNMENT
+#endif
+
 /* An AltOS task */
 struct ao_task {
        __xdata void *wchan;            /* current wait channel (NULL if running) */
@@ -36,7 +48,7 @@ struct ao_task {
        struct ao_list  queue;
        struct ao_list  alarm_queue;
 #endif
-       uint8_t stack[AO_STACK_SIZE];   /* saved stack */
+       uint8_t stack[AO_STACK_SIZE] AO_STACK_ALIGNMENT;        /* saved stack */
 #if HAS_SAMPLE_PROFILE
        uint32_t ticks;
        uint32_t yields;
@@ -56,6 +68,10 @@ extern __data uint8_t ao_num_tasks;
 extern __xdata struct ao_task *__data ao_cur_task;
 extern __data uint8_t ao_task_minimize_latency;        /* Reduce IRQ latency */
 
+#ifndef HAS_ARCH_VALIDATE_CUR_STACK
+#define ao_validate_cur_stack()
+#endif
+
 /*
  ao_task.c
  */