diff options
| -rw-r--r-- | examples/device/cdc_msc_hid/src/main.c | 4 | ||||
| -rw-r--r-- | examples/device/cdc_msc_hid_freertos/Makefile | 5 | ||||
| -rw-r--r-- | examples/device/cdc_msc_hid_freertos/ses/nrf5x/nrf5x.emProject | 1 | ||||
| -rw-r--r-- | examples/device/cdc_msc_hid_freertos/src/freertos_hook.c (renamed from lib/FreeRTOS/freertos_hook.c) | 0 | ||||
| -rw-r--r-- | examples/device/cdc_msc_hid_freertos/src/main.c | 4 | ||||
| -rw-r--r-- | hw/mcu/nordic/FreeRTOSConfig.h (renamed from examples/device/cdc_msc_hid_freertos/ses/nrf5x/FreeRTOSConfig.h) | 2 |
6 files changed, 9 insertions, 7 deletions
diff --git a/examples/device/cdc_msc_hid/src/main.c b/examples/device/cdc_msc_hid/src/main.c index fc2f2aad0..8087adbb9 100644 --- a/examples/device/cdc_msc_hid/src/main.c +++ b/examples/device/cdc_msc_hid/src/main.c @@ -49,8 +49,8 @@ static uint32_t blink_interval_ms = BLINK_NOT_MOUNTED; void led_blinking_task(void); -extern void cdc_task(void); -extern void hid_task(void); +void cdc_task(void); +void hid_task(void); /*------------- MAIN -------------*/ int main(void) diff --git a/examples/device/cdc_msc_hid_freertos/Makefile b/examples/device/cdc_msc_hid_freertos/Makefile index 825ff9f7d..3a39f4601 100644 --- a/examples/device/cdc_msc_hid_freertos/Makefile +++ b/examples/device/cdc_msc_hid_freertos/Makefile @@ -20,7 +20,10 @@ SRC_C += \ lib/FreeRTOS/Source/queue.c \ lib/FreeRTOS/Source/tasks.c \ lib/FreeRTOS/Source/timers.c \ - lib/FreeRTOS/Source/portable/GCC/$(FREERTOS_PORT)/port.c \ lib/FreeRTOS/Source/portable/MemMang/heap_4.c \ + lib/FreeRTOS/Source/portable/GCC/$(FREERTOS_PORT)/port.c \ + +# FreeRTOS (lto + Os) linker issue +LDFLAGS += -Wl,--undefined=vTaskSwitchContext include ../../rules.mk diff --git a/examples/device/cdc_msc_hid_freertos/ses/nrf5x/nrf5x.emProject b/examples/device/cdc_msc_hid_freertos/ses/nrf5x/nrf5x.emProject index ee387958e..f01b26d23 100644 --- a/examples/device/cdc_msc_hid_freertos/ses/nrf5x/nrf5x.emProject +++ b/examples/device/cdc_msc_hid_freertos/ses/nrf5x/nrf5x.emProject @@ -141,7 +141,6 @@ <file file_name="../../../../../lib/FreeRTOS/Source/tasks.c" /> <file file_name="../../../../../lib/FreeRTOS/Source/timers.c" /> </folder> - <file file_name="../../../../../lib/FreeRTOS/freertos_hook.c" /> </folder> </folder> <configuration diff --git a/lib/FreeRTOS/freertos_hook.c b/examples/device/cdc_msc_hid_freertos/src/freertos_hook.c index 455e8fb88..455e8fb88 100644 --- a/lib/FreeRTOS/freertos_hook.c +++ b/examples/device/cdc_msc_hid_freertos/src/freertos_hook.c diff --git a/examples/device/cdc_msc_hid_freertos/src/main.c b/examples/device/cdc_msc_hid_freertos/src/main.c index f10c81d7c..2cd34dddc 100644 --- a/examples/device/cdc_msc_hid_freertos/src/main.c +++ b/examples/device/cdc_msc_hid_freertos/src/main.c @@ -55,6 +55,8 @@ TimerHandle_t blink_tm; void led_blinky_cb(TimerHandle_t xTimer); void usb_device_task(void* param); +void cdc_task(void* params); +void hid_task(void* params); /*------------- MAIN -------------*/ int main(void) @@ -72,12 +74,10 @@ int main(void) // Create task #if CFG_TUD_CDC - extern void cdc_task(void* params); xTaskCreate( cdc_task, "cdc", 128, NULL, configMAX_PRIORITIES-2, NULL); #endif #if CFG_TUD_HID - extern void hid_task(void* params); xTaskCreate( hid_task, "hid", 128, NULL, configMAX_PRIORITIES-2, NULL); #endif diff --git a/examples/device/cdc_msc_hid_freertos/ses/nrf5x/FreeRTOSConfig.h b/hw/mcu/nordic/FreeRTOSConfig.h index 754158622..53f72a062 100644 --- a/examples/device/cdc_msc_hid_freertos/ses/nrf5x/FreeRTOSConfig.h +++ b/hw/mcu/nordic/FreeRTOSConfig.h @@ -69,7 +69,7 @@ /* Hook function related definitions. */ #define configUSE_IDLE_HOOK 0 #define configUSE_TICK_HOOK 0 -#define configUSE_MALLOC_FAILED_HOOK 1 +#define configUSE_MALLOC_FAILED_HOOK 0 // cause nested extern warning #define configCHECK_FOR_STACK_OVERFLOW 2 /* Run time and task stats gathering related definitions. */ |