diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-01-23 21:11:43 +0100 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-03-09 22:02:43 +0100 |
| commit | 907293d78872ee492ce6a114258dd853ec5082ae (patch) | |
| tree | 9384ac58621706b7d3846b34944fa5475f084502 /drivers/firewire/fw-device.c | |
| parent | 366f5f4fa31cd3f3d5901f5edfe255a48906505d (diff) | |
firewire: consistent usage of node_id
Definitions as per IEEE 1212 and IEEE 1394:
Node ID: Concatenation of bus ID and local ID. 16 bits long.
Bus ID: Identifies a particular bus within a group of buses
interconnected by bus bridges.
Local ID: Identifies a particular node on a bus.
PHY ID: Local ID of IEEE 1394 nodes. 6 bits long.
Never ever use a variable called node_id for anything else than a node ID.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire/fw-device.c')
| -rw-r--r-- | drivers/firewire/fw-device.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c index f1b0e75fd91e..4fb5587252a9 100644 --- a/drivers/firewire/fw-device.c +++ b/drivers/firewire/fw-device.c @@ -257,7 +257,7 @@ static int read_rom(struct fw_device *device, int index, u32 * data) offset = 0xfffff0000400ULL + index * 4; fw_send_request(device->card, &t, TCODE_READ_QUADLET_REQUEST, - device->node_id | LOCAL_BUS, + device->node_id, device->generation, SCODE_100, offset, NULL, 4, complete_transaction, &callback_data); @@ -447,7 +447,7 @@ static void fw_device_init(struct work_struct *work) device->config_rom_retries++; schedule_delayed_work(&device->work, RETRY_DELAY); } else { - fw_notify("giving up on config rom for node id %d\n", + fw_notify("giving up on config rom for node id %x\n", device->node_id); fw_device_release(&device->device); } |