LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MLK-20887 usb: gadget: Fix controller index in UMS 

The usb mass storage (f_mass_storage.c) uses fixed usb index 0,
this causes problem while CDNS3 USB controller index is 1.
Modify the API of fsg to pass the controller index.

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Jun Li <jun.li@nxp.com>
This commit is contained in:
Ye Li 2019-01-31 02:20:23 -08:00
parent a726a0c38b
commit d903cd890d
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/usb_mass_storage.c
View File

@ -167,7 +167,7 @@ static int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
goto cleanup_ums_init;
}
rc = fsg_init(ums, ums_count);
rc = fsg_init(ums, ums_count, controller_index);
if (rc) {
pr_err("fsg_init failed");
rc = CMD_RET_FAILURE;

6
drivers/usb/gadget/f_mass_storage.c
View File

@ -447,6 +447,7 @@ static void set_bulk_out_req_length(struct fsg_common *common,
static struct ums *ums;
static int ums_count;
static struct fsg_common *the_fsg_common;
static unsigned int controller_index = 0;
static int fsg_set_halt(struct fsg_dev *fsg, struct usb_ep *ep)
{
@ -691,7 +692,7 @@ static int sleep_thread(struct fsg_common *common)
k = 0;
}
usb_gadget_handle_interrupts(0);
usb_gadget_handle_interrupts(controller_index);
}
common->thread_wakeup_needed = 0;
return rc;
@ -2776,10 +2777,11 @@ int fsg_add(struct usb_configuration *c)
return fsg_bind_config(c->cdev, c, fsg_common);
}
int fsg_init(struct ums *ums_devs, int count)
int fsg_init(struct ums *ums_devs, int count, unsigned int controller_idx)
{
ums = ums_devs;
ums_count = count;
controller_index = controller_idx;
return 0;
}

2
include/usb_mass_storage.h
View File

@ -26,7 +26,7 @@ struct ums {
struct blk_desc block_dev;
};
int fsg_init(struct ums *ums_devs, int count);
int fsg_init(struct ums *ums_devs, int count, unsigned int controller_idx);
void fsg_cleanup(void);
int fsg_main_thread(void *);
int fsg_add(struct usb_configuration *c);