Signed-off-by: Sean O. Stalley <sean.stalley@xxxxxxxxx> Signed-off-by: Stephanie Wallick <stephanie.s.wallick@xxxxxxxxx> --- MAINTAINERS | 7 +++++++ drivers/staging/Kconfig | 2 ++ drivers/staging/Makefile | 1 + drivers/staging/mausb/Kconfig | 16 ++++++++++++++++ drivers/staging/mausb/Makefile | 2 ++ drivers/staging/mausb/TODO | 5 +++++ drivers/staging/mausb/drivers/Kconfig | 34 ++++++++++++++++++++++++++++++++++ drivers/staging/mausb/drivers/Makefile | 18 ++++++++++++++++++ 8 files changed, 85 insertions(+) create mode 100644 drivers/staging/mausb/Kconfig create mode 100644 drivers/staging/mausb/Makefile create mode 100644 drivers/staging/mausb/TODO create mode 100644 drivers/staging/mausb/drivers/Kconfig create mode 100644 drivers/staging/mausb/drivers/Makefile diff --git a/MAINTAINERS b/MAINTAINERS index c3cfa1b..bd52ec2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8721,6 +8721,13 @@ W: http://www.lirc.org/ S: Odd Fixes F: drivers/staging/media/lirc/ +STAGING - MEDIA AGNOSTIC USB DRIVERS +M: Sean O. Stalley <sean.stalley@xxxxxxxxx> +M: Stephanie Wallick <stephanie.s.wallick@xxxxxxxxx> +L: linux-usb@xxxxxxxxxxxxxxx +S: Maintained +F: drivers/staging/mausb + STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec) M: Julian Andres Klode <jak@xxxxxxxxxxxxx> M: Marc Dietrich <marvin24@xxxxxx> diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 35b494f..f57621b 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -24,6 +24,8 @@ menuconfig STAGING if STAGING +source "drivers/staging/mausb/Kconfig" + source "drivers/staging/et131x/Kconfig" source "drivers/staging/slicoss/Kconfig" diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index e66a5db..7615c85 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -51,3 +51,4 @@ obj-$(CONFIG_GS_FPGABOOT) += gs_fpgaboot/ obj-$(CONFIG_BT_NOKIA_H4P) += nokia_h4p/ obj-$(CONFIG_CRYPTO_SKEIN) += skein/ obj-$(CONFIG_UNISYSSPAR) += unisys/ +obj-$(CONFIG_MAUSB) += mausb/ diff --git a/drivers/staging/mausb/Kconfig b/drivers/staging/mausb/Kconfig new file mode 100644 index 0000000..095c08b --- /dev/null +++ b/drivers/staging/mausb/Kconfig @@ -0,0 +1,16 @@ + +menuconfig MAUSB + bool "MA USB drivers" + depends on USB + ---help--- + This option allows you to select from the various MA USB + drivers. Note that a media-specific driver (e.g. tcp or SNAP) + is needed in addition to the media agnostic host or device driver. + + +if MAUSB + +source "drivers/staging/mausb/drivers/Kconfig" + +endif + diff --git a/drivers/staging/mausb/Makefile b/drivers/staging/mausb/Makefile new file mode 100644 index 0000000..fc09fb5 --- /dev/null +++ b/drivers/staging/mausb/Makefile @@ -0,0 +1,2 @@ +obj-y += drivers/ + diff --git a/drivers/staging/mausb/TODO b/drivers/staging/mausb/TODO new file mode 100644 index 0000000..710ee936 --- /dev/null +++ b/drivers/staging/mausb/TODO @@ -0,0 +1,5 @@ +TODO: + - checkpatch.pl cleanups + - address miscellaneous "TODO" statements in code + - add support for multiple media agnostic (MA) devices + - add/improve support for unimplemented packet types diff --git a/drivers/staging/mausb/drivers/Kconfig b/drivers/staging/mausb/drivers/Kconfig new file mode 100644 index 0000000..9e12e22 --- /dev/null +++ b/drivers/staging/mausb/drivers/Kconfig @@ -0,0 +1,34 @@ +config MA_CORE + tristate "MA USB core" + ---help--- + This builds ma_core module. + +config MAUSB_HOST + tristate "MA USB host" + depends on MA_CORE + ---help--- + This builds MA USB host driver module. + +config MAUSB_DEVICE + tristate "MA USB device" + depends on MA_CORE && USB_GADGET + ---help--- + This builds MA USB device driver module. + +config MATCP_CORE + tristate "MA USB tcp core" + ---help--- + This builds tcp_core module. + +config MATCP_HOST + tristate "MA USB host tcp" + depends on MATCP_CORE + ---help--- + This builds tcp_host module. + +config MATCP_DEVICE + tristate "MA USB device tcp" + depends on MATCP_CORE + ---help--- + This builds tcp_dev module. + diff --git a/drivers/staging/mausb/drivers/Makefile b/drivers/staging/mausb/drivers/Makefile new file mode 100644 index 0000000..47f3222 --- /dev/null +++ b/drivers/staging/mausb/drivers/Makefile @@ -0,0 +1,18 @@ +obj-$(CONFIG_MA_CORE) += ma_core.o +ma_core-y := mausb_pkt.o mausb_tx.o mausb_msapi.o mausb_mem.o mausb_mgmt.o + +obj-$(CONFIG_MAUSB_HOST) += mausb.o +mausb-y := mausb_hcd.o mausb_hub.o mausb_tx-host.o mausb_mem-host.o + +obj-$(CONFIG_MAUSB_DEVICE) += maudc.o +maudc-y := mausb_udc.o mausb_tx-device.o + +obj-$(CONFIG_MATCP_HOST) += matcp_host.o +matcp_host-y := mausb_tcp-host.o + +obj-$(CONFIG_MATCP_DEVICE) += matcp_dev.o +matcp_dev-y := mausb_tcp-device.o + +obj-$(CONFIG_MATCP_CORE) += matcp_core.o +matcp_core-y := mausb_tcp.o mausb_ioctl.o + -- 1.9.1 -- 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
