Merge branch 'viveris:master' into master

devangpatel · web-flow · commit f1abff8ea41f · 2025-02-06T09:08:33.000-07:00
diff --git a/src/usb_gadget.c b/src/usb_gadget.c
@@ -223,7 +223,14 @@ void fill_ep_descriptor(mtp_ctx * ctx, usb_gadget * usbctx,struct usb_endpoint_d
 	if(flags & EP_BULK_MODE)
 	{
 		desc->bmAttributes = USB_ENDPOINT_XFER_BULK;
-		desc->wMaxPacketSize = flags & EP_SS_MODE ? 1024 : 512;
+
+		desc->wMaxPacketSize = 64;
+
+		if( flags & EP_HS_MODE )
+			desc->wMaxPacketSize = 512;
+
+		if( flags & EP_SS_MODE )
+			desc->wMaxPacketSize = 1024;
 	}
 	else
 	{

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,14 @@ void fill_ep_descriptor(mtp_ctx * ctx, usb_gadget * usbctx,struct usb_endpoint_d`
`223`	`223`	`if(flags & EP_BULK_MODE)`
`224`	`224`	`{`
`225`	`225`	`desc->bmAttributes = USB_ENDPOINT_XFER_BULK;`
`226`		`- desc->wMaxPacketSize = flags & EP_SS_MODE ? 1024 : 512;`
	`226`	`+`
	`227`	`+ desc->wMaxPacketSize = 64;`
	`228`	`+`
	`229`	`+ if( flags & EP_HS_MODE )`
	`230`	`+ desc->wMaxPacketSize = 512;`
	`231`	`+`
	`232`	`+ if( flags & EP_SS_MODE )`
	`233`	`+ desc->wMaxPacketSize = 1024;`
`227`	`234`	`}`
`228`	`235`	`else`
`229`	`236`	`{`