|
|
|
|
@ -664,6 +664,35 @@ static int bos_desc(struct usb_composite_dev *cdev)
|
|
|
|
|
struct usb_ext_cap_descriptor *usb_ext;
|
|
|
|
|
struct usb_dcd_config_params dcd_config_params;
|
|
|
|
|
struct usb_bos_descriptor *bos = cdev->req->buf;
|
|
|
|
|
#if defined (CONFIG_GAOYANG)
|
|
|
|
|
/* WCID20 device capability descriptor */
|
|
|
|
|
#define USB_CAP_TYPE_WCID 5
|
|
|
|
|
#define USB_CAP_WCID_SIZE 0x1C
|
|
|
|
|
#define WINUSB20_WCID_VENDOR_CODE 0x00
|
|
|
|
|
#define WINUSB20_WCID_DESC_SET_SIZE 162
|
|
|
|
|
|
|
|
|
|
struct usb_cap_wcid20_descriptor {
|
|
|
|
|
__u8 bLength;
|
|
|
|
|
__u8 bDescriptorType;
|
|
|
|
|
__u8 bDevCapabilityType;
|
|
|
|
|
__u8 bReserved ;
|
|
|
|
|
__u8 bPlatformCapabilityUUID_16[16];
|
|
|
|
|
__u32 dwWindowsVersion;
|
|
|
|
|
__le32 wDescriptorSetTotalLength;
|
|
|
|
|
__u8 bVendorCode;
|
|
|
|
|
__u8 bAltEnumCode;
|
|
|
|
|
} __attribute__((packed));
|
|
|
|
|
|
|
|
|
|
char winusb20_wcidbos_uuid[] = {
|
|
|
|
|
0xdf, 0x60, 0xdd, 0xd8, 0x89, 0x45, 0xc7, 0x4c,
|
|
|
|
|
0x9c, 0xd2, 0x65, 0x9d, 0x9e, 0x64, 0x8a, 0x9f,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
uint32_t winusb20_wcidbos_version = 0x06030000;
|
|
|
|
|
|
|
|
|
|
struct usb_cap_wcid20_descriptor *usb_cap_wcid;
|
|
|
|
|
|
|
|
|
|
#endif // defined (CONFIG_GAOYANG)
|
|
|
|
|
unsigned int besl = 0;
|
|
|
|
|
|
|
|
|
|
bos->bLength = USB_DT_BOS_SIZE;
|
|
|
|
|
@ -694,7 +723,6 @@ static int bos_desc(struct usb_composite_dev *cdev)
|
|
|
|
|
if (dcd_config_params.besl_deep != USB_DEFAULT_BESL_UNSPECIFIED)
|
|
|
|
|
besl |= USB_BESL_DEEP_VALID |
|
|
|
|
|
USB_SET_BESL_DEEP(dcd_config_params.besl_deep);
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* A SuperSpeed device shall include the USB2.0 extension descriptor
|
|
|
|
|
* and shall support LPM when operating in USB2.0 HS mode.
|
|
|
|
|
@ -708,6 +736,19 @@ static int bos_desc(struct usb_composite_dev *cdev)
|
|
|
|
|
usb_ext->bmAttributes = cpu_to_le32(USB_LPM_SUPPORT |
|
|
|
|
|
USB_BESL_SUPPORT | besl);
|
|
|
|
|
|
|
|
|
|
#if defined (CONFIG_GAOYANG)
|
|
|
|
|
usb_cap_wcid = cdev->req->buf + le16_to_cpu(bos->wTotalLength);
|
|
|
|
|
le16_add_cpu(&bos->wTotalLength, USB_CAP_WCID_SIZE);
|
|
|
|
|
bos->bNumDeviceCaps++;
|
|
|
|
|
|
|
|
|
|
usb_cap_wcid->bLength = USB_CAP_WCID_SIZE;
|
|
|
|
|
usb_cap_wcid->bDescriptorType = USB_DT_DEVICE_CAPABILITY;
|
|
|
|
|
usb_cap_wcid->bDevCapabilityType = USB_CAP_TYPE_WCID;
|
|
|
|
|
usb_cap_wcid->dwWindowsVersion = winusb20_wcidbos_version;
|
|
|
|
|
usb_cap_wcid->wDescriptorSetTotalLength = cpu_to_le32(WINUSB20_WCID_DESC_SET_SIZE);
|
|
|
|
|
usb_cap_wcid->bVendorCode = WINUSB20_WCID_VENDOR_CODE;
|
|
|
|
|
memcpy(usb_cap_wcid->bPlatformCapabilityUUID_16, winusb20_wcidbos_uuid, sizeof(winusb20_wcidbos_uuid));
|
|
|
|
|
#endif // defined (CONFIG_GAOYANG)
|
|
|
|
|
/*
|
|
|
|
|
* The Superspeed USB Capability descriptor shall be implemented by all
|
|
|
|
|
* SuperSpeed devices.
|
|
|
|
|
@ -1685,7 +1726,7 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
|
|
|
|
|
if (gadget->lpm_capable)
|
|
|
|
|
cdev->desc.bcdUSB = cpu_to_le16(0x0201);
|
|
|
|
|
else
|
|
|
|
|
cdev->desc.bcdUSB = cpu_to_le16(0x0200);
|
|
|
|
|
cdev->desc.bcdUSB = cpu_to_le16(0x0201);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
value = min(w_length, (u16) sizeof cdev->desc);
|
|
|
|
|
@ -1716,11 +1757,16 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
|
|
|
|
|
value = min(w_length, (u16) value);
|
|
|
|
|
break;
|
|
|
|
|
case USB_DT_BOS:
|
|
|
|
|
#if !defined (CONFIG_GAOYANG)
|
|
|
|
|
if (gadget_is_superspeed(gadget) ||
|
|
|
|
|
gadget->lpm_capable) {
|
|
|
|
|
value = bos_desc(cdev);
|
|
|
|
|
value = min(w_length, (u16) value);
|
|
|
|
|
}
|
|
|
|
|
#else
|
|
|
|
|
value = bos_desc(cdev);
|
|
|
|
|
value = min(w_length, (u16) value);
|
|
|
|
|
#endif // defined (CONFIG_GAOYANG)
|
|
|
|
|
break;
|
|
|
|
|
case USB_DT_OTG:
|
|
|
|
|
if (gadget_is_otg(gadget)) {
|
|
|
|
|
|