hwdb: ieee1394-unit-function: add entry for AV/C device with generic AV/C command set

Typical node of AV/C device has standard content of configuration ROM.
This is defined in documentation of 1394 Trading Association.

 * Configuration ROM for AV/C Devices 1.0 (Dec. 12, 2000, 1394 Trading
   Association, TA Document 1999027)

However, it brings an issue that the functions in AV/C device are not
distinguished just by the content of configuration ROM.

In former commit, hardware database was added to describe function type
of unit in the node, then udev rules are added to utilize the database.

However, we have an request to obsolete existent udev rules by putting
enough entries to the database. It should be done carefully.

This commit adds entry into hardware database just for backward
compatibility. The entry can match to some node and unit unexpectedly.
Therefore this commit modifies existent entries to invalidate the effect
from added entry.

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 0c1aa2aa4feddbffb2e2c98cdd211be8280c7a4d..721ae24b6e4fc6067bb86b336d1d05c59a0d7623 100644 (file)
--- a/hwdb.d/80-ieee1394-unit-function.hwdb
+++ b/hwdb.d/80-ieee1394-unit-function.hwdb
@@ -37,6 +37,18 @@
 # Additionally, ID_VENDOR_FROM_DATABASE and ID_MODEL_FROM_DATABASE environment variables are
 # preferable.
 
+#
+# General entry for AV/C device compliant to AV/C command set generic specification:
+# * Configuration ROM for AV/C Devices 1.0 (Dec. 12, 2000, 1394 Trading Association, TA Document
+#   1999027)
+#
+
+# Just for backward compatibility. Please invalidate IEEE1394_UNIT_FUNCTION_VIDEO by adding entries
+# if it is inconvenient.
+ieee1394:node:ven*mo*units*0x00a02d:0x010001*
+ieee1394:ven*mo*sp0000A02Dver00010001
+ IEEE1394_UNIT_FUNCTION_VIDEO=1
+
 #
 # General entry for:
 # * 1394-based Digital Camera Specification Version 1.04 (Aug. 9, 1996, 1394 Trading Association)
@@ -90,6 +102,7 @@ ieee1394:ven00000AACmo00000002sp0000A02Dver00010001
  ID_VENDOR_FROM_DATABASE=Acoustic Reality
  ID_MODEL_FROM_DATABASE=eAR FireWire Audio
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x0003dbmo0x01eeeeunits0x00a02d:0x010001
 ieee1394:ven000003DBmo0001EEEEsp0000A02Dver00010001
@@ -97,6 +110,7 @@ ieee1394:ven000003DBmo0001EEEEsp0000A02Dver00010001
  ID_MODEL_FROM_DATABASE=Ensemble FireWire
  IEEE1394_UNIT_FUNCTION_MIDI=1
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 # An extension card for Rosetta 200, Rosetta 800, AD16X, DA16X, DD16X, and BigBen.
 ieee1394:node:ven0x0003dbmo0x010048units0x00a02d:0x010001
@@ -105,6 +119,7 @@ ieee1394:ven000003DBmo00010048sp0000A02Dver00010001
  ID_MODEL_FROM_DATABASE=X-FireWire Card
  IEEE1394_UNIT_FUNCTION_MIDI=1
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x001564mo0x000610units0x00a02d:0x010001
 ieee1394:ven00001564mo00000610sp0000A02Dver00010001
@@ -112,6 +127,7 @@ ieee1394:ven00001564mo00000610sp0000A02Dver00010001
  ID_MODEL_FROM_DATABASE=F-Control Audio 610
  IEEE1394_UNIT_FUNCTION_MIDI=1
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x001564mo0x001616units0x00a02d:0x010001
 ieee1394:ven00001564mo00001616sp0000A02Dver00010001
@@ -119,18 +135,21 @@ ieee1394:ven00001564mo00001616sp0000A02Dver00010001
  ID_MODEL_FROM_DATABASE=F-Control Audio 1616
  IEEE1394_UNIT_FUNCTION_MIDI=1
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x001564mo0x001204units0x00a02d:0x010001
 ieee1394:ven00001564mo00001204sp0000A02Dver00010001
  ID_VENDOR_FROM_DATABASE=Behringer
  ID_MODEL_FROM_DATABASE=XENYX UFX1204
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x001564mo0x001604units0x00a02d:0x010001
 ieee1394:ven00001564mo00001604sp0000A02Dver00010001
  ID_VENDOR_FROM_DATABASE=Behringer
  ID_MODEL_FROM_DATABASE=XENYX UFX1604
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 # An extension card for Behringer X32.
 ieee1394:node:ven0x001564mo0x000006units0x00a02d:0x010001
@@ -139,12 +158,14 @@ ieee1394:ven00001564mo00000006sp0000A02Dver00010001
  ID_MODEL_FROM_DATABASE=X-UF
  IEEE1394_UNIT_FUNCTION_MIDI=1
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x00000amo0x030000units0x00a02d:0x010001
 ieee1394:ven0000000Amo00030000sp0000A02Dver00010001
  ID_VENDOR_FROM_DATABASE=CME
  ID_MODEL_FROM_DATABASE=Matrix K FW
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x00a07emo0x0000a9units0x00a02d:0x014001
 ieee1394:ven0000A07Emo000000A9sp0000A02Dver00014001
@@ -159,6 +180,7 @@ ieee1394:ven000040ABmo00010048sp0000A02Dver00010001
  ID_MODEL_FROM_DATABASE=FA-101
  IEEE1394_UNIT_FUNCTION_MIDI=1
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x0040abmo0x010049units0x00a02d:0x010001
 ieee1394:ven000040ABmo00010049sp0000A02Dver00010001
@@ -166,6 +188,7 @@ ieee1394:ven000040ABmo00010049sp0000A02Dver00010001
  ID_MODEL_FROM_DATABASE=FA-66
  IEEE1394_UNIT_FUNCTION_MIDI=1
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 # The value of model field differs depending on firmware.
 ieee1394:node:ven0x000f1bmo0x010064units0x00a02d:0x010001
@@ -176,6 +199,7 @@ ieee1394:ven00000F1Bmo00000210sp0000A02Dver00010001
  ID_MODEL_FROM_DATABASE=QuataFire
  IEEE1394_UNIT_FUNCTION_MIDI=1
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 # Match to Saffire and Saffire LE.
 ieee1394:node:ven0x00130emo0x000000units0x00a02d:0x010001
@@ -184,6 +208,7 @@ ieee1394:ven0000130Emo00000000sp0000A02Dver00010001
  ID_MODEL_FROM_DATABASE=Saffire
  IEEE1394_UNIT_FUNCTION_MIDI=1
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x00130emo0x000006units0x00a02d:0x010001
 ieee1394:ven0000130Emo00000006sp0000A02Dver00010001
@@ -191,6 +216,7 @@ ieee1394:ven0000130Emo00000006sp0000A02Dver00010001
  ID_MODEL_FROM_DATABASE=Saffire Pro 10 i/o
  IEEE1394_UNIT_FUNCTION_MIDI=1
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x00130emo0x000003units0x00a02d:0x010001
 ieee1394:ven0000130Emo00000003sp0000A02Dver00010001
@@ -198,6 +224,7 @@ ieee1394:ven0000130Emo00000003sp0000A02Dver00010001
  ID_MODEL_FROM_DATABASE=Saffire Pro 26 i/o
  IEEE1394_UNIT_FUNCTION_MIDI=1
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x01a9eemo0x000001units0x00a02d:0x010001
 ieee1394:ven0001A9EEmo00000001sp0000A02Dver00010001
@@ -205,6 +232,7 @@ ieee1394:ven0001A9EEmo00000001sp0000A02Dver00010001
  ID_MODEL_FROM_DATABASE=FireXon
  IEEE1394_UNIT_FUNCTION_MIDI=1
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x000d6cmo0x010071units0x00a02d:0x014001
 ieee1394:ven00000D6Cmo00010071sp0000A02Dver00014001
@@ -233,12 +261,14 @@ ieee1394:ven00000D6Cmo00010062sp0000A02Dver00010001
  ID_VENDOR_FROM_DATABASE=M-Audio
  ID_MODEL_FROM_DATABASE=FW Solo
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x000d6cmo0x010081units0x00a02d:0x010001
 ieee1394:ven00000D6Cmo00010081sp0000A02Dver00010001
  ID_VENDOR_FROM_DATABASE=M-Audio
  ID_MODEL_FROM_DATABASE=NRV10
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x000d6cmo0x00000aunits0x00a02d:0x014001
 ieee1394:ven00000D6Cmo0000000Asp0000A02Dver00014001
@@ -267,6 +297,7 @@ ieee1394:ven00000FF2mo00010065sp0000A02Dver00010001
  ID_VENDOR_FROM_DATABASE=Loud Technologies
  ID_MODEL_FROM_DATABASE=Mackie Onyx FireWire
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 # An extension card for Mackie d.2.
 ieee1394:node:ven0x000ff2mo0x010067units0x00a02d:0x010001
@@ -274,6 +305,7 @@ ieee1394:ven00000FF2mo00010067sp0000A02Dver00010001
  ID_VENDOR_FROM_DATABASE=Loud Technologies
  ID_MODEL_FROM_DATABASE=Mackie DJ Mixer
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 # Match to FireFly 202, 302, 808, and 808 Universal.
 # Match to HelixBoard 12 mk II, 18 mk II, 24 mk II, 12 Universal, 18 Universal, and 24 Universal.
@@ -283,6 +315,7 @@ ieee1394:ven00001496mo00000000sp0000A02Dver00010001
  ID_MODEL_FROM_DATABASE=FireFly/Helixboard
  IEEE1394_UNIT_FUNCTION_MIDI=1
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x000a92mo0x010000units0x00a02d:0x010001
 ieee1394:ven00000A92mo00010000sp0000A02Dver00010001
@@ -290,18 +323,21 @@ ieee1394:ven00000A92mo00010000sp0000A02Dver00010001
  ID_MODEL_FROM_DATABASE=FireBox
  IEEE1394_UNIT_FUNCTION_MIDI=1
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x000a92mo0x010001units0x00a02d:0x010001
 ieee1394:ven00000A92mo00010001sp0000A02Dver00010001
  ID_VENDOR_FROM_DATABASE=PreSonus
  ID_MODEL_FROM_DATABASE=Inspire 1394
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x001198mo0x010048units0x00a02d:0x010001
 ieee1394:ven00001198mo00010048sp0000A02Dver00010001
  ID_VENDOR_FROM_DATABASE=Prism Media Products
  ID_MODEL_FROM_DATABASE=Orpheus
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x000a92mo0x010066units0x00a02d:0x010001
 ieee1394:ven00000A92mo00010066sp0000A02Dver00010001
@@ -309,6 +345,7 @@ ieee1394:ven00000A92mo00010066sp0000A02Dver00010001
  ID_MODEL_FROM_DATABASE=PreSonus FP10
  IEEE1394_UNIT_FUNCTION_MIDI=1
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x001260mo0x000001units0x00a02d:0x010001
 ieee1394:ven00001260mo00000001sp0000A02Dver00010001
@@ -316,6 +353,7 @@ ieee1394:ven00001260mo00000001sp0000A02Dver00010001
  ID_MODEL_FROM_DATABASE=ScratchAmp
  IEEE1394_UNIT_FUNCTION_MIDI=1
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x010065mo0x010067units0x00a02d:0x010001
 ieee1394:ven00010065mo00010067sp0000A02Dver00010001
@@ -323,6 +361,7 @@ ieee1394:ven00010065mo00010067sp0000A02Dver00010001
  ID_MODEL_FROM_DATABASE=IF-FW/DM
  IEEE1394_UNIT_FUNCTION_MIDI=1
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x000aacmo0x000003units0x00a02d:0x010001
 ieee1394:ven00000AACmo00000003sp0000A02Dver00010001
@@ -330,6 +369,7 @@ ieee1394:ven00000AACmo00000003sp0000A02Dver00010001
  ID_MODEL_FROM_DATABASE=PHASE 88 FW
  IEEE1394_UNIT_FUNCTION_MIDI=1
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x000aacmo0x000004units0x00a02d:0x010001
 ieee1394:ven00000AACmo00000004sp0000A02Dver00010001
@@ -337,6 +377,7 @@ ieee1394:ven00000AACmo00000004sp0000A02Dver00010001
  ID_MODEL_FROM_DATABASE=PHASE 24 FW
  IEEE1394_UNIT_FUNCTION_MIDI=1
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x000aacmo0x000007units0x00a02d:0x010001
 ieee1394:ven00000AACmo00000007sp0000A02Dver00010001
@@ -344,6 +385,7 @@ ieee1394:ven00000AACmo00000007sp0000A02Dver00010001
  ID_MODEL_FROM_DATABASE=PHASE X24 FW
  IEEE1394_UNIT_FUNCTION_MIDI=1
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x002327mo0x020002units0x00a02d:0x010001
 ieee1394:ven00002327mo00020002sp0000A02Dver00010001
@@ -351,6 +393,7 @@ ieee1394:ven00002327mo00020002sp0000A02Dver00010001
  ID_MODEL_FROM_DATABASE=FW66
  IEEE1394_UNIT_FUNCTION_MIDI=1
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x00a0demo0x10000bunits0x00a02d:0x010001
 ieee1394:ven0000A0DEmo0010000Bsp0000A02Dver00010001
@@ -358,6 +401,7 @@ ieee1394:ven0000A0DEmo0010000Bsp0000A02Dver00010001
  ID_MODEL_FROM_DATABASE=GO44
  IEEE1394_UNIT_FUNCTION_MIDI=1
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x00a0demo0x10000cunits0x00a02d:0x010001
 ieee1394:ven0000A0DEmo0010000Csp0000A02Dver00010001
@@ -365,6 +409,7 @@ ieee1394:ven0000A0DEmo0010000Csp0000A02Dver00010001
  ID_MODEL_FROM_DATABASE=GO46
  IEEE1394_UNIT_FUNCTION_MIDI=1
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 #
 # Fireworks board module.
@@ -446,24 +491,28 @@ ieee1394:ven000003DBmo0001DDDDsp0000A02Dver00010001
  ID_VENDOR_FROM_DATABASE=Apogee Electronics
  ID_MODEL_FROM_DATABASE=Duet FireWire
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x001564mo0x00fc22units0x00a02d:0x010001
 ieee1394:ven00001564mo0000FC22sp0000A02Dver00010001
  ID_VENDOR_FROM_DATABASE=Behringer
  ID_MODEL_FROM_DATABASE=F-Control Audio 202
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x001292mo0x00f970units0x00a02d:0x010001
 ieee1394:ven00001292mo0000F970sp0000A02Dver00010001
  ID_VENDOR_FROM_DATABASE=Griffin Technology
  ID_MODEL_FROM_DATABASE=Griffin FireWave
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x00d04bmo0x00f970units0x00a02d:0x010001
 ieee1394:ven0000D04Bmo0000F970sp0000A02Dver00010001
  ID_VENDOR_FROM_DATABASE=LaCie
  ID_MODEL_FROM_DATABASE=LaCie FireWire Speakers
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 # Match to former models of Onyx 820i, 1220i, and 1620i.
 ieee1394:node:ven0x000ff2mo0x081216units0x00a02d:0x010001
@@ -471,24 +520,28 @@ ieee1394:ven00000FF2mo00081216sp0000A02Dver00010001
  ID_VENDOR_FROM_DATABASE=Loud Technologies
  ID_MODEL_FROM_DATABASE=Mackie Onyx-i series
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x000ff2mo0x001640units0x00a02d:0x010001
 ieee1394:ven00000FF2mo00001640sp0000A02Dver00010001
  ID_VENDOR_FROM_DATABASE=Loud Technologies
  ID_MODEL_FROM_DATABASE=Mackie Onyx 1640i
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x000ff2mo0x00200funits0x00a02d:0x010001
 ieee1394:ven00000FF2mo0000200Fsp0000A02Dver00010001
  ID_VENDOR_FROM_DATABASE=Loud Technologies
  ID_MODEL_FROM_DATABASE=Mackie Onyx Satellite
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x000ff2mo0x000460units0x00a02d:0x010001
 ieee1394:ven00000FF2mo00000460sp0000A02Dver00010001
  ID_VENDOR_FROM_DATABASE=Loud Technologies
  ID_MODEL_FROM_DATABASE=Tapco LINK.firewire 4x6
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x001260mo0x002000units0x00a02d:0x010001
 ieee1394:ven00001260mo00002000sp0000A02Dver00010001
@@ -496,12 +549,14 @@ ieee1394:ven00001260mo00002000sp0000A02Dver00010001
  ID_MODEL_FROM_DATABASE=SCS.1d
  IEEE1394_UNIT_FUNCTION_MIDI=1
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x001260mo0x001000units0x00a02d:0x010001
 ieee1394:ven00001260mo00001000sp0000A02Dver00010001
  ID_VENDOR_FROM_DATABASE=Stanton Magnetics
  ID_MODEL_FROM_DATABASE=SCS.1m
  IEEE1394_UNIT_FUNCTION_MIDI=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 ieee1394:node:ven0x00022emo0x800007units0x00a02d:0x010001
 ieee1394:ven0000022Emo00800007sp0000A02Dver00010001
@@ -509,6 +564,7 @@ ieee1394:ven0000022Emo00800007sp0000A02Dver00010001
  ID_MODEL_FROM_DATABASE=FireOne
  IEEE1394_UNIT_FUNCTION_MIDI=1
  IEEE1394_UNIT_FUNCTION_AUDIO=1
+ IEEE1394_UNIT_FUNCTION_VIDEO=0
 
 #
 # TC Applied Technologies. Digital Interface Communication Engine (DICE).

diff --git a/rules.d/50-udev-default.rules.in b/rules.d/50-udev-default.rules.in
index eab6c734616e51929f041d79d3e90542a1d4c1d5..7ba3b70e09e4dd516d6a4fa486df371f8680e155 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}=="*0x00a02d:0x010001*", GROUP="video"
 SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x014001*", GROUP="video"
 
 SUBSYSTEM=="firewire", TEST=="units", TEST=="model", \

diff --git a/src/login/70-uaccess.rules.m4 b/src/login/70-uaccess.rules.m4
index 6c078bc907960fa47e77a24a411496e20846c007..974fcf56ca6a41f7a3d01bed0c2a3f6914ece63a 100644 (file)
--- a/src/login/70-uaccess.rules.m4
+++ b/src/login/70-uaccess.rules.m4
@@ -38,7 +38,6 @@ SUBSYSTEM=="video4linux", TAG+="uaccess"
 SUBSYSTEM=="dvb", 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"
 
 SUBSYSTEM=="firewire", TEST=="units", ENV{IEEE1394_UNIT_FUNCTION_MIDI}=="1", TAG+="uaccess"