From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rajat Srivastava Date: Tue, 31 May 2016 17:02:48 +0530 Subject: [U-Boot] [PATCH 1/3] usb: ums: support multiple controllers using controller_index In-Reply-To: <1464694370-15853-1-git-send-email-rajat.srivastava@nxp.com> References: <1464694370-15853-1-git-send-email-rajat.srivastava@nxp.com> Message-ID: <1464694370-15853-2-git-send-email-rajat.srivastava@nxp.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de From: Rajesh Bhagat Adds a new field in fsg_common namely controller_index to support multiple controllers usb gadget support. Signed-off-by: Rajat Srivastava Signed-off-by: Rajesh Bhagat --- cmd/usb_mass_storage.c | 2 +- drivers/usb/gadget/f_mass_storage.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c index b05913a..1c955f8 100644 --- a/cmd/usb_mass_storage.c +++ b/cmd/usb_mass_storage.c @@ -214,7 +214,7 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag, while (1) { usb_gadget_handle_interrupts(controller_index); - rc = fsg_main_thread(NULL); + rc = fsg_main_thread(&controller_index); if (rc) { /* Check I/O error */ if (rc == -EIO) diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index 1ecb92a..cc3e4af 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c @@ -362,6 +362,7 @@ struct fsg_common { char inquiry_string[8 + 16 + 4 + 1]; struct kref ref; + unsigned int controller_index; }; struct fsg_config { @@ -691,7 +692,7 @@ static int sleep_thread(struct fsg_common *common) k = 0; } - usb_gadget_handle_interrupts(0); + usb_gadget_handle_interrupts(common->controller_index); } common->thread_wakeup_needed = 0; return rc; @@ -2406,6 +2407,11 @@ int fsg_main_thread(void *common_) { int ret; struct fsg_common *common = the_fsg_common; + + /* update the controller_index */ + if (common_) + common->controller_index = *(unsigned int *)common_; + /* The main loop */ do { if (exception_in_progress(common)) { @@ -2476,6 +2482,7 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common, common->ops = NULL; common->private_data = NULL; + common->controller_index = 0; common->gadget = gadget; common->ep0 = gadget->ep0; @@ -2770,6 +2777,7 @@ int fsg_add(struct usb_configuration *c) fsg_common->ops = NULL; fsg_common->private_data = NULL; + fsg_common->controller_index = 0; the_fsg_common = fsg_common; -- 1.9.1