Hi,
Sync Documentation/devices.txt with the new version from the LANANA
site (http://www.lanana.org/docs/device-list/devices-2.6+.txt)
Signed-off-by: Peter Korsgaard <[email protected]>
diff -urpN linux-2.6.18-rc4.orig/Documentation/devices.txt linux-2.6.18-rc4/Documentation/devices.txt
--- linux-2.6.18-rc4.orig/Documentation/devices.txt 2006-08-22 16:58:14.000000000 +0200
+++ linux-2.6.18-rc4/Documentation/devices.txt 2006-08-22 16:57:21.000000000 +0200
@@ -3,7 +3,7 @@
Maintained by Torben Mathiasen <[email protected]>
- Last revised: 15 May 2006
+ Last revised: 21 August 2006
This list is the Linux Device List, the official registry of allocated
device numbers and /dev directory nodes for the Linux operating
@@ -1522,7 +1522,7 @@ Your cooperation is appreciated.
disks (see major number 3) except that the limit on
partitions is 15.
- 83 char Matrox mga_vid video driver
+ 83 char Matrox mga_vid video driver
0 = /dev/mga_vid0 1st video card
1 = /dev/mga_vid1 2nd video card
2 = /dev/mga_vid2 3rd video card
@@ -1731,7 +1731,7 @@ Your cooperation is appreciated.
0 = /dev/ubda First user-mode block device
16 = /dev/udbb Second user-mode block device
...
-
+
Partitions are handled in the same way as for IDE
disks (see major number 3) except that the limit on
partitions is 15.
@@ -2305,7 +2305,7 @@ Your cooperation is appreciated.
0 = /dev/drbd0 First DRBD device
1 = /dev/drbd1 Second DRBD device
...
-
+
148 char Technology Concepts serial card
0 = /dev/ttyT0 First TCL port
1 = /dev/ttyT1 Second TCL port
@@ -2565,10 +2565,10 @@ Your cooperation is appreciated.
243 = /dev/usb/dabusb3 Fourth dabusb device
180 block USB block devices
- 0 = /dev/uba First USB block device
- 8 = /dev/ubb Second USB block device
- 16 = /dev/ubc Third USB block device
- ...
+ 0 = /dev/uba First USB block device
+ 8 = /dev/ubb Second USB block device
+ 16 = /dev/ubc Third USB block device
+ ...
181 char Conrad Electronic parallel port radio clocks
0 = /dev/pcfclock0 First Conrad radio clock
@@ -2767,7 +2767,7 @@ Your cooperation is appreciated.
42 = /dev/ttySMX1 Motorola i.MX - port 1
43 = /dev/ttySMX2 Motorola i.MX - port 2
44 = /dev/ttyMM0 Marvell MPSC - port 0
- 45 = /dev/ttyMM1 Marvell MPSC - port 1
+ 45 = /dev/ttyMM1 Marvell MPSC - port 1
46 = /dev/ttyCPM0 PPC CPM (SCC or SMC) - port 0
...
47 = /dev/ttyCPM5 PPC CPM (SCC or SMC) - port 5
@@ -2792,6 +2792,9 @@ Your cooperation is appreciated.
...
185 = /dev/ttyNX15 Hilscher netX serial port 15
186 = /dev/ttyJ0 JTAG1 DCC protocol based serial port emulation
+ 187 = /dev/ttyUL0 Xilinx uartlite - port 0
+ ...
+ 190 = /dev/ttyUL3 Xilinx uartlite - port 3
205 char Low-density serial ports (alternate device)
0 = /dev/culu0 Callout device for ttyLU0
@@ -3005,11 +3008,11 @@ Your cooperation is appreciated.
2 = /dev/3270/tub2 Second 3270 terminal
...
-229 char IBM iSeries virtual console
- 0 = /dev/iseries/vtty0 First console port
- 1 = /dev/iseries/vtty1 Second console port
+229 char IBM iSeries/pSeries virtual console
+ 0 = /dev/hvc0 First console port
+ 1 = /dev/hvc1 Second console port
...
-
+
230 char IBM iSeries virtual tape
0 = /dev/iseries/vt0 First virtual tape, mode 0
1 = /dev/iseries/vt1 Second virtual tape, mode 0
@@ -3091,7 +3094,7 @@ Your cooperation is appreciated.
This major is reserved to assist the expansion to a
larger number space. No device nodes with this major
should ever be created on the filesystem.
- (This is probaly not true anymore, but I'll leave it
+ (This is probaly not true anymore, but I'll leave it
for now /Torben)
---LARGE MAJORS!!!!!---
--
Bye, Peter Korsgaard
On Tue, 22 Aug 2006 17:08:13 +0200 Peter Korsgaard wrote:
> Hi,
>
> Sync Documentation/devices.txt with the new version from the LANANA
> site (http://www.lanana.org/docs/device-list/devices-2.6+.txt)
>
> Signed-off-by: Peter Korsgaard <[email protected]>
>
> diff -urpN linux-2.6.18-rc4.orig/Documentation/devices.txt linux-2.6.18-rc4/Documentation/devices.txt
> --- linux-2.6.18-rc4.orig/Documentation/devices.txt 2006-08-22 16:58:14.000000000 +0200
> +++ linux-2.6.18-rc4/Documentation/devices.txt 2006-08-22 16:57:21.000000000 +0200
> @@ -3,7 +3,7 @@
>
> Maintained by Torben Mathiasen <[email protected]>
Maybe Torben could update or ack/nack or comment?
> @@ -1522,7 +1522,7 @@ Your cooperation is appreciated.
> disks (see major number 3) except that the limit on
> partitions is 15.
>
> - 83 char Matrox mga_vid video driver
> + 83 char Matrox mga_vid video driver
Please don't add trailing whitespace like above.
> @@ -1731,7 +1731,7 @@ Your cooperation is appreciated.
> 0 = /dev/ubda First user-mode block device
> 16 = /dev/udbb Second user-mode block device
> ...
> -
> +
More trailing whitespace above.
> Partitions are handled in the same way as for IDE
> disks (see major number 3) except that the limit on
> partitions is 15.
> @@ -2305,7 +2305,7 @@ Your cooperation is appreciated.
> 0 = /dev/drbd0 First DRBD device
> 1 = /dev/drbd1 Second DRBD device
> ...
> -
> +
ditto.
> 148 char Technology Concepts serial card
> 0 = /dev/ttyT0 First TCL port
> 1 = /dev/ttyT1 Second TCL port
> @@ -2767,7 +2767,7 @@ Your cooperation is appreciated.
> 42 = /dev/ttySMX1 Motorola i.MX - port 1
> 43 = /dev/ttySMX2 Motorola i.MX - port 2
> 44 = /dev/ttyMM0 Marvell MPSC - port 0
> - 45 = /dev/ttyMM1 Marvell MPSC - port 1
> + 45 = /dev/ttyMM1 Marvell MPSC - port 1
again
> 46 = /dev/ttyCPM0 PPC CPM (SCC or SMC) - port 0
> ...
> 47 = /dev/ttyCPM5 PPC CPM (SCC or SMC) - port 5
> @@ -3005,11 +3008,11 @@ Your cooperation is appreciated.
> 2 = /dev/3270/tub2 Second 3270 terminal
> ...
>
> -229 char IBM iSeries virtual console
> - 0 = /dev/iseries/vtty0 First console port
> - 1 = /dev/iseries/vtty1 Second console port
> +229 char IBM iSeries/pSeries virtual console
> + 0 = /dev/hvc0 First console port
> + 1 = /dev/hvc1 Second console port
> ...
> -
> +
again
> 230 char IBM iSeries virtual tape
> 0 = /dev/iseries/vt0 First virtual tape, mode 0
> 1 = /dev/iseries/vt1 Second virtual tape, mode 0
> @@ -3091,7 +3094,7 @@ Your cooperation is appreciated.
> This major is reserved to assist the expansion to a
> larger number space. No device nodes with this major
> should ever be created on the filesystem.
> - (This is probaly not true anymore, but I'll leave it
> + (This is probaly not true anymore, but I'll leave it
whitespace. again.
and s/probaly/probably/
> for now /Torben)
---
~Randy
On Tue, Aug 22, Peter Korsgaard wrote:
> -229 char IBM iSeries virtual console
> - 0 = /dev/iseries/vtty0 First console port
> - 1 = /dev/iseries/vtty1 Second console port
> +229 char IBM iSeries/pSeries virtual console
> + 0 = /dev/hvc0 First console port
hvc0 is pSeries only, iSeries uses tty1 for its OS400 provided telnet
console. I doubt there is a hvc1.
>@@ -2565,10 +2565,10 @@ Your cooperation is appreciated.
> 243 = /dev/usb/dabusb3 Fourth dabusb device
>
> 180 block USB block devices
>- 0 = /dev/uba First USB block device
>- 8 = /dev/ubb Second USB block device
>- 16 = /dev/ubc Third USB block device
>- ...
>+ 0 = /dev/uba First USB block device
>+ 8 = /dev/ubb Second USB block device
>+ 16 = /dev/ubc Third USB block device
>+ ...
What's the reason for this indent change?
Jan Engelhardt
--
On Tue, 22 Aug 2006 19:23:39 +0200 Olaf Hering <[email protected]> wrote:
>
> On Tue, Aug 22, Peter Korsgaard wrote:
>
>
> > -229 char IBM iSeries virtual console
> > - 0 = /dev/iseries/vtty0 First console port
> > - 1 = /dev/iseries/vtty1 Second console port
> > +229 char IBM iSeries/pSeries virtual console
> > + 0 = /dev/hvc0 First console port
>
> hvc0 is pSeries only, iSeries uses tty1 for its OS400 provided telnet
> console. I doubt there is a hvc1.
There is a new driver for the iSeries console which uses /dev/hvc0.
You are correct that there is not hvc1 on iSeries. (I actually submitted
the change to Devices.txt)
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
>>>>> "Randy" == Randy Dunlap <[email protected]> writes:
Hi.
>> Maintained by Torben Mathiasen <[email protected]>
Randy> Maybe Torben could update or ack/nack or comment?
Yeah - Torben?
>> @@ -1522,7 +1522,7 @@ Your cooperation is appreciated.
>> disks (see major number 3) except that the limit on
>> partitions is 15.
>>
>> - 83 char Matrox mga_vid video driver
>> + 83 char Matrox mga_vid video driver
Randy> Please don't add trailing whitespace like above.
I've just taken the file from lanana.org verbatim. I can fix the
issues in the patch or try to get Torben to change it on lanana.org,
but his turnaround time is pretty slow (took ~3 months for my ttyULx
nodes).
--
Bye, Peter Korsgaard
>>>>> "Jan" == Jan Engelhardt <[email protected]> writes:
Hi,
>> 180 block USB block devices
>> - 0 = /dev/uba First USB block device
>> - 8 = /dev/ubb Second USB block device
>> - 16 = /dev/ubc Third USB block device
>> - ...
>> + 0 = /dev/uba First USB block device
>> + 8 = /dev/ubb Second USB block device
>> + 16 = /dev/ubc Third USB block device
>> + ...
Jan> What's the reason for this indent change?
I don't know - Torben?
--
Bye, Peter Korsgaard
> >> Maintained by Torben Mathiasen <[email protected]>
>
>I've just taken the file from lanana.org verbatim. I can fix the
>issues in the patch or try to get Torben to change it on lanana.org,
>but his turnaround time is pretty slow (took ~3 months for my ttyULx
>nodes).
If you got a better turnaround time, propose your maintainership. :)
Jan Engelhardt
--
>>>>> "Jan" == Jan Engelhardt <[email protected]> writes:
Hi,
>> I've just taken the file from lanana.org verbatim. I can fix the
>> issues in the patch or try to get Torben to change it on lanana.org,
>> but his turnaround time is pretty slow (took ~3 months for my ttyULx
>> nodes).
Jan> If you got a better turnaround time, propose your maintainership. :)
No way, I'm not going there ;) Sorry if it sounded offensive.
My point was just that it's probably faster to change the copy in the
kernel tree than getting the one on lanana.org updated.
--
Bye, Peter Korsgaard
>
> Jan> If you got a better turnaround time, propose your maintainership. :)
>
>No way, I'm not going there ;) Sorry if it sounded offensive.
>
>My point was just that it's probably faster to change the copy in the
>kernel tree than getting the one on lanana.org updated.
Maybe the kernel one should be the official document.
Jan Engelhardt
--
Yeah, sorry about the slow turnaround time lately. Hopefully it will better soon :).
Please send me a patch and I'll have it in asap.
Torben
-----Original Message-----
From: Peter Korsgaard [mailto:[email protected]]
Sent: Wednesday, August 23, 2006 8:23 AM
To: Jan Engelhardt
Cc: Randy.Dunlap; [email protected]; [email protected]
Subject: Re: [PATCH] Update Documentation/devices.txt
>>>>> "Jan" == Jan Engelhardt <[email protected]> writes:
Hi,
>> I've just taken the file from lanana.org verbatim. I can fix the >> issues in the patch or try to get Torben to change it on lanana.org, >> but his turnaround time is pretty slow (took ~3 months for my ttyULx >> nodes).
Jan> If you got a better turnaround time, propose your maintainership. :)
No way, I'm not going there ;) Sorry if it sounded offensive.
My point was just that it's probably faster to change the copy in the kernel tree than getting the one on lanana.org updated.
--
Bye, Peter Korsgaard
> >>>>> "Jan" == Jan Engelhardt <[email protected]> writes:
>
> Hi,
>
> >> 180 block USB block devices
> >> - 0 = /dev/uba First USB block device
> >> - 8 = /dev/ubb Second USB block device
> >> - 16 = /dev/ubc Third USB block device
> >> - ...
> >> + 0 = /dev/uba First USB block device
> >> + 8 = /dev/ubb Second USB block device
> >> + 16 = /dev/ubc Third USB block device
> >> + ...
>
> Jan> What's the reason for this indent change?
>
> I don't know - Torben?
A wrong indent it seems. If someone else is working on getting this fixed let me know. Otherwise I'll update the kernel version of devices.txt and fix the whitespaces at the same time.
Torben
>>>>> "Torben" == Mathiasen, Torben <[email protected]> writes:
Torben> Yeah, sorry about the slow turnaround time lately. Hopefully it will better soon :).
Torben> Please send me a patch and I'll have it in asap.
Ok, here you go:
--- devices-2.6+.txt.orig 2006-08-23 11:07:41.000000000 +0200
+++ devices-2.6+.txt 2006-08-23 11:19:24.000000000 +0200
@@ -122,7 +122,7 @@ Your cooperation is appreciated.
devices are on major 128 and above and use the PTY
master multiplex (/dev/ptmx) to acquire a PTY on
demand.
-
+
2 block Floppy disks
0 = /dev/fd0 Controller 0, drive 0, autodetect
1 = /dev/fd1 Controller 0, drive 1, autodetect
@@ -257,7 +257,7 @@ Your cooperation is appreciated.
129 = /dev/vcsa1 tty1 text/attribute contents
...
191 = /dev/vcsa63 tty63 text/attribute contents
-
+
NOTE: These devices permit both read and write access.
7 block Loopback devices
@@ -411,7 +411,7 @@ Your cooperation is appreciated.
207 = /dev/video/em8300_sp EM8300 DVD decoder subpicture
208 = /dev/compaq/cpqphpc Compaq PCI Hot Plug Controller
209 = /dev/compaq/cpqrid Compaq Remote Insight Driver
- 210 = /dev/impi/bt IMPI coprocessor block transfer
+ 210 = /dev/impi/bt IMPI coprocessor block transfer
211 = /dev/impi/smic IMPI coprocessor stream interface
212 = /dev/watchdogs/0 First watchdog device
213 = /dev/watchdogs/1 Second watchdog device
@@ -582,7 +582,7 @@ Your cooperation is appreciated.
This device is used on the ARM-based Acorn RiscPC.
Partitions are handled the same way as for IDE disks
- (see major number 3).
+ (see major number 3).
22 char Digiboard serial card
0 = /dev/ttyD0 First Digiboard port
@@ -591,7 +591,7 @@ Your cooperation is appreciated.
22 block Second IDE hard disk/CD-ROM interface
0 = /dev/hdc Master: whole disk (or CD-ROM)
64 = /dev/hdd Slave: whole disk (or CD-ROM)
-
+
Partitions are handled the same way as for the first
interface (see major number 3).
@@ -801,7 +801,7 @@ Your cooperation is appreciated.
34 block Fourth IDE hard disk/CD-ROM interface
0 = /dev/hdg Master: whole disk (or CD-ROM)
64 = /dev/hdh Slave: whole disk (or CD-ROM)
-
+
Partitions are handled the same way as for the first
interface (see major number 3).
@@ -939,7 +939,7 @@ Your cooperation is appreciated.
16 = /dev/ftlb FTL on second Memory Technology Device
32 = /dev/ftlc FTL on third Memory Technology Device
...
- 240 = /dev/ftlp FTL on 16th Memory Technology Device
+ 240 = /dev/ftlp FTL on 16th Memory Technology Device
Partitions are handled in the same way as for IDE
disks (see major number 3) except that the partition
@@ -1522,7 +1522,7 @@ Your cooperation is appreciated.
disks (see major number 3) except that the limit on
partitions is 15.
- 83 char Matrox mga_vid video driver
+ 83 char Matrox mga_vid video driver
0 = /dev/mga_vid0 1st video card
1 = /dev/mga_vid1 2nd video card
2 = /dev/mga_vid2 3rd video card
@@ -1695,7 +1695,7 @@ Your cooperation is appreciated.
1 = /dev/ipnat NAT control device/log file
2 = /dev/ipstate State information log file
3 = /dev/ipauth Authentication control device/log file
- ...
+ ...
96 char Parallel port ATAPI tape devices
0 = /dev/pt0 First parallel port ATAPI tape
@@ -1731,7 +1731,7 @@ Your cooperation is appreciated.
0 = /dev/ubda First user-mode block device
16 = /dev/udbb Second user-mode block device
...
-
+
Partitions are handled in the same way as for IDE
disks (see major number 3) except that the limit on
partitions is 15.
@@ -2305,7 +2305,7 @@ Your cooperation is appreciated.
0 = /dev/drbd0 First DRBD device
1 = /dev/drbd1 Second DRBD device
...
-
+
148 char Technology Concepts serial card
0 = /dev/ttyT0 First TCL port
1 = /dev/ttyT1 Second TCL port
@@ -2427,7 +2427,7 @@ Your cooperation is appreciated.
Partitions are handled in the same way as for IDE
disks (see major number 3) except that the limit on
- partitions is 31.
+ partitions is 31.
162 char Raw block device interface
0 = /dev/rawctl Raw I/O control device
@@ -2565,9 +2565,9 @@ Your cooperation is appreciated.
243 = /dev/usb/dabusb3 Fourth dabusb device
180 block USB block devices
- 0 = /dev/uba First USB block device
- 8 = /dev/ubb Second USB block device
- 16 = /dev/ubc Third USB block device
+ 0 = /dev/uba First USB block device
+ 8 = /dev/ubb Second USB block device
+ 16 = /dev/ubc Third USB block device
...
181 char Conrad Electronic parallel port radio clocks
@@ -2654,7 +2654,7 @@ Your cooperation is appreciated.
32 = /dev/mvideo/status2 Third device
...
...
- 240 = /dev/mvideo/status15 16th device
+ 240 = /dev/mvideo/status15 16th device
...
195 char Nvidia graphics devices
@@ -2767,7 +2767,7 @@ Your cooperation is appreciated.
42 = /dev/ttySMX1 Motorola i.MX - port 1
43 = /dev/ttySMX2 Motorola i.MX - port 2
44 = /dev/ttyMM0 Marvell MPSC - port 0
- 45 = /dev/ttyMM1 Marvell MPSC - port 1
+ 45 = /dev/ttyMM1 Marvell MPSC - port 1
46 = /dev/ttyCPM0 PPC CPM (SCC or SMC) - port 0
...
47 = /dev/ttyCPM5 PPC CPM (SCC or SMC) - port 5
@@ -3012,7 +3012,7 @@ Your cooperation is appreciated.
0 = /dev/hvc0 First console port
1 = /dev/hvc1 Second console port
...
-
+
230 char IBM iSeries virtual tape
0 = /dev/iseries/vt0 First virtual tape, mode 0
1 = /dev/iseries/vt1 Second virtual tape, mode 0
@@ -3094,7 +3094,7 @@ Your cooperation is appreciated.
This major is reserved to assist the expansion to a
larger number space. No device nodes with this major
should ever be created on the filesystem.
- (This is probaly not true anymore, but I'll leave it
+ (This is probably not true anymore, but I'll leave it
for now /Torben)
---LARGE MAJORS!!!!!---
--
Bye, Peter Korsgaard
>>>>> "Torben" == Mathiasen, Torben <[email protected]> writes:
Hi,
Jan> What's the reason for this indent change?
>>
>> I don't know - Torben?
Torben> A wrong indent it seems. If someone else is working on
Torben> getting this fixed let me know. Otherwise I'll update the
Torben> kernel version of devices.txt and fix the whitespaces at the
Torben> same time.
It should be fixed by the patch I just sent you.
--
Bye, Peter Korsgaard
> >>>>> "Torben" == Mathiasen, Torben <[email protected]> writes:
>
> Torben> Yeah, sorry about the slow turnaround time lately.
> Hopefully it will better soon :). Torben> Please send me a
> patch and I'll have it in asap.
>
> Ok, here you go:
>
Thanks. Applied to lanana.org. I'll get the kernel version merged too.
Torben
> Sync Documentation/devices.txt with the new version from the LANANA
> site (http://www.lanana.org/docs/device-list/devices-2.6+.txt)
This doesn't look like a "sync". More like a "replacement, discarding
changes".
> @@ -1522,7 +1522,7 @@ Your cooperation is appreciated.
> disks (see major number 3) except that the limit on
> partitions is 15.
>
> - 83 char Matrox mga_vid video driver
> + 83 char Matrox mga_vid video driver
> @@ -1731,7 +1731,7 @@ Your cooperation is appreciated.
> 0 = /dev/ubda First user-mode block device
> 16 = /dev/udbb Second user-mode block device
> ...
> -
> +
Nice trailing space! I don't remember this happening when HPA was
in charge.
> @@ -2565,10 +2565,10 @@ Your cooperation is appreciated.
> 243 = /dev/usb/dabusb3 Fourth dabusb device
>
> 180 block USB block devices
> - 0 = /dev/uba First USB block device
> - 8 = /dev/ubb Second USB block device
> - 16 = /dev/ubc Third USB block device
> - ...
> + 0 = /dev/uba First USB block device
> + 8 = /dev/ubb Second USB block device
> + 16 = /dev/ubc Third USB block device
> + ...
>
> 181 char Conrad Electronic parallel port radio clocks
Please do not apply this.
-- Pete
>>>>> "Pete" == Pete Zaitcev <[email protected]> writes:
>> Sync Documentation/devices.txt with the new version from the LANANA
>> site (http://www.lanana.org/docs/device-list/devices-2.6+.txt)
Pete> This doesn't look like a "sync". More like a "replacement, discarding
Pete> changes".
Ok, bad choice of words ..
>> 181 char Conrad Electronic parallel port radio clocks
Pete> Please do not apply this.
Please check the thread. The trailing spaces are now removed from the
file at lanana.org and Torben will send a new patch..
--
Bye, Peter Korsgaard