Commit b3b29888 authored by Stefan Richter's avatar Stefan Richter
Browse files

firewire: share device ID table type with ieee1394 



That way, the new firedtv driver will be able to use a single ID table
in builds against ieee1394 core and/or against firewire core.

Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 0210b66d

drivers/firewire/fw-device.c

+9 −7
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/jiffies.h>

#include <linux/kobject.h>

#include <linux/list.h>

#include <linux/mod_devicetable.h>

#include <linux/mutex.h>

#include <linux/rwsem.h>

#include <linux/semaphore.h>
@@ -57,7 +58,8 @@ EXPORT_SYMBOL(fw_csr_iterator_next); 


static int is_fw_unit(struct device *dev);



static int match_unit_directory(u32 * directory, const struct fw_device_id *id)

static int match_unit_directory(u32 *directory,

				const struct ieee1394_device_id *id)

{

	struct fw_csr_iterator ci;

	int key, value, match;
@@ -65,14 +67,14 @@ static int match_unit_directory(u32 * directory, const struct fw_device_id *id) 
	match = 0;

	fw_csr_iterator_init(&ci, directory);

	while (fw_csr_iterator_next(&ci, &key, &value)) {

		if (key == CSR_VENDOR && value == id->vendor)

			match |= FW_MATCH_VENDOR;

		if (key == CSR_MODEL && value == id->model)

			match |= FW_MATCH_MODEL;

		if (key == CSR_VENDOR && value == id->vendor_id)

			match |= IEEE1394_MATCH_VENDOR_ID;

		if (key == CSR_MODEL && value == id->model_id)

			match |= IEEE1394_MATCH_MODEL_ID;

		if (key == CSR_SPECIFIER_ID && value == id->specifier_id)

			match |= FW_MATCH_SPECIFIER_ID;

			match |= IEEE1394_MATCH_SPECIFIER_ID;

		if (key == CSR_VERSION && value == id->version)

			match |= FW_MATCH_VERSION;

			match |= IEEE1394_MATCH_VERSION;

	}



	return (match & id->match_flags) == id->match_flags;

drivers/firewire/fw-device.h

+3 −16
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/idr.h>

#include <linux/kernel.h>

#include <linux/list.h>

#include <linux/mod_devicetable.h>

#include <linux/mutex.h>

#include <linux/rwsem.h>

#include <linux/sysfs.h>
@@ -172,25 +173,11 @@ void fw_csr_iterator_init(struct fw_csr_iterator *ci, u32 *p); 
int fw_csr_iterator_next(struct fw_csr_iterator *ci,

			 int *key, int *value);



#define FW_MATCH_VENDOR		0x0001

#define FW_MATCH_MODEL		0x0002

#define FW_MATCH_SPECIFIER_ID	0x0004

#define FW_MATCH_VERSION	0x0008



struct fw_device_id {

	u32 match_flags;

	u32 vendor;

	u32 model;

	u32 specifier_id;

	u32 version;

	void *driver_data;

};



struct fw_driver {

	struct device_driver driver;

	/* Called when the parent device sits through a bus reset. */

	void (*update)(struct fw_unit *unit);

	const struct fw_device_id *id_table;

	const struct ieee1394_device_id *id_table;

};



static inline struct fw_driver *fw_driver(struct device_driver *drv)

drivers/firewire/fw-sbp2.c

+3 −2
Original line number Diff line number Diff line
@@ -1259,9 +1259,10 @@ static void sbp2_update(struct fw_unit *unit) 
#define SBP2_UNIT_SPEC_ID_ENTRY	0x0000609e

#define SBP2_SW_VERSION_ENTRY	0x00010483



static const struct fw_device_id sbp2_id_table[] = {

static const struct ieee1394_device_id sbp2_id_table[] = {

	{

		.match_flags  = FW_MATCH_SPECIFIER_ID | FW_MATCH_VERSION,

		.match_flags  = IEEE1394_MATCH_SPECIFIER_ID |

				IEEE1394_MATCH_VERSION,

		.specifier_id = SBP2_UNIT_SPEC_ID_ENTRY,

		.version      = SBP2_SW_VERSION_ENTRY,

	},