Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Get rid of _all_ uint16_t things that refer to stack size. Plus small fix to panic, not break, when coproc enable error.

Browse source
This commit is contained in:
Jeroen Domburg 2017-03-01 17:59:07 +08:00
parent 0be8f6d308
commit 96be5f3700
4 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/freertos/include/freertos/portable.h
View file

@ -209,7 +209,7 @@ BaseType_t xPortInIsrContext();
*/ */
#if( portUSING_MPU_WRAPPERS == 1 ) #if( portUSING_MPU_WRAPPERS == 1 )
struct xMEMORY_REGION; struct xMEMORY_REGION;
void vPortStoreTaskMPUSettings( xMPU_SETTINGS *xMPUSettings, const struct xMEMORY_REGION * const xRegions, StackType_t *pxBottomOfStack, uint16_t usStackDepth ) PRIVILEGED_FUNCTION; void vPortStoreTaskMPUSettings( xMPU_SETTINGS *xMPUSettings, const struct xMEMORY_REGION * const xRegions, StackType_t *pxBottomOfStack, uint32_t usStackDepth ) PRIVILEGED_FUNCTION;
#endif #endif
/* Multi-core: get current core ID */ /* Multi-core: get current core ID */

2
components/freertos/include/freertos/task.h
View file

@ -1250,7 +1250,7 @@ TickType_t xTaskGetTickCountFromISR( void ) PRIVILEGED_FUNCTION;
/** /**
* task. h * task. h
* <PRE>uint16_t uxTaskGetNumberOfTasks( void );</PRE> * <PRE>UBaseType_t uxTaskGetNumberOfTasks( void );</PRE>
* *
* @return The number of tasks that the real time kernel is currently managing. * @return The number of tasks that the real time kernel is currently managing.
* This includes all ready, blocked and suspended tasks. A task that * This includes all ready, blocked and suspended tasks. A task that

2
components/freertos/port.c
View file

@ -242,7 +242,7 @@ void vPortYieldOtherCore( BaseType_t coreid ) {
* Used to set coprocessor area in stack. Current hack is to reuse MPU pointer for coprocessor area. * Used to set coprocessor area in stack. Current hack is to reuse MPU pointer for coprocessor area.
*/ */
#if portUSING_MPU_WRAPPERS #if portUSING_MPU_WRAPPERS
void vPortStoreTaskMPUSettings( xMPU_SETTINGS *xMPUSettings, const struct xMEMORY_REGION * const xRegions, StackType_t *pxBottomOfStack, uint16_t usStackDepth ) void vPortStoreTaskMPUSettings( xMPU_SETTINGS *xMPUSettings, const struct xMEMORY_REGION * const xRegions, StackType_t *pxBottomOfStack, uint32_t usStackDepth )
{ {
#if XCHAL_CP_NUM > 0 #if XCHAL_CP_NUM > 0
xMPUSettings->coproc_area = (StackType_t*)((((uint32_t)(pxBottomOfStack + usStackDepth - 1)) - XT_CP_SIZE ) & ~0xf); xMPUSettings->coproc_area = (StackType_t*)((((uint32_t)(pxBottomOfStack + usStackDepth - 1)) - XT_CP_SIZE ) & ~0xf);

3
components/freertos/xtensa_vectors.S
View file

@ -1054,9 +1054,6 @@ _xt_coproc_exc:
/* Co-processor exception occurred outside a thread (not supported). */ /* Co-processor exception occurred outside a thread (not supported). */
.L_xt_coproc_invalid: .L_xt_coproc_invalid:
#if XCHAL_HAVE_DEBUG
break 1, 1 /* unhandled user exception */
#endif
movi a0,PANIC_RSN_COPROCEXCEPTION movi a0,PANIC_RSN_COPROCEXCEPTION
wsr a0,EXCCAUSE wsr a0,EXCCAUSE
call0 _xt_panic /* not in a thread (invalid) */ call0 _xt_panic /* not in a thread (invalid) */