--- trunk/udev/udev-acl.rules.magellan	2009/10/13 15:10:19	888
+++ trunk/udev/udev-acl.rules.magellan	2010/04/06 23:46:22	1016
@@ -1,5 +1,5 @@
 # /etc/udev/rules/70-acl.rules:  device naming rules for udev
-# $Header: /root/magellan-cvs/src/udev/udev-acl.rules.magellan,v 1.1 2009-10-13 15:10:19 niro Exp $
+# $Header: /root/magellan-cvs/src/udev/udev-acl.rules.magellan,v 1.2 2010-04-06 23:46:22 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:
@@ -19,6 +19,7 @@
 #
 
 ENV{MAJOR}=="", GOTO="acl_end"
+ENV{ACL_MANAGE}=="0", GOTO="acl_end"
 ACTION!="add|change", GOTO="acl_apply"
 
 # PTP/MTP protocol devices, cameras, portable media players
@@ -50,9 +51,23 @@
 SUBSYSTEM=="video4linux", ENV{ACL_MANAGE}="1"
 SUBSYSTEM=="dvb", ENV{ACL_MANAGE}="1"
 
+# IIDC devices: industrial cameras and some webcams
+SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x00010*",  ENV{ACL_MANAGE}="1"
+# AV/C devices: camcorders, set-top boxes, TV sets, audio devices, and more
+SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x010001*", ENV{ACL_MANAGE}="1"
+
+# old style firewire devices
+KERNEL=="dv1394-[0-9]*", ENV{ACL_MANAGE}="1"
+KERNEL=="video1394-[0-9]*", ENV{ACL_MANAGE}="1"
+
 # fingerprint readers
 SUBSYSTEM=="usb", ATTR{idVendor}=="0483", ATTR{idProduct}=="2016", ENV{ACL_MANAGE}="1"
 
+# GPS devices
+ # Garmin GPSMap 60
+SUBSYSTEM=="usb", ATTR{idVendor}=="091e", ATTR{idProduct}=="0003", ENV{ACL_MANAGE}="1"
+
+
 # DRI video devices
 SUBSYSTEM=="drm", KERNEL=="card*", ENV{ACL_MANAGE}="1"
 
@@ -63,7 +78,13 @@
 ENV{ID_SMARTCARD_READER}=="*?", ENV{ACL_MANAGE}="1"
 
 # joysticks
-SUBSYSTEM=="input", ENV{ID_CLASS}=="joystick", ENV{ACL_MANAGE}="1"
+SUBSYSTEM=="input", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ACL_MANAGE}="1"
+
+# smart phones
+SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c02", ENV{ACL_MANAGE}="1"
+
+# color measurement devices
+ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}="1"
 
 # apply ACL for all locally logged in users
 LABEL="acl_apply", ENV{ACL_MANAGE}=="?*", TEST=="/var/run/ConsoleKit/database", \