summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hwdb.d/80-ieee1394-unit-function.hwdb43
-rw-r--r--rules.d/50-udev-default.rules.in1
-rw-r--r--src/login/70-uaccess.rules.m43
3 files changed, 44 insertions, 3 deletions
diff --git a/hwdb.d/80-ieee1394-unit-function.hwdb b/hwdb.d/80-ieee1394-unit-function.hwdb
index 4e24174377..06086e2d74 100644
--- a/hwdb.d/80-ieee1394-unit-function.hwdb
+++ b/hwdb.d/80-ieee1394-unit-function.hwdb
@@ -38,6 +38,49 @@
# preferable.
#
+# General entry for:
+# * 1394-based Digital Camera Specification Version 1.04 (Aug. 9, 1996, 1394 Trading Association)
+#
+
+ieee1394:node:ven*units0x00a02d:0x000100
+ieee1394:ven*sp0000A02Dver00000100
+ IEEE1394_UNIT_FUNCTION_VIDEO=1
+
+#
+# General entry for:
+# * 1394-based Digital Camera Specification Version 1.20 (Jul. 23, 1998, 1394 Trading Association)
+#
+
+ieee1394:node:ven*units0x00a02d:0x000101
+ieee1394:ven*sp0000A02Dver00000101
+ IEEE1394_UNIT_FUNCTION_VIDEO=1
+
+#
+# General entry for:
+# * IIDC Digital Camera Control Specification Ver.1.30 (Jul. 25, 2000, 1394 Trading Association)
+# * IIDC Digital Camera Control Specification Ver.1.31 (Feb. 2, 2004, 1394 Trading Association, TA
+# Document 2003017)
+# * IIDC Digital Camera Control Specification Ver.1.32 (Jul. 24, 2008, 1394 Trading Association,
+# Document number 2007009)
+#
+
+ieee1394:node:ven*units0x00a02d:0x000102
+ieee1394:ven*sp0000A02Dver00000102
+ IEEE1394_UNIT_FUNCTION_VIDEO=1
+
+#
+# General entry for:
+# * IIDC2 Digital Camera Control Specification Ver.1.0.0 (Jan 26th, 2012, 1394 Trading Association,
+# TS2011001)
+# * IIDC2 Digital Camera Control Specification Ver.1.1.0 (May 19th, 2015, 1394 Trading Association,
+# TS2015001)
+#
+
+ieee1394:node:ven*units0x00a02d:0x000110
+ieee1394:ven*sp0000A02Dver00000110
+ IEEE1394_UNIT_FUNCTION_VIDEO=1
+
+#
# BridgeCo. Enhancement BreakOut Box (BeBoB) for DM1000, DM1100, and DM1500 ASICs.
#
diff --git a/rules.d/50-udev-default.rules.in b/rules.d/50-udev-default.rules.in
index dabde06dde..47fd62e778 100644
--- a/rules.d/50-udev-default.rules.in
+++ b/rules.d/50-udev-default.rules.in
@@ -49,7 +49,6 @@ SUBSYSTEM=="sound", GROUP="audio", \
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", MODE="0664"
-SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x00010*", GROUP="video"
SUBSYSTEM=="firewire", ATTR{units}=="*0x00b09d:0x00010*", GROUP="video"
SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x010001*", GROUP="video"
SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x014001*", GROUP="video"
diff --git a/src/login/70-uaccess.rules.m4 b/src/login/70-uaccess.rules.m4
index f621c684dd..547e3daee3 100644
--- a/src/login/70-uaccess.rules.m4
+++ b/src/login/70-uaccess.rules.m4
@@ -37,8 +37,7 @@ SUBSYSTEM=="firewire", ENV{ID_FFADO}=="1", TAG+="uaccess"
SUBSYSTEM=="video4linux", TAG+="uaccess"
SUBSYSTEM=="dvb", TAG+="uaccess"
-# IIDC devices: industrial cameras and some webcams
-SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x00010*", TAG+="uaccess"
+# Industrial cameras and some webcams
SUBSYSTEM=="firewire", ATTR{units}=="*0x00b09d:0x00010*", TAG+="uaccess"
# AV/C devices: camcorders, set-top boxes, TV sets, audio devices, and more
SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x010001*", TAG+="uaccess"