diff options
| author | Wini-Buh <[email protected]> | 2021-06-29 00:19:30 +0200 |
|---|---|---|
| committer | Wini-Buh <[email protected]> | 2021-06-29 00:19:30 +0200 |
| commit | cb0f1d98db3c4bcfdcba231a78b1c18805483ad8 (patch) | |
| tree | fa88fc9cb41a59a2089ea2e43d8feac2b8987474 /examples/device | |
| parent | 970da35fb303f1aa44e6279b14b80418f3250f60 (diff) | |
| parent | 6e939de9d673979721b83b0b3ab724ebd652770c (diff) | |
Merge remote-tracking branch 'origin/master' into CCRX_Port
# Conflicts:
# src/portable/renesas/usba/dcd_usba.c
# src/tusb_option.h
Diffstat (limited to 'examples/device')
| -rw-r--r-- | examples/device/cdc_msc_freertos/src/freertos_hook.c | 2 | ||||
| -rw-r--r-- | examples/device/hid_composite_freertos/src/freertos_hook.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/device/cdc_msc_freertos/src/freertos_hook.c b/examples/device/cdc_msc_freertos/src/freertos_hook.c index 273ad46e6..ab885947c 100644 --- a/examples/device/cdc_msc_freertos/src/freertos_hook.c +++ b/examples/device/cdc_msc_freertos/src/freertos_hook.c @@ -94,7 +94,7 @@ void vApplicationGetTimerTaskMemory( StaticTask_t **ppxTimerTaskTCBBuffer, Stack *pulTimerTaskStackSize = configTIMER_TASK_STACK_DEPTH; } -#if CFG_TUSB_MCU == OPT_MCU_RX63X +#if CFG_TUSB_MCU == OPT_MCU_RX63X | CFG_TUSB_MCU == OPT_MCU_RX65X #include "iodefine.h" void vApplicationSetupTimerInterrupt(void) { diff --git a/examples/device/hid_composite_freertos/src/freertos_hook.c b/examples/device/hid_composite_freertos/src/freertos_hook.c index 273ad46e6..ab885947c 100644 --- a/examples/device/hid_composite_freertos/src/freertos_hook.c +++ b/examples/device/hid_composite_freertos/src/freertos_hook.c @@ -94,7 +94,7 @@ void vApplicationGetTimerTaskMemory( StaticTask_t **ppxTimerTaskTCBBuffer, Stack *pulTimerTaskStackSize = configTIMER_TASK_STACK_DEPTH; } -#if CFG_TUSB_MCU == OPT_MCU_RX63X +#if CFG_TUSB_MCU == OPT_MCU_RX63X | CFG_TUSB_MCU == OPT_MCU_RX65X #include "iodefine.h" void vApplicationSetupTimerInterrupt(void) { |