# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.583 -> 1.584 # CREDITS 1.42 -> 1.43 # drivers/usb/Config.in 1.22 -> 1.23 # drivers/usb/Config.help 1.7 -> 1.8 # drivers/usb/Makefile 1.17 -> 1.18 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 02/04/03 greg@kroah.com 1.584 # USB # # Updated the CREDITS, Config.help, Config.in, and Makefile to be up to date # with the last round of USB changes. # -------------------------------------------- # diff -Nru a/CREDITS b/CREDITS --- a/CREDITS Wed Apr 3 16:38:57 2002 +++ b/CREDITS Wed Apr 3 16:38:57 2002 @@ -1916,6 +1916,7 @@ N: Petko Manolov E: petkan@users.sourceforge.net D: USB ethernet pegasus/pegasus-II driver +D: USB ethernet rtl8150 driver D: optimizing i[45]86 string routines D: i386 task switching hacks S: 482 Shadowgraph Dr. diff -Nru a/drivers/usb/Config.help b/drivers/usb/Config.help --- a/drivers/usb/Config.help Wed Apr 3 16:38:57 2002 +++ b/drivers/usb/Config.help Wed Apr 3 16:38:57 2002 @@ -94,9 +94,13 @@ CONFIG_USB_HID Say Y here if you want full HID support to connect keyboards, mice, joysticks, graphic tablets, or any other HID based devices - to your computer via USB. You can't use this driver and the - HIDBP (Boot Protocol) keyboard and mouse drivers at the same time. - More information is available: . + to your computer via USB. You also need to select HID Input layer + support (below) if you want to use keyboards, mice, joysticks and + the like. + + You can't use this driver and the HIDBP (Boot Protocol) keyboard + and mouse drivers at the same time. More information is available: + . If unsure, say Y. @@ -105,6 +109,13 @@ The module will be called hid.o. If you want to compile it as a module, say M here and read . +CONFIG_USB_HIDINPUT + Say Y here if you want to use a USB keyboard, mouse or joystick, + or any other HID input device. You also need Input layer support, + (CONFIG_INPUT) which you select under "Input core support". + + If unsure, say Y. + CONFIG_USB_HIDDEV Say Y here if you want to support HID devices (from the USB specification standpoint) that aren't strictly user interface @@ -114,31 +125,35 @@ event interface on /dev/usb/hiddevX (char 180:96 to 180:111). This driver requires CONFIG_USB_HID. - If unsure, say N. + If unsure, say Y. CONFIG_USB_KBD - Say Y here if you don't want to use the generic HID driver for your - USB keyboard and prefer to use the keyboard in its limited Boot - Protocol mode instead. This driver is much smaller than the HID one. + Say Y here only if you are absolutely sure that you don't want + to use the generic HID driver for your USB keyboard and prefer + to use the keyboard in its limited Boot Protocol mode instead. + + This is almost certainly not what you want. This code is also available as a module ( = code which can be inserted in and removed from the running kernel whenever you want). The module will be called usbkbd.o. If you want to compile it as a module, say M here and read . - If unsure, say N. + If even remotely unsure, say N. CONFIG_USB_MOUSE - Say Y here if you don't want to use the generic HID driver for your - USB mouse and prefer to use the mouse in its limited Boot Protocol - mode instead. This driver is much smaller than the HID one. + Say Y here only if you are absolutely sure that you don't want + to use the generic HID driver for your USB keyboard and prefer + to use the keyboard in its limited Boot Protocol mode instead. + + This is almost certainly not what you want. This code is also available as a module ( = code which can be inserted in and removed from the running kernel whenever you want). The module will be called usbmouse.o. If you want to compile it as a module, say M here and read . - If unsure, say N. + If even remotely unsure, say N. CONFIG_USB_WACOM Say Y here if you want to use the USB version of the Wacom Intuos @@ -636,3 +651,21 @@ The module will be called bluetooth.o. If you want to compile it as a module, say M here and read . +CONFIG_USB_TIGL + If you own a Texas Instruments graphing calculator and use a + TI-GRAPH LINK USB cable (aka SilverLink), then you might be + interested in this driver. + + If you enable this driver, you will be able to communicate with + your calculator through a set of device nodes under /dev. + + This code is also available as a module ( = code which can be + inserted in and removed from the running kernel whenever you want). + The module will be called tiglusb.o. If you want to compile it as a + module, say M here and read Documentation/modules.txt. + + If you don't know what the SilverLink cable is or what a Texas + Instruments graphing calculator is, then you probably don't need this + driver. + + If unsure, say N. diff -Nru a/drivers/usb/Config.in b/drivers/usb/Config.in --- a/drivers/usb/Config.in Wed Apr 3 16:38:57 2002 +++ b/drivers/usb/Config.in Wed Apr 3 16:38:57 2002 @@ -49,18 +49,19 @@ dep_tristate ' USB Printer support' CONFIG_USB_PRINTER $CONFIG_USB comment 'USB Human Interface Devices (HID)' + dep_tristate ' USB Human Interface Device (full HID) support' CONFIG_USB_HID $CONFIG_USB if [ "$CONFIG_INPUT" = "n" ]; then - comment ' Input core support is needed for USB HID' - else - dep_tristate ' USB Human Interface Device (full HID) support' CONFIG_USB_HID $CONFIG_USB $CONFIG_INPUT - dep_mbool ' /dev/hiddev raw HID device support (EXPERIMENTAL)' CONFIG_USB_HIDDEV $CONFIG_USB_HID - if [ "$CONFIG_USB_HID" != "y" ]; then - dep_tristate ' USB HIDBP Keyboard (basic) support' CONFIG_USB_KBD $CONFIG_USB $CONFIG_INPUT - dep_tristate ' USB HIDBP Mouse (basic) support' CONFIG_USB_MOUSE $CONFIG_USB $CONFIG_INPUT - fi - dep_tristate ' Wacom Intuos/Graphire tablet support' CONFIG_USB_WACOM $CONFIG_USB $CONFIG_INPUT + comment ' Input core support is needed for USB HID input layer or HIDBP support' fi + dep_mbool ' HID input layer support' CONFIG_USB_HIDINPUT $CONFIG_INPUT $CONFIG_USB_HID + dep_mbool ' /dev/hiddev raw HID device support' CONFIG_USB_HIDDEV $CONFIG_USB_HID + if [ "$CONFIG_USB_HID" != "y" ]; then + dep_tristate ' USB HIDBP Keyboard (basic) support' CONFIG_USB_KBD $CONFIG_USB $CONFIG_INPUT + dep_tristate ' USB HIDBP Mouse (basic) support' CONFIG_USB_MOUSE $CONFIG_USB $CONFIG_INPUT + fi + dep_tristate ' Wacom Intuos/Graphire tablet support' CONFIG_USB_WACOM $CONFIG_USB $CONFIG_INPUT + comment 'USB Imaging devices' dep_tristate ' USB Kodak DC-2xx Camera support' CONFIG_USB_DC2XX $CONFIG_USB dep_tristate ' USB Mustek MDC800 Digital Camera support (EXPERIMENTAL)' CONFIG_USB_MDC800 $CONFIG_USB $CONFIG_EXPERIMENTAL @@ -102,6 +103,7 @@ comment 'USB Miscellaneous drivers' dep_tristate ' USB Diamond Rio500 support (EXPERIMENTAL)' CONFIG_USB_RIO500 $CONFIG_USB $CONFIG_EXPERIMENTAL dep_tristate ' USB Auerswald ISDN support (EXPERIMENTAL)' CONFIG_USB_AUERSWALD $CONFIG_USB $CONFIG_EXPERIMENTAL + dep_tristate ' Texas Instruments Graph Link USB (aka SilverLink) cable support' CONFIG_USB_TIGL $CONFIG_USB fi endmenu diff -Nru a/drivers/usb/Makefile b/drivers/usb/Makefile --- a/drivers/usb/Makefile Wed Apr 3 16:38:57 2002 +++ b/drivers/usb/Makefile Wed Apr 3 16:38:57 2002 @@ -2,8 +2,6 @@ # Makefile for the kernel USB device drivers. # -# Subdirs. - # The target object and module list name. O_TARGET := usbdrv.o @@ -14,9 +12,8 @@ # Multipart objects. -list-multi := usbcore.o hid.o pwc.o usbcore-objs := usb.o usb-debug.o hub.o hcd.o -hid-objs := hid-core.o hid-input.o +hid-objs := hid-core.o pwc-objs := pwc-if.o pwc-misc.o pwc-ctrl.o pwc-uncompress.o @@ -30,6 +27,10 @@ hid-objs += hiddev.o endif +ifeq ($(CONFIG_USB_HIDINPUT),y) + hid-objs += hid-input.o +endif + # Object file lists. obj-y := @@ -87,6 +88,7 @@ obj-$(CONFIG_USB_BLUETOOTH) += bluetooth.o obj-$(CONFIG_USB_USBNET) += usbnet.o obj-$(CONFIG_USB_AUERSWALD) += auerswald.o +obj-$(CONFIG_USB_TIGL) += tiglusb.o # Object files in subdirectories mod-subdirs := serial hcd @@ -105,14 +107,3 @@ endif include $(TOPDIR)/Rules.make - -# Link rules for multi-part drivers. - -usbcore.o: $(usbcore-objs) - $(LD) -r -o $@ $(usbcore-objs) - -hid.o: $(hid-objs) - $(LD) -r -o $@ $(hid-objs) - -pwc.o: $(pwc-objs) - $(LD) -r -o $@ $(pwc-objs)