diff options
| author | Angus Gratton <angus@redyak.com.au> | 2022-10-04 10:25:56 +1100 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2022-11-11 16:47:36 +1100 |
| commit | 2e6e53057b62a010d541e5a267c4088cd565203b (patch) | |
| tree | 10c36a396edddf4b5ae2ccdad38dde20aca16ee3 /shared/tinyusb/tusb_config.h | |
| parent | eed4eb2645aa3975ef822f4b34110730811690b7 (diff) | |
shared/tinyusb: Further refactor static USB device implementation.
App the mp_ prefix to usbd_ symbols and files which are defined here and
not in TinyUSB.
rp2 only for now. This includes some groundwork for dynamic USB devices
(defined in Python).
This work was funded through GitHub Sponsors.
Signed-off-by: Angus Gratton <angus@redyak.com.au>
Diffstat (limited to 'shared/tinyusb/tusb_config.h')
| -rw-r--r-- | shared/tinyusb/tusb_config.h | 64 |
1 files changed, 62 insertions, 2 deletions
diff --git a/shared/tinyusb/tusb_config.h b/shared/tinyusb/tusb_config.h index b50c70260..15e5acf55 100644 --- a/shared/tinyusb/tusb_config.h +++ b/shared/tinyusb/tusb_config.h @@ -2,6 +2,7 @@ * 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 @@ -29,6 +30,20 @@ #include <py/mpconfig.h> #include "mpconfigport.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) #define CFG_TUD_CDC (1) @@ -36,11 +51,56 @@ #define CFG_TUD_CDC_RX_BUFSIZE (256) #define CFG_TUD_CDC_TX_BUFSIZE (256) -#if MICROPY_HW_USB_MSC -// Board and hardware specific configuration +// MSC Configuration +#if CFG_TUD_MSC +#ifndef MICROPY_HW_USB_MSC_INTERFACE_STRING +#define MICROPY_HW_USB_MSC_INTERFACE_STRING "Board MSC" +#endif #define CFG_TUD_MSC (1) // 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 + +#if CFG_TUD_MSC +#define USBD_STATIC_DESC_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN + TUD_MSC_DESC_LEN) +#else +#define USBD_STATIC_DESC_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN) +#endif + +#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) + +#define USBD_DESC_STR_MAX (20) + +#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) + +#if CFG_TUD_MSC +#define USBD_ITF_MSC (2) +#define EPNUM_MSC_OUT (0x03) +#define EPNUM_MSC_IN (0x83) +#endif + +/* Limits of statically defined USB interfaces, endpoints, strings */ +#if CFG_TUD_MSC +#define USBD_ITF_STATIC_MAX (3) +#define USBD_STR_STATIC_MAX (USBD_STR_MSC + 1) +#define USBD_EP_STATIC_MAX (0x04) // ignoring the IN EP flag 0x80 +#else +#define USBD_ITF_STATIC_MAX (2) +#define USBD_STR_STATIC_MAX (USBD_STR_CDC + 1) +#define USBD_EP_STATIC_MAX (0x03) // ignoring the IN EP flag 0x80 +#endif + #endif // MICROPY_INCLUDED_SHARED_TINYUSB_TUSB_CONFIG_H |