summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/Changes6
-rw-r--r--Documentation/Configure.help412
-rw-r--r--Documentation/SMP.txt2
-rw-r--r--Documentation/cpqarray.txt107
-rw-r--r--Documentation/fb/tgafb.txt51
-rw-r--r--Documentation/java.txt329
-rw-r--r--Documentation/kernel-parameters.txt2
-rw-r--r--Documentation/networking/arcnet-hardware.txt54
-rw-r--r--Documentation/networking/arcnet.txt37
-rw-r--r--Documentation/networking/baycom.txt6
-rw-r--r--Documentation/networking/cs89x0.txt18
-rw-r--r--Documentation/networking/olympic.txt75
-rw-r--r--Documentation/networking/policy-routing.txt2
-rw-r--r--Documentation/networking/z8530drv.txt2
-rw-r--r--Documentation/oops-tracing.txt20
-rw-r--r--Documentation/parport.txt114
-rw-r--r--Documentation/pcwd-watchdog.txt9
-rw-r--r--Documentation/sound/Introduction161
-rw-r--r--Documentation/sound/OPL3-SA215
-rw-r--r--Documentation/sysctl/README2
-rw-r--r--Documentation/sysctl/fs.txt2
-rw-r--r--Documentation/sysctl/kernel.txt21
-rw-r--r--Documentation/sysctl/sunrpc.txt2
-rw-r--r--Documentation/sysctl/vm.txt2
-rw-r--r--Documentation/video4linux/API.html28
-rw-r--r--Documentation/video4linux/README.buz212
-rw-r--r--Documentation/video4linux/bttv/PROBLEMS12
-rw-r--r--Documentation/video4linux/bttv/README.RADIO2
-rw-r--r--Documentation/video4linux/bttv/THANKS2
29 files changed, 1456 insertions, 251 deletions
diff --git a/Documentation/Changes b/Documentation/Changes
index 633479eb9..ce50723e9 100644
--- a/Documentation/Changes
+++ b/Documentation/Changes
@@ -191,12 +191,6 @@ Either use binutils-2.8.1.0.23 or binutils-2.9.1.0.7 or later. Glibc2
users should especially try to use the 2.9.1.0.x releases, as they
resolve known issues with glibc2 and binutils-2.8.x releases.
- libbfd, libiberty, and /usr/include/bfd.h, which are part of recent
-binutils packages, are also required to compile ksymoops. Depending
-upon your distribution, this may require you to install both binutils
-and binutils-development packages (Debian puts bfd.h in binutils-dev,
-for example).
-
Gnu C
=====
diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index 8bb81c48b..5be8caee1 100644
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -530,7 +530,7 @@ CONFIG_BLK_DEV_IDEPCI
People with SCSI-only systems should say N here; if unsure say Y.
Generic PCI bus-master DMA support
-CONFIG_BLK_DEV_IDEDMA
+CONFIG_BLK_DEV_IDEDMA_PCI
If your PCI system uses IDE drive(s) (as opposed to SCSI, say) and
is capable of bus-master DMA operation (most Pentium PCI systems),
you will want to say Y here to reduce CPU overhead. You can then use
@@ -546,6 +546,26 @@ CONFIG_BLK_DEV_IDEDMA
It is safe to say Y to this question.
+Good-Bad DMA Model-Firmware (EXPERIMENTAL)
+IDEDMA_NEW_DRIVE_LISTINGS
+ This test compares both the model and firmware revision for buggy drives
+ that claim to (U)DMA capable. This is a blanket on/off test with no speed
+ limit options. Straight GNU GCC 2.7.3/2.8.X compilers are known to be safe;
+ whereas, many versions of EGCS have a problem and miscompile.
+
+ If in doubt, say N.
+
+Generic ATA-66 support (DANGEROUS)
+CONFIG_IDEDMA_ULTRA_66
+ This allows for your Generic IDE control to attempt support for
+ using ATA-66 or UDMA-66 transfer modes 3/4. If you are not sure what you
+ are attempting, "DO NOT" even think about this option, unless your
+ mainboard's chipset is verified. Do not complain to anyone if you
+ do not know what you are doing and are just playing around.
+ This option has no known success cases to date.
+
+ Say N, or beware.........
+
Winbond SL82c105 support
CONFIG_BLK_DEV_SL82C105
If you have a Winbond SL82c105 IDE controller, say Y here to enable
@@ -562,13 +582,16 @@ CONFIG_BLK_DEV_OFFBOARD
improve the usability of some boot managers such as LILO when
booting from a drive on an off-board controller.
+ Requires that all onboard ide controllers be disabled or calling
+ "pci=reverse" to invert the device scan order.
+
Note that, if you say Y here, the order of the hd* devices will be
rearranged which may require modification of fstab and other files.
If in doubt, say N.
Use DMA by default when available
-CONFIG_IDEDMA_AUTO
+CONFIG_IDEDMA_PCI_AUTO
Prior to kernel version 2.1.112, Linux used to automatically use
DMA for IDE drives and chipsets which support it. Due to concerns
about a couple of cases where buggy hardware may have caused damage,
@@ -664,7 +687,7 @@ CONFIG_BLK_DEV_CY82C693
This driver adds detection and support for the CY82C693 chipset
used on Digital's PC-Alpha 164SX boards.
- This requires CONFIG_IDEDMA_AUTO to be enabled.
+ This requires CONFIG_IDEDMA_PCI_AUTO to be enabled.
Please read the comments at the top of drivers/block/cy82c693.c
@@ -679,7 +702,7 @@ CONFIG_BLK_DEV_VIA82C586
(while running a "cat") provided you enabled "proc" support and
set DISPLAY_APOLLO_TIMINGS in via82c586.c
- This requires CONFIG_IDEDMA_AUTO to be enabled.
+ This requires CONFIG_IDEDMA_PCI_AUTO to be enabled.
If unsure, say N.
@@ -693,14 +716,15 @@ CONFIG_BLK_DEV_ALI15X3
onboard chipsets. It also tests for Simplex mode and enables
normal dual channel support.
- This requires CONFIG_IDEDMA_AUTO to be enabled.
+ This requires CONFIG_IDEDMA_PCI_AUTO to be enabled.
Please read the comments at the top of drivers/block/alim15x3.c
If unsure, say N.
-PROMISE PDC20246 support (EXPERIMENTAL)
-CONFIG_BLK_DEV_PDC20246
+PROMISE PDC20246/PDC20262 support
+CONFIG_BLK_DEV_PDC202XX
+ Promise Ultra33 or PDC20246.
This driver adds up to 4 more eide devices sharing a single interrupt.
This add-on card is a bootable PCI UDMA controller.
Since multiple cards can be installed and there are BIOS ROM problems
@@ -708,38 +732,49 @@ CONFIG_BLK_DEV_PDC20246
do not match. Should you be unable to make new BIOS chips with a burner,
the driver attempts to dynamic tuning of the chipset at boot-time
for max-speed. Ultra33 BIOS 1.25 or new required for more than one card.
+ This card may require "PDC202XX Special UDMA Feature (EXPERIMENTAL)".
- This requires CONFIG_IDEDMA_AUTO to be enabled.
-
- Please read the comments at the top of drivers/block/pdc202xx.c
-
- If unsure, say N.
-
-PROMISE PDC20262 support (EXPERIMENTAL)
-CONFIG_BLK_DEV_PDC20262
+ Promise Ultra66 or PDC20262.
This driver adds up to 4 more eide devices sharing a single interrupt.
This add-on card is a bootable PCI UDMA ATA-66 controller.
The driver attempts to dynamic tuning of the chipset at boot-time
for max-speed. Note tested limits are UDMA-2.
Ultra66 BIOS 1.11 or newer required.
- This requires CONFIG_IDEDMA_AUTO to be enabled.
+ This requires CONFIG_IDEDMA_PCI_AUTO to be enabled.
Please read the comments at the top of drivers/block/pdc202xx.c
If unsure, say N.
+Special UDMA Feature (EXPERIMENTAL)
+PDC202XX_FORCE_BURST_BIT
+ For PDC20246 and PDC20262 Ultra DMA chipsets.
+ Designed originally for PDC20246/Ultra33 that has BIOS setup failures
+ when using 3 or more cards.
+
+ Please read the comments at the top of drivers/block/pdc202xx.c
+
+ If unsure, say N.
+
+Special Mode Feature (DANGEROUS)
+PDC202XX_FORCE_MASTER_MODE
+ For PDC20246 and PDC20262 Ultra DMA chipsets.
+ This is reserved for possible Hardware RAID 0,1 for the FastTrak Series.
+
+ Say N.
+
AEC6210 chipset support
CONFIG_BLK_DEV_AEC6210
This driver adds up to 4 more eide devices sharing a single interrupt.
This add-on card is a bootable PCI UDMA controller. In order to get this
card to initialize correctly in some cases, you should include this driver.
- This prefers CONFIG_IDEDMA_AUTO to be enabled, regardless.
+ This prefers CONFIG_IDEDMA_PCI_AUTO to be enabled, regardless.
Please read the comments at the top of drivers/block/aec6210.c
-Intel PIIXn chipsets support (EXPERIMENTAL)
+Intel PIIXn chipsets support
CONFIG_BLK_DEV_PIIX
This driver adds PIO mode setting and tuning for all PIIX IDE
controllers by Intel. Since the BIOS can sometimes improperly tune
@@ -750,15 +785,31 @@ CONFIG_BLK_DEV_PIIX
If unsure, say N.
-HPT343 chipset support (EXPERIMENTAL)
-CONFIG_BLK_DEV_HPT343
+PIIXn Tuning support (EXPERIMENTAL)
+CONFIG_BLK_DEV_PIIX_TUNING
+ This driver extension adds DMA mode setting and tuning for all PIIX IDE
+ controllers by Intel. Since the BIOS can sometimes improperly setup
+ the device/adapter combination and speed limits, It has become a necessity
+ to back/forward speed devices as needed.
+
+ Case 430HX/440FX PIIX3 need speed limits to reduce UDMA to DMA mode 2
+ if the BIOS can to perform this task at INIT.
+
+ If unsure, say N.
+
+HPT34X chipset support
+CONFIG_BLK_DEV_HPT34X
This driver adds up to 4 more EIDE devices sharing a single
- interrupt. The HPT343 chipset in its current form is a non-bootable
- PCI UDMA controller. This driver requires dynamic tuning of the
- chipset during the ide-probe at boot. It is reported to support DVD
- II drives, by the manufacturer.
+ interrupt. The HPT343 chipset in its current form is a non-bootable or
+ HPT345/HPT363 chipset is bootable (needs BIOS FIX) PCI UDMA controllers.
+ This driver requires dynamic tuning of the chipset during the ide-probe
+ at boot. It is reported to support DVD II drives, by the manufacturer.
- This requires CONFIG_IDEDMA_AUTO to be enabled.
+ Please read the comments at the top of drivers/block/hpt343.c
+
+HPT34X DMA support (DANGEROUS)
+CONFIG_BLK_DEV_HPT34X_DMA
+ This requires CONFIG_IDEDMA_PCI_AUTO to be enabled.
Please read the comments at the top of drivers/block/hpt343.c
@@ -821,17 +872,17 @@ CONFIG_BLK_DEV_IDEDOUBLER
Say Y if you have an IDE doubler. The driver is enabled at kernel
runtime using the "ide=doubler" kernel boot parameter.
- Support for PowerMac IDE devices (must also enable IDE)
- CONFIG_BLK_DEV_IDE_PMAC
- No help for CONFIG_BLK_DEV_IDE_PMAC
+Support for PowerMac IDE devices (must also enable IDE)
+CONFIG_BLK_DEV_IDE_PMAC
+ No help for CONFIG_BLK_DEV_IDE_PMAC
- PowerMac IDE DMA support
- CONFIG_BLK_DEV_IDEDMA_PMAC
- No help for CONFIG_BLK_DEV_IDEDMA_PMAC
+PowerMac IDE DMA support
+CONFIG_BLK_DEV_IDEDMA_PMAC
+ No help for CONFIG_BLK_DEV_IDEDMA_PMAC
- Use DMA by default
- CONFIG_PMAC_IDEDMA_AUTO
- No help for CONFIG_PMAC_IDEDMA_AUTO
+Use DMA by default
+CONFIG_IDEDMA_PMAC_AUTO
+ No help for CONFIG_IDEDMA_PMAC_AUTO
Macintosh Quadra/Powerbook IDE interface support
CONFIG_BLK_DEV_MAC_IDE
@@ -843,9 +894,21 @@ CONFIG_BLK_DEV_MAC_IDE
(hard disks, CD-ROM drives, etc.) that are connected to the builtin
IDE interface.
- RapIDE interface support
- CONFIG_BLK_DEV_IDE_RAPIDE
- No help for CONFIG_BLK_DEV_IDE_RAPIDE
+ICS IDE interface support
+CONFIG_BLK_DEV_IDE_ICSIDE
+ No help for CONFIG_BLK_DEV_IDE_ICSIDE
+
+ICS DMA support
+CONFIG_BLK_DEV_IDEDMA_ICS
+ No help for CONFIG_BLK_DEV_IDEDMA_ICS
+
+Use ICS DMA by default
+CONFIG_IDEDMA_ICS_AUTO
+ No help for CONFIG_IDEDMA_ICS_AUTO
+
+RapIDE interface support
+CONFIG_BLK_DEV_IDE_RAPIDE
+ No help for CONFIG_BLK_DEV_IDE_RAPIDE
XT hard disk support
CONFIG_BLK_DEV_XD
@@ -1676,6 +1739,45 @@ SGI Visual Workstation framebuffer support
CONFIG_FB_SGIVW
SGI Visual Workstation support for framebuffer graphics.
+I2O support
+CONFIG_I2O
+ The Intelligent Input/Output (I2O) architecture allows
+ hardware drivers to be split into two parts: an operating system
+ specific module called the OSM and an hardware specific module
+ called the HDM. The OSM can talk to a whole range of HDM's, and
+ ideally the HDM's are not OS dependent. This allows for the same
+ driver to be used under different operating systems if the relevant
+ OSM is in place. If you say Y here, you will get a choice of OSM's
+ with the following questions.
+
+ This support is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to compile it as a module, say M here and read
+ Documentation/modules.txt.
+
+ If unsure, say N.
+
+I2O PCI support
+CONFIG_I2O_PCI
+ Build in support for PCI bus I2O interface adapters. Currently this
+ is the only variety supported.
+
+I2O Block OSM
+CONFIG_I2O_BLOCK
+ Include support for the I2O Block OSM. The Block OSM presents disk and
+ other structured block devices to the operating system.
+
+I2O LAN OSM
+CONFIG_I2O_LAN
+ Include support for the LAN OSM. You will also need to include support
+ for token ring or fddi if you wish to use token ring or FDDI I2O cards
+ with this driver.
+
+I2O SCSI OSM
+CONFIG_I2O_SCSI
+ Allow direct scsi access to scsi devices on a SCSI or FibreChannel I2O
+ controller. You can use both the SCSI and Block OSM together if you wish.
+
System V IPC
CONFIG_SYSVIPC
Inter Process Communication is a suite of library functions and
@@ -2042,6 +2144,11 @@ CONFIG_FB_VESA
You will get a boot time penguin logo at no additional cost. Please
read Documentation/fb/vesafb.txt. If unsure, say Y.
+VGA 16-color graphics console
+CONFIG_FB_VGA16
+ This is the frame buffer device driver for VGA 16 color graphic
+ cards. Say Y if you have such a card.
+
Backward compatibility mode for Xpmac
CONFIG_FB_COMPAT_XPMAC
If you use the Xpmac X server (common with mklinux), you'll need to
@@ -2283,12 +2390,12 @@ CONFIG_PARPORT
whenever you want), say M here and read Documentation/modules.txt.
The module will be called parport.o. If you have more than one
parallel port and want to specify which port and IRQ to be used by
- this driver at module load time, read
- Documentation/networking/net-modules.txt.
+ this driver at module load time, take a look at
+ Documentation/networking/parport.txt.
If unsure, say Y.
-PC-style hardware
+PC-style hardware
CONFIG_PARPORT_PC
You should say Y here if you have a PC-style parallel port. All IBM
PC compatible computers and some Alphas have PC-style parallel
@@ -2301,28 +2408,36 @@ CONFIG_PARPORT_PC
If unsure, say Y.
+Use FIFO/DMA if available
+CONFIG_PARPORT_PC_FIFO
+ Many parallel port chipsets provide hardware that can speed up
+ printing. Say Y here if you want to take advantage of that.
+
+ As well as actually having a FIFO, or DMA capability, the kernel
+ will need to know which IRQ the parallel port has. By default,
+ parallel port interrupts will not be used, and so neither will the
+ FIFO. See Documentation/parport.txt to find out how to specify
+ which IRQ/DMA to use.
+
Support foreign hardware
CONFIG_PARPORT_OTHER
Say Y here if you want to be able to load driver modules to support
other non-standard types of parallel ports. This causes a
performance loss, so most people say N.
-Sun Ultra/AX-style hardware
+Sun Ultra/AX-style hardware
CONFIG_PARPORT_AX
Say Y here if you need support for the parallel port hardware on Sun
Ultra/AX machines. This code is also available as a module (say M),
called parport_ax.o. If in doubt, saying N is the safe plan.
-Plug and Play support
-CONFIG_PNP
- Plug and Play support allows the kernel to automatically configure
- some peripheral devices. Say Y to enable PnP.
-
-Auto-probe for parallel devices
-CONFIG_PNP_PARPORT
- Some IEEE-1284 conforming parallel-port devices can identify
- themselves when requested. Say Y to enable this feature, or M to
- compile it as a module (parport_probe.o). If in doubt, say N.
+IEEE1284 transfer modes
+CONFIG_PARPORT_1284
+ If you have a printer that supports status readback or device ID, or
+ want to use a device that uses enhanced parallel port transfer modes
+ such as EPP and ECP, say Y here to enable advanced IEEE 1284
+ transfer modes. Also say Y if you want device ID information to
+ appear in /proc/sys/dev/parport/*/autoprobe*. It is safe to say N.
Enable loadable module support
CONFIG_MODULES
@@ -5225,6 +5340,17 @@ CONFIG_WAVELAN
module, say M here and read Documentation/modules.txt as well as
Documentation/networking/net-modules.txt.
+Aironet Arlan 655 & IC2200 DS support
+CONFIG_ARLAN
+ Aironet makes Arlan. www.aironet.com. Uses www.Telxon.com chip, which is
+ used on several similar cards. Driver is tested on 655 and IC2200 series.
+ Look for http://www.ylenurme.ee/~elmer/655/ for latest information.
+ Driver is build as two modules, arlan and arlan-proc. The later is /proc
+ interface and not needed most of time.
+ On some computers the card ends up in non-valid state after some time.
+ Use a ping-reset script to clear it.
+
+
LAPB over Ethernet driver
CONFIG_LAPBETHER
This is a driver for a pseudo device (typically called /dev/lapb0)
@@ -5351,6 +5477,15 @@ CONFIG_ETHERTAP
module, say M here and read Documentation/modules.txt. If you don't
know what to use this for, you don't need it.
+Sealevel Systems 4021 support
+CONFIG_SEALEVEL_4021
+ This is a driver for the Sealevel Systems ACB 56 serial I/O adapter.
+
+ This driver can only be compiled as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ If you want to do that, say M here. The module will be called
+ sealevel.o.
+
Frame Relay (DLCI) support
CONFIG_DLCI
This is support for the frame relay protocol; frame relay is a fast
@@ -5757,6 +5892,40 @@ CONFIG_WANPIPE_PPP
you say N, the PPP support will not be included in the driver (saves
about 16 KB of kernel memory).
+Cyclom 2X(tm) multiprotocol cards
+CONFIG_CYCLADES_SYNC
+ Cyclom 2X from Cyclades Corporation (http://www.cyclades.com and
+ http://www.cyclades.com.br; to browse the WWW, you need to have
+ access to a machine on the Internet that has a program like lynx or
+ netscape) is an intelligent multiprotocol WAN adapter with data
+ transfer rates up to 512 Kbps). These cards support the X.25 and SNA
+ related protocols. If you have one or more of these cards, say Y to
+ this option. The next questions will ask you about the protocols you
+ want the driver to support (for now only X.25 is supported).
+
+ While no documentation is available at this time please grab the
+ wanconfig tarball in http://www.conectiva.com.br/~acme/cycsyn-devel
+ (with minor changes to make it compile with the current wanrouter
+ include files; efforts are being made to use the original package
+ available at ftp://ftp.sangoma.com).
+
+ Feel free to contact me or the cycsyn-devel mailing list at
+ acme@conectiva.com.br and cycsyn-devel@bazar.conectiva.com.br for
+ aditional details, I hope to have documentation available as soon
+ as possible.
+
+ The driver will be compiled as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ The module will be called cyclomx.o. For general information about
+ modules read Documentation/modules.txt.
+
+Cyclom 2X X.25 support
+CONFIG_CYCLOMX_X25
+ Say Y to this option if you are planning to connect a Cyclom 2X card
+ to an X.25 network.
+ If you say N, the X.25 support will not be included in the driver
+ (saves about 11 KB of kernel memory).
+
Ethernet (10 or 100Mbit)
CONFIG_NET_ETHERNET
Ethernet (also called IEEE 802.3 or ISO 8802-2) is the most common
@@ -5970,7 +6139,7 @@ CONFIG_YELLOWFIN
say M here and read Documentation/modules.txt. This is recommended.
The module will be called yellowfin.o.
-Alteon AceNIC / 3Com 3C985 Gigabit Ethernet support.
+Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support
CONFIG_ACENIC
Say Y here if you have an Alteon AceNIC or 3Com 3C985 PCI Gigabit
Ethernet adapter. The driver allows for using the Jumbo Frame
@@ -6728,6 +6897,25 @@ CONFIG_IBMTR
The module will be called ibmtr.o. If you want to compile it as a
module, say M here and read Documentation/modules.txt.
+IBM Olympic chipset PCI adapter support
+CONFIG_IBMOL
+ This is support for all non-Lanstreamer IBM PCI Token Ring Cards.
+ Specifically this is all IBM PCI, PCI Wake On Lan, PCI II, PCI II
+ Wake On Lan, and PCI 100/16/4 adapters.
+
+ If you have such an adapter, say Y and read the Token-Ring mini-HOWTO,
+ available via FTP (user:anonymous) from
+ ftp://metalab.unc/edu/pub/Linux/docs/HOWTO.
+
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ The module will will be called olympic.o. If you want to compile it as a
+ module, say M here and read Documentation/modules.txt.
+
+ Also read the linux/Documentation/networking/olympic.txt or check the
+ Linux Token Ring Project site for the latest information at
+ http://www.linuxtr.net
+
SysKonnect adapter support
CONFIG_SKTR
This is support for all SysKonnect Token Ring cards, specifically
@@ -8381,6 +8569,16 @@ CONFIG_CYCLADES
If you haven't heard about it, it's safe to say N.
+Cyclades-Z interrupt mode operation (EXPERIMENTAL)
+CONFIG_CYZ_INTR
+ The Cyclades-Z family of multiport cards allows 2 (two) driver
+ op modes: polling and interrupt. In polling mode, the driver will
+ check the status of the Cyclades-Z ports every certain amount of
+ time (which is called polling cycle and is configurable). In
+ interrupt mode, it will use an interrupt line (IRQ) in order to check
+ the status of the Cyclades-Z ports. The default op mode is polling.
+ If unsure, say N.
+
Stallion multiport serial support
CONFIG_STALDRV
Stallion cards give you many serial ports. You would need something
@@ -8505,7 +8703,8 @@ CONFIG_PRINTER
corresponding drivers into the kernel. If you want to compile this
driver as a module however ( = code which can be inserted in and
removed from the running kernel whenever you want), say M here and
- read Documentation/modules.txt. The module will be called lp.o.
+ read Documentation/modules.txt and Documentation/parport.txt. The
+ module will be called lp.o.
If you have several parallel ports, you can specify which ports to
use with the "lp" kernel command line option. (Try "man bootparam"
@@ -8519,11 +8718,18 @@ CONFIG_PRINTER
If you have more than 3 printers, you need to increase the LP_NO
variable in lp.c.
-Support IEEE1284 status readback
-CONFIG_PRINTER_READBACK
- If your printer conforms to IEEE 1284, it may be able to provide a
- status indication when you read from it (for example, with `cat
- /dev/lp1'). To use this feature, say Y here.
+Support for console on line printer
+CONFIG_LP_CONSOLE
+ If you want kernel messages to be printed out as they occur, you
+ can have a console on the printer. This option adds support for
+ doing that; to actually get it to happen you need to pass the
+ option "console=lp" to the kernel at boot time.
+
+ Note that kernel messages can get lost if the printer is out of
+ paper (or off, or unplugged, or too busy..), but this behaviour
+ can be changed. See drivers/char/lp.c (do this at your own risk).
+
+ If unsure, say N.
Mouse Support (not serial mice)
CONFIG_MOUSE
@@ -9462,7 +9668,7 @@ CONFIG_SOUND
after the PnP configuration is finished. To do this, say M here and
read Documentation/modules.txt as well as
Documentation/sound/README.modules; the module will be called
- sound.o.
+ soundcore.o.
I'm told that even without a sound card, you can make your computer
say more than an occasional beep, by programming the PC speaker.
@@ -11008,6 +11214,11 @@ CONFIG_RADIO_RTRACK2
Choose Y here if you have this FM radio card, and then fill in the
port address below.
+ If you have GemTeks combined (PnP) sound- and radio card you must use
+ this driver as a module and setup the card with isapnptools. You must
+ also pass the module a suitable io parameter, 0x248 has been reported
+ to be used by these cards.
+
In order to control your radio card, you will need to use programs
that are compatible with the Video for Linux API. Information on
this API and pointers to "v4l" programs may be found on the WWW at
@@ -11184,6 +11395,40 @@ CONFIG_RADIO_GEMTEK_PORT
Enter either 0x20c, 0x30c, 0x24c or 0x34c here. The card default is
0x34c, if you haven't changed the jumper setting on the card.
+PlanB Video-In for PowerMacs
+CONFIG_VIDEO_PLANB
+ PlanB is the V4L driver for the PowerMac 7x00/8x00 series video
+ input hardware. If you want to experiment with this, say Y.
+ Otherwise, or if you don't understand a word, say N.
+ See http://www.cpu.lu/~mlan/planb.html for more info.
+
+ Saying M will compile this driver as a module (planb.o).
+
+TerraTec ActiveRadio
+CONFIG_RADIO_TERRATEC
+ Choose Y here if you have this FM radio card, and then fill in the
+ port address below. (TODO)
+
+ Note: This driver is in its early stages. Right now volume and frequency
+ control and muting works at least for me, but unfortunately i have not
+ found anybody who wants to use this card with linux. So if it is this
+ what YOU are trying to do right now, PLEASE DROP ME A NOTE!!
+ Rolf Offermanns (rolf@offermanns.de)
+
+ In order to control your radio card, you will need to use programs
+ that are compatible with the Video for Linux API. Information on
+ this API and pointers to "v4l" programs may be found on the WWW at
+ http://roadrunner.swansea.uk.linux.org/v4l.shtml; to browse the WWW,
+ you need to have access to a machine on the Internet that has a
+ program like lynx or netscape.
+
+
+ If you want to compile this driver as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want),
+ say M here and read Documentation/modules.txt. The module will be
+ called radio-terratec.o.
+
+
BT848 Video For Linux
CONFIG_VIDEO_BT848
Support for BT848 based frame grabber/overlay boards. This includes
@@ -11230,6 +11475,14 @@ CONFIG_VIDEO_PMS
from the running kernel whenever you want). If you want to compile
it as a module, say M here and read Documentation/modules.txt.
+Compaq SMART2 support
+CONFIG_BLK_CPQ_DA
+ This is the driver for Compaq Smart Array controllers.
+ Everyone using these boards should say Y here.
+ See "linux/Documentation/cpqarray.txt" for the current list of
+ boards supported by this driver, and for further information
+ on the use of this driver.
+
#
# ARM options
#
@@ -11528,6 +11781,21 @@ CONFIG_IRTTY_SIR
If unsure, say Y.
+IrPORT IrDA Device Driver
+CONFIG_IRPORT_SIR
+ Say Y here if you want to build support for the IrPORT IrDA device
+ driver. If you want to compile it as a module, say M here and
+ read Documentation/modules.txt. IrPORT can be used instead of
+ IrTTY and sometimes this can be better. One example is if your
+ IrDA port does not have echo-canceling, which will work OK with
+ IrPORT since this driver is working in half-duplex mode only. You
+ don't need to use irattach with IrPORT, but you just insert it
+ the same way as FIR drivers (insmod irport io=0x3e8 irq=11).
+ Notice that IrPORT is a SIR device driver which means that speed
+ is limited to 115200 bps.
+
+ If unsure, say Y.
+
Winbond W83977AF IrDA Device Driver
CONFIG_WINBOND_FIR
Say Y here if you want to build IrDA support for the Winbond
@@ -11551,6 +11819,13 @@ CONFIG_SHARP_FIR
read Documentation/modules.txt. This chipset is used by the Toshiba
Tecra laptops.
+Toshiba Type-O IR Port Device Driver
+CONFIG_TOSHIBA_FIR
+ Say Y here if you want to build support for the Toshiba Type-O IR
+ chipset. If you want to compile it as a module, say M here and
+ read Documentation/modules.txt. This chipset is used by the Toshiba
+ Libretto 100CT, and many more laptops.
+
ESI JetEye PC Dongle
CONFIG_ESI_DONGLE
Say Y here if you want to build support for the Extended Systems
@@ -11588,6 +11863,15 @@ CONFIG_GIRBIL_DONGLE
by IrTTY. To activate support for Greenwich dongles you will have to
insert "irattach -d girbil" in the /etc/irda/drivers script.
+Parallax Litelink dongle
+CONFIG_LITELINK_DONGLE
+ Say Y here if you want to build support for the Parallax Litelink
+ dongle. If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. The Parallax dongle attaches to the
+ normal 9-pin serial port connector, and can currently only be used
+ by IrTTY. To activate support for Parallax dongles you will have to
+ insert "irattach -d litelink" in the /etc/irda/drivers script.
+
VME (Motorola and BVM) support
CONFIG_VME
Say Y here if you want to build a kernel for a 680x0 based VME
@@ -11724,6 +12008,16 @@ CONFIG_USB_ACM
This driver allows for devices which support the Abstract Control Model,
including many USB-based modems, ISDN adapters, and network adapters.
+Support for user-space parallel port device drivers
+CONFIG_PPDEV
+ Saying Y to this adds support for /dev/parport device nodes.
+ NB. You have to make them before you can use them:
+ mknod /dev/parport00 c 99 0
+ mknod /dev/parport01 c 99 1
+ mknod /dev/parport10 c 99 16
+ mknod /dev/parport11 c 99 17
+ etc..
+
#
# A couple of things I keep forgetting:
# capitalize: AppleTalk, Ethernet, DOS, DMA, FAT, FTP, Internet,
diff --git a/Documentation/SMP.txt b/Documentation/SMP.txt
index deac933c8..99832ca96 100644
--- a/Documentation/SMP.txt
+++ b/Documentation/SMP.txt
@@ -1,7 +1,7 @@
SMP on x86/Linux is now an official feature and is not experimental.
Experimental SMP support for other architectures is underway.
-Please view linux/Documentation/smp for more information about enabling SMP.
+Please view linux/Documentation/smp.txt for more information about enabling SMP.
SMP support for Linux with up to 16 processors using the Intel MP
specification.
diff --git a/Documentation/cpqarray.txt b/Documentation/cpqarray.txt
new file mode 100644
index 000000000..45a53216f
--- /dev/null
+++ b/Documentation/cpqarray.txt
@@ -0,0 +1,107 @@
+This driver is for Compaq's SMART2 Intellegent Disk Array Controllers.
+
+WARNING:
+--------
+
+This driver comes with NO WARRANTY. It is not officially supported by
+Compaq. Do not call technical support. Use at your own risk.
+
+Supported Cards:
+----------------
+
+This driver is known to work with the following cards:
+
+ * SMART (EISA)
+ * SMART-2/E (EISA)
+ * SMART-2/P
+ * SMART-2DH
+ * SMART-2SL
+ * SMART-221
+ * SMART-3100ES
+ * SMART-3200
+ * Integrated Smart Array Controller
+ * SA 4200
+ * SA 4250ES
+
+It should also work with some really old Disk array adapters, but I am
+unable to test against these cards:
+
+ * IDA
+ * IDA-2
+ * IAES
+
+Installing:
+-----------
+
+You need to build a new kernel to use this device, even if you want to
+use a loadable module.
+
+Apply the patch to a 2.2.x kernel:
+
+# cd linux
+# patch -p1 <smart2.patch
+
+Then build a new kernel and turn on Compaq SMART2 Disk Array support.
+Create device nodes for the diskarray device:
+
+# mkdev.ida [ctlrs]
+
+Where ctlrs is the number of controllers you have (defaults to 1 if not
+specified).
+
+EISA Controllers:
+-----------------
+
+If you want to use an EISA controller you'll have to supply some
+insmod/lilo paramaters. If the driver is compiled into the kernel, must
+give it the controller's IO port address at boot time (it is no longer
+necessary to specifiy the IRQ). For example, if you had two SMART-2/E
+controllers, in EISA slots 1 and 2 you'd give it a boot argument like
+this:
+
+ smart2=0x1000,0x2000
+
+If you were loading the driver as a module, you'd give load it like this:
+
+ insmod cpqarray.o eisa=0x1000,0x2000
+
+You can use EISA and PCI adapters at the same time.
+
+Booting:
+--------
+
+You'll need to use a modified lilo if you want to boot from a disk array.
+Its simply a version of lilo with some code added to tell it how to
+understand Compaq diskarray devices.
+
+Device Naming:
+--------------
+
+You need some entries in /dev for the ida device. The mkdev.ida script
+can make device nodes for you automatically. Currently the device setup
+is as follows:
+
+Major numbers:
+ 72 ida0
+ 73 ida1
+ 74 ida2
+ etc...
+
+Minor numbers:
+ b7 b6 b5 b4 b3 b2 b1 b0
+ |----+----| |----+----|
+ | |
+ | +-------- Partition ID (0=wholedev, 1-15 partition)
+ |
+ +-------------------- Logical Volume number
+
+The suggested device naming scheme is:
+/dev/ida/c0d0 Controller 0, disk 0, whole device
+/dev/ida/c0d0p1 Controller 0, disk 0, partition 1
+/dev/ida/c0d0p2 Controller 0, disk 0, partition 2
+/dev/ida/c0d0p3 Controller 0, disk 0, partition 3
+
+/dev/ida/c1d1 Controller 1, disk 1, whole device
+/dev/ida/c1d1p1 Controller 1, disk 1, partition 1
+/dev/ida/c1d1p2 Controller 1, disk 1, partition 2
+/dev/ida/c1d1p3 Controller 1, disk 1, partition 3
diff --git a/Documentation/fb/tgafb.txt b/Documentation/fb/tgafb.txt
new file mode 100644
index 000000000..36fe07821
--- /dev/null
+++ b/Documentation/fb/tgafb.txt
@@ -0,0 +1,51 @@
+[Also cloned from vesafb.txt, thanks to Gerd]
+
+What is tgafb?
+===============
+
+This is a driver for DECChip 21030 based graphics framebuffers, a.k.a. TGA
+cards, specifically the following models
+
+ZLxP-E1 (8bpp, 4 MB VRAM)
+ZLxP-E2 (32bpp, 8 MB VRAM)
+ZLxP-E3 (32bpp, 16 MB VRAM, Zbuffer)
+
+This version, tgafb-1.12, is almost a complete rewrite of the code written
+by Geert Uytterhoeven, which was based on the original TGA console code
+written by Jay Estabrook.
+
+Major new features:
+
+ * Support for multiple resolutions, including setting the resolution at
+ boot time, allowing the use of a fixed-frequency monitor.
+ * Complete code rewrite to follow Geert's skeletonfb spec which will allow
+ future implementation of hardware acceleration and other features.
+
+
+Configuration
+=============
+
+You can pass kernel command line options to tgafb with
+`video=tga:option1,option2:value2,option3' (multiple options should be
+separated by comma, values are separated from options by `:').
+Accepted options:
+
+font:X - default font to use. All fonts are supported, including the
+ SUN12x22 font which is very nice at high resolutions.
+mode:X - default video mode. See drivers/video/tgafb.c for a list.
+
+X11
+===
+
+XF68_FBDev should work just fine, but I haven't tested it. Running
+the XF86_TGA server (reasonably recent versions of which support all TGA
+cards) works fine for me.
+
+One minor problem with XF86_TGA is when running tgafb in resolutions higher
+than 640x480, on switching VCs from tgafb to X, the entire screen is not
+re-drawn and must be manually refreshed. This is an X server problem, not a
+tgafb problem.
+
+Enjoy!
+
+Martin Lucina <mato@kotelna.sk>
diff --git a/Documentation/java.txt b/Documentation/java.txt
index 1b30c1183..be7203d3b 100644
--- a/Documentation/java.txt
+++ b/Documentation/java.txt
@@ -21,7 +21,7 @@ other program after you have done the following:
2) You have to compile BINFMT_MISC either as a module or into
the kernel (CONFIG_BINFMT_MISC) and set it up properly.
If you choose to compile it as a module, you will have
- to insert it manually with modprobe/insmod, as kerneld
+ to insert it manually with modprobe/insmod, as kmod
can not easy be supported with binfmt_misc.
Read the file 'binfmt_misc.txt' in this directory to know
more about the configuration process.
@@ -29,14 +29,15 @@ other program after you have done the following:
3) Add the following configuration items to binfmt_misc
(you should really have read binfmt_misc.txt now):
support for Java applications:
- ':Java:M::\xca\xfe\xba\xbe::/usr/local/java/bin/javawrapper:'
+ ':Java:M::\xca\xfe\xba\xbe::/usr/local/bin/javawrapper:'
support for Java Applets:
- ':Applet:E::html::/usr/local/java/bin/appletviewer:'
+ ':Applet:E::html::/usr/bin/appletviewer:'
or the following, if you want to be more selective:
- ':Applet:M::<!--applet::/usr/local/java/bin/appletviewer:'
+ ':Applet:M::<!--applet::/usr/bin/appletviewer:'
- Of cause you have to fix the path names, if you installed the JDK
- at another place than /usr/local/java.
+ Of cause you have to fix the path names. Given path/file names in this
+ document match the Debian 2.1 system. (i.e. jdk installed in /usr,
+ custom wrappers from this document in /usr/local)
Note, that for the more selective applet support you have to modify
existing html-files to contain <!--applet--> in the first line
@@ -45,42 +46,300 @@ other program after you have done the following:
For the compiled Java programs you need a wrapper script like the
following (this is because Java is broken in case of the filename
handling), again fix the path names, both in the script and in the
- above given configuration string:
+ above given configuration string.
+
+ You, too, need the little program after the script. Compile like
+ gcc -O2 -o javaclassname javaclassname.c
+ and stick it to /usr/local/bin.
+
+ Both the javawrapper shellscript and the javaclassname program
+ were supplied by Colin J. Watson <cjw44@cam.ac.uk>.
====================== Cut here ===================
#!/bin/bash
-# /usr/local/java/bin/javawrapper - the wrapper for binfmt_misc/java
+# /usr/local/bin/javawrapper - the wrapper for binfmt_misc/java
+
+if [ -z "$1" ]; then
+ exec 1>&2
+ echo Usage: $0 class-file
+ exit 1
+fi
+
CLASS=$1
+FQCLASS=`/usr/local/bin/javaclassname $1`
+FQCLASSN=`echo $FQCLASS | sed -e 's/^.*\.\([^.]*\)$/\1/'`
+FQCLASSP=`echo $FQCLASS | sed -e 's-\.-/-g' -e 's-^[^/]*$--' -e 's-/[^/]*$--'`
-# if classname is a link, we follow it (this could be done easier - how?)
-if [ -L "$1" ] ; then
- CLASS=`ls --color=no -l $1 | tr -s '\t ' ' ' | cut -d ' ' -f 11`
+# for example:
+# CLASS=Test.class
+# FQCLASS=foo.bar.Test
+# FQCLASSN=Test
+# FQCLASSP=foo/bar
+
+unset CLASSBASE
+
+declare -i LINKLEVEL=0
+
+while :; do
+ if [ "`basename $CLASS .class`" == "$FQCLASSN" ]; then
+ # See if this directory works straight off
+ cd -L `dirname $CLASS`
+ CLASSDIR=$PWD
+ cd $OLDPWD
+ if echo $CLASSDIR | grep -q "$FQCLASSP$"; then
+ CLASSBASE=`echo $CLASSDIR | sed -e "s.$FQCLASSP$.."`
+ break;
+ fi
+ # Try dereferencing the directory name
+ cd -P `dirname $CLASS`
+ CLASSDIR=$PWD
+ cd $OLDPWD
+ if echo $CLASSDIR | grep -q "$FQCLASSP$"; then
+ CLASSBASE=`echo $CLASSDIR | sed -e "s.$FQCLASSP$.."`
+ break;
+ fi
+ # If no other possible filename exists
+ if [ ! -L $CLASS ]; then
+ exec 1>&2
+ echo $0:
+ echo " $CLASS should be in a" \
+ "directory tree called $FQCLASSP"
+ exit 1
+ fi
+ fi
+ if [ ! -L $CLASS ]; then break; fi
+ # Go down one more level of symbolic links
+ let LINKLEVEL+=1
+ if [ $LINKLEVEL -gt 5 ]; then
+ exec 1>&2
+ echo $0:
+ echo " Too many symbolic links encountered"
+ exit 1
+ fi
+ CLASS=`ls --color=no -l $CLASS | sed -e 's/^.* \([^ ]*\)$/\1/'`
+done
+
+if [ -z "$CLASSBASE" ]; then
+ if [ -z "$FQCLASSP" ]; then
+ GOODNAME=$FQCLASSN.class
+ else
+ GOODNAME=$FQCLASSP/$FQCLASSN.class
+ fi
+ exec 1>&2
+ echo $0:
+ echo " $FQCLASS should be in a file called $GOODNAME"
+ exit 1
fi
-CLASSN=`basename $CLASS .class`
-CLASSP=`dirname $CLASS`
-
-FOO=$PATH
-PATH=$CLASSPATH
-if [ -z "`type -p -a $CLASSN.class`" ] ; then
- # class is not in CLASSPATH
- if [ -e "$CLASSP/$CLASSN.class" ] ; then
- # append dir of class to CLASSPATH
- if [ -z "${CLASSPATH}" ] ; then
- export CLASSPATH=$CLASSP
- else
- export CLASSPATH=$CLASSP:$CLASSPATH
- fi
- else
- # uh! now we would have to create a symbolic link - really
- # ugly, i.e. print a message that one has to change the setup
- echo "Hey! This is not a good setup to run $1 !"
- exit 1
- fi
+
+if ! echo $CLASSPATH | grep -q "^\(.*:\)*$CLASSBASE\(:.*\)*"; then
+ # class is not in CLASSPATH, so prepend dir of class to CLASSPATH
+ if [ -z "${CLASSPATH}" ] ; then
+ export CLASSPATH=$CLASSBASE
+ else
+ export CLASSPATH=$CLASSBASE:$CLASSPATH
+ fi
fi
-PATH=$FOO
shift
-/usr/local/java/bin/java $CLASSN "$@"
+/usr/bin/java $FQCLASS "$@"
+====================== Cut here ===================
+
+
+====================== Cut here ===================
+/* javaclassname.c
+ *
+ * Extracts the class name from a Java class file; intended for use in a Java
+ * wrapper of the type supported by the binfmt_misc option in the Linux kernel.
+ *
+ * Copyright (C) 1999 Colin J. Watson <cjw44@cam.ac.uk>.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <sys/types.h>
+
+/* From Sun's Java VM Specification, as tag entries in the constant pool. */
+
+#define CP_UTF8 1
+#define CP_INTEGER 3
+#define CP_FLOAT 4
+#define CP_LONG 5
+#define CP_DOUBLE 6
+#define CP_CLASS 7
+#define CP_STRING 8
+#define CP_FIELDREF 9
+#define CP_METHODREF 10
+#define CP_INTERFACEMETHODREF 11
+#define CP_NAMEANDTYPE 12
+
+/* Define some commonly used error messages */
+
+#define seek_error() error("%s: Cannot seek\n", program)
+#define corrupt_error() error("%s: Class file corrupt\n", program)
+#define eof_error() error("%s: Unexpected end of file\n", program)
+#define utf8_error() error("%s: Only ASCII 1-255 supported\n", program);
+
+char *program;
+
+long *pool;
+
+u_int8_t read_8(FILE *classfile);
+u_int16_t read_16(FILE *classfile);
+void skip_constant(FILE *classfile, u_int16_t *cur);
+void error(const char *format, ...);
+int main(int argc, char **argv);
+
+/* Reads in an unsigned 8-bit integer. */
+u_int8_t read_8(FILE *classfile)
+{
+ int b = fgetc(classfile);
+ if(b == EOF)
+ eof_error();
+ return (u_int8_t)b;
+}
+
+/* Reads in an unsigned 16-bit integer. */
+u_int16_t read_16(FILE *classfile)
+{
+ int b1, b2;
+ b1 = fgetc(classfile);
+ if(b1 == EOF)
+ eof_error();
+ b2 = fgetc(classfile);
+ if(b2 == EOF)
+ eof_error();
+ return (u_int16_t)((b1 << 8) | b2);
+}
+
+/* Reads in a value from the constant pool. */
+void skip_constant(FILE *classfile, u_int16_t *cur)
+{
+ u_int16_t len;
+ int seekerr = 1;
+ pool[*cur] = ftell(classfile);
+ switch(read_8(classfile))
+ {
+ case CP_UTF8:
+ len = read_16(classfile);
+ seekerr = fseek(classfile, len, SEEK_CUR);
+ break;
+ case CP_CLASS:
+ case CP_STRING:
+ seekerr = fseek(classfile, 2, SEEK_CUR);
+ break;
+ case CP_INTEGER:
+ case CP_FLOAT:
+ case CP_FIELDREF:
+ case CP_METHODREF:
+ case CP_INTERFACEMETHODREF:
+ case CP_NAMEANDTYPE:
+ seekerr = fseek(classfile, 4, SEEK_CUR);
+ break;
+ case CP_LONG:
+ case CP_DOUBLE:
+ seekerr = fseek(classfile, 8, SEEK_CUR);
+ ++(*cur);
+ break;
+ default:
+ corrupt_error();
+ }
+ if(seekerr)
+ seek_error();
+}
+
+void error(const char *format, ...)
+{
+ va_list ap;
+ va_start(ap, format);
+ vfprintf(stderr, format, ap);
+ va_end(ap);
+ exit(1);
+}
+
+int main(int argc, char **argv)
+{
+ FILE *classfile;
+ u_int16_t cp_count, i, this_class, classinfo_ptr;
+ u_int8_t length;
+
+ program = argv[0];
+
+ if(!argv[1])
+ error("%s: Missing input file\n", program);
+ classfile = fopen(argv[1], "rb");
+ if(!classfile)
+ error("%s: Error opening %s\n", program, argv[1]);
+
+ if(fseek(classfile, 8, SEEK_SET)) /* skip magic and version numbers */
+ seek_error();
+ cp_count = read_16(classfile);
+ pool = calloc(cp_count, sizeof(long));
+ if(!pool)
+ error("%s: Out of memory for constant pool\n", program);
+
+ for(i = 1; i < cp_count; ++i)
+ skip_constant(classfile, &i);
+ if(fseek(classfile, 2, SEEK_CUR)) /* skip access flags */
+ seek_error();
+
+ this_class = read_16(classfile);
+ if(this_class < 1 || this_class >= cp_count)
+ corrupt_error();
+ if(!pool[this_class] || pool[this_class] == -1)
+ corrupt_error();
+ if(fseek(classfile, pool[this_class] + 1, SEEK_SET))
+ seek_error();
+
+ classinfo_ptr = read_16(classfile);
+ if(classinfo_ptr < 1 || classinfo_ptr >= cp_count)
+ corrupt_error();
+ if(!pool[classinfo_ptr] || pool[classinfo_ptr] == -1)
+ corrupt_error();
+ if(fseek(classfile, pool[classinfo_ptr] + 1, SEEK_SET))
+ seek_error();
+
+ length = read_16(classfile);
+ for(i = 0; i < length; ++i)
+ {
+ u_int8_t x = read_8(classfile);
+ if((x & 0x80) || !x)
+ {
+ if((x & 0xE0) == 0xC0)
+ {
+ u_int8_t y = read_8(classfile);
+ if((y & 0xC0) == 0x80)
+ {
+ int c = ((x & 0x1f) << 6) + (y & 0x3f);
+ if(c) putchar(c);
+ else utf8_error();
+ }
+ else utf8_error();
+ }
+ else utf8_error();
+ }
+ else if(x == '/') putchar('.');
+ else putchar(x);
+ }
+ putchar('\n');
+ free(pool);
+ fclose(classfile);
+ return 0;
+}
====================== Cut here ===================
@@ -116,4 +375,6 @@ the execution bit, then just do
originally by Brian A. Lantz, brian@lantz.com
-heavily edited for binfmt_misc by Richard Günther.
+heavily edited for binfmt_misc by Richard Günther
+new scripts by Colin J. Watson <cjw44@cam.ac.uk>.
+
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 9c293fbc9..e1392c277 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -37,7 +37,7 @@ restrictions referred to are that the relevant option is valid if:
SOUND Appropriate sound system support is enabled.
VGA The VGA console has been enabled.
VT Virtual terminal support is enabled.
- XT IBM PC/XT support is enabled.
+ XT IBM PC/XT MFM hard disk support is enabled.
In addition, the following text indicates that the option:
diff --git a/Documentation/networking/arcnet-hardware.txt b/Documentation/networking/arcnet-hardware.txt
index 0c1dbcea9..638bb8abf 100644
--- a/Documentation/networking/arcnet-hardware.txt
+++ b/Documentation/networking/arcnet-hardware.txt
@@ -20,14 +20,14 @@ INTRODUCTION TO ARCNET
ARCnet is a network type which works in a way similar to popular Ethernet
networks but which is also different in some very important ways.
-First of all, you can get ARCnet cards in at least two speeds: 2.5Mbps
-(slower than Ethernet) and 100Mbps (faster than normal Ethernet). In fact,
+First of all, you can get ARCnet cards in at least two speeds: 2.5 Mbps
+(slower than Ethernet) and 100 Mbps (faster than normal Ethernet). In fact,
there are others as well, but these are less common. The different hardware
types, as far as I'm aware, are not compatible and so you cannot wire a
-100Mbps card to a 2.5Mbps card, and so on. From what I hear, my driver does
-work with 100Mbps cards, but I haven't been able to verify this myself,
-since I only have the 2.5Mbps variety. It is probably not going to saturate
-your 100Mbps card. Stop complaining :)
+100 Mbps card to a 2.5 Mbps card, and so on. From what I hear, my driver does
+work with 100 Mbps cards, but I haven't been able to verify this myself,
+since I only have the 2.5 Mbps variety. It is probably not going to saturate
+your 100 Mbps card. Stop complaining. :)
You also cannot connect an ARCnet card to any kind of Ethernet card and
expect it to work.
@@ -52,17 +52,17 @@ a pass around the "ring" within a maximum length of time. This makes it
useful for realtime networks.
In addition, all known ARCnet cards have an (almost) identical programming
-interface. This means that with one "arcnet" driver you can support any
-card; whereas, with Ethernet, each manufacturer uses what is sometimes a
+interface. This means that with one ARCnet driver you can support any
+card, whereas with Ethernet each manufacturer uses what is sometimes a
completely different programming interface, leading to a lot of different,
sometimes very similar, Ethernet drivers. Of course, always using the same
programming interface also means that when high-performance hardware
-facilities like PCI busmastering DMA appear, it's hard to take advantage of
+facilities like PCI bus mastering DMA appear, it's hard to take advantage of
them. Let's not go into that.
One thing that makes ARCnet cards difficult to program for, however, is the
limit on their packet sizes; standard ARCnet can only send packets that are
-up to 508 bytes in length. This is smaller than the internet "bare minimum"
+up to 508 bytes in length. This is smaller than the Internet "bare minimum"
of 576 bytes, let alone the Ethernet MTU of 1500. To compensate, an extra
level of encapsulation is defined by RFC1201, which I call "packet
splitting," that allows "virtual packets" to grow as large as 64K each,
@@ -1005,9 +1005,9 @@ LCS-8830(-T) (8 and 16-bit cards)
only (the JP0 jumper is hardwired), and BNC only.
This is a LCS-8830-T made by SMC, I think ('SMC' only appears on one PLCC,
-nowhere else, not even on the few xeroxed sheets from the manual).
+nowhere else, not even on the few Xeroxed sheets from the manual).
-SMC Arcnet Board Type LCS-8830-T
+SMC ARCnet Board Type LCS-8830-T
------------------------------------
| |
@@ -1070,7 +1070,7 @@ Switches Base
DIP Switches 1-5 of SW2 encode the RAM and ROM Address Range:
-Switches Ram Rom
+Switches RAM ROM
12345 Address Range Address Range
00000 C:0000-C:07ff C:2000-C:3fff
10000 C:0800-C:0fff
@@ -1170,11 +1170,11 @@ Carl de Billy <CARL@carainfo.com> explains J3 and J4:
DIP Switches:
The DIP switches accessible on the accessible end of the card while
- it is installed, is used to set the arcnet address. There are 8
+ it is installed, is used to set the ARCnet address. There are 8
switches. Use an address from 1 to 254.
Switch No.
- 12345678 Arcnet address
+ 12345678 ARCnet address
-----------------------------------------
00000000 FF (Don't use this!)
00000001 FE
@@ -1222,7 +1222,7 @@ DIP Switches:
from the upper memory regions, and then attempting to load ARCETHER
using these addresses.
- I recommend using an arcnet memory address of 0xD000, and putting
+ I recommend using an ARCnet memory address of 0xD000, and putting
the EMS page frame at 0xC000 while using QEMM stealth mode. That
way, you get contiguous high memory from 0xD100 almost all the way
the end of the megabyte.
@@ -1687,7 +1687,7 @@ parameters. These two jumpers are normally left open.
|____________________________________________| |__|
-UM9065L : Arcnet Controller
+UM9065L : ARCnet Controller
SW 1 : Shared Memory Address and I/O Base
@@ -1800,7 +1800,7 @@ SW2 1-8 Node ID Select (ID0-ID7)
J1-J5 IRQ Select
J6-J21 Unknown (Probably extra timeouts & ROM enable ...)
LED1 Activity LED
-BNC Coax connector (STAR arcnet)
+BNC Coax connector (STAR ARCnet)
RAM 2k of SRAM
ROM Boot ROM socket
UFS Unidentified Flying Sockets
@@ -1905,7 +1905,7 @@ LAN-ARC-8, an 8-bit card
------------------------
- from Vojtech Pavlik <Vojtech.Pavlik@st.mff.cuni.cz>
-This is another SMC 90C65 based arcnet card. I couldn't identify the
+This is another SMC 90C65-based ARCnet card. I couldn't identify the
manufacturer, but it might be DataPoint, because the card has the
original arcNet logo in its upper right corner.
@@ -1942,9 +1942,9 @@ SW1 1-5: Base Memory Address Select
SW2 1-8: Node ID Select
SW3 1-5: IRQ Select
6-7: Extra Timeout
- 8 : Rom Enable
+ 8 : ROM Enable
BNC Coax connector
-XTAL 20MHz Crystal
+XTAL 20 MHz Crystal
Setting the Node ID
@@ -2081,11 +2081,11 @@ SW1 1-5 Base Memory Address Select
6-8 Base I/O Address Select
SW2 1-8 Node ID Select (ID0-ID7)
J1 IRQ Select
-J2 Rom Enable
+J2 ROM Enable
J3 Extra Timeout
LED1 Activity LED
-BNC Coax connector (BUS arcnet)
-RJ Twisted Pair Connector (daisychain)
+BNC Coax connector (BUS ARCnet)
+RJ Twisted Pair Connector (daisy chain)
Setting the Node ID
@@ -2419,7 +2419,7 @@ using information from the Original
Legend:
-COM90C65: Arcnet Probe
+COM90C65: ARCnet Probe
S1 1-8: Node ID Select
S2 1-3: I/O Base Address Select
4-6: Memory Base Address Select
@@ -2791,7 +2791,7 @@ SW1 1-5: Base Memory Address Select
SW2 1-8: Node ID Select (ID0-ID7)
SW3 1-5: IRQ Select
6-7: Extra Timeout
- 8 : Rom Enable
+ 8 : ROM Enable
JP1 Led connector
BNC Coax connector
@@ -3089,7 +3089,7 @@ Tiara LanCard of Tiara Computer Systems.
0 = Jumper Installed
1 = Open
-Top Jumper line Bit 7 = Rom Enable 654=Memory location 321=I/O
+Top Jumper line Bit 7 = ROM Enable 654=Memory location 321=I/O
Settings for Memory Location (Top Jumper Line)
456 Address selected
diff --git a/Documentation/networking/arcnet.txt b/Documentation/networking/arcnet.txt
index 3bb2f6d96..2cdb6db62 100644
--- a/Documentation/networking/arcnet.txt
+++ b/Documentation/networking/arcnet.txt
@@ -1,4 +1,3 @@
-
----------------------------------------------------------------------------
NOTE: See also arcnet-hardware.txt in this directory for jumper-setting
and cabling information if you're like many of us and didn't happen to get a
@@ -92,10 +91,10 @@ ARCnet:
http://www.perftech.com/ or ftp to ftp.perftech.com.
Novell makes a networking stack for DOS which includes ARCnet drivers. Try
-ftp'ing to ftp.novell.com.
+FTPing to ftp.novell.com.
You can get the Crynwr packet driver collection (including arcether.com, the
-one you'll want to use with arcnet cards) from
+one you'll want to use with ARCnet cards) from
oak.oakland.edu:/simtel/msdos/pktdrvr. It won't work perfectly on a 386+
without patches, though, and also doesn't like several cards. Fixed
versions are available on my WWW page, or via e-mail if you don't have WWW
@@ -183,7 +182,7 @@ Loadable Module Support
-----------------------
Configure and rebuild Linux. When asked, answer 'm' to "Generic ARCnet
-support" and to support for your ARcnet chipset if you want to use the
+support" and to support for your ARCnet chipset if you want to use the
loadable module. You can also say 'y' to "Generic ARCnet support" and 'm'
to the chipset support if you wish.
@@ -269,7 +268,7 @@ Windows: See DOS :) Trumpet Winsock works fine with either the Novell or
Arcether client, assuming you remember to load winpkt of course.
LAN Manager and Windows for Workgroups: These programs use protocols that
- are incompatible with the internet standard. They try to pretend
+ are incompatible with the Internet standard. They try to pretend
the cards are Ethernet, and confuse everyone else on the network.
However, v2.00 and higher of the Linux ARCnet driver supports this
@@ -288,7 +287,7 @@ Windows 95: Tools are included with Win95 that let you use either the LANMAN
you're completely insane, and/or you need to build some kind of
hybrid network that uses both encapsulation types.
-OS2: I've been told it works under Warp Connect with an ARCnet driver from
+OS/2: I've been told it works under Warp Connect with an ARCnet driver from
SMC. You need to use the 'arc0e' interface for this. If you get
the SMC driver to work with the TCP/IP stuff included in the
"normal" Warp Bonus Pack, let me know.
@@ -309,7 +308,7 @@ Using Multiprotocol ARCnet
The ARCnet driver v2.10 ALPHA supports three protocols, each on its own
"virtual network device":
- arc0 - RFC1201 protocol, the official internet standard which just
+ arc0 - RFC1201 protocol, the official Internet standard which just
happens to be 100% compatible with Novell's TRXNET driver.
Version 1.00 of the ARCnet driver supported _only_ this
protocol. arc0 is the fastest of the three protocols (for
@@ -331,13 +330,13 @@ The ARCnet driver v2.10 ALPHA supports three protocols, each on its own
reasons yet to be determined. (Probably it's the smaller
MTU that does it.)
- arc0s - The "[s]imple" RFC1051 protocol is the "previous" internet
+ arc0s - The "[s]imple" RFC1051 protocol is the "previous" Internet
standard that is completely incompatible with the new
standard. Some software today, however, continues to
support the old standard (and only the old standard)
including NetBSD and AmiTCP. RFC1051 also does not support
RFC1201's packet splitting, and the MTU of 507 is still
- smaller than the internet "requirement," so it's quite
+ smaller than the Internet "requirement," so it's quite
possible that you may run into problems. It's also slower
than RFC1201 by about 25%, for the same reason as arc0e.
@@ -388,16 +387,16 @@ can set up your network then:
Linux but runs the free Microsoft LANMAN Client instead.
Worse, one of the Linux computers (freedom) also has a modem and acts as
- a router to my internet provider. The other Linux box (insight) also has
+ a router to my Internet provider. The other Linux box (insight) also has
its own IP address and needs to use freedom as its default gateway. The
- XT (patience), however, does not have its own internet IP address and so
+ XT (patience), however, does not have its own Internet IP address and so
I assigned it one on a "private subnet" (as defined by RFC1597).
To start with, take a simple network with just insight and freedom.
Insight needs to:
- talk to freedom via RFC1201 (arc0) protocol, because I like it
more and it's faster.
- - use freedom as its internet gateway.
+ - use freedom as its Internet gateway.
That's pretty easy to do. Set up insight like this:
ifconfig arc0 insight
@@ -417,20 +416,20 @@ can set up your network then:
/* and default gateway is configured by pppd */
Great, now insight talks to freedom directly on arc0, and sends packets
- to the internet through freedom. If you didn't know how to do the above,
+ to the Internet through freedom. If you didn't know how to do the above,
you should probably stop reading this section now because it only gets
worse.
Now, how do I add patience into the network? It will be using LANMAN
Client, which means I need the arc0e device. It needs to be able to talk
to both insight and freedom, and also use freedom as a gateway to the
- internet. (Recall that patience has a "private IP address" which won't
- work on the internet; that's okay, I configured Linux IP masquerading on
+ Internet. (Recall that patience has a "private IP address" which won't
+ work on the Internet; that's okay, I configured Linux IP masquerading on
freedom for this subnet).
So patience (necessarily; I don't have another IP number from my
provider) has an IP address on a different subnet than freedom and
- insight, but needs to use freedom as an internet gateway. Worse, most
+ insight, but needs to use freedom as an Internet gateway. Worse, most
DOS networking programs, including LANMAN, have braindead networking
schemes that rely completely on the netmask and a 'default gateway' to
determine how to route packets. This means that to get to freedom or
@@ -449,7 +448,7 @@ can set up your network then:
This way, freedom will send all packets for patience through arc0e,
giving its IP address as gatekeeper (on the private subnet). When it
- talks to insight or the internet, it will use its "freedom" internet IP
+ talks to insight or the Internet, it will use its "freedom" Internet IP
address.
You will notice that we haven't configured the arc0e device on insight.
@@ -473,7 +472,7 @@ can set up your network then:
[RFC1201 NETWORK] [ETHER-ENCAP NETWORK]
- (registered internet subnet) (RFC1597 private subnet)
+ (registered Internet subnet) (RFC1597 private subnet)
(IP Masquerade)
/---------------\ * /---------------\
@@ -523,7 +522,7 @@ found unless you turn on the D_INIT_REASONS debugging flag.
Once the driver is running, you can run the arcdump shell script (available
from me or in the full ARCnet package, if you have it) as root to list the
contents of the arcnet buffers at any time. To make any sense at all out of
-this, you should grab the pertinent RFC's. (some are listed near the top of
+this, you should grab the pertinent RFCs. (some are listed near the top of
arcnet.c). arcdump assumes your card is at 0xD0000. If it isn't, edit the
script.
diff --git a/Documentation/networking/baycom.txt b/Documentation/networking/baycom.txt
index 8d5bc3566..71e0c76df 100644
--- a/Documentation/networking/baycom.txt
+++ b/Documentation/networking/baycom.txt
@@ -31,7 +31,7 @@ baycom_par:
Its devices are called bcp0 through bcp3.
baycom_epp:
- This driver supports the epp modem.
+ This driver supports the EPP modem.
Its devices are called bce0 through bce3.
This driver is work-in-progress.
@@ -60,10 +60,10 @@ picpar: This is a redesign of the par96 modem by Henning Rech, DF9IC. The modem
an additional power supply. Furthermore, it incorporates a carrier
detect circuitry.
-epp: This is a high speed modem adaptor that connects to an enhanced parallel port.
+EPP: This is a high-speed modem adaptor that connects to an enhanced parallel port.
Its target audience is users working over a high speed hub (76.8kbit/s).
-eppfpga: This is a redesign of the epp adaptor.
+eppfpga: This is a redesign of the EPP adaptor.
diff --git a/Documentation/networking/cs89x0.txt b/Documentation/networking/cs89x0.txt
index 839db8ece..1da37d5ce 100644
--- a/Documentation/networking/cs89x0.txt
+++ b/Documentation/networking/cs89x0.txt
@@ -203,7 +203,7 @@ configuration options are available on the command line:
* io=### - specify IO address (200h-360h)
* irq=## - specify interrupt level
* mmode=##### - specify memory base address
-* dma=# - specify dma channel
+* dma=# - specify DMA channel
* media=rj45 - specify media type
or media=2
or media=aui
@@ -412,33 +412,33 @@ its ability to communicate across the ISA bus based on the system resources
assigned during hardware configuration. The following tests are performed:
* IO Register Read/Write Test
- The IO Register Read/Write test insures that the CS8900/20 can be
+ The IO Register Read/Write test ensures that the CS8900/20 can be
accessed in IO mode, and that the IO base address is correct.
* Shared Memory Test
- The Shared Memory test insures the CS8900/20 can be accessed in memory
+ The Shared Memory test ensures the CS8900/20 can be accessed in memory
mode and that the range of memory addresses assigned does not conflict
with other devices in the system.
* Interrupt Test
- The Interrupt test insures there are no conflicts with the assigned IRQ
+ The Interrupt test ensures there are no conflicts with the assigned IRQ
signal.
* EEPROM Test
- The EEPROM test insures the EEPROM can be read.
+ The EEPROM test ensures the EEPROM can be read.
* Chip RAM Test
- The Chip RAM test insures the 4K of memory internal to the CS8900/20 is
+ The Chip RAM test ensures the 4 K of memory internal to the CS8900/20 is
working properly.
* Internal Loop-back Test
- The Internal Loop Back test insures the adapter's transmitter and
+ The Internal Loop Back test ensures the adapter's transmitter and
receiver are operating properly. If this test fails, make sure the
adapter's cable is connected to the network (check for LED activity for
example).
* Boot PROM Test
- The Boot PROM test insures the Boot PROM is present, and can be read.
+ The Boot PROM test ensures the Boot PROM is present, and can be read.
Failure indicates the Boot PROM was not successfully read due to a
hardware problem or due to a conflicts on the Boot PROM address
assignment. (Test only applies if the adapter is configured to use the
@@ -564,7 +564,7 @@ Crystal's CS89XX Technical Application Support can be reached at:
Telephone :(800) 888-5016 (from inside U.S. and Canada)
:(512) 442-7555 (from outside the U.S. and Canada)
Fax :(512) 912-3871
-Email :ethernet@crystal.cirrus.com
+E-mail :ethernet@crystal.cirrus.com
WWW :http://www.crystal.com
diff --git a/Documentation/networking/olympic.txt b/Documentation/networking/olympic.txt
new file mode 100644
index 000000000..04198aec5
--- /dev/null
+++ b/Documentation/networking/olympic.txt
@@ -0,0 +1,75 @@
+
+IBM PCI Pit/Pit-Phy/Olympic CHIPSET BASED TOKEN RING CARDS README
+
+Release 0.2.0 - Release
+ June 8th 1999 Peter De Schrijver & Mike Phillips
+
+
+Thanks:
+Erik De Cock, Adrian Bridgett and Frank Fiene for their
+patience and testing.
+Paul Norton without whose tr.c code we would have had
+a lot more work to do.
+
+Options:
+
+The driver accepts three options: ringspeed, pkt_buf_sz, and
+message_level.
+
+These options can be specified differently for each card found.
+
+ringspeed: Has one of three settings 0 (default), 4 or 16. 0 will
+make the card autosense the ringspeed and join at the appropriate speed,
+this will be the default option for most people. 4 or 16 allow you to
+explicitly force the card to operate at a certain speed. The card will fail
+if you try to insert it at the wrong speed. (Although some hubs will allow
+this so be *very* careful). The main purpose for explicitly setting the ring
+speed is for when the card is first on the ring. In autosense mode, if the card
+cannot detect any active monitors on the ring it will not open, so you must
+re-init the card at the appropriate speed. Unfortunately at present the only
+way of doing this is rmmod and insmod which is a bit tough if it is compiled
+in the kernel.
+
+pkt_buf_sz: This is this initial receive buffer allocation size. This will
+default to 4096 if no value is entered. You may increase performance of the
+driver by setting this to a value larger than the network packet size, although
+the driver now re-sizes buffers based on MTU settings as well.
+
+message_level: Controls level of messages created by the driver. Defaults to 0:
+which only displays start-up and critical messages. Presently any non-zero
+value will display all soft messages as well. NB This does not turn
+debuging messages on, that must be done by modified the source code.
+
+Multi-card:
+
+The driver will detect multiple cards and will work with shared interrupts,
+each card is assigned the next token ring device, i.e. tr0 , tr1, tr2. The
+driver should also happily reside in the system with other drivers. It has
+been tested with ibmtr.c running, and I personnally have had one Olicom PCI
+card and two IBM olympic cards (all on the same interrupt), all running
+together.
+
+Variable MTU size:
+
+The driver can handle a MTU size upto either 4500 or 18000 depending upon
+ring speed. The driver also changes the size of the receive buffers as part
+of the mtu re-sizing, so if you set mtu = 18000, you will need to be able
+to allocate 16 * (sk_buff with 18000 buffer size) call it 18500 bytes per ring
+position = 296,000 bytes of memory space, plus of course anything
+necessary for the tx sk_buff's. Remember this is per card, so if you are
+building routers, gateway's etc, you could start to use a lot of memory
+real fast.
+
+Network Monitor Mode:
+
+By modifying the #define OLYMPIC_NETWORK_MONITOR from 0 to 1 in the
+source code the driver will implement a quasi network monitoring
+mode. All unexpected MAC frames (beaconing etc.) will be received
+by the driver and the source and destination addresses printed.
+Also an entry will be added in /proc/net called olympic_tr. This
+displays low level information about the configuration of the ring and
+the adapter. This feature has been designed for network adiministrators
+to assist in the diagnosis of network / ring problems.
+
+6/8/99 Peter De Schrijver and Mike Phillips
+
diff --git a/Documentation/networking/policy-routing.txt b/Documentation/networking/policy-routing.txt
index 376dd6e80..36f6936d7 100644
--- a/Documentation/networking/policy-routing.txt
+++ b/Documentation/networking/policy-routing.txt
@@ -83,7 +83,7 @@ Applications
2. Opposite case. Just forget all that you know about routing
tables. Every rule is supplied with its own gateway, device
info. record. This approach is not appropriate for automated
- route maintanance, but it is ideal for manual configuration.
+ route maintenance, but it is ideal for manual configuration.
HOWTO: iproute addrule [ from PREFIX ] [ to PREFIX ] [ tos TOS ]
[ dev INPUTDEV] [ pref PREFERENCE ] route [ gw GATEWAY ]
diff --git a/Documentation/networking/z8530drv.txt b/Documentation/networking/z8530drv.txt
index cf7dc609b..c74fb4253 100644
--- a/Documentation/networking/z8530drv.txt
+++ b/Documentation/networking/z8530drv.txt
@@ -252,7 +252,7 @@ device scc0 # the device for the following params
speed 1200 # the default baudrate
clock dpll # clock source:
- # dpll = normal halfduplex operation
+ # dpll = normal half duplex operation
# external = MODEM provides own Rx/Tx clock
# divider = use full duplex divider if
# installed (1)
diff --git a/Documentation/oops-tracing.txt b/Documentation/oops-tracing.txt
index 108c3b645..ebdef0873 100644
--- a/Documentation/oops-tracing.txt
+++ b/Documentation/oops-tracing.txt
@@ -1,15 +1,16 @@
Quick Summary
-------------
-cd /usr/src/linux/scripts/ksymoops
-make ksymoops
-./ksymoops < the_oops.txt
+Install ksymoops from ftp://ftp.ocs.com.au/pub/ksymoops
+Read the ksymoops man page.
+ksymoops < the_oops.txt
and send the output the maintainer of the kernel area that seems to be
-involved with the problem. Don't worry too much about getting the wrong
-person. If you are unsure send it to the person responsible for the code
-relevant to what you were doing. If it occurs repeatably try and describe
-how to recreate it. Thats worth even more than the oops
+involved with the problem, not to the ksymoops maintainer. Don't worry
+too much about getting the wrong person. If you are unsure send it to
+the person responsible for the code relevant to what you were doing.
+If it occurs repeatably try and describe how to recreate it. Thats
+worth even more than the oops
If you are totally stumped as to whom to send the report, send it to
linux-kernel@vger.rutgers.edu. Thanks for your help in making Linux as
@@ -41,9 +42,8 @@ Oh, it helps if the report happens on a kernel that is compiled with the
same compiler and similar setups.
The other thing to do is disassemble the "Code:" part of the bug report:
-ksymoops will do this too with the correct tools (and new version of
-ksymoops), but if you don't have the tools you can just do a silly
-program:
+ksymoops will do this too with the correct tools, but if you don't have
+the tools you can just do a silly program:
char str[] = "\xXX\xXX\xXX...";
main(){}
diff --git a/Documentation/parport.txt b/Documentation/parport.txt
index 6cf09e631..854290f15 100644
--- a/Documentation/parport.txt
+++ b/Documentation/parport.txt
@@ -28,8 +28,8 @@ architecture-dependent code with (for example):
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 @@ KMod
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 @@ KMod will then automatically load parport_pc (with the options
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 @@ Files in /proc
==============
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").
-
-/proc/parport/0/autoprobe Any IEEE-1284 device ID information
- that has been acquired.
-
+configured. In each of those directories are a collection of files
+describing that parallel port.
+
+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 @@ regardless of base address.
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.
diff --git a/Documentation/pcwd-watchdog.txt b/Documentation/pcwd-watchdog.txt
index 878ca69f3..a586667aa 100644
--- a/Documentation/pcwd-watchdog.txt
+++ b/Documentation/pcwd-watchdog.txt
@@ -1,6 +1,6 @@
Berkshire Products PC Watchdog Card
Support for ISA Cards Revision A and C
- Documentation and Driver by Ken Hollis <khollis@nurk.org>
+ Documentation and Driver by Ken Hollis <kenji@bitgate.com>
The PC Watchdog is a card that offers the same type of functionality that
the WDT card does, only it doesn't require an IRQ to run. Furthermore,
@@ -15,7 +15,7 @@
The Watchdog Driver will automatically find your watchdog card, and will
attach a running driver for use with that card. After the watchdog
drivers have initialized, you can then talk to the card using the PC
- Watchdog program, available from ftp.bitgate.com:/pub/bitgate/pcwd.
+ Watchdog program, available from http://ftp.bitgate.com/pcwd/.
I suggest putting a "watchdog -d" before the beginning of an fsck, and
a "watchdog -e -t 1" immediately after the end of an fsck. (Remember
@@ -128,4 +128,7 @@ int main(int argc, char *argv[])
And that's all she wrote!
-- Ken Hollis
- (khollis@nurk.org)
+ (kenji@bitgate.com)
+
+(This documentation may be out of date. Check
+ http://ftp.bitgate.com/pcwd/ for the absolute latest additions.)
diff --git a/Documentation/sound/Introduction b/Documentation/sound/Introduction
index 14fadf3fe..f33121e0c 100644
--- a/Documentation/sound/Introduction
+++ b/Documentation/sound/Introduction
@@ -1,6 +1,6 @@
-Soundcore Notes on Modular Sound Drivers and Soundcore
+Introduction Notes on Modular Sound Drivers and Soundcore
Wade Hampton
-11/20/1998
+6/30/1999
Purpose:
========
@@ -10,13 +10,21 @@ support modules sound.o, soundlow.o and soundcore.o.
Note, some of this probably should be added to the Sound-HOWTO!
+
Copying:
========
none
+
History:
========
-0.1.0 11/20/1998 First version
+0.1.0 11/20/1998 First version, draft
+1.0.0 11/1998 Alan Cox changes, incorporation in 2.2.0
+ as /usr/src/linux/Documentation/sound/Introduction
+1.1.0 6/30/1999 Second version, added notes on making the drivers,
+ added info on multiple sound cards of similar types,]
+ added more diagnostics info, added info about esd.
+ added info on OSS and ALSA.
Modular Sound Drivers:
@@ -58,6 +66,53 @@ Warning, the options for different cards sometime use different names
for the same or a similar feature (dma1= versus dma16=). As a last
resort, inspect the code (search for MODULE_PARM).
+Notes:
+
+1. There is a new OpenSource sound driver called ALSA which is
+ currently under development: http://www.alsa-project.org/
+ I have not tried it nor am I aware of its status, but it is
+ currently under development.
+
+2. The commercial OSS driver may be obtained from the site:
+ http://www/opensound.com. This may be used for cards that
+ are unsupported by the kernel driver, or may be used
+ by other operating systems.
+
+3. The enlightenment sound daemon may be used for playing
+ multiple sounds at the same time via a single card, eliminating
+ some of the requirements for multiple sound card systems. For
+ more information, see: http://www.tux.org/~ricdude/EsounD.html
+ The "esd" program may be used with the real-player and mpeg
+ players like mpg123 and x11amp.
+
+
+Building the Modules:
+=====================
+
+This document does not provide full details on building the
+kernel, etc. The notes below apply only to making the kernel
+sound modules. If this conflicts with the kernel's README,
+the README takes precedence.
+
+1. To make the kernel sound modules, cd to your /usr/src/linux
+ directory (typically) and type make config, make menuconfig,
+ or make xconfig (to start the command line, dialog, or x-based
+ configuration tool).
+
+2. Select the Sound option and a dialog will be displayed.
+
+3. Select M (module) for "Sound card support".
+
+4. Select your sound driver(s) as a module. For ProAudio, Sound
+ Blaster, etc., select M (module) for OSS sound modules.
+ [thanks to marvin stodolsky <stodolsk@erols.com>]A
+
+5. Make the kernel (e.g., make dep ; make bzImage), and install
+ the kernel.
+
+6. Make the modules and install them (make modules; make modules_install).
+
+
INSMOD:
=======
@@ -82,6 +137,9 @@ echo Starting sound blaster....
/sbin/insmod uart401
/sbin/insmod sb io=$SB_BASE irq=$SB_IRQ dma=$SB_DMA dma16=$SB_DMA2 mpu_io=$SB_MP
+When using sound as a module, I typically put these commands
+in a file such as /root/soundon.sh.
+
MODPROBE:
=========
@@ -117,8 +175,8 @@ which other modules may be checked by:
soundcore 1968 8 [sb sound]
-Removing Sound:
-===============
+Removing Sound:
+===============
Sound may be removed by using /sbin/rmmod in the reverse order
in which you load the modules. Note, if a program has a sound device
@@ -134,6 +192,25 @@ in the reverse order in which I loaded the modules):
/sbin/rmmod soundlow
/sbin/rmmod soundcore
+When using sound as a module, I typically put these commands
+in a script such as /root/soundoff.sh.
+
+
+Removing Sound for use with OSS:
+================================
+
+If you get really stuck or have a card that the kernel modules
+will not support, you can get a commercial sound driver from
+http://www.opensound.com. Before loading the commercial sound
+driver, you should do the following:
+
+1. remove sound modules (detailed above)
+2. remove the sound modules from /etc/conf.modules
+3. move the sound modules from /lib/modules/<kernel>/misc
+ (for example, I make a /lib/modules/<kernel>/misc/tmp
+ directory and copy the sound module files to that
+ directory).
+
Multiple Sound Cards:
=====================
@@ -154,11 +231,30 @@ All you have to do is to load the one you want as /dev/dsp
first (in my case "sb") and then load the other one
(in my case "cs4232").
+If you have two cards of the same type that are jumpered
+cards or different PnP revisions, you may load the same
+module twice. For example, I have a SoundBlaster vibra 16
+and an older SoundBlaster 16 (jumpers). To load the module
+twice, you need to do the following:
+
+1. Copy the sound modules to a new name. For example
+ sb.o could be copied (or symlinked) to sb1.o for the
+ second SoundBlasster.
+
+2. Make a second entry in /etc/conf.modules, for example,
+ sound1 or sb1. This second entry should refer to the
+ new module names for example sb1, and should include
+ the I/O, etc. for the second sound card.
+
+3. Update your soundon.sh script, etc.
+
Warning: I have never been able to get two PnP sound cards of the
same type to load at the same time. I have tried this several times
with the Soundblaster Vibra 16 cards. OSS has indicated that this
is a PnP problem.... If anyone has any luck doing this, please
-send me an E-MAIL. PCI sound cards should not have this problem.
+send me an E-MAIL. PCI sound cards should not have this problem.a
+Since this was originally release, I have received a couple of
+mails from people who have accomplished this!
Sound Problems:
@@ -175,6 +271,8 @@ in the Sound-HOWTO).
write down what addresses, IRQ, and DMA channels
those were using for the same hardware. You probably
can use these addresses, IRQs, and DMA channels.
+ You should really do this BEFORE attempting to get
+ sound working!
B) Check (cat) /proc/interrupts, /proc/ioports,
and /proc/dma. Are you trying to use an address,
@@ -184,22 +282,44 @@ in the Sound-HOWTO).
may need a kernel patch to get this device).
D) Inspect your /var/log/messages file. Often that will
- indicate what IRQ or IO port could not be obtained
+ indicate what IRQ or IO port could not be obtained.
E) Try another port or IRQ. Note this may involve
using the PnP tools to move the sound card to
- another location.
+ another location. Sometimes this is the only way
+ and it is more or less trial and error.
-2) If you get motorboating (the same sound or part of a
+2) If you get motor-boating (the same sound or part of a
sound clip repeated), you probably have either an IRQ
- or DMA conflict. Move the card to another address. This
- has happened to me when playing long files when I had
- an IRQ conflict.
-
-3) Ask for help on the sound list or send E-MAIL to the
+ or DMA conflict. Move the card to another IRQ or DMA
+ port. This has happened to me when playing long files
+ when I had an IRQ conflict.
+
+3. If you get dropouts or pauses when playing high sample
+ rate files such as using mpg123 or x11amp/xmms, you may
+ have too slow of a CPU and may have to use the options to
+ play the files at 1/2 speed. For example, you may use
+ the -2 or -4 option on mpg123. You may also get this
+ when trying to play mpeg files stored on a CD-ROM
+ (my Toshiba T8000 PII/366 sometimes has this problem).
+
+4. If you get "cannot access device" errors, your /dev/dsp
+ files, etc. may be set to owner root, mode 600. You
+ may have to use the command:
+ chmod 666 /dev/dsp /dev/mixer /dev/audio
+
+5. If you get "device busy" errors, another program has the
+ sound device open. For example, if using the Enlightenment
+ sound daemon "esd", the "esd" program has the sound device.
+ If using "esd", please RTFM the docs on ESD. For example,
+ esddsp <program> may be used to play files via a non-esd
+ aware program.
+
+
+6) Ask for help on the sound list or send E-MAIL to the
sound driver author/maintainer.
-4) Turn on debug in drivers/sound/sound_config.h (DEB, DDB, MDB).
+7) Turn on debug in drivers/sound/sound_config.h (DEB, DDB, MDB).
Configuring Sound:
@@ -210,7 +330,8 @@ There are several ways of configuring your sound:
1) Hardcoded in the kernel at compile time (not applicable when
using sound modules). This was the OLD way!
-2) On the command line when using insmod.
+2) On the command line when using insmod or in a bash script
+ using command line calls to load sound.
3) In /etc/conf.modules when using modprobe.
@@ -224,7 +345,6 @@ And I am sure, several other ways.
Anyone want to write a linuxconf module for configuring sound?
-
For More Information (RTFM):
============================
1) Information on kernel modules: linux/Documentation/modules.txt
@@ -242,8 +362,12 @@ For More Information (RTFM):
7) The sndconfig and rhsound documentation from Red Hat.
-8) The Linux-sound mailing list: sound-list@redhat.com
+8) The Linux-sound mailing list: sound-list@redhat.com.
+9) Enlightenment documentation (for info on esd)
+ http://www.tux.org/~ricdude/EsounD.html.
+
+10) ALSA home page: http://www.alsa-project.org/
Contact Information:
@@ -251,3 +375,4 @@ Contact Information:
Wade Hampton: (whampton@staffnet.com)
+
diff --git a/Documentation/sound/OPL3-SA2 b/Documentation/sound/OPL3-SA2
index fb07d6a0a..a51a4aebb 100644
--- a/Documentation/sound/OPL3-SA2
+++ b/Documentation/sound/OPL3-SA2
@@ -46,6 +46,21 @@ possible for most people with PnP BIOS. If it does not work for you,
then email me if you are willing to experiment in an effort to make it
work.
+************************************************************************
+* I have now had two such machines, and I have fixed this to work
+* properly when built into the kernel. The Toshiba Libretto series, or
+* at least models 70CT and 110CT which I have owned, use a Yamaha
+* OPL3-SAx (OPL3-SA3 according to documentation) sound chip, IRQ 5,
+* IO addresses 220/530/388/330/370 and DMA 1,0 (_not_ 0,1). All these
+* configuration settings can be gathered by booting another OS which
+* recognizes the card already.
+*
+* I have made things 'just work' for the non-modular case on such
+* machines when configured properly.
+*
+* David Luyer <luyer@ucs.uwa.edu.au>
+************************************************************************
+
If you are using isapnp, follow the directions in its documentation to
produce a configuration file. Here is the relevant excerpt I use for
my SAx card from my isapnp.conf:
diff --git a/Documentation/sysctl/README b/Documentation/sysctl/README
index cf062682a..fccc16512 100644
--- a/Documentation/sysctl/README
+++ b/Documentation/sysctl/README
@@ -1,4 +1,4 @@
-Documentation for /proc/sys/ kernel version 2.2.5
+Documentation for /proc/sys/ kernel version 2.2.10
(c) 1998, 1999, Rik van Riel <riel@nl.linux.org>
'Why', I hear you ask, 'would anyone even _want_ documentation
diff --git a/Documentation/sysctl/fs.txt b/Documentation/sysctl/fs.txt
index b88d5ed5c..ed53d96c7 100644
--- a/Documentation/sysctl/fs.txt
+++ b/Documentation/sysctl/fs.txt
@@ -1,4 +1,4 @@
-Documentation for /proc/sys/fs/* kernel version 2.2.5
+Documentation for /proc/sys/fs/* kernel version 2.2.10
(c) 1998, 1999, Rik van Riel <riel@nl.linux.org>
For general info and legal blurb, please look in README.
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index 8f65d6037..01fbbc9c4 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -1,4 +1,4 @@
-Documentation for /proc/sys/kernel/* kernel version 2.2.5
+Documentation for /proc/sys/kernel/* kernel version 2.2.10
(c) 1998, 1999, Rik van Riel <riel@nl.linux.org>
For general info and legal blurb, please look in README.
@@ -76,12 +76,21 @@ to decide what to do with it.
domainname & hostname:
-These files can be controlled to set the domainname and
-hostname of your box. For the classic darkstar.frop.org
-a simple:
+These files can be used to set the NIS/YP domainname and the
+hostname of your box in exactly the same way as the commands
+domainname and hostname, i.e.:
# echo "darkstar" > /proc/sys/kernel/hostname
-# echo "frop.org" > /proc/sys/kernel/domainname
-would suffice to set your hostname and domainname.
+# echo "mydomain" > /proc/sys/kernel/domainname
+has the same effect as
+# hostname "darkstar" > /proc/sys/kernel/hostname
+# domainname "mydomain" > /proc/sys/kernel/domainname
+
+Note, however, that the classic darkstar.frop.org has the
+hostname "darkstar" and DNS (Internet Domain Name Server)
+domainname "frop.org", not to be confused with the NIS (Network
+Information Service) or YP (Yellow Pages) domainname. These two
+domain names are in general different. For a detailed discussion
+see the hostname(1) man page.
==============================================================
diff --git a/Documentation/sysctl/sunrpc.txt b/Documentation/sysctl/sunrpc.txt
index 4a52862c5..ae1ecac6f 100644
--- a/Documentation/sysctl/sunrpc.txt
+++ b/Documentation/sysctl/sunrpc.txt
@@ -1,4 +1,4 @@
-Documentation for /proc/sys/sunrpc/* kernel version 2.2.5
+Documentation for /proc/sys/sunrpc/* kernel version 2.2.10
(c) 1998, 1999, Rik van Riel <riel@nl.linux.org>
For general info and legal blurb, please look in README.
diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt
index 470c001d3..5fe4af170 100644
--- a/Documentation/sysctl/vm.txt
+++ b/Documentation/sysctl/vm.txt
@@ -1,4 +1,4 @@
-Documentation for /proc/sys/vm/* kernel version 2.2.5
+Documentation for /proc/sys/vm/* kernel version 2.2.10
(c) 1998, 1999, Rik van Riel <riel@nl.linux.org>
For general info and legal blurb, please look in README.
diff --git a/Documentation/video4linux/API.html b/Documentation/video4linux/API.html
index 1af60ed4e..b4b9d0dcc 100644
--- a/Documentation/video4linux/API.html
+++ b/Documentation/video4linux/API.html
@@ -1,6 +1,9 @@
<HTML><HEAD>
-<TITLE>Video4Linux Kernel API Reference v0.1:19980516</TITLE>
+<TITLE>Video4Linux Kernel API Reference v0.1:19990430</TITLE>
</HEAD>
+<! Revision History: >
+<! 4/30/1999 - Fred Gleason (fredg@wava.com)>
+<! Documented extensions for the Radio Data System (RDS) extensions >
<BODY bgcolor="#ffffff">
<H3>Devices</H3>
Video4Linux provides the following sets of device files. These live on the
@@ -117,7 +120,7 @@ fields available to the user.
</TABLE>
<P>
Merely setting the window does not enable capturing. Overlay capturing
-is activatied by passing the <b>VIDIOCCAPTURE</b> ioctl a value of 1, and
+is activated by passing the <b>VIDIOCCAPTURE</b> ioctl a value of 1, and
disabled by passing it a value of 0.
<P>
Some capture devices can capture a subfield of the image they actually see.
@@ -150,7 +153,7 @@ the <b>struct video_channel</b> is filled in with information about the
nature of the channel itself.
<P>
The <b>VIDIOCSCHAN</b> ioctl takes an integer argument and switches the
-capture to this input. It is not defined whether paramters such as colour
+capture to this input. It is not defined whether parameters such as colour
settings or tuning are maintained across a channel switch. The caller should
maintain settings as desired for each channel. (This is reasonable as
different video inputs may have different properties).
@@ -249,6 +252,8 @@ The following flags exist
<TR><TD><b>VIDEO_TUNER_LOW</b><TD>Frequency is in a lower range</TD>
<TR><TD><b>VIDEO_TUNER_NORM</b><TD>The norm for this tuner is settable</TD>
<TR><TD><b>VIDEO_TUNER_STEREO_ON</b><TD>The tuner is seeing stereo audio</TD>
+<TR><TD><b>VIDEO_TUNER_RDS_ON</b><TD>The tuner is seeing a RDS datastream</TD>
+<TR><TD><b>VIDEO_TUNER_MBS_ON</b><TD>The tuner is seeing a MBS datastream</TD>
</TABLE>
<P>
The following modes are defined
@@ -349,6 +354,21 @@ devices if any exist. The video_unit structure has the following fields.
<TR><TD><b>teletext</b><TD>Teletext device</TD>
</TABLE>
<P>
-
+<H3>RDS Datastreams</H3>
+For radio devices that support it, it is possible to receive Radio Data
+System (RDS) data by means of a read() on the device. The data is packed in
+groups of three, as follows:
+<TABLE>
+<TR><TD>First Octet</TD><TD>Least Siginificant Byte of RDS Block</TD></TR>
+<TR><TD>Second Octet</TD><TD>Most Siginificant Byte of RDS Block
+<TR><TD>Third Octet</TD><TD>Bit 7:</TD><TD>Error bit. Indicates that
+an uncorrectable error occured during reception of this block.</TD></TR>
+<TR><TD>&nbsp;</TD><TD>Bit 6:</TD><TD>Corrected bit. Indicates that
+an error was corrected for this data block.</TD></TR>
+<TR><TD>&nbsp;</TD><TD>Bits 5-3:</TD><TD>Reeived Offset. Indicates the
+offset received by the sync system.</TD></TR>
+<TR><TD>&nbsp;</TD><TD>Bits 2-0:</TD><TD>Offset Name. Indicates the
+offset applied to this data.</TD></TR>
+</TABLE>
</BODY>
</HTML>
diff --git a/Documentation/video4linux/README.buz b/Documentation/video4linux/README.buz
new file mode 100644
index 000000000..b9eb9cd74
--- /dev/null
+++ b/Documentation/video4linux/README.buz
@@ -0,0 +1,212 @@
+Iomega Buz Driver for Linux
+===========================
+
+by Rainer Johanni <Rainer@Johanni.de>
+
+Compiling and Loading the Driver
+================================
+
+You must run a 2.2.x kernel in order to use this driver.
+
+To compile the driver, just type make.
+
+Besides the files in this directory, the driver needs the
+'videodev' and the 'i2c' module from the Linux kernel.
+In order to get these modules available, enable module support
+for VIDEODEV and BTTV (which implies i2c) in your kernel
+configuration. You find these devices in the menu
+"Character Devices" in your Kernel Configuration.
+
+Before you load the driver you must have a video device
+at major device node 81. If you don't have it yet, do the
+following (as root!):
+
+cd /dev
+mknod video0 c 81 0
+ln -s video0 video
+
+Edit the 'update' script if you want to give the driver
+special options and then type (as root)
+
+./update
+
+to insert all the necessary modules into the kernel.
+
+If you want to make full use of the Video for Linux uncompressed
+grabbing facilities, you must either
+
+- obtain and install the "big_physarea patch" for your kernel and
+ set aside the necessary memory during boot time.
+ There seem to be several versions of this patch against
+ various kernel versions floating around in the net,
+ you may obtain one e.g. from:
+ http://www.polyware.nl/~middelin/patch/bigphysarea-2.2.1.tar.gz
+ You also have to compile your driber AFTER installing that patch
+ in order to get it working
+
+ or
+
+- start your kernel with the mem=xxx option, where xxx is your
+ real memory minus the memory needed for the buffers.
+ For doing this add an entry in lilo.conf (if you use lilo):
+ append "mem=xxxM"
+ or add a line in your linux.par file (if you use loadlin):
+ mem=xxxM
+
+The second method is by far easier, however it is dangerous
+if more than one driver at a time has the idea to use the memory
+leftover by setting the mem=xxx parameter below the actual
+memory size.
+
+Read also below how to use this memory!
+
+
+
+Driver Options
+==============
+
+You are able to customize the behavior of the driver by giving
+it some options at start time.
+
+default_input, default_norm
+---------------------------
+
+As soon as the driver is loaded, the Buz samples video signals
+from one of its input ports and displays it on its output.
+The driver uses the Composite Input and the video norm PAL for this.
+If you want to change this default behavior, set default_input=1
+(for S-VHS input) or default_norm=1 for NTSC.
+
+v4l_nbufs, v4l_bufsize
+----------------------
+
+In order to make to make full use of the Video for Linux picture
+grabbing facilities of the driver (which are needed by many
+Video for Linux applications), the driver needs a set of
+physically contiguous buffers for grabbing. These parameters
+determine how many buffers of which size the driver will
+allocate at open (the open will fail if it is unable to do so!).
+
+These values do not affect the MJPEG grabbing facilities of the driver,
+they are needed for uncompressed image grabbing only!!!
+
+v4l_nbufs is the number of buffers to allocate, a value of 2 (the default)
+should be sufficient in allmost all cases. Only special applications
+(streaming captures) will need more buffers and then mostly the
+MJPEG capturing features of the Buz will be more apropriate.
+So leave this parameter at it's default unless you know what you do.
+
+The things for v4l_bufsize are more complicated:
+v4l_bufsize is set by default to 128 [KB] which is the maximum
+amount of physically contiguous memory Linux is able to allocate
+without kernel changes. This is sufficient for grabbing 24 bit color images
+up to sizes of approx. 240x180 pixels (240*180*3 = 129600, 128 KB = 131072).
+
+In order to be able to capture bigger images you have either to
+- obtain and install the "big_physarea patch" and set aside
+ the necessary memory during boot time or
+- start your kernel with the mem=xxx option, where xxx is your
+ real memory minus the memory needed for the buffers.
+In that case, usefull settings for v4l_bufsize are
+- 1296 [Kb] for grabbing 24 bit images of max size 768*576
+- 1728 [Kb] for 32bit images of same size (4*768*576 = 1728 Kb!)
+You may reduce these numbers accordingly if you know you are only
+grabbing 720 pixels wide images or NTSC images (max height 480).
+
+In some cases it may happen that Linux isn't even able to obtain
+the default 128 KB buffers. If you don't need uncompressed image
+grabbing at all, set v4l_bufsize to an arbitrary small value (e.g. 4)
+in order to be able to open the video device.
+
+vidmem
+------
+
+The video mem address of the video card.
+The driver has a little database for some videocards
+to determine it from there. If your video card is not in there
+you have either to give it to the driver as a parameter
+or set in in a VIDIOCSFBUF ioctl
+
+The videocard database is contained in the file "videocards.h"
+Gernot Ziegler wants to keep an actual version of that file.
+If your card is not contained in that file, look at
+http://www.lysator.liu.se/~gz/buz/ for an actual version of
+"videocards.h".
+
+triton, natoma
+--------------
+
+The driver tries to detect if you have a triton or natome chipset
+in order to take special messures for these chipsets.
+If this detection fails but you are sure you have such a chipset,
+set the corresponding variable to 1.
+This is a very special option and may go away in the future.
+
+
+
+Programming interface
+=====================
+
+This driver should be fully compliant to Video for Linux, so all
+tools working with Video for Linux should work with (hopefully)
+no problems.
+
+A description of the Video for Linux programming interace can be found at:
+http://roadrunner.swansea.linux.org.uk/v4lapi.shtml
+
+Besides the Video for Linux interface, the driver has a "proprietary"
+interface for accessing the Buz's MJPEG capture and playback facilities.
+
+The ioctls for that interface are as follows:
+
+BUZIOC_G_PARAMS
+BUZIOC_S_PARAMS
+
+Get and set the parameters of the buz. The user should allways
+do a BUZIOC_G_PARAMS (with a struct buz_params) to obtain the default
+settings, change what he likes and then make a BUZIOC_S_PARAMS call.
+A typical application should at least set the members
+input, norm and decimation of the struct buz_params.
+For a full description of all members see "buz.h"
+
+BUZIOC_REQBUFS
+
+Before being able to capture/playback, the user has to request
+the buffers he is wanting to use. Fill the structure
+buz_requestbuffers with the size (recommended: 256*1024) and
+the number (recommended 32 up to 256). There are no such restrictions
+as for the Video for Linux buffers, you should LEAVE SUFFICIENT
+MEMORY for your system however, else strange things will happen ....
+On return, the buz_requestbuffers structure contains number and
+size of the actually allocated buffers.
+You should use these numbers for doing a mmap of the buffers
+into the user space.
+The BUZIOC_REQBUFS ioctl also makes it happen, that the next mmap
+maps the MJPEG buffer instead of the V4L buffers.
+
+BUZIOC_QBUF_CAPT
+BUZIOC_QBUF_PLAY
+
+Queue a buffer for capture or playback. The first call also starts
+streaming capture. When streaming capture is going on, you may
+only queue further buffers or issue syncs until streaming
+capture is switched off again with a argument of -1 to
+a BUZIOC_QBUF_CAPT/BUZIOC_QBUF_PLAY ioctl.
+
+BUZIOC_SYNC
+
+Issue this ioctl when all buffers are queued. This ioctl will
+block until the first buffer becomes free for saving its
+data to disk (after BUZIOC_QBUF_CAPT) or for reuse (after BUZIOC_QBUF_PLAY).
+
+BUZIOC_G_STATUS
+
+Get the status of the input lines (video source connected/norm).
+This ioctl may be subject to change.
+
+
+
+
+
+See the examples directory delivered with this driver
+for actual coding examples!
diff --git a/Documentation/video4linux/bttv/PROBLEMS b/Documentation/video4linux/bttv/PROBLEMS
index 6148f859c..744d1155b 100644
--- a/Documentation/video4linux/bttv/PROBLEMS
+++ b/Documentation/video4linux/bttv/PROBLEMS
@@ -17,9 +17,9 @@
If this 64MB area overlaps the IO memory of the Bt848 you also have to
remap this. E.g.: insmod bttv vidmem=0xfb0 remap=0xfa0
- If the videomemory is found at the right place and there are no address
- conflicts but still no picture (or the computer even crashes.),
- try disabling features of your PCI chipset in the BIOS Setup.
+ If the video memory is found at the right place and there are no address
+ conflicts but still no picture (or the computer even crashes),
+ try disabling features of your PCI chipset in the BIOS setup.
Frank Kapahnke <frank@kapahnke.prima.ruhr.de> also reported that problems
with his S3 868 went away when he upgraded to XFree 3.2.
@@ -50,13 +50,13 @@
Disable backing store by starting X with the option "-bs"
-- When using 32bpp in XFree or 24+8bpp mode in AccelX 3.1 the system
+- When using 32 bpp in XFree or 24+8bpp mode in AccelX 3.1 the system
can sometimes lock up if you use more than 1 bt848 card at the same time.
You will always get pixel errors when e.g. using more than 1 card in full
screen mode. Maybe we need something faster than the PCI bus ...
-- Some S3 cards and the Matrox Mystique will produce pixel erros with
- full resolution in 32bit mode.
+- Some S3 cards and the Matrox Mystique will produce pixel errors with
+ full resolution in 32-bit mode.
- Some video cards have problems with Accelerated X 4.1 \ No newline at end of file
diff --git a/Documentation/video4linux/bttv/README.RADIO b/Documentation/video4linux/bttv/README.RADIO
index 53d04f59b..f22f9c0ca 100644
--- a/Documentation/video4linux/bttv/README.RADIO
+++ b/Documentation/video4linux/bttv/README.RADIO
@@ -6,7 +6,7 @@ Support is in now:
So you should have TV with (stereo) sound now. Radio does _not_ work.
It probably does not work with sat receivers. I can't test this and
-therefore hav'nt added support for it yet. If someone needs this and
+therefore have not added support for it yet. If someone needs this and
can help testing the sat stuff, drop me a note.
Gerd
diff --git a/Documentation/video4linux/bttv/THANKS b/Documentation/video4linux/bttv/THANKS
index 0da6d9f8e..2085399da 100644
--- a/Documentation/video4linux/bttv/THANKS
+++ b/Documentation/video4linux/bttv/THANKS
@@ -17,7 +17,7 @@ Many thanks to:
components on their cards. (E.g. how the tuner type is detected)
Without their card I could not have debugged the NTSC mode.
-- Hauppauge for telling how the sound input is selected and what compenents
+- Hauppauge for telling how the sound input is selected and what components
they do and will use on their radio cards.
Also many thanks for faxing me the FM1216 data sheet.