diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2005-07-30 19:05:53 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-08 19:22:29 -0400 |
commit | fbf82fd2e1f4e679c60516d772d1862c941ca845 (patch) | |
tree | 85aee08e665076cf90251e705db13f03b136ce0a /include/linux/usb.h | |
parent | 22af8878d2d641c6b15fe39fe4de3c05b2c477f0 (diff) |
[PATCH] USB: real nodes instead of usbfs
This patch introduces a /sys/class/usb_device/ class
where every connected usb-device will show up:
tree /sys/class/usb_device/
/sys/class/usb_device/
|-- usb1.1
| |-- dev
| `-- device -> ../../../devices/pci0000:00/0000:00:1d.0/usb1
|-- usb2.1
| |-- dev
| `-- device -> ../../../devices/pci0000:00/0000:00:1d.1/usb2
...
The presence of the "dev" file lets udev create real device nodes.
kay@pim:~/src/linux-2.6> tree /dev/bus/usb/
/dev/bus/usb/
|-- 1
| `-- 1
|-- 2
| `-- 1
...
udev rule:
SUBSYSTEM="usb_device", PROGRAM="/sbin/usb_device %k", NAME="%c"
(echo $1 | /bin/sed 's/usb\([0-9]*\)\.\([0-9]*\)/bus\/usb\/\1\/\2/')
This makes libusb pick up the real nodes instead of the mounted usbfs:
export USB_DEVFS_PATH=/dev/bus/usb
Background:
All this makes it possible to manage usb devices with udev instead of
the devfs solution. We are currently working on a pam_console/resmgr
replacement driven by udev and a pam-helper. It applies ACL's to device
nodes, which is required for modern desktop functionalty like
"Fast User Switching" or multiple local login support.
New patch with its own major. I've succesfully disabled usbfs and use real
nodes only on my box. With: "export USB_DEVFS_PATH=/dev/bus/usb" libusb picks
up the udev managed nodes instead of reading usbfs files.
This makes udev to provide symlinks for libusb to pick up:
SUBSYSTEM="usb_device", PROGRAM="/sbin/usbdevice %k", SYMLINK="%c"
/sbin/usbdevice:
#!/bin/sh
echo $1 | /bin/sed 's/usbdev\([0-9]*\)\.\([0-9]*\)/bus\/usb\/\1\/\2/'
Signed-off-by: Kay Sievers <kay.sievers@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/usb.h')
-rw-r--r-- | include/linux/usb.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index 724637792996..434e35120c65 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h | |||
@@ -5,6 +5,7 @@ | |||
5 | #include <linux/usb_ch9.h> | 5 | #include <linux/usb_ch9.h> |
6 | 6 | ||
7 | #define USB_MAJOR 180 | 7 | #define USB_MAJOR 180 |
8 | #define USB_DEVICE_MAJOR 189 | ||
8 | 9 | ||
9 | 10 | ||
10 | #ifdef __KERNEL__ | 11 | #ifdef __KERNEL__ |
@@ -349,6 +350,7 @@ struct usb_device { | |||
349 | char *manufacturer; | 350 | char *manufacturer; |
350 | char *serial; /* static strings from the device */ | 351 | char *serial; /* static strings from the device */ |
351 | struct list_head filelist; | 352 | struct list_head filelist; |
353 | struct class_device *class_dev; | ||
352 | struct dentry *usbfs_dentry; /* usbfs dentry entry for the device */ | 354 | struct dentry *usbfs_dentry; /* usbfs dentry entry for the device */ |
353 | 355 | ||
354 | /* | 356 | /* |