From: peng.fan at nxp.com <peng.fan@nxp.com>
To: u-boot@lists.denx.de
Subject: [PATCH 07/16] usb: gadget: fastboot: add ext properties for WCID
Date: Wed, 16 Sep 2020 21:25:28 +0800 [thread overview]
Message-ID: <20200916132537.8313-8-peng.fan@nxp.com> (raw)
In-Reply-To: <20200916132537.8313-1-peng.fan@nxp.com>
From: Li Jun <jun.li@nxp.com>
Add device interface GUID for Microsoft Extended Properties Feature
Descriptor.
Signed-off-by: Li Jun <jun.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
drivers/usb/gadget/f_fastboot.c | 34 +++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index d1d087e12b..e330456390 100644
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -46,6 +46,25 @@ struct f_fastboot {
struct usb_request *in_req, *out_req;
};
+static char fb_ext_prop_name[] = "DeviceInterfaceGUID";
+static char fb_ext_prop_data[] = "{4866319A-F4D6-4374-93B9-DC2DEB361BA9}";
+
+static struct usb_os_desc_ext_prop fb_ext_prop = {
+ .type = 1, /* NUL-terminated Unicode String (REG_SZ) */
+ .name = fb_ext_prop_name,
+ .data = fb_ext_prop_data,
+};
+
+/* 16 bytes of "Compatible ID" and "Subcompatible ID" */
+static char fb_cid[16] = {'W', 'I', 'N', 'U', 'S', 'B'};
+static struct usb_os_desc fb_os_desc = {
+ .ext_compat_id = fb_cid,
+};
+
+static struct usb_os_desc_table fb_os_desc_table = {
+ .os_desc = &fb_os_desc,
+};
+
static inline struct f_fastboot *func_to_fastboot(struct usb_function *f)
{
return container_of(f, struct f_fastboot, usb_function);
@@ -161,6 +180,19 @@ static int fastboot_bind(struct usb_configuration *c, struct usb_function *f)
return id;
interface_desc.bInterfaceNumber = id;
+ /* Enable OS and Extended Properties Feature Descriptor */
+ c->cdev->use_os_string = 1;
+ f->os_desc_table = &fb_os_desc_table;
+ f->os_desc_n = 1;
+ f->os_desc_table->if_id = id;
+ INIT_LIST_HEAD(&fb_os_desc.ext_prop);
+ fb_ext_prop.name_len = strlen(fb_ext_prop.name) * 2 + 2;
+ fb_os_desc.ext_prop_len = 10 + fb_ext_prop.name_len;
+ fb_os_desc.ext_prop_count = 1;
+ fb_ext_prop.data_len = strlen(fb_ext_prop.data) * 2 + 2;
+ fb_os_desc.ext_prop_len += fb_ext_prop.data_len + 4;
+ list_add_tail(&fb_ext_prop.entry, &fb_os_desc.ext_prop);
+
id = usb_string_id(c->cdev);
if (id < 0)
return id;
@@ -196,6 +228,8 @@ static int fastboot_bind(struct usb_configuration *c, struct usb_function *f)
static void fastboot_unbind(struct usb_configuration *c, struct usb_function *f)
{
+ f->os_desc_table = NULL;
+ list_del(&fb_os_desc.ext_prop);
memset(fastboot_func, 0, sizeof(*fastboot_func));
}
--
2.28.0
next prev parent reply other threads:[~2020-09-16 13:25 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-16 13:25 [PATCH 00/16] usb: gadget: update peng.fan at nxp.com
2020-09-16 13:25 ` [PATCH 01/16] usb: gadget: Add ep_config call back to usb_gadget_ops peng.fan at nxp.com
2020-09-16 13:25 ` [PATCH 02/16] usb: gadget: don't change ep name for dwc3 while ep autoconfig peng.fan at nxp.com
2020-09-16 13:25 ` [PATCH 03/16] usb: gadget: OS String support peng.fan at nxp.com
2020-09-16 13:25 ` [PATCH 04/16] usb: gadget: move utf8_to_utf16le to header file peng.fan at nxp.com
2020-09-16 13:25 ` [PATCH 05/16] usb: gadget: OS Feature Descriptors support peng.fan at nxp.com
2020-09-16 13:25 ` [PATCH 06/16] usb: gadget: add WCID support for mfgtool peng.fan at nxp.com
2020-09-16 13:25 ` peng.fan at nxp.com [this message]
2020-09-16 13:25 ` [PATCH 08/16] usb: gadget: set correct usb_configuration for os_desc_config peng.fan at nxp.com
2020-09-16 13:25 ` [PATCH 09/16] usb: gadget: update os_desc_config when add config peng.fan at nxp.com
2020-09-16 13:25 ` [PATCH 10/16] usb: gadget: add super speed support peng.fan at nxp.com
2020-09-16 13:25 ` [PATCH 11/16] usb: fastboot: " peng.fan at nxp.com
2020-09-16 13:25 ` [PATCH 12/16] usb: gadget: dnl: set dnl to be super speed peng.fan at nxp.com
2020-09-16 13:25 ` [PATCH 13/16] usb: composite: force gadget to be USB2 for HS only function peng.fan at nxp.com
2020-09-16 13:25 ` [PATCH 14/16] usb: udc: ci: update speed handling peng.fan at nxp.com
2020-09-16 13:25 ` [PATCH 15/16] usb: gadget: fastboot: use correct max packet size peng.fan at nxp.com
2020-09-16 13:25 ` [PATCH 16/16] usb: gaget: ci: set ep's desc when enable ep peng.fan at nxp.com
2020-10-10 6:00 ` [PATCH 00/16] usb: gadget: update Peng Fan
2021-01-03 10:32 ` Peng Fan
2021-01-23 12:11 ` Lukasz Majewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200916132537.8313-8-peng.fan@nxp.com \
--to=peng.fan@nxp.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.