Browse Source

usb: gadget: Gadget directory cleanup - group usb functions

The drivers/usb/gadget directory contains many files.
Files which are related can be distributed into separate directories.
This patch moves the USB functions implementations into a separate directory.

Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Andrzej Pietrasiewicz 11 years ago
parent
commit
00a2430ff0
48 changed files with 36 additions and 29 deletions
  1. 1 29
      drivers/usb/gadget/Makefile
  2. 34 0
      drivers/usb/gadget/function/Makefile
  3. 0 0
      drivers/usb/gadget/function/f_acm.c
  4. 0 0
      drivers/usb/gadget/function/f_ecm.c
  5. 0 0
      drivers/usb/gadget/function/f_eem.c
  6. 0 0
      drivers/usb/gadget/function/f_fs.c
  7. 0 0
      drivers/usb/gadget/function/f_hid.c
  8. 0 0
      drivers/usb/gadget/function/f_loopback.c
  9. 0 0
      drivers/usb/gadget/function/f_mass_storage.c
  10. 0 0
      drivers/usb/gadget/function/f_mass_storage.h
  11. 0 0
      drivers/usb/gadget/function/f_midi.c
  12. 0 0
      drivers/usb/gadget/function/f_ncm.c
  13. 0 0
      drivers/usb/gadget/function/f_obex.c
  14. 0 0
      drivers/usb/gadget/function/f_phonet.c
  15. 0 0
      drivers/usb/gadget/function/f_rndis.c
  16. 0 0
      drivers/usb/gadget/function/f_serial.c
  17. 0 0
      drivers/usb/gadget/function/f_sourcesink.c
  18. 0 0
      drivers/usb/gadget/function/f_subset.c
  19. 0 0
      drivers/usb/gadget/function/f_uac1.c
  20. 0 0
      drivers/usb/gadget/function/f_uac2.c
  21. 0 0
      drivers/usb/gadget/function/f_uvc.c
  22. 0 0
      drivers/usb/gadget/function/f_uvc.h
  23. 0 0
      drivers/usb/gadget/function/g_zero.h
  24. 0 0
      drivers/usb/gadget/function/ndis.h
  25. 0 0
      drivers/usb/gadget/function/rndis.c
  26. 0 0
      drivers/usb/gadget/function/rndis.h
  27. 0 0
      drivers/usb/gadget/function/storage_common.c
  28. 0 0
      drivers/usb/gadget/function/storage_common.h
  29. 0 0
      drivers/usb/gadget/function/u_ecm.h
  30. 0 0
      drivers/usb/gadget/function/u_eem.h
  31. 0 0
      drivers/usb/gadget/function/u_ether.c
  32. 0 0
      drivers/usb/gadget/function/u_ether.h
  33. 0 0
      drivers/usb/gadget/function/u_ether_configfs.h
  34. 0 0
      drivers/usb/gadget/function/u_fs.h
  35. 0 0
      drivers/usb/gadget/function/u_gether.h
  36. 0 0
      drivers/usb/gadget/function/u_ncm.h
  37. 0 0
      drivers/usb/gadget/function/u_phonet.h
  38. 0 0
      drivers/usb/gadget/function/u_rndis.h
  39. 0 0
      drivers/usb/gadget/function/u_serial.c
  40. 0 0
      drivers/usb/gadget/function/u_serial.h
  41. 0 0
      drivers/usb/gadget/function/u_uac1.c
  42. 0 0
      drivers/usb/gadget/function/u_uac1.h
  43. 0 0
      drivers/usb/gadget/function/uvc.h
  44. 0 0
      drivers/usb/gadget/function/uvc_queue.c
  45. 0 0
      drivers/usb/gadget/function/uvc_queue.h
  46. 0 0
      drivers/usb/gadget/function/uvc_v4l2.c
  47. 0 0
      drivers/usb/gadget/function/uvc_video.c
  48. 1 0
      drivers/usb/gadget/legacy/Makefile

+ 1 - 29
drivers/usb/gadget/Makefile

@@ -9,32 +9,4 @@ obj-$(CONFIG_USB_LIBCOMPOSITE)	+= libcomposite.o
 libcomposite-y			:= usbstring.o config.o epautoconf.o
 libcomposite-y			+= composite.o functions.o configfs.o u_f.o
 
-# USB Functions
-usb_f_acm-y			:= f_acm.o
-obj-$(CONFIG_USB_F_ACM)		+= usb_f_acm.o
-usb_f_ss_lb-y			:= f_loopback.o f_sourcesink.o
-obj-$(CONFIG_USB_F_SS_LB)	+= usb_f_ss_lb.o
-obj-$(CONFIG_USB_U_SERIAL)	+= u_serial.o
-usb_f_serial-y			:= f_serial.o
-obj-$(CONFIG_USB_F_SERIAL)	+= usb_f_serial.o
-usb_f_obex-y			:= f_obex.o
-obj-$(CONFIG_USB_F_OBEX)	+= usb_f_obex.o
-obj-$(CONFIG_USB_U_ETHER)	+= u_ether.o
-usb_f_ncm-y			:= f_ncm.o
-obj-$(CONFIG_USB_F_NCM)		+= usb_f_ncm.o
-usb_f_ecm-y			:= f_ecm.o
-obj-$(CONFIG_USB_F_ECM)		+= usb_f_ecm.o
-usb_f_phonet-y			:= f_phonet.o
-obj-$(CONFIG_USB_F_PHONET)	+= usb_f_phonet.o
-usb_f_eem-y			:= f_eem.o
-obj-$(CONFIG_USB_F_EEM)		+= usb_f_eem.o
-usb_f_ecm_subset-y		:= f_subset.o
-obj-$(CONFIG_USB_F_SUBSET)	+= usb_f_ecm_subset.o
-usb_f_rndis-y			:= f_rndis.o rndis.o
-obj-$(CONFIG_USB_F_RNDIS)	+= usb_f_rndis.o
-usb_f_mass_storage-y		:= f_mass_storage.o storage_common.o
-obj-$(CONFIG_USB_F_MASS_STORAGE)+= usb_f_mass_storage.o
-usb_f_fs-y			:= f_fs.o
-obj-$(CONFIG_USB_F_FS)		+= usb_f_fs.o
-
-obj-$(CONFIG_USB_GADGET)	+= udc/ legacy/
+obj-$(CONFIG_USB_GADGET)	+= udc/ function/ legacy/

+ 34 - 0
drivers/usb/gadget/function/Makefile

@@ -0,0 +1,34 @@
+#
+# USB peripheral controller drivers
+#
+
+ccflags-y			:= -I$(PWD)/drivers/usb/gadget/
+ccflags-y			+= -I$(PWD)/drivers/usb/gadget/udc/
+
+# USB Functions
+usb_f_acm-y			:= f_acm.o
+obj-$(CONFIG_USB_F_ACM)		+= usb_f_acm.o
+usb_f_ss_lb-y			:= f_loopback.o f_sourcesink.o
+obj-$(CONFIG_USB_F_SS_LB)	+= usb_f_ss_lb.o
+obj-$(CONFIG_USB_U_SERIAL)	+= u_serial.o
+usb_f_serial-y			:= f_serial.o
+obj-$(CONFIG_USB_F_SERIAL)	+= usb_f_serial.o
+usb_f_obex-y			:= f_obex.o
+obj-$(CONFIG_USB_F_OBEX)	+= usb_f_obex.o
+obj-$(CONFIG_USB_U_ETHER)	+= u_ether.o
+usb_f_ncm-y			:= f_ncm.o
+obj-$(CONFIG_USB_F_NCM)		+= usb_f_ncm.o
+usb_f_ecm-y			:= f_ecm.o
+obj-$(CONFIG_USB_F_ECM)		+= usb_f_ecm.o
+usb_f_phonet-y			:= f_phonet.o
+obj-$(CONFIG_USB_F_PHONET)	+= usb_f_phonet.o
+usb_f_eem-y			:= f_eem.o
+obj-$(CONFIG_USB_F_EEM)		+= usb_f_eem.o
+usb_f_ecm_subset-y		:= f_subset.o
+obj-$(CONFIG_USB_F_SUBSET)	+= usb_f_ecm_subset.o
+usb_f_rndis-y			:= f_rndis.o rndis.o
+obj-$(CONFIG_USB_F_RNDIS)	+= usb_f_rndis.o
+usb_f_mass_storage-y		:= f_mass_storage.o storage_common.o
+obj-$(CONFIG_USB_F_MASS_STORAGE)+= usb_f_mass_storage.o
+usb_f_fs-y			:= f_fs.o
+obj-$(CONFIG_USB_F_FS)		+= usb_f_fs.o

+ 0 - 0
drivers/usb/gadget/f_acm.c → drivers/usb/gadget/function/f_acm.c


+ 0 - 0
drivers/usb/gadget/f_ecm.c → drivers/usb/gadget/function/f_ecm.c


+ 0 - 0
drivers/usb/gadget/f_eem.c → drivers/usb/gadget/function/f_eem.c


+ 0 - 0
drivers/usb/gadget/f_fs.c → drivers/usb/gadget/function/f_fs.c


+ 0 - 0
drivers/usb/gadget/f_hid.c → drivers/usb/gadget/function/f_hid.c


+ 0 - 0
drivers/usb/gadget/f_loopback.c → drivers/usb/gadget/function/f_loopback.c


+ 0 - 0
drivers/usb/gadget/f_mass_storage.c → drivers/usb/gadget/function/f_mass_storage.c


+ 0 - 0
drivers/usb/gadget/f_mass_storage.h → drivers/usb/gadget/function/f_mass_storage.h


+ 0 - 0
drivers/usb/gadget/f_midi.c → drivers/usb/gadget/function/f_midi.c


+ 0 - 0
drivers/usb/gadget/f_ncm.c → drivers/usb/gadget/function/f_ncm.c


+ 0 - 0
drivers/usb/gadget/f_obex.c → drivers/usb/gadget/function/f_obex.c


+ 0 - 0
drivers/usb/gadget/f_phonet.c → drivers/usb/gadget/function/f_phonet.c


+ 0 - 0
drivers/usb/gadget/f_rndis.c → drivers/usb/gadget/function/f_rndis.c


+ 0 - 0
drivers/usb/gadget/f_serial.c → drivers/usb/gadget/function/f_serial.c


+ 0 - 0
drivers/usb/gadget/f_sourcesink.c → drivers/usb/gadget/function/f_sourcesink.c


+ 0 - 0
drivers/usb/gadget/f_subset.c → drivers/usb/gadget/function/f_subset.c


+ 0 - 0
drivers/usb/gadget/f_uac1.c → drivers/usb/gadget/function/f_uac1.c


+ 0 - 0
drivers/usb/gadget/f_uac2.c → drivers/usb/gadget/function/f_uac2.c


+ 0 - 0
drivers/usb/gadget/f_uvc.c → drivers/usb/gadget/function/f_uvc.c


+ 0 - 0
drivers/usb/gadget/f_uvc.h → drivers/usb/gadget/function/f_uvc.h


+ 0 - 0
drivers/usb/gadget/g_zero.h → drivers/usb/gadget/function/g_zero.h


+ 0 - 0
drivers/usb/gadget/ndis.h → drivers/usb/gadget/function/ndis.h


+ 0 - 0
drivers/usb/gadget/rndis.c → drivers/usb/gadget/function/rndis.c


+ 0 - 0
drivers/usb/gadget/rndis.h → drivers/usb/gadget/function/rndis.h


+ 0 - 0
drivers/usb/gadget/storage_common.c → drivers/usb/gadget/function/storage_common.c


+ 0 - 0
drivers/usb/gadget/storage_common.h → drivers/usb/gadget/function/storage_common.h


+ 0 - 0
drivers/usb/gadget/u_ecm.h → drivers/usb/gadget/function/u_ecm.h


+ 0 - 0
drivers/usb/gadget/u_eem.h → drivers/usb/gadget/function/u_eem.h


+ 0 - 0
drivers/usb/gadget/u_ether.c → drivers/usb/gadget/function/u_ether.c


+ 0 - 0
drivers/usb/gadget/u_ether.h → drivers/usb/gadget/function/u_ether.h


+ 0 - 0
drivers/usb/gadget/u_ether_configfs.h → drivers/usb/gadget/function/u_ether_configfs.h


+ 0 - 0
drivers/usb/gadget/u_fs.h → drivers/usb/gadget/function/u_fs.h


+ 0 - 0
drivers/usb/gadget/u_gether.h → drivers/usb/gadget/function/u_gether.h


+ 0 - 0
drivers/usb/gadget/u_ncm.h → drivers/usb/gadget/function/u_ncm.h


+ 0 - 0
drivers/usb/gadget/u_phonet.h → drivers/usb/gadget/function/u_phonet.h


+ 0 - 0
drivers/usb/gadget/u_rndis.h → drivers/usb/gadget/function/u_rndis.h


+ 0 - 0
drivers/usb/gadget/u_serial.c → drivers/usb/gadget/function/u_serial.c


+ 0 - 0
drivers/usb/gadget/u_serial.h → drivers/usb/gadget/function/u_serial.h


+ 0 - 0
drivers/usb/gadget/u_uac1.c → drivers/usb/gadget/function/u_uac1.c


+ 0 - 0
drivers/usb/gadget/u_uac1.h → drivers/usb/gadget/function/u_uac1.h


+ 0 - 0
drivers/usb/gadget/uvc.h → drivers/usb/gadget/function/uvc.h


+ 0 - 0
drivers/usb/gadget/uvc_queue.c → drivers/usb/gadget/function/uvc_queue.c


+ 0 - 0
drivers/usb/gadget/uvc_queue.h → drivers/usb/gadget/function/uvc_queue.h


+ 0 - 0
drivers/usb/gadget/uvc_v4l2.c → drivers/usb/gadget/function/uvc_v4l2.c


+ 0 - 0
drivers/usb/gadget/uvc_video.c → drivers/usb/gadget/function/uvc_video.c


+ 1 - 0
drivers/usb/gadget/legacy/Makefile

@@ -4,6 +4,7 @@
 
 ccflags-y			:= -I$(PWD)/drivers/usb/gadget/
 ccflags-y			+= -I$(PWD)/drivers/usb/gadget/udc/
+ccflags-y			+= -I$(PWD)/drivers/usb/gadget/function/
 
 g_zero-y			:= zero.o
 g_audio-y			:= audio.o