mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-26 15:20:49 +07:00
usb: gadget: libcomposite: add epautoconf.c to libcomposite
This patch adds epautoconf.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:
parent
e87bb7118c
commit
dc995fc27c
@ -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 config.o
|
||||
libcomposite-y := usbstring.o config.o epautoconf.o
|
||||
obj-$(CONFIG_USB_DUMMY_HCD) += dummy_hcd.o
|
||||
obj-$(CONFIG_USB_NET2272) += net2272.o
|
||||
obj-$(CONFIG_USB_NET2280) += net2280.o
|
||||
|
@ -42,7 +42,6 @@
|
||||
*/
|
||||
|
||||
#include "composite.c"
|
||||
#include "epautoconf.c"
|
||||
#include "u_serial.c"
|
||||
#include "f_acm.c"
|
||||
#include "f_mass_storage.c"
|
||||
|
@ -14,6 +14,7 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/utsname.h>
|
||||
|
||||
#include "gadget_chips.h"
|
||||
#define DRIVER_DESC "Linux USB Audio Gadget"
|
||||
#define DRIVER_VERSION "Feb 2, 2012"
|
||||
|
||||
@ -27,7 +28,6 @@
|
||||
* a "gcc --combine ... part1.c part2.c part3.c ... " build would.
|
||||
*/
|
||||
#include "composite.c"
|
||||
#include "epautoconf.c"
|
||||
|
||||
/* string IDs are assigned dynamically */
|
||||
|
||||
|
@ -44,7 +44,6 @@
|
||||
*/
|
||||
|
||||
#include "composite.c"
|
||||
#include "epautoconf.c"
|
||||
#include "u_serial.c"
|
||||
#include "f_acm.c"
|
||||
#include "f_ecm.c"
|
||||
|
@ -13,9 +13,6 @@
|
||||
#include <linux/usb/ch9.h>
|
||||
#include <linux/usb/gadget.h>
|
||||
|
||||
/* See comments in "zero.c" */
|
||||
#include "epautoconf.c"
|
||||
|
||||
#ifdef CONFIG_USB_G_DBGP_SERIAL
|
||||
#include "u_serial.c"
|
||||
#endif
|
||||
|
@ -10,6 +10,7 @@
|
||||
*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/device.h>
|
||||
@ -315,6 +316,7 @@ struct usb_ep *usb_ep_autoconfig_ss(
|
||||
ep->comp_desc = NULL;
|
||||
return ep;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(usb_ep_autoconfig_ss);
|
||||
|
||||
/**
|
||||
* usb_ep_autoconfig() - choose an endpoint matching the
|
||||
@ -354,7 +356,7 @@ struct usb_ep *usb_ep_autoconfig(
|
||||
{
|
||||
return usb_ep_autoconfig_ss(gadget, desc, NULL);
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(usb_ep_autoconfig);
|
||||
|
||||
/**
|
||||
* usb_ep_autoconfig_reset - reset endpoint autoconfig state
|
||||
@ -375,4 +377,4 @@ void usb_ep_autoconfig_reset (struct usb_gadget *gadget)
|
||||
gadget->in_epnum = 0;
|
||||
gadget->out_epnum = 0;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(usb_ep_autoconfig_reset);
|
||||
|
@ -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 "epautoconf.c"
|
||||
|
||||
#include "f_ecm.c"
|
||||
#include "f_subset.c"
|
||||
|
@ -256,19 +256,6 @@
|
||||
|
||||
#include "gadget_chips.h"
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Kbuild is not very cooperative with respect to linking separately
|
||||
* compiled library objects into one module. So for now we won't use
|
||||
* separate compilation ... ensuring init/exit sections work to shrink
|
||||
* the runtime footprint, and giving us at least some parts of what
|
||||
* a "gcc --combine ... part1.c part2.c part3.c ... " build would.
|
||||
*/
|
||||
#include "epautoconf.c"
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
#define DRIVER_DESC "File-backed Storage Gadget"
|
||||
#define DRIVER_NAME "g_file_storage"
|
||||
#define DRIVER_VERSION "1 September 2010"
|
||||
|
@ -24,7 +24,6 @@
|
||||
*/
|
||||
|
||||
#include "composite.c"
|
||||
#include "epautoconf.c"
|
||||
|
||||
#if defined CONFIG_USB_FUNCTIONFS_ETH || defined CONFIG_USB_FUNCTIONFS_RNDIS
|
||||
# if defined USB_ETH_RNDIS
|
||||
|
@ -15,6 +15,8 @@
|
||||
#ifndef __GADGET_CHIPS_H
|
||||
#define __GADGET_CHIPS_H
|
||||
|
||||
#include <linux/usb/gadget.h>
|
||||
|
||||
/*
|
||||
* NOTICE: the entries below are alphabetical and should be kept
|
||||
* that way.
|
||||
|
@ -38,7 +38,6 @@
|
||||
#include "gadget_chips.h"
|
||||
|
||||
#include "composite.c"
|
||||
#include "epautoconf.c"
|
||||
#include "f_midi.c"
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
@ -16,6 +16,7 @@
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/list.h>
|
||||
|
||||
#include "gadget_chips.h"
|
||||
#define DRIVER_DESC "HID Gadget"
|
||||
#define DRIVER_VERSION "2010/03/16"
|
||||
|
||||
@ -35,7 +36,6 @@
|
||||
*/
|
||||
|
||||
#include "composite.c"
|
||||
#include "epautoconf.c"
|
||||
|
||||
#include "f_hid.c"
|
||||
|
||||
|
@ -49,7 +49,6 @@
|
||||
*/
|
||||
|
||||
#include "composite.c"
|
||||
#include "epautoconf.c"
|
||||
#include "f_mass_storage.c"
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
@ -44,7 +44,6 @@ MODULE_LICENSE("GPL");
|
||||
*/
|
||||
|
||||
#include "composite.c"
|
||||
#include "epautoconf.c"
|
||||
|
||||
#include "f_mass_storage.c"
|
||||
|
||||
|
@ -37,7 +37,6 @@
|
||||
* a "gcc --combine ... part1.c part2.c part3.c ... " build would.
|
||||
*/
|
||||
#include "composite.c"
|
||||
#include "epautoconf.c"
|
||||
|
||||
#include "f_ncm.c"
|
||||
#include "u_ether.c"
|
||||
|
@ -39,7 +39,6 @@
|
||||
* a "gcc --combine ... part1.c part2.c part3.c ... " build would.
|
||||
*/
|
||||
#include "composite.c"
|
||||
#include "epautoconf.c"
|
||||
|
||||
#include "u_serial.c"
|
||||
#include "f_acm.c"
|
||||
|
@ -52,7 +52,6 @@
|
||||
* a "gcc --combine ... part1.c part2.c part3.c ... " build would.
|
||||
*/
|
||||
#include "composite.c"
|
||||
#include "epautoconf.c"
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
|
@ -38,7 +38,6 @@
|
||||
* a "gcc --combine ... part1.c part2.c part3.c ... " build would.
|
||||
*/
|
||||
#include "composite.c"
|
||||
#include "epautoconf.c"
|
||||
|
||||
#include "f_acm.c"
|
||||
#include "f_obex.c"
|
||||
|
@ -25,7 +25,6 @@
|
||||
#include <target/configfs_macros.h>
|
||||
#include <asm/unaligned.h>
|
||||
|
||||
#include "epautoconf.c"
|
||||
#include "composite.c"
|
||||
|
||||
#include "tcm_usb_gadget.h"
|
||||
|
@ -24,7 +24,6 @@
|
||||
* a "gcc --combine ... part1.c part2.c part3.c ... " build would.
|
||||
*/
|
||||
#include "composite.c"
|
||||
#include "epautoconf.c"
|
||||
|
||||
#include "uvc_queue.c"
|
||||
#include "uvc_video.c"
|
||||
|
@ -59,7 +59,6 @@
|
||||
* a "gcc --combine ... part1.c part2.c part3.c ... " build would.
|
||||
*/
|
||||
#include "composite.c"
|
||||
#include "epautoconf.c"
|
||||
|
||||
#include "f_sourcesink.c"
|
||||
#include "f_loopback.c"
|
||||
|
Loading…
Reference in New Issue
Block a user