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>

diff --git a/hwdb.d/80-ieee1394-unit-function.hwdb b/hwdb.d/80-ieee1394-unit-function.hwdb
index 06086e2d74da8bd57842b35b1e9229b6b3c2f1a4..6ebe32e7a0b7a50291863e2dad95f0843da18084 100644 (file)
--- a/hwdb.d/80-ieee1394-unit-function.hwdb
+++ b/hwdb.d/80-ieee1394-unit-function.hwdb
@@ -1123,6 +1123,34 @@ ieee1394:ven000002F0mo00000000sp0000A02Dver00000100
  ID_MODEL_FROM_DATABASE=iSweet
  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 47fd62e7786db09294ccb864865eed45e18b1bae..eab6c734616e51929f041d79d3e90542a1d4c1d5 100644 (file)
--- 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 547e3daee3e926242af40e017f3af1dfe0a7adf9..6c078bc907960fa47e77a24a411496e20846c007 100644 (file)
--- 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"