devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Li Jun <jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
To: gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org,
	balbi-l0cyMroinI0@public.gmane.org,
	peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org,
	robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	pawel.moll-5wv7dgnIgG8@public.gmane.org,
	mark.rutland-5wv7dgnIgG8@public.gmane.org,
	macpaul-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
	rogerq-l0cyMroinI0@public.gmane.org,
	Li Jun <jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
Subject: [PATCH v3 04/22] usb: gadget: composite: add USB_DT_OTG request handling
Date: Tue, 16 Jun 2015 14:51:54 +0800	[thread overview]
Message-ID: <1434437532-23678-5-git-send-email-jun.li@freescale.com> (raw)
In-Reply-To: <1434437532-23678-1-git-send-email-jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>

From: Macpaul Lin <macpaul-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

Copy usb_otg_descriptor from config's descriptor if host requests
USB_DT_OTG.

Signed-off-by: Macpaul Lin <macpaul-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Signed-off-by: Li Jun <jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
---
 drivers/usb/gadget/composite.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 4e3447b..8322e80 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1534,6 +1534,31 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
 				value = min(w_length, (u16) value);
 			}
 			break;
+		case USB_DT_OTG:
+			if (gadget_is_otg(gadget)) {
+				struct usb_configuration *config;
+				int otg_desc_len = 0;
+
+				if (cdev->config)
+					config = cdev->config;
+				else
+					config = list_first_entry(
+							&cdev->configs,
+						struct usb_configuration, list);
+				if (!config)
+					goto done;
+
+				if (gadget->otg_rev >= 0x0200)
+					otg_desc_len += sizeof(
+						struct usb_otg20_descriptor);
+				else
+					otg_desc_len += sizeof(
+						struct usb_otg_descriptor);
+
+				value = min_t(int, w_length, otg_desc_len);
+				memcpy(req->buf, config->descriptors[0], value);
+			}
+			break;
 		}
 		break;
 
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2015-06-16  6:51 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-16  6:51 [PATCH v3 00/22] usb gadget update for OTG 2.0 Li Jun
     [not found] ` <1434437532-23678-1-git-send-email-jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2015-06-16  6:51   ` [PATCH v3 01/22] usb: add usb_otg20_descriptor for OTG 2.0 and above Li Jun
     [not found]     ` <1434437532-23678-2-git-send-email-jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2015-06-16  7:25       ` Roger Quadros
2015-06-16  6:51   ` [PATCH v3 02/22] usb: add USB_OTG_ADP definition Li Jun
2015-06-16  6:51   ` [PATCH v3 03/22] usb: add OTG feature options to gadget structure Li Jun
     [not found]     ` <1434437532-23678-4-git-send-email-jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2015-06-16  7:28       ` Roger Quadros
2015-06-16  8:06         ` Li Jun
2015-06-16  6:51   ` Li Jun [this message]
     [not found]     ` <1434437532-23678-5-git-send-email-jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2015-06-16  7:30       ` [PATCH v3 04/22] usb: gadget: composite: add USB_DT_OTG request handling Roger Quadros
2015-06-16  6:51   ` [PATCH v3 05/22] doc: dt-binding: usb: add otg related properties Li Jun
     [not found]     ` <1434437532-23678-6-git-send-email-jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2015-06-16  8:21       ` Roger Quadros
2015-06-16  8:32         ` Li Jun
2015-06-16  6:51   ` [PATCH v3 06/22] usb: common: add API to get usb otg features from device tree Li Jun
2015-06-16  6:51   ` [PATCH v3 07/22] usb: chipidea: set usb gadeget's otg config Li Jun
     [not found]     ` <1434437532-23678-8-git-send-email-jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2015-06-16  8:44       ` Roger Quadros
2015-06-16  9:21         ` Li Jun
2015-06-17  8:21           ` Roger Quadros
2015-06-16  6:51   ` [PATCH v3 08/22] usb: chipidea: update ci_otg_is_fsm_mode conditions Li Jun
2015-06-16  6:51   ` [PATCH v3 09/22] usb: gadget: add usb_otg_descriptor_add interface to init usb_otg_descriptor Li Jun
     [not found]     ` <1434437532-23678-10-git-send-email-jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2015-06-16  8:01       ` Roger Quadros
2015-06-16  8:13         ` Li Jun
2015-06-16  6:52   ` [PATCH v3 10/22] usb: gadget: configfs: init and add usb_otg_descriptor for usb configurations Li Jun
     [not found]     ` <1434437532-23678-11-git-send-email-jun.li-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2015-06-16  7:58       ` Roger Quadros
2015-06-16  8:08         ` Li Jun
2015-06-16  6:52   ` [PATCH v3 11/22] usb: gadget: ether: init usb_otg_descriptor via usb_otg_descriptor_add Li Jun
2015-06-16  6:52   ` [PATCH v3 12/22] usb: gadget: acm_ms: " Li Jun
2015-06-16  6:52   ` [PATCH v3 13/22] usb: gadget: audio: " Li Jun
2015-06-16  6:52   ` [PATCH v3 14/22] usb: gadget: cdc2: " Li Jun
2015-06-16  6:52   ` [PATCH v3 15/22] usb: gadget: g_ffs: " Li Jun
2015-06-16  6:52   ` [PATCH v3 16/22] usb: gadget: hid: " Li Jun
2015-06-16  6:52   ` [PATCH v3 17/22] usb: gadget: mass_storage: " Li Jun
2015-06-16  6:52   ` [PATCH v3 18/22] usb: gadget: multi: " Li Jun
2015-06-16  6:52   ` [PATCH v3 19/22] usb: gadget: ncm: " Li Jun
2015-06-16  6:52   ` [PATCH v3 20/22] usb: gadget: printer: " Li Jun
2015-06-16  6:52   ` [PATCH v3 21/22] usb: gadget: serial: " Li Jun
2015-06-16  6:52   ` [PATCH v3 22/22] usb: gadget: zero: " Li Jun

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=1434437532-23678-5-git-send-email-jun.li@freescale.com \
    --to=jun.li-kzfg59tc24xl57midrcfdg@public.gmane.org \
    --cc=balbi-l0cyMroinI0@public.gmane.org \
    --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org \
    --cc=linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=macpaul-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
    --cc=mark.rutland-5wv7dgnIgG8@public.gmane.org \
    --cc=pawel.moll-5wv7dgnIgG8@public.gmane.org \
    --cc=peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org \
    --cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
    --cc=rogerq-l0cyMroinI0@public.gmane.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).