diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2010-06-12 14:30:21 -0400 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2010-06-19 07:01:41 -0400 |
commit | db3c9cc105ee844f6cd7a1beb9926fb8e9a093ae (patch) | |
tree | 5fe981b7be4ffb97a506e23836d6c81a61dc8c91 /drivers/firewire/core.h | |
parent | e847cc832bab50aad939a0c30414cd986637564d (diff) |
firewire: replace get_features card driver hook
by feature variables in the fw_card struct. The hook appeared to be an
unnecessary abstraction in the card driver interface.
Cleaner would be to pass those feature flags as arguments to
fw_card_initialize() or fw_card_add(), but the FairnessControl register
is in the SCLK domain and may therefore not be accessible while Link
Power Status is off, i.e. before the card->driver->enable call from
fw_card_add().
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire/core.h')
-rw-r--r-- | drivers/firewire/core.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h index 3f9e39b60bca..8dc76d8711a5 100644 --- a/drivers/firewire/core.h +++ b/drivers/firewire/core.h | |||
@@ -38,9 +38,6 @@ struct fw_packet; | |||
38 | #define BROADCAST_CHANNEL_INITIAL (1 << 31 | 31) | 38 | #define BROADCAST_CHANNEL_INITIAL (1 << 31 | 31) |
39 | #define BROADCAST_CHANNEL_VALID (1 << 30) | 39 | #define BROADCAST_CHANNEL_VALID (1 << 30) |
40 | 40 | ||
41 | #define FEATURE_PRIORITY_BUDGET 0x01 | ||
42 | #define FEATURE_CHANNEL_31_ALLOCATED 0x02 | ||
43 | |||
44 | #define CSR_STATE_BIT_CMSTR (1 << 8) | 41 | #define CSR_STATE_BIT_CMSTR (1 << 8) |
45 | #define CSR_STATE_BIT_ABDICATE (1 << 10) | 42 | #define CSR_STATE_BIT_ABDICATE (1 << 10) |
46 | 43 | ||
@@ -84,8 +81,6 @@ struct fw_card_driver { | |||
84 | u32 (*read_csr_reg)(struct fw_card *card, int csr_offset); | 81 | u32 (*read_csr_reg)(struct fw_card *card, int csr_offset); |
85 | void (*write_csr_reg)(struct fw_card *card, int csr_offset, u32 value); | 82 | void (*write_csr_reg)(struct fw_card *card, int csr_offset, u32 value); |
86 | 83 | ||
87 | unsigned int (*get_features)(struct fw_card *card); | ||
88 | |||
89 | struct fw_iso_context * | 84 | struct fw_iso_context * |
90 | (*allocate_iso_context)(struct fw_card *card, | 85 | (*allocate_iso_context)(struct fw_card *card, |
91 | int type, int channel, size_t header_size); | 86 | int type, int channel, size_t header_size); |