Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ba16dea authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Felipe Balbi
Browse files

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



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

Acked-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent a84d9e53

drivers/usb/gadget/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/usb/gadget/acm_ms.c

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
 */



#include "composite.c"

#include "config.c"

#include "epautoconf.c"

#include "u_serial.c"

#include "f_acm.c"

drivers/usb/gadget/audio.c

+0 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/usb/gadget/cdc2.c

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ 
 */



#include "composite.c"

#include "config.c"

#include "epautoconf.c"

#include "u_serial.c"

#include "f_acm.c"

drivers/usb/gadget/config.c

+4 −2
Original line number Diff line number Diff line
@@ -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);