ec1eeccab4
This reverts commit 0613d3e356.
The value of CFG_TUD_CDC_EP_BUFSIZE should match the endpoint size,
otherwise data may stay in the lower layers of the USB stack (and not
passed up to the higher layers) until a total of CFG_TUD_CDC_EP_BUFSIZE
bytes have been received, which may not happen for a long time.
Fixes issue #11253.
Signed-off-by: Damien George <damien@micropython.org>
133 lines
4.0 KiB
C
133 lines
4.0 KiB
C
/*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2020-2021 Damien P. George
|
|
* Copyright (c) 2022 Angus Gratton
|
|
*
|
|
* 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.
|
|
*
|
|
*/
|
|
|
|
#ifndef MICROPY_INCLUDED_SHARED_TINYUSB_TUSB_CONFIG_H
|
|
#define MICROPY_INCLUDED_SHARED_TINYUSB_TUSB_CONFIG_H
|
|
|
|
#include "py/mpconfig.h"
|
|
|
|
#if MICROPY_HW_ENABLE_USBDEV
|
|
|
|
#ifndef MICROPY_HW_USB_MANUFACTURER_STRING
|
|
#define MICROPY_HW_USB_MANUFACTURER_STRING "MicroPython"
|
|
#endif
|
|
|
|
#ifndef MICROPY_HW_USB_PRODUCT_FS_STRING
|
|
#define MICROPY_HW_USB_PRODUCT_FS_STRING "Board in FS mode"
|
|
#endif
|
|
|
|
#ifndef MICROPY_HW_USB_CDC_INTERFACE_STRING
|
|
#define MICROPY_HW_USB_CDC_INTERFACE_STRING "Board CDC"
|
|
#endif
|
|
|
|
#define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE)
|
|
|
|
#if MICROPY_HW_USB_CDC
|
|
#define CFG_TUD_CDC (1)
|
|
#else
|
|
#define CFG_TUD_CDC (0)
|
|
#endif
|
|
|
|
#if MICROPY_HW_USB_MSC
|
|
#define CFG_TUD_MSC (1)
|
|
#else
|
|
#define CFG_TUD_MSC (0)
|
|
#endif
|
|
|
|
// CDC Configuration
|
|
#if CFG_TUD_CDC
|
|
#define CFG_TUD_CDC_RX_BUFSIZE (256)
|
|
#define CFG_TUD_CDC_TX_BUFSIZE (256)
|
|
#endif
|
|
|
|
// MSC Configuration
|
|
#if CFG_TUD_MSC
|
|
#ifndef MICROPY_HW_USB_MSC_INTERFACE_STRING
|
|
#define MICROPY_HW_USB_MSC_INTERFACE_STRING "Board MSC"
|
|
#endif
|
|
// Set MSC EP buffer size to FatFS block size to avoid partial read/writes (offset arg).
|
|
#define CFG_TUD_MSC_BUFSIZE (MICROPY_FATFS_MAX_SS)
|
|
#endif
|
|
|
|
// Define static descriptor size and interface count based on the above config
|
|
|
|
#define USBD_STATIC_DESC_LEN (TUD_CONFIG_DESC_LEN + \
|
|
(CFG_TUD_CDC ? (TUD_CDC_DESC_LEN) : 0) + \
|
|
(CFG_TUD_MSC ? (TUD_MSC_DESC_LEN) : 0) \
|
|
)
|
|
|
|
#define USBD_STR_0 (0x00)
|
|
#define USBD_STR_MANUF (0x01)
|
|
#define USBD_STR_PRODUCT (0x02)
|
|
#define USBD_STR_SERIAL (0x03)
|
|
#define USBD_STR_CDC (0x04)
|
|
#define USBD_STR_MSC (0x05)
|
|
|
|
#define USBD_MAX_POWER_MA (250)
|
|
|
|
#ifndef MICROPY_HW_USB_DESC_STR_MAX
|
|
#define MICROPY_HW_USB_DESC_STR_MAX (20)
|
|
#endif
|
|
|
|
#if CFG_TUD_CDC
|
|
#define USBD_ITF_CDC (0) // needs 2 interfaces
|
|
#define USBD_CDC_EP_CMD (0x81)
|
|
#define USBD_CDC_EP_OUT (0x02)
|
|
#define USBD_CDC_EP_IN (0x82)
|
|
#endif // CFG_TUD_CDC
|
|
|
|
#if CFG_TUD_MSC
|
|
// Interface & Endpoint numbers for MSC come after CDC, if it is enabled
|
|
#if CFG_TUD_CDC
|
|
#define USBD_ITF_MSC (2)
|
|
#define EPNUM_MSC_OUT (0x03)
|
|
#define EPNUM_MSC_IN (0x83)
|
|
#else
|
|
#define USBD_ITF_MSC (0)
|
|
#define EPNUM_MSC_OUT (0x01)
|
|
#define EPNUM_MSC_IN (0x81)
|
|
#endif // CFG_TUD_CDC
|
|
#endif // CFG_TUD_MSC
|
|
|
|
/* Limits of statically defined USB interfaces, endpoints, strings */
|
|
#if CFG_TUD_MSC
|
|
#define USBD_ITF_STATIC_MAX (USBD_ITF_MSC + 1)
|
|
#define USBD_STR_STATIC_MAX (USBD_STR_MSC + 1)
|
|
#define USBD_EP_STATIC_MAX (EPNUM_MSC_OUT + 1)
|
|
#elif CFG_TUD_CDC
|
|
#define USBD_ITF_STATIC_MAX (USBD_ITF_CDC + 2)
|
|
#define USBD_STR_STATIC_MAX (USBD_STR_CDC + 1)
|
|
#define USBD_EP_STATIC_MAX (((EPNUM_CDC_EP_IN)&~TUSB_DIR_IN_MASK) + 1)
|
|
#else // !CFG_TUD_MSC && !CFG_TUD_CDC
|
|
#define USBD_ITF_STATIC_MAX (0)
|
|
#define USBD_STR_STATIC_MAX (0)
|
|
#define USBD_EP_STATIC_MAX (0)
|
|
#endif
|
|
|
|
#endif // MICROPY_HW_ENABLE_USBDEV
|
|
|
|
#endif // MICROPY_INCLUDED_SHARED_TINYUSB_TUSB_CONFIG_H
|