Pull latest IDF and enable TinyUSB

2020-05-30 03:58:15 +03:00
parent 604abf0a96
commit 5dbcf201b8
245 changed files with 10305 additions and 98 deletions
--- a/tools/sdk/esp32s2/include/tinyusb/port/common/include/descriptors_control.h
+++ b/tools/sdk/esp32s2/include/tinyusb/port/common/include/descriptors_control.h
@ -0,0 +1,71 @@
+// Copyright 2020 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string.h>
+#include "usb_descriptors.h"
+
+
+/* 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 0x03
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+//------------- HID Report Descriptor -------------//
+#if CFG_TUD_HID
+enum {
+    REPORT_ID_KEYBOARD = 1,
+    REPORT_ID_MOUSE
+};
+#endif
+
+//------------- Configuration Descriptor -------------//
+enum {
+#   if CFG_TUD_CDC
+    ITF_NUM_CDC = 0,
+    ITF_NUM_CDC_DATA,
+#   endif
+
+#   if CFG_TUD_MSC
+    ITF_NUM_MSC,
+#   endif
+
+#   if CFG_TUD_HID
+    ITF_NUM_HID,
+#   endif
+
+    ITF_NUM_TOTAL
+};
+
+enum {
+    CONFIG_TOTAL_LEN = TUD_CONFIG_DESC_LEN + CFG_TUD_CDC * TUD_CDC_DESC_LEN + CFG_TUD_MSC * TUD_MSC_DESC_LEN +
+                       CFG_TUD_HID * TUD_HID_DESC_LEN
+};
+
+bool tusb_desc_set;
+void tusb_set_descriptor(tusb_desc_device_t *desc, char **str_desc);
+tusb_desc_device_t *tusb_get_active_desc(void);
+char **tusb_get_active_str_desc(void);
+void tusb_clear_descriptor(void);
+
+#ifdef __cplusplus
+}
+#endif
--- a/tools/sdk/esp32s2/include/tinyusb/port/common/include/usb_descriptors.h
+++ b/tools/sdk/esp32s2/include/tinyusb/port/common/include/usb_descriptors.h
@ -0,0 +1,30 @@
+// Copyright 2020 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include "tusb.h"
+
+#define _PID_MAP(itf, n) ((CFG_TUD_##itf) << (n))
+
+#define USB_ESPRESSIF_VID 0x303A
+
+#define USB_STRING_DESCRIPTOR_ARRAY_SIZE 7
+typedef char *tusb_desc_strarray_device_t[USB_STRING_DESCRIPTOR_ARRAY_SIZE];
+
+tusb_desc_device_t descriptor_tinyusb;
+tusb_desc_strarray_device_t descriptor_str_tinyusb;
+
+tusb_desc_device_t descriptor_kconfig;
+tusb_desc_strarray_device_t descriptor_str_kconfig;
--- a/tools/sdk/esp32s2/include/tinyusb/port/esp32s2/include/device_controller_driver.h
+++ b/tools/sdk/esp32s2/include/tinyusb/port/esp32s2/include/device_controller_driver.h
@ -0,0 +1,51 @@
+// Copyright 2020 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+// Espressif
+#include "driver/periph_ctrl.h"
+#include "freertos/xtensa_api.h"
+#include "esp_intr_alloc.h"
+#include "esp_log.h"
+#include "esp32s2/rom/gpio.h"
+#include "soc/dport_reg.h"
+#include "soc/gpio_sig_map.h"
+#include "soc/usb_periph.h"
+#include "tusb_config.h"
+// TinyUSB
+#include "tusb_option.h"
+#include "descriptors_control.h"
+#include "device/dcd.h"
+
+
+#define USB_EP_DIRECTIONS 2
+#define USB_MAX_EP_NUM 16
+
+typedef struct {
+    uint8_t *buffer;
+    uint16_t total_len;
+    uint16_t queued_len;
+    uint16_t max_size;
+    bool short_packet;
+} xfer_ctl_t;
+
+#ifdef __cplusplus
+}
+#endif
--- a/tools/sdk/esp32s2/include/tinyusb/port/esp32s2/include/tinyusb.h
+++ b/tools/sdk/esp32s2/include/tinyusb/port/esp32s2/include/tinyusb.h
@ -0,0 +1,80 @@
+// Copyright 2020 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <stdbool.h>
+#include "descriptors_control.h"
+#include "board.h"
+#include "tusb.h"
+#include "tusb_config.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* tinyusb uses buffers with type of uint8_t[] but in our driver we are reading them as a 32-bit word */
+#if (CFG_TUD_ENDOINT0_SIZE < 4)
+#   define CFG_TUD_ENDOINT0_SIZE 4
+#   warning "CFG_TUD_ENDOINT0_SIZE was too low and was set to 4"
+#endif
+
+#if TUSB_OPT_DEVICE_ENABLED
+
+#   if CFG_TUD_HID
+#      if (CFG_TUD_HID_BUFSIZE < 4)
+#         define CFG_TUD_HID_BUFSIZE 4
+#         warning "CFG_TUD_HID_BUFSIZE was too low and was set to 4"
+#      endif
+#   endif
+
+#   if CFG_TUD_CDC
+#      if (CFG_TUD_CDC_EPSIZE < 4)
+#         define CFG_TUD_CDC_EPSIZE 4
+#         warning "CFG_TUD_CDC_EPSIZE was too low and was set to 4"
+#      endif
+#   endif
+
+#   if CFG_TUD_MSC
+#      if (CFG_TUD_MSC_BUFSIZE < 4)
+#         define CFG_TUD_MSC_BUFSIZE 4
+#         warning "CFG_TUD_MSC_BUFSIZE was too low and was set to 4"
+#      endif
+#   endif
+
+#   if CFG_TUD_MIDI
+#       if (CFG_TUD_MIDI_EPSIZE < 4)
+#          define CFG_TUD_MIDI_EPSIZE 4
+#          warning "CFG_TUD_MIDI_EPSIZE was too low and was set to 4"
+#       endif
+#   endif
+
+#   if CFG_TUD_CUSTOM_CLASS
+#          warning "Please check that the buffer is more then 4 bytes"
+#   endif
+#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)
+
+#ifdef __cplusplus
+}
+#endif
--- a/tools/sdk/esp32s2/include/tinyusb/port/esp32s2/include/tusb_config.h
+++ b/tools/sdk/esp32s2/include/tinyusb/port/esp32s2/include/tusb_config.h
@ -0,0 +1,114 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Ha Thach (tinyusb.org),
+ * Additions Copyright (c) 2020, Espressif Systems (Shanghai) PTE LTD
+ *
+ * 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.
+ *
+ */
+
+#pragma once
+#include "sdkconfig.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+//--------------------------------------------------------------------
+// COMMON CONFIGURATION
+//--------------------------------------------------------------------
+#define OPT_MCU_ESP32_S2 900 // TODO remove after rebase to the last TUSB (IDF-1473)
+#define CFG_TUSB_MCU OPT_MCU_ESP32_S2
+
+#define CFG_TUSB_RHPORT0_MODE       OPT_MODE_DEVICE
+#define CFG_TUSB_OS                 OPT_OS_FREERTOS
+
+// CFG_TUSB_DEBUG is defined by compiler in DEBUG build
+#define CFG_TUSB_DEBUG CONFIG_USB_DEBUG
+
+/* USB DMA on some MCUs can only access a specific SRAM region with restriction on alignment.
+ * Tinyusb use follows macros to declare transferring memory so that they can be put
+ * into those specific section.
+ * e.g
+ * - CFG_TUSB_MEM SECTION : __attribute__ (( section(".usb_ram") ))
+ * - CFG_TUSB_MEM_ALIGN   : __attribute__ ((aligned(4)))
+ */
+#ifndef CFG_TUSB_MEM_SECTION
+#   define CFG_TUSB_MEM_SECTION
+#endif
+
+#ifndef CFG_TUSB_MEM_ALIGN
+#   define CFG_TUSB_MEM_ALIGN          TU_ATTR_ALIGNED(4)
+#endif
+
+
+
+//--------------------------------------------------------------------
+// DEVICE CONFIGURATION
+//--------------------------------------------------------------------
+
+#define CFG_TUD_ENDOINT0_SIZE 64
+
+//------kconfig adaptor part -------//
+#ifndef CONFIG_USB_CDC_ENABLED
+#   define CONFIG_USB_CDC_ENABLED 0
+#endif
+
+#ifndef CONFIG_USB_MSC_ENABLED
+#   define CONFIG_USB_MSC_ENABLED 0
+#endif
+
+#ifndef CONFIG_USB_HID_ENABLED
+#   define CONFIG_USB_HID_ENABLED 0
+#endif
+
+#ifndef CONFIG_USB_MIDI_ENABLED
+#   define CONFIG_USB_MIDI_ENABLED 0
+#endif
+
+#ifndef CONFIG_USB_CUSTOM_CLASS_ENABLED
+#   define CONFIG_USB_CUSTOM_CLASS_ENABLED 0
+#endif
+
+//------------- CLASS -------------//
+#define CFG_TUD_CDC CONFIG_USB_CDC_ENABLED
+#define CFG_TUD_MSC CONFIG_USB_MSC_ENABLED
+#define CFG_TUD_HID CONFIG_USB_HID_ENABLED
+
+#define CFG_TUD_MIDI CONFIG_USB_MIDI_ENABLED
+#define CFG_TUD_CUSTOM_CLASS CONFIG_USB_CUSTOM_CLASS_ENABLED
+
+
+
+// CDC FIFO size of TX and RX
+#define CFG_TUD_CDC_RX_BUFSIZE CONFIG_USB_CDC_RX_BUFSIZE
+#define CFG_TUD_CDC_TX_BUFSIZE CONFIG_USB_CDC_TX_BUFSIZE
+
+// MSC Buffer size of Device Mass storage:
+#define CFG_TUD_MSC_BUFSIZE CONFIG_USB_MSC_BUFSIZE
+
+// HID buffer size Should be sufficient to hold ID (if any) + Data
+#define CFG_TUD_HID_BUFSIZE CONFIG_USB_HID_BUFSIZE
+
+#ifdef __cplusplus
+}
+#endif