Merge branch 'master' into edpt_ISO_xfer

28 files changed, 182 insertions, 184 deletions

diff --git a/examples/device/99-tinyusb.rules b/examples/device/99-tinyusb.rules
new file mode 100644
index 000000000..e6372ed58
--- /dev/null
+++ b/examples/device/99-tinyusb.rules
@@ -0,0 +1,14 @@
+# Copy this file to the location of your distribution's udev rules, for example on Ubuntu:
+#   sudo cp 99-tinyusb.rules /etc/udev/rules.d/
+# Then reload udev configuration by executing:
+#   sudo udevadm control --reload-rules
+#   sudo udevadm trigger
+
+# Check SUBSYSTEM
+SUBSYSTEMS=="hidraw", KERNEL=="hidraw*", MODE="0666", GROUP="dialout"
+
+# Rule applies to all TinyUSB example
+ATTRS{idVendor}=="cafe", MODE="0666", GROUP="dialout"
+
+# Rule to blacklist TinyUSB example from being manipulated by ModemManager.
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="cafe", ENV{ID_MM_DEVICE_IGNORE}="1"
diff --git a/examples/device/audio_test/CMakeLists.txt b/examples/device/audio_test/CMakeLists.txt
index a10473b79..7038dd041 100644
--- a/examples/device/audio_test/CMakeLists.txt
+++ b/examples/device/audio_test/CMakeLists.txt
@@ -33,9 +33,6 @@ if(FAMILY STREQUAL "rp2040")
     CFG_TUSB_OS=OPT_OS_PICO
   )
 
-  target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
-  pico_add_extra_outputs(${PROJECT})
-
 else()
   message(FATAL_ERROR "Invalid FAMILY specified")
 endif()
diff --git a/examples/device/board_test/CMakeLists.txt b/examples/device/board_test/CMakeLists.txt
index b8b7e7297..4e6a9b3f8 100644
--- a/examples/device/board_test/CMakeLists.txt
+++ b/examples/device/board_test/CMakeLists.txt
@@ -37,9 +37,6 @@ elseif(FAMILY STREQUAL "rp2040")
     CFG_TUSB_OS=OPT_OS_PICO
   )
 
-  target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
-  pico_add_extra_outputs(${PROJECT})
-
 else()
   message(FATAL_ERROR "Invalid FAMILY specified")
 endif()
diff --git a/examples/device/cdc_dual_ports/CMakeLists.txt b/examples/device/cdc_dual_ports/CMakeLists.txt
index f4bf75c26..5e3ec0909 100644
--- a/examples/device/cdc_dual_ports/CMakeLists.txt
+++ b/examples/device/cdc_dual_ports/CMakeLists.txt
@@ -33,9 +33,6 @@ if(FAMILY STREQUAL "rp2040")
     CFG_TUSB_OS=OPT_OS_PICO
   )
 
-  target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
-  pico_add_extra_outputs(${PROJECT})
-
 else()
   message(FATAL_ERROR "Invalid FAMILY specified")
 endif()
diff --git a/examples/device/cdc_msc/CMakeLists.txt b/examples/device/cdc_msc/CMakeLists.txt
index 9e0d1f790..41dd167b7 100644
--- a/examples/device/cdc_msc/CMakeLists.txt
+++ b/examples/device/cdc_msc/CMakeLists.txt
@@ -39,9 +39,6 @@ elseif(FAMILY STREQUAL "rp2040")
     CFG_TUSB_OS=OPT_OS_PICO
   )
 
-  target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
-  pico_add_extra_outputs(${PROJECT})
-
 else()
   message(FATAL_ERROR "Invalid FAMILY specified")
 endif()
diff --git a/examples/device/cdc_msc/ses/nrf5x/nrf5x.emProject b/examples/device/cdc_msc/ses/nrf5x/nrf5x.emProject
index f7714f269..944199138 100644
--- a/examples/device/cdc_msc/ses/nrf5x/nrf5x.emProject
+++ b/examples/device/cdc_msc/ses/nrf5x/nrf5x.emProject
@@ -21,7 +21,7 @@
       build_treat_warnings_as_errors="Yes"
       c_additional_options="-Wno-error=undef;-Wno-error=unused-parameter;-Wno-error=cast-align;-Wno-error=cast-function-type"
       c_preprocessor_definitions="NRF52840_XXAA;__nRF_FAMILY;ARM_MATH_CM4;FLASH_PLACEMENT=1;CFG_TUSB_MCU=OPT_MCU_NRF5X;CFG_TUSB_DEBUG=1"
-      c_user_include_directories="../../src;$(rootDir)/lib/CMSIS_4/CMSIS/Include;$(rootDir)/hw;$(rootDir)/src;$(nrfxDir)/..;$(nrfxDir);$(nrfxDir)/mdk;$(nrfxDir)/hal;$(nrfxDir)/drivers/include;$(nrfxDir)/drivers/src"
+      c_user_include_directories="../../src;$(rootDir)/lib/CMSIS_5/CMSIS/Core/Include;$(rootDir)/hw;$(rootDir)/src;$(nrfxDir)/..;$(nrfxDir);$(nrfxDir)/mdk;$(nrfxDir)/hal;$(nrfxDir)/drivers/include;$(nrfxDir)/drivers/src"
       debug_register_definition_file="nrf52840_Registers.xml"
       debug_target_connection="J-Link"
       gcc_enable_all_warnings="Yes"
diff --git a/examples/device/cdc_msc_freertos/Makefile b/examples/device/cdc_msc_freertos/Makefile
index 3570daa41..36174b5e1 100644
--- a/examples/device/cdc_msc_freertos/Makefile
+++ b/examples/device/cdc_msc_freertos/Makefile
@@ -1,7 +1,7 @@
 include ../../../tools/top.mk
 include ../../make.mk
 
-FREERTOS_SRC = lib/FreeRTOS/FreeRTOS/Source
+FREERTOS_SRC = lib/FreeRTOS-Kernel
 
 INC += \
 	src \
diff --git a/examples/device/cdc_msc_freertos/ses/lpc175x_6x/lpc175x_6x.emProject b/examples/device/cdc_msc_freertos/ses/lpc175x_6x/lpc175x_6x.emProject
index 4dc111f2e..691f8c3b0 100644
--- a/examples/device/cdc_msc_freertos/ses/lpc175x_6x/lpc175x_6x.emProject
+++ b/examples/device/cdc_msc_freertos/ses/lpc175x_6x/lpc175x_6x.emProject
@@ -20,7 +20,7 @@
       arm_target_interface_type="SWD"
       build_treat_warnings_as_errors="No"
       c_preprocessor_definitions="LPC175x_6x;__LPC1700_FAMILY;__LPC176x_SUBFAMILY;ARM_MATH_CM3;FLASH_PLACEMENT=1;CORE_M3;CFG_TUSB_MCU=OPT_MCU_LPC175X_6X"
-      c_user_include_directories=".;../../src;$(rootDir)/hw;$(rootDir)/src;$(rootDir)/hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/inc;$(rootDir)/lib/FreeRTOS/Source/include;$(rootDir)/lib/FreeRTOS/Source/portable/GCC/ARM_CM3"
+      c_user_include_directories=".;../../src;$(rootDir)/hw;$(rootDir)/src;$(rootDir)/hw/mcu/nxp/lpc_driver/lpc_chip_175x_6x/inc;$(rootDir)/lib/FreeRTOS-Kernel/include;$(rootDir)/lib/FreeRTOS-Kernel/portable/GCC/ARM_CM3"
       debug_register_definition_file="LPC176x5x_Registers.xml"
       debug_target_connection="J-Link"
       gcc_enable_all_warnings="Yes"
@@ -92,39 +92,39 @@
       <folder Name="FreeRTOS">
         <folder Name="Source">
           <folder Name="include">
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/croutine.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/deprecated_definitions.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/event_groups.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/FreeRTOS.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/list.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/message_buffer.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/mpu_prototypes.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/mpu_wrappers.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/portable.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/projdefs.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/queue.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/semphr.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/stack_macros.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/StackMacros.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/stream_buffer.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/task.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/timers.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/croutine.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/deprecated_definitions.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/event_groups.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/FreeRTOS.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/list.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/message_buffer.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/mpu_prototypes.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/mpu_wrappers.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/portable.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/projdefs.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/queue.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/semphr.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/stack_macros.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/StackMacros.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/stream_buffer.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/task.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/timers.h" />
           </folder>
           <folder Name="portable">
             <folder Name="GCC">
               <folder Name="ARM_CM3">
-                <file file_name="../../../../../lib/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c" />
-                <file file_name="../../../../../lib/FreeRTOS/Source/portable/GCC/ARM_CM3/portmacro.h" />
+                <file file_name="../../../../../lib/FreeRTOS-Kernel/portable/GCC/ARM_CM3/port.c" />
+                <file file_name="../../../../../lib/FreeRTOS-Kernel/portable/GCC/ARM_CM3/portmacro.h" />
               </folder>
             </folder>
             <folder Name="MemMang">
-              <file file_name="../../../../../lib/FreeRTOS/Source/portable/MemMang/heap_4.c" />
+              <file file_name="../../../../../lib/FreeRTOS-Kernel/portable/MemMang/heap_4.c" />
             </folder>
           </folder>
-          <file file_name="../../../../../lib/FreeRTOS/Source/list.c" />
-          <file file_name="../../../../../lib/FreeRTOS/Source/queue.c" />
-          <file file_name="../../../../../lib/FreeRTOS/Source/tasks.c" />
-          <file file_name="../../../../../lib/FreeRTOS/Source/timers.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/list.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/queue.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/tasks.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/timers.c" />
         </folder>
         <file file_name="../../../../../lib/FreeRTOS/freertos_hook.c" />
       </folder>
diff --git a/examples/device/cdc_msc_freertos/ses/nrf5x/nrf5x.emProject b/examples/device/cdc_msc_freertos/ses/nrf5x/nrf5x.emProject
index f01b26d23..e964d6fb5 100644
--- a/examples/device/cdc_msc_freertos/ses/nrf5x/nrf5x.emProject
+++ b/examples/device/cdc_msc_freertos/ses/nrf5x/nrf5x.emProject
@@ -107,39 +107,39 @@
       <folder Name="FreeRTOS">
         <folder Name="Source">
           <folder Name="include">
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/croutine.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/deprecated_definitions.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/event_groups.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/FreeRTOS.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/list.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/message_buffer.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/mpu_prototypes.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/mpu_wrappers.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/portable.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/projdefs.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/queue.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/semphr.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/stack_macros.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/StackMacros.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/stream_buffer.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/task.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/timers.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/croutine.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/deprecated_definitions.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/event_groups.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/FreeRTOS.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/list.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/message_buffer.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/mpu_prototypes.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/mpu_wrappers.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/portable.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/projdefs.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/queue.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/semphr.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/stack_macros.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/StackMacros.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/stream_buffer.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/task.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/timers.h" />
           </folder>
           <folder Name="portable">
             <folder Name="GCC">
               <folder Name="ARM_CM4F">
-                <file file_name="../../../../../lib/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c" />
-                <file file_name="../../../../../lib/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h" />
+                <file file_name="../../../../../lib/FreeRTOS-Kernel/portable/GCC/ARM_CM4F/port.c" />
+                <file file_name="../../../../../lib/FreeRTOS-Kernel/portable/GCC/ARM_CM4F/portmacro.h" />
               </folder>
             </folder>
             <folder Name="MemMang">
-              <file file_name="../../../../../lib/FreeRTOS/Source/portable/MemMang/heap_4.c" />
+              <file file_name="../../../../../lib/FreeRTOS-Kernel/portable/MemMang/heap_4.c" />
             </folder>
           </folder>
-          <file file_name="../../../../../lib/FreeRTOS/Source/list.c" />
-          <file file_name="../../../../../lib/FreeRTOS/Source/queue.c" />
-          <file file_name="../../../../../lib/FreeRTOS/Source/tasks.c" />
-          <file file_name="../../../../../lib/FreeRTOS/Source/timers.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/list.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/queue.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/tasks.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/timers.c" />
         </folder>
       </folder>
     </folder>
diff --git a/examples/device/cdc_msc_freertos/ses/samd21/samd21.emProject b/examples/device/cdc_msc_freertos/ses/samd21/samd21.emProject
index b8b099b68..b3db856d3 100644
--- a/examples/device/cdc_msc_freertos/ses/samd21/samd21.emProject
+++ b/examples/device/cdc_msc_freertos/ses/samd21/samd21.emProject
@@ -100,39 +100,39 @@
       <folder Name="FreeRTOS">
         <folder Name="Source">
           <folder Name="include">
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/croutine.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/deprecated_definitions.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/event_groups.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/FreeRTOS.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/list.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/message_buffer.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/mpu_prototypes.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/mpu_wrappers.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/portable.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/projdefs.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/queue.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/semphr.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/stack_macros.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/StackMacros.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/stream_buffer.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/task.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/timers.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/croutine.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/deprecated_definitions.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/event_groups.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/FreeRTOS.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/list.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/message_buffer.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/mpu_prototypes.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/mpu_wrappers.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/portable.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/projdefs.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/queue.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/semphr.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/stack_macros.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/StackMacros.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/stream_buffer.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/task.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/timers.h" />
           </folder>
           <folder Name="portable">
             <folder Name="GCC">
               <folder Name="ARM_CM0">
-                <file file_name="../../../../../lib/FreeRTOS/Source/portable/GCC/ARM_CM0/port.c" />
-                <file file_name="../../../../../lib/FreeRTOS/Source/portable/GCC/ARM_CM0/portmacro.h" />
+                <file file_name="../../../../../lib/FreeRTOS-Kernel/portable/GCC/ARM_CM0/port.c" />
+                <file file_name="../../../../../lib/FreeRTOS-Kernel/portable/GCC/ARM_CM0/portmacro.h" />
               </folder>
             </folder>
             <folder Name="MemMang">
-              <file file_name="../../../../../lib/FreeRTOS/Source/portable/MemMang/heap_4.c" />
+              <file file_name="../../../../../lib/FreeRTOS-Kernel/portable/MemMang/heap_4.c" />
             </folder>
           </folder>
-          <file file_name="../../../../../lib/FreeRTOS/Source/list.c" />
-          <file file_name="../../../../../lib/FreeRTOS/Source/queue.c" />
-          <file file_name="../../../../../lib/FreeRTOS/Source/tasks.c" />
-          <file file_name="../../../../../lib/FreeRTOS/Source/timers.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/list.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/queue.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/tasks.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/timers.c" />
         </folder>
         <file file_name="../../../../../lib/FreeRTOS/freertos_hook.c" />
       </folder>
diff --git a/examples/device/cdc_msc_freertos/ses/samd51/samd51.emProject b/examples/device/cdc_msc_freertos/ses/samd51/samd51.emProject
index d84d070c0..77ff38b62 100644
--- a/examples/device/cdc_msc_freertos/ses/samd51/samd51.emProject
+++ b/examples/device/cdc_msc_freertos/ses/samd51/samd51.emProject
@@ -104,39 +104,39 @@
       <folder Name="FreeRTOS">
         <folder Name="Source">
           <folder Name="include">
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/croutine.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/deprecated_definitions.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/event_groups.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/FreeRTOS.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/list.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/message_buffer.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/mpu_prototypes.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/mpu_wrappers.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/portable.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/projdefs.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/queue.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/semphr.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/stack_macros.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/StackMacros.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/stream_buffer.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/task.h" />
-            <file file_name="../../../../../lib/FreeRTOS/Source/include/timers.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/croutine.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/deprecated_definitions.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/event_groups.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/FreeRTOS.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/list.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/message_buffer.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/mpu_prototypes.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/mpu_wrappers.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/portable.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/projdefs.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/queue.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/semphr.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/stack_macros.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/StackMacros.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/stream_buffer.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/task.h" />
+            <file file_name="../../../../../lib/FreeRTOS-Kernel/include/timers.h" />
           </folder>
           <folder Name="portable">
             <folder Name="GCC">
               <folder Name="ARM_CM4F">
-                <file file_name="../../../../../lib/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c" />
-                <file file_name="../../../../../lib/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h" />
+                <file file_name="../../../../../lib/FreeRTOS-Kernel/portable/GCC/ARM_CM4F/port.c" />
+                <file file_name="../../../../../lib/FreeRTOS-Kernel/portable/GCC/ARM_CM4F/portmacro.h" />
               </folder>
             </folder>
             <folder Name="MemMang">
-              <file file_name="../../../../../lib/FreeRTOS/Source/portable/MemMang/heap_4.c" />
+              <file file_name="../../../../../lib/FreeRTOS-Kernel/portable/MemMang/heap_4.c" />
             </folder>
           </folder>
-          <file file_name="../../../../../lib/FreeRTOS/Source/list.c" />
-          <file file_name="../../../../../lib/FreeRTOS/Source/queue.c" />
-          <file file_name="../../../../../lib/FreeRTOS/Source/tasks.c" />
-          <file file_name="../../../../../lib/FreeRTOS/Source/timers.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/list.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/queue.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/tasks.c" />
+          <file file_name="../../../../../lib/FreeRTOS-Kernel/timers.c" />
         </folder>
         <file file_name="../../../../../lib/FreeRTOS/freertos_hook.c" />
       </folder>
diff --git a/examples/device/cdc_msc_freertos/src/FreeRTOSConfig.h b/examples/device/cdc_msc_freertos/src/FreeRTOSConfig.h
index 494452d43..7b2b93d7b 100644
--- a/examples/device/cdc_msc_freertos/src/FreeRTOSConfig.h
+++ b/examples/device/cdc_msc_freertos/src/FreeRTOSConfig.h
@@ -71,6 +71,7 @@ extern uint32_t SystemCoreClock;
 #define configUSE_TIME_SLICING                  0
 #define configUSE_NEWLIB_REENTRANT              0
 #define configENABLE_BACKWARD_COMPATIBILITY     1
+#define configSTACK_ALLOCATION_FROM_SEPARATE_HEAP   0
 
 #define configSUPPORT_STATIC_ALLOCATION         1
 #define configSUPPORT_DYNAMIC_ALLOCATION        0
diff --git a/examples/device/cdc_msc_freertos/src/freertos_hook.c b/examples/device/cdc_msc_freertos/src/freertos_hook.c
index 423bad4d3..df15a8de7 100644
--- a/examples/device/cdc_msc_freertos/src/freertos_hook.c
+++ b/examples/device/cdc_msc_freertos/src/freertos_hook.c
@@ -37,7 +37,7 @@ void vApplicationMallocFailedHook(void)
   TU_ASSERT(false, );
 }
 
-void vApplicationStackOverflowHook(xTaskHandle pxTask, signed char *pcTaskName)
+void vApplicationStackOverflowHook(xTaskHandle pxTask, char *pcTaskName)
 {
   (void) pxTask;
   (void) pcTaskName;
diff --git a/examples/device/dfu_runtime/CMakeLists.txt b/examples/device/dfu_runtime/CMakeLists.txt
index f4bf75c26..5e3ec0909 100644
--- a/examples/device/dfu_runtime/CMakeLists.txt
+++ b/examples/device/dfu_runtime/CMakeLists.txt
@@ -33,9 +33,6 @@ if(FAMILY STREQUAL "rp2040")
     CFG_TUSB_OS=OPT_OS_PICO
   )
 
-  target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
-  pico_add_extra_outputs(${PROJECT})
-
 else()
   message(FATAL_ERROR "Invalid FAMILY specified")
 endif()
diff --git a/examples/device/dynamic_configuration/CMakeLists.txt b/examples/device/dynamic_configuration/CMakeLists.txt
index b4c95652a..be6224360 100644
--- a/examples/device/dynamic_configuration/CMakeLists.txt
+++ b/examples/device/dynamic_configuration/CMakeLists.txt
@@ -34,9 +34,6 @@ if(FAMILY STREQUAL "rp2040")
     CFG_TUSB_OS=OPT_OS_PICO
   )
 
-  target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
-  pico_add_extra_outputs(${PROJECT})
-
 else()
   message(FATAL_ERROR "Invalid FAMILY specified")
 endif()
diff --git a/examples/device/hid_composite/CMakeLists.txt b/examples/device/hid_composite/CMakeLists.txt
index f4bf75c26..5e3ec0909 100644
--- a/examples/device/hid_composite/CMakeLists.txt
+++ b/examples/device/hid_composite/CMakeLists.txt
@@ -33,9 +33,6 @@ if(FAMILY STREQUAL "rp2040")
     CFG_TUSB_OS=OPT_OS_PICO
   )
 
-  target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
-  pico_add_extra_outputs(${PROJECT})
-
 else()
   message(FATAL_ERROR "Invalid FAMILY specified")
 endif()
diff --git a/examples/device/hid_composite_freertos/Makefile b/examples/device/hid_composite_freertos/Makefile
index cef1af5a6..db7dfd345 100644
--- a/examples/device/hid_composite_freertos/Makefile
+++ b/examples/device/hid_composite_freertos/Makefile
@@ -1,7 +1,7 @@
 include ../../../tools/top.mk
 include ../../make.mk
 
-FREERTOS_SRC = lib/FreeRTOS/FreeRTOS/Source
+FREERTOS_SRC = lib/FreeRTOS-Kernel
 
 INC += \
 	src \
diff --git a/examples/device/hid_composite_freertos/src/FreeRTOSConfig.h b/examples/device/hid_composite_freertos/src/FreeRTOSConfig.h
index 494452d43..7b2b93d7b 100644
--- a/examples/device/hid_composite_freertos/src/FreeRTOSConfig.h
+++ b/examples/device/hid_composite_freertos/src/FreeRTOSConfig.h
@@ -71,6 +71,7 @@ extern uint32_t SystemCoreClock;
 #define configUSE_TIME_SLICING                  0
 #define configUSE_NEWLIB_REENTRANT              0
 #define configENABLE_BACKWARD_COMPATIBILITY     1
+#define configSTACK_ALLOCATION_FROM_SEPARATE_HEAP   0
 
 #define configSUPPORT_STATIC_ALLOCATION         1
 #define configSUPPORT_DYNAMIC_ALLOCATION        0
diff --git a/examples/device/hid_composite_freertos/src/freertos_hook.c b/examples/device/hid_composite_freertos/src/freertos_hook.c
index 423bad4d3..df15a8de7 100644
--- a/examples/device/hid_composite_freertos/src/freertos_hook.c
+++ b/examples/device/hid_composite_freertos/src/freertos_hook.c
@@ -37,7 +37,7 @@ void vApplicationMallocFailedHook(void)
   TU_ASSERT(false, );
 }
 
-void vApplicationStackOverflowHook(xTaskHandle pxTask, signed char *pcTaskName)
+void vApplicationStackOverflowHook(xTaskHandle pxTask, char *pcTaskName)
 {
   (void) pxTask;
   (void) pcTaskName;
diff --git a/examples/device/hid_generic_inout/CMakeLists.txt b/examples/device/hid_generic_inout/CMakeLists.txt
index f4bf75c26..5e3ec0909 100644
--- a/examples/device/hid_generic_inout/CMakeLists.txt
+++ b/examples/device/hid_generic_inout/CMakeLists.txt
@@ -33,9 +33,6 @@ if(FAMILY STREQUAL "rp2040")
     CFG_TUSB_OS=OPT_OS_PICO
   )
 
-  target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
-  pico_add_extra_outputs(${PROJECT})
-
 else()
   message(FATAL_ERROR "Invalid FAMILY specified")
 endif()
diff --git a/examples/device/hid_multiple_interface/CMakeLists.txt b/examples/device/hid_multiple_interface/CMakeLists.txt
index f4bf75c26..5e3ec0909 100644
--- a/examples/device/hid_multiple_interface/CMakeLists.txt
+++ b/examples/device/hid_multiple_interface/CMakeLists.txt
@@ -33,9 +33,6 @@ if(FAMILY STREQUAL "rp2040")
     CFG_TUSB_OS=OPT_OS_PICO
   )
 
-  target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
-  pico_add_extra_outputs(${PROJECT})
-
 else()
   message(FATAL_ERROR "Invalid FAMILY specified")
 endif()
diff --git a/examples/device/midi_test/CMakeLists.txt b/examples/device/midi_test/CMakeLists.txt
index f4bf75c26..5e3ec0909 100644
--- a/examples/device/midi_test/CMakeLists.txt
+++ b/examples/device/midi_test/CMakeLists.txt
@@ -33,9 +33,6 @@ if(FAMILY STREQUAL "rp2040")
     CFG_TUSB_OS=OPT_OS_PICO
   )
 
-  target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
-  pico_add_extra_outputs(${PROJECT})
-
 else()
   message(FATAL_ERROR "Invalid FAMILY specified")
 endif()
diff --git a/examples/device/msc_dual_lun/CMakeLists.txt b/examples/device/msc_dual_lun/CMakeLists.txt
index 6032308f2..0036dc685 100644
--- a/examples/device/msc_dual_lun/CMakeLists.txt
+++ b/examples/device/msc_dual_lun/CMakeLists.txt
@@ -34,9 +34,6 @@ if(FAMILY STREQUAL "rp2040")
     CFG_TUSB_OS=OPT_OS_PICO
   )
 
-  target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
-  pico_add_extra_outputs(${PROJECT})
-
 else()
   message(FATAL_ERROR "Invalid FAMILY specified")
 endif()
diff --git a/examples/device/net_lwip_webserver/CMakeLists.txt b/examples/device/net_lwip_webserver/CMakeLists.txt
index e3c8190f4..c9aabc636 100644
--- a/examples/device/net_lwip_webserver/CMakeLists.txt
+++ b/examples/device/net_lwip_webserver/CMakeLists.txt
@@ -80,9 +80,6 @@ if(FAMILY STREQUAL "rp2040")
     HTTPD_USE_CUSTOM_FSDATA=0
   )
 
-  target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
-  pico_add_extra_outputs(${PROJECT})
-
 else()
   message(FATAL_ERROR "Invalid FAMILY specified")
 endif()
diff --git a/examples/device/uac2_headset/CMakeLists.txt b/examples/device/uac2_headset/CMakeLists.txt
index f4bf75c26..5e3ec0909 100644
--- a/examples/device/uac2_headset/CMakeLists.txt
+++ b/examples/device/uac2_headset/CMakeLists.txt
@@ -33,9 +33,6 @@ if(FAMILY STREQUAL "rp2040")
     CFG_TUSB_OS=OPT_OS_PICO
   )
 
-  target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
-  pico_add_extra_outputs(${PROJECT})
-
 else()
   message(FATAL_ERROR "Invalid FAMILY specified")
 endif()
diff --git a/examples/device/usbtmc/CMakeLists.txt b/examples/device/usbtmc/CMakeLists.txt
index 9a4aa382b..808bdbcf8 100644
--- a/examples/device/usbtmc/CMakeLists.txt
+++ b/examples/device/usbtmc/CMakeLists.txt
@@ -34,9 +34,6 @@ if(FAMILY STREQUAL "rp2040")
     CFG_TUSB_OS=OPT_OS_PICO
   )
 
-  target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
-  pico_add_extra_outputs(${PROJECT})
-
 else()
   message(FATAL_ERROR "Invalid FAMILY specified")
 endif()
diff --git a/examples/device/webusb_serial/CMakeLists.txt b/examples/device/webusb_serial/CMakeLists.txt
index f4bf75c26..5e3ec0909 100644
--- a/examples/device/webusb_serial/CMakeLists.txt
+++ b/examples/device/webusb_serial/CMakeLists.txt
@@ -33,9 +33,6 @@ if(FAMILY STREQUAL "rp2040")
     CFG_TUSB_OS=OPT_OS_PICO
   )
 
-  target_link_libraries(${PROJECT} pico_stdlib pico_fix_rp2040_usb_device_enumeration)
-  pico_add_extra_outputs(${PROJECT})
-
 else()
   message(FATAL_ERROR "Invalid FAMILY specified")
 endif()
diff --git a/examples/device/webusb_serial/src/main.c b/examples/device/webusb_serial/src/main.c
index 143a73374..c85b3cc9a 100644
--- a/examples/device/webusb_serial/src/main.c
+++ b/examples/device/webusb_serial/src/main.c
@@ -23,6 +23,26 @@
  *
  */
 
+/* This example demonstrates WebUSB as web serial with browser with WebUSB support (e.g Chrome).
+ * After enumerated successfully, browser will pop-up notification
+ * with URL to landing page, click on it to test
+ *  - Click "Connect" and select device, When connected the on-board LED will litted up.
+ *  - Any charters received from either webusb/Serial will be echo back to webusb and Serial
+ *
+ * Note:
+ * - The WebUSB landing page notification is currently disabled in Chrome
+ * on Windows due to Chromium issue 656702 (https://crbug.com/656702). You have to
+ * go to landing page (below) to test
+ *
+ * - On Windows 7 and prior: You need to use Zadig tool to manually bind the
+ * WebUSB interface with the WinUSB driver for Chrome to access. From windows 8 and 10, this
+ * is done automatically by firmware.
+ *
+ * - On Linux/macOS, udev permission may need to be updated by
+ *   - copying '/examples/device/99-tinyusb.rules' file to /etc/udev/rules.d/ then
+ *   - run 'sudo udevadm control --reload-rules && sudo udevadm trigger'
+ */
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -149,52 +169,59 @@ void tud_resume_cb(void)
 bool tud_vendor_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_request_t const * request)
 {
   // nothing to with DATA & ACK stage
-  if (stage != CONTROL_STAGE_SETUP ) return true;
+  if (stage != CONTROL_STAGE_SETUP) return true;
 
-  if (request->bmRequestType_bit.type == TUSB_REQ_TYPE_VENDOR) {
-    switch (request->bRequest)
-    {
-      case VENDOR_REQUEST_WEBUSB:
-        // match vendor request in BOS descriptor
-        // Get landing page url
-        return tud_control_xfer(rhport, request, (void*) &desc_url, desc_url.bLength);
+  switch (request->bmRequestType_bit.type)
+  {
+    case TUSB_REQ_TYPE_VENDOR:
+      switch (request->bRequest)
+      {
+        case VENDOR_REQUEST_WEBUSB:
+          // match vendor request in BOS descriptor
+          // Get landing page url
+          return tud_control_xfer(rhport, request, (void*) &desc_url, desc_url.bLength);
+
+        case VENDOR_REQUEST_MICROSOFT:
+          if ( request->wIndex == 7 )
+          {
+            // Get Microsoft OS 2.0 compatible descriptor
+            uint16_t total_len;
+            memcpy(&total_len, desc_ms_os_20+8, 2);
 
-      case VENDOR_REQUEST_MICROSOFT:
-        if ( request->wIndex == 7 )
+            return tud_control_xfer(rhport, request, (void*) desc_ms_os_20, total_len);
+          }else
+          {
+            return false;
+          }
+
+        default: break;
+      }
+    break;
+
+    case TUSB_REQ_TYPE_CLASS:
+      if (request->bRequest == 0x22)
+      {
+        // Webserial simulate the CDC_REQUEST_SET_CONTROL_LINE_STATE (0x22) to connect and disconnect.
+        web_serial_connected = (request->wValue != 0);
+
+        // Always lit LED if connected
+        if ( web_serial_connected )
         {
-          // Get Microsoft OS 2.0 compatible descriptor
-          uint16_t total_len;
-          memcpy(&total_len, desc_ms_os_20+8, 2);
+          board_led_write(true);
+          blink_interval_ms = BLINK_ALWAYS_ON;
 
-          return tud_control_xfer(rhport, request, (void*) desc_ms_os_20, total_len);
+          tud_vendor_write_str("\r\nTinyUSB WebUSB device example\r\n");
         }else
         {
-          return false;
+          blink_interval_ms = BLINK_MOUNTED;
         }
 
-      default:
-        return false;
-    }
-  } else if (
-        request->bmRequestType_bit.type == TUSB_REQ_TYPE_CLASS &&
-        request->bRequest == 0x22) {
-    // Webserial simulate the CDC_REQUEST_SET_CONTROL_LINE_STATE (0x22) to
-    // connect and disconnect.
-    web_serial_connected = (request->wValue != 0);
-
-    // Always lit LED if connected
-    if ( web_serial_connected ) {
-      board_led_write(true);
-      blink_interval_ms = BLINK_ALWAYS_ON;
-
-      tud_vendor_write_str("\r\nTinyUSB WebUSB device example\r\n");
-    }else
-    {
-      blink_interval_ms = BLINK_MOUNTED;
-    }
+        // response with status OK
+        return tud_control_status(rhport, request);
+      }
+    break;
 
-    // response with status OK
-    return tud_control_status(rhport, request);
+    default: break;
   }
 
   // stall unknown request