Merge with Linux 2.3.40.

4 files changed, 222 insertions, 99 deletions

diff --git a/Documentation/usb/CREDITS b/Documentation/usb/CREDITS
index 04e67607c..738b55efc 100644
--- a/Documentation/usb/CREDITS
+++ b/Documentation/usb/CREDITS
@@ -4,13 +4,18 @@ The following people have contributed to this code (in alphabetical
 order by last name).  I'm sure this list should be longer, its
 difficult to maintain, add yourself with a patch if desired.
 
+  Georg Acher <acher@informatik.tu-muenchen.de>
   Alan Cox <alan@lxorguk.ukuu.org.uk>
+  Randy Dunlap <randy.dunlap@intel.com>
   Johannes Erdfelt <jerdfelt@sventech.com>
+  Deti Fliegl <deti@fliegl.de>
   ham <ham@unsuave.com>
   Bradley M Keryan <keryan@andrew.cmu.edu>
+  Greg Kroah-Hartman <greg@kroah.com>
   Paul Mackerras <paulus@cs.anu.edu.au>
   David E. Nelson <dnelson@jump.net>
   Vojtech Pavlik <vojtech@suse.cz>
+  Thomas Sailer <sailer@ife.ee.ethz.ch>
   Gregory P. Smith <greg@electricrain.com>
   Linus Torvalds <torvalds@transmeta.com>
   Roman Weissgaerber <weissg@vienna.at>
@@ -101,6 +106,9 @@ THANKS file in Inaky's driver):
         - Thanks to Entrega for providing PCI to USB cards, hubs and
           converter products for development. 
 
+	- Thanks to ConnectTech for providing a WhiteHEAT usb to
+	  serial converter, and the documentation for the device to
+	  allow a driver to be written.
 
         And thanks go to (hey! in no particular order :)
 
@@ -157,4 +165,3 @@ THANKS file in Inaky's driver):
           for convincing me USB Standard hubs are not that standard
           and that's good to allow for vendor specific quirks on the
           standard hub driver.
-
diff --git a/Documentation/usb/dc2xx.txt b/Documentation/usb/dc2xx.txt
index 25b024123..42c840ee5 100644
--- a/Documentation/usb/dc2xx.txt
+++ b/Documentation/usb/dc2xx.txt
@@ -1,4 +1,4 @@
-13 November 1999
+19 January 2000
 david-b@pacbell.net
 
 This is an overview of how to use the "dc2xx" USB driver with certain
@@ -15,14 +15,13 @@ You'll most likely want to hook it up to recent versions of "gPhoto"
 (www.gphoto.org), since version 0.4 and later know how to use it to talk
 to Kodak DC-240 and DC-280 cameras over USB.
 
-In addition the DC-260, DC-265, and DC-290 are currently recognized.
+In addition the DC-220, DC-260, DC-265, and DC-290 are also recognized.
 However, like other cameras using the "Digita OS" (from www.flashpoint.com)
 there is no gPhoto support for this camera.  At this writing the best
 known support for these cameras is a Python script that supports image
 downloading from those cameras.  (See archives of the linux-usb mailing
-list.)  The DC-220 should also work with this driver, given information
-about the USB product IDs.  When it becomes available, the HP PhotoSmart
-C500 should also work ... it's another Digita OS camera with USB support.)
+list.)  When it becomes available, the HP PhotoSmart C500 should also
+work ... it's another Digita OS camera with USB support.
 
 It's likely that other digital still cameras can also use this USB driver,
 even if they're not from Kodak and don't use Digita.  The reason is that
@@ -35,30 +34,33 @@ USB HARDWARE
 
 This has been shown to work on x86 OHCI and UHCI (Intel) chipsets.  OHCI has
 been trouble free; not so with UHCI, which was first seen to be happy with
-2.3.24 kernels, and has not been as fast as OHCI.
+2.3.24 kernels, and has not been as fast as OHCI.  Users on the PowerMac
+platform have had success, although the stock kernel doesn't yet support
+that platform.
 
 Note that in some cases changes in BIOS settings may be needed before
 your USB works.  At least one user has reported a need for SMP-related 
 settings as well.
 
-As yet, no reports have come from Linux users on non-Intel hardware.
-(You could color coordinate your iMac with a DC-240i ... :-)
-
 
 SETUP
 
-Configure in the DC2XX USB driver, and have it in your kernel.  Recently I
-compile it right in, but I've done it as a module in the past.
+Configure in the DC2XX USB driver, and have it in your kernel.  It works
+as a module, or compiled in directly.
 
-Create a device, perhaps like this (both read and write):
+Create at least one device, perhaps like this (both read and write):
 
-    # mknod -m 0666 /dev/kodak c 10 170
+    # mknod -m 0666 /dev/kodak00 c 180 80
+    # mknod -m 0666 /dev/kodak01 c 180 81
+    ...
 
-That "170" is not formally assigned, and this command may change.  If you're
-using a non-Kodak camera, you may prefer another name.
+The driver supports multiple device nodes.  The USB framework supports
+a maximum of sixteen device nodes (up to minor device number 96), though
+by default fewer devices are available.
 
-Don't plug in more than one compatible camera at this time.  One of them
-will be ignored, but I'd not be sure which one!
+When you plug in one camera, it will use the first device node (kodak00
+in the example above).  A second camera will use the second device node,
+and so on.
 
 
 SANITY TESTING
@@ -66,14 +68,11 @@ SANITY TESTING
 First:  if you've got /proc support, make sure that the driver has hooked
 itself up correctly.
 
-    - you should see an entry in /proc/misc for the a Kodak DC-2xx
-      minor device number
-
-    - you should see an entry in /proc/bus/usb/drivers for "dc2xx",
-      if you also enabled USB /proc support.
+    - You should see an entry in /proc/bus/usb/drivers for "dc2xx",
+      if you enabled USB /proc support.
 
 Second:  when you connect your camera to the computer, does it get recognized
-by the driver?
+by the driver?  (Make sure the camera is powered on!)
 
     - if you've got /proc/bus/usb/devices, you should see an entry
       something like this.  The "ProdID" may be different if you didn't
@@ -87,19 +86,16 @@ by the driver?
 	E:  Ad=01(O) Atr=02(Bulk) MxPS=  64 Ivl=  0ms
 	E:  Ad=82(I) Atr=02(Bulk) MxPS=  64 Ivl=  0ms
 
-    - if you don't have /proc support for USB, see if "dmesg" output
-      tells you that you plugged in your camera.
+    - see if "dmesg" output tells you that you plugged in your camera.
 
-	USB new device connect, assigned device number 1
 	Manufacturer: Eastman Kodak Company
 	Product: KODAK DC240 Zoom Digital Camera
-	USB Camera is connected
-	usbcore: dc2xx driver claimed interface c3a68600
-	ohci-control thread sleeping
+	Serial Number: ?
+	dc2xx.c: USB Camera #0 connected
 
 Third:  (optional) can you use gPhoto to talk to the camera?
 
-    - When you configure your camera, tell it to use "/dev/kodak" (or
+    - When you configure your camera, tell it to use "/dev/kodak00" (or
       whatever name you used).  Right now, gPhoto emits a diagnostic
       message (non-GUI) saying that it since it didn't act like a TTY,
       it's assuming it's got a USB connection.
@@ -108,3 +104,10 @@ Third:  (optional) can you use gPhoto to talk to the camera?
       talk to the camera -- and tell you you're using USB.
 
 If you got that far, you should be able to use everything fine.
+
+
+ADDITIONAL INFORMATION
+
+You may find that you need more driver-specific information, which is
+currently accessible through a link from http://www.linux-usb.org/
+along with other Linux USB resources.
diff --git a/Documentation/usb/ov511.txt b/Documentation/usb/ov511.txt
index 14163ae87..3a73afc0d 100644
--- a/Documentation/usb/ov511.txt
+++ b/Documentation/usb/ov511.txt
@@ -2,22 +2,29 @@
 Readme for Linux device driver for the OmniVision OV511 USB to camera bridge IC
 -------------------------------------------------------------------------------
 
+Author: Mark McClelland
+Homepage: http://people.delphi.com/mmcclelland/linux/
+
 INTRODUCTION:
 
-This is a preliminary version of my OV511 Linux device driver. At the moment,
-it does not do much more than detect the chip and initialize it. As trivial
-as this sounds, it represents many hours of my work. Since OmniVision refused
-to release the full specs to me, I had to write code to probe out the register
-read/write commands. Some code is in place to allow a frame to be grabbed, but
-it is nowhere near complete.
+This is a preliminary version of my OV511 Linux device driver. Currently, it can
+grab a frame in color (YUV420) at 640x480 or 320x240 using either vidcat or
+xawtv. Other utilities may work but have not yet been tested.
+
+NOTE: 320x240 does not work reliably for me, and causes complete system crashes.
+      I recommend not using it until a later version, and if you do, run "sync"
+      first.
 
 SUPPORTED CAMERAS:
-____________________________________________
-Manufacturer     | Model        | Custom ID 
------------------+--------------+-----------
-D-Link           | DSB-C300	    | 3
-Creative Labs    | WebCam 3     | 21
---------------------------------------------
+________________________________________________________
+Manufacturer     | Model          | Custom ID | Status
+-----------------+----------------+-----------+---------
+MediaForte       | MV300          | 0         | Untested
+D-Link           | DSB-C300       | 3         | Working
+Creative Labs    | WebCam 3       | 21        | Working
+Lifeview         | RoboCam        | 100       | Untested
+AverMedia        | InterCam Elite | 102       | Working
+--------------------------------------------------------
 
 Any camera using the OV511 and the OV7610 CCD should work with this driver. The
 driver only detects known cameras though, based on their custom id number. If
@@ -31,23 +38,56 @@ WHAT YOU NEED:
 - If you want to help with the development, get the chip's specification docs at
   http://www.ovt.com/omniusbp.html
 
-- A Video4Linux compatible frame grabber program (I recommend vidcat)
+- A Video4Linux compatible frame grabber program (I recommend vidcat and xawtv)
   (see: http://www.exploits.org/v4l/ )
-  
-WHAT NEEDS TO BE DONE:
 
-In short, a lot. 
+HOW TO USE IT:
+
+You must have first compiled USB support, support for your specific USB host
+controller (UHCI or OHCI), and Video4Linux support for your kernel (I recommend
+making them modules.) 
+
+Next, (as root) from your appropriate modules directory (lib/modules/2.3.XX):
+
+	insmod usb/usbcore.o
+	insmod usb/usb-uhci.o  <OR>  insmod usb/ohci-hcd.o
+	insmod misc/videodev.o
+	insmod usb/ov511.o
+
+If it is not already there (it usually is), create the video device:
 
-UPDATE:
-Currently, the control messages are working fine ("vendor commands"; for
-reading and writing the OV511 registers.) The I2C bus commands for reading and
-writing the camera (OV7610) registers are implemented and working, with at least
-one person's camera. The isochronous-in endpoint for video data is finally
-producing data, but since ov511_parse_data() is not implemented you will not see
-a picture yet.
+	mknod /dev/video c 81 0
+	
+Now you are ready to run a video app! Both vidcat and xawtv work well for me
+at 640x480.
+	
+[Using vidcat:]
 
-Support for specific CCD's will have to be implemented as well (such as the
-OV7610.) 
+	vidcat -s 640x480 > test.jpg
+	xview test.jpg
+	
+[Using xawtv:]
+
+You must make some modifications to the source and compile it before you use it.
+(Note: this may not be applicable to versions other than 3.06)
+
+In src/Xawtv.ad, change xawtv.tv.width to 640 and xawtv.tv.height to 480. Next,
+in src/grab-v4l.c, change SYNC_TIMEOUT from 1 to 2. Then, from the main xawtv
+directory:
+
+	make clean
+	./configure
+	make
+	make install
+
+Now you should be able to run xawtv. Right click for the options dialog.
+
+WORKING FEATURES:
+ o Color streaming/capture at 640x480 (reliably) and 320x240 (unreliably)
+ o YUV420 color
+ o Setting/getting of saturation, contrast and brightness (no color yet)
+
+WHAT NEEDS TO BE DONE:
 
 The rest of the work will involve implementing support for all the different
 resolutions, color depths, etc. Also, while support for the OV511's proprietary
@@ -66,5 +106,5 @@ CREDITS:
 
 The code is based in no small part on the CPiA driver by Johannes Erdfelt,
 Randy Dunlap, and others. Big thanks to them for their pioneering work on that
-and the USB stack. Thanks to Bret Wallach for getting camera reg IO and ISOC
-working.
+and the USB stack. Thanks to Bret Wallach for getting camera reg IO , ISOC, and
+image capture working.
diff --git a/Documentation/usb/usb-serial.txt b/Documentation/usb/usb-serial.txt
index 053f18d2e..e046ae2e5 100644
--- a/Documentation/usb/usb-serial.txt
+++ b/Documentation/usb/usb-serial.txt
@@ -1,42 +1,115 @@
-This serial driver currently only works with the Belkin and Peracom USB 
-Serial devices. It should also work for the Etek converter, but I do 
-not know the vendor id and device id of that device (if anyone does, 
-please let me know.)
-
-If your device is not compatible with the above models, you can try
-out the "generic" interface. This interface does not provide any type
-of control messages sent to the device, and does not support any kind
-of device flow control. All that is required of your device is that
-it has at least one bulk in endpoint, or one bulk out endpoint.
-To enable the driver to recognize your device, build the driver as
-a module and load it by the following invocation:
-	insmod usb-serial.o vendor=0x#### product=0x####
-where the #### is replaced with the hex representation of your device's
-vendor id and product id.
-
-The driver can handle enumerating the device, and sending and receiving
-data from the converter. However, since I do not have a spec for the Belkin,
-Peracom, and eTek devices, and the raw dumps from the Win98 driver are 
-confusing, and eTek keeps giving me the run around, no control signals are 
-currently handled, and the data will most likely come through on a baud
-rate that you are not expecting. So if you have these devices, do not 
-expect the correct data to show up at either end. 
-
-The major number that the driver uses is 188 so to use the driver, create
-the following nodes:
-mknod /dev/ttyUSB0 c 188 0
-mknod /dev/ttyUSB1 c 188 1
-mknod /dev/ttyUSB2 c 188 2
-mknod /dev/ttyUSB3 c 188 3
-
-then plug in a device and use your friendly terminal program to see what
-happens.
-
-If anyone has any problems getting the device to enumerate, or data to 
-flow through it, please contact me.
-
-
-
-greg k-h
-greg@kroah.com
+INTRODUCTION
+
+  The USB serial driver currently supports a number of different USB to
+  serial converter products, as well as some devices that use a serial
+  interface from userspace to talk to the device.
+
+  See the individual product section below for specific information about
+  the different devices.
+
+
+CONFIGURATION
+
+  Currently the driver can handle up to 16 different serial interfaces at
+  one time. Once more of the drivers become stable, this number will be
+  increased to the full 256. 
+
+  The major number that the driver uses is 188 so to use the driver,
+  create the following nodes:
+	mknod /dev/ttyUSB0 c 188 0
+	mknod /dev/ttyUSB1 c 188 1
+	mknod /dev/ttyUSB2 c 188 2
+	mknod /dev/ttyUSB3 c 188 3
+	mknod /dev/ttyUSB4 c 188 4
+	mknod /dev/ttyUSB5 c 188 5
+	mknod /dev/ttyUSB6 c 188 6
+	mknod /dev/ttyUSB7 c 188 7
+	mknod /dev/ttyUSB8 c 188 8
+	mknod /dev/ttyUSB9 c 188 9
+	mknod /dev/ttyUSB10 c 188 10
+	mknod /dev/ttyUSB11 c 188 11
+	mknod /dev/ttyUSB12 c 188 12
+	mknod /dev/ttyUSB13 c 188 13
+	mknod /dev/ttyUSB14 c 188 14
+	mknod /dev/ttyUSB15 c 188 15
+	mknod /dev/ttyUSB16 c 188 16
+
+
+SPECIFIC DEVICES SUPPORTED
+
+
+ConnectTech WhiteHEAT 4 port converter
+
+  ConnectTech has been very forthcoming with information about their
+  device, including providing a unit to test with. This driver will end up
+  being fully supported.
+
+Current status:
+  The device's firmware is downloaded on connection, but the use of a
+  special Anchor Chips extension is currently giving me problems.
+  This driver is not fully operational.
+
 
+HandSpring Visor USB docking station
+
+Current status:
+  Only when the Visor tries to connect to the host, does the docking
+  station show up as a valid USB device. When this happens, the device is
+  properly enumerated, assigned a port, and then communication _should_ be
+  possible. The driver cleans up properly when the device is removed, or
+  the connection is canceled on the Visor.
+  
+  I write _should_ because communication does not seem to work properly at
+  this time. I am in contact with the developers at HandSpring and am
+  working at getting this to work properly.
+
+  There is a webpage for this portion of the driver at 
+  http://milosch.net/visor/ and a project set up with mailing lists for
+  it at :
+  http://sourceforge.net/project/?group_id=1404
+
+
+Belkin single port serial converter
+Peracom single port serial converter
+
+Current status:
+  The driver can handle enumerating the device, and sending and receiving
+  data from the converter. However, since I do not have a spec for the
+  Belkin, Peracom, and eTek devices, and the raw dumps from the Win98
+  driver are confusing, and eTek refuses to provide documentation on their
+  protocol, no control signals are currently handled, and the data will
+  most likely come through on a baud rate that you are not expecting. So
+  if you have these devices, do not expect the correct data to show up at 
+  either end. 
+  
+
+Generic Serial driver
+
+  If your device is not one of the above listed devices, compatible with
+  the above models, you can try out the "generic" interface. This
+  interface does not provide any type of control messages sent to the
+  device, and does not support any kind of device flow control. All that
+  is required of your device is that it has at least one bulk in endpoint,
+  or one bulk out endpoint. 
+  
+  To enable the generic driver to recognize your device, build the driver
+  as a module and load it by the following invocation:
+	insmod usb-serial vendor=0x#### product=0x####
+  where the #### is replaced with the hex representation of your device's
+  vendor id and product id.
+
+  This driver has been successfully used to connect to the NetChip USB
+  development board, providing a way to develop USB firmware without
+  having to write a custom driver.
+
+
+CONTACT:
+
+  If anyone has any problems using this driver, with any of the above
+  specified products, please contact me, or join the Linux-USB mailing
+  list (information on joining the mailing list, as well as a link to its
+  searchable archive is at http://www.linux-usb.org/ )
+
+
+Greg Kroah-Hartman
+greg@kroah.com