fixup! pkg/tinyusb: common descriptors implementation

RIOT-OS · Nov 8, 2022 · 95fb69d · 95fb69d
1 parent c7ef310
commit 95fb69d
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/pkg/tinyusb/contrib/tinyusb_descriptors.c b/pkg/tinyusb/contrib/tinyusb_descriptors.c
@@ -102,15 +102,15 @@ uint8_t const *tud_descriptor_device_cb(void)
 
 #if CONFIG_TUSBD_HID_NUMOF > 0
 __attribute__((weak))
-uint8_t const desc_hid_0_report[] =
+uint8_t const tusb_desc_hid_0_report[] =
 {
     TUD_HID_REPORT_DESC_GENERIC_INOUT(CONFIG_TUSBD_HID_NUMOF_EP_BUFSIZE),
 };
 #endif
 
 #if CONFIG_TUSBD_HID_NUMOF > 1
 __attribute__((weak))
-uint8_t const desc_hid_1_report[] =
+uint8_t const tusb_desc_hid_1_report[] =
 {
     TUD_HID_REPORT_DESC_GENERIC_INOUT(CONFIG_TUSBD_HID_NUMOF_TUSBD_EP_BUFSIZE),
 };
@@ -126,13 +126,13 @@ uint8_t const *tud_hid_descriptor_report_cb(uint8_t itf)
 #if CONFIG_TUSBD_HID_NUMOF > 0
   if (itf == 0)
   {
-    return desc_hid_0_report;
+    return tusb_desc_hid_0_report;
   }
 #endif
 #if CONFIG_TUSBD_HID_NUMOF > 1
   else if (itf == 1)
   {
-    return desc_hid_1_report;
+    return tusb_desc_hid_1_report;
   }
 #endif
   return NULL;
@@ -242,7 +242,7 @@ uint8_t const tusb_desc_fs_config[] = {
      * EP Out & EP In address, EP size, polling interval */
     TUD_HID_INOUT_DESCRIPTOR(TUSBD_ITF_HID_0, TUSBD_STR_IDX_HID_0,
                              HID_TUSBD_ITF_PROTOCOL_NONE,
-                             sizeof(desc_hid_0_report),
+                             sizeof(tusb_desc_hid_0_report),
                              TUSBD_EP_HID_0_OUT, TUSBD_EP_HID_0_IN,
                              CONFIG_TUSBD_HID_EP_SIZE,
                              CONFIG_TUSBD_HID_0_POLL_INTERVALL),
@@ -252,7 +252,7 @@ uint8_t const tusb_desc_fs_config[] = {
      * EP Out & EP In address, EP size, polling interval */
     TUD_HID_INOUT_DESCRIPTOR(TUSBD_ITF_HID_1, TUSBD_STR_IDX_HID_1,
                              HID_TUSBD_ITF_PROTOCOL_NONE,
-                             sizeof(desc_hid_1_report),
+                             sizeof(tusb_desc_hid_1_report),
                              TUSBD_EP_HID_1_OUT, TUSBD_EP_HID_1_IN,
                              CONFIG_TUSBD_HID_EP_SIZE,
                              CONFIG_TUSBD_HID_1_POLL_INTERVALL),
@@ -303,7 +303,7 @@ uint8_t const tusb_desc_hs_config[] = {
      * EP Out & EP In address, EP size, polling interval */
     TUD_HID_INOUT_DESCRIPTOR(TUSBD_ITF_HID_0, TUSBD_STR_IDX_HID_0,
                              HID_TUSBD_ITF_PROTOCOL_NONE,
-                             sizeof(desc_hid_0_report),
+                             sizeof(tusb_desc_hid_0_report),
                              TUSBD_EP_HID_0_OUT, TUSBD_EP_HID_0_IN,
                              CONFIG_TUSBD_HID_EP_SIZE,
                              CONFIG_TUSBD_HID_0_POLL_INTERVALL),
@@ -313,7 +313,7 @@ uint8_t const tusb_desc_hs_config[] = {
      * EP Out & EP In address, EP size, polling interval */
     TUD_HID_INOUT_DESCRIPTOR(TUSBD_ITF_HID_1, TUSBD_STR_IDX_HID_1,
                              HID_TUSBD_ITF_PROTOCOL_NONE,
-                             sizeof(desc_hid_1_report),
+                             sizeof(tusb_desc_hid_1_report),
                              TUSBD_EP_HID_1_OUT, TUSBD_EP_HID_1_IN,
                              CONFIG_TUSBD_HID_EP_SIZE,
                              CONFIG_TUSBD_HID_1_POLL_INTERVALL),