From 96be5f3700c95b3ee05be037340e693c0d2a9126 Mon Sep 17 00:00:00 2001
From: Jeroen Domburg <jeroen@espressif.com>
Date: Wed, 1 Mar 2017 17:59:07 +0800
Subject: [PATCH] Get rid of _all_ uint16_t things that refer to stack size.
 Plus small fix to panic, not break, when coproc enable error.

---
 components/freertos/include/freertos/portable.h | 2 +-
 components/freertos/include/freertos/task.h     | 2 +-
 components/freertos/port.c                      | 2 +-
 components/freertos/xtensa_vectors.S            | 3 ---
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/components/freertos/include/freertos/portable.h b/components/freertos/include/freertos/portable.h
index e46ec17fb..be45c4ecc 100644
--- a/components/freertos/include/freertos/portable.h
+++ b/components/freertos/include/freertos/portable.h
@@ -209,7 +209,7 @@ BaseType_t xPortInIsrContext();
  */
 #if( portUSING_MPU_WRAPPERS == 1 )
 	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
 
 /* Multi-core: get current core ID */
diff --git a/components/freertos/include/freertos/task.h b/components/freertos/include/freertos/task.h
index 418a8f399..bd91d3499 100644
--- a/components/freertos/include/freertos/task.h
+++ b/components/freertos/include/freertos/task.h
@@ -1250,7 +1250,7 @@ TickType_t xTaskGetTickCountFromISR( void ) PRIVILEGED_FUNCTION;
 
 /**
  * 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.
  * This includes all ready, blocked and suspended tasks.  A task that
diff --git a/components/freertos/port.c b/components/freertos/port.c
index 83b793c9d..f01045ec5 100644
--- a/components/freertos/port.c
+++ b/components/freertos/port.c
@@ -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.
  */
 #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
 	xMPUSettings->coproc_area = (StackType_t*)((((uint32_t)(pxBottomOfStack + usStackDepth - 1)) - XT_CP_SIZE ) & ~0xf);
diff --git a/components/freertos/xtensa_vectors.S b/components/freertos/xtensa_vectors.S
index a6dd01d31..507a26806 100644
--- a/components/freertos/xtensa_vectors.S
+++ b/components/freertos/xtensa_vectors.S
@@ -1054,9 +1054,6 @@ _xt_coproc_exc:
 
     /* Co-processor exception occurred outside a thread (not supported). */
 .L_xt_coproc_invalid:
-    #if XCHAL_HAVE_DEBUG
-    break   1, 1                            /* unhandled user exception */
-    #endif
     movi    a0,PANIC_RSN_COPROCEXCEPTION
     wsr     a0,EXCCAUSE
     call0   _xt_panic                       /* not in a thread (invalid) */