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

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

drivers/staging/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ obj-$(CONFIG_VIDEO_CX25821) += cx25821/ 
obj-$(CONFIG_VIDEO_TM6000)	+= tm6000/

obj-$(CONFIG_DVB_CXD2099)	+= cxd2099/

obj-$(CONFIG_LIRC_STAGING)	+= lirc/

obj-$(CONFIG_USB_IP_COMMON)	+= usbip/

obj-$(CONFIG_USBIP_CORE)	+= usbip/

obj-$(CONFIG_W35UND)		+= winbond/

obj-$(CONFIG_PRISM2_USB)	+= wlan-ng/

obj-$(CONFIG_ECHO)		+= echo/

drivers/staging/usbip/Kconfig

+27 −25
Original line number Diff line number Diff line 
config USB_IP_COMMON

	tristate "USB IP support (EXPERIMENTAL)"

config USBIP_CORE

	tristate "USB/IP support (EXPERIMENTAL)"

	depends on USB && NET && EXPERIMENTAL

	default N

	---help---

	  This enables pushing USB packets over IP to allow remote

	  machines access to USB devices directly.  For more details,

	  and links to the userspace utility programs to let this work

	  properly, see http://usbip.sourceforge.net/.

	  machines direct access to USB devices. It provides the

	  USB/IP core that is required by both drivers.



	  To compile this driver as a module, choose M here: the

	  module will be called usbip_common_mod.

	  For more details, and to get the userspace utility

	  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.



config USB_IP_VHCI_HCD

	tristate "USB IP client driver"

	depends on USB_IP_COMMON

config USBIP_VHCI_HCD

	tristate "VHCI hcd"

	depends on USBIP_CORE

	default N

	---help---

	 This enables the USB IP host controller driver which will

	 run on the client machine.

	  This enables the USB/IP virtual host controller driver,

	  which is run on the remote machine.



	  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

	tristate "USB IP host driver"

	depends on USB_IP_COMMON

config USBIP_HOST

	tristate "Host driver"

	depends on USBIP_CORE

	default N

	---help---

	 This enables the USB IP device driver which will run on the

	 host machine.

	  This enables the USB/IP host driver, which is run on the

	  machine that is sharing the USB devices.



	  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

	bool "USB/IP debug messages"

	depends on USB_IP_COMMON

config USBIP_DEBUG

	bool "Debug messages for USB/IP"

	depends on USBIP_CORE

	default N

	---help---

	  This enables the debug messages from the USB-IP drivers.
 
	  This enables the debug messages from the USB/IP drivers.

drivers/staging/usbip/Makefile

+6 −6
Original line number Diff line number Diff line 
ccflags-$(CONFIG_USB_IP_DEBUG) := -DDEBUG

ccflags-$(CONFIG_USBIP_DEBUG) := -DDEBUG



obj-$(CONFIG_USB_IP_COMMON) += usbip_common_mod.o

usbip_common_mod-y := usbip_common.o usbip_event.o

obj-$(CONFIG_USBIP_CORE) += usbip-core.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



obj-$(CONFIG_USB_IP_HOST) += usbip.o

usbip-y := stub_dev.o stub_main.o stub_rx.o stub_tx.o
 
obj-$(CONFIG_USBIP_HOST) += usbip-host.o

usbip-host-y := stub_dev.o stub_main.o stub_rx.o stub_tx.o

drivers/staging/usbip/stub_main.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include "stub.h"



#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 */

struct kmem_cache *stub_priv_cache;

drivers/staging/usbip/usbip_common.c

+2 −2
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ 
#include "usbip_common.h"



#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;

#else

unsigned long usbip_debug_flag;

CRA Git | Maintained and supported by SUSTech CRA and CCSE