2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 12:43:55 +08:00

usb: gadget: libcomposite: move config.c into libcomposite

This patch moves config.c into libcomposite and updates all gadgets.

Acked-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Sebastian Andrzej Siewior 2012-09-06 20:11:10 +02:00 committed by Felipe Balbi
parent a84d9e5361
commit 0ba16dea72
19 changed files with 5 additions and 20 deletions

View File

@ -5,7 +5,7 @@ ccflags-$(CONFIG_USB_GADGET_DEBUG) := -DDEBUG
obj-$(CONFIG_USB_GADGET) += udc-core.o
obj-$(CONFIG_USB_LIBCOMPOSITE) += libcomposite.o
libcomposite-y := usbstring.o
libcomposite-y := usbstring.o config.o
obj-$(CONFIG_USB_DUMMY_HCD) += dummy_hcd.o
obj-$(CONFIG_USB_NET2272) += net2272.o
obj-$(CONFIG_USB_NET2280) += net2280.o

View File

@ -42,7 +42,6 @@
*/
#include "composite.c"
#include "config.c"
#include "epautoconf.c"
#include "u_serial.c"
#include "f_acm.c"

View File

@ -27,7 +27,6 @@
* a "gcc --combine ... part1.c part2.c part3.c ... " build would.
*/
#include "composite.c"
#include "config.c"
#include "epautoconf.c"
/* string IDs are assigned dynamically */

View File

@ -44,7 +44,6 @@
*/
#include "composite.c"
#include "config.c"
#include "epautoconf.c"
#include "u_serial.c"
#include "f_acm.c"

View File

@ -12,6 +12,7 @@
#include <linux/errno.h>
#include <linux/slab.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/list.h>
#include <linux/string.h>
#include <linux/device.h>
@ -53,7 +54,7 @@ usb_descriptor_fillbuf(void *buf, unsigned buflen,
}
return dest - (u8 *)buf;
}
EXPORT_SYMBOL_GPL(usb_descriptor_fillbuf);
/**
* usb_gadget_config_buf - builts a complete configuration descriptor
@ -106,6 +107,7 @@ int usb_gadget_config_buf(
cp->bmAttributes |= USB_CONFIG_ATT_ONE;
return len;
}
EXPORT_SYMBOL_GPL(usb_gadget_config_buf);
/**
* usb_copy_descriptors - copy a vector of USB descriptors
@ -155,4 +157,4 @@ usb_copy_descriptors(struct usb_descriptor_header **src)
return ret;
}
EXPORT_SYMBOL_GPL(usb_copy_descriptors);

View File

@ -103,7 +103,6 @@ static inline bool has_rndis(void)
* a "gcc --combine ... part1.c part2.c part3.c ... " build would.
*/
#include "composite.c"
#include "config.c"
#include "epautoconf.c"
#include "f_ecm.c"

View File

@ -265,7 +265,6 @@
* the runtime footprint, and giving us at least some parts of what
* a "gcc --combine ... part1.c part2.c part3.c ... " build would.
*/
#include "config.c"
#include "epautoconf.c"
/*-------------------------------------------------------------------------*/

View File

@ -24,7 +24,6 @@
*/
#include "composite.c"
#include "config.c"
#include "epautoconf.c"
#if defined CONFIG_USB_FUNCTIONFS_ETH || defined CONFIG_USB_FUNCTIONFS_RNDIS

View File

@ -38,7 +38,6 @@
#include "gadget_chips.h"
#include "composite.c"
#include "config.c"
#include "epautoconf.c"
#include "f_midi.c"

View File

@ -35,7 +35,6 @@
*/
#include "composite.c"
#include "config.c"
#include "epautoconf.c"
#include "f_hid.c"

View File

@ -49,7 +49,6 @@
*/
#include "composite.c"
#include "config.c"
#include "epautoconf.c"
#include "f_mass_storage.c"

View File

@ -44,7 +44,6 @@ MODULE_LICENSE("GPL");
*/
#include "composite.c"
#include "config.c"
#include "epautoconf.c"
#include "f_mass_storage.c"

View File

@ -37,7 +37,6 @@
* a "gcc --combine ... part1.c part2.c part3.c ... " build would.
*/
#include "composite.c"
#include "config.c"
#include "epautoconf.c"
#include "f_ncm.c"

View File

@ -39,7 +39,6 @@
* a "gcc --combine ... part1.c part2.c part3.c ... " build would.
*/
#include "composite.c"
#include "config.c"
#include "epautoconf.c"
#include "u_serial.c"

View File

@ -52,7 +52,6 @@
* a "gcc --combine ... part1.c part2.c part3.c ... " build would.
*/
#include "composite.c"
#include "config.c"
#include "epautoconf.c"
/*-------------------------------------------------------------------------*/

View File

@ -38,7 +38,6 @@
* a "gcc --combine ... part1.c part2.c part3.c ... " build would.
*/
#include "composite.c"
#include "config.c"
#include "epautoconf.c"
#include "f_acm.c"

View File

@ -26,7 +26,6 @@
#include <asm/unaligned.h>
#include "epautoconf.c"
#include "config.c"
#include "composite.c"
#include "tcm_usb_gadget.h"

View File

@ -24,7 +24,6 @@
* a "gcc --combine ... part1.c part2.c part3.c ... " build would.
*/
#include "composite.c"
#include "config.c"
#include "epautoconf.c"
#include "uvc_queue.c"

View File

@ -59,7 +59,6 @@
* a "gcc --combine ... part1.c part2.c part3.c ... " build would.
*/
#include "composite.c"
#include "config.c"
#include "epautoconf.c"
#include "f_sourcesink.c"