michaelh/zephyr
1
0
Fork 0
Code Releases Activity

unified: Include _timeout structure in tcs_base

Browse source 
The '_timeout' structure is needed by dummy threads so that they can
handle timeouts.

Change-Id: Iefabd6ad93c8e176e95ce4262f5f3544dc90b7d5
Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>
This commit is contained in:
Peter Mitsis 2016-09-09 14:20:55 -04:00 • committed by Benjamin Walsh
commit 3ffe5bfb8c
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
arch/arm/include/nano_private.h
View file

@ -168,6 +168,9 @@ struct tcs_base {
uint32_t flags;
int prio;
void *swap_data;
#ifdef CONFIG_NANO_TIMEOUTS
struct _timeout timeout;
#endif
};
#endif
@ -177,6 +180,9 @@ struct tcs {
uint32_t flags;
int prio;
void *swap_data;
#ifdef CONFIG_NANO_TIMEOUTS
struct _timeout timeout;
#endif
#else
struct tcs *link; /* singly-linked list in _nanokernel.fibers */
uint32_t flags;
@ -204,9 +210,6 @@ struct tcs {
#endif
#endif
#ifdef CONFIG_KERNEL_V2
#ifdef CONFIG_NANO_TIMEOUTS
struct _timeout timeout;
#endif
atomic_t sched_locked;
void *init_data;
void (*fn_abort)(void);

9
arch/x86/include/nano_private.h
View file

@ -640,6 +640,9 @@ struct tcs_base {
uint32_t flags;
int prio; /* thread priority used to sort linked list */
void *swap_data;
#ifdef CONFIG_NANO_TIMEOUTS
struct _timeout timeout;
#endif
};
#endif
@ -662,6 +665,9 @@ struct tcs {
int flags;
int prio; /* thread priority used to sort linked list */
void *swap_data;
#ifdef CONFIG_NANO_TIMEOUTS
struct _timeout timeout;
#endif
#else
struct tcs *link;
@ -722,9 +728,6 @@ struct tcs {
#endif
#ifdef CONFIG_KERNEL_V2
#ifdef CONFIG_NANO_TIMEOUTS
struct _timeout timeout;
#endif
atomic_t sched_locked;
void *init_data;
void (*fn_abort)(void);