diff options
| author | hathach <[email protected]> | 2018-04-16 13:46:28 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2018-04-16 13:46:28 +0700 |
| commit | 6f7c4346c39bd57014e95b577255c3870a5979c6 (patch) | |
| tree | e8a3f3a039637934aa5c9916725c8d1e3c1cba1c /examples/obsolete/device/src | |
| parent | 29071c10b1e2f2574afb310a7197d599a25cd362 (diff) | |
add tud_set_descriptors
Diffstat (limited to 'examples/obsolete/device/src')
| -rw-r--r-- | examples/obsolete/device/src/main.c | 2 | ||||
| -rw-r--r-- | examples/obsolete/device/src/tusb_descriptors.c | 13 | ||||
| -rw-r--r-- | examples/obsolete/device/src/tusb_descriptors.h | 4 |
3 files changed, 12 insertions, 7 deletions
diff --git a/examples/obsolete/device/src/main.c b/examples/obsolete/device/src/main.c index e11bbc7cd..6b3bdeee5 100644 --- a/examples/obsolete/device/src/main.c +++ b/examples/obsolete/device/src/main.c @@ -46,6 +46,7 @@ #include "bsp/board.h" #include "app_os_prio.h" #include "tusb.h" +#include "tusb_descriptors.h" #include "msc_device_app.h" #include "keyboard_device_app.h" @@ -87,6 +88,7 @@ int main(void) print_greeting(); tusb_init(); + tud_set_descriptors(&usb_desc_init); //------------- application task init -------------// led_blinking_init(); diff --git a/examples/obsolete/device/src/tusb_descriptors.c b/examples/obsolete/device/src/tusb_descriptors.c index 51e9b2b79..ea15b75ec 100644 --- a/examples/obsolete/device/src/tusb_descriptors.c +++ b/examples/obsolete/device/src/tusb_descriptors.c @@ -456,14 +456,13 @@ uint16_t const * const string_descriptor_arr [] = } }; -//--------------------------------------------------------------------+ -// TINYUSB Descriptors Pointer (this variable is required by the stack) -//--------------------------------------------------------------------+ -tusbd_descriptor_pointer_t tusbd_descriptor_pointers = + +/*------------- Variable used by tud_set_descriptors -------------*/ +tud_desc_init_t usb_desc_init = { - .p_device = (uint8_t const * ) &desc_device, - .p_configuration = (uint8_t const * ) &desc_configuration, - .p_string_arr = (uint8_t const **) string_descriptor_arr, + .device = (uint8_t const * ) &desc_device, + .configuration = (uint8_t const * ) &desc_configuration, + .string_arr = (uint8_t const **) string_descriptor_arr, #if CFG_TUD_HID_KEYBOARD .p_hid_keyboard_report = (uint8_t const *) desc_keyboard_report, diff --git a/examples/obsolete/device/src/tusb_descriptors.h b/examples/obsolete/device/src/tusb_descriptors.h index 7aa4c806c..c5c3f177f 100644 --- a/examples/obsolete/device/src/tusb_descriptors.h +++ b/examples/obsolete/device/src/tusb_descriptors.h @@ -175,4 +175,8 @@ typedef struct ATTR_PACKED } app_descriptor_configuration_t; + + +extern tud_desc_init_t usb_desc_init; + #endif |