diff options
| author | hathach <[email protected]> | 2018-04-10 14:43:13 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2018-04-10 14:43:13 +0700 |
| commit | 81935c91e98e76108d045df2581772c3a34a99ce (patch) | |
| tree | cff9feb178a2a7d896066298084e88539f0300f7 /examples | |
| parent | 3c2467196070eeedd4171e183db04fb815677246 (diff) | |
rename CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE to CFG_TUSB_DEVICE_ENDOINT0_SIZE
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/device/device_virtual_com/src/tusb_config.h | 16 | ||||
| -rw-r--r-- | examples/device/device_virtual_com/src/tusb_descriptors.c | 2 | ||||
| -rw-r--r-- | examples/device/nrf52840/src/tusb_config.h | 21 | ||||
| -rw-r--r-- | examples/device/nrf52840/src/tusb_descriptors.c | 2 | ||||
| -rw-r--r-- | examples/obsolete/device/src/tusb_config.h | 14 | ||||
| -rw-r--r-- | examples/obsolete/device/src/tusb_descriptors.c | 2 | ||||
| -rw-r--r-- | examples/obsolete/host/src/tusb_config.h | 18 |
7 files changed, 37 insertions, 38 deletions
diff --git a/examples/device/device_virtual_com/src/tusb_config.h b/examples/device/device_virtual_com/src/tusb_config.h index d0737de13..d5139e385 100644 --- a/examples/device/device_virtual_com/src/tusb_config.h +++ b/examples/device/device_virtual_com/src/tusb_config.h @@ -54,23 +54,23 @@ //--------------------------------------------------------------------+ // DEVICE CONFIGURATION //--------------------------------------------------------------------+ -#define CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE 64 +#define CFG_TUSB_DEVICE_ENDOINT0_SIZE 64 //------------- CLASS -------------// -#define CFG_TUSB_DEVICE_HID_KEYBOARD 0 -#define CFG_TUSB_DEVICE_HID_MOUSE 0 -#define CFG_TUSB_DEVICE_HID_GENERIC 0 // not supported yet -#define CFG_TUSB_DEVICE_MSC 0 -#define CFG_TUSB_DEVICE_CDC 1 +#define CFG_TUSB_DEVICE_HID_KEYBOARD 0 +#define CFG_TUSB_DEVICE_HID_MOUSE 0 +#define CFG_TUSB_DEVICE_HID_GENERIC 0 // not supported yet +#define CFG_TUSB_DEVICE_MSC 0 +#define CFG_TUSB_DEVICE_CDC 1 //--------------------------------------------------------------------+ // COMMON CONFIGURATION //--------------------------------------------------------------------+ -#define CFG_TUSB_DEBUG 2 +#define CFG_TUSB_DEBUG 2 //#define CFG_TUSB_OS TUSB_OS_NONE // be passed from IDE/command line for easy project switching //#define CFG_TUSB_OS_TASK_PRIO 0 // be passed from IDE/command line for easy project switching -#define CFG_TUSB_TICKS_HZ 1000 +#define CFG_TUSB_TICKS_HZ 1000 //#define CFG_TUSB_OS TUSB_OS_NONE diff --git a/examples/device/device_virtual_com/src/tusb_descriptors.c b/examples/device/device_virtual_com/src/tusb_descriptors.c index f0867585a..6a057d0a4 100644 --- a/examples/device/device_virtual_com/src/tusb_descriptors.c +++ b/examples/device/device_virtual_com/src/tusb_descriptors.c @@ -53,7 +53,7 @@ tusb_desc_device_t const desc_device = .bDeviceSubClass = MISC_SUBCLASS_COMMON, .bDeviceProtocol = MISC_PROTOCOL_IAD, - .bMaxPacketSize0 = CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE, + .bMaxPacketSize0 = CFG_TUSB_DEVICE_ENDOINT0_SIZE, .idVendor = CFG_VENDORID, .idProduct = CFG_PRODUCTID, diff --git a/examples/device/nrf52840/src/tusb_config.h b/examples/device/nrf52840/src/tusb_config.h index 54ec51cce..75d137d1d 100644 --- a/examples/device/nrf52840/src/tusb_config.h +++ b/examples/device/nrf52840/src/tusb_config.h @@ -48,29 +48,28 @@ //--------------------------------------------------------------------+ //#define CFG_TUSB_MCU will be passed from IDE/command line for easy board/mcu switching -#define CFG_TUSB_CONTROLLER_0_MODE (TUSB_MODE_DEVICE) -//#define CFG_TUSB_CONTROLLER_1_MODE (TUSB_MODE_DEVICE) +#define CFG_TUSB_CONTROLLER_0_MODE (TUSB_MODE_DEVICE) //--------------------------------------------------------------------+ // DEVICE CONFIGURATION //--------------------------------------------------------------------+ -#define CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE 64 +#define CFG_TUSB_DEVICE_ENDOINT0_SIZE 64 //------------- CLASS -------------// -#define CFG_TUSB_DEVICE_HID_KEYBOARD 0 -#define CFG_TUSB_DEVICE_HID_MOUSE 0 -#define CFG_TUSB_DEVICE_HID_GENERIC 0 // not supported yet -#define CFG_TUSB_DEVICE_MSC 1 -#define CFG_TUSB_DEVICE_CDC 1 +#define CFG_TUSB_DEVICE_HID_KEYBOARD 0 +#define CFG_TUSB_DEVICE_HID_MOUSE 0 +#define CFG_TUSB_DEVICE_HID_GENERIC 0 // not supported yet +#define CFG_TUSB_DEVICE_MSC 1 +#define CFG_TUSB_DEVICE_CDC 1 //--------------------------------------------------------------------+ // COMMON CONFIGURATION //--------------------------------------------------------------------+ -#define CFG_TUSB_DEBUG 2 +#define CFG_TUSB_DEBUG 2 -#define CFG_TUSB_OS TUSB_OS_NONE // be passed from IDE/command line for easy project switching +#define CFG_TUSB_OS TUSB_OS_NONE // be passed from IDE/command line for easy project switching //#define CFG_TUSB_OS_TASK_PRIO 0 // be passed from IDE/command line for easy project switching -#define CFG_TUSB_TICKS_HZ 1000 +#define CFG_TUSB_TICKS_HZ 1000 //#define CFG_TUSB_OS TUSB_OS_NONE diff --git a/examples/device/nrf52840/src/tusb_descriptors.c b/examples/device/nrf52840/src/tusb_descriptors.c index 99a47618a..b8f0a89d9 100644 --- a/examples/device/nrf52840/src/tusb_descriptors.c +++ b/examples/device/nrf52840/src/tusb_descriptors.c @@ -53,7 +53,7 @@ tusb_desc_device_t const desc_device = .bDeviceSubClass = MISC_SUBCLASS_COMMON, .bDeviceProtocol = MISC_PROTOCOL_IAD, - .bMaxPacketSize0 = CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE, + .bMaxPacketSize0 = CFG_TUSB_DEVICE_ENDOINT0_SIZE, .idVendor = CFG_VENDORID, .idProduct = CFG_PRODUCTID, diff --git a/examples/obsolete/device/src/tusb_config.h b/examples/obsolete/device/src/tusb_config.h index 6a841d28c..abbb8f6f7 100644 --- a/examples/obsolete/device/src/tusb_config.h +++ b/examples/obsolete/device/src/tusb_config.h @@ -54,19 +54,19 @@ //--------------------------------------------------------------------+ // DEVICE CONFIGURATION //--------------------------------------------------------------------+ -#define CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE 64 +#define CFG_TUSB_DEVICE_ENDOINT0_SIZE 64 //------------- CLASS -------------// -#define CFG_TUSB_DEVICE_HID_KEYBOARD 1 -#define CFG_TUSB_DEVICE_HID_MOUSE 1 -#define CFG_TUSB_DEVICE_HID_GENERIC 0 // not supported yet -#define CFG_TUSB_DEVICE_MSC 1 -#define CFG_TUSB_DEVICE_CDC 1 +#define CFG_TUSB_DEVICE_HID_KEYBOARD 1 +#define CFG_TUSB_DEVICE_HID_MOUSE 1 +#define CFG_TUSB_DEVICE_HID_GENERIC 0 // not supported yet +#define CFG_TUSB_DEVICE_MSC 1 +#define CFG_TUSB_DEVICE_CDC 1 //--------------------------------------------------------------------+ // COMMON CONFIGURATION //--------------------------------------------------------------------+ -#define CFG_TUSB_DEBUG 2 +#define CFG_TUSB_DEBUG 2 //#define CFG_TUSB_OS TUSB_OS_NONE // be passed from IDE/command line for easy project switching //#define CFG_TUSB_OS_TASK_PRIO 0 // be passed from IDE/command line for easy project switching diff --git a/examples/obsolete/device/src/tusb_descriptors.c b/examples/obsolete/device/src/tusb_descriptors.c index ca71d60e3..75ea1a88a 100644 --- a/examples/obsolete/device/src/tusb_descriptors.c +++ b/examples/obsolete/device/src/tusb_descriptors.c @@ -152,7 +152,7 @@ tusb_desc_device_t const desc_device = .bDeviceProtocol = 0x00, #endif - .bMaxPacketSize0 = CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE, + .bMaxPacketSize0 = CFG_TUSB_DEVICE_ENDOINT0_SIZE, .idVendor = CFG_VENDORID, .idProduct = CFG_PRODUCTID, diff --git a/examples/obsolete/host/src/tusb_config.h b/examples/obsolete/host/src/tusb_config.h index 501f6304d..02ce4f8fb 100644 --- a/examples/obsolete/host/src/tusb_config.h +++ b/examples/obsolete/host/src/tusb_config.h @@ -47,26 +47,26 @@ // CONTROLLER CONFIGURATION //--------------------------------------------------------------------+ //#define CFG_TUSB_MCU will be passed from IDE for easy board/mcu switching -#define CFG_TUSB_CONTROLLER_0_MODE (TUSB_MODE_HOST) +#define CFG_TUSB_CONTROLLER_0_MODE (TUSB_MODE_HOST) //--------------------------------------------------------------------+ // HOST CONFIGURATION //--------------------------------------------------------------------+ //------------- CLASS -------------// -#define CFG_TUSB_HOST_HUB 1 -#define CFG_TUSB_HOST_HID_KEYBOARD 1 -#define CFG_TUSB_HOST_HID_MOUSE 1 -#define CFG_TUSB_HOST_HID_GENERIC 0 // (not yet supported) -#define CFG_TUSB_HOST_MSC 1 -#define CFG_TUSB_HOST_CDC 1 +#define CFG_TUSB_HOST_HUB 1 +#define CFG_TUSB_HOST_HID_KEYBOARD 1 +#define CFG_TUSB_HOST_HID_MOUSE 1 +#define CFG_TUSB_HOST_HID_GENERIC 0 // (not yet supported) +#define CFG_TUSB_HOST_MSC 1 +#define CFG_TUSB_HOST_CDC 1 -#define CFG_TUSB_HOST_DEVICE_MAX (CFG_TUSB_HOST_HUB ? 5 : 1) // normal hub has 4 ports +#define CFG_TUSB_HOST_DEVICE_MAX (CFG_TUSB_HOST_HUB ? 5 : 1) // normal hub has 4 ports //--------------------------------------------------------------------+ // COMMON CONFIGURATION //--------------------------------------------------------------------+ -#define CFG_TUSB_DEBUG 2 +#define CFG_TUSB_DEBUG 2 //#define CFG_TUSB_OS TUSB_OS_NONE // defined using eclipse build //#define CFG_TUSB_OS_TASK_PRIO 0 // defined using eclipse build |
