Browse Source

Merge upstream TinyUSB master

Jean Gressmann 5 years ago
parent
commit
8e6f298aa1
94 changed files with 1233 additions and 439 deletions
  1. 14 10
      .github/ISSUE_TEMPLATE/bug_report.md
  2. 1 1
      .github/ISSUE_TEMPLATE/feature_request.md
  3. 1 1
      README.md
  4. 5 5
      docs/boards.md
  5. 99 4
      docs/changelog.md
  6. 2 1
      examples/device/audio_test/CMakeLists.txt
  7. 3 1
      examples/device/board_test/CMakeLists.txt
  8. 2 1
      examples/device/cdc_dual_ports/CMakeLists.txt
  9. 2 4
      examples/device/cdc_dual_ports/src/main.c
  10. 2 0
      examples/device/cdc_dual_ports/src/tusb_config.h
  11. 1 2
      examples/device/cdc_msc/CMakeLists.txt
  12. 13 15
      examples/device/cdc_msc/src/main.c
  13. 3 0
      examples/device/cdc_msc/src/tusb_config.h
  14. 2 0
      examples/device/cdc_msc_freertos/Makefile
  15. 11 11
      examples/device/cdc_msc_freertos/src/main.c
  16. 3 0
      examples/device/cdc_msc_freertos/src/tusb_config.h
  17. 2 1
      examples/device/dfu_runtime/CMakeLists.txt
  18. 2 1
      examples/device/dynamic_configuration/CMakeLists.txt
  19. 2 1
      examples/device/hid_composite/CMakeLists.txt
  20. 2 0
      examples/device/hid_composite_freertos/Makefile
  21. 2 1
      examples/device/hid_generic_inout/CMakeLists.txt
  22. 2 1
      examples/device/hid_multiple_interface/CMakeLists.txt
  23. 2 1
      examples/device/midi_test/CMakeLists.txt
  24. 2 1
      examples/device/msc_dual_lun/CMakeLists.txt
  25. 2 1
      examples/device/net_lwip_webserver/CMakeLists.txt
  26. 2 0
      examples/device/net_lwip_webserver/Makefile
  27. 0 1
      examples/device/net_lwip_webserver/src/usb_descriptors.c
  28. 2 1
      examples/device/uac2_headset/CMakeLists.txt
  29. 1 1
      examples/device/usbtmc/CMakeLists.txt
  30. 2 1
      examples/device/webusb_serial/CMakeLists.txt
  31. 2 1
      examples/host/cdc_msc_hid/CMakeLists.txt
  32. 1 1
      examples/make.mk
  33. 12 69
      examples/rules.mk
  34. 3 6
      hw/bsp/d5035_01/board.mk
  35. 3 6
      hw/bsp/da14695_dk_usb/board.mk
  36. 3 6
      hw/bsp/da1469x_dk_pro/board.mk
  37. 2 5
      hw/bsp/ea4088qs/board.mk
  38. 2 5
      hw/bsp/ea4357/board.mk
  39. 36 0
      hw/bsp/esp32s2/family.mk
  40. 2 4
      hw/bsp/fomu/family.mk
  41. 2 5
      hw/bsp/frdm_kl25z/board.mk
  42. 2 5
      hw/bsp/imxrt/family.mk
  43. 2 5
      hw/bsp/lpc18/family.mk
  44. 2 5
      hw/bsp/lpc55/family.mk
  45. 2 5
      hw/bsp/lpcxpresso11u37/board.mk
  46. 2 5
      hw/bsp/lpcxpresso11u68/board.mk
  47. 2 5
      hw/bsp/lpcxpresso1347/board.mk
  48. 2 5
      hw/bsp/lpcxpresso1549/board.mk
  49. 2 5
      hw/bsp/lpcxpresso1769/board.mk
  50. 2 5
      hw/bsp/lpcxpresso51u68/board.mk
  51. 2 5
      hw/bsp/lpcxpresso54114/board.mk
  52. 2 5
      hw/bsp/mbed1768/board.mk
  53. 3 9
      hw/bsp/msp430/family.mk
  54. 2 5
      hw/bsp/ngx4330/board.mk
  55. 2 5
      hw/bsp/nrf/family.mk
  56. 2 5
      hw/bsp/nutiny_nuc121s/board.mk
  57. 3 6
      hw/bsp/nutiny_nuc125s/board.mk
  58. 2 5
      hw/bsp/nutiny_nuc126v/board.mk
  59. 2 5
      hw/bsp/nutiny_sdk_nuc120/board.mk
  60. 2 5
      hw/bsp/nutiny_sdk_nuc505/board.mk
  61. 1 0
      hw/bsp/rp2040/boards/adafruit_feather_rp2040/board.cmake
  62. 1 0
      hw/bsp/rp2040/boards/adafruit_itsybitsy_rp2040/board.cmake
  63. 1 0
      hw/bsp/rp2040/boards/adafruit_qt_rp2040/board.cmake
  64. 1 0
      hw/bsp/rp2040/boards/raspberry_pi_pico/board.cmake
  65. 6 0
      hw/bsp/rp2040/family.cmake
  66. 18 1
      hw/bsp/rp2040/family.mk
  67. 2 5
      hw/bsp/samd11/family.mk
  68. 2 5
      hw/bsp/samd21/family.mk
  69. 2 5
      hw/bsp/samd51/family.mk
  70. 2 6
      hw/bsp/same54xplainedpro/board.mk
  71. 2 1
      hw/bsp/same70_xplained/board.mk
  72. 2 5
      hw/bsp/samg55xplained/board.mk
  73. 4 6
      hw/bsp/spresense/board.mk
  74. 2 5
      hw/bsp/stm32f070rbnucleo/board.mk
  75. 2 5
      hw/bsp/stm32f072disco/board.mk
  76. 177 0
      hw/bsp/stm32f072eval/STM32F072VBTx_FLASH.ld
  77. 50 0
      hw/bsp/stm32f072eval/board.mk
  78. 245 0
      hw/bsp/stm32f072eval/stm32f072eval.c
  79. 321 0
      hw/bsp/stm32f072eval/stm32f0xx_hal_conf.h
  80. 2 5
      hw/bsp/stm32f103bluepill/board.mk
  81. 2 5
      hw/bsp/stm32f207nucleo/board.mk
  82. 2 5
      hw/bsp/stm32f303disco/board.mk
  83. 2 5
      hw/bsp/stm32f4/family.mk
  84. 2 5
      hw/bsp/stm32f7/family.mk
  85. 2 5
      hw/bsp/stm32h7/family.mk
  86. 2 5
      hw/bsp/stm32l0538disco/board.mk
  87. 2 5
      hw/bsp/stm32l476disco/board.mk
  88. 2 5
      hw/bsp/stm32l4r5nucleo/board.mk
  89. 3 3
      src/class/usbtmc/usbtmc_device.c
  90. 66 65
      src/portable/nordic/nrf5x/dcd_nrf5x.c
  91. 2 1
      src/portable/nxp/lpc17_40/dcd_lpc17_40.c
  92. 3 3
      src/portable/nxp/lpc17_40/dcd_lpc17_40.h
  93. 2 1
      src/portable/nxp/lpc17_40/hcd_lpc17_40.c
  94. 1 1
      src/tusb_option.h

+ 14 - 10
.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,29 +1,33 @@
 ---
-name: Bug report
+name: Bug Report
 about: Create a report to help us improve
-title: ''
+title: 'Please provide all details at least for Setup/Describe/Reproduce'
 labels: Bug 🐞
 assignees: ''
 
 ---
 
-**Set up**
-[Mandatory] Provide details of your setup help us to reproduce the issue as quick as possible  
- - **PC OS**   : Ubuntu 18.04 / Windows 10/ macOS 10.15 
- - **Board**   : Feather nRF52840 Express
- - **Firmware**: examples/device/cdc_msc
+**Set Up**
+
+- **PC OS** e.g Ubuntu 20.04 / Windows 10/ macOS 10.15
+- **Board** e.g Feather nRF52840 Express (if custom specify your MCUs)
+- **Firmware** e.g examples/device/cdc_msc
+
+**Describe The Bug**
 
-**Describe the bug**
 A clear and concise description of what the bug is.
 
-**To reproduce**
+**To Reproduce**
+
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. See error
 
 **Screenshots**
+
 If applicable, add screenshots, bus capture to help explain your problem. 
 
 **Log**
-Please provide the stack's log (uart/rtt/swo) where the issue occurred, best with comments to explain the actual events. To enable logging, add `LOG=2` to to the make command if building with stock examples or set `CFG_TUSB_DEBUG=2` in your tusb_config.h. More information can be found at [example's readme](/docs/getting_started.md)
+
+If applicable, provide the stack's log (uart/rtt/swo) where the issue occurred, best with comments to explain the actual events. To enable logging, add `LOG=2` to to the make command if building with stock examples or set `CFG_TUSB_DEBUG=2` in your tusb_config.h. More information can be found at [example's readme](/docs/getting_started.md)

+ 1 - 1
.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,5 +1,5 @@
 ---
-name: Feature request
+name: Feature Request
 about: Suggest an idea for this project
 title: ''
 labels: Feature 💡

+ 1 - 1
README.md

@@ -30,8 +30,8 @@ Special thanks to all the people who spent their precious time and effort to hel
 
 The stack supports the following MCUs:
 
-- **Espressif:** ESP32-S2
 - **Dialog:** DA1469x
+- **Espressif:** ESP32-S2
 - **MicroChip:** SAMD11, SAMD21, SAMD51, SAME5x, SAMG55
 - **NordicSemi:** nRF52833, nRF52840
 - **Nuvoton:** NUC120, NUC121/NUC125, NUC126, NUC505

+ 5 - 5
docs/boards.md

@@ -9,6 +9,11 @@ The board support code is only used for self-contained examples and testing. It
 
 This code base already had supported for a handful of following boards (sorted alphabetically)
 
+### Dialog DA146xx
+
+- [DA14695 Development Kit – USB](https://www.dialog-semiconductor.com/products/da14695-development-kit-usb)
+- [DA1469x Development Kit – Pro](https://www.dialog-semiconductor.com/products/da14695-development-kit-pro)
+
 ### Espressif ESP32-S2
 
 - Adafruit Feather ESP32-S2
@@ -17,11 +22,6 @@ This code base already had supported for a handful of following boards (sorted a
 - [ESP32-S2-Kaluga-1](https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/hw-reference/esp32s2/user-guide-esp32-s2-kaluga-1-kit.html)
 - [ESP32-S2-Saola-1](https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/hw-reference/esp32s2/user-guide-saola-1-v1.2.html)
 
-### Dialog DA146xx
-
-- [DA14695 Development Kit – USB](https://www.dialog-semiconductor.com/products/da14695-development-kit-usb)
-- [DA1469x Development Kit – Pro](https://www.dialog-semiconductor.com/products/da14695-development-kit-pro)
-
 ### MicroChip SAMD11 & SAMD21
 
 - [Adafruit Circuit Playground Express](https://www.adafruit.com/product/3333)

+ 99 - 4
changelog.md → docs/changelog.md

@@ -1,10 +1,105 @@
 # TinyUSB Changelog
 
-## WIP
+## 0.9.0 - 2021.03.12
 
-- Fix dropping MIDI sysex message when fifo is full
+### Device Stack
+
+#### Device Controller Driver (DCD)
+
+RP2040
+
+- Fix endpoint buffer reallocation overrun problem
+- Fix osal_pico queue overflow in initialization
+- Fix Isochronous endpoint buffer size in transfer
+- Optimize hardware endpoint struct to reduce RAM usage
+- Fix enum walkaround forever check for SE0 when pull up is disabled
+
+Sony CXD56
+
+- Pass the correct speed on Spresense
+- Fix setup processed flag
+
+NXP Transdimention
+
+- Update dcd_init() to reset controller to device mode
+
+#### USB Device Driver (USBD)
+
+- Fix issue with status zlp (tud_control_status) is returned by class driver with SET/CLEAR_FEATURE for endpoint.
+- Correct endpoint size check for fullspeed bulk, can be 8, 16, 32, 64
+- Ack SET_INTERFACE even if it is not implemented by class driver.
+
+#### Device Class Driver
+
+DFU Runtime
+
+- rename dfu_rt to dfu_runtime for easy reading
+
+CDC
+
+- Add tud_cdc_send_break_cb() to support break request
+- Improve CDC receive, minor behavior changes: when tud_cdc_rx_wanted_cb() is invoked wanted_char may not be the last byte in the fifo 
+
+HID
+
+- [Breaking] Add itf argument to hid API to support multiple instances, follow API has signature changes
+  - tud_hid_descriptor_report_cb()
+  - tud_hid_get_report_cb()
+  - tud_hid_set_report_cb()
+  - tud_hid_boot_mode_cb()
+  - tud_hid_set_idle_cb()
+- Add report complete callback tud_hid_report_complete_cb() API
 - Add DPad/Hat support for HID Gamepad
-- Add tud_hid_report_complete_cb() API
+  - TUD_HID_REPORT_DESC_GAMEPAD() now support 16 buttons, 2 joysticks, 1 hat/dpad
+  - Add hid_gamepad_report_t along with GAMEPAD_BUTTON_ and GAMEPAD_HAT_ enum
+  - Add Gamepad to hid_composite / hid_composite_freertos example
+
+MIDI
+
+- Fix dropping MIDI sysex message when fifo is full
+- Fix typo in tud_midi_write24(), make example less ambigous for cable and channel
+- Fix incorrect endpoint descriptor length, MIDI v1 use Audio v1 which has 9-byte endpoint descriptor (instead of 7)
+
+### Host Stack
+
+#### Host Controller Driver (HCD)
+
+- Add rhport to hcd_init()
+- Improve EHCI/OHCI driver abstraction
+  - Move echi/ohci files to portable/
+  - Rename hcd_lpc18_43 to hcd_transdimension
+  - Sub hcd API with hcd_ehci_init(), hcd_ehci_register_addr()
+- Update NXP transdimention hcd_init() to reset controller to host mode
+  - Ported hcd to rt10xx
+
+#### USB Host Driver (USBH)
+
+- No noticeable changes to usbh
+
+#### Host Class Driver
+
+MSC
+
+- Rename tuh_msc_scsi_inquiry() to tuh_msc_inquiry()
+- Rename tuh_msc_mounted_cb/tuh_msc_unmounted_cb to tuh_msc_mount_cb/tuh_msc_unmount_cb to match device stack naming
+- Change tuh_msc_is_busy() to tuh_msc_ready()
+- Add read10 and write10 function: tuh_msc_read10(), tuh_msc_write10()
+- Read_Capacity is invoked as part of enumeration process
+- Add tuh_msc_get_block_count(), tuh_msc_get_block_size()
+- Add CFG_TUH_MSC_MAXLUN (default to 4) to hold lun capacities
+
+### Others
+
+- Add basic support for rt-thread OS
+- Change zero bitfield length to more explicit padding
+- Build example now fetch required submodules on the fly while running `make` without prio submodule init for mcu drivers
+- Update pico-sdk to v1.1.0
+
+**New Boards**
+
+- Microchip SAM E54 Xplained Pro
+- LPCXpresso 55s28
+- LPCXpresso 18s37
 
 ## 0.8.0 - 2021.02.05
 
@@ -26,7 +121,7 @@
 
 ### USB Device 
 
-**UBSD**
+**USBD**
 
 - Rework usbd control transfer to have additional stage parameter for setup, data, status
 - Fix tusb_init() return true instead of TUSB_ERROR_NONE

+ 2 - 1
examples/device/audio_test/CMakeLists.txt

@@ -9,10 +9,11 @@ get_filename_component(TOP "${TOP}" REALPATH)
 # Check for -DFAMILY=
 if(FAMILY STREQUAL "rp2040")
   cmake_minimum_required(VERSION 3.12)
+  
   set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
   include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
+
   project(${PROJECT})
-  pico_sdk_init()
   add_executable(${PROJECT})
 
   include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

+ 3 - 1
examples/device/board_test/CMakeLists.txt

@@ -9,15 +9,17 @@ get_filename_component(TOP "${TOP}" REALPATH)
 # Check for -DFAMILY=
 if(FAMILY STREQUAL "esp32s2")
   cmake_minimum_required(VERSION 3.5)
+
   include(${TOP}/hw/bsp/${FAMILY}/family.cmake)
   project(${PROJECT})
 
 elseif(FAMILY STREQUAL "rp2040")
   cmake_minimum_required(VERSION 3.12)
+  
   set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
   include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
+
   project(${PROJECT})
-  pico_sdk_init()
   add_executable(${PROJECT})
 
   include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

+ 2 - 1
examples/device/cdc_dual_ports/CMakeLists.txt

@@ -9,10 +9,11 @@ get_filename_component(TOP "${TOP}" REALPATH)
 # Check for -DFAMILY=
 if(FAMILY STREQUAL "rp2040")
   cmake_minimum_required(VERSION 3.12)
+
   set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
   include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
+
   project(${PROJECT})
-  pico_sdk_init()
   add_executable(${PROJECT})
 
   include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

+ 2 - 4
examples/device/cdc_dual_ports/src/main.c

@@ -63,13 +63,11 @@ static void echo_serial_port(uint8_t itf, uint8_t buf[], uint32_t count)
     }
     else
     {
-      // echo back additional ports as upper case
+      // echo back 2nd port as upper case
       if (islower(buf[i])) buf[i] -= 'a' - 'A';
     }
 
     tud_cdc_n_write_char(itf, buf[i]);
-
-    if ( buf[i] == '\r' ) tud_cdc_n_write_char(itf, '\n');
   }
   tud_cdc_n_write_flush(itf);
 }
@@ -85,7 +83,7 @@ static void cdc_task(void)
   {
     // connected() check for DTR bit
     // Most but not all terminal client set this when making connection
-    if ( tud_cdc_n_connected(itf) )
+    // if ( tud_cdc_n_connected(itf) )
     {
       if ( tud_cdc_n_available(itf) )
       {

+ 2 - 0
examples/device/cdc_dual_ports/src/tusb_config.h

@@ -104,6 +104,8 @@
 #define CFG_TUD_CDC_RX_BUFSIZE   (TUD_OPT_HIGH_SPEED ? 512 : 64)
 #define CFG_TUD_CDC_TX_BUFSIZE   (TUD_OPT_HIGH_SPEED ? 512 : 64)
 
+// CDC Endpoint transfer buffer size, more is faster
+#define CFG_TUD_CDC_EP_BUFSIZE   (TUD_OPT_HIGH_SPEED ? 512 : 64)
 
 #ifdef __cplusplus
  }

+ 1 - 2
examples/device/cdc_msc/CMakeLists.txt

@@ -17,9 +17,8 @@ elseif(FAMILY STREQUAL "rp2040")
   set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
   include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
   project(${PROJECT})
-  pico_sdk_init()
   add_executable(${PROJECT})
-
+    
   include(${TOP}/hw/bsp/${FAMILY}/family.cmake)
 
   # Example source

+ 13 - 15
examples/device/cdc_msc/src/main.c

@@ -48,7 +48,6 @@ enum  {
 static uint32_t blink_interval_ms = BLINK_NOT_MOUNTED;
 
 void led_blinking_task(void);
-
 void cdc_task(void);
 
 /*------------- MAIN -------------*/
@@ -112,18 +111,16 @@ void cdc_task(void)
     // connected and there are data available
     if ( tud_cdc_available() )
     {
-      uint8_t buf[64];
-
-      // read and echo back
+      // read datas
+      char buf[64];
       uint32_t count = tud_cdc_read(buf, sizeof(buf));
+      (void) count;
 
-      for(uint32_t i=0; i<count; i++)
-      {
-        tud_cdc_write_char(buf[i]);
-
-        if ( buf[i] == '\r' ) tud_cdc_write_char('\n');
-      }
-
+      // Echo back
+      // Note: Skip echo by commenting out write() and write_flush()
+      // for throughput test e.g
+      //    $ dd if=/dev/zero of=/dev/ttyACM0 count=10000
+      tud_cdc_write(buf, count);
       tud_cdc_write_flush();
     }
   }
@@ -135,12 +132,13 @@ void tud_cdc_line_state_cb(uint8_t itf, bool dtr, bool rts)
   (void) itf;
   (void) rts;
 
-  // connected
+  // TODO set some indicator
   if ( dtr )
   {
-    // print initial message when connected
-    tud_cdc_write_str("\r\nTinyUSB CDC MSC device example\r\n");
-    tud_cdc_write_flush();
+    // Terminal connected
+  }else
+  {
+    // Terminal disconnected
   }
 }
 

+ 3 - 0
examples/device/cdc_msc/src/tusb_config.h

@@ -106,6 +106,9 @@
 #define CFG_TUD_CDC_RX_BUFSIZE   (TUD_OPT_HIGH_SPEED ? 512 : 64)
 #define CFG_TUD_CDC_TX_BUFSIZE   (TUD_OPT_HIGH_SPEED ? 512 : 64)
 
+// CDC Endpoint transfer buffer size, more is faster
+#define CFG_TUD_CDC_EP_BUFSIZE   (TUD_OPT_HIGH_SPEED ? 512 : 64)
+
 // MSC Buffer size of Device Mass storage
 #define CFG_TUD_MSC_EP_BUFSIZE   512
 

+ 2 - 0
examples/device/cdc_msc_freertos/Makefile

@@ -1,3 +1,5 @@
+DEPS_SUBMODULES += lib/FreeRTOS-Kernel
+
 include ../../../tools/top.mk
 include ../../make.mk
 

+ 11 - 11
examples/device/cdc_msc_freertos/src/main.c

@@ -179,14 +179,13 @@ void cdc_task(void* params)
 
         // read and echo back
         uint32_t count = tud_cdc_read(buf, sizeof(buf));
+        (void) count;
 
-        for(uint32_t i=0; i<count; i++)
-        {
-          tud_cdc_write_char(buf[i]);
-
-          if ( buf[i] == '\r' ) tud_cdc_write_char('\n');
-        }
-
+        // Echo back
+        // Note: Skip echo by commenting out write() and write_flush()
+        // for throughput test e.g
+        //    $ dd if=/dev/zero of=/dev/ttyACM0 count=10000
+        tud_cdc_write(buf, count);
         tud_cdc_write_flush();
       }
     }
@@ -202,12 +201,13 @@ void tud_cdc_line_state_cb(uint8_t itf, bool dtr, bool rts)
   (void) itf;
   (void) rts;
 
-  // connected
+  // TODO set some indicator
   if ( dtr )
   {
-    // print initial message when connected
-    tud_cdc_write_str("\r\nTinyUSB CDC MSC device with FreeRTOS example\r\n");
-    tud_cdc_write_flush();
+    // Terminal connected
+  }else
+  {
+    // Terminal disconnected
   }
 }
 

+ 3 - 0
examples/device/cdc_msc_freertos/src/tusb_config.h

@@ -106,6 +106,9 @@
 #define CFG_TUD_CDC_RX_BUFSIZE   (TUD_OPT_HIGH_SPEED ? 512 : 64)
 #define CFG_TUD_CDC_TX_BUFSIZE   (TUD_OPT_HIGH_SPEED ? 512 : 64)
 
+// CDC Endpoint transfer buffer size, more is faster
+#define CFG_TUD_CDC_EP_BUFSIZE   (TUD_OPT_HIGH_SPEED ? 512 : 64)
+
 // MSC Buffer size of Device Mass storage
 #define CFG_TUD_MSC_EP_BUFSIZE   512
 

+ 2 - 1
examples/device/dfu_runtime/CMakeLists.txt

@@ -9,10 +9,11 @@ get_filename_component(TOP "${TOP}" REALPATH)
 # Check for -DFAMILY=
 if(FAMILY STREQUAL "rp2040")
   cmake_minimum_required(VERSION 3.12)
+  
   set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
   include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
+
   project(${PROJECT})
-  pico_sdk_init()
   add_executable(${PROJECT})
 
   include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

+ 2 - 1
examples/device/dynamic_configuration/CMakeLists.txt

@@ -9,10 +9,11 @@ get_filename_component(TOP "${TOP}" REALPATH)
 # Check for -DFAMILY=
 if(FAMILY STREQUAL "rp2040")
   cmake_minimum_required(VERSION 3.12)
+
   set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
   include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
+  
   project(${PROJECT})
-  pico_sdk_init()
   add_executable(${PROJECT})
 
   include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

+ 2 - 1
examples/device/hid_composite/CMakeLists.txt

@@ -9,10 +9,11 @@ get_filename_component(TOP "${TOP}" REALPATH)
 # Check for -DFAMILY=
 if(FAMILY STREQUAL "rp2040")
   cmake_minimum_required(VERSION 3.12)
+
   set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
   include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
+  
   project(${PROJECT})
-  pico_sdk_init()
   add_executable(${PROJECT})
 
   include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

+ 2 - 0
examples/device/hid_composite_freertos/Makefile

@@ -1,3 +1,5 @@
+DEPS_SUBMODULES += lib/FreeRTOS-Kernel
+
 include ../../../tools/top.mk
 include ../../make.mk
 

+ 2 - 1
examples/device/hid_generic_inout/CMakeLists.txt

@@ -9,10 +9,11 @@ get_filename_component(TOP "${TOP}" REALPATH)
 # Check for -DFAMILY=
 if(FAMILY STREQUAL "rp2040")
   cmake_minimum_required(VERSION 3.12)
+  
   set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
   include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
+  
   project(${PROJECT})
-  pico_sdk_init()
   add_executable(${PROJECT})
 
   include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

+ 2 - 1
examples/device/hid_multiple_interface/CMakeLists.txt

@@ -9,10 +9,11 @@ get_filename_component(TOP "${TOP}" REALPATH)
 # Check for -DFAMILY=
 if(FAMILY STREQUAL "rp2040")
   cmake_minimum_required(VERSION 3.12)
+  
   set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
   include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
+  
   project(${PROJECT})
-  pico_sdk_init()
   add_executable(${PROJECT})
 
   include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

+ 2 - 1
examples/device/midi_test/CMakeLists.txt

@@ -9,10 +9,11 @@ get_filename_component(TOP "${TOP}" REALPATH)
 # Check for -DFAMILY=
 if(FAMILY STREQUAL "rp2040")
   cmake_minimum_required(VERSION 3.12)
+  
   set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
   include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
+  
   project(${PROJECT})
-  pico_sdk_init()
   add_executable(${PROJECT})
 
   include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

+ 2 - 1
examples/device/msc_dual_lun/CMakeLists.txt

@@ -9,10 +9,11 @@ get_filename_component(TOP "${TOP}" REALPATH)
 # Check for -DFAMILY=
 if(FAMILY STREQUAL "rp2040")
   cmake_minimum_required(VERSION 3.12)
+  
   set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
   include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
+  
   project(${PROJECT})
-  pico_sdk_init()
   add_executable(${PROJECT})
 
   include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

+ 2 - 1
examples/device/net_lwip_webserver/CMakeLists.txt

@@ -9,10 +9,11 @@ get_filename_component(TOP "${TOP}" REALPATH)
 # Check for -DFAMILY=
 if(FAMILY STREQUAL "rp2040")
   cmake_minimum_required(VERSION 3.12)
+  
   set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
   include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
+  
   project(${PROJECT})
-  pico_sdk_init()
   add_executable(${PROJECT})
 
   include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

+ 2 - 0
examples/device/net_lwip_webserver/Makefile

@@ -1,3 +1,5 @@
+DEPS_SUBMODULES += lib/lwip
+
 include ../../../tools/top.mk
 include ../../make.mk
 

+ 0 - 1
examples/device/net_lwip_webserver/src/usb_descriptors.c

@@ -142,7 +142,6 @@ static uint8_t const ecm_configuration[] =
 // - Windows only works with RNDIS
 // - MacOS only works with CDC-ECM
 // - Linux will work on both
-// Note index is Num-1x
 static uint8_t const * const configuration_arr[2] =
 {
   [CONFIG_ID_RNDIS] = rndis_configuration,

+ 2 - 1
examples/device/uac2_headset/CMakeLists.txt

@@ -9,10 +9,11 @@ get_filename_component(TOP "${TOP}" REALPATH)
 # Check for -DFAMILY=
 if(FAMILY STREQUAL "rp2040")
   cmake_minimum_required(VERSION 3.12)
+  
   set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
   include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
+  
   project(${PROJECT})
-  pico_sdk_init()
   add_executable(${PROJECT})
 
   include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

+ 1 - 1
examples/device/usbtmc/CMakeLists.txt

@@ -11,8 +11,8 @@ if(FAMILY STREQUAL "rp2040")
   cmake_minimum_required(VERSION 3.12)
   set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
   include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
+  
   project(${PROJECT})
-  pico_sdk_init()
   add_executable(${PROJECT})
 
   include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

+ 2 - 1
examples/device/webusb_serial/CMakeLists.txt

@@ -9,10 +9,11 @@ get_filename_component(TOP "${TOP}" REALPATH)
 # Check for -DFAMILY=
 if(FAMILY STREQUAL "rp2040")
   cmake_minimum_required(VERSION 3.12)
+  
   set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
   include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
+  
   project(${PROJECT})
-  pico_sdk_init()
   add_executable(${PROJECT})
 
   include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

+ 2 - 1
examples/host/cdc_msc_hid/CMakeLists.txt

@@ -14,10 +14,11 @@ if(FAMILY STREQUAL "esp32s2")
 
 elseif(FAMILY STREQUAL "rp2040")
   cmake_minimum_required(VERSION 3.12)
+  
   set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk)
   include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
+  
   project(${PROJECT})
-  pico_sdk_init()
   add_executable(${PROJECT})
 
   include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

+ 1 - 1
examples/make.mk

@@ -40,7 +40,7 @@ ifeq ($(FAMILY),)
   include $(TOP)/hw/bsp/$(BOARD)/board.mk
 else
   # Include Family and Board specific defs
-  -include $(TOP)/$(FAMILY_PATH)/family.mk
+  include $(TOP)/$(FAMILY_PATH)/family.mk
 
   SRC_C += $(subst $(TOP)/,,$(wildcard $(TOP)/$(FAMILY_PATH)/*.c))
 endif

+ 12 - 69
examples/rules.mk

@@ -5,69 +5,9 @@
 # Set all as default goal
 .DEFAULT_GOAL := all
 
-ifeq ($(FAMILY),esp32s2)
-# ---------------------------------------
-# Espressif IDF use CMake build system, this add wrapper target to call idf.py
-# ---------------------------------------
-
-.PHONY: all clean flash
-
-all:
-	idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) $(CMAKE_DEFSYM) build
-
-build: all
-
-clean:
-	idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) $(CMAKE_DEFSYM) clean
-
-fullclean:
-	idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) $(CMAKE_DEFSYM) fullclean
-
-flash:
-	idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) $(CMAKE_DEFSYM) flash
-
-bootloader-flash:
-	idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) $(CMAKE_DEFSYM) bootloader-flash
-
-app-flash:
-	idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) $(CMAKE_DEFSYM) app-flash
-
-erase:
-	idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) $(CMAKE_DEFSYM) erase_flash
-
-monitor:
-	idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) $(CMAKE_DEFSYM) monitor
-
-uf2: $(BUILD)/$(PROJECT).uf2
-
-UF2_FAMILY_ID = 0xbfdd4eee
-$(BUILD)/$(PROJECT).uf2: $(BUILD)/$(PROJECT).bin
-	@echo CREATE $@
-	$(PYTHON) $(TOP)/tools/uf2/utils/uf2conv.py -f $(UF2_FAMILY_ID) -b 0x0 -c -o $@ $^
-
-else ifeq ($(FAMILY),rp2040)
-# ---------------------------------------
-# RP2040 CMake
-# ---------------------------------------
-
-ifeq ($(DEBUG), 1)
-CMAKE_DEFSYM += -DCMAKE_BUILD_TYPE=Debug
-endif
-
-$(BUILD):
-	cmake -S . -B $(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) -DPICO_BUILD_DOCS=0 $(CMAKE_DEFSYM)
-
-all: $(BUILD)
-	$(MAKE) -C $(BUILD)
-
-clean:
-	$(RM) -rf $(BUILD)
-
-#flash: flash-pyocd
-flash:
-	@$(CP) $(BUILD)/$(PROJECT).uf2 /media/$(USER)/RPI-RP2
-
-else
+# ESP32-S2 and RP2040 has its own CMake build system
+ifneq ($(FAMILY),esp32s2)
+ifneq ($(FAMILY),rp2040)
 # ---------------------------------------
 # GNU Make build system
 # ---------------------------------------
@@ -93,8 +33,7 @@ SRC_C += \
 	src/class/msc/msc_device.c \
 	src/class/net/net_device.c \
 	src/class/usbtmc/usbtmc_device.c \
-	src/class/vendor/vendor_device.c \
-	src/portable/$(VENDOR)/$(CHIP_FAMILY)/dcd_$(CHIP_FAMILY).c
+	src/class/vendor/vendor_device.c
 
 # TinyUSB stack include
 INC += $(TOP)/src
@@ -195,12 +134,12 @@ else
 	$(RM) -rf $(BUILD)
 endif
 
+endif
 endif # GNU Make
 
-# Print out the value of a make variable.
-# https://stackoverflow.com/questions/16467718/how-to-print-out-a-variable-in-makefile
-print-%:
-	@echo $* = $($*)
+# ---------------------------------------
+# Flash Targets
+# ---------------------------------------
 
 # Flash binary using Jlink
 ifeq ($(OS),Windows_NT)
@@ -245,3 +184,7 @@ copy-artifact: $(BIN)
 	#@$(CP) $(BUILD)/$(PROJECT).hex $(BIN)
 	#@$(CP) $(BUILD)/$(PROJECT).elf $(BIN)
 
+# Print out the value of a make variable.
+# https://stackoverflow.com/questions/16467718/how-to-print-out-a-variable-in-makefile
+print-%:
+	@echo $* = $($*)

+ 3 - 6
hw/bsp/d5035_01/board.mk

@@ -1,4 +1,4 @@
-DEPS_SUBMODULES = hw/mcu/microchip
+DEPS_SUBMODULES += hw/mcu/microchip
 HWREV ?= 1
 
 CFLAGS += \
@@ -22,8 +22,9 @@ CFLAGS += \
 LD_FILE = hw/bsp/$(BOARD)/same51j19a_flash.ld
 
 SRC_C += \
+  src/portable/microchip/samd/dcd_samd.c \
   hw/mcu/microchip/same51/gcc/gcc/startup_same51.c \
-  hw/mcu/microchip/same51/gcc/system_same51.c \
+  hw/mcu/microchip/same51/gcc/system_same51.c
 
 ifdef SYSCALLS
 ifneq ($(SYSCALLS),0)
@@ -47,10 +48,6 @@ INC += \
 	$(TOP)/hw/mcu/microchip/same51/hri \
 	$(TOP)/hw/mcu/microchip/same51/CMSIS/Include
 
-# For TinyUSB port source
-VENDOR = microchip
-CHIP_FAMILY = samd
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM4F
 

+ 3 - 6
hw/bsp/da14695_dk_usb/board.mk

@@ -16,7 +16,9 @@ MCU_FAMILY_DIR = hw/mcu/dialog/da1469x
 # All source paths should be relative to the top level.
 LD_FILE = hw/bsp/$(BOARD)/da1469x.ld
 
+# While this is for da1469x chip, there is chance that da1468x chip family will also work
 SRC_C += \
+	src/portable/dialog/da146xx/dcd_da146xx.c \
 	$(MCU_FAMILY_DIR)/src/system_da1469x.c \
 	$(MCU_FAMILY_DIR)/src/da1469x_clock.c \
 	$(MCU_FAMILY_DIR)/src/hal_gpio.c \
@@ -26,12 +28,7 @@ SRC_S += hw/bsp/$(BOARD)/gcc_startup_da1469x.S
 INC += \
 	$(TOP)/hw/bsp/$(BOARD) \
 	$(TOP)/$(MCU_FAMILY_DIR)/include \
-	$(TOP)/$(MCU_FAMILY_DIR)/SDK_10.0.8.105/sdk/bsp/include \
-
-# For TinyUSB port source
-VENDOR = dialog
-# While this is for da1469x chip, there is chance that da1468x chip family will also work
-CHIP_FAMILY = da146xx
+	$(TOP)/$(MCU_FAMILY_DIR)/SDK_10.0.8.105/sdk/bsp/include
 
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM33_NTZ/non_secure

+ 3 - 6
hw/bsp/da1469x_dk_pro/board.mk

@@ -16,7 +16,9 @@ MCU_FAMILY_DIR = hw/mcu/dialog/da1469x
 # All source paths should be relative to the top level.
 LD_FILE = hw/bsp/$(BOARD)/da1469x.ld
 
+# While this is for da1469x chip, there is chance that da1468x chip family will also work
 SRC_C += \
+	src/portable/dialog/da146xx/dcd_da146xx.c \
 	$(MCU_FAMILY_DIR)/src/system_da1469x.c \
 	$(MCU_FAMILY_DIR)/src/da1469x_clock.c \
 	$(MCU_FAMILY_DIR)/src/hal_gpio.c \
@@ -26,12 +28,7 @@ SRC_S += hw/bsp/$(BOARD)/gcc_startup_da1469x.S
 INC += \
 	$(TOP)/hw/bsp/$(BOARD) \
 	$(TOP)/$(MCU_FAMILY_DIR)/include \
-	$(TOP)/$(MCU_FAMILY_DIR)/SDK_10.0.8.105/sdk/bsp/include \
-
-# For TinyUSB port source
-VENDOR = dialog
-# While this is for da1469x chip, there is chance that da1468x chip family will also work
-CHIP_FAMILY = da146xx
+	$(TOP)/$(MCU_FAMILY_DIR)/SDK_10.0.8.105/sdk/bsp/include
 
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM33_NTZ/non_secure

+ 2 - 5
hw/bsp/ea4088qs/board.mk

@@ -1,4 +1,4 @@
-DEPS_SUBMODULES = hw/mcu/nxp
+DEPS_SUBMODULES += hw/mcu/nxp
 
 CFLAGS += \
   -flto \
@@ -22,6 +22,7 @@ MCU_DIR = hw/mcu/nxp/lpcopen/lpc40xx/lpc_chip_40xx
 LD_FILE = hw/bsp/$(BOARD)/lpc4088.ld
 
 SRC_C += \
+	src/portable/nxp/lpc17_40/dcd_lpc17_40.c \
 	$(MCU_DIR)/../gcc/cr_startup_lpc40xx.c \
 	$(MCU_DIR)/src/chip_17xx_40xx.c \
 	$(MCU_DIR)/src/clock_17xx_40xx.c \
@@ -35,10 +36,6 @@ SRC_C += \
 INC += \
 	$(TOP)/$(MCU_DIR)/inc
 
-# For TinyUSB port source
-VENDOR = nxp
-CHIP_FAMILY = lpc17_40
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM4F
 

+ 2 - 5
hw/bsp/ea4357/board.mk

@@ -1,4 +1,4 @@
-DEPS_SUBMODULES = hw/mcu/nxp
+DEPS_SUBMODULES += hw/mcu/nxp
 
 CFLAGS += \
   -flto \
@@ -21,6 +21,7 @@ MCU_DIR = hw/mcu/nxp/lpcopen/lpc43xx/lpc_chip_43xx
 LD_FILE = hw/bsp/$(BOARD)/lpc4357.ld
 
 SRC_C += \
+	src/portable/nxp/transdimension/dcd_transdimension.c \
 	$(MCU_DIR)/../gcc/cr_startup_lpc43xx.c \
 	$(MCU_DIR)/src/chip_18xx_43xx.c \
 	$(MCU_DIR)/src/clock_18xx_43xx.c \
@@ -35,10 +36,6 @@ INC += \
 	$(TOP)/$(MCU_DIR)/inc \
 	$(TOP)/$(MCU_DIR)/inc/config_43xx
 
-# For TinyUSB port source
-VENDOR = nxp
-CHIP_FAMILY = transdimension
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM4F
 

+ 36 - 0
hw/bsp/esp32s2/family.mk

@@ -0,0 +1,36 @@
+#DEPS_SUBMODULES +=
+
+.PHONY: all clean flash
+
+all:
+	idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) $(CMAKE_DEFSYM) build
+
+build: all
+
+clean:
+	idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) $(CMAKE_DEFSYM) clean
+
+fullclean:
+	idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) $(CMAKE_DEFSYM) fullclean
+
+flash:
+	idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) $(CMAKE_DEFSYM) flash
+
+bootloader-flash:
+	idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) $(CMAKE_DEFSYM) bootloader-flash
+
+app-flash:
+	idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) $(CMAKE_DEFSYM) app-flash
+
+erase:
+	idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) $(CMAKE_DEFSYM) erase_flash
+
+monitor:
+	idf.py -B$(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) $(CMAKE_DEFSYM) monitor
+
+uf2: $(BUILD)/$(PROJECT).uf2
+
+UF2_FAMILY_ID = 0xbfdd4eee
+$(BUILD)/$(PROJECT).uf2: $(BUILD)/$(PROJECT).bin
+	@echo CREATE $@
+	$(PYTHON) $(TOP)/tools/uf2/utils/uf2conv.py -f $(UF2_FAMILY_ID) -b 0x0 -c -o $@ $^

+ 2 - 4
hw/bsp/fomu/family.mk

@@ -11,15 +11,13 @@ CROSS_COMPILE = riscv-none-embed-
 # All source paths should be relative to the top level.
 LD_FILE = $(FAMILY_PATH)/fomu.ld
 
+SRC_C += src/portable/valentyusb/eptri/dcd_eptri.c
+
 SRC_S += $(FAMILY_PATH)/crt0-vexriscv.S
 
 INC += \
 	$(TOP)/$(FAMILY_PATH)/include
 
-# For TinyUSB port source
-VENDOR = valentyusb
-CHIP_FAMILY = eptri
-
 # For freeRTOS port source
 FREERTOS_PORT = RISC-V
 

+ 2 - 5
hw/bsp/frdm_kl25z/board.mk

@@ -1,4 +1,4 @@
-DEPS_SUBMODULES = hw/mcu/nxp
+DEPS_SUBMODULES += hw/mcu/nxp
 
 CFLAGS += \
   -mthumb \
@@ -16,6 +16,7 @@ MCU_DIR = hw/mcu/nxp/sdk/devices/MKL25Z4
 LD_FILE = $(MCU_DIR)/gcc/MKL25Z128xxx4_flash.ld
 
 SRC_C += \
+	src/portable/nxp/khci/dcd_khci.c \
 	$(MCU_DIR)/system_MKL25Z4.c \
 	$(MCU_DIR)/project_template/clock_config.c \
 	$(MCU_DIR)/drivers/fsl_clock.c \
@@ -31,10 +32,6 @@ INC += \
 
 SRC_S += $(MCU_DIR)/gcc/startup_MKL25Z4.S
 
-# For TinyUSB port source
-VENDOR = nxp
-CHIP_FAMILY = khci
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM0
 

+ 2 - 5
hw/bsp/imxrt/family.mk

@@ -1,5 +1,5 @@
 UF2_FAMILY_ID = 0x4fb2d5bd
-DEPS_SUBMODULES = hw/mcu/nxp
+DEPS_SUBMODULES += hw/mcu/nxp
 
 include $(TOP)/$(BOARD_PATH)/board.mk
 
@@ -27,6 +27,7 @@ LDFLAGS += \
 	-Wl,--defsym,__stack_size__=0x800 \
 
 SRC_C += \
+	src/portable/nxp/transdimension/dcd_transdimension.c \
 	$(MCU_DIR)/system_$(MCU_VARIANT).c \
 	$(MCU_DIR)/xip/fsl_flexspi_nor_boot.c \
 	$(MCU_DIR)/project_template/clock_config.c \
@@ -44,10 +45,6 @@ INC += \
 
 SRC_S += $(MCU_DIR)/gcc/startup_$(MCU_VARIANT).S
 
-# For TinyUSB port source
-VENDOR = nxp
-CHIP_FAMILY = transdimension
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM7/r0p1
 

+ 2 - 5
hw/bsp/lpc18/family.mk

@@ -1,4 +1,4 @@
-DEPS_SUBMODULES = hw/mcu/nxp
+DEPS_SUBMODULES += hw/mcu/nxp
 
 include $(TOP)/$(BOARD_PATH)/board.mk
 
@@ -18,6 +18,7 @@ CFLAGS += -Wno-error=unused-parameter -Wno-error=strict-prototypes
 MCU_DIR = hw/mcu/nxp/lpcopen/lpc18xx/lpc_chip_18xx
 
 SRC_C += \
+	src/portable/nxp/transdimension/dcd_transdimension.c \
 	$(MCU_DIR)/../gcc/cr_startup_lpc18xx.c \
 	$(MCU_DIR)/src/chip_18xx_43xx.c \
 	$(MCU_DIR)/src/clock_18xx_43xx.c \
@@ -30,9 +31,5 @@ INC += \
 	$(TOP)/$(MCU_DIR)/inc \
 	$(TOP)/$(MCU_DIR)/inc/config_18xx
 
-# For TinyUSB port source
-VENDOR = nxp
-CHIP_FAMILY = transdimension
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM3

+ 2 - 5
hw/bsp/lpc55/family.mk

@@ -1,5 +1,5 @@
 UF2_FAMILY_ID = 0x2abc77ec
-DEPS_SUBMODULES = lib/sct_neopixel hw/mcu/nxp
+DEPS_SUBMODULES += lib/sct_neopixel hw/mcu/nxp
 
 include $(TOP)/$(BOARD_PATH)/board.mk
 
@@ -34,6 +34,7 @@ MCU_DIR = hw/mcu/nxp/sdk/devices/$(MCU_VARIANT)
 LD_FILE ?= $(MCU_DIR)/gcc/$(MCU_CORE)_flash.ld
 
 SRC_C += \
+	src/portable/nxp/lpc_ip3511/dcd_lpc_ip3511.c \
 	$(MCU_DIR)/system_$(MCU_CORE).c \
 	$(MCU_DIR)/drivers/fsl_clock.c \
 	$(MCU_DIR)/drivers/fsl_gpio.c \
@@ -54,9 +55,5 @@ SRC_S += $(MCU_DIR)/gcc/startup_$(MCU_CORE).S
 
 LIBS += $(TOP)/$(MCU_DIR)/gcc/libpower_hardabi.a
 
-# For TinyUSB port source
-VENDOR = nxp
-CHIP_FAMILY = lpc_ip3511
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM33_NTZ/non_secure

+ 2 - 5
hw/bsp/lpcxpresso11u37/board.mk

@@ -1,4 +1,4 @@
-DEPS_SUBMODULES = hw/mcu/nxp
+DEPS_SUBMODULES += hw/mcu/nxp
 
 CFLAGS += \
   -flto \
@@ -22,6 +22,7 @@ MCU_DIR = hw/mcu/nxp/lpcopen/lpc11uxx/lpc_chip_11uxx
 LD_FILE = hw/bsp/$(BOARD)/lpc11u37.ld
 
 SRC_C += \
+	src/portable/nxp/lpc_ip3511/dcd_lpc_ip3511.c \
 	$(MCU_DIR)/../gcc/cr_startup_lpc11xx.c \
 	$(MCU_DIR)/src/chip_11xx.c \
 	$(MCU_DIR)/src/clock_11xx.c \
@@ -33,10 +34,6 @@ SRC_C += \
 INC += \
 	$(TOP)/$(MCU_DIR)/inc
 
-# For TinyUSB port source
-VENDOR = nxp
-CHIP_FAMILY = lpc_ip3511
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM0
 

+ 2 - 5
hw/bsp/lpcxpresso11u68/board.mk

@@ -1,4 +1,4 @@
-DEPS_SUBMODULES = hw/mcu/nxp
+DEPS_SUBMODULES += hw/mcu/nxp
 
 CFLAGS += \
   -flto \
@@ -19,6 +19,7 @@ MCU_DIR = hw/mcu/nxp/lpcopen/lpc11u6x/lpc_chip_11u6x
 LD_FILE = hw/bsp/$(BOARD)/lpc11u68.ld
 
 SRC_C += \
+	src/portable/nxp/lpc_ip3511/dcd_lpc_ip3511.c \
 	$(MCU_DIR)/../gcc/cr_startup_lpc11u6x.c \
 	$(MCU_DIR)/src/chip_11u6x.c \
 	$(MCU_DIR)/src/clock_11u6x.c \
@@ -30,10 +31,6 @@ SRC_C += \
 INC += \
 	$(TOP)/$(MCU_DIR)/inc
 
-# For TinyUSB port source
-VENDOR = nxp
-CHIP_FAMILY = lpc_ip3511
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM0
 

+ 2 - 5
hw/bsp/lpcxpresso1347/board.mk

@@ -1,4 +1,4 @@
-DEPS_SUBMODULES = hw/mcu/nxp
+DEPS_SUBMODULES += hw/mcu/nxp
 
 CFLAGS += \
   -flto \
@@ -22,6 +22,7 @@ MCU_DIR = hw/mcu/nxp/lpcopen/lpc13xx/lpc_chip_13xx
 LD_FILE = hw/bsp/$(BOARD)/lpc1347.ld
 
 SRC_C += \
+	src/portable/nxp/lpc_ip3511/dcd_lpc_ip3511.c \
 	$(MCU_DIR)/../gcc/cr_startup_lpc13xx.c \
 	$(MCU_DIR)/src/chip_13xx.c \
 	$(MCU_DIR)/src/clock_13xx.c \
@@ -33,10 +34,6 @@ SRC_C += \
 INC += \
 	$(TOP)/$(MCU_DIR)/inc
 
-# For TinyUSB port source
-VENDOR = nxp
-CHIP_FAMILY = lpc_ip3511
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM3
 

+ 2 - 5
hw/bsp/lpcxpresso1549/board.mk

@@ -1,4 +1,4 @@
-DEPS_SUBMODULES = hw/mcu/nxp
+DEPS_SUBMODULES += hw/mcu/nxp
 
 CFLAGS += \
   -flto \
@@ -21,6 +21,7 @@ MCU_DIR = hw/mcu/nxp/lpcopen/lpc15xx/lpc_chip_15xx
 LD_FILE = hw/bsp/$(BOARD)/lpc1549.ld
 
 SRC_C += \
+	src/portable/nxp/lpc_ip3511/dcd_lpc_ip3511.c \
 	$(MCU_DIR)/../gcc/cr_startup_lpc15xx.c \
 	$(MCU_DIR)/src/chip_15xx.c \
 	$(MCU_DIR)/src/clock_15xx.c \
@@ -33,10 +34,6 @@ SRC_C += \
 INC += \
 	$(TOP)/$(MCU_DIR)/inc
 
-# For TinyUSB port source
-VENDOR = nxp
-CHIP_FAMILY = lpc_ip3511
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM3
 

+ 2 - 5
hw/bsp/lpcxpresso1769/board.mk

@@ -1,4 +1,4 @@
-DEPS_SUBMODULES = hw/mcu/nxp
+DEPS_SUBMODULES += hw/mcu/nxp
 
 CFLAGS += \
   -flto \
@@ -20,6 +20,7 @@ MCU_DIR = hw/mcu/nxp/lpcopen/lpc175x_6x/lpc_chip_175x_6x
 LD_FILE = hw/bsp/$(BOARD)/lpc1769.ld
 
 SRC_C += \
+	src/portable/nxp/lpc17_40/dcd_lpc17_40.c \
 	$(MCU_DIR)/../gcc/cr_startup_lpc175x_6x.c \
 	$(MCU_DIR)/src/chip_17xx_40xx.c \
 	$(MCU_DIR)/src/clock_17xx_40xx.c \
@@ -32,10 +33,6 @@ SRC_C += \
 INC += \
 	$(TOP)/$(MCU_DIR)/inc
 
-# For TinyUSB port source
-VENDOR = nxp
-CHIP_FAMILY = lpc17_40
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM3
 

+ 2 - 5
hw/bsp/lpcxpresso51u68/board.mk

@@ -1,4 +1,4 @@
-DEPS_SUBMODULES = hw/mcu/nxp
+DEPS_SUBMODULES += hw/mcu/nxp
 
 CFLAGS += \
   -flto \
@@ -19,6 +19,7 @@ MCU_DIR = hw/mcu/nxp/sdk/devices/LPC51U68
 LD_FILE = $(MCU_DIR)/gcc/LPC51U68_flash.ld
 
 SRC_C += \
+	src/portable/nxp/lpc_ip3511/dcd_lpc_ip3511.c \
 	$(MCU_DIR)/system_LPC51U68.c \
 	$(MCU_DIR)/drivers/fsl_clock.c \
 	$(MCU_DIR)/drivers/fsl_gpio.c \
@@ -34,10 +35,6 @@ SRC_S += $(MCU_DIR)/gcc/startup_LPC51U68.S
 
 LIBS += $(TOP)/$(MCU_DIR)/gcc/libpower.a
 
-# For TinyUSB port source
-VENDOR = nxp
-CHIP_FAMILY = lpc_ip3511
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM0
 

+ 2 - 5
hw/bsp/lpcxpresso54114/board.mk

@@ -1,4 +1,4 @@
-DEPS_SUBMODULES = hw/mcu/nxp
+DEPS_SUBMODULES += hw/mcu/nxp
 
 CFLAGS += \
   -flto \
@@ -21,6 +21,7 @@ MCU_DIR = hw/mcu/nxp/sdk/devices/LPC54114
 LD_FILE = $(MCU_DIR)/gcc/LPC54114J256_cm4_flash.ld
 
 SRC_C += \
+	src/portable/nxp/lpc_ip3511/dcd_lpc_ip3511.c \
 	$(MCU_DIR)/system_LPC54114_cm4.c \
 	$(MCU_DIR)/drivers/fsl_clock.c \
 	$(MCU_DIR)/drivers/fsl_gpio.c \
@@ -36,10 +37,6 @@ SRC_S += $(MCU_DIR)/gcc/startup_LPC54114_cm4.S
 
 LIBS += $(TOP)/$(MCU_DIR)/gcc/libpower_cm4_hardabi.a
 
-# For TinyUSB port source
-VENDOR = nxp
-CHIP_FAMILY = lpc_ip3511
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM4F
 

+ 2 - 5
hw/bsp/mbed1768/board.mk

@@ -1,4 +1,4 @@
-DEPS_SUBMODULES = hw/mcu/nxp
+DEPS_SUBMODULES += hw/mcu/nxp
 
 CFLAGS += \
   -flto \
@@ -20,6 +20,7 @@ MCU_DIR = hw/mcu/nxp/lpcopen/lpc175x_6x/lpc_chip_175x_6x
 LD_FILE = hw/bsp/$(BOARD)/lpc1768.ld
 
 SRC_C += \
+	src/portable/nxp/lpc17_40/dcd_lpc17_40.c \
 	$(MCU_DIR)/../gcc/cr_startup_lpc175x_6x.c \
 	$(MCU_DIR)/src/chip_17xx_40xx.c \
 	$(MCU_DIR)/src/clock_17xx_40xx.c \
@@ -32,10 +33,6 @@ SRC_C += \
 INC += \
 	$(TOP)/$(MCU_DIR)/inc
 
-# For TinyUSB port source
-VENDOR = nxp
-CHIP_FAMILY = lpc17_40
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM3
 

+ 3 - 9
hw/bsp/msp430/family.mk

@@ -1,5 +1,5 @@
 CROSS_COMPILE = msp430-elf-
-DEPS_SUBMODULES = hw/mcu/ti
+DEPS_SUBMODULES += hw/mcu/ti
 SKIP_NANOLIB = 1
 
 CFLAGS += \
@@ -8,23 +8,17 @@ CFLAGS += \
 	-DCFG_EXAMPLE_MSC_READONLY \
 	-DCFG_TUD_ENDPOINT0_SIZE=8
 
-#-mmcu=msp430f5529
-
-
-
 # All source paths should be relative to the top level.
 LD_FILE = hw/mcu/ti/msp430/msp430-gcc-support-files/include/msp430f5529.ld
 LDINC += $(TOP)/hw/mcu/ti/msp430/msp430-gcc-support-files/include
 LDFLAGS += $(addprefix -L,$(LDINC))
 
+SRC_C += src/portable/ti/msp430x5xx/dcd_msp430x5xx.c
+
 INC += \
 	$(TOP)/hw/mcu/ti/msp430/msp430-gcc-support-files/include \
 	$(TOP)/$(BOARD_PATH)
 
-# For TinyUSB port source
-VENDOR = ti
-CHIP_FAMILY = msp430x5xx
-
 # export for libmsp430.so to same installation
 ifneq ($(OS),Windows_NT)
 export LD_LIBRARY_PATH=$(dir $(shell which MSP430Flasher))

+ 2 - 5
hw/bsp/ngx4330/board.mk

@@ -1,4 +1,4 @@
-DEPS_SUBMODULES = hw/mcu/nxp
+DEPS_SUBMODULES += hw/mcu/nxp
 
 CFLAGS += \
   -flto \
@@ -21,6 +21,7 @@ MCU_DIR = hw/mcu/nxp/lpcopen/lpc43xx/lpc_chip_43xx
 LD_FILE = hw/bsp/$(BOARD)/ngx4330.ld
 
 SRC_C += \
+	src/portable/nxp/transdimension/dcd_transdimension.c \
 	$(MCU_DIR)/../gcc/cr_startup_lpc43xx.c \
 	$(MCU_DIR)/src/chip_18xx_43xx.c \
 	$(MCU_DIR)/src/clock_18xx_43xx.c \
@@ -33,10 +34,6 @@ INC += \
 	$(TOP)/$(MCU_DIR)/inc \
 	$(TOP)/$(MCU_DIR)/inc/config_43xx
 
-# For TinyUSB port source
-VENDOR = nxp
-CHIP_FAMILY = transdimension
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM4F
 

+ 2 - 5
hw/bsp/nrf/family.mk

@@ -1,5 +1,5 @@
 UF2_FAMILY_ID = 0xADA52840
-DEPS_SUBMODULES = lib/CMSIS_5 hw/mcu/nordic/nrfx
+DEPS_SUBMODULES += lib/CMSIS_5 hw/mcu/nordic/nrfx
 
 include $(TOP)/$(BOARD_PATH)/board.mk
 
@@ -34,6 +34,7 @@ LD_FILE ?= hw/bsp/nrf/boards/$(BOARD)/nrf52840_s140_v6.ld
 LDFLAGS += -L$(TOP)/hw/mcu/nordic/nrfx/mdk
 
 SRC_C += \
+  src/portable/nordic/nrf5x/dcd_nrf5x.c \
   hw/mcu/nordic/nrfx/drivers/src/nrfx_power.c \
   hw/mcu/nordic/nrfx/drivers/src/nrfx_uarte.c \
   hw/mcu/nordic/nrfx/mdk/system_$(MCU_VARIANT).c
@@ -52,10 +53,6 @@ SRC_S += hw/mcu/nordic/nrfx/mdk/gcc_startup_$(MCU_VARIANT).S
 
 ASFLAGS += -D__HEAP_SIZE=0
 
-# For TinyUSB port source
-VENDOR = nordic
-CHIP_FAMILY = nrf5x
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM4F
 

+ 2 - 5
hw/bsp/nutiny_nuc121s/board.mk

@@ -1,4 +1,4 @@
-DEPS_SUBMODULES = hw/mcu/nuvoton
+DEPS_SUBMODULES += hw/mcu/nuvoton
 
 CFLAGS += \
   -flto \
@@ -14,6 +14,7 @@ CFLAGS += \
 LD_FILE = hw/bsp/$(BOARD)/nuc121_flash.ld
 
 SRC_C += \
+  src/portable/nuvoton/nuc121/dcd_nuc121.c \
   hw/mcu/nuvoton/nuc121_125/Device/Nuvoton/NUC121/Source/system_NUC121.c \
   hw/mcu/nuvoton/nuc121_125/StdDriver/src/adc.c \
   hw/mcu/nuvoton/nuc121_125/StdDriver/src/bpwm.c \
@@ -42,10 +43,6 @@ INC += \
   $(TOP)/hw/mcu/nuvoton/nuc121_125/StdDriver/inc \
   $(TOP)/hw/mcu/nuvoton/nuc121_125/CMSIS/Include
 
-# For TinyUSB port source
-VENDOR = nuvoton
-CHIP_FAMILY = nuc121
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM0
 

+ 3 - 6
hw/bsp/nutiny_nuc125s/board.mk

@@ -1,4 +1,4 @@
-DEPS_SUBMODULES = hw/mcu/nuvoton
+DEPS_SUBMODULES += hw/mcu/nuvoton
 
 CFLAGS += \
   -flto \
@@ -14,9 +14,10 @@ CFLAGS += \
 LD_FILE = hw/bsp/$(BOARD)/nuc125_flash.ld
 
 SRC_C += \
+  src/portable/nuvoton/nuc121/dcd_nuc121.c \
   hw/mcu/nuvoton/nuc121_125/Device/Nuvoton/NUC121/Source/system_NUC121.c \
   hw/mcu/nuvoton/nuc121_125/StdDriver/src/clk.c \
-    hw/mcu/nuvoton/nuc121_125/StdDriver/src/gpio.c
+  hw/mcu/nuvoton/nuc121_125/StdDriver/src/gpio.c
 
 SRC_S += \
   hw/mcu/nuvoton/nuc121_125/Device/Nuvoton/NUC121/Source/GCC/startup_NUC121.S
@@ -26,10 +27,6 @@ INC += \
   $(TOP)/hw/mcu/nuvoton/nuc121_125/StdDriver/inc \
   $(TOP)/hw/mcu/nuvoton/nuc121_125/CMSIS/Include
 
-# For TinyUSB port source
-VENDOR = nuvoton
-CHIP_FAMILY = nuc121
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM0
 

+ 2 - 5
hw/bsp/nutiny_nuc126v/board.mk

@@ -1,4 +1,4 @@
-DEPS_SUBMODULES = hw/mcu/nuvoton
+DEPS_SUBMODULES += hw/mcu/nuvoton
 
 CFLAGS += \
   -flto \
@@ -14,6 +14,7 @@ CFLAGS += \
 LD_FILE = hw/bsp/$(BOARD)/nuc126_flash.ld
 
 SRC_C += \
+  src/portable/nuvoton/nuc121/dcd_nuc121.c \
   hw/mcu/nuvoton/nuc126/Device/Nuvoton/NUC126/Source/system_NUC126.c \
   hw/mcu/nuvoton/nuc126/StdDriver/src/acmp.c \
   hw/mcu/nuvoton/nuc126/StdDriver/src/adc.c \
@@ -46,10 +47,6 @@ INC += \
   $(TOP)/hw/mcu/nuvoton/nuc126/StdDriver/inc \
   $(TOP)/hw/mcu/nuvoton/nuc126/CMSIS/Include
 
-# For TinyUSB port source
-VENDOR = nuvoton
-CHIP_FAMILY = nuc121
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM0
 

+ 2 - 5
hw/bsp/nutiny_sdk_nuc120/board.mk

@@ -1,4 +1,4 @@
-DEPS_SUBMODULES = hw/mcu/nuvoton
+DEPS_SUBMODULES += hw/mcu/nuvoton
 
 CFLAGS += \
   -flto \
@@ -12,6 +12,7 @@ CFLAGS += \
 LD_FILE = hw/bsp/nutiny_sdk_nuc120/nuc120_flash.ld
 
 SRC_C += \
+  src/portable/nuvoton/nuc120/dcd_nuc120.c \
   hw/mcu/nuvoton/nuc100_120/Device/Nuvoton/NUC100Series/Source/system_NUC100Series.c \
   hw/mcu/nuvoton/nuc100_120/StdDriver/src/acmp.c \
   hw/mcu/nuvoton/nuc100_120/StdDriver/src/adc.c \
@@ -42,10 +43,6 @@ INC += \
   $(TOP)/hw/mcu/nuvoton/nuc100_120/StdDriver/inc \
   $(TOP)/hw/mcu/nuvoton/nuc100_120/CMSIS/Include
 
-# For TinyUSB port source
-VENDOR = nuvoton
-CHIP_FAMILY = nuc120
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM0
 

+ 2 - 5
hw/bsp/nutiny_sdk_nuc505/board.mk

@@ -1,4 +1,4 @@
-DEPS_SUBMODULES = hw/mcu/nuvoton
+DEPS_SUBMODULES += hw/mcu/nuvoton
 
 CFLAGS += \
   -flto \
@@ -13,6 +13,7 @@ CFLAGS += \
 LD_FILE = hw/bsp/$(BOARD)/nuc505_flashtoram.ld
 
 SRC_C += \
+  src/portable/nuvoton/nuc505/dcd_nuc505.c \
   hw/mcu/nuvoton/nuc505/Device/Nuvoton/NUC505Series/Source/system_NUC505Series.c \
   hw/mcu/nuvoton/nuc505/StdDriver/src/adc.c \
   hw/mcu/nuvoton/nuc505/StdDriver/src/clk.c \
@@ -37,10 +38,6 @@ INC += \
   $(TOP)/hw/mcu/nuvoton/nuc505/StdDriver/inc \
   $(TOP)/hw/mcu/nuvoton/nuc505/CMSIS/Include
 
-# For TinyUSB port source
-VENDOR = nuvoton
-CHIP_FAMILY = nuc505
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM4F
 

+ 1 - 0
hw/bsp/rp2040/boards/adafruit_feather_rp2040/board.cmake

@@ -0,0 +1 @@
+set(PICO_DEFAULT_BOOT_STAGE2_FILE "${PICO_SDK_PATH}/src/rp2_common/boot_stage2/boot2_generic_03h.S")

+ 1 - 0
hw/bsp/rp2040/boards/adafruit_itsybitsy_rp2040/board.cmake

@@ -0,0 +1 @@
+set(PICO_DEFAULT_BOOT_STAGE2_FILE "${PICO_SDK_PATH}/src/rp2_common/boot_stage2/boot2_generic_03h.S")

+ 1 - 0
hw/bsp/rp2040/boards/adafruit_qt_rp2040/board.cmake

@@ -0,0 +1 @@
+set(PICO_DEFAULT_BOOT_STAGE2_FILE "${PICO_SDK_PATH}/src/rp2_common/boot_stage2/boot2_generic_03h.S")

+ 1 - 0
hw/bsp/rp2040/boards/raspberry_pi_pico/board.cmake

@@ -0,0 +1 @@
+set(PICO_DEFAULT_BOOT_STAGE2_FILE "${PICO_SDK_PATH}/src/rp2_common/boot_stage2/boot2_w25q080.S")

+ 6 - 0
hw/bsp/rp2040/family.cmake

@@ -1,3 +1,9 @@
+# Board specific define e.g boot stage2
+# PICO_DEFAULT_BOOT_STAGE2_FILE must be set before pico_sdk_init()
+include(${TOP}/hw/bsp/${FAMILY}/boards/${BOARD}/board.cmake)
+
+pico_sdk_init()
+
 target_link_libraries(${PROJECT}
   pico_stdlib
   pico_bootsel_via_double_reset

+ 18 - 1
hw/bsp/rp2040/family.mk

@@ -1,4 +1,21 @@
-DEPS_SUBMODULES = hw/mcu/raspberrypi/pico-sdk
+DEPS_SUBMODULES += hw/mcu/raspberrypi/pico-sdk
 
 JLINK_DEVICE = rp2040_m0_0
 PYOCD_TARGET = rp2040
+
+ifeq ($(DEBUG), 1)
+CMAKE_DEFSYM += -DCMAKE_BUILD_TYPE=Debug
+endif
+
+$(BUILD):
+	cmake -S . -B $(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) -DPICO_BUILD_DOCS=0 $(CMAKE_DEFSYM)
+
+all: $(BUILD)
+	$(MAKE) -C $(BUILD)
+
+clean:
+	$(RM) -rf $(BUILD)
+
+flash: flash-pyocd
+flash-uf2:
+	@$(CP) $(BUILD)/$(PROJECT).uf2 /media/$(USER)/RPI-RP2

+ 2 - 5
hw/bsp/samd11/family.mk

@@ -1,4 +1,4 @@
-DEPS_SUBMODULES = hw/mcu/microchip
+DEPS_SUBMODULES += hw/mcu/microchip
 
 include $(TOP)/$(BOARD_PATH)/board.mk
 
@@ -12,6 +12,7 @@ CFLAGS += \
   -DCFG_TUSB_MCU=OPT_MCU_SAMD11
 
 SRC_C += \
+	src/portable/microchip/samd/dcd_samd.c \
 	hw/mcu/microchip/samd11/gcc/gcc/startup_samd11.c \
 	hw/mcu/microchip/samd11/gcc/system_samd11.c \
 	hw/mcu/microchip/samd11/hpl/gclk/hpl_gclk.c \
@@ -32,9 +33,5 @@ INC += \
 	$(TOP)/hw/mcu/microchip/samd11/CMSIS/Include \
 	$(TOP)/hw/mcu/microchip/samd11/CMSIS/Core/Include
 
-# For TinyUSB port source
-VENDOR = microchip
-CHIP_FAMILY = samd
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM0

+ 2 - 5
hw/bsp/samd21/family.mk

@@ -1,5 +1,5 @@
 UF2_FAMILY_ID = 0x68ed2b88
-DEPS_SUBMODULES = hw/mcu/microchip
+DEPS_SUBMODULES += hw/mcu/microchip
 
 include $(TOP)/$(BOARD_PATH)/board.mk
 
@@ -13,6 +13,7 @@ CFLAGS += \
   -DCFG_TUSB_MCU=OPT_MCU_SAMD21
 
 SRC_C += \
+	src/portable/microchip/samd/dcd_samd.c \
 	hw/mcu/microchip/samd21/gcc/gcc/startup_samd21.c \
 	hw/mcu/microchip/samd21/gcc/system_samd21.c \
 	hw/mcu/microchip/samd21/hpl/gclk/hpl_gclk.c \
@@ -32,10 +33,6 @@ INC += \
 	$(TOP)/hw/mcu/microchip/samd21/hri \
 	$(TOP)/hw/mcu/microchip/samd21/CMSIS/Include
 
-# For TinyUSB port source 
-VENDOR = microchip
-CHIP_FAMILY = samd
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM0
 

+ 2 - 5
hw/bsp/samd51/family.mk

@@ -1,5 +1,5 @@
 UF2_FAMILY_ID = 0x55114460
-DEPS_SUBMODULES = hw/mcu/microchip
+DEPS_SUBMODULES += hw/mcu/microchip
 
 include $(TOP)/$(BOARD_PATH)/board.mk
 
@@ -16,6 +16,7 @@ CFLAGS += \
 CFLAGS += -Wno-error=undef
 
 SRC_C += \
+	src/portable/microchip/samd/dcd_samd.c \
 	hw/mcu/microchip/samd51/gcc/gcc/startup_samd51.c \
 	hw/mcu/microchip/samd51/gcc/system_samd51.c \
 	hw/mcu/microchip/samd51/hpl/gclk/hpl_gclk.c \
@@ -35,10 +36,6 @@ INC += \
 	$(TOP)/hw/mcu/microchip/samd51/hri \
 	$(TOP)/hw/mcu/microchip/samd51/CMSIS/Include
 
-# For TinyUSB port source
-VENDOR = microchip
-CHIP_FAMILY = samd
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM4F
 

+ 2 - 6
hw/bsp/same54xplainedpro/board.mk

@@ -1,4 +1,4 @@
-DEPS_SUBMODULES = hw/mcu/microchip
+DEPS_SUBMODULES += hw/mcu/microchip
 
 CONF_CPU_FREQUENCY ?= 48000000
 
@@ -20,6 +20,7 @@ CFLAGS += \
 LD_FILE = hw/bsp/$(BOARD)/same54p20a_flash.ld
 
 SRC_C += \
+  src/portable/microchip/samd/dcd_samd.c \
   hw/mcu/microchip/same54/gcc/gcc/startup_same54.c \
   hw/mcu/microchip/same54/gcc/system_same54.c \
   hw/mcu/microchip/same54/hal/utils/src/utils_syscalls.c
@@ -34,14 +35,9 @@ INC += \
 	$(TOP)/hw/mcu/microchip/same54/hri \
 	$(TOP)/hw/mcu/microchip/same54/CMSIS/Include
 
-# For TinyUSB port source
-VENDOR = microchip
-CHIP_FAMILY = samd
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM4F
 
-
 # For flash-jlink target
 JLINK_DEVICE = ATSAME54P20
 

+ 2 - 1
hw/bsp/same70_xplained/board.mk

@@ -1,4 +1,4 @@
-DEPS_SUBMODULES = hw/mcu/microchip
+DEPS_SUBMODULES += hw/mcu/microchip
 
 CFLAGS += \
   -mthumb \
@@ -19,6 +19,7 @@ ASF_DIR = hw/mcu/microchip/same70
 LD_FILE = $(ASF_DIR)/same70b/gcc/gcc/same70q21b_flash.ld
 
 SRC_C += \
+	src/portable/template/dcd_template.c \
 	$(ASF_DIR)/same70b/gcc/gcc/startup_same70q21b.c \
 	$(ASF_DIR)/same70b/gcc/system_same70q21b.c \
 	$(ASF_DIR)/hpl/core/hpl_init.c \

+ 2 - 5
hw/bsp/samg55xplained/board.mk

@@ -1,4 +1,4 @@
-DEPS_SUBMODULES = hw/mcu/microchip
+DEPS_SUBMODULES += hw/mcu/microchip
 
 CFLAGS += \
   -flto \
@@ -20,6 +20,7 @@ ASF_DIR = hw/mcu/microchip/samg55
 LD_FILE = hw/bsp/$(BOARD)/samg55j19_flash.ld
 
 SRC_C += \
+	src/portable/microchip/samg/dcd_samg.c \
 	$(ASF_DIR)/samg55/gcc/gcc/startup_samg55.c \
 	$(ASF_DIR)/samg55/gcc/system_samg55.c \
 	$(ASF_DIR)/hpl/core/hpl_init.c \
@@ -40,10 +41,6 @@ INC += \
 	$(TOP)/$(ASF_DIR)/hri \
 	$(TOP)/$(ASF_DIR)/CMSIS/Core/Include
 
-# For TinyUSB port source
-VENDOR = microchip
-CHIP_FAMILY = samg
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM4F
 

+ 4 - 6
hw/bsp/spresense/board.mk

@@ -1,4 +1,4 @@
-DEPS_SUBMODULES = hw/mcu/sony/cxd56/spresense-exported-sdk
+DEPS_SUBMODULES += hw/mcu/sony/cxd56/spresense-exported-sdk
 
 # Platforms are: Linux, Darwin, MSYS, CYGWIN
 PLATFORM := $(firstword $(subst _, ,$(shell uname -s 2>/dev/null)))
@@ -39,6 +39,8 @@ CFLAGS += -Wno-error=shadow
 
 SPRESENSE_SDK = $(TOP)/hw/mcu/sony/cxd56/spresense-exported-sdk
 
+SRC_C += src/portable/sony/cxd56/dcd_cxd56.c
+
 INC += \
 	$(SPRESENSE_SDK)/nuttx/include \
 	$(SPRESENSE_SDK)/nuttx/arch \
@@ -57,11 +59,7 @@ LDFLAGS += \
 	-nostartfiles \
 	-nodefaultlibs \
 	-Wl,--gc-sections \
-	-u spresense_main \
-
-# For TinyUSB port source
-VENDOR = sony
-CHIP_FAMILY = cxd56
+	-u spresense_main
 
 $(MKSPK): $(BUILD)/$(PROJECT).elf
 	$(MAKE) -C $(TOP)/hw/mcu/sony/cxd56/mkspk

+ 2 - 5
hw/bsp/stm32f070rbnucleo/board.mk

@@ -1,5 +1,5 @@
 ST_FAMILY = f0
-DEPS_SUBMODULES = lib/CMSIS_5 hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+DEPS_SUBMODULES += lib/CMSIS_5 hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
 
 ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY)
 ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
@@ -23,6 +23,7 @@ CFLAGS += -Wno-error=unused-parameter -Wno-error=cast-align
 LD_FILE = hw/bsp/$(BOARD)/stm32F070rbtx_flash.ld
 
 SRC_C += \
+  src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c \
   $(ST_CMSIS)/Source/Templates/system_stm32$(ST_FAMILY)xx.c \
   $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal.c \
   $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_cortex.c \
@@ -40,10 +41,6 @@ INC += \
   $(TOP)/$(ST_HAL_DRIVER)/Inc \
   $(TOP)/hw/bsp/$(BOARD)
 
-# For TinyUSB port source
-VENDOR = st
-CHIP_FAMILY = stm32_fsdev
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM0
 

+ 2 - 5
hw/bsp/stm32f072disco/board.mk

@@ -1,5 +1,5 @@
 ST_FAMILY = f0
-DEPS_SUBMODULES = lib/CMSIS_5 hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+DEPS_SUBMODULES += lib/CMSIS_5 hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
 
 ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY)
 ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
@@ -22,6 +22,7 @@ CFLAGS += -Wno-error=unused-parameter -Wno-error=cast-align
 LD_FILE = hw/bsp/$(BOARD)/STM32F072RBTx_FLASH.ld
 
 SRC_C += \
+  src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c \
   $(ST_CMSIS)/Source/Templates/system_stm32$(ST_FAMILY)xx.c \
   $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal.c \
   $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_cortex.c \
@@ -39,10 +40,6 @@ INC += \
   $(TOP)/$(ST_HAL_DRIVER)/Inc \
   $(TOP)/hw/bsp/$(BOARD)
 
-# For TinyUSB port source
-VENDOR = st
-CHIP_FAMILY = stm32_fsdev
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM0
 

+ 177 - 0
hw/bsp/stm32f072eval/STM32F072VBTx_FLASH.ld

@@ -0,0 +1,177 @@
+/**
+ ******************************************************************************
+ * @file      LinkerScript.ld
+ * @author    Auto-generated by STM32CubeIDE
+ *  Abstract    : Linker script for STM32072B-EVAL Board embedding STM32F072VBTx Device from stm32f0 series
+ *                      128Kbytes FLASH
+ *                      16Kbytes RAM
+ *
+ *            Set heap size, stack size and stack location according
+ *            to application requirements.
+ *
+ *            Set memory bank area and size if external memory is used
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = ORIGIN(RAM) + LENGTH(RAM);	/* end of "RAM" Ram type memory */
+
+_Min_Heap_Size = 0x200 ;	/* required amount of heap  */
+_Min_Stack_Size = 0x400 ;	/* required amount of stack */
+
+/* Memories definition */
+MEMORY
+{
+  RAM    (xrw)    : ORIGIN = 0x20000000,   LENGTH = 16K
+  FLASH    (rx)    : ORIGIN = 0x8000000,   LENGTH = 128K
+}
+
+/* Sections */
+SECTIONS
+{
+  /* The startup code into "FLASH" Rom type memory */
+  .isr_vector :
+  {
+    . = ALIGN(4);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(4);
+  } >FLASH
+
+  /* The program code and other data into "FLASH" Rom type memory */
+  .text :
+  {
+    . = ALIGN(4);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(4);
+    _etext = .;        /* define a global symbols at end of code */
+  } >FLASH
+
+  /* Constant data into "FLASH" Rom type memory */
+  .rodata :
+  {
+    . = ALIGN(4);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM.extab   : {
+    . = ALIGN(4);
+    *(.ARM.extab* .gnu.linkonce.armextab.*)
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM : {
+    . = ALIGN(4);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+    . = ALIGN(4);
+  } >FLASH
+
+  .preinit_array     :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  .init_array :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  .fini_array :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  /* Used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections into "RAM" Ram type memory */
+  .data :
+  {
+    . = ALIGN(4);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
+
+    . = ALIGN(4);
+    _edata = .;        /* define a global symbol at data end */
+
+  } >RAM AT> FLASH
+
+  /* Uninitialized data section into "RAM" Ram type memory */
+  . = ALIGN(4);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(4);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >RAM
+
+  /* User_heap_stack section, used to check that there is enough "RAM" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >RAM
+
+  /* Remove information from the compiler libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}

+ 50 - 0
hw/bsp/stm32f072eval/board.mk

@@ -0,0 +1,50 @@
+ST_FAMILY = f0
+DEPS_SUBMODULES += lib/CMSIS_5 hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+
+ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY)
+ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+
+CFLAGS += \
+  -flto \
+  -mthumb \
+  -mabi=aapcs \
+  -mcpu=cortex-m0 \
+  -mfloat-abi=soft \
+  -nostdlib -nostartfiles \
+  -DSTM32F072xB \
+  -DCFG_EXAMPLE_MSC_READONLY \
+  -DCFG_TUSB_MCU=OPT_MCU_STM32F0
+
+# suppress warning caused by vendor mcu driver
+CFLAGS += -Wno-error=unused-parameter -Wno-error=cast-align
+
+# All source paths should be relative to the top level.
+LD_FILE = hw/bsp/$(BOARD)/STM32F072VBTx_FLASH.ld
+
+SRC_C += \
+  src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c \
+  $(ST_CMSIS)/Source/Templates/system_stm32$(ST_FAMILY)xx.c \
+  $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal.c \
+  $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_cortex.c \
+  $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc.c \
+  $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc_ex.c \
+  $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_gpio.c \
+  $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_uart.c
+
+SRC_S += \
+  $(ST_CMSIS)/Source/Templates/gcc/startup_stm32f072xb.s
+
+INC += \
+  $(TOP)/lib/CMSIS_5/CMSIS/Core/Include \
+  $(TOP)/$(ST_CMSIS)/Include \
+  $(TOP)/$(ST_HAL_DRIVER)/Inc \
+  $(TOP)/hw/bsp/$(BOARD)
+
+# For freeRTOS port source
+FREERTOS_PORT = ARM_CM0
+
+# For flash-jlink target
+JLINK_DEVICE = stm32f072vb
+
+# flash target using on-board stlink
+flash: flash-stlink

+ 245 - 0
hw/bsp/stm32f072eval/stm32f072eval.c

@@ -0,0 +1,245 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Ha Thach (tinyusb.org)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * This file is part of the TinyUSB stack.
+ */
+
+#include "../board.h"
+#include "stm32f0xx_hal.h"
+
+//--------------------------------------------------------------------+
+// Forward USB interrupt events to TinyUSB IRQ Handler
+//--------------------------------------------------------------------+
+void USB_IRQHandler(void)
+{
+  tud_int_handler(0);
+}
+
+//--------------------------------------------------------------------+
+// MACRO TYPEDEF CONSTANT ENUM
+//--------------------------------------------------------------------+
+#define LED_PORT              GPIOD
+#define LED_PIN               GPIO_PIN_8	// LED1, GREEN
+// #define LED_PIN               GPIO_PIN_9	// LED2, ORANGE
+// #define LED_PIN               GPIO_PIN_10	// LED3, RED
+// #define LED_PIN               GPIO_PIN_11	// LED4, BLUE
+#define LED_STATE_ON          0
+
+#define BUTTON_PORT           GPIOA
+#define BUTTON_PIN            GPIO_PIN_0	// JOY_SEL
+#define BUTTON_STATE_ACTIVE   1
+
+#define UARTx                 USART2
+#define UART_GPIO_PORT        GPIOD
+#define UART_GPIO_AF          GPIO_AF0_USART2
+#define UART_TX_PIN           GPIO_PIN_5
+#define UART_RX_PIN           GPIO_PIN_6
+
+UART_HandleTypeDef UartHandle;
+
+
+// enable all LED, Button, Uart, USB clock
+static void all_rcc_clk_enable(void)
+{
+  __HAL_RCC_GPIOA_CLK_ENABLE();  // USB D+, D-, button
+  // __HAL_RCC_GPIOB_CLK_ENABLE();
+  //__HAL_RCC_GPIOC_CLK_ENABLE();
+  __HAL_RCC_GPIOD_CLK_ENABLE();  // Uart tx, rx, LED
+  __HAL_RCC_USART2_CLK_ENABLE(); // Uart module
+}
+
+/**
+  * @brief  System Clock Configuration
+  *         The system Clock is configured as follow :
+  *            System Clock source            = PLL (HSI48)
+  *            SYSCLK(Hz)                     = 48000000
+  *            HCLK(Hz)                       = 48000000
+  *            AHB Prescaler                  = 1
+  *            APB1 Prescaler                 = 1
+  *            HSI Frequency(Hz)              = 48000000
+  *            PREDIV                         = 2
+  *            PLLMUL                         = 2
+  *            Flash Latency(WS)              = 1
+  * @param  None
+  * @retval None
+  */
+static void SystemClock_Config(void)
+{
+  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
+  RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
+  RCC_PeriphCLKInitTypeDef PeriphClkInit = {0};
+
+  /** Initializes the RCC Oscillators according to the specified parameters
+   * in the RCC_OscInitTypeDef structure.
+   */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI48;
+  RCC_OscInitStruct.HSEState = RCC_HSE_OFF;
+  RCC_OscInitStruct.HSI48State = RCC_HSI48_ON;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI;
+  RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL6;
+  RCC_OscInitStruct.PLL.PREDIV = RCC_PREDIV_DIV1;
+
+  HAL_RCC_OscConfig(&RCC_OscInitStruct);
+
+  /** Initializes the CPU, AHB and APB buses clocks
+   */
+  RCC_ClkInitStruct.ClockType =
+      RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_PCLK1;
+  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
+  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
+
+  HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1);
+
+  PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USB | RCC_PERIPHCLK_USART2;
+  PeriphClkInit.Usart2ClockSelection = RCC_USART2CLKSOURCE_PCLK1;
+  PeriphClkInit.UsbClockSelection = RCC_USBCLKSOURCE_HSI48;
+
+  HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit);
+}
+
+
+void board_init(void)
+{
+  SystemClock_Config();
+  all_rcc_clk_enable();
+
+  #if CFG_TUSB_OS  == OPT_OS_NONE
+  // 1ms tick timer
+  SysTick_Config(SystemCoreClock / 1000);
+  #endif
+
+  // LED
+  GPIO_InitTypeDef  GPIO_InitStruct;
+  GPIO_InitStruct.Pin = LED_PIN;
+  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+  GPIO_InitStruct.Pull = GPIO_PULLUP;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+  HAL_GPIO_Init(LED_PORT, &GPIO_InitStruct);
+
+  // Button
+  GPIO_InitStruct.Pin = BUTTON_PIN;
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+  GPIO_InitStruct.Pull = GPIO_PULLDOWN;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+  HAL_GPIO_Init(BUTTON_PORT, &GPIO_InitStruct);
+
+  // Uart
+  GPIO_InitStruct.Pin       = UART_TX_PIN | UART_RX_PIN;
+  GPIO_InitStruct.Mode      = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull      = GPIO_PULLUP;
+  GPIO_InitStruct.Speed     = GPIO_SPEED_FREQ_HIGH;
+  GPIO_InitStruct.Alternate = UART_GPIO_AF;
+  HAL_GPIO_Init(UART_GPIO_PORT, &GPIO_InitStruct);
+
+  UartHandle.Instance        = UARTx;
+  UartHandle.Init.BaudRate   = CFG_BOARD_UART_BAUDRATE;
+  UartHandle.Init.WordLength = UART_WORDLENGTH_8B;
+  UartHandle.Init.StopBits   = UART_STOPBITS_1;
+  UartHandle.Init.Parity     = UART_PARITY_NONE;
+  UartHandle.Init.HwFlowCtl  = UART_HWCONTROL_NONE;
+  UartHandle.Init.Mode       = UART_MODE_TX_RX;
+  UartHandle.Init.OverSampling = UART_OVERSAMPLING_16;
+  HAL_UART_Init(&UartHandle);
+
+  // USB Pins
+  // Configure USB DM and DP pins. This is optional, and maintained only for user guidance.
+  GPIO_InitStruct.Pin = (GPIO_PIN_11 | GPIO_PIN_12);
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+  // USB Clock enable
+  __HAL_RCC_USB_CLK_ENABLE();
+}
+
+//--------------------------------------------------------------------+
+// Board porting API
+//--------------------------------------------------------------------+
+
+void board_led_write(bool state)
+{
+  HAL_GPIO_WritePin(LED_PORT, LED_PIN, state ? LED_STATE_ON : (1-LED_STATE_ON));
+}
+
+uint32_t board_button_read(void)
+{
+  return BUTTON_STATE_ACTIVE == HAL_GPIO_ReadPin(BUTTON_PORT, BUTTON_PIN);
+}
+
+int board_uart_read(uint8_t* buf, int len)
+{
+  (void) buf; (void) len;
+  return 0;
+}
+
+int board_uart_write(void const * buf, int len)
+{
+  HAL_UART_Transmit(&UartHandle, (uint8_t*) buf, len, 0xffff);
+  return len;
+}
+
+#if CFG_TUSB_OS  == OPT_OS_NONE
+volatile uint32_t system_ticks = 0;
+void SysTick_Handler (void)
+{
+  system_ticks++;
+}
+
+uint32_t board_millis(void)
+{
+  return system_ticks;
+}
+#endif
+
+void HardFault_Handler (void)
+{
+  asm("bkpt");
+}
+
+#ifdef  USE_FULL_ASSERT
+/**
+  * @brief  Reports the name of the source file and the source line number
+  *         where the assert_param error has occurred.
+  * @param  file: pointer to the source file name
+  * @param  line: assert_param error line source number
+  * @retval None
+  */
+void assert_failed(uint8_t* file, uint32_t line)
+{
+  (void) file; (void) line;
+  /* USER CODE BEGIN 6 */
+  /* User can add his own implementation to report the file name and line number,
+     tex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+  /* USER CODE END 6 */
+}
+#endif /* USE_FULL_ASSERT */
+
+// Required by __libc_init_array in startup code if we are compiling using
+// -nostdlib/-nostartfiles.
+void _init(void)
+{
+
+}

+ 321 - 0
hw/bsp/stm32f072eval/stm32f0xx_hal_conf.h

@@ -0,0 +1,321 @@
+/**
+  ******************************************************************************
+  * @file    stm32f0xx_hal_conf.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2016 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */ 
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __STM32F0xx_HAL_CONF_H
+#define __STM32F0xx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver 
+  */
+#define HAL_MODULE_ENABLED  
+/*#define HAL_ADC_MODULE_ENABLED   */
+/*#define HAL_CAN_MODULE_ENABLED   */
+/*#define HAL_CEC_MODULE_ENABLED   */
+/*#define HAL_COMP_MODULE_ENABLED   */
+#define HAL_CORTEX_MODULE_ENABLED
+/*#define HAL_CRC_MODULE_ENABLED   */
+/*#define HAL_DAC_MODULE_ENABLED   */
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+/*#define HAL_EXTI_MODULE_ENABLED   */
+/*#define HAL_I2C_MODULE_ENABLED */
+/*#define HAL_I2S_MODULE_ENABLED */
+/*#define HAL_IRDA_MODULE_ENABLED */
+/*#define HAL_IWDG_MODULE_ENABLED */
+#define HAL_PCD_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+/*#define HAL_RTC_MODULE_ENABLED   */
+/*#define HAL_SMARTCARD_MODULE_ENABLED   */
+/*#define HAL_SMBUS_MODULE_ENABLED   */
+/*#define HAL_SPI_MODULE_ENABLED   */
+/*#define HAL_TIM_MODULE_ENABLED   */
+/*#define HAL_TSC_MODULE_ENABLED   */
+#define HAL_UART_MODULE_ENABLED
+/*#define HAL_USART_MODULE_ENABLED   */
+/*#define HAL_WWDG_MODULE_ENABLED */
+
+/* ######################### Oscillator Values adaptation ################### */
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).  
+  */
+#if !defined  (HSE_VALUE) 
+  #define HSE_VALUE            8000000U  /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+/**
+  * @brief In the following line adjust the External High Speed oscillator (HSE) Startup 
+  *        Timeout value 
+  */
+#if !defined  (HSE_STARTUP_TIMEOUT)
+  #define HSE_STARTUP_TIMEOUT  100U      /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL). 
+  */
+#if !defined  (HSI_VALUE)
+  #define HSI_VALUE            8000000U  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief In the following line adjust the Internal High Speed oscillator (HSI) Startup 
+  *        Timeout value 
+  */
+#if !defined  (HSI_STARTUP_TIMEOUT) 
+  #define HSI_STARTUP_TIMEOUT  5000U     /*!< Time out for HSI start up */
+#endif /* HSI_STARTUP_TIMEOUT */  
+
+/**
+  * @brief Internal High Speed oscillator for ADC (HSI14) value.
+  */
+#if !defined  (HSI14_VALUE) 
+  #define HSI14_VALUE          14000000U /*!< Value of the Internal High Speed oscillator for ADC in Hz.
+                                             The real value may vary depending on the variations
+                                             in voltage and temperature.  */
+#endif /* HSI14_VALUE */
+
+/**
+  * @brief Internal High Speed oscillator for USB (HSI48) value.
+  */
+#if !defined  (HSI48_VALUE) 
+  #define HSI48_VALUE          48000000U /*!< Value of the Internal High Speed oscillator for USB in Hz.
+                                             The real value may vary depending on the variations
+                                             in voltage and temperature.  */
+#endif /* HSI48_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined  (LSI_VALUE) 
+  #define LSI_VALUE            40000U    
+#endif /* LSI_VALUE */                      /*!< Value of the Internal Low Speed oscillator in Hz
+                                             The real value may vary depending on the variations
+                                             in voltage and temperature.  */
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  */
+#if !defined  (LSE_VALUE)
+  #define LSE_VALUE            32768U    /*!< Value of the External Low Speed oscillator in Hz */
+#endif /* LSE_VALUE */     
+
+/**
+  * @brief Time out for LSE start up value in ms.
+  */
+#if !defined  (LSE_STARTUP_TIMEOUT)
+  #define LSE_STARTUP_TIMEOUT  5000U     /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */     
+#define  VDD_VALUE                    3300U  /*!< Value of VDD in mv */           
+#define  TICK_INT_PRIORITY            ((uint32_t)(1U<<__NVIC_PRIO_BITS) - 1U) /*!< tick interrupt priority (lowest by default)             */
+                                                                              /*  Warning: Must be set to higher priority for HAL_Delay()  */
+                                                                              /*  and HAL_GetTick() usage under interrupt context          */
+#define  USE_RTOS                     0U
+#define  PREFETCH_ENABLE              1U
+#define  INSTRUCTION_CACHE_ENABLE     0U
+#define  DATA_CACHE_ENABLE            0U
+#define  USE_SPI_CRC                  1U
+
+#define  USE_HAL_ADC_REGISTER_CALLBACKS         0U /* ADC register callback disabled       */
+#define  USE_HAL_CAN_REGISTER_CALLBACKS         0U /* CAN register callback disabled       */
+#define  USE_HAL_COMP_REGISTER_CALLBACKS        0U /* COMP register callback disabled      */
+#define  USE_HAL_CEC_REGISTER_CALLBACKS         0U /* CEC register callback disabled       */
+#define  USE_HAL_DAC_REGISTER_CALLBACKS         0U /* DAC register callback disabled       */
+#define  USE_HAL_I2C_REGISTER_CALLBACKS         0U /* I2C register callback disabled       */
+#define  USE_HAL_SMBUS_REGISTER_CALLBACKS       0U /* SMBUS register callback disabled     */
+#define  USE_HAL_UART_REGISTER_CALLBACKS        0U /* UART register callback disabled      */
+#define  USE_HAL_USART_REGISTER_CALLBACKS       0U /* USART register callback disabled     */
+#define  USE_HAL_IRDA_REGISTER_CALLBACKS        0U /* IRDA register callback disabled      */
+#define  USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0U /* SMARTCARD register callback disabled */
+#define  USE_HAL_WWDG_REGISTER_CALLBACKS        0U /* WWDG register callback disabled      */
+#define  USE_HAL_RTC_REGISTER_CALLBACKS         0U /* RTC register callback disabled       */
+#define  USE_HAL_SPI_REGISTER_CALLBACKS         0U /* SPI register callback disabled       */
+#define  USE_HAL_I2S_REGISTER_CALLBACKS         0U /* I2S register callback disabled       */
+#define  USE_HAL_TIM_REGISTER_CALLBACKS         0U /* TIM register callback disabled       */
+#define  USE_HAL_TSC_REGISTER_CALLBACKS         0U /* TSC register callback disabled       */
+#define  USE_HAL_PCD_REGISTER_CALLBACKS         0U /* PCD register callback disabled       */
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the 
+  *        HAL drivers code
+  */
+ #define USE_FULL_ASSERT   1 
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file 
+  */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+ #include "stm32f0xx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+ #include "stm32f0xx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32f0xx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32f0xx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+ #include "stm32f0xx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+ #include "stm32f0xx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_CAN_MODULE_ENABLED
+ #include "stm32f0xx_hal_can.h"
+#endif /* HAL_CAN_MODULE_ENABLED */
+
+#ifdef HAL_CEC_MODULE_ENABLED
+ #include "stm32f0xx_hal_cec.h"
+#endif /* HAL_CEC_MODULE_ENABLED */
+
+#ifdef HAL_COMP_MODULE_ENABLED
+ #include "stm32f0xx_hal_comp.h"
+#endif /* HAL_COMP_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+ #include "stm32f0xx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+ #include "stm32f0xx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+ #include "stm32f0xx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+ #include "stm32f0xx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+ #include "stm32f0xx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+ #include "stm32f0xx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+ #include "stm32f0xx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_PCD_MODULE_ENABLED
+ #include "stm32f0xx_hal_pcd.h"
+#endif /* HAL_PCD_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+ #include "stm32f0xx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+ #include "stm32f0xx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+ #include "stm32f0xx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+ #include "stm32f0xx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+ #include "stm32f0xx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+ #include "stm32f0xx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_TSC_MODULE_ENABLED
+ #include "stm32f0xx_hal_tsc.h"
+#endif /* HAL_TSC_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+ #include "stm32f0xx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+ #include "stm32f0xx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+ #include "stm32f0xx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef  USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param  expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed. 
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */    
+    
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __STM32F0xx_HAL_CONF_H */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+

+ 2 - 5
hw/bsp/stm32f103bluepill/board.mk

@@ -1,5 +1,5 @@
 ST_FAMILY = f1
-DEPS_SUBMODULES = lib/CMSIS_5 hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+DEPS_SUBMODULES += lib/CMSIS_5 hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
 
 ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY)
 ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
@@ -21,6 +21,7 @@ CFLAGS += \
 LD_FILE = hw/bsp/$(BOARD)/STM32F103XB_FLASH.ld
 
 SRC_C += \
+  src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c \
   $(ST_CMSIS)/Source/Templates/system_stm32$(ST_FAMILY)xx.c \
   $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal.c \
   $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_cortex.c \
@@ -37,10 +38,6 @@ INC += \
   $(TOP)/$(ST_HAL_DRIVER)/Inc \
   $(TOP)/hw/bsp/$(BOARD)
 
-# For TinyUSB port source
-VENDOR = st
-CHIP_FAMILY = stm32_fsdev
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM3
 

+ 2 - 5
hw/bsp/stm32f207nucleo/board.mk

@@ -1,5 +1,5 @@
 ST_FAMILY = f2
-DEPS_SUBMODULES = lib/CMSIS_5 hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+DEPS_SUBMODULES += lib/CMSIS_5 hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
 
 ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY)
 ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
@@ -21,6 +21,7 @@ CFLAGS += -Wno-error=sign-compare
 LD_FILE = hw/bsp/$(BOARD)/STM32F207ZGTx_FLASH.ld
 
 SRC_C += \
+  src/portable/st/synopsys/dcd_synopsys.c \
   $(ST_CMSIS)/Source/Templates/system_stm32$(ST_FAMILY)xx.c \
   $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal.c \
   $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_cortex.c \
@@ -37,10 +38,6 @@ INC += \
   $(TOP)/$(ST_HAL_DRIVER)/Inc \
   $(TOP)/hw/bsp/$(BOARD)
 
-# For TinyUSB port source
-VENDOR = st
-CHIP_FAMILY = synopsys
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM3
 

+ 2 - 5
hw/bsp/stm32f303disco/board.mk

@@ -1,5 +1,5 @@
 ST_FAMILY = f3
-DEPS_SUBMODULES = lib/CMSIS_5 hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+DEPS_SUBMODULES += lib/CMSIS_5 hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
 
 ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY)
 ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
@@ -22,6 +22,7 @@ CFLAGS += -Wno-error=unused-parameter
 LD_FILE = hw/bsp/$(BOARD)/STM32F303VCTx_FLASH.ld
 
 SRC_C += \
+  src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c \
   $(ST_CMSIS)/Source/Templates/system_stm32$(ST_FAMILY)xx.c \
   $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal.c \
   $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_cortex.c \
@@ -38,10 +39,6 @@ INC += \
   $(TOP)/$(ST_HAL_DRIVER)/Inc \
   $(TOP)/hw/bsp/$(BOARD)
 
-# For TinyUSB port source
-VENDOR = st
-CHIP_FAMILY = stm32_fsdev
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM4F
 

+ 2 - 5
hw/bsp/stm32f4/family.mk

@@ -1,6 +1,6 @@
 UF2_FAMILY_ID = 0x57755a57
 ST_FAMILY = f4
-DEPS_SUBMODULES = lib/CMSIS_5 hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+DEPS_SUBMODULES += lib/CMSIS_5 hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
 
 ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY)
 ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
@@ -21,6 +21,7 @@ CFLAGS += \
 CFLAGS += -Wno-error=cast-align
 
 SRC_C += \
+	src/portable/st/synopsys/dcd_synopsys.c \
 	$(ST_CMSIS)/Source/Templates/system_stm32$(ST_FAMILY)xx.c \
 	$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal.c \
 	$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_cortex.c \
@@ -35,10 +36,6 @@ INC += \
 	$(TOP)/$(ST_CMSIS)/Include \
 	$(TOP)/$(ST_HAL_DRIVER)/Inc
 
-# For TinyUSB port source
-VENDOR = st
-CHIP_FAMILY = synopsys
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM4F
 

+ 2 - 5
hw/bsp/stm32f7/family.mk

@@ -1,6 +1,6 @@
 UF2_FAMILY_ID = 0x53b80f00
 ST_FAMILY = f7
-DEPS_SUBMODULES = lib/CMSIS_5 hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+DEPS_SUBMODULES += lib/CMSIS_5 hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
 
 ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY)
 ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
@@ -34,6 +34,7 @@ endif
 CFLAGS += -Wno-error=shadow -Wno-error=cast-align
 
 SRC_C += \
+	src/portable/st/synopsys/dcd_synopsys.c \
 	$(ST_CMSIS)/Source/Templates/system_stm32$(ST_FAMILY)xx.c \
 	$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal.c \
 	$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_cortex.c \
@@ -49,9 +50,5 @@ INC += \
 	$(TOP)/$(ST_CMSIS)/Include \
 	$(TOP)/$(ST_HAL_DRIVER)/Inc
 
-# For TinyUSB port source
-VENDOR = st
-CHIP_FAMILY = synopsys
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM7/r0p1

+ 2 - 5
hw/bsp/stm32h7/family.mk

@@ -1,6 +1,6 @@
 UF2_FAMILY_ID = 0x6db66082
 ST_FAMILY = h7
-DEPS_SUBMODULES = lib/CMSIS_5 hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+DEPS_SUBMODULES += lib/CMSIS_5 hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
 
 ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY)
 ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
@@ -30,6 +30,7 @@ CFLAGS += -Wno-error=maybe-uninitialized -Wno-error=cast-align
 
 # All source paths should be relative to the top level.
 SRC_C += \
+	src/portable/st/synopsys/dcd_synopsys.c \
 	$(ST_CMSIS)/Source/Templates/system_stm32$(ST_FAMILY)xx.c \
 	$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal.c \
 	$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_cortex.c \
@@ -45,10 +46,6 @@ INC += \
 	$(TOP)/$(ST_CMSIS)/Include \
 	$(TOP)/$(ST_HAL_DRIVER)/Inc
 
-# For TinyUSB port source
-VENDOR = st
-CHIP_FAMILY = synopsys
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM7/r0p1
 

+ 2 - 5
hw/bsp/stm32l0538disco/board.mk

@@ -1,5 +1,5 @@
 ST_FAMILY = l0
-DEPS_SUBMODULES = lib/CMSIS_5 hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+DEPS_SUBMODULES += lib/CMSIS_5 hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
 
 ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY)
 ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
@@ -22,6 +22,7 @@ CFLAGS += -Wno-error=unused-parameter -Wno-error=maybe-uninitialized
 LD_FILE = hw/bsp/$(BOARD)/STM32L053C8Tx_FLASH.ld
 
 SRC_C += \
+  src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c \
   $(ST_CMSIS)/Source/Templates/system_stm32$(ST_FAMILY)xx.c \
   $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal.c \
   $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_cortex.c \
@@ -38,10 +39,6 @@ INC += \
   $(TOP)/$(ST_HAL_DRIVER)/Inc \
   $(TOP)/hw/bsp/$(BOARD)
 
-# For TinyUSB port source
-VENDOR = st
-CHIP_FAMILY = stm32_fsdev
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM0
 

+ 2 - 5
hw/bsp/stm32l476disco/board.mk

@@ -1,5 +1,5 @@
 ST_FAMILY = l4
-DEPS_SUBMODULES = lib/CMSIS_5 hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+DEPS_SUBMODULES += lib/CMSIS_5 hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
 
 ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY)
 ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
@@ -22,6 +22,7 @@ CFLAGS += -Wno-error=maybe-uninitialized -Wno-error=cast-align
 LD_FILE = hw/bsp/$(BOARD)/STM32L476VGTx_FLASH.ld
 
 SRC_C += \
+	src/portable/st/synopsys/dcd_synopsys.c \
 	$(ST_CMSIS)/Source/Templates/system_stm32$(ST_FAMILY)xx.c \
 	$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal.c \
 	$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_cortex.c \
@@ -41,10 +42,6 @@ INC += \
 	$(TOP)/$(ST_HAL_DRIVER)/Inc \
 	$(TOP)/hw/bsp/$(BOARD)
 
-# For TinyUSB port source
-VENDOR = st
-CHIP_FAMILY = synopsys
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM4F
 

+ 2 - 5
hw/bsp/stm32l4r5nucleo/board.mk

@@ -1,5 +1,5 @@
 ST_FAMILY = l4
-DEPS_SUBMODULES = lib/CMSIS_5 hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+DEPS_SUBMODULES += lib/CMSIS_5 hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
 
 ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY)
 ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
@@ -23,6 +23,7 @@ CFLAGS += -Wno-error=maybe-uninitialized -Wno-error=cast-align
 LD_FILE = hw/bsp/$(BOARD)/STM32L4RXxI_FLASH.ld
 
 SRC_C += \
+	src/portable/st/synopsys/dcd_synopsys.c \
 	$(ST_CMSIS)/Source/Templates/system_stm32$(ST_FAMILY)xx.c \
 	$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal.c \
 	$(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_cortex.c \
@@ -42,10 +43,6 @@ INC += \
 	$(TOP)/$(ST_HAL_DRIVER)/Inc \
 	$(TOP)/hw/bsp/$(BOARD)
 
-# For TinyUSB port source
-VENDOR = st
-CHIP_FAMILY = synopsys
-
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM4F
 

+ 3 - 3
src/class/usbtmc/usbtmc_device.c

@@ -131,9 +131,9 @@ typedef struct
   uint8_t ep_int_in;
   // IN buffer is only used for first packet, not the remainder
   // in order to deal with prepending header
-  uint8_t ep_bulk_in_buf[USBTMCD_MAX_PACKET_SIZE];
+  CFG_TUSB_MEM_ALIGN uint8_t ep_bulk_in_buf[USBTMCD_MAX_PACKET_SIZE];
   // OUT buffer receives one packet at a time
-  uint8_t ep_bulk_out_buf[USBTMCD_MAX_PACKET_SIZE];
+  CFG_TUSB_MEM_ALIGN uint8_t ep_bulk_out_buf[USBTMCD_MAX_PACKET_SIZE];
   uint32_t transfer_size_remaining; // also used for requested length for bulk IN.
   uint32_t transfer_size_sent;      // To keep track of data bytes that have been queued in FIFO (not header bytes)
 
@@ -145,7 +145,7 @@ typedef struct
   usbtmc_capabilities_specific_t const * capabilities;
 } usbtmc_interface_state_t;
 
-static usbtmc_interface_state_t usbtmc_state =
+CFG_TUSB_MEM_SECTION static usbtmc_interface_state_t usbtmc_state =
 {
     .itf_id = 0xFF,
 };

+ 66 - 65
src/portable/nordic/nrf5x/dcd_nrf5x.c

@@ -53,13 +53,11 @@ enum
 
 enum
 {
-  // Endpoint number is fixed (8) for ISOOUT and ISOIN.
-  EP_ISO_NUM = 8,
-  // CBI endpoints count
-  EP_COUNT = 8
+  EP_ISO_NUM   = 8, // Endpoint number is fixed (8) for ISOOUT and ISOIN
+  EP_CBI_COUNT = 8  // Control Bulk Interrupt endpoints count
 };
 
-// Transfer descriptor
+// Transfer Descriptor
 typedef struct
 {
   uint8_t* buffer;
@@ -67,9 +65,10 @@ typedef struct
   volatile uint16_t actual_len;
   uint16_t  mps; // max packet size
 
-  // nrf52840 will auto ACK OUT packet after DMA is done
+  // nRF will auto accept OUT packet after DMA is done
   // indicate packet is already ACK
   volatile bool data_received;
+
   // Set to true when data was transferred from RAM to ISO IN output buffer.
   // New data can be put in ISO IN output buffer after SOF.
   bool iso_in_transfer_ready;
@@ -81,7 +80,7 @@ static struct
 {
   // All 8 endpoints including control IN & OUT (offset 1)
   // +1 for ISO endpoints
-  xfer_td_t xfer[EP_COUNT + 1][2];
+  xfer_td_t xfer[EP_CBI_COUNT + 1][2];
 
   // Number of pending DMA that is started but not handled yet by dcd_int_handler().
   // Since nRF can only carry one DMA can run at a time, this value is normally be either 0 or 1.
@@ -133,7 +132,7 @@ static void edpt_dma_start(volatile uint32_t* reg_startep)
         {
           ended = NRF_USBD->EVENTS_ENDISOIN + NRF_USBD->EVENTS_ENDISOOUT;
 
-          for (uint8_t i=0; i<EP_COUNT; i++)
+          for (uint8_t i=0; i<EP_CBI_COUNT; i++)
           {
             ended += NRF_USBD->EVENTS_ENDEPIN[i] + NRF_USBD->EVENTS_ENDEPOUT[i];
           }
@@ -166,27 +165,6 @@ static inline xfer_td_t* get_td(uint8_t epnum, uint8_t dir)
   return &_dcd.xfer[epnum][dir];
 }
 
-/*------------- CBI OUT Transfer -------------*/
-
-// Prepare for a CBI transaction OUT, call at the start
-// Allow ACK incoming data
-static void xact_out_prepare(uint8_t epnum)
-{
-  if ( epnum == 0 )
-  {
-    NRF_USBD->TASKS_EP0RCVOUT = 1;
-  }
-  else
-  {
-    // Write zero value to SIZE register will allow hw to ACK (accept data)
-    // If it is not already done by DMA
-    // SIZE.ISOOUT can also be accessed this way
-    NRF_USBD->SIZE.EPOUT[epnum] = 0;
-  }
-
-  __ISB(); __DSB();
-}
-
 // Start DMA to move data from Endpoint -> RAM
 static void xact_out_dma(uint8_t epnum)
 {
@@ -217,15 +195,14 @@ static void xact_out_dma(uint8_t epnum)
 
     edpt_dma_start(&NRF_USBD->TASKS_STARTEPOUT[epnum]);
   }
+
   xfer->buffer     += xact_len;
   xfer->actual_len += xact_len;
 }
 
-/*------------- CBI IN Transfer -------------*/
-
 // Prepare for a CBI transaction IN, call at the start
 // it start DMA to transfer data from RAM -> Endpoint
-static void xact_in_prepare(uint8_t epnum)
+static void xact_in_dma(uint8_t epnum)
 {
   xfer_td_t* xfer = get_td(epnum, TUSB_DIR_IN);
 
@@ -327,6 +304,9 @@ bool dcd_edpt_open (uint8_t rhport, tusb_desc_endpoint_t const * desc_edpt)
     {
       NRF_USBD->INTENSET = TU_BIT(USBD_INTEN_ENDEPOUT0_Pos + epnum);
       NRF_USBD->EPOUTEN |= TU_BIT(epnum);
+
+      // Write any value to SIZE register will allow nRF to ACK/accept data
+      NRF_USBD->SIZE.EPOUT[epnum] = 0;
     }else
     {
       NRF_USBD->INTENSET = TU_BIT(USBD_INTEN_ENDEPIN0_Pos + epnum);
@@ -438,20 +418,31 @@ bool dcd_edpt_xfer (uint8_t rhport, uint8_t ep_addr, uint8_t * buffer, uint16_t
   }
   else if ( dir == TUSB_DIR_OUT )
   {
-    if ( xfer->data_received )
+    if ( epnum == 0 )
     {
-      // nrf52840 auto ACK OUT packet after DMA is done
-      // Data already received previously --> trigger DMA to copy to SRAM
-      xact_out_dma(epnum);
-    }
-    else
+      // Accept next Control Out packet
+      NRF_USBD->TASKS_EP0RCVOUT = 1;
+    }else
     {
-      xact_out_prepare(epnum);
+      if ( xfer->data_received )
+      {
+        // Data may already be received previously
+        xfer->data_received = false;
+
+        // start DMA to copy to SRAM
+        xact_out_dma(epnum);
+      }
+      else
+      {
+        // nRF auto accept next Bulk/Interrupt OUT packet
+        // nothing to do
+      }
     }
   }
   else
   {
-    xact_in_prepare(epnum);
+    // Start DMA to copy data from RAM -> Endpoint
+    xact_in_dma(epnum);
   }
 
   return true;
@@ -477,6 +468,7 @@ void dcd_edpt_clear_stall (uint8_t rhport, uint8_t ep_addr)
 {
   (void) rhport;
   uint8_t const epnum = tu_edpt_number(ep_addr);
+  uint8_t const dir   = tu_edpt_dir(ep_addr);
 
   if ( epnum != 0 && epnum != EP_ISO_NUM )
   {
@@ -486,6 +478,10 @@ void dcd_edpt_clear_stall (uint8_t rhport, uint8_t ep_addr)
     // reset data toggle to DATA0
     NRF_USBD->DTOGGLE = (USBD_DTOGGLE_VALUE_Data0 << USBD_DTOGGLE_VALUE_Pos) | ep_addr;
 
+    // Write any value to SIZE register will allow nRF to ACK/accept data
+    // Drop any pending data
+    if (dir == TUSB_DIR_OUT) NRF_USBD->SIZE.EPOUT[epnum] = 0;
+
     __ISB(); __DSB();
   }
 }
@@ -594,17 +590,18 @@ void dcd_int_handler(uint8_t rhport)
   // Setup tokens are specific to the Control endpoint.
   if ( int_status & USBD_INTEN_EP0SETUP_Msk )
   {
-    uint8_t const setup[8] = {
-        NRF_USBD->BMREQUESTTYPE , NRF_USBD->BREQUEST, NRF_USBD->WVALUEL , NRF_USBD->WVALUEH,
-        NRF_USBD->WINDEXL       , NRF_USBD->WINDEXH , NRF_USBD->WLENGTHL, NRF_USBD->WLENGTHH
+    uint8_t const setup[8] =
+    {
+      NRF_USBD->BMREQUESTTYPE , NRF_USBD->BREQUEST, NRF_USBD->WVALUEL , NRF_USBD->WVALUEH,
+      NRF_USBD->WINDEXL       , NRF_USBD->WINDEXH , NRF_USBD->WLENGTHL, NRF_USBD->WLENGTHH
     };
 
     // nrf5x hw auto handle set address, there is no need to inform usb stack
     tusb_control_request_t const * request = (tusb_control_request_t const *) setup;
 
-    if ( !(TUSB_REQ_RCPT_DEVICE == request->bmRequestType_bit.recipient &&
+    if ( !(TUSB_REQ_RCPT_DEVICE   == request->bmRequestType_bit.recipient &&
            TUSB_REQ_TYPE_STANDARD == request->bmRequestType_bit.type &&
-           TUSB_REQ_SET_ADDRESS == request->bRequest) )
+           TUSB_REQ_SET_ADDRESS   == request->bRequest) )
     {
       dcd_event_setup_received(0, setup, true);
     }
@@ -620,15 +617,15 @@ void dcd_int_handler(uint8_t rhport)
    * For CBI OUT:
    *  - Host -> Endpoint
    *      EPDATA (or EP0DATADONE) interrupted, check EPDATASTATUS.EPOUT[i]
-   *      to start DMA. This step can occur automatically (without sw),
-   *      which means data may or may not ready (data_received flag).
+   *      to start DMA. For Bulk/Interrupt, this step can occur automatically (without sw),
+   *      which means data may or may not be ready (data_received flag).
    *  - Endpoint -> RAM
    *      ENDEPOUT[i] interrupted, transaction complete, sw prepare next transaction
    *
    * For CBI IN:
    *  - RAM -> Endpoint
    *      ENDEPIN[i] interrupted indicate DMA is complete. HW will start
-   *      to move daat to host
+   *      to move data to host
    *  - Endpoint -> Host
    *      EPDATA (or EP0DATADONE) interrupted, check EPDATASTATUS.EPIN[i].
    *      Transaction is complete, sw prepare next transaction
@@ -640,27 +637,31 @@ void dcd_int_handler(uint8_t rhport)
 
   /* CBI OUT: Endpoint -> SRAM (aka transaction complete)
    * Note: Since nRF controller auto ACK next packet without SW awareness
-   * We must handle this stage before Host -> Endpoint just in case
-   * 2 event happens at once
-   * ISO OUT: Transaction must fit in single packed, it can be shorter then total
+   * We must handle this stage before Host -> Endpoint just in case 2 event happens at once
+   *
+   * ISO OUT: Transaction must fit in single packet, it can be shorter then total
    * len if Host decides to sent fewer bytes, it this case transaction is also
    * complete and next transfer is not initiated here like for CBI.
    */
-  for(uint8_t epnum=0; epnum<EP_COUNT+1; epnum++)
+  for(uint8_t epnum=0; epnum<EP_CBI_COUNT+1; epnum++)
   {
     if ( tu_bit_test(int_status, USBD_INTEN_ENDEPOUT0_Pos+epnum))
     {
       xfer_td_t* xfer = get_td(epnum, TUSB_DIR_OUT);
       uint8_t const xact_len = NRF_USBD->EPOUT[epnum].AMOUNT;
 
-      // Data in endpoint has been consumed
-      xfer->data_received = false;
-
       // Transfer complete if transaction len < Max Packet Size or total len is transferred
       if ( (epnum != EP_ISO_NUM) && (xact_len == xfer->mps) && (xfer->actual_len < xfer->total_len) )
       {
-        // Prepare for next transaction
-        xact_out_prepare(epnum);
+        if ( epnum == 0 )
+        {
+          // Accept next Control Out packet
+          NRF_USBD->TASKS_EP0RCVOUT = 1;
+        }else
+        {
+          // nRF auto accept next Bulk/Interrupt OUT packet
+          // nothing to do
+        }
       }else
       {
         xfer->total_len = xfer->actual_len;
@@ -673,7 +674,7 @@ void dcd_int_handler(uint8_t rhport)
     // Ended event for CBI IN : nothing to do
   }
 
-  // Endpoint <-> Host
+  // Endpoint <-> Host ( In & OUT )
   if ( int_status & (USBD_INTEN_EPDATA_Msk | USBD_INTEN_EP0DATADONE_Msk) )
   {
     uint32_t data_status = NRF_USBD->EPDATASTATUS;
@@ -687,9 +688,9 @@ void dcd_int_handler(uint8_t rhport)
     bool const is_control_out = (int_status & USBD_INTEN_EP0DATADONE_Msk) && !(NRF_USBD->BMREQUESTTYPE & TUSB_DIR_IN_MASK);
 
     // CBI In: Endpoint -> Host (transaction complete)
-    for(uint8_t epnum=0; epnum<8; epnum++)
+    for(uint8_t epnum=0; epnum<EP_CBI_COUNT; epnum++)
     {
-      if ( tu_bit_test(data_status, epnum ) || ( epnum == 0 && is_control_in) )
+      if ( tu_bit_test(data_status, epnum) || (epnum == 0 && is_control_in) )
       {
         xfer_td_t* xfer = get_td(epnum, TUSB_DIR_IN);
 
@@ -697,8 +698,8 @@ void dcd_int_handler(uint8_t rhport)
 
         if ( xfer->actual_len < xfer->total_len )
         {
-          // prepare next transaction
-          xact_in_prepare(epnum);
+          // Start DMA to copy next data packet
+          xact_in_dma(epnum);
         } else
         {
           // CBI IN complete
@@ -708,9 +709,9 @@ void dcd_int_handler(uint8_t rhport)
     }
 
     // CBI OUT: Host -> Endpoint
-    for(uint8_t epnum=0; epnum<8; epnum++)
+    for(uint8_t epnum=0; epnum<EP_CBI_COUNT; epnum++)
     {
-      if ( tu_bit_test(data_status, 16+epnum ) || ( epnum == 0 && is_control_out) )
+      if ( tu_bit_test(data_status, 16+epnum) || (epnum == 0 && is_control_out) )
       {
         xfer_td_t* xfer = get_td(epnum, TUSB_DIR_OUT);
 
@@ -719,7 +720,7 @@ void dcd_int_handler(uint8_t rhport)
           xact_out_dma(epnum);
         }else
         {
-          // Data overflow !!! Nah, nrf52840 will auto ACK OUT packet after DMA is done
+          // Data overflow !!! Nah, nRF will auto accept next Bulk/Interrupt OUT packet
           // Mark this endpoint with data received
           xfer->data_received = true;
         }

+ 2 - 1
src/portable/nxp/lpc17_40/dcd_lpc17_40.c

@@ -26,7 +26,8 @@
 
 #include "tusb_option.h"
 
-#if TUSB_OPT_DEVICE_ENABLED && (CFG_TUSB_MCU == OPT_MCU_LPC175X_6X || CFG_TUSB_MCU == OPT_MCU_LPC40XX)
+#if TUSB_OPT_DEVICE_ENABLED && \
+    (CFG_TUSB_MCU == OPT_MCU_LPC175X_6X || CFG_TUSB_MCU == OPT_MCU_LPC177X_8X || CFG_TUSB_MCU == OPT_MCU_LPC40XX)
 
 #include "device/dcd.h"
 #include "dcd_lpc17_40.h"

+ 3 - 3
src/portable/nxp/lpc17_40/dcd_lpc17_40.h

@@ -24,8 +24,8 @@
  * This file is part of the TinyUSB stack.
  */
 
-#ifndef _TUSB_DCD_LPC175X_6X_H_
-#define _TUSB_DCD_LPC175X_6X_H_
+#ifndef _TUSB_DCD_LPC17_40_H_
+#define _TUSB_DCD_LPC17_40_H_
 
 #include "common/tusb_common.h"
 
@@ -149,4 +149,4 @@ enum {
  }
 #endif
 
-#endif /* _TUSB_DCD_LPC175X_6X_H_ */
+#endif

+ 2 - 1
src/portable/nxp/lpc17_40/hcd_lpc17_40.c

@@ -26,7 +26,8 @@
 
 #include "tusb_option.h"
 
-#if (CFG_TUSB_MCU == OPT_MCU_LPC175X_6X || CFG_TUSB_MCU == OPT_MCU_LPC40XX)
+#if TUSB_OPT_HOST_ENABLED && \
+    (CFG_TUSB_MCU == OPT_MCU_LPC175X_6X || CFG_TUSB_MCU == OPT_MCU_LPC177X_8X || CFG_TUSB_MCU == OPT_MCU_LPC40XX)
 
 #include "chip.h"
 

+ 1 - 1
src/tusb_option.h

@@ -28,7 +28,7 @@
 #define _TUSB_OPTION_H_
 
 #define TUSB_VERSION_MAJOR     0
-#define TUSB_VERSION_MINOR     8
+#define TUSB_VERSION_MINOR     9
 #define TUSB_VERSION_REVISION  0
 #define TUSB_VERSION_STRING    TU_STRING(TUSB_VERSION_MAJOR) "." TU_STRING(TUSB_VERSION_MINOR) "." TU_STRING(TUSB_VERSION_REVISION)