Commit 64e62426 authored by matt mooney's avatar matt mooney Committed by Greg Kroah-Hartman

staging: usbip: edit Kconfig and rename CONFIG options

Change modules usbip_common_mod to usbip-core and usbip to usbip-host;
edit configuration option help text; rename CONFIG options to use a
USBIP prefix and change COMMON to CORE in both the Kconfig and
Makefiles; edit the menu entries; and edit the driver descriptions.
Signed-off-by: default avatarmatt mooney <mfm@muteddisk.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7aaacb43
...@@ -12,7 +12,7 @@ obj-$(CONFIG_VIDEO_CX25821) += cx25821/ ...@@ -12,7 +12,7 @@ obj-$(CONFIG_VIDEO_CX25821) += cx25821/
obj-$(CONFIG_VIDEO_TM6000) += tm6000/ obj-$(CONFIG_VIDEO_TM6000) += tm6000/
obj-$(CONFIG_DVB_CXD2099) += cxd2099/ obj-$(CONFIG_DVB_CXD2099) += cxd2099/
obj-$(CONFIG_LIRC_STAGING) += lirc/ obj-$(CONFIG_LIRC_STAGING) += lirc/
obj-$(CONFIG_USB_IP_COMMON) += usbip/ obj-$(CONFIG_USBIP_CORE) += usbip/
obj-$(CONFIG_W35UND) += winbond/ obj-$(CONFIG_W35UND) += winbond/
obj-$(CONFIG_PRISM2_USB) += wlan-ng/ obj-$(CONFIG_PRISM2_USB) += wlan-ng/
obj-$(CONFIG_ECHO) += echo/ obj-$(CONFIG_ECHO) += echo/
......
config USB_IP_COMMON config USBIP_CORE
tristate "USB IP support (EXPERIMENTAL)" tristate "USB/IP support (EXPERIMENTAL)"
depends on USB && NET && EXPERIMENTAL depends on USB && NET && EXPERIMENTAL
default N default N
---help--- ---help---
This enables pushing USB packets over IP to allow remote This enables pushing USB packets over IP to allow remote
machines access to USB devices directly. For more details, machines direct access to USB devices. It provides the
and links to the userspace utility programs to let this work USB/IP core that is required by both drivers.
properly, see http://usbip.sourceforge.net/.
To compile this driver as a module, choose M here: the For more details, and to get the userspace utility
module will be called usbip_common_mod. programs, please see http://usbip.sourceforge.net/.
To compile this as a module, choose M here: the module will
be called usbip-core.
If unsure, say N. If unsure, say N.
config USB_IP_VHCI_HCD config USBIP_VHCI_HCD
tristate "USB IP client driver" tristate "VHCI hcd"
depends on USB_IP_COMMON depends on USBIP_CORE
default N default N
---help--- ---help---
This enables the USB IP host controller driver which will This enables the USB/IP virtual host controller driver,
run on the client machine. which is run on the remote machine.
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called vhci_hcd. module will be called vhci-hcd.
config USB_IP_HOST config USBIP_HOST
tristate "USB IP host driver" tristate "Host driver"
depends on USB_IP_COMMON depends on USBIP_CORE
default N default N
---help--- ---help---
This enables the USB IP device driver which will run on the This enables the USB/IP host driver, which is run on the
host machine. machine that is sharing the USB devices.
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called usbip. module will be called usbip-host.
config USB_IP_DEBUG config USBIP_DEBUG
bool "USB/IP debug messages" bool "Debug messages for USB/IP"
depends on USB_IP_COMMON depends on USBIP_CORE
default N default N
---help--- ---help---
This enables the debug messages from the USB-IP drivers. This enables the debug messages from the USB/IP drivers.
ccflags-$(CONFIG_USB_IP_DEBUG) := -DDEBUG ccflags-$(CONFIG_USBIP_DEBUG) := -DDEBUG
obj-$(CONFIG_USB_IP_COMMON) += usbip_common_mod.o obj-$(CONFIG_USBIP_CORE) += usbip-core.o
usbip_common_mod-y := usbip_common.o usbip_event.o usbip-core-y := usbip_common.o usbip_event.o
obj-$(CONFIG_USB_IP_VHCI_HCD) += vhci-hcd.o obj-$(CONFIG_USBIP_VHCI_HCD) += vhci-hcd.o
vhci-hcd-y := vhci_sysfs.o vhci_tx.o vhci_rx.o vhci_hcd.o vhci-hcd-y := vhci_sysfs.o vhci_tx.o vhci_rx.o vhci_hcd.o
obj-$(CONFIG_USB_IP_HOST) += usbip.o obj-$(CONFIG_USBIP_HOST) += usbip-host.o
usbip-y := stub_dev.o stub_main.o stub_rx.o stub_tx.o usbip-host-y := stub_dev.o stub_main.o stub_rx.o stub_tx.o
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "stub.h" #include "stub.h"
#define DRIVER_AUTHOR "Takahiro Hirofuchi" #define DRIVER_AUTHOR "Takahiro Hirofuchi"
#define DRIVER_DESC "Stub Driver for USB/IP" #define DRIVER_DESC "USB/IP Host Driver"
/* stub_priv is allocated from stub_priv_cache */ /* stub_priv is allocated from stub_priv_cache */
struct kmem_cache *stub_priv_cache; struct kmem_cache *stub_priv_cache;
......
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
#include "usbip_common.h" #include "usbip_common.h"
#define DRIVER_AUTHOR "Takahiro Hirofuchi <hirofuchi@users.sourceforge.net>" #define DRIVER_AUTHOR "Takahiro Hirofuchi <hirofuchi@users.sourceforge.net>"
#define DRIVER_DESC "USB/IP Common Driver" #define DRIVER_DESC "USB/IP Core"
#ifdef CONFIG_USB_IP_DEBUG #ifdef CONFIG_USBIP_DEBUG
unsigned long usbip_debug_flag = 0xffffffff; unsigned long usbip_debug_flag = 0xffffffff;
#else #else
unsigned long usbip_debug_flag; unsigned long usbip_debug_flag;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "vhci.h" #include "vhci.h"
#define DRIVER_AUTHOR "Takahiro Hirofuchi" #define DRIVER_AUTHOR "Takahiro Hirofuchi"
#define DRIVER_DESC "Virtual Host Controller Interface Driver for USB/IP" #define DRIVER_DESC "USB/IP 'Virtual' Host Controller (VHCI) Driver"
/* /*
* TODO * TODO
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment