add endpoint number configuration

rt-thread/usb_descriptor.c

@@ -42,6 +42,35 @@ TU_ATTR_WEAK uint8_t const *tud_descriptor_device_cb(void)
     return (uint8_t const *) &desc_device;
 }
 
+//--------------------------------------------------------------------+
+// HID Report Descriptor
+//--------------------------------------------------------------------+
+
+static uint8_t const desc_hid_report[] =
+{
+#ifdef PKG_TINYUSB_DEVICE_HID_KEYBOARD
+    TUD_HID_REPORT_DESC_KEYBOARD(HID_REPORT_ID(REPORT_ID_KEYBOARD)),
+#endif
+#ifdef PKG_TINYUSB_DEVICE_HID_MOUSE
+    TUD_HID_REPORT_DESC_MOUSE(HID_REPORT_ID(REPORT_ID_MOUSE)),
+#endif
+#ifdef PKG_TINYUSB_DEVICE_HID_CONSUMER
+    TUD_HID_REPORT_DESC_CONSUMER(HID_REPORT_ID(REPORT_ID_CONSUMER_CONTROL)),
+#endif
+#ifdef PKG_TINYUSB_DEVICE_HID_GAMEPAD
+    TUD_HID_REPORT_DESC_GAMEPAD(HID_REPORT_ID(REPORT_ID_GAMEPAD))
+#endif
+};
+
+// Invoked when received GET HID REPORT DESCRIPTOR
+// Application return pointer to descriptor
+// Descriptor contents must exist long enough for transfer to complete
+TU_ATTR_WEAK uint8_t const *tud_hid_descriptor_report_cb(uint8_t instance)
+{
+    (void)instance;
+    return desc_hid_report;
+}
+
 //--------------------------------------------------------------------+
 // Configuration Descriptor
 //--------------------------------------------------------------------+
@@ -138,32 +167,3 @@ TU_ATTR_WEAK uint16_t const *tud_descriptor_string_cb(uint8_t index, uint16_t la
 
     return desc_str;
 }
-
-//--------------------------------------------------------------------+
-// HID Report Descriptor
-//--------------------------------------------------------------------+
-
-static uint8_t const desc_hid_report[] =
-{
-#ifdef PKG_TINYUSB_DEVICE_HID_KEYBOARD
-    TUD_HID_REPORT_DESC_KEYBOARD(HID_REPORT_ID(REPORT_ID_KEYBOARD)),
-#endif
-#ifdef PKG_TINYUSB_DEVICE_HID_MOUSE
-    TUD_HID_REPORT_DESC_MOUSE(HID_REPORT_ID(REPORT_ID_MOUSE)),
-#endif
-#ifdef PKG_TINYUSB_DEVICE_HID_CONSUMER
-    TUD_HID_REPORT_DESC_CONSUMER(HID_REPORT_ID(REPORT_ID_CONSUMER_CONTROL)),
-#endif
-#ifdef PKG_TINYUSB_DEVICE_HID_GAMEPAD
-    TUD_HID_REPORT_DESC_GAMEPAD(HID_REPORT_ID(REPORT_ID_GAMEPAD))
-#endif
-};
-
-// Invoked when received GET HID REPORT DESCRIPTOR
-// Application return pointer to descriptor
-// Descriptor contents must exist long enough for transfer to complete
-TU_ATTR_WEAK uint8_t const *tud_hid_descriptor_report_cb(uint8_t instance)
-{
-    (void)instance;
-    return desc_hid_report;
-}

rt-thread/usb_descriptor.h

@@ -33,14 +33,14 @@ enum
                              TUD_CDC_DESC_LEN * CFG_TUD_CDC + \
                              TUD_HID_DESC_LEN * CFG_TUD_HID)
 
-#define EPNUM_CDC_NOTIF     0x81
-#define EPNUM_CDC_OUT       0x02
-#define EPNUM_CDC_IN        0x82
+#define EPNUM_CDC_NOTIF     (0x80 | PKG_TINYUSB_DEVICE_CDC_EPNUM_NOTIF)
+#define EPNUM_CDC_OUT       PKG_TINYUSB_DEVICE_CDC_EPNUM
+#define EPNUM_CDC_IN        (0x80 | PKG_TINYUSB_DEVICE_CDC_EPNUM)
 
-#define EPNUM_MSC_OUT       0x03
-#define EPNUM_MSC_IN        0x83
+#define EPNUM_MSC_OUT       PKG_TINYUSB_DEVICE_MSC_EPNUM
+#define EPNUM_MSC_IN        (0x80 | PKG_TINYUSB_DEVICE_MSC_EPNUM)
   
-#define EPNUM_HID           0x84
+#define EPNUM_HID           (0x80 | PKG_TINYUSB_DEVICE_HID_EPNUM)
 
 enum
 {