X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_task.h;h=d27ef060384b375100930fd886d0fb7506326d3f;hb=6b0754cee625c6e2c19dc70fb5be6cd2f0125d47;hp=f3789fa2cd2725a6fd3207561e124263815ed530;hpb=2cdb1f30c49ba460b0850d23ba9c85e0336af290;p=fw%2Faltos

diff --git a/src/kernel/ao_task.h b/src/kernel/ao_task.h
index f3789fa2..d27ef060 100644
--- a/src/kernel/ao_task.h
+++ b/src/kernel/ao_task.h
@@ -27,31 +27,34 @@
 #endif
 
 /* arm stacks must be 32-bit aligned */
+#ifndef AO_STACK_ALIGNMENT
 #ifdef __arm__
 #define AO_STACK_ALIGNMENT __attribute__ ((aligned(4)))
-#endif
-#ifdef SDCC
+#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) */
+	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 */
+	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, always 32-bit aligned */
+	union {
+		uint32_t stack32[AO_STACK_SIZE>>2];
+		uint8_t stack8[AO_STACK_SIZE];
+	};
 #if HAS_SAMPLE_PROFILE
 	uint32_t ticks;
 	uint32_t yields;