MartinUbl
diff --git a/‎tools/sdk/esp32s2/include/config/sdkconfig.h‎
Lines changed: 4 additions & 1 deletion b/‎tools/sdk/esp32s2/include/config/sdkconfig.h‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎tools/sdk/esp32s2/include/tinyusb/port/common/include/descriptors_control.h‎
Lines changed: 12 additions & 5 deletions b/‎tools/sdk/esp32s2/include/tinyusb/port/common/include/descriptors_control.h‎
Lines changed: 12 additions & 5 deletions
diff --git a/‎tools/sdk/esp32s2/include/tinyusb/port/esp32s2/include/device_controller_driver.h‎
Lines changed: 0 additions & 51 deletions b/‎tools/sdk/esp32s2/include/tinyusb/port/esp32s2/include/device_controller_driver.h‎
Lines changed: 0 additions & 51 deletions
diff --git a/‎tools/sdk/esp32s2/include/tinyusb/port/esp32s2/include/tinyusb.h‎
Lines changed: 67 additions & 2 deletions b/‎tools/sdk/esp32s2/include/tinyusb/port/esp32s2/include/tinyusb.h‎
Lines changed: 67 additions & 2 deletions
diff --git a/‎tools/sdk/esp32s2/include/tinyusb/port/esp32s2/include/tusb_config.h‎
Lines changed: 5 additions & 5 deletions b/‎tools/sdk/esp32s2/include/tinyusb/port/esp32s2/include/tusb_config.h‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎tools/sdk/esp32s2/include/tinyusb/tinyusb/src/class/bth/bth_device.h‎
Lines changed: 110 additions & 0 deletions b/‎tools/sdk/esp32s2/include/tinyusb/tinyusb/src/class/bth/bth_device.h‎
Lines changed: 110 additions & 0 deletions
diff --git a/‎tools/sdk/esp32s2/include/tinyusb/tinyusb/src/class/cdc/cdc_device.h‎
Lines changed: 6 additions & 6 deletions b/‎tools/sdk/esp32s2/include/tinyusb/tinyusb/src/class/cdc/cdc_device.h‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎tools/sdk/esp32s2/include/tinyusb/tinyusb/src/class/dfu/dfu_rt_device.h‎
Lines changed: 6 additions & 6 deletions b/‎tools/sdk/esp32s2/include/tinyusb/tinyusb/src/class/dfu/dfu_rt_device.h‎
Lines changed: 6 additions & 6 deletions
@@ -354,9 +354,12 @@
 #define CONFIG_SPIFFS_USE_MTIME 1
 #define CONFIG_USB_ENABLED 1
 #define CONFIG_USB_MAX_POWER_USAGE 500
+#define CONFIG_USB_DYNAMIC_DRIVER_LOADING 1
+#define CONFIG_USB_DYNAMIC_DRIVER_MAX 16
 #define CONFIG_USB_CDC_ENABLED 1
 #define CONFIG_USB_CDC_RX_BUFSIZE 1024
 #define CONFIG_USB_CDC_TX_BUFSIZE 1024
+#define CONFIG_USB_DFU_RT_ENABLED 1
 #define CONFIG_USB_MSC_ENABLED 1
 #define CONFIG_USB_MSC_BUFSIZE 512
 #define CONFIG_USB_HID_ENABLED 1
@@ -365,14 +368,14 @@
 #define CONFIG_USB_MIDI_RX_BUFSIZE 64
 #define CONFIG_USB_MIDI_TX_BUFSIZE 64
 #define CONFIG_USB_VENDOR_ENABLED 1
-#define CONFIG_USB_DFU_RT_ENABLED 1
 #define CONFIG_USB_DESC_USE_ESPRESSIF_VID 1
 #define CONFIG_USB_DESC_USE_DEFAULT_PID 1
 #define CONFIG_USB_DESC_BCDDEVICE 0x0100
 #define CONFIG_USB_DESC_MANUFACTURER_STRING "Espressif"
 #define CONFIG_USB_DESC_PRODUCT_STRING "Espressif Device"
 #define CONFIG_USB_DESC_SERIAL_STRING "123456"
 #define CONFIG_USB_DESC_CDC_STRING "Espressif CDC Device"
+#define CONFIG_USB_DESC_DFU_RT_STRING "Espressif DFU Device"
 #define CONFIG_USB_DESC_MSC_STRING "Espressif MSC Device"
 #define CONFIG_USB_DESC_MIDI_STRING "Espressif MIDI Device"
 #define CONFIG_USB_DESC_HID_STRING "Espressif HID Device"
 
@@ -18,16 +18,17 @@
 #include "usb_descriptors.h"
 
 
+#if CONFIG_USB_USE_BUILTIN_DESCRIPTORS
 /* A combination of interfaces must have a unique product id, since PC will save device driver after the first plug.
  * Same VID/PID with different interface e.g MSC (first), then CDC (later) will possibly cause system error on PC.
  *
  * Auto ProductID layout's Bitmap:
  *   [MSB]         HID | MSC | CDC          [LSB]
  */
-#define EPNUM_MSC       0x01
-#define EPNUM_HID       0x02
-#define EPNUM_MIDI      0x04
-#define EPNUM_VENDOR    0x06
+#define EPNUM_MSC       0x02
+#define EPNUM_HID       0x03
+#define EPNUM_MIDI      0x06
+#define EPNUM_VENDOR    0x01
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,6 +48,10 @@ enum {
     ITF_NUM_CDC_DATA,
 #   endif
 
+#   if CFG_TUD_DFU_RT
+    ITF_NUM_DFU_RT,
+#   endif
+
 #   if CFG_TUD_MSC
     ITF_NUM_MSC,
 #   endif
@@ -68,7 +73,7 @@ enum {
 };
 
 enum {
-    CONFIG_TOTAL_LEN = TUD_CONFIG_DESC_LEN + CFG_TUD_CDC * TUD_
E1FE
CDC_DESC_LEN + CFG_TUD_MSC * TUD_MSC_DESC_LEN +
+    CONFIG_TOTAL_LEN = TUD_CONFIG_DESC_LEN + CFG_TUD_CDC * TUD_CDC_DESC_LEN + CFG_TUD_DFU_RT * TUD_DFU_RT_DESC_LEN + CFG_TUD_MSC * TUD_MSC_DESC_LEN +
                        CFG_TUD_HID * TUD_HID_DESC_LEN + CFG_TUD_VENDOR * TUD_VENDOR_DESC_LEN + CFG_TUD_MIDI * TUD_MIDI_DESC_LEN
 };
 
@@ -81,3 +86,5 @@ void tusb_clear_descriptor(void);
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* CONFIG_USB_USE_BUILTIN_DESCRIPTORS */
@@ -74,14 +74,79 @@ extern "C" {
 #endif
 
 typedef struct {
-    tusb_desc_device_t *descriptor;
-    char **string_descriptor;
     bool external_phy;
 } tinyusb_config_t;
 
 esp_err_t tinyusb_driver_install(const tinyusb_config_t *config);
 // TODO esp_err_t tinyusb_driver_uninstall(void); (IDF-1474)
 
+/*
+ * USB Persistence API
+ * */
+typedef enum {
+    REBOOT_NO_PERSIST,
+    REBOOT_PERSIST,
+    REBOOT_BOOTLOADER,
+    REBOOT_BOOTLOADER_DFU
 } reboot_type_t;
+
+/*
+ * Enable Persist reboot
+ * 
+ * Note: Persistence should be enabled when ONLY CDC and DFU are being used
+ * */
+void tinyusb_persist_set_enable(bool enable);
+
+/*
+ * Set Persist reboot mode, if available, before calling esp_reboot();
+ * */
+void tinyusb_persist_set_mode(reboot_type_t mode);
+
+/*
+ * TinyUSB Dynamic Driver Loading
+ * 
+ * When enabled, usb drivers can be loaded at runtime, before calling tinyusb_driver_install()
+ * */
+#if CFG_TUSB_DYNAMIC_DRIVER_LOAD
+#if CFG_TUSB_DEBUG >= 2
+  #define DRIVER_NAME(_name)    .name = _name,
+#else
+  #define DRIVER_NAME(_name)
+#endif
+
+typedef struct
+{
+  #if CFG_TUSB_DEBUG >= 2
+  char const* name;
+  #endif
+
+  void     (* init             ) (void);
+  void     (* reset            ) (uint8_t rhport);
+  uint16_t (* open             ) (uint8_t rhport, tusb_desc_interface_t const * desc_intf, uint16_t max_len);
+  bool     (* control_request  ) (uint8_t rhport, tusb_control_request_t const * request);
+  bool     (* control_complete ) (uint8_t rhport, tusb_control_request_t const * request);
+  bool     (* xfer_cb          ) (uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes);
+  void     (* sof              ) (uint8_t rhport); /* optional */
+} usbd_class_driver_t;
+
+bool usbd_device_driver_load(const usbd_class_driver_t * driver);
+
+#define STRINGIFY(x) #x
+#define TOSTRING(x) STRINGIFY(x)
+#define LOAD_DEFAULT_TUSB_DRIVER(name) \
+    static usbd_class_driver_t name ## d_driver = { \
+        DRIVER_NAME(TOSTRING(name)) \
+        .init             = name ## d_init, \
+        .reset            = name ## d_reset, \
+        .open             = name ## d_open, \
+        .control_request  = name ## d_control_request, \
+        .control_complete = name ## d_control_complete, \
+        .xfer_cb          = name ## d_xfer_cb, \
+        .sof              = NULL \
+    }; \
+    TU_VERIFY (usbd_device_driver_load(&name ## d_driver));
+#endif /* CFG_TUSB_DYNAMIC_DRIVER_LOAD */
+
 #ifdef __cplusplus
 }
 #endif
@@ -60,6 +60,10 @@ extern "C" {
 #   define CFG_TUSB_MEM_ALIGN          TU_ATTR_ALIGNED(4)
 #endif
 
+//Allow loading additional drivers
+#define CFG_TUSB_DYNAMIC_DRIVER_LOAD 	CONFIG_USB_DYNAMIC_DRIVER_LOADING
+#define CFG_TUSB_DYNAMIC_DRIVER_MAX 	CONFIG_USB_DYNAMIC_DRIVER_MAX
+
 
 
 //--------------------------------------------------------------------
@@ -93,10 +97,6 @@ extern "C" {
 #   define CONFIG_USB_DFU_RT_ENABLED 0
 #endif
 
-#ifndef CONFIG_USB_NET_ENABLED
-#   define CONFIG_USB_NET_ENABLED 0
-#endif
-
 #ifndef CONFIG_USB_VENDOR_ENABLED
 #   define CONFIG_USB_VENDOR_ENABLED 0
 #endif
@@ -106,11 +106,11 @@ extern "C" {
 #define CFG_TUD_MSC CONFIG_USB_MSC_ENABLED
 #define CFG_TUD_HID CONFIG_USB_HID_ENABLED
 #define CFG_TUD_DFU_RT CONFIG_USB_DFU_RT_ENABLED
-#define CFG_TUD_NET CONFIG_USB_NET_ENABLED
 
 #define CFG_TUD_MIDI CONFIG_USB_MIDI_ENABLED
 #define CFG_TUD_CUSTOM_CLASS CONFIG_USB_CUSTOM_CLASS_ENABLED
 
+
 #define CFG_TUD_VENDOR CONFIG_USB_VENDOR_ENABLED
 
 // CDC FIFO size of TX and RX
 
@@ -0,0 +1,110 @@
+/* 
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jerzy Kasenberg
+ *
+ * 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.
+ */
+
+#ifndef _TUSB_BTH_DEVICE_H_
+#define _TUSB_BTH_DEVICE_H_
+
+#include <common/tusb_common.h>
+#include <device/usbd.h>
+
+//--------------------------------------------------------------------+
+// Class Driver Configuration
+//--------------------------------------------------------------------+
+#ifndef CFG_TUD_BTH_EVENT_EPSIZE
+#define CFG_TUD_BTH_EVENT_EPSIZE     16
+#endif
+#ifndef CFG_TUD_BTH_DATA_EPSIZE
+#define CFG_TUD_BTH_DATA_EPSIZE      64
+#endif
+
+typedef struct TU_ATTR_PACKED
+{
+  uint16_t op_code;
+  uint8_t param_length;
+  uint8_t param[255];
+} bt_hci_cmd_t;
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+//--------------------------------------------------------------------+
+// Application Callback API (weak is optional)
+//--------------------------------------------------------------------+
+
+// Invoked when HCI command was received over USB from Bluetooth host.
+// Detailed format is described in Bluetooth core specification Vol 2,
+// Part E, 5.4.1.
+// Length of the command is from 3 bytes (2 bytes for OpCode,
+// 1 byte for parameter total length) to 258.
+TU_ATTR_WEAK void tud_bt_hci_cmd_cb(void *hci_cmd, size_t cmd_len);
+
+// Invoked when ACL data was received over USB from Bluetooth host.
+// Detailed format is described in Bluetooth core specification Vol 2,
+// Part E, 5.4.2.
+// Length is from 4 bytes, (12 bits for Handle, 4 bits for flags
+// and 16 bits for data total length) to endpoint size.
+TU_ATTR_WEAK void tud_bt_acl_data_received_cb(void *acl_data, uint16_t data_len);
+
+// Called when event sent with tud_bt_event_send() was delivered to BT stack.
+// Controller can release/reuse buffer with Event packet at this point.
+TU_ATTR_WEAK void tud_bt_event_sent_cb(uint16_t sent_bytes);
+
+// Called when ACL data that was sent with tud_bt_acl_data_send()
+// was delivered to BT stack.
+// Controller can release/reuse buffer with ACL packet at this point.
+TU_ATTR_WEAK void tud_bt_acl_data_sent_cb(uint16_t sent_bytes);
+
+// Bluetooth controller calls this function when it wants to send even packet
+// as described in Bluetooth core specification Vol 2, Part E, 5.4.4.
+// Event has at least 2 bytes, first is Event code second contains parameter
+// total length. Controller can release/reuse event memory after
+// tud_bt_event_sent_cb() is called.
+bool tud_bt_event_send(void *event, uint16_t event_len);
+
+// Bluetooth controller calls this to send ACL data packet
+// as described in Bluetooth core specification Vol 2, Part E, 5.4.2
+// Minimum length is 4 bytes, (12 bits for Handle, 4 bits for flags
+// and 16 bits for data total length). Upper limit is not limited
+// to endpoint size since buffer is allocate by controller
+// and must not be reused till tud_bt_acl_data_sent_cb() is called.
+bool tud_bt_acl_data_send(void *acl_data, uint16_t data_len);
+
+//--------------------------------------------------------------------+
+// Internal Class Driver API
+//--------------------------------------------------------------------+
+void     btd_init             (void);
+void     btd_reset            (uint8_t rhport);
+uint16_t btd_open             (uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint16_t max_len);
+bool     btd_control_request  (uint8_t rhport, tusb_control_request_t const * request);
+bool     btd_control_complete (uint8_t rhport, tusb_control_request_t const * request);
+bool     btd_xfer_cb          (uint8_t rhport, uint8_t edpt_addr, xfer_result_t result, uint32_t xferred_bytes);
+
+#ifdef __cplusplus
+ }
+#endif
+
+#endif /* _TUSB_BTH_DEVICE_H_ */
@@ -229,12 +229,12 @@ static inline uint32_t tud_cdc_write_available(void)
 //--------------------------------------------------------------------+
 // INTERNAL USBD-CLASS DRIVER API
 //--------------------------------------------------------------------+
-void cdcd_init             (void);
-void cdcd_reset            (uint8_t rhport);
-bool cdcd_open             (uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint16_t *p_length);
-bool cdcd_control_request  (uint8_t rhport, tusb_control_request_t const * request);
-bool cdcd_control_complete (uint8_t rhport, tusb_control_request_t const * request);
-bool cdcd_xfer_cb          (uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint32_t xferred_bytes);
+void     cdcd_init             (void);
+void     cdcd_reset            (uint8_t rhport);
+uint16_t cdcd_open             (uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint16_t max_len);
+bool     cdcd_control_request  (uint8_t rhport, tusb_control_request_t const * request);
+bool     cdcd_control_complete (uint8_t rhport, tusb_control_request_t const * request);
+bool     cdcd_xfer_cb          (uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint32_t xferred_bytes);
 
 #ifdef __cplusplus
  }
 
@@ -63,12 +63,12 @@ TU_ATTR_WEAK void tud_dfu_rt_reboot_to_dfu(void); // TODO rename to _cb conventi
 //--------------------------------------------------------------------+
 // Internal Class Driver API
 //--------------------------------------------------------------------+
-void dfu_rtd_init(void);
-void dfu_rtd_reset(uint8_t rhport);
-bool dfu_rtd_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint16_t *p_length);
-bool dfu_rtd_control_request(uint8_t rhport, tusb_control_request_t const * request);
-bool dfu_rtd_control_complete(uint8_t rhport, tusb_control_request_t const * request);
-bool dfu_rtd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes);
+void     dfu_rtd_init(void);
+void     dfu_rtd_reset(uint8_t rhport);
+uint16_t dfu_rtd_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint16_t max_len);
+bool     dfu_rtd_control_request(uint8_t rhport, tusb_control_request_t const * request);
+bool     dfu_rtd_control_complete(uint8_t rhport, tusb_control_request_t const * request);
+bool     dfu_rtd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes);
 
 #ifdef __cplusplus
  }