--- trunk/udev/udev.rules.magellan	2009/05/04 21:51:39	781
+++ trunk/udev/udev.rules.magellan	2009/12/27 02:27:13	961
@@ -1,5 +1,5 @@
 # /etc/udev/rules/50-udev.rules:  device naming rules for udev
-# $Header: /root/magellan-cvs/src/udev/udev.rules.magellan,v 1.8 2009-05-04 21:51:39 niro Exp $
+# $Header: /root/magellan-cvs/src/udev/udev.rules.magellan,v 1.11 2009-12-27 02:27:13 niro Exp $
 #
 # There are a number of modifiers that are allowed to be used in some
 # of the different fields. They provide the following subsitutions:
@@ -27,11 +27,11 @@
 KERNEL=="ptmx",			GROUP="tty", MODE="0666"
 KERNEL=="tty",			GROUP="tty", MODE="0666"
 KERNEL=="tty[0-9]*",		GROUP="tty", MODE="0620"
-KERNEL=="vcs|vcs[0-9]*|vcsa|vcsa[0-9]*", GROUP="tty"
 KERNEL=="console",		MODE="0600"
+KERNEL=="vcs|vcs[0-9]*|vcsa|vcsa[0-9]*", GROUP="tty"
 
 # serial
-KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*", GROUP="dialout"
+KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout"
 KERNEL=="ppp",			MODE="0600"
 KERNEL=="mwave",		NAME="modems/mwave", GROUP="dialout"
 KERNEL=="hvc*|hvsi*",		GROUP="dialout"
@@ -61,11 +61,13 @@
 
 # DVB (video)
 SUBSYSTEM=="dvb", ENV{DVB_ADAPTER_NUM}=="?*", NAME="dvb/adapter$env{DVB_ADAPTER_NUM}/$env{DVB_DEVICE_TYPE}$env{DVB_DEVICE_NUM}", GROUP="video"
-SUBSYSTEM=="dvb", ENV{DVB_ADAPTER_NUM}=="", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
 
-# Firewire
-KERNEL=="dv1394[0-9]*",		NAME="dv1394/%n", GROUP="video"
-KERNEL=="video1394[0-9]*",	NAME="video1394/%n", GROUP="video"
+# FireWire (dv1394 and video1394 drivers)
+KERNEL=="dv1394-[0-9]*",	NAME="dv1394/%n", GROUP="video"
+KERNEL=="video1394-[0-9]*",	NAME="video1394/%n", GROUP="video"
+# FireWire (firewire-core driver: IIDC devices, AV/C devices)
+SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x00010*", GROUP="video"
+SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x010001*", GROUP="video"
 
 # libusb device nodes
 SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE="0664"
@@ -77,6 +79,10 @@
 SUBSYSTEM=="usb",		KERNEL=="lp*", NAME="usb/%k", SYMLINK+="usb%k", GROUP="lp"
 KERNEL=="lp[0-9]*",		GROUP="lp"
 KERNEL=="irlpt[0-9]*",		GROUP="lp"
+# hplip and cups 1.4+ use raw USB devices, so permissions should be similar to
+# the ones from the old usblp kernel module
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}==":0701*:", GROUP="lp", MODE="660"
 
 # block
 SUBSYSTEM=="block", GROUP="disk"
@@ -89,18 +95,18 @@
 # cdrom
 SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="cdrom"
 SUBSYSTEM=="block", KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="cdrom"
-SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom"
+SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom"
 KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%k", GROUP="cdrom"
 KERNEL=="pktcdvd", NAME="pktcdvd/control", GROUP="cdrom"
 
 # tape
 KERNEL=="ht[0-9]*|nht[0-9]*", GROUP="tape"
 KERNEL=="pt[0-9]*|npt[0-9]*|pht[0-9]*", GROUP="tape"
-SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape"
+SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape"
 
-# block-releated
+# block-related
 KERNEL=="sch[0-9]*", GROUP="disk"
-SUBSYSTEMS=="scsi", ATTRS{type}=="0", GROUP="disk"
+SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="0", GROUP="disk"
 KERNEL=="pg[0-9]*", GROUP="disk"
 KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk"
 KERNEL=="rawctl", NAME="raw/rawctl", GROUP="disk"
@@ -111,9 +117,10 @@
 
 # network
 KERNEL=="tun",			NAME="net/%k", MODE="0666"
+KERNEL=="rfkill",		MODE="0664"
 
 # CPU
-KERNEL=="cpu[0-9]*",		NAME="cpu/%n/cpuid"
+KERNEL=="cpu[0-9]*",		NAME="cpu/%n/cpuid", MODE="0444"
 KERNEL=="msr[0-9]*",		NAME="cpu/%n/msr"
 KERNEL=="microcode",		NAME="cpu/microcode", MODE="0600"