From 6f7c4346c39bd57014e95b577255c3870a5979c6 Mon Sep 17 00:00:00 2001 From: hathach Date: Mon, 16 Apr 2018 13:46:28 +0700 Subject: add tud_set_descriptors --- examples/device/device_virtual_com/src/main.c | 2 ++ examples/device/device_virtual_com/src/tusb_descriptors.c | 13 ++++++------- examples/device/device_virtual_com/src/tusb_descriptors.h | 4 ++++ 3 files changed, 12 insertions(+), 7 deletions(-) (limited to 'examples/device/device_virtual_com') diff --git a/examples/device/device_virtual_com/src/main.c b/examples/device/device_virtual_com/src/main.c index 531733cdc..8145d0183 100644 --- a/examples/device/device_virtual_com/src/main.c +++ b/examples/device/device_virtual_com/src/main.c @@ -45,6 +45,7 @@ #include "bsp/board.h" #include "tusb.h" +#include "tusb_descriptors.h" //--------------------------------------------------------------------+ // MACRO CONSTANT TYPEDEF @@ -64,6 +65,7 @@ int main(void) print_greeting(); tusb_init(); + tud_set_descriptors(&usb_desc_init); while (1) { diff --git a/examples/device/device_virtual_com/src/tusb_descriptors.c b/examples/device/device_virtual_com/src/tusb_descriptors.c index 09543e0de..c28534738 100644 --- a/examples/device/device_virtual_com/src/tusb_descriptors.c +++ b/examples/device/device_virtual_com/src/tusb_descriptors.c @@ -245,12 +245,11 @@ 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, }; diff --git a/examples/device/device_virtual_com/src/tusb_descriptors.h b/examples/device/device_virtual_com/src/tusb_descriptors.h index 0c80579e1..a7c81e2b0 100644 --- a/examples/device/device_virtual_com/src/tusb_descriptors.h +++ b/examples/device/device_virtual_com/src/tusb_descriptors.h @@ -98,4 +98,8 @@ typedef struct ATTR_PACKED } app_descriptor_configuration_t; + + +extern tud_desc_init_t usb_desc_init; + #endif -- cgit v1.3.1