andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rename TUD_ENDPOINT_EXCLUSIVE_NUMBER to TUD_ENDPOINT_ONE_DIRECTION_ONLY

Browse Source
This commit is contained in:
hathach
2024-08-19 19:05:33 +07:00
parent ca3925a4c5
commit 088486186f
14 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/device/cdc_dual_ports/src/usb_descriptors.c
View File

@@ -109,7 +109,7 @@ enum
#define EPNUM_CDC_1_OUT 0x05 #define EPNUM_CDC_1_OUT 0x05
#define EPNUM_CDC_1_IN 0x84 #define EPNUM_CDC_1_IN 0x84
#elif defined(TUD_ENDPOINT_EXCLUSIVE_NUMBER) #elif defined(TUD_ENDPOINT_ONE_DIRECTION_ONLY)
// MCUs that don't support a same endpoint number with different direction IN and OUT defined in tusb_mcu.h // MCUs that don't support a same endpoint number with different direction IN and OUT defined in tusb_mcu.h
// e.g EP1 OUT & EP1 IN cannot exist together // e.g EP1 OUT & EP1 IN cannot exist together
#define EPNUM_CDC_0_NOTIF 0x81 #define EPNUM_CDC_0_NOTIF 0x81

2
examples/device/cdc_msc/src/usb_descriptors.c
View File

@@ -103,7 +103,7 @@ enum {
#define EPNUM_MSC_OUT 0x05 #define EPNUM_MSC_OUT 0x05
#define EPNUM_MSC_IN 0x84 #define EPNUM_MSC_IN 0x84
#elif defined(TUD_ENDPOINT_EXCLUSIVE_NUMBER) #elif defined(TUD_ENDPOINT_ONE_DIRECTION_ONLY)
// MCUs that don't support a same endpoint number with different direction IN and OUT defined in tusb_mcu.h // MCUs that don't support a same endpoint number with different direction IN and OUT defined in tusb_mcu.h
// e.g EP1 OUT & EP1 IN cannot exist together // e.g EP1 OUT & EP1 IN cannot exist together
#define EPNUM_CDC_NOTIF 0x81 #define EPNUM_CDC_NOTIF 0x81

2
examples/device/cdc_msc_freertos/src/usb_descriptors.c
View File

@@ -103,7 +103,7 @@ enum {
#define EPNUM_MSC_OUT 0x05 #define EPNUM_MSC_OUT 0x05
#define EPNUM_MSC_IN 0x84 #define EPNUM_MSC_IN 0x84
#elif defined(TUD_ENDPOINT_EXCLUSIVE_NUMBER) #elif defined(TUD_ENDPOINT_ONE_DIRECTION_ONLY)
// MCUs that don't support a same endpoint number with different direction IN and OUT defined in tusb_mcu.h // MCUs that don't support a same endpoint number with different direction IN and OUT defined in tusb_mcu.h
// e.g EP1 OUT & EP1 IN cannot exist together // e.g EP1 OUT & EP1 IN cannot exist together
#define EPNUM_CDC_NOTIF 0x81 #define EPNUM_CDC_NOTIF 0x81

2
examples/device/cdc_uac2/src/usb_descriptors.c
View File

@@ -97,7 +97,7 @@ uint8_t const * tud_descriptor_device_cb(void)
#define EPNUM_CDC_OUT 0x02 #define EPNUM_CDC_OUT 0x02
#define EPNUM_CDC_IN 0x82 #define EPNUM_CDC_IN 0x82
#elif defined(TUD_ENDPOINT_EXCLUSIVE_NUMBER) #elif defined(TUD_ENDPOINT_ONE_DIRECTION_ONLY)
// MCUs that don't support a same endpoint number with different direction IN and OUT defined in tusb_mcu.h // MCUs that don't support a same endpoint number with different direction IN and OUT defined in tusb_mcu.h
// e.g EP1 OUT & EP1 IN cannot exist together // e.g EP1 OUT & EP1 IN cannot exist together
#define EPNUM_AUDIO_IN 0x01 #define EPNUM_AUDIO_IN 0x01

2
examples/device/dynamic_configuration/src/usb_descriptors.c
View File

@@ -132,7 +132,7 @@ enum
#define EPNUM_1_MSC_OUT 0x02 #define EPNUM_1_MSC_OUT 0x02
#define EPNUM_1_MSC_IN 0x82 #define EPNUM_1_MSC_IN 0x82
#elif defined(TUD_ENDPOINT_EXCLUSIVE_NUMBER) #elif defined(TUD_ENDPOINT_ONE_DIRECTION_ONLY)
// MCUs that don't support a same endpoint number with different direction IN and OUT defined in tusb_mcu.h // MCUs that don't support a same endpoint number with different direction IN and OUT defined in tusb_mcu.h
// e.g EP1 OUT & EP1 IN cannot exist together // e.g EP1 OUT & EP1 IN cannot exist together
#define EPNUM_0_CDC_NOTIF 0x81 #define EPNUM_0_CDC_NOTIF 0x81

2
examples/device/midi_test/src/usb_descriptors.c
View File

@@ -93,7 +93,7 @@ enum
#define EPNUM_MIDI_OUT 0x02 #define EPNUM_MIDI_OUT 0x02
#define EPNUM_MIDI_IN 0x81 #define EPNUM_MIDI_IN 0x81
#elif defined(TUD_ENDPOINT_EXCLUSIVE_NUMBER) #elif defined(TUD_ENDPOINT_ONE_DIRECTION_ONLY)
// MCUs that don't support a same endpoint number with different direction IN and OUT defined in tusb_mcu.h // MCUs that don't support a same endpoint number with different direction IN and OUT defined in tusb_mcu.h
// e.g EP1 OUT & EP1 IN cannot exist together // e.g EP1 OUT & EP1 IN cannot exist together
#define EPNUM_MIDI_OUT 0x01 #define EPNUM_MIDI_OUT 0x01

2
examples/device/msc_dual_lun/src/usb_descriptors.c
View File

@@ -91,7 +91,7 @@ enum
#define EPNUM_MSC_OUT 0x02 #define EPNUM_MSC_OUT 0x02
#define EPNUM_MSC_IN 0x81 #define EPNUM_MSC_IN 0x81
#elif defined(TUD_ENDPOINT_EXCLUSIVE_NUMBER) #elif defined(TUD_ENDPOINT_ONE_DIRECTION_ONLY)
// MCUs that don't support a same endpoint number with different direction IN and OUT defined in tusb_mcu.h // MCUs that don't support a same endpoint number with different direction IN and OUT defined in tusb_mcu.h
// e.g EP1 OUT & EP1 IN cannot exist together // e.g EP1 OUT & EP1 IN cannot exist together
#define EPNUM_MSC_OUT 0x01 #define EPNUM_MSC_OUT 0x01

2
examples/device/net_lwip_webserver/src/usb_descriptors.c
View File

@@ -120,7 +120,7 @@ uint8_t const * tud_descriptor_device_cb(void)
#define EPNUM_NET_OUT 0x02 #define EPNUM_NET_OUT 0x02
#define EPNUM_NET_IN 0x81 #define EPNUM_NET_IN 0x81
#elif defined(TUD_ENDPOINT_EXCLUSIVE_NUMBER) #elif defined(TUD_ENDPOINT_ONE_DIRECTION_ONLY)
// MCUs that don't support a same endpoint number with different direction IN and OUT defined in tusb_mcu.h // MCUs that don't support a same endpoint number with different direction IN and OUT defined in tusb_mcu.h
// e.g EP1 OUT & EP1 IN cannot exist together // e.g EP1 OUT & EP1 IN cannot exist together
#define EPNUM_NET_NOTIF 0x81 #define EPNUM_NET_NOTIF 0x81

2
examples/device/uac2_headset/src/usb_descriptors.c
View File

@@ -97,7 +97,7 @@ uint8_t const * tud_descriptor_device_cb(void)
#define EPNUM_AUDIO_OUT 0x08 #define EPNUM_AUDIO_OUT 0x08
#define EPNUM_AUDIO_INT 0x01 #define EPNUM_AUDIO_INT 0x01
#elif defined(TUD_ENDPOINT_EXCLUSIVE_NUMBER) #elif defined(TUD_ENDPOINT_ONE_DIRECTION_ONLY)
// MCUs that don't support a same endpoint number with different direction IN and OUT defined in tusb_mcu.h // MCUs that don't support a same endpoint number with different direction IN and OUT defined in tusb_mcu.h
// e.g EP1 OUT & EP1 IN cannot exist together // e.g EP1 OUT & EP1 IN cannot exist together
#define EPNUM_AUDIO_IN 0x01 #define EPNUM_AUDIO_IN 0x01

2
examples/device/uac2_speaker_fb/src/usb_descriptors.c
View File

@@ -131,7 +131,7 @@ uint8_t const * tud_hid_descriptor_report_cb(uint8_t itf)
#define EPNUM_AUDIO_OUT 0x08 #define EPNUM_AUDIO_OUT 0x08
#define EPNUM_DEBUG 0x01 #define EPNUM_DEBUG 0x01
#elif defined(TUD_ENDPOINT_EXCLUSIVE_NUMBER) #elif defined(TUD_ENDPOINT_ONE_DIRECTION_ONLY)
// MCUs that don't support a same endpoint number with different direction IN and OUT defined in tusb_mcu.h // MCUs that don't support a same endpoint number with different direction IN and OUT defined in tusb_mcu.h
// e.g EP1 OUT & EP1 IN cannot exist together // e.g EP1 OUT & EP1 IN cannot exist together
#define EPNUM_AUDIO_FB 0x01 #define EPNUM_AUDIO_FB 0x01

2
examples/device/video_capture/src/tusb_config.h
View File

@@ -106,7 +106,7 @@
#define CFG_TUD_VIDEO_STREAMING_EP_BUFSIZE 256 #define CFG_TUD_VIDEO_STREAMING_EP_BUFSIZE 256
// use bulk endpoint for streaming interface // use bulk endpoint for streaming interface
#define CFG_TUD_VIDEO_STREAMING_BULK 1 #define CFG_TUD_VIDEO_STREAMING_BULK 0
//#define CFG_EXAMPLE_VIDEO_READONLY //#define CFG_EXAMPLE_VIDEO_READONLY
//#define CFG_EXAMPLE_VIDEO_DISABLE_MJPEG //#define CFG_EXAMPLE_VIDEO_DISABLE_MJPEG

2
examples/device/video_capture/src/usb_descriptors.c
View File

@@ -118,6 +118,8 @@ enum {
#elif TU_CHECK_MCU(OPT_MCU_NRF5X) #elif TU_CHECK_MCU(OPT_MCU_NRF5X)
// nRF5x ISO can only be endpoint 8 // nRF5x ISO can only be endpoint 8
#define EPNUM_VIDEO_IN (CFG_TUD_VIDEO_STREAMING_BULK ? 0x81 : 0x88) #define EPNUM_VIDEO_IN (CFG_TUD_VIDEO_STREAMING_BULK ? 0x81 : 0x88)
#elif TU_CHECK_MCU(OPT_MCU_MAX32650, OPT_MCU_MAX32666, OPT_MCU_MAX32690, OPT_MCU_MAX78002)
#define EPNUM_VIDEO_IN 0x81
#else #else
#define EPNUM_VIDEO_IN 0x81 #define EPNUM_VIDEO_IN 0x81
#endif #endif

2
examples/device/webusb_serial/src/usb_descriptors.c
View File

@@ -104,7 +104,7 @@ enum
#define EPNUM_VENDOR_OUT 0x05 #define EPNUM_VENDOR_OUT 0x05
#define EPNUM_VENDOR_IN 0x84 #define EPNUM_VENDOR_IN 0x84
#elif defined(TUD_ENDPOINT_EXCLUSIVE_NUMBER) #elif defined(TUD_ENDPOINT_ONE_DIRECTION_ONLY)
// MCUs that don't support a same endpoint number with different direction IN and OUT defined in tusb_mcu.h // MCUs that don't support a same endpoint number with different direction IN and OUT defined in tusb_mcu.h
// e.g EP1 OUT & EP1 IN cannot exist together // e.g EP1 OUT & EP1 IN cannot exist together
#define EPNUM_CDC_NOTIF 0x81 #define EPNUM_CDC_NOTIF 0x81

16
src/common/tusb_mcu.h
View File

@@ -138,21 +138,21 @@
#elif TU_CHECK_MCU(OPT_MCU_SAMG) #elif TU_CHECK_MCU(OPT_MCU_SAMG)
#define TUP_DCD_ENDPOINT_MAX 6 #define TUP_DCD_ENDPOINT_MAX 6
#define TUD_ENDPOINT_EXCLUSIVE_NUMBER #define TUD_ENDPOINT_ONE_DIRECTION_ONLY
#elif TU_CHECK_MCU(OPT_MCU_SAMX7X) #elif TU_CHECK_MCU(OPT_MCU_SAMX7X)
#define TUP_DCD_ENDPOINT_MAX 10 #define TUP_DCD_ENDPOINT_MAX 10
#define TUP_RHPORT_HIGHSPEED 1 #define TUP_RHPORT_HIGHSPEED 1
#define TUD_ENDPOINT_EXCLUSIVE_NUMBER #define TUD_ENDPOINT_ONE_DIRECTION_ONLY
#elif TU_CHECK_MCU(OPT_MCU_PIC32MZ) #elif TU_CHECK_MCU(OPT_MCU_PIC32MZ)
#define TUP_DCD_ENDPOINT_MAX 8 #define TUP_DCD_ENDPOINT_MAX 8
#define TUD_ENDPOINT_EXCLUSIVE_NUMBER #define TUD_ENDPOINT_ONE_DIRECTION_ONLY
#elif TU_CHECK_MCU(OPT_MCU_PIC32MX, OPT_MCU_PIC32MM, OPT_MCU_PIC32MK) || \ #elif TU_CHECK_MCU(OPT_MCU_PIC32MX, OPT_MCU_PIC32MM, OPT_MCU_PIC32MK) || \
TU_CHECK_MCU(OPT_MCU_PIC24, OPT_MCU_DSPIC33) TU_CHECK_MCU(OPT_MCU_PIC24, OPT_MCU_DSPIC33)
#define TUP_DCD_ENDPOINT_MAX 16 #define TUP_DCD_ENDPOINT_MAX 16
#define TUD_ENDPOINT_EXCLUSIVE_NUMBER #define TUD_ENDPOINT_ONE_DIRECTION_ONLY
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// ST // ST
@@ -299,7 +299,7 @@
#elif TU_CHECK_MCU(OPT_MCU_CXD56) #elif TU_CHECK_MCU(OPT_MCU_CXD56)
#define TUP_DCD_ENDPOINT_MAX 7 #define TUP_DCD_ENDPOINT_MAX 7
#define TUP_RHPORT_HIGHSPEED 1 #define TUP_RHPORT_HIGHSPEED 1
#define TUD_ENDPOINT_EXCLUSIVE_NUMBER #define TUD_ENDPOINT_ONE_DIRECTION_ONLY
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// TI // TI
@@ -400,12 +400,12 @@
#elif TU_CHECK_MCU(OPT_MCU_FT90X) #elif TU_CHECK_MCU(OPT_MCU_FT90X)
#define TUP_DCD_ENDPOINT_MAX 8 #define TUP_DCD_ENDPOINT_MAX 8
#define TUP_RHPORT_HIGHSPEED 1 #define TUP_RHPORT_HIGHSPEED 1
#define TUD_ENDPOINT_EXCLUSIVE_NUMBER #define TUD_ENDPOINT_ONE_DIRECTION_ONLY
#elif TU_CHECK_MCU(OPT_MCU_FT93X) #elif TU_CHECK_MCU(OPT_MCU_FT93X)
#define TUP_DCD_ENDPOINT_MAX 16 #define TUP_DCD_ENDPOINT_MAX 16
#define TUP_RHPORT_HIGHSPEED 1 #define TUP_RHPORT_HIGHSPEED 1
#define TUD_ENDPOINT_EXCLUSIVE_NUMBER #define TUD_ENDPOINT_ONE_DIRECTION_ONLY
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// Allwinner // Allwinner
@@ -480,7 +480,7 @@
#define TUP_USBIP_MUSB_ADI #define TUP_USBIP_MUSB_ADI
#define TUP_DCD_ENDPOINT_MAX 12 #define TUP_DCD_ENDPOINT_MAX 12
#define TUP_RHPORT_HIGHSPEED 1 #define TUP_RHPORT_HIGHSPEED 1
#define TUD_ENDPOINT_EXCLUSIVE_NUMBER #define TUD_ENDPOINT_ONE_DIRECTION_ONLY
#endif #endif