Skip to contentSkip to conversation

Devices.txt, update with LANANA

PATCH Olaf Hering 4 participants 4 messages Feb 3, 2005 – Feb 4, 2005 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 10 lines · Linux Kernel Mailing List

ChangeSet 1.1992.2.74, 2005/02/02 08:48:39-08:00, [email protected]

[PATCH] Devices.txt, update with LANANA

Attached is diff for bringing devices.txt uptodate with lanana.

Please note: The devices.txt file in your tree will now be for 2.6+ kernels only. 2.6 specific allocations will now be given out more freely, and some of the stuff marked for obsolete for 2.6 has been removed. I put a note in the file to let people know its for 2.6+ kernels only.

...

Quoted 11 lines
(quoted diff) +0 -7
@@ -2554,23 +2555,11 @@
 		 65 = /dev/usb/usblcd	USBLCD Interface ([email protected])
 		 66 = /dev/usb/cpad0	Synaptics cPad (mouse/LCD)
 
-		 96 = /dev/usb/hiddev0	1st USB HID device
-		    ...
-		111 = /dev/usb/hiddev15	16th USB HID device
-		112 = /dev/usb/auer0	1st auerswald ISDN device
-		    ...
-		127 = /dev/usb/auer15	16th auerswald ISDN device
-		128 = /dev/usb/brlvgr0	First Braille Voyager device

Review line 2573

Quoted 10 lines
(quoted diff) +0 -10
-		    ...
-		131 = /dev/usb/brlvgr3	Fourth Braille Voyager device
-		132 = /dev/usb/idmouse	ID Mouse (fingerprint scanner) device
-		144 = /dev/usb/lcd	USB LCD device
-		160 = /dev/usb/legousbtower0	1st USB Legotower device
-		    ...
-		175 = /dev/usb/legousbtower15	16th USB Legotower device
-		240 = /dev/usb/dabusb0	First daubusb device
-		    ...
-		243 = /dev/usb/dabusb3	Fourth dabusb device

I still see legousbtower registered in drivers/usb/misc/legousbtower.c. Are you sure about these changes? Also, do the names in this document match the names registered with sysfs (new mga_* stuff etc)? I found a few sysfs entries that differ from devices.txt:

# misc devices
# 183 = /dev/hwrng        Generic random number generator
KERNEL="hw_random",     NAME="hwrng", SYMLINK="%k"
# 219 = /dev/modems/mwave MWave modem firmware upload
KERNEL="mwave",         NAME="modems/%k"
# 169 = /dev/specialix_rioctl Specialix RIO serial control
KERNEL="rioctl",        NAME="specialix_rioctl", SYMLINK="%k"
# 167 = /dev/specialix_sxctl Specialix serial control
KERNEL="sxctl",         NAME="specialix_sxctl", SYMLINK="%k"
#2 lore raw
In reply to a message not in the archive
Quoted 13 lines · Linux Kernel Mailing List

ChangeSet 1.1992.2.74, 2005/02/02 08:48:39-08:00, [email protected]

[PATCH] Devices.txt, update with LANANA

Attached is diff for bringing devices.txt uptodate with lanana.

Please note: The devices.txt file in your tree will now be for 2.6+ kernels only. 2.6 specific allocations will now be given out more freely, and some of the stuff marked for obsolete for 2.6 has been removed. I put a note in the file to let people know its for 2.6+ kernels only.

I wanted to rename the new file to devices-2.6+.txt and then make a link from the old devices.txt to this new file, but diffing it became too ugly.

<snip>

Quoted 25 lines
(quoted diff) +6 -8
@@ -2546,7 +2542,12 @@
 		  0 = /dev/usb/lp0	First USB printer
...
 		 15 = /dev/usb/lp15	16th USB printer
-		 32 = /dev/usb/mdc800	MDC800 USB camera
+		 16 = /dev/usb/mouse0	First USB mouse
+		    ...
+		 31 = /dev/usb/mouse15	16th USB mouse
+		 32 = /dev/usb/ez0	First USB firmware loader
+		    ...
+		 47 = /dev/usb/ez15	16th USB firmware loader
 		 48 = /dev/usb/scanner0	First USB scanner
...
 		 63 = /dev/usb/scanner15 16th USB scanner
@@ -2554,23 +2555,11 @@
 		 65 = /dev/usb/usblcd	USBLCD Interface ([email protected])
 		 66 = /dev/usb/cpad0	Synaptics cPad (mouse/LCD)
 
-		 96 = /dev/usb/hiddev0	1st USB HID device
-		    ...
-		111 = /dev/usb/hiddev15	16th USB HID device
-		112 = /dev/usb/auer0	1st auerswald ISDN device
-		    ...
-		127 = /dev/usb/auer15	16th auerswald ISDN device
-		128 = /dev/usb/brlvgr0	First Braille Voyager device

Review line 2573

Quoted 10 lines
(quoted diff) +0 -10
-		    ...
-		131 = /dev/usb/brlvgr3	Fourth Braille Voyager device
-		132 = /dev/usb/idmouse	ID Mouse (fingerprint scanner) device
-		144 = /dev/usb/lcd	USB LCD device
-		160 = /dev/usb/legousbtower0	1st USB Legotower device
-		    ...
-		175 = /dev/usb/legousbtower15	16th USB Legotower device
-		240 = /dev/usb/dabusb0	First daubusb device
-		    ...
-		243 = /dev/usb/dabusb3	Fourth dabusb device

Hm, this is just wrong. As I recall, LANANA is in charge of the major numbers, but for the USB major, the USB developers have been assigning the USB minors. This patch just made the file different from what is currently present in the kernel.

Should I just submit a patch to LANANA to update the USB minors for their copy so this doesn't happen again?

I'll also fix this up in mainline in the next round of USB patches...

thanks,

greg k-h

#3 lore raw
Quoted 61 lines · Greg KH
Quoted 13 lines · Linux Kernel Mailing List

ChangeSet 1.1992.2.74, 2005/02/02 08:48:39-08:00, [email protected]

[PATCH] Devices.txt, update with LANANA

Attached is diff for bringing devices.txt uptodate with lanana.

Please note: The devices.txt file in your tree will now be for 2.6+ kernels only. 2.6 specific allocations will now be given out more freely, and some of the stuff marked for obsolete for 2.6 has been removed. I put a note in the file to let people know its for 2.6+ kernels only.

I wanted to rename the new file to devices-2.6+.txt and then make a link from the old devices.txt to this new file, but diffing it became too ugly.

<snip>

Quoted 25 lines
(quoted diff) +0 -0
@@ -2546,7 +2542,12 @@
 		  0 = /dev/usb/lp0	First USB printer
...
		 15 = /dev/usb/lp15	16th USB printer
(quoted diff) +6 -1
-		 32 = /dev/usb/mdc800	MDC800 USB camera
+		 16 = /dev/usb/mouse0	First USB mouse
+		    ...
+		 31 = /dev/usb/mouse15	16th USB mouse
+		 32 = /dev/usb/ez0	First USB firmware loader
+		    ...
+		 47 = /dev/usb/ez15	16th USB firmware loader

48 = /dev/usb/scanner0 First USB scanner
...
63 = /dev/usb/scanner15 16th USB scanner

(quoted diff) +0 -7
@@ -2554,23 +2555,11 @@
 		 65 = /dev/usb/usblcd	USBLCD Interface ([email protected])
 		 66 = /dev/usb/cpad0	Synaptics cPad (mouse/LCD)
 
-		 96 = /dev/usb/hiddev0	1st USB HID device
-		    ...
-		111 = /dev/usb/hiddev15	16th USB HID device
-		112 = /dev/usb/auer0	1st auerswald ISDN device
-		    ...
-		127 = /dev/usb/auer15	16th auerswald ISDN device
-		128 = /dev/usb/brlvgr0	First Braille Voyager device

Review line 2573

Quoted 10 lines
(quoted diff) +0 -10
-		    ...
-		131 = /dev/usb/brlvgr3	Fourth Braille Voyager device
-		132 = /dev/usb/idmouse	ID Mouse (fingerprint scanner) device
-		144 = /dev/usb/lcd	USB LCD device
-		160 = /dev/usb/legousbtower0	1st USB Legotower device
-		    ...
-		175 = /dev/usb/legousbtower15	16th USB Legotower device
-		240 = /dev/usb/dabusb0	First daubusb device
-		    ...
-		243 = /dev/usb/dabusb3	Fourth dabusb device

Hm, this is just wrong. As I recall, LANANA is in charge of the major numbers, but for the USB major, the USB developers have been assigning the USB minors. This patch just made the file different from what is currently present in the kernel.

Quoted 2 lines

Should I just submit a patch to LANANA to update the USB minors for their copy so this doesn't happen again?

In general the policy has been: submit to LANANA any changes to devices.txt, which they maintain.

So, they are the maintainer of major numbers, but also the maintainer of devices.txt.

Jeff

#4 lore raw
In reply to Greg KH

On Thu, Feb 03 2005, Greg KH wrote:

<snip>

Quoted 8 lines

Hm, this is just wrong. As I recall, LANANA is in charge of the major numbers, but for the USB major, the USB developers have been assigning the USB minors. This patch just made the file different from what is currently present in the kernel.

Should I just submit a patch to LANANA to update the USB minors for their copy so this doesn't happen again?

Yes please!. Since the devices file at lanana.org is the one being merged into the one in the kernel tree, please send future updates to lanana and it'll go in that way.

Thanks,
Torben