diff --git a/device/generic/rootfs_overlay/duos/mnt/system/usb-ncm.sh b/device/generic/rootfs_overlay/duos/mnt/system/usb-ncm.sh index bf9193936..9914eb9a2 100755 --- a/device/generic/rootfs_overlay/duos/mnt/system/usb-ncm.sh +++ b/device/generic/rootfs_overlay/duos/mnt/system/usb-ncm.sh @@ -25,7 +25,7 @@ sleep 0.5 set_gpio ${usb_select} 0 sleep 0.5 -/etc/uhubon.sh device >> /tmp/ncm.log 2>&1 +/etc/uhubon.sh device >> /tmp/ncm.log 2>&1 /etc/run_usb.sh probe ncm >> /tmp/ncm.log 2>&1 /etc/run_usb.sh start ncm >> /tmp/ncm.log 2>&1 diff --git a/linux_5.10/drivers/usb/Makefile b/linux_5.10/drivers/usb/Makefile index 1c1c1d659..0da7c468f 100644 --- a/linux_5.10/drivers/usb/Makefile +++ b/linux_5.10/drivers/usb/Makefile @@ -66,3 +66,5 @@ obj-$(CONFIG_USBIP_CORE) += usbip/ obj-$(CONFIG_TYPEC) += typec/ obj-$(CONFIG_USB_ROLE_SWITCH) += roles/ + +subdir-ccflags-y += -DDEBUG -DCONFIG_GAOYANG diff --git a/linux_5.10/drivers/usb/gadget/composite.c b/linux_5.10/drivers/usb/gadget/composite.c index 1a556a628..b080f7c5c 100644 --- a/linux_5.10/drivers/usb/gadget/composite.c +++ b/linux_5.10/drivers/usb/gadget/composite.c @@ -1685,7 +1685,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 +1716,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)) {