From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757227AbcBCMlE (ORCPT ); Wed, 3 Feb 2016 07:41:04 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:36223 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757192AbcBCMk7 (ORCPT ); Wed, 3 Feb 2016 07:40:59 -0500 X-AuditID: cbfee61b-f793c6d00000236c-22-56b1f55ad650 From: Robert Baldyga To: balbi@ti.com Cc: gregkh@linuxfoundation.org, andrzej.p@samsung.com, m.szyprowski@samsung.com, b.zolnierkie@samsung.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Robert Baldyga Subject: [PATCH v4 16/43] usb: gadget: composite: add usb_function_get_ep() function Date: Wed, 03 Feb 2016 13:39:24 +0100 Message-id: <1454503191-11796-17-git-send-email-r.baldyga@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1454503191-11796-1-git-send-email-r.baldyga@samsung.com> References: <1454503191-11796-1-git-send-email-r.baldyga@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprKLMWRmVeSWpSXmKPExsVy+t9jQd2orxvDDBa1aVnMetnOYrFxxnpW i4P36y2aF69ns7i8aw6bxaJlrcwWa4/cZbd4cHgnuwOHx/65a9g9+rasYvQ4fmM7k8fnTXIB LFFcNimpOZllqUX6dglcGRc+rmUq+C9U8fkJawPje/4uRk4OCQETiTnHGtggbDGJC/fWA9lc HEICsxglrhz7zQTh/GSU+HP7HDNIFZuAjsSW7xMYQWwRAQGJ9S8usYMUMQucY5R4eKcNLCEs ECbxfv5hJhCbRUBVYsuZ7WBxXgE3idef9rBArJOTOHlsMmsXIwcHJ1D84TEHkLCQgKvErtbv jBMYeRcwMqxilEgtSC4oTkrPNcpLLdcrTswtLs1L10vOz93ECA6sZ9I7GA/vcj/EKMDBqMTD G/FrQ5gQa2JZcWXuIUYJDmYlEV6jzxvDhHhTEiurUovy44tKc1KLDzFKc7AoifM+/r8uTEgg PbEkNTs1tSC1CCbLxMEp1cAYpCPy8tLZe+J/JzVwNYfKfFXrNfPmsrnYdNRjs1Xdhx08bW/i vFaHsnkEimnbyDvyqDhNy9Xdo5P8KOpexobl8/v2lUx6EeIrIb3bx5fxYfpl1TSOSfGc+kvF JoRfXDs98Pe79qu8NuyFWTvMqh4pZRs8n2X+t1wxQjt3+WG/4J9nDjtptymxFGckGmoxFxUn AgDcl/veKAIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Introduce function returning endpoint of given index in active altsetting of specified interface. It's intended to be used in set_alt() callback to obtain endpoints of currently selected altsetting. Signed-off-by: Robert Baldyga --- drivers/usb/gadget/composite.c | 33 +++++++++++++++++++++++++++++++++ include/linux/usb/composite.h | 2 ++ 2 files changed, 35 insertions(+) diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index a4b5346..452294e 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -670,6 +670,39 @@ static int usb_interface_id_to_index(struct usb_function *f, u8 id) } /** + * usb_function_get_ep - obtains endpoint of given index from active + * altsetting of given interface + * @f: USB function + * @i: index of interface in given function + * @e: index of endpoint in active altsetting of given interface + * + * This function is designed to be used in set_alt() callback, when + * new altsetting is selected. It allows to obtain endpoints assigned + * to altsetting during autoconfig process. + * + * Returns pointer to endpoint on success or NULL on failure. + */ +struct usb_ep *usb_function_get_ep(struct usb_function *f, int i, int e) +{ + struct usb_composite_altset *altset; + int selected_altset; + + if (!f->descs) + return NULL; + if (i >= f->descs->intfs_num) + return NULL; + + selected_altset = f->descs->intfs[i]->cur_altset; + altset = f->descs->intfs[i]->altsets[selected_altset]; + + if (e >= altset->eps_num) + return NULL; + + return altset->eps[e]->ep; +} +EXPORT_SYMBOL_GPL(usb_function_get_ep); + +/** * usb_interface_id() - allocate an unused interface ID * @config: configuration associated with the interface * @function: function handling the interface diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h index aa55377..2e646e3 100644 --- a/include/linux/usb/composite.h +++ b/include/linux/usb/composite.h @@ -425,6 +425,8 @@ int usb_ep_add_vendor_desc(struct usb_function *f, int i, int a, int e, const struct usb_descriptor_header *desc); +struct usb_ep *usb_function_get_ep(struct usb_function *f, int intf, int ep); + int usb_interface_id(struct usb_configuration *, struct usb_function *); int config_ep_by_speed(struct usb_gadget *g, struct usb_function *f, -- 1.9.1