summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2021-05-05 23:10:29 +0900
committerTakashi Sakamoto <o-takashi@sakamocchi.jp>2021-05-05 23:10:29 +0900
commit70fb7e5da5ad24c09b6b58885c9da6c857beada0 (patch)
treecb1fa741e1df253f205ca98ba3a715ceac84c73b
parent78eb99c49673de1a418d60901ed4b7d2907af728 (diff)
downloadsystemd-70fb7e5da5ad24c09b6b58885c9da6c857beada0.tar.gz
hwdb: ieee1394-unit-function: add entries for Point Grey cameras
Point Grey Research, inc. shipped cameras to support IIDC, however some of them are necessarily compliant to IIDC specification in terms of the value of software version field in unit directory of configuration ROM. This commit adds entries for them. Reviewed-by: Damien Douxchamps <damien@douxchamps.net> Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
-rw-r--r--hwdb.d/80-ieee1394-unit-function.hwdb28
-rw-r--r--rules.d/50-udev-default.rules.in1
-rw-r--r--src/login/70-uaccess.rules.m42
3 files changed, 28 insertions, 3 deletions
diff --git a/hwdb.d/80-ieee1394-unit-function.hwdb b/hwdb.d/80-ieee1394-unit-function.hwdb
index 06086e2d74..6ebe32e7a0 100644
--- a/hwdb.d/80-ieee1394-unit-function.hwdb
+++ b/hwdb.d/80-ieee1394-unit-function.hwdb
@@ -1124,6 +1124,34 @@ ieee1394:ven000002F0mo00000000sp0000A02Dver00000100
IEEE1394_UNIT_FUNCTION_VIDEO=1
#
+# Point Grey cameras.
+#
+
+# IIDC v1.04 compatible.
+ieee1394:node:ven0x00b09dmo*units0x00b09d:0x000100
+ieee1394:ven0000B09Dmo*spec0000B09Dver00000100
+ ID_VENDOR_FROM_DATABASE=Point Grey Research
+ IEEE1394_UNIT_FUNCTION_VIDEO=1
+
+# IIDC v1.20 compatible.
+ieee1394:node:ven0x00b09dmo*units0x00b09d:0x000101
+ieee1394:ven0000B09Dmo*spec0000B09Dver00000101
+ ID_VENDOR_FROM_DATABASE=Point Grey Research
+ IEEE1394_UNIT_FUNCTION_VIDEO=1
+
+# IIDC v1.30/v1.31/v1.32 compatible.
+ieee1394:node:ven0x00b09dmo*units0x00b09d:0x000102
+ieee1394:ven0000B09Dmo*spec0000B09Dver00000102
+ ID_VENDOR_FROM_DATABASE=Point Grey Research
+ IEEE1394_UNIT_FUNCTION_VIDEO=1
+
+# Unique protocol.
+ieee1394:node:ven0x00b09dmo*units0x00b09d:0x000114
+ieee1394:ven0000B09Dmo*spec0000B09Dver00000114
+ ID_VENDOR_FROM_DATABASE=Point Grey Research
+ IEEE1394_UNIT_FUNCTION_VIDEO=1
+
+#
# Digital Everywhere FloppyDTV and FireDtv series.
#
diff --git a/rules.d/50-udev-default.rules.in b/rules.d/50-udev-default.rules.in
index 47fd62e778..eab6c73461 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}=="*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 547e3daee3..6c078bc907 100644
--- a/src/login/70-uaccess.rules.m4
+++ b/src/login/70-uaccess.rules.m4
@@ -37,8 +37,6 @@ SUBSYSTEM=="firewire", ENV{ID_FFADO}=="1", TAG+="uaccess"
SUBSYSTEM=="video4linux", TAG+="uaccess"
SUBSYSTEM=="dvb", 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"
SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x014001*", TAG+="uaccess"