update double winusb demo

common/usb_def.h

@@ -484,10 +484,10 @@ struct usb_msosv1_comp_id_function_descriptor {
     };
 
 struct usb_msosv1_descriptor {
-    uint8_t *string;
+    const uint8_t *string;
     uint8_t vendor_code;
-    uint8_t *compat_id;
-    uint8_t **comp_id_property;
+    const uint8_t *compat_id;
+    const uint8_t **comp_id_property;
 };
 
 /* MS OS 2.0 Header descriptor */

demo/winusb1.0_template.c

@@ -3,6 +3,8 @@
 
 #define WCID_VENDOR_CODE 0x17
 
+#define DOUBLE_WINUSB 0
+
 __ALIGN_BEGIN const uint8_t WCID_StringDescriptor_MSOS[18] __ALIGN_END = {
     ///////////////////////////////////////
     /// MS OS string descriptor
@@ -16,6 +18,7 @@ __ALIGN_BEGIN const uint8_t WCID_StringDescriptor_MSOS[18] __ALIGN_END = {
     0x00,                                       /* bReserved */
 };
 
+#if DOUBLE_WINUSB == 0
 __ALIGN_BEGIN const uint8_t WINUSB_WCIDDescriptor[40] __ALIGN_END = {
     ///////////////////////////////////////
     /// WCID descriptor
@@ -37,58 +40,144 @@ __ALIGN_BEGIN const uint8_t WINUSB_WCIDDescriptor[40] __ALIGN_END = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* cSubCID_8 */
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00,             /* bReserved_6 */
 };
+#else
+__ALIGN_BEGIN const uint8_t WINUSB_WCIDDescriptor[64] __ALIGN_END = {
+    ///////////////////////////////////////
+    /// WCID descriptor
+    ///////////////////////////////////////
+    0x40, 0x00, 0x00, 0x00,                   /* dwLength */
+    0x00, 0x01,                               /* bcdVersion */
+    0x04, 0x00,                               /* wIndex */
+    0x02,                                     /* bCount */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* bReserved_7 */
 
-__ALIGN_BEGIN const uint8_t WINUSB_IF0_WCIDProperties[142] __ALIGN_END = {
     ///////////////////////////////////////
-    /// WCID property descriptor
+    /// WCID function descriptor
     ///////////////////////////////////////
-    0x8e, 0x00, 0x00, 0x00, /* dwLength */
-    0x00, 0x01,             /* bcdVersion */
-    0x05, 0x00,             /* wIndex */
-    0x01, 0x00,             /* wCount */
+    0x00, /* bFirstInterfaceNumber */
+    0x01, /* bReserved */
+    /* WINUSB */
+    'W', 'I', 'N', 'U', 'S', 'B', 0x00, 0x00, /* cCID_8 */
+    /*  */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* cSubCID_8 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,             /* bReserved_6 */
 
     ///////////////////////////////////////
-    /// registry propter descriptor
+    /// WCID function descriptor
     ///////////////////////////////////////
-    0x84, 0x00, 0x00, 0x00, /* dwSize */
-    0x01, 0x00, 0x00, 0x00, /* dwPropertyDataType */
-    0x28, 0x00,             /* wPropertyNameLength */
-    /* DeviceInterfaceGUID */
-    'D', 0x00, 'e', 0x00, 'v', 0x00, 'i', 0x00,  /* wcName_20 */
-    'c', 0x00, 'e', 0x00, 'I', 0x00, 'n', 0x00,  /* wcName_20 */
-    't', 0x00, 'e', 0x00, 'r', 0x00, 'f', 0x00,  /* wcName_20 */
-    'a', 0x00, 'c', 0x00, 'e', 0x00, 'G', 0x00,  /* wcName_20 */
-    'U', 0x00, 'I', 0x00, 'D', 0x00, 0x00, 0x00, /* wcName_20 */
-    0x4e, 0x00, 0x00, 0x00,                      /* dwPropertyDataLength */
-    /* {CDB3B5AD-293B-4663-AA36-1AAE46463776} */
-    '{', 0x00, 'C', 0x00, 'D', 0x00, 'B', 0x00, /* wcData_39 */
-    '3', 0x00, 'B', 0x00, '5', 0x00, 'A', 0x00, /* wcData_39 */
-    'D', 0x00, '-', 0x00, '2', 0x00, '9', 0x00, /* wcData_39 */
-    '3', 0x00, 'B', 0x00, '-', 0x00, '4', 0x00, /* wcData_39 */
-    '6', 0x00, '6', 0x00, '3', 0x00, '-', 0x00, /* wcData_39 */
-    'A', 0x00, 'A', 0x00, '3', 0x00, '6', 0x00, /* wcData_39 */
-    '-', 0x00, '1', 0x00, 'A', 0x00, 'A', 0x00, /* wcData_39 */
-    'E', 0x00, '4', 0x00, '6', 0x00, '4', 0x00, /* wcData_39 */
-    '6', 0x00, '3', 0x00, '7', 0x00, '7', 0x00, /* wcData_39 */
-    '6', 0x00, '}', 0x00, 0x00, 0x00,           /* wcData_39 */
+    0x01, /* bFirstInterfaceNumber */
+    0x01, /* bReserved */
+    /* WINUSB */
+    'W', 'I', 'N', 'U', 'S', 'B', 0x00, 0x00, /* cCID_8 */
+    /*  */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* cSubCID_8 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,             /* bReserved_6 */
+};
+#endif
+__ALIGN_BEGIN const uint8_t WINUSB_IF0_WCIDProperties [142] __ALIGN_END = {
+  ///////////////////////////////////////
+  /// WCID property descriptor
+  ///////////////////////////////////////
+  0x8e, 0x00, 0x00, 0x00,                           /* dwLength */
+  0x00, 0x01,                                       /* bcdVersion */
+  0x05, 0x00,                                       /* wIndex */
+  0x01, 0x00,                                       /* wCount */
+  
+  ///////////////////////////////////////
+  /// registry propter descriptor
+  ///////////////////////////////////////
+  0x84, 0x00, 0x00, 0x00,                           /* dwSize */
+  0x01, 0x00, 0x00, 0x00,                           /* dwPropertyDataType */
+  0x28, 0x00,                                       /* wPropertyNameLength */
+  /* DeviceInterfaceGUID */
+  'D', 0x00, 'e', 0x00, 'v', 0x00, 'i', 0x00,       /* wcName_20 */
+  'c', 0x00, 'e', 0x00, 'I', 0x00, 'n', 0x00,       /* wcName_20 */
+  't', 0x00, 'e', 0x00, 'r', 0x00, 'f', 0x00,       /* wcName_20 */
+  'a', 0x00, 'c', 0x00, 'e', 0x00, 'G', 0x00,       /* wcName_20 */
+  'U', 0x00, 'I', 0x00, 'D', 0x00, 0x00, 0x00,      /* wcName_20 */
+  0x4e, 0x00, 0x00, 0x00,                           /* dwPropertyDataLength */
+  /* {1D4B2365-4749-48EA-B38A-7C6FDDDD7E26} */
+  '{', 0x00, '1', 0x00, 'D', 0x00, '4', 0x00,       /* wcData_39 */
+  'B', 0x00, '2', 0x00, '3', 0x00, '6', 0x00,       /* wcData_39 */
+  '5', 0x00, '-', 0x00, '4', 0x00, '7', 0x00,       /* wcData_39 */
+  '4', 0x00, '9', 0x00, '-', 0x00, '4', 0x00,       /* wcData_39 */
+  '8', 0x00, 'E', 0x00, 'A', 0x00, '-', 0x00,       /* wcData_39 */
+  'B', 0x00, '3', 0x00, '8', 0x00, 'A', 0x00,       /* wcData_39 */
+  '-', 0x00, '7', 0x00, 'C', 0x00, '6', 0x00,       /* wcData_39 */
+  'F', 0x00, 'D', 0x00, 'D', 0x00, 'D', 0x00,       /* wcData_39 */
+  'D', 0x00, '7', 0x00, 'E', 0x00, '2', 0x00,       /* wcData_39 */
+  '6', 0x00, '}', 0x00, 0x00, 0x00,                 /* wcData_39 */
+};
+#define  WINUSB_IF1_WCID_PROPERTIES_SIZE  (142)
+__ALIGN_BEGIN const uint8_t WINUSB_IF1_WCIDProperties [142] __ALIGN_END = {
+  ///////////////////////////////////////
+  /// WCID property descriptor
+  ///////////////////////////////////////
+  0x8e, 0x00, 0x00, 0x00,                           /* dwLength */
+  0x00, 0x01,                                       /* bcdVersion */
+  0x05, 0x00,                                       /* wIndex */
+  0x01, 0x00,                                       /* wCount */
+  
+  ///////////////////////////////////////
+  /// registry propter descriptor
+  ///////////////////////////////////////
+  0x84, 0x00, 0x00, 0x00,                           /* dwSize */
+  0x01, 0x00, 0x00, 0x00,                           /* dwPropertyDataType */
+  0x28, 0x00,                                       /* wPropertyNameLength */
+  /* DeviceInterfaceGUID */
+  'D', 0x00, 'e', 0x00, 'v', 0x00, 'i', 0x00,       /* wcName_20 */
+  'c', 0x00, 'e', 0x00, 'I', 0x00, 'n', 0x00,       /* wcName_20 */
+  't', 0x00, 'e', 0x00, 'r', 0x00, 'f', 0x00,       /* wcName_20 */
+  'a', 0x00, 'c', 0x00, 'e', 0x00, 'G', 0x00,       /* wcName_20 */
+  'U', 0x00, 'I', 0x00, 'D', 0x00, 0x00, 0x00,      /* wcName_20 */
+  0x4e, 0x00, 0x00, 0x00,                           /* dwPropertyDataLength */
+  /* {1D4B2365-4749-48EA-B38A-7C6FDDDD7E26} */
+  '{', 0x00, '1', 0x00, 'D', 0x00, '4', 0x00,       /* wcData_39 */
+  'B', 0x00, '2', 0x00, '3', 0x00, '6', 0x00,       /* wcData_39 */
+  '5', 0x00, '-', 0x00, '4', 0x00, '7', 0x00,       /* wcData_39 */
+  '4', 0x00, '9', 0x00, '-', 0x00, '4', 0x00,       /* wcData_39 */
+  '8', 0x00, 'E', 0x00, 'A', 0x00, '-', 0x00,       /* wcData_39 */
+  'B', 0x00, '3', 0x00, '8', 0x00, 'A', 0x00,       /* wcData_39 */
+  '-', 0x00, '7', 0x00, 'C', 0x00, '6', 0x00,       /* wcData_39 */
+  'F', 0x00, 'D', 0x00, 'D', 0x00, 'D', 0x00,       /* wcData_39 */
+  'D', 0x00, '7', 0x00, 'E', 0x00, '2', 0x00,       /* wcData_39 */
+  '6', 0x00, '}', 0x00, 0x00, 0x00,                 /* wcData_39 */
+};
+
+const uint8_t *WINUSB_IFx_WCIDProperties[] = {
+    WINUSB_IF0_WCIDProperties,
+    WINUSB_IF1_WCIDProperties,
 };
 
 struct usb_msosv1_descriptor msosv1_desc = {
-    .string = (uint8_t *)WCID_StringDescriptor_MSOS,
+    .string = WCID_StringDescriptor_MSOS,
     .vendor_code = WCID_VENDOR_CODE,
-    .compat_id = (uint8_t *)WINUSB_WCIDDescriptor,
-    .comp_id_property = (uint8_t **)&WINUSB_IF0_WCIDProperties,
+    .compat_id = WINUSB_WCIDDescriptor,
+#if DOUBLE_WINUSB == 0
+    .comp_id_property = &WINUSB_IF0_WCIDProperties,
+#else
+    .comp_id_property = WINUSB_IFx_WCIDProperties,
+#endif
 };
 
 #define WINUSB_IN_EP  0x81
 #define WINUSB_OUT_EP 0x02
 
-#define USBD_VID           0x0d28
-#define USBD_PID           0x0404
+#define USBD_VID           0xefff
+#define USBD_PID           0xffff
 #define USBD_MAX_POWER     100
 #define USBD_LANGID_STRING 1033
 
+#if DOUBLE_WINUSB == 0
 #define USB_CONFIG_SIZE (9 + 9 + 7 + 7)
+#define INTF_NUM 1
+#else
+#define WINUSB_IN_EP2  0x83
+#define WINUSB_OUT_EP2 0x04
+
+#define USB_CONFIG_SIZE (9 + 9 + 7 + 7 + 9 + 7 + 7)
+#define INTF_NUM 2
+#endif
 
 #ifdef CONFIG_USB_HS
 #define WINUSB_EP_MPS 512
@@ -97,11 +186,16 @@ struct usb_msosv1_descriptor msosv1_desc = {
 #endif
 
 const uint8_t winusb_descriptor[] = {
-    USB_DEVICE_DESCRIPTOR_INIT(USB_2_0, 0xff, 0xff, 0xff, USBD_VID, USBD_PID, 0x0001, 0x01),
-    USB_CONFIG_DESCRIPTOR_INIT(USB_CONFIG_SIZE, 0x01, 0x01, USB_CONFIG_BUS_POWERED, USBD_MAX_POWER),
-    USB_INTERFACE_DESCRIPTOR_INIT(0x00, 0x00, 0x02, 0xff, 0x01, 0x00, 0x02),
+    USB_DEVICE_DESCRIPTOR_INIT(USB_2_0, 0x00, 0x00, 0x00, USBD_VID, USBD_PID, 0x0001, 0x01),
+    USB_CONFIG_DESCRIPTOR_INIT(USB_CONFIG_SIZE, INTF_NUM, 0x01, USB_CONFIG_BUS_POWERED, USBD_MAX_POWER),
+    USB_INTERFACE_DESCRIPTOR_INIT(0x00, 0x00, 0x02, 0xff, 0xff, 0x00, 0x04),
     USB_ENDPOINT_DESCRIPTOR_INIT(WINUSB_IN_EP, 0x02, WINUSB_EP_MPS, 0x00),
     USB_ENDPOINT_DESCRIPTOR_INIT(WINUSB_OUT_EP, 0x02, WINUSB_EP_MPS, 0x00),
+#if DOUBLE_WINUSB == 1
+    USB_INTERFACE_DESCRIPTOR_INIT(0x01, 0x00, 0x02, 0xff, 0xff, 0x00, 0x05),
+    USB_ENDPOINT_DESCRIPTOR_INIT(WINUSB_IN_EP2, 0x02, WINUSB_EP_MPS, 0x00),
+    USB_ENDPOINT_DESCRIPTOR_INIT(WINUSB_OUT_EP2, 0x02, WINUSB_EP_MPS, 0x00),
+#endif
     ///////////////////////////////////////
     /// string0 descriptor
     ///////////////////////////////////////
@@ -161,6 +255,62 @@ const uint8_t winusb_descriptor[] = {
     '0', 0x00,                  /* wcChar7 */
     '0', 0x00,                  /* wcChar8 */
     '0', 0x00,                  /* wcChar9 */
+    ///////////////////////////////////////
+    /// string4 descriptor
+    ///////////////////////////////////////
+    0x30,                       /* bLength */
+    USB_DESCRIPTOR_TYPE_STRING, /* bDescriptorType */
+    'C', 0x00,                  /* wcChar0 */
+    'h', 0x00,                  /* wcChar1 */
+    'e', 0x00,                  /* wcChar2 */
+    'r', 0x00,                  /* wcChar3 */
+    'r', 0x00,                  /* wcChar4 */
+    'y', 0x00,                  /* wcChar5 */
+    'U', 0x00,                  /* wcChar6 */
+    'S', 0x00,                  /* wcChar7 */
+    'B', 0x00,                  /* wcChar8 */
+    ' ', 0x00,                  /* wcChar9 */
+    'W', 0x00,                  /* wcChar10 */
+    'I', 0x00,                  /* wcChar11 */
+    'N', 0x00,                  /* wcChar12 */
+    'U', 0x00,                  /* wcChar13 */
+    'S', 0x00,                  /* wcChar14 */
+    'B', 0x00,                  /* wcChar15 */
+    ' ', 0x00,                  /* wcChar16 */
+    'D', 0x00,                  /* wcChar17 */
+    'E', 0x00,                  /* wcChar18 */
+    'M', 0x00,                  /* wcChar19 */
+    'O', 0x00,                  /* wcChar20 */
+        ' ', 0x00,                  /* wcChar16 */
+    '1', 0x00,                  /* wcChar21 */
+    ///////////////////////////////////////
+    /// string5 descriptor
+    ///////////////////////////////////////
+    0x30,                       /* bLength */
+    USB_DESCRIPTOR_TYPE_STRING, /* bDescriptorType */
+    'C', 0x00,                  /* wcChar0 */
+    'h', 0x00,                  /* wcChar1 */
+    'e', 0x00,                  /* wcChar2 */
+    'r', 0x00,                  /* wcChar3 */
+    'r', 0x00,                  /* wcChar4 */
+    'y', 0x00,                  /* wcChar5 */
+    'U', 0x00,                  /* wcChar6 */
+    'S', 0x00,                  /* wcChar7 */
+    'B', 0x00,                  /* wcChar8 */
+    ' ', 0x00,                  /* wcChar9 */
+    'W', 0x00,                  /* wcChar10 */
+    'I', 0x00,                  /* wcChar11 */
+    'N', 0x00,                  /* wcChar12 */
+    'U', 0x00,                  /* wcChar13 */
+    'S', 0x00,                  /* wcChar14 */
+    'B', 0x00,                  /* wcChar15 */
+    ' ', 0x00,                  /* wcChar16 */
+    'D', 0x00,                  /* wcChar17 */
+    'E', 0x00,                  /* wcChar18 */
+    'M', 0x00,                  /* wcChar19 */
+    'O', 0x00,                  /* wcChar20 */
+        ' ', 0x00,                  /* wcChar16 */
+    '2', 0x00,                  /* wcChar21 */
 #ifdef CONFIG_USB_HS
     ///////////////////////////////////////
     /// device qualifier descriptor
@@ -200,6 +350,9 @@ void usbd_event_handler(uint8_t event)
         case USBD_EVENT_CONFIGURED:
             /* setup first out ep read transfer */
             usbd_ep_start_read(WINUSB_OUT_EP, read_buffer, 2048);
+#if DOUBLE_WINUSB == 1
+            usbd_ep_start_read(WINUSB_OUT_EP2, read_buffer, 2048);
+#endif
             break;
         case USBD_EVENT_SET_REMOTE_WAKEUP:
             break;
@@ -218,7 +371,7 @@ void usbd_winusb_out(uint8_t ep, uint32_t nbytes)
     //     printf("%02x ", read_buffer[i]);
     // }
     // printf("\r\n");
-	usbd_ep_start_write(WINUSB_IN_EP, read_buffer, nbytes);
+    usbd_ep_start_write(WINUSB_IN_EP, read_buffer, nbytes);
     /* setup next out ep read transfer */
     usbd_ep_start_read(WINUSB_OUT_EP, read_buffer, 2048);
 }
@@ -235,25 +388,69 @@ void usbd_winusb_in(uint8_t ep, uint32_t nbytes)
     }
 }
 
-struct usbd_endpoint winusb_out_ep = {
+struct usbd_endpoint winusb_out_ep1 = {
     .ep_addr = WINUSB_OUT_EP,
     .ep_cb = usbd_winusb_out
 };
 
-struct usbd_endpoint winusb_in_ep = {
+struct usbd_endpoint winusb_in_ep1 = {
     .ep_addr = WINUSB_IN_EP,
     .ep_cb = usbd_winusb_in
 };
 
 struct usbd_interface intf0;
 
+#if DOUBLE_WINUSB == 1
+
+void usbd_winusb_out2(uint8_t ep, uint32_t nbytes)
+{
+    USB_LOG_RAW("actual out len:%d\r\n", nbytes);
+    // for (int i = 0; i < 100; i++) {
+    //     printf("%02x ", read_buffer[i]);
+    // }
+    // printf("\r\n");
+    usbd_ep_start_write(WINUSB_IN_EP2, read_buffer, nbytes);
+    /* setup next out ep read transfer */
+    usbd_ep_start_read(WINUSB_OUT_EP2, read_buffer, 2048);
+}
+
+void usbd_winusb_in2(uint8_t ep, uint32_t nbytes)
+{
+    USB_LOG_RAW("actual in len:%d\r\n", nbytes);
+
+    if ((nbytes % WINUSB_EP_MPS) == 0 && nbytes) {
+        /* send zlp */
+        usbd_ep_start_write(WINUSB_IN_EP2, NULL, 0);
+    } else {
+        ep_tx_busy_flag = false;
+    }
+}
+
+struct usbd_endpoint winusb_out_ep2 = {
+    .ep_addr = WINUSB_OUT_EP2,
+    .ep_cb = usbd_winusb_out2
+};
+
+struct usbd_endpoint winusb_in_ep2 = {
+    .ep_addr = WINUSB_IN_EP2,
+    .ep_cb = usbd_winusb_in2
+};
+
+struct usbd_interface intf1;
+
+#endif
+
 void winusb_init(void)
 {
     usbd_desc_register(winusb_descriptor);
     usbd_msosv1_desc_register(&msosv1_desc);
     usbd_add_interface(&intf0);
-    usbd_add_endpoint(&winusb_out_ep);
-    usbd_add_endpoint(&winusb_in_ep);
-
+    usbd_add_endpoint(&winusb_out_ep1);
+    usbd_add_endpoint(&winusb_in_ep1);
+#if DOUBLE_WINUSB == 1
+    usbd_add_interface(&intf1);
+    usbd_add_endpoint(&winusb_out_ep2);
+    usbd_add_endpoint(&winusb_in_ep2);
+#endif
     usbd_initialize();
 }