patch-2.3.10 linux/Documentation/parport.txt

Next file: linux/Documentation/pcwd-watchdog.txt
Previous file: linux/Documentation/oops-tracing.txt
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.9/linux/Documentation/parport.txt linux/Documentation/parport.txt
@@ -28,8 +28,8 @@
 
 to tell the parport code that you want three PC-style ports, one at
 0x3bc with no IRQ, one at 0x378 using IRQ 7, and one at 0x278 with an
-auto-detected IRQ.  Currently, PC-style (parport_pc) and Sun Ultra/AX
-(parport_ax) hardware is supported; more is in the works.
+auto-detected IRQ.  Currently, PC-style (parport_pc), Sun Ultra/AX
+(parport_ax), Amiga, Atari, and MFC3 hardware is supported.
 
 
 KMod
@@ -38,7 +38,7 @@
 If you use kmod, you will find it useful to edit /etc/conf.modules.
 Here is an example of the lines that need to be added:
 
-	alias parport_lowlevel parport_pc
+	post-install parport modprobe -k parport_pc
 	options parport_pc io=0x378,0x278 irq=7,auto
 
 KMod will then automatically load parport_pc (with the options
@@ -49,20 +49,15 @@
 Parport probe [optional]
 -------------
 
-Once the architecture-dependent part of the parport code is loaded
-into the kernel, you can insert the parport_probe module with:
-
-	# insmod parport_probe.o
-
-This will perform an IEEE1284 probe of any attached devices and log a
-message similar to:
+In 2.2 kernels there was a module called parport_probe, which was used
+for collecting IEEE 1284 device ID information.  This has now been
+enhanced and now lives with the IEEE 1284 support.  When a parallel
+port is detected, the devices that are connected to it are analysed,
+and information is logged like this:
 
 	parport0: Printer, BJC-210 (Canon)
 
-(If you are using kmod and have configured parport_probe as a module,
-this will just happen.)
-
-The probe information is available in /proc/parport/?/autoprobe.
+The probe information is available from files in /proc/sys/dev/parport/.
 
 
 Parport linked into the kernel statically
@@ -85,29 +80,74 @@
 ==============
 
 If you have configured the /proc filesystem into your kernel, you will
-see a new directory entry: /proc/parport.  In there will be a
+see a new directory entry: /proc/sys/dev/parport.  In there will be a
 directory entry for each parallel port for which parport is
-configured.  In each of those directories are four files describing
-that parallel port.  For example:
-
-File:				Contents:
-
-/proc/parport/0/devices		A list of the device drivers using
-				that port.  A "+" will appear by the
-				name of the device currently using the
-				port (it might not appear against any).
-
-/proc/parport/0/hardware	Parallel port's base address, IRQ line
-				and DMA channel.
-
-/proc/parport/0/irq		The IRQ that parport is using for that
-				port.  This is in a separate file to
-                                allow you to alter it by writing a new
-				value in (IRQ number or "none").
+configured.  In each of those directories are a collection of files
+describing that parallel port.
 
-/proc/parport/0/autoprobe	Any IEEE-1284 device ID information
-				that has been acquired.
+The /proc/sys/dev/parport directory tree looks like:
 
+parport
+|-- default
+|   |-- spintime
+|   `-- timeslice
+|-- parport0
+|   |-- autoprobe
+|   |-- autoprobe0
+|   |-- autoprobe1
+|   |-- autoprobe2
+|   |-- autoprobe3
+|   |-- devices
+|   |   |-- active
+|   |   `-- lp
+|   |       `-- timeslice
+|   |-- hardware
+|   `-- spintime
+`-- parport1
+    |-- autoprobe
+    |-- autoprobe0
+    |-- autoprobe1
+    |-- autoprobe2
+    |-- autoprobe3
+    |-- devices
+    |   |-- active
+    |   `-- ppa
+    |       `-- timeslice
+    |-- hardware
+    `-- spintime
+
+
+File:		Contents:
+
+devices/active	A list of the device drivers using that port.  A "+"
+		will appear by the name of the device currently using
+		the port (it might not appear against any).  The
+		string "none" means that there are no device drivers
+		using that port.
+
+hardware	Parallel port's base address, IRQ line and DMA channel.
+
+autoprobe	Any IEEE-1284 device ID information that has been
+		acquired from the (non-IEEE 1284.3) device.
+
+autoprobe[0-3]	IEEE 1284 device ID information retrieved from
+		daisy-chain devices that conform to IEEE 1284.3.
+
+spintime	The number of microseconds to busy-loop while waiting
+		for the peripheral to respond.  You might find that
+		adjusting this improves performance, depending on your
+		peripherals.  This is a port-wide setting, i.e. it
+		applies to all devices on a particular port.
+
+timeslice	The number of jiffies (FIXME: this should be in
+		milliseconds or something) that a device driver is
+		allowed to keep a port claimed for.  This is advisory,
+		and driver can ignore it if it must.
+
+default/*	The defaults for spintime and timeslice. When a new
+		port is	registered, it picks up the default spintime.
+		When a new device is registered, it picks up the
+		default timeslice.
 
 Device drivers
 ==============
@@ -135,7 +175,7 @@
 
 Also:
 
- * If you selected the IEEE-1284 autoprobe at compile time, you can say
+ * If you selected the IEEE 1284 support at compile time, you can say
    `lp=auto' on the kernel command line, and lp will create devices
    only for those ports that seem to have printers attached.
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)