sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'for-next/usb'

This commit is contained in:
Sascha Hauer 2017-03-13 08:16:44 +01:00
parent a2e3bad25f 2b9bcff79a
commit 6b926567c0
3 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
commands/usbgadget.c
View File

@ -31,10 +31,10 @@
static int do_usbgadget(int argc, char *argv[])
{
int opt;
int opt, ret;
int acm = 1, create_serial = 0;
char *fastboot_opts = NULL, *dfu_opts = NULL;
struct f_multi_opts opts = {};
struct f_multi_opts *opts;
while ((opt = getopt(argc, argv, "asdA:D:")) > 0) {
switch (opt) {
@ -73,19 +73,26 @@ static int do_usbgadget(int argc, char *argv[])
return -EINVAL;
}
opts = xzalloc(sizeof(*opts));
opts->release = usb_multi_opts_release;
if (fastboot_opts) {
opts.fastboot_opts.files = file_list_parse(fastboot_opts);
opts->fastboot_opts.files = file_list_parse(fastboot_opts);
}
if (dfu_opts) {
opts.dfu_opts.files = file_list_parse(dfu_opts);
opts->dfu_opts.files = file_list_parse(dfu_opts);
}
if (create_serial) {
opts.create_acm = acm;
opts->create_acm = acm;
}
return usb_multi_register(&opts);
ret = usb_multi_register(opts);
if (ret)
usb_multi_opts_release(opts);
return ret;
}
BAREBOX_CMD_HELP_START(usbgadget)

23
drivers/usb/gadget/multi.c
View File

@ -234,6 +234,11 @@ static struct usb_composite_driver multi_driver = {
int usb_multi_register(struct f_multi_opts *opts)
{
if (gadget_multi_opts) {
pr_err("USB multi gadget already registered\n");
return -EBUSY;
}
gadget_multi_opts = opts;
return usb_composite_probe(&multi_driver);
@ -241,8 +246,22 @@ int usb_multi_register(struct f_multi_opts *opts)
void usb_multi_unregister(void)
{
if (gadget_multi_opts)
usb_composite_unregister(&multi_driver);
if (!gadget_multi_opts)
return;
usb_composite_unregister(&multi_driver);
if (gadget_multi_opts->release)
gadget_multi_opts->release(gadget_multi_opts);
gadget_multi_opts = NULL;
}
void usb_multi_opts_release(struct f_multi_opts *opts)
{
if (opts->fastboot_opts.files)
file_list_free(opts->fastboot_opts.files);
if (opts->dfu_opts.files)
file_list_free(opts->dfu_opts.files);
free(opts);
}

2
include/usb/gadget-multi.h
View File

@ -9,9 +9,11 @@ struct f_multi_opts {
struct f_fastboot_opts fastboot_opts;
struct f_dfu_opts dfu_opts;
int create_acm;
void (*release)(struct f_multi_opts *opts);
};
int usb_multi_register(struct f_multi_opts *opts);
void usb_multi_unregister(void);
void usb_multi_opts_release(struct f_multi_opts *opts);
#endif /* __USB_GADGET_MULTI_H */