This Android gadget includes a bunch of .c files. Fixing normal gadgets
is not the real problem but this gadget is not always fixable since the
problem here are fundumential / design.
*I* wanted to get this removed but other people want to keep it even
though there were reports that Android itself is not using it. Some
poeple think that it is better to have this instead of nothing and other
argue that they need sdb and mass storage gadget. The sdb function is
not provided by ccg so I don't see the point of this. I don't see any
logical reasoning behind it and I decided that it is time for retreat.
This patch brings all dependencies of ccg into staging so I can do
whatever I want in drivers/usb/gadget without breaking ccg.
Cc: devel@xxxxxxxxxxxxxxxxxxxx
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
---
drivers/staging/ccg/Makefile | 2 --
drivers/staging/ccg/ccg.c | 26 ++++++++++----------
drivers/{usb/gadget => staging/ccg}/composite.c | 0
.../linux/usb => drivers/staging/ccg}/composite.h | 0
drivers/{usb/gadget => staging/ccg}/config.c | 0
drivers/{usb/gadget => staging/ccg}/epautoconf.c | 0
drivers/{usb/gadget => staging/ccg}/f_acm.c | 0
drivers/{usb/gadget => staging/ccg}/f_fs.c | 0
.../{usb/gadget => staging/ccg}/f_mass_storage.c | 0
drivers/{usb/gadget => staging/ccg}/f_rndis.c | 0
drivers/{usb/gadget => staging/ccg}/gadget_chips.h | 0
drivers/{usb/gadget => staging/ccg}/ndis.h | 0
drivers/{usb/gadget => staging/ccg}/rndis.c | 0
drivers/{usb/gadget => staging/ccg}/rndis.h | 0
.../{usb/gadget => staging/ccg}/storage_common.c | 0
drivers/{usb/gadget => staging/ccg}/u_ether.c | 0
drivers/{usb/gadget => staging/ccg}/u_ether.h | 0
drivers/{usb/gadget => staging/ccg}/u_serial.c | 0
drivers/{usb/gadget => staging/ccg}/u_serial.h | 0
drivers/{usb/gadget => staging/ccg}/usbstring.c | 0
20 files changed, 13 insertions(+), 15 deletions(-)
copy drivers/{usb/gadget => staging/ccg}/composite.c (100%)
copy {include/linux/usb => drivers/staging/ccg}/composite.h (100%)
copy drivers/{usb/gadget => staging/ccg}/config.c (100%)
copy drivers/{usb/gadget => staging/ccg}/epautoconf.c (100%)
copy drivers/{usb/gadget => staging/ccg}/f_acm.c (100%)
copy drivers/{usb/gadget => staging/ccg}/f_fs.c (100%)
copy drivers/{usb/gadget => staging/ccg}/f_mass_storage.c (100%)
copy drivers/{usb/gadget => staging/ccg}/f_rndis.c (100%)
copy drivers/{usb/gadget => staging/ccg}/gadget_chips.h (100%)
copy drivers/{usb/gadget => staging/ccg}/ndis.h (100%)
copy drivers/{usb/gadget => staging/ccg}/rndis.c (100%)
copy drivers/{usb/gadget => staging/ccg}/rndis.h (100%)
copy drivers/{usb/gadget => staging/ccg}/storage_common.c (100%)
copy drivers/{usb/gadget => staging/ccg}/u_ether.c (100%)
copy drivers/{usb/gadget => staging/ccg}/u_ether.h (100%)
copy drivers/{usb/gadget => staging/ccg}/u_serial.c (100%)
copy drivers/{usb/gadget => staging/ccg}/u_serial.h (100%)
copy drivers/{usb/gadget => staging/ccg}/usbstring.c (100%)
diff --git a/drivers/staging/ccg/Makefile b/drivers/staging/ccg/Makefile
index 693da63..814fa9d 100644
--- a/drivers/staging/ccg/Makefile
+++ b/drivers/staging/ccg/Makefile
@@ -1,4 +1,2 @@
g_ccg-y := ccg.o
-ccflags-y += -Idrivers/usb/gadget
-
obj-$(CONFIG_USB_G_CCG) += g_ccg.o
diff --git a/drivers/staging/ccg/ccg.c b/drivers/staging/ccg/ccg.c
index eadda55..80feb95 100644
--- a/drivers/staging/ccg/ccg.c
+++ b/drivers/staging/ccg/ccg.c
@@ -32,7 +32,7 @@
#include <linux/platform_device.h>
#include <linux/usb/ch9.h>
-#include <linux/usb/composite.h>
+#include "composite.h"
#include <linux/usb/gadget.h>
#include "gadget_chips.h"
@@ -44,19 +44,19 @@
* the runtime footprint, and giving us at least some parts of what
* a "gcc --combine ... part1.c part2.c part3.c ... " build would.
*/
-#include "../../usb/gadget/usbstring.c"
-#include "../../usb/gadget/config.c"
-#include "../../usb/gadget/epautoconf.c"
-#include "../../usb/gadget/composite.c"
-
-#include "../../usb/gadget/f_mass_storage.c"
-#include "../../usb/gadget/u_serial.c"
-#include "../../usb/gadget/f_acm.c"
+#include "usbstring.c"
+#include "config.c"
+#include "epautoconf.c"
+#include "composite.c"
+
+#include "f_mass_storage.c"
+#include "u_serial.c"
+#include "f_acm.c"
#define USB_ETH_RNDIS y
-#include "../../usb/gadget/f_rndis.c"
-#include "../../usb/gadget/rndis.c"
-#include "../../usb/gadget/u_ether.c"
-#include "../../usb/gadget/f_fs.c"
+#include "f_rndis.c"
+#include "rndis.c"
+#include "u_ether.c"
+#include "f_fs.c"
MODULE_AUTHOR("Mike Lockwood, Andrzej Pietrasiewicz");
MODULE_DESCRIPTION("Configurable Composite USB Gadget");
diff --git a/drivers/usb/gadget/composite.c b/drivers/staging/ccg/composite.c
similarity index 100%
copy from drivers/usb/gadget/composite.c
copy to drivers/staging/ccg/composite.c
diff --git a/include/linux/usb/composite.h b/drivers/staging/ccg/composite.h
similarity index 100%
copy from include/linux/usb/composite.h
copy to drivers/staging/ccg/composite.h
diff --git a/drivers/usb/gadget/config.c b/drivers/staging/ccg/config.c
similarity index 100%
copy from drivers/usb/gadget/config.c
copy to drivers/staging/ccg/config.c
diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/staging/ccg/epautoconf.c
similarity index 100%
copy from drivers/usb/gadget/epautoconf.c
copy to drivers/staging/ccg/epautoconf.c
diff --git a/drivers/usb/gadget/f_acm.c b/drivers/staging/ccg/f_acm.c
similarity index 100%
copy from drivers/usb/gadget/f_acm.c
copy to drivers/staging/ccg/f_acm.c
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/staging/ccg/f_fs.c
similarity index 100%
copy from drivers/usb/gadget/f_fs.c
copy to drivers/staging/ccg/f_fs.c
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/staging/ccg/f_mass_storage.c
similarity index 100%
copy from drivers/usb/gadget/f_mass_storage.c
copy to drivers/staging/ccg/f_mass_storage.c
diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/staging/ccg/f_rndis.c
similarity index 100%
copy from drivers/usb/gadget/f_rndis.c
copy to drivers/staging/ccg/f_rndis.c
diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/staging/ccg/gadget_chips.h
similarity index 100%
copy from drivers/usb/gadget/gadget_chips.h
copy to drivers/staging/ccg/gadget_chips.h
diff --git a/drivers/usb/gadget/ndis.h b/drivers/staging/ccg/ndis.h
similarity index 100%
copy from drivers/usb/gadget/ndis.h
copy to drivers/staging/ccg/ndis.h
diff --git a/drivers/usb/gadget/rndis.c b/drivers/staging/ccg/rndis.c
similarity index 100%
copy from drivers/usb/gadget/rndis.c
copy to drivers/staging/ccg/rndis.c
diff --git a/drivers/usb/gadget/rndis.h b/drivers/staging/ccg/rndis.h
similarity index 100%
copy from drivers/usb/gadget/rndis.h
copy to drivers/staging/ccg/rndis.h
diff --git a/drivers/usb/gadget/storage_common.c b/drivers/staging/ccg/storage_common.c
similarity index 100%
copy from drivers/usb/gadget/storage_common.c
copy to drivers/staging/ccg/storage_common.c
diff --git a/drivers/usb/gadget/u_ether.c b/drivers/staging/ccg/u_ether.c
similarity index 100%
copy from drivers/usb/gadget/u_ether.c
copy to drivers/staging/ccg/u_ether.c
diff --git a/drivers/usb/gadget/u_ether.h b/drivers/staging/ccg/u_ether.h
similarity index 100%
copy from drivers/usb/gadget/u_ether.h
copy to drivers/staging/ccg/u_ether.h
diff --git a/drivers/usb/gadget/u_serial.c b/drivers/staging/ccg/u_serial.c
similarity index 100%
copy from drivers/usb/gadget/u_serial.c
copy to drivers/staging/ccg/u_serial.c
diff --git a/drivers/usb/gadget/u_serial.h b/drivers/staging/ccg/u_serial.h
similarity index 100%
copy from drivers/usb/gadget/u_serial.h
copy to drivers/staging/ccg/u_serial.h
diff --git a/drivers/usb/gadget/usbstring.c b/drivers/staging/ccg/usbstring.c
similarity index 100%
copy from drivers/usb/gadget/usbstring.c
copy to drivers/staging/ccg/usbstring.c
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
