summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHa Thach <[email protected]>2021-11-29 16:17:37 +0700
committerGitHub <[email protected]>2021-11-29 16:17:37 +0700
commitae5b1bab149d491a03427081a40019a2265b2e9c (patch)
treefada505816d3ff223536b249ebdc18b0525e7fb4
parentaae57cd3fd3dcebea1768c0c9cbc7d70a0b1cd0f (diff)
parent7ad0af64cc172331413aa634aa28002171fe31ab (diff)
Merge pull request #1215 from hathach/fix-esp-stack
use 4k stack for example with esp32sx
-rw-r--r--examples/device/cdc_msc_freertos/src/main.c14
-rw-r--r--examples/device/hid_composite_freertos/src/main.c14
2 files changed, 13 insertions, 15 deletions
diff --git a/examples/device/cdc_msc_freertos/src/main.c b/examples/device/cdc_msc_freertos/src/main.c
index 2d3426f1d..0a1c964ae 100644
--- a/examples/device/cdc_msc_freertos/src/main.c
+++ b/examples/device/cdc_msc_freertos/src/main.c
@@ -38,12 +38,17 @@
#include "freertos/queue.h"
#include "freertos/task.h"
#include "freertos/timers.h"
+
+ #define USBD_STACK_SIZE 4096
#else
#include "FreeRTOS.h"
#include "semphr.h"
#include "queue.h"
#include "task.h"
#include "timers.h"
+
+ // Increase stack size when debug log is enabled
+ #define USBD_STACK_SIZE (3*configMINIMAL_STACK_SIZE/2) * (CFG_TUSB_DEBUG ? 2 : 1)
#endif
//--------------------------------------------------------------------+
@@ -65,14 +70,7 @@ enum {
StaticTimer_t blinky_tmdef;
TimerHandle_t blinky_tm;
-// static task for usbd
-// Increase stack size when debug log is enabled
-#if CFG_TUSB_DEBUG
- #define USBD_STACK_SIZE (3*configMINIMAL_STACK_SIZE)
-#else
- #define USBD_STACK_SIZE (3*configMINIMAL_STACK_SIZE/2)
-#endif
-
+// static task
StackType_t usb_device_stack[USBD_STACK_SIZE];
StaticTask_t usb_device_taskdef;
diff --git a/examples/device/hid_composite_freertos/src/main.c b/examples/device/hid_composite_freertos/src/main.c
index 336f5d426..1695f968c 100644
--- a/examples/device/hid_composite_freertos/src/main.c
+++ b/examples/device/hid_composite_freertos/src/main.c
@@ -39,12 +39,18 @@
#include "freertos/queue.h"
#include "freertos/task.h"
#include "freertos/timers.h"
+
+ #define USBD_STACK_SIZE 4096
+
#else
#include "FreeRTOS.h"
#include "semphr.h"
#include "queue.h"
#include "task.h"
#include "timers.h"
+
+ // Increase stack size when debug log is enabled
+ #define USBD_STACK_SIZE (3*configMINIMAL_STACK_SIZE/2) * (CFG_TUSB_DEBUG ? 2 : 1)
#endif
//--------------------------------------------------------------------+
@@ -66,13 +72,7 @@ enum {
StaticTimer_t blinky_tmdef;
TimerHandle_t blinky_tm;
-// static task for usbd
-#if CFG_TUSB_DEBUG
- #define USBD_STACK_SIZE (3*configMINIMAL_STACK_SIZE)
-#else
- #define USBD_STACK_SIZE (3*configMINIMAL_STACK_SIZE/2)
-#endif
-
+// static task
StackType_t usb_device_stack[USBD_STACK_SIZE];
StaticTask_t usb_device_taskdef;