Home » Mailing list archives » linux-driver-devel » 2008 » September » 29

[patch 05/10] firedtv: add vendor_id and version to driver match table

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Stefan Richter <stefanr@...>
To: <devel@...>
Subject: [patch 05/10] firedtv: add vendor_id and version to driver match table
Date: Monday, September 29, 2008 - 1:19 pm

Now that nodemgr was enhanced to match against the root directory's

vendor ID if there isn't one in the unit directory, use this to

prevent firedtv to be bound to wrong devices by accident.


Also add the AV/C software version ID to the match flags for

completeness; specifier ID and software only make sense as a pair.


Signed-off-by: Stefan Richter

---

 drivers/media/dvb/firesat/firesat_1394.c |   52 ++++++++++++++---------

 1 file changed, 33 insertions(+), 19 deletions(-)


Index: linux/drivers/media/dvb/firesat/firesat_1394.c

===================================================================

--- linux.orig/drivers/media/dvb/firesat/firesat_1394.c

+++ linux/drivers/media/dvb/firesat/firesat_1394.c

@@ -39,40 +39,54 @@

 #include "firesat-ci.h"

 #include "firesat-rc.h"


-#define FIRESAT_Vendor_ID   0x001287

+#define MATCH_FLAGS	IEEE1394_MATCH_VENDOR_ID | IEEE1394_MATCH_MODEL_ID | \

+			IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION

+#define DIGITAL_EVERYWHERE_OUI   0x001287


 static struct ieee1394_device_id firesat_id_table[] = {


 	{

 		/* FloppyDTV S/CI and FloppyDTV S2 */

-		.match_flags = IEEE1394_MATCH_MODEL_ID | IEEE1394_MATCH_SPECIFIER_ID,

-		.model_id = 0x000024,

-		.specifier_id = AVC_UNIT_SPEC_ID_ENTRY & 0xffffff,

+		.match_flags	= MATCH_FLAGS,

+		.vendor_id	= DIGITAL_EVERYWHERE_OUI,

+		.model_id	= 0x000024,

+		.specifier_id	= AVC_UNIT_SPEC_ID_ENTRY,

+		.version	= AVC_SW_VERSION_ENTRY,

 	},{

 		/* FloppyDTV T/CI */

-		.match_flags = IEEE1394_MATCH_MODEL_ID | IEEE1394_MATCH_SPECIFIER_ID,

-		.model_id = 0x000025,

-		.specifier_id = AVC_UNIT_SPEC_ID_ENTRY & 0xffffff,

+		.match_flags	= MATCH_FLAGS,

+		.vendor_id	= DIGITAL_EVERYWHERE_OUI,

+		.model_id	= 0x000025,

+		.specifier_id	= AVC_UNIT_SPEC_ID_ENTRY,

+		.version	= AVC_SW_VERSION_ENTRY,

 	},{

 		/* FloppyDTV C/CI */

-		.match_flags = IEEE1394_MATCH_MODEL_ID | IEEE1394_MATCH_SPECIFIER_ID,

-		.model_id = 0x000026,

-		.specifier_id = AVC_UNIT_SPEC_ID_ENTRY & 0xffffff,

+		.match_flags	= MATCH_FLAGS,

+		.vendor_id	= DIGITAL_EVERYWHERE_OUI,

+		.model_id	= 0x000026,

+		.specifier_id	= AVC_UNIT_SPEC_ID_ENTRY,

+		.version	= AVC_SW_VERSION_ENTRY,

 	},{

 		/* FireDTV S/CI and FloppyDTV S2 */

-		.match_flags = IEEE1394_MATCH_MODEL_ID | IEEE1394_MATCH_SPECIFIER_ID,

-		.model_id = 0x000034,

-		.specifier_id = AVC_UNIT_SPEC_ID_ENTRY & 0xffffff,

+		.match_flags	= MATCH_FLAGS,

+		.vendor_id	= DIGITAL_EVERYWHERE_OUI,

+		.model_id	= 0x000034,

+		.specifier_id	= AVC_UNIT_SPEC_ID_ENTRY,

+		.version	= AVC_SW_VERSION_ENTRY,

 	},{

 		/* FireDTV T/CI */

-		.match_flags = IEEE1394_MATCH_MODEL_ID | IEEE1394_MATCH_SPECIFIER_ID,

-		.model_id = 0x000035,

-		.specifier_id = AVC_UNIT_SPEC_ID_ENTRY & 0xffffff,

+		.match_flags	= MATCH_FLAGS,

+		.vendor_id	= DIGITAL_EVERYWHERE_OUI,

+		.model_id	= 0x000035,

+		.specifier_id	= AVC_UNIT_SPEC_ID_ENTRY,

+		.version	= AVC_SW_VERSION_ENTRY,

 	},{

 		/* FireDTV C/CI */

-		.match_flags = IEEE1394_MATCH_MODEL_ID | IEEE1394_MATCH_SPECIFIER_ID,

-		.model_id = 0x000036,

-		.specifier_id = AVC_UNIT_SPEC_ID_ENTRY & 0xffffff,

+		.match_flags	= MATCH_FLAGS,

+		.vendor_id	= DIGITAL_EVERYWHERE_OUI,

+		.model_id	= 0x000036,

+		.specifier_id	= AVC_UNIT_SPEC_ID_ENTRY,

+		.version	= AVC_SW_VERSION_ENTRY,

 	}, { }

 };


--

Stefan Richter

-=====-==--- =--= ===-=

http://arcgraph.de/sr/


_______________________________________________

devel mailing list

devel@linuxdriverproject.org

http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
Gettinng started with Linux drivers, Amit Uttamchandani, (Fri Apr 10, 6:04 pm)
broken mailing list, try 47..., Greg KH, (Fri Jan 11, 3:12 pm)
Mailing Lists, Tomasz Grzegurzko, (Fri Feb 8, 8:22 pm)
what is the status of this initiative ?, JoJo jojo, (Thu Mar 13, 3:20 am)
A tablet driver question, Steven Hunt, (Wed May 20, 12:49 am)
Dearest Beloved,, Mr. Kunio Uematsu, (Tue Mar 16, 3:52 pm)
[patch 00/10] firedtv: a few more updates, Stefan Richter, (Mon Sep 29, 1:15 pm)
Kick off the Linux Driver Project (again, this time for real), Greg KH, (Wed Sep 26, 10:32 pm)
Re: A tablet driver question, Greg KH, (Wed May 20, 1:12 am)
Re: A tablet driver question, Steven Hunt, (Wed May 20, 2:16 am)
Re: A tablet driver question, Jiri Slaby, (Wed May 20, 3:19 am)
Re: A tablet driver question, Steven Hunt, (Wed May 20, 11:58 am)
Re: A tablet driver question, Jiri Slaby, (Wed May 20, 12:24 pm)
Re: A tablet driver question, Mohamed Ikbel Boulabiar, (Wed May 20, 12:50 pm)
Re: A tablet driver question, Jiri Kosina, (Thu May 21, 4:33 am)
Re: Gettinng started with Linux drivers, Stefan Richter, (Sat Apr 11, 6:00 am)
Re: Gettinng started with Linux drivers, Amit Uttamchandani, (Sun Apr 12, 9:08 pm)
Re: Gettinng started with Linux drivers, Stefan Richter, (Mon Apr 13, 3:39 am)
Re: [patch 00/10] firedtv: a few more updates, Stefan Richter, (Mon Sep 29, 1:46 pm)
[patch 10/10] firedtv: register input device as child of a F..., Stefan Richter, (Mon Sep 29, 1:22 pm)
[patch 09/10] firedtv: fix string comparison and a few spars..., Stefan Richter, (Mon Sep 29, 1:21 pm)
[patch 08/10] firedtv: remove unused struct members, Stefan Richter, (Mon Sep 29, 1:21 pm)
[patch 07/10] firedtv: fix initialization of dvb_frontend.ops, Stefan Richter, (Mon Sep 29, 1:20 pm)
[patch 06/10] firedtv: remove unused dual subunit code from ..., Stefan Richter, (Mon Sep 29, 1:19 pm)
[patch 05/10] firedtv: add vendor_id and version to driver m..., Stefan Richter, (Mon Sep 29, 1:19 pm)
[patch 04/10] firedtv: use hpsb_node_read(), _write(), _lock(), Stefan Richter, (Mon Sep 29, 1:18 pm)
[patch 03/10] ieee1394: inherit ud vendor_id from node vendo..., Stefan Richter, (Mon Sep 29, 1:17 pm)
[patch 02/10] ieee1394: add hpsb_node_read() and hpsb_node_l..., Stefan Richter, (Mon Sep 29, 1:17 pm)
[patch 01/10] ieee1394: use correct barrier types between ac..., Stefan Richter, (Mon Sep 29, 1:16 pm)
Re: what is the status of this initiative ?, Greg KH, (Thu Mar 13, 10:51 am)
Re: what is the status of this initiative ?, Javi Roman, (Thu Mar 13, 1:13 pm)
Re: what is the status of this initiative ?, Greg KH, (Thu Mar 13, 1:36 pm)
Re: what is the status of this initiative ?, Davide Madrisan, (Thu Mar 13, 1:30 pm)
Re: broken mailing list, try 47..., Steven Le Roux, (Sat Jan 12, 2:10 pm)
Re: broken mailing list, try 47..., stuart, (Sat Jan 12, 6:56 pm)
AW: Kick off the Linux Driver Project (again, this time for ..., Thomas Schnürer, (Thu Sep 27, 9:48 am)
Kick off the Linux Driver Project (again, this time for real), Miguel Ojeda, (Thu Sep 27, 10:36 am)
Kick off the Linux Driver Project (again, this time for real), Greg KH, (Thu Sep 27, 11:47 am)
Kick off the Linux Driver Project (again, this time for real), Miguel Ojeda, (Thu Sep 27, 4:39 pm)
Kick off the Linux Driver Project (again, this time for real), Peter W. Morreale, (Thu Sep 27, 9:21 am)
Kick off the Linux Driver Project (again, this time for real), Felipe Balbi, (Thu Sep 27, 9:27 am)
Kick off the Linux Driver Project (again, this time for real), Peter W. Morreale, (Thu Sep 27, 9:55 am)
Kick off the Linux Driver Project (again, this time for real), Sai Suman, (Thu Sep 27, 9:46 am)
Kick off the Linux Driver Project (again, this time for real), Peter W. Morreale, (Thu Sep 27, 10:58 am)
Kick off the Linux Driver Project (again, this time for real), Greg KH, (Thu Sep 27, 12:33 pm)
Kick off the Linux Driver Project (again, this time for real), Tomasz Grzegurzko, (Thu Sep 27, 9:40 pm)