mirror of
https://github.com/W3SLAV/micropython.git
synced 2025-06-19 12:05:32 -04:00
8809ae7161
At startup, buffer initial stdout / MicroyPthon banner so that it can be sent to the host on initial connection of the USB serial port. This buffering also works for when the CDC becomes disconnected and the device is still printing to stdout, and when CDC is reconnected the most recent part of stdout (depending on how big the internal USB FIFO is) is flushed to the host. This change is most obvious when you've first plugged in a MicroPython device (or hit reset), when it's a board that uses USB (CDC) serial in the chip itself for the REPL interface. This doesn't apply to UART going via a separate USB-serial chip. The stm32 port already has this buffering behaviour (it doesn't use TinyUSB) and this commit extends such behaviour to rp2, mimxrt, samd and renesas-ra ports, which do use TinyUSB. Signed-off-by: Andrew Leech <andrew@alelec.net>
149 lines
4.5 KiB
C
149 lines
4.5 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_ENABLE_USB_RUNTIME_DEVICE
|
|
#define MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE 0
|
|
#endif
|
|
|
|
#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
|
|
|
|
#ifndef MICROPY_HW_USB_MSC_INQUIRY_VENDOR_STRING
|
|
#define MICROPY_HW_USB_MSC_INQUIRY_VENDOR_STRING "MicroPy"
|
|
#endif
|
|
|
|
#ifndef MICROPY_HW_USB_MSC_INQUIRY_PRODUCT_STRING
|
|
#define MICROPY_HW_USB_MSC_INQUIRY_PRODUCT_STRING "Mass Storage"
|
|
#endif
|
|
|
|
#ifndef MICROPY_HW_USB_MSC_INQUIRY_REVISION_STRING
|
|
#define MICROPY_HW_USB_MSC_INQUIRY_REVISION_STRING "1.00"
|
|
#endif
|
|
|
|
#ifndef CFG_TUSB_RHPORT0_MODE
|
|
#define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE)
|
|
#endif
|
|
|
|
#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 ((CFG_TUD_MAX_SPEED == OPT_MODE_HIGH_SPEED) ? 512 : 256)
|
|
#define CFG_TUD_CDC_TX_BUFSIZE ((CFG_TUD_MAX_SPEED == OPT_MODE_HIGH_SPEED) ? 512 : 256)
|
|
#define CFG_TUD_CDC_PERSISTENT_TX_BUFF (1)
|
|
#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 USBD_RHPORT (0) // Currently only one port is supported
|
|
|
|
// Define built-in interface, string and endpoint numbering based on the above config
|
|
|
|
#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 (40)
|
|
#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 builtin USB interfaces, endpoints, strings */
|
|
#if CFG_TUD_MSC
|
|
#define USBD_ITF_BUILTIN_MAX (USBD_ITF_MSC + 1)
|
|
#define USBD_STR_BUILTIN_MAX (USBD_STR_MSC + 1)
|
|
#define USBD_EP_BUILTIN_MAX (EPNUM_MSC_OUT + 1)
|
|
#elif CFG_TUD_CDC
|
|
#define USBD_ITF_BUILTIN_MAX (USBD_ITF_CDC + 2)
|
|
#define USBD_STR_BUILTIN_MAX (USBD_STR_CDC + 1)
|
|
#define USBD_EP_BUILTIN_MAX (((USBD_CDC_EP_IN)&~TUSB_DIR_IN_MASK) + 1)
|
|
#else // !CFG_TUD_MSC && !CFG_TUD_CDC
|
|
#define USBD_ITF_BUILTIN_MAX (0)
|
|
#define USBD_STR_BUILTIN_MAX (0)
|
|
#define USBD_EP_BUILTIN_MAX (0)
|
|
#endif
|
|
|
|
#endif // MICROPY_HW_ENABLE_USBDEV
|
|
|
|
#endif // MICROPY_INCLUDED_SHARED_TINYUSB_TUSB_CONFIG_H
|