Commit c914a1a9 authored by Jody McIntyre's avatar Jody McIntyre

Damien Douxchamps:

I have tested and updated a patch from Randy Dunlap that fixes missing
entries in the modules.ieee1394map file. The patch is against latest SVN
(1234).

The patch adds the following entries for IIDC cameras that would not be
detected otherwise:

video1394            0x0000000c  0x000000  0x000000 0x00a02d     0x000101
video1394            0x0000000c  0x000000  0x000000 0x00a02d     0x000102
raw1394              0x0000000c  0x000000  0x000000 0x00a02d     0x000101
raw1394              0x0000000c  0x000000  0x000000 0x00a02d     0x000102

This is necessary because the IIDC consortium interpreted the 1394
specifications differently. They have been summoned by the 1394TA to
change their numbering policy so that these entries are final and will
not grow forever in number.
Signed-off-by: default avatarJody McIntyre <scjody@modernduck.com>
parent 7b49acb3
...@@ -2689,6 +2689,16 @@ static struct ieee1394_device_id raw1394_id_table[] = { ...@@ -2689,6 +2689,16 @@ static struct ieee1394_device_id raw1394_id_table[] = {
.specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
.version = CAMERA_SW_VERSION_ENTRY & 0xffffff .version = CAMERA_SW_VERSION_ENTRY & 0xffffff
}, },
{
.match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
.specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
.version = (CAMERA_SW_VERSION_ENTRY + 1) & 0xffffff
},
{
.match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
.specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
.version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff
},
{ } { }
}; };
......
...@@ -1269,6 +1269,16 @@ static struct ieee1394_device_id video1394_id_table[] = { ...@@ -1269,6 +1269,16 @@ static struct ieee1394_device_id video1394_id_table[] = {
.specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
.version = CAMERA_SW_VERSION_ENTRY & 0xffffff .version = CAMERA_SW_VERSION_ENTRY & 0xffffff
}, },
{
.match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
.specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
.version = (CAMERA_SW_VERSION_ENTRY + 1) & 0xffffff
},
{
.match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
.specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
.version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff
},
{ } { }
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment