diff options
Diffstat (limited to 'src/kernel/ao_task.h')
| -rw-r--r-- | src/kernel/ao_task.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/kernel/ao_task.h b/src/kernel/ao_task.h index 709e10c6..d27ef060 100644 --- a/src/kernel/ao_task.h +++ b/src/kernel/ao_task.h @@ -37,19 +37,24 @@ /* 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; |