Merge with Linux 2.3.99-pre7 and various other bits.

5 files changed, 191 insertions, 118 deletions

diff --git a/Documentation/usb/input.txt b/Documentation/usb/input.txt
index ebf9058de..262c595e4 100644
--- a/Documentation/usb/input.txt
+++ b/Documentation/usb/input.txt
@@ -185,24 +185,28 @@ programs could use a more reasonable interface, for example evdev.c
 	crw-r--r--   1 root     root      13,  33 Mar 29 00:41 mouse1
 	crw-r--r--   1 root     root      13,  34 Mar 29 00:41 mouse2
 	crw-r--r--   1 root     root      13,  35 Apr  1 10:50 mouse3
+	...
+	...
+	crw-r--r--   1 root     root      13,  62 Apr  1 10:50 mouse30
+	crw-r--r--   1 root     root      13,  63 Apr  1 10:50 mice
 
-and so on, up to mouse31. Each is assigned to a single mouse or digitizer,
-unless CONFIG_INPUT_MOUSEDEV_MIX is set. In that case all mice and
-digitizers share a single character device, mouse0, and even when none are
-connected, mouse0 is present. This is useful for hotplugging USB mice, so
-that programs can open the device even when no mice are present.
+Each 'mouse' device is assigned to a single mouse or digitizer, except the last
+one - 'mice'. This single character device is shared by all mice and
+digitizers, and even if none are connected, the device is present.  This is
+useful for hotplugging USB mice, so that programs can open the device even when
+no mice are present.
 
   CONFIG_INPUT_MOUSEDEV_SCREEN_[XY] in the kernel configuration are the size
 of your screen (in pixels) in XFree86. This is needed if you want to use
 your digitizer in X, because it's movement is sent to X via a virtual PS/2
-mouse.
+mouse. These values won't be used if you use a mouse only.
 
   Mousedev.c will generate either PS/2, ImPS/2 (microsoft intellimouse) or
 GenPS/2 (genius netmouse/netscroll) protocols, depending on what the program
-wishes. You can set GPM and X to any of these. You'll need ImPS/2 if you
-want to make use of a wheel on a USB mouse and GenPS/2 if you want to use
-extra (up to 5) buttons. I'm not sure how much is GenPS/2 supported in X,
-though.
+reading the data wishes. You can set GPM and X to any of these. You'll need
+ImPS/2 if you want to make use of a wheel on a USB mouse and GenPS/2 if you
+want to use extra (up to 5) buttons. I'm not sure how much is GenPS/2 supported
+in X, though.
 
 3.2.3 joydev.c
 ~~~~~~~~~~~~~~
@@ -216,6 +220,7 @@ though. As soon as any USB joystick is connected, it can be accessed in
 	crw-r--r--   1 root     root      13,   1 Apr  1 10:50 js1
 	crw-r--r--   1 root     root      13,   2 Apr  1 10:50 js2
 	crw-r--r--   1 root     root      13,   3 Apr  1 10:50 js3
+	...
 
 And so on up to js31.
 
@@ -236,6 +241,7 @@ independent.
 	crw-r--r--   1 root     root      13,  65 Apr  1 10:50 event1
 	crw-r--r--   1 root     root      13,  66 Apr  1 10:50 event2
 	crw-r--r--   1 root     root      13,  67 Apr  1 10:50 event3
+	...
 
 3. Contacts
 ~~~~~~~~~~~
diff --git a/Documentation/usb/ov511.txt b/Documentation/usb/ov511.txt
index b4c536ec1..58efa7ccf 100644
--- a/Documentation/usb/ov511.txt
+++ b/Documentation/usb/ov511.txt
@@ -6,8 +6,11 @@ Author: Mark McClelland
 Homepage: http://alpha.dyndns.org/ov511
 
 NEW IN THIS VERSION:
- o Support for OV511+
- o Support for OV7620
+ o Improvements to sensor detection code
+ o Added "i2c_detect_tries" and "aperture" parameters
+ o proc filesystem status support
+ o read() fixed partially
+ o code cleanups and minor fixes
 
 INTRODUCTION:
 
@@ -151,11 +154,13 @@ WORKING FEATURES:
  o Monochrome
  o Setting/getting of saturation, contrast and brightness (no hue yet; only
    works with OV7610, not the OV7620 or OV7620AE)
+ o proc status reporting
 
 EXPERIMENTAL FEATURES:
  o fix_rgb_offset: Sometimes works, but other times causes errors with xawtv and
    corrupted frames.
  o Snapshot mode (only works with some read() based apps; see below for more)
+ o read() support
 
 TODO:
  o Fix the noise / grainy image problem.
@@ -180,6 +185,8 @@ TODO:
  o Get rid of the memory management functions (put them in videodev.c??)
  o Setting of contrast and brightness not working with 7620
  o Driver/camera state save/restore for when USB supports suspend/resume
+ o Multiple cameras reportedly do not work simultaneously
+ o Problems with OHCI
 
 HOW TO CONTACT ME:
 
diff --git a/Documentation/usb/scanner-hp-sane.txt b/Documentation/usb/scanner-hp-sane.txt
index c47491765..25c36b7fe 100644
--- a/Documentation/usb/scanner-hp-sane.txt
+++ b/Documentation/usb/scanner-hp-sane.txt
@@ -1,13 +1,12 @@
 Copyright (C) 1999, 2000 David E. Nelson
 
-Mar. 23, 2000
+April 26, 2000
 
 CHANGES
 
-- Amended for Linux-2.3.40
+- Amended for Linux-2.3.99-pre6-3
 - Updated for multiple scanner support
 
-
 INTRODUCTION
 
 This document will hopefully provide enough info on how to get SANE
@@ -15,9 +14,12 @@ working with a Hewlett Packard USB capable scanner using the USB
 interface.  The majority of HP Scanners support the Scanner Control
 Language (SCL) which is both published by HP and supported by SANE.
 The only HP Scanners that I'm aware of that do not support SCL are the
-4200C and the 3300C.  All other HP scanners with USB interfaces should
-work (4100C, 5200C, 6200C, and 6300C).  Of course as HP releases new
-scanners this information may change.
+4200C ,3300C, and the PhotoSmart S20.  All other HP scanners with USB
+interfaces should work (4100C, 5200C, 6200C, and 6300C) as do models
+that are derived from the models above. ie the 6350C which is a 6300C
+with a transparency adaptor included with the scanner at time of
+purchase.  Of course as HP releases new scanners this information may
+change.
 
 
 REQUIREMENTS
@@ -37,9 +39,9 @@ At the time of this writing, version 0.83 was available.
 
 OK, I'VE INSTALLED SANE. SO WHAT DO I DO NOW?
 
-NOTE: $INSTALL_DIR is the location where SANE is installed.  It may
-be /usr/local, /usr, /opt or somewhere else.  If you don't know, ask
-your system administrator.
+NOTE: $INSTALL_DIR is the location where SANE is installed.  It may be
+/usr/local, /usr, /opt or somewhere else.  If you don't know, ask your
+system administrator.
 
 1) Make sure that you have the libsane-hp.* libraries under the
 $INSTALL_DIR/lib/sane/ directory.  If you don't, then the HP backend
@@ -56,17 +58,18 @@ files: dll.conf, hp.conf.
     option connect-device
 
 NOTE: If you are using multiple scanners, make sure to have the correct
-devince, ie /dev/usbscanner0.  See scanner.txt for more info.
+device, ie /dev/usbscanner0.  See scanner.txt for more info.
 
 3) You should now be able to use SANE (xscanimage or scanimage).
 
 Don't forget to read any relevant man pages regarding the usage of
-SANE.  If you have other entries uncommented in dll.conf, you may have
-to specify the device to (x)scanimage.  Again, `man` is your friend.
-The xscanimage (1) man page has info on how to get 'The Gimp' to work
-with xscanimage.  Note that Gimp support must be compiled into SANE
-for it work.  If you are dealing with a RedHat system, this means that
-you'll also need to install the gimp-devel rpm package.
+SANE.  If you have other entries uncommented in 'dll.conf', you may
+have to specify the device to (x)scanimage.  Again, `man` is your
+friend.  The xscanimage (1) man page has info on how to get 'The Gimp'
+to work with xscanimage.  Note that Gimp support must be compiled into
+SANE for it to work.  If you are dealing with a RedHat system, this
+means that you'll also need to install the gimp-devel rpm package
+prior to compiling SANE.
 
 NOTE: The issues regarding core dumping by (x)scanimage have (or seem
 to be thus far) been resolved with version 0.2+ of the USB scanner
diff --git a/Documentation/usb/scanner.txt b/Documentation/usb/scanner.txt
index a750e191d..e800b37e5 100644
--- a/Documentation/usb/scanner.txt
+++ b/Documentation/usb/scanner.txt
@@ -1,25 +1,26 @@
 Copyright (C) 1999, 2000 David E. Nelson
 
-Mar. 23, 2000
+April 26, 2000
 
 CHANGES
 
-- Amended for linux-2.3.40
+- Amended for linux-2.3.99-pre6-3
 - Appended hp_scan.c to end of this README
 - Removed most references to HP
 - Updated uhci/ohci host controller info
 - Updated support for multiple scanner support
 - Updated supported scanners list
-
+- Updated usbdevfs info
+- Spellcheck
 
 OVERVIEW
 
-This README will address issues regarding how to configure the kernel
+This README addresses issues regarding how to configure the kernel
 to access a USB scanner.  Although the driver was originally conceived
 for USB HP scanners, it's general enough so that it can be used with
 other scanners.  Also, one can now pass the USB Vendor and Product
 ID's using module parameters for unknown scanners.  Refer to the
-document scanner_hp_sane.txt for guidance on how to configure SANE to
+document scanner-hp-sane.txt for guidance on how to configure SANE to
 use a USB HP Scanner.
 
 
@@ -41,11 +42,11 @@ more information on accomplishing this.
 A Linux kernel with USB Scanner support enabled.
 
 'lspci' which is only needed to determine the type of USB hardware
-available in your machine.
+available/installed in your machine.
 
 CONFIGURATION
 
-Using `lspci -v`, determine the type of USB hardware available.
+Using `lspci -v`, determine the type of USB hardware available/installed.
 
   If you see something like:
 
@@ -68,7 +69,10 @@ kernel, select 'Support for USB', 'OHCI/UHCI' depending on your
 hardware (determined from the steps above), 'USB Scanner support', and
 'Preliminary USB device filesystem'.  Compile and install the modules
 (you may need to execute `depmod -a` to update the module
-dependencies).  Testing was performed only as modules, YMMV.
+dependencies). If any of the USB sections were compiled into the
+kernel, a reboot is necessary. NOTE: Updating the boot disk with
+'lilo' may also be required. Testing was performed only as modules,
+YMMV.
 
 Beginning with version 0.4 of the driver, up to 16 scanners can be
 connected/used simultaneously.  If you intend to use more than
@@ -82,14 +86,15 @@ one scanner at a time:
 	`mknod /dev/usb/scanner15 180 63`
 
 
-If you forsee using only one scanner:
+If you foresee using only one scanner it is best to:
 	`mknod /dev/usbscanner0 c 180 48`
 	`ln -s /dev/usbscanner0 /dev/usbscanner`
 
 
 Set appropriate permissions for /dev/usbscanner[0-15] (don't forget
 about group and world permissions).  Both read and write permissions
-are required for proper operation.
+are required for proper operation. For example:
+	`chmod 666 /dev/usbscanner0`
 
 Load the appropriate modules (if compiled as modules):
 
@@ -108,12 +113,23 @@ be used to test the scanner device if it's an HP scanner that supports
 SCL (Scanner Control Language).  Known HP scanner that support SCL are
 the 4100, 5200, 6200, the 6300 -- note that the 4200 is *not*
 supported since it does not understand SCL; it's also strongly
-suspected that the 3300 is not SCL compliant.  Hp_scan.c's purpose is
-to test the driver without having to retrieve/configure SANE.
-Hp_scan.c will scan the entire bed and put the output into a file
-called 'out.dat' in the current directory.  The data in the file is
-raw data so it's not very useful for imaging.
-
+suspected that the 3300 and the PhotoSmart S20 are not SCL compliant.
+Hp_scan.c's purpose is to test the driver without having to
+retrieve/configure SANE.  Hp_scan.c will scan the entire bed and put
+the output into a file called 'out.dat' in the current directory.  The
+data in the file is raw data so it's not very useful for imaging.
+
+MESSAGES
+
+On occassion the message 'usb_control/bulk_msg: timeout' or something
+similar will appear in '/var/adm/messages' or on the console or both,
+depending on how your system is configured.  This is a side effect
+that scanners are sometimes very slow at warming up and/or
+initialiazing.  In most cases, however, only several of these messages
+should appear and is generally considered to be normal.  If you see
+a message of the type 'excessive NAK's received' then this should
+be considered abnormal and generally indicates that the USB system is
+unable to communicate with the scanner for some particular reason.
 
 SUPPORTED SCANNERS
 
@@ -125,72 +141,97 @@ support the listed USB products.
 At the time of this writing, the following scanners were supported by
 scanner.c:
 
-  Acer
-
-    Prisa AcerScan 620U
-
-  Agfa
-
-    SnapScan 1212U, SnapScan Touch
-
-  Genius
-
-    ColorPage Vivid Pro
-
-  Hewlett Packard
-
-    3300, 4100, 4200, 5200, 6200, 6300, PhotoSmart S20
-
-  Microtek
-
-    ScanMaker X6-X6U, Phantom 336CX - C3, Phantom C6, ScanMaker V6USL,
-    ScanMaker V6UL - SpicyU
-
-  Mustek
+ Acer
+	 Prisa Acerscan 620U & 640U (!)
+	 Prisa AcerScan 620U (!)
+ Agfa
+	 SnapScan 1212U
+	 Another SnapScan 1212U (?)
+	 SnapScan Touch
+ Colorado -- See Primax/Colorado below
+ Epson -- See Seiko/Epson below
+ Genius
+         ColorPage-Vivid Pro
+ Hewlett Packard
+	 3300C
+	 4100C
+	 4200C
+	 PhotoSmart S20
+	 5200C
+	 6200C
+	 6300C
+ Microtek
+	 ScanMaker X6 - X6U
+	 Phantom 336CX - C3
+	 Phantom 336CX - C3 #2
+	 Phantom C6
+	 ScanMaker V6USL
+	 ScanMaker V6USL #2
+	 ScanMaker V6UL - SpicyU
+ Mustek
+	 1200 CU
+ Primax/Colorado
+	 G2-300 #1
+	 G2-600 #1
+	 G2E-300 #1
+	 ReadyScan 636i
+	 G2-300 #2
+	 G2-600 #2
+	 G2E-300 #2
+	 G2E-600
+	 Colorado USB 9600
+	 Colorado USB 19200
+	 Colorado 600u
+	 Colorado 1200u
+ Seiko/Epson Corp.
+	 Perfection 636U and 636Photo
+	 Perfection 610
+	 Perfection 1200U and 1200Photo
+ Umax
+	 Astra 1220U
+	 Astra 1236U
+	 Astra 2000U
+	 Astra 2200U
+ Visioneer
+	 OneTouch 5300
+	 OneTouch 7600 duplicate ID (!)
+	 6100
 
-    1200 CU
 
-  Primax/Colorado
-
-    G2-300, G2-600, G2E-300, G2E-600, ReadyScan 636i, Colorado USB
-    19200, Colorado 600u, Colorado 1200u
-
-  Seiko/Epson
-
-    Perfection Perfection 610, Perfection 636U/636Photo, Perfection
-    1200U/1200Photo
-
-  Umax
+MODULE PARAMETERS
 
-    Astra 1220U, 1236U, 2000U
+If you have a device that you wish to experiment with or try using
+this driver with, but the Vendor and Product ID's are not coded in,
+don't despair.  If the driver was compiled as a module, you can pass
+options to the driver.  Simply add 
 
-  Visioneer
+  options scanner vendor=0x#### product=0x****
 
-    OneTouch 5300, OneTouch 7600, 6100,
+to the /etc/modules.conf file replacing the #'s and the *'s with the
+correct ID's.  The ID's can be retrieved from the messages file or
+using `cat /proc/bus/usb/devices`. Note that USB /proc support must be
+enabled during kernel configuration.  If the 'scanner' module is
+already loaded into memory, it must be reloaded for the module
+parameters to take effect.  In essence, `rmmod scanner; modprobe
+scanner` must be performed.
 
+**NOTE**: In later kernels (2.3.38+), a new filesystem was introduced,
+usbdevfs.  To mount the filesystem, issue the command (as root):
 
-  User Specified.  See MODULE PARAMETERS for details.
+  mount -t usbdevfs /proc/bus/usb /proc/bus/usb
 
+An alternative and more permanent method would be to add
 
-MODULE PARAMETERS
+  none  /proc/bus/usb  usbdevfs  defaults  0  0
 
-If you have a device that you wish to experiment with or try using
-this driver with, but the Vendor and Product ID's are not coded in,
-don't despair.  If the driver was compiled as a module, you can pass
-options to the driver.  Simply add 'options scanner vendor=0x####
-product=0x****' to the conf.modules/modules.conf file replacing the
-#'s and the *'s with the correct ID's.  The ID's can be retrieved from
-the messages file or using `cat /proc/bus/usb/devices` if USB /proc
-support was selected during kernel configuration.  **NOTE**:In later
-kernels (2.3.38+), a new filesystem was introduced, usbdevfs.  To
-mount the filesystem, issue the command `mount -t usbdevfs
-/proc/bus/usb /proc/bus/usb`.  You can then issue ` cat
-/proc/bus/usb/devices` to extract USB device information.
+to /etc/fstab.  This will mount usbdevfs at each reboot.  You can then
+issue `cat /proc/bus/usb/devices` to extract USB device information.
 
 
 BUGS
 
-If you encounter any problems feel free to drop me an email.
+Just look at the list of fixes in the source files.  So, if you
+encounter any problems feel free to drop me an email.
 
 David /\/elson
 dnelson@jump.net
diff --git a/Documentation/usb/usb-serial.txt b/Documentation/usb/usb-serial.txt
index 1ea46bbaa..193ab6ddc 100644
--- a/Documentation/usb/usb-serial.txt
+++ b/Documentation/usb/usb-serial.txt
@@ -10,30 +10,30 @@ INTRODUCTION
 
 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. 
+  Currently the driver can handle up to 256 different serial interfaces at
+  one time. 
 
-  The major number that the driver uses is 188 so to use the driver,
-  create the following nodes:
+  If you are not using devfs:
+    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
-
+		.
+		.
+		.
+	mknod /dev/ttyUSB254 c 188 254
+	mknod /dev/ttyUSB255 c 188 255
+
+  If you are using devfs:
+    The devices supported by this driver will show up as
+    /dev/usb/tts/{0,1,...}
+
+  When the device is connected and recognized by the driver, the driver
+  will print to the system log, which node(s) the device has been bound
+  to.
+  
 
 SPECIFIC DEVICES SUPPORTED
 
@@ -45,8 +45,9 @@ ConnectTech WhiteHEAT 4 port converter
   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.
+  The device's firmware is downloaded on connection, the new firmware 
+  runs properly and all four ports are successfuly recognized and connected.
+  Now data flow needs to be implemented properly.
   This driver is not fully operational.
 
 
@@ -61,7 +62,9 @@ Current status:
   
   When the device is connected, try talking to it on the second port
   (this is usually /dev/ttyUSB1 if you do not have any other usb-serial
-  devices in the system.)
+  devices in the system.) The system log should tell you which port is
+  the port to use for the HotSync transfer. The "Generic" port can be used
+  for other device communication, such as a PPP link.
 
   There is a webpage and mailing lists for this portion of the driver at: 
   http://usbvisor.sourceforge.net/
@@ -91,6 +94,19 @@ Current status:
    O_NONBLOCK, select()
 
 
+FTDI Single Port Serial Driver
+
+  This is a single port DB-25 serial adapter. More information about this
+  device and the Linux driver can be found at:
+	http://reality.sgi.com/bryder_wellington/ftdi_sio/
+
+
+ZyXEL omni.net lcd plus ISDN TA
+
+  This is an ISDN TA. Please report both successes and troubles to the
+  author at omninet@kroah.com
+
+
 Generic Serial driver
 
   If your device is not one of the above listed devices, compatible with