diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2021-05-17 16:23:51 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-05-17 16:23:51 +0200 |
commit | dee7a15dfaa640130d0b9bc289e5d55b358a2dbc (patch) | |
tree | 8ea7b1c341b1ea5453d1a3576fb238dc21edaa37 /drivers/usb | |
parent | c5e0e697de769d0e78a00b1cb47fe864fade9974 (diff) | |
parent | 7ef2912d40b52202f563806fbffb9f615d2d2220 (diff) | |
download | barebox-dee7a15dfaa640130d0b9bc289e5d55b358a2dbc.tar.gz barebox-dee7a15dfaa640130d0b9bc289e5d55b358a2dbc.tar.xz |
Merge branch 'for-next/usb-gadget'
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/gadget/Kconfig | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/dfu.c | 3 | ||||
-rw-r--r-- | drivers/usb/gadget/multi.c | 18 |
3 files changed, 15 insertions, 8 deletions
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 7e0c570914..4ed6cbbee1 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -45,7 +45,6 @@ comment "USB Gadget drivers" config USB_GADGET_DFU bool - select FILE_LIST prompt "Device Firmware Update Gadget" config USB_GADGET_SERIAL @@ -56,7 +55,6 @@ config USB_GADGET_SERIAL config USB_GADGET_FASTBOOT bool select BANNER - select FILE_LIST select FASTBOOT_BASE prompt "Android Fastboot USB Gadget" endif diff --git a/drivers/usb/gadget/dfu.c b/drivers/usb/gadget/dfu.c index 1ac63c4642..fd0ec505dc 100644 --- a/drivers/usb/gadget/dfu.c +++ b/drivers/usb/gadget/dfu.c @@ -447,8 +447,7 @@ dfu_bind(struct usb_configuration *c, struct usb_function *f) i = 0; file_list_for_each_entry(dfu_files, fentry) { - pr_err("register alt%d(%s) with device %s\n", - i, fentry->name, fentry->filename); + pr_info("register alt%d(%s) with device %s\n", i, fentry->name, fentry->filename); i++; } diff --git a/drivers/usb/gadget/multi.c b/drivers/usb/gadget/multi.c index 95f5b90c88..144ac0624b 100644 --- a/drivers/usb/gadget/multi.c +++ b/drivers/usb/gadget/multi.c @@ -266,12 +266,22 @@ void usb_multi_unregister(void) gadget_multi_opts = NULL; } +unsigned usb_multi_count_functions(struct f_multi_opts *opts) +{ + unsigned count = 0; + + count += !file_list_empty(opts->fastboot_opts.files) || + opts->fastboot_opts.export_bbu; + count += !file_list_empty(opts->dfu_opts.files); + count += opts->create_acm; + + return count; +} + 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); + file_list_free(opts->fastboot_opts.files); + file_list_free(opts->dfu_opts.files); free(opts); } |