X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fkernel%2Fao_task.h;h=7d81c1da547243e4c024fbf35ebcc5ae8633812a;hp=ffeb7313ba423af2c55cd052c6728ef4d48eb896;hb=b8a9273162b7016afc29f4c98fc3b66324d4c85b;hpb=c6e57291d91f1f6c4de5c54a5cfd3eef66d9f830

diff --git a/src/kernel/ao_task.h b/src/kernel/ao_task.h
index ffeb7313..7d81c1da 100644
--- a/src/kernel/ao_task.h
+++ b/src/kernel/ao_task.h
@@ -26,32 +26,35 @@
 #define HAS_TASK_INFO 1
 #endif
 
-/* arm stacks must be 32-bit aligned */
+/* arm stacks must be 64-bit aligned */
+#ifndef AO_STACK_ALIGNMENT
 #ifdef __arm__
-#define AO_STACK_ALIGNMENT __attribute__ ((aligned(4)))
-#endif
-#ifdef SDCC
+#define AO_STACK_ALIGNMENT __attribute__ ((aligned(8)))
+#else
 #define AO_STACK_ALIGNMENT
 #endif
-#ifdef __AVR__
-#define AO_STACK_ALIGNMENT
 #endif
 
 /* An AltOS task */
 struct ao_task {
-	void *wchan;		/* current wait channel (NULL if running) */
-	uint16_t alarm;			/* abort ao_sleep time */
-	ao_arch_task_members		/* any architecture-specific fields */
-	uint8_t task_id;		/* unique id */
+	void *wchan;			/* current wait channel (NULL if running) */
+	AO_TICK_TYPE alarm;		/* abort ao_sleep time */
+	uint16_t task_id;		/* unique id */
+	/* Saved stack pointer */
+	union {
+		uint32_t	*sp32;
+		uint8_t		*sp8;
+	};
 	const char *name;		/* task name */
-#ifdef NEWLIB
-	int __errno;			/* storage for errno in newlib libc */
-#endif
 #if HAS_TASK_QUEUE
 	struct ao_list	queue;
 	struct ao_list	alarm_queue;
 #endif
-	uint8_t stack[AO_STACK_SIZE] AO_STACK_ALIGNMENT;	/* saved stack */
+	/* Provide both 32-bit and 8-bit stacks */
+	union {
+		uint32_t stack32[AO_STACK_SIZE>>2];
+		uint8_t stack8[AO_STACK_SIZE];
+	} AO_STACK_ALIGNMENT;
 #if HAS_SAMPLE_PROFILE
 	uint32_t ticks;
 	uint32_t yields;
@@ -93,7 +96,7 @@ ao_sleep(void *wchan);
  *  1 on alarm
  */
 uint8_t
-ao_sleep_for(void *wchan, uint16_t timeout);
+ao_sleep_for(void *wchan, AO_TICK_TYPE timeout);
 
 /* Wake all tasks sleeping on wchan */
 void
@@ -102,7 +105,7 @@ ao_wakeup(void *wchan);
 #if 0
 /* set an alarm to go off in 'delay' ticks */
 void
-ao_alarm(uint16_t delay);
+ao_alarm(AO_TICK_TYPE delay);
 
 /* Clear any pending alarm */
 void
@@ -119,9 +122,9 @@ ao_add_task(struct ao_task * task, void (*start)(void), const char *name);
 
 #if HAS_TASK_QUEUE
 /* Called on timer interrupt to check alarms */
-extern uint16_t	ao_task_alarm_tick;
+extern AO_TICK_TYPE	ao_task_alarm_tick;
 void
-ao_task_check_alarm(uint16_t tick);
+ao_task_check_alarm(AO_TICK_TYPE tick);
 #endif
 
 /* Terminate the current task */
@@ -134,7 +137,7 @@ ao_task_info(void);
 
 /* Start the scheduler. This will not return */
 void
-ao_start_scheduler(void);
+ao_start_scheduler(void) __attribute__((noreturn));
 
 #if HAS_TASK_QUEUE
 void