diff options
| author | Lukasz Majewski <l.majewski@samsung.com> | 2013-09-17 15:58:23 +0200 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2013-09-24 17:51:36 +0200 |
| commit | a6921adcf200b3f2b6fadd78f99ea99b0f362e9c (patch) | |
| tree | 8a2f8f668d53321c561016e97b46d3a925223720 | |
| parent | 69d6cbe748ae13e6b728d2c28616a8c54b07f9c2 (diff) | |
| download | talos-obmc-uboot-a6921adcf200b3f2b6fadd78f99ea99b0f362e9c.tar.gz talos-obmc-uboot-a6921adcf200b3f2b6fadd78f99ea99b0f362e9c.zip | |
usb:g_dnl:dfu: Download gadget and DFU function code clean up
The download gadget code and DFU function lacks of proper declarations
for the case when a target board wants to use only one of available usb
functions.
Moreover the relevant declarations have been moved to consistent
localization (like <dfu.h>).
Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Cc: Marek Vasut <marex@denx.de>
| -rw-r--r-- | drivers/usb/gadget/f_dfu.h | 3 | ||||
| -rw-r--r-- | drivers/usb/gadget/g_dnl.c | 2 | ||||
| -rw-r--r-- | include/dfu.h | 9 |
3 files changed, 10 insertions, 4 deletions
diff --git a/drivers/usb/gadget/f_dfu.h b/drivers/usb/gadget/f_dfu.h index 34a4dde5aa..cc2c45567b 100644 --- a/drivers/usb/gadget/f_dfu.h +++ b/drivers/usb/gadget/f_dfu.h @@ -82,7 +82,4 @@ struct dfu_function_descriptor { __le16 wTransferSize; __le16 bcdDFUVersion; } __packed; - -/* configuration-specific linkup */ -int dfu_add(struct usb_configuration *c); #endif /* __F_DFU_H_ */ diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c index 29d08a3a22..40868c034e 100644 --- a/drivers/usb/gadget/g_dnl.c +++ b/drivers/usb/gadget/g_dnl.c @@ -15,7 +15,7 @@ #include <g_dnl.h> #include <usb_mass_storage.h> -#include "f_dfu.h" +#include <dfu.h> #include "gadget_chips.h" #include "composite.c" diff --git a/include/dfu.h b/include/dfu.h index 6f4bba455b..b2ecf1bebe 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -14,6 +14,7 @@ #include <common.h> #include <linux/list.h> #include <mmc.h> +#include <linux/usb/composite.h> enum dfu_device_type { DFU_DEV_MMC = 1, @@ -161,4 +162,12 @@ static inline int dfu_fill_entity_ram(struct dfu_entity *dfu, char *s) } #endif +#ifdef CONFIG_DFU_FUNCTION +int dfu_add(struct usb_configuration *c); +#else +int dfu_add(struct usb_configuration *c) +{ + return 0; +} +#endif #endif /* __DFU_ENTITY_H_ */ |
