Skip to content

RTX: Support stacks larger than 64k #826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 5, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
.file "HAL_CM0.S"
.syntax unified

.equ TCB_TSTACK, 36
.equ TCB_TSTACK, 40


/*----------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

NAME HAL_CM0.S

#define TCB_TSTACK 36
#define TCB_TSTACK 40

EXTERN os_flags
EXTERN os_tsk
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
.file "HAL_CM0.S"
.syntax unified

.equ TCB_TSTACK, 36
.equ TCB_TSTACK, 40


/*----------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

NAME HAL_CM0.S

#define TCB_TSTACK 36
#define TCB_TSTACK 40

EXTERN os_flags
EXTERN os_tsk
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
.file "HAL_CM3.S"
.syntax unified

.equ TCB_TSTACK, 36
.equ TCB_TSTACK, 40


/*----------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

NAME HAL_CM3.S

#define TCB_TSTACK 36
#define TCB_TSTACK 40

EXTERN os_flags
EXTERN os_tsk
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
.syntax unified

.equ TCB_STACKF, 32
.equ TCB_TSTACK, 36
.equ TCB_TSTACK, 40


/*----------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
NAME HAL_CM4.S

#define TCB_STACKF 32
#define TCB_TSTACK 36
#define TCB_TSTACK 40

EXTERN os_flags
EXTERN os_tsk
Expand Down
5 changes: 3 additions & 2 deletions libraries/rtos/rtx/TARGET_CORTEX_M/os_tcb.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ typedef struct OS_TCB {

/* Hardware dependant part: specific for CM processor */
U8 stack_frame; /* Stack frame: 0=Basic, 1=Extended */
U8 reserved;
U16 priv_stack; /* Private stack size in bytes */
U8 reserved1;
U16 reserved2;
U32 priv_stack; /* Private stack size in bytes */
U32 tsk_stack; /* Current task Stack pointer (R13) */
U32 *stack; /* Pointer to Task Stack memory block */

Expand Down
2 changes: 1 addition & 1 deletion libraries/rtos/rtx/TARGET_CORTEX_M/rt_TypeDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ typedef void *OS_ID;
typedef U32 OS_RESULT;

#define TCB_STACKF 32 /* 'stack_frame' offset */
#define TCB_TSTACK 36 /* 'tsk_stack' offset */
#define TCB_TSTACK 40 /* 'tsk_stack' offset */

typedef struct OS_PSFE { /* Post Service Fifo Entry */
void *id; /* Object Identification */
Expand Down