Skip to contentSkip to conversation

Renaming of the USB HID driver

PATCH Marcel Holtmann 1 participant 1 message Mar 24, 2004

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Hi Linus,

the concept of the HID parser is not really USB related anymore. The Bluetooth people uses it too and actually it is really generic stuff. My plan is to write a generic HID device/parser implementation, so that the USB and Bluetooth subsystems only have to provide a transport layer. To achieve this goal I wanna first rename the current hid.ko kernel module to usbhid.ko for a nicer and transparent transition in the future. Greg and Vojtech agreed on this module name change.

 Documentation/input/ff.txt       |    2 -
 Documentation/input/input.txt    |   70 +++++++++++++++++++--------------------
 Documentation/input/joystick.txt |    4 +-
 drivers/usb/input/Kconfig        |    2 -
 drivers/usb/input/Makefile       |   16 ++++----
 5 files changed, 47 insertions(+), 47 deletions(-)

The attached patch also fixes all references to the hid module in the documentation and removes the .o suffix from every module name.

Please apply before you release the 2.6.5 final.

Regards

Marcel

===== Documentation/input/joystick.txt 1.4 vs edited =====

Documentation/input/joystick.txt +2 -2
@@ -182,7 +182,7 @@
 
   For other joystick types (more/less axes, hats, and buttons) support
 you'll need to specify the types either on the kernel command line or on the
-module command line, when inserting analog.o into the kernel. The
+module command line, when inserting analog into the kernel. The
 parameters are:
 
 	analog.map=<type1>,<type2>,<type3>,....
@@ -503,7 +503,7 @@
 
 3.21 I-Force devices 
 ~~~~~~~~~~~~~~~~~~~~
-  All I-Force devices are supported by the iforce.o module. This includes:
+  All I-Force devices are supported by the iforce module. This includes:
 
 * AVB Mag Turbo Force
 * AVB Top Shot Pegasus

===== Documentation/input/ff.txt 1.4 vs edited =====

Documentation/input/ff.txt +1 -1
@@ -20,7 +20,7 @@
 2. Instructions to the user
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Here are instructions on how to compile and use the driver. In fact, this
-driver is the normal iforce.o, input.o and evdev.o drivers written by Vojtech
+driver is the normal iforce, input and evdev drivers written by Vojtech
 Pavlik, plus additions to support force feedback.
 
 Before you start, let me WARN you that some devices shake violently during the

===== Documentation/input/input.txt 1.5 vs edited =====

Documentation/input/input.txt +35 -35

148 lines not on this page · raw message

===== drivers/usb/input/Kconfig 1.13 vs edited =====

drivers/usb/input/Kconfig +1 -1
@@ -21,7 +21,7 @@
 	  If unsure, say Y.
 
 	  To compile this driver as a module, choose M here: the
-	  module will be called hid.
+	  module will be called usbhid.
 
 comment "Input core support is needed for USB HID input layer or HIDBP support"
 	depends on USB && INPUT=n

===== drivers/usb/input/Makefile 1.17 vs edited =====

drivers/usb/input/Makefile +8 -8
@@ -3,32 +3,32 @@
 #
 
 # Multipart objects.
-hid-objs	:= hid-core.o
+usbhid-objs	:= hid-core.o
 
 # Optional parts of multipart objects.
 
 ifeq ($(CONFIG_USB_HIDDEV),y)
-	hid-objs        += hiddev.o
+	usbhid-objs	+= hiddev.o
 endif
 ifeq ($(CONFIG_USB_HIDINPUT),y)
-	hid-objs        += hid-input.o
+	usbhid-objs	+= hid-input.o
 endif
 ifeq ($(CONFIG_HID_PID),y)
-	hid-objs	+= pid.o
+	usbhid-objs	+= pid.o
 endif
 ifeq ($(CONFIG_LOGITECH_FF),y)
-	hid-objs	+= hid-lgff.o
+	usbhid-objs	+= hid-lgff.o
 endif
 ifeq ($(CONFIG_THRUSTMASTER_FF),y)
-	hid-objs	+= hid-tmff.o
+	usbhid-objs	+= hid-tmff.o
 endif
 ifeq ($(CONFIG_HID_FF),y)
-	hid-objs	+= hid-ff.o
+	usbhid-objs	+= hid-ff.o
 endif
 
 obj-$(CONFIG_USB_AIPTEK)	+= aiptek.o
 obj-$(CONFIG_USB_ATI_REMOTE)	+= ati_remote.o
-obj-$(CONFIG_USB_HID)		+= hid.o
+obj-$(CONFIG_USB_HID)		+= usbhid.o
 obj-$(CONFIG_USB_KBD)		+= usbkbd.o
 obj-$(CONFIG_USB_KBTAB)		+= kbtab.o
 obj-$(CONFIG_USB_MOUSE)		+= usbmouse.o