diff options
Diffstat (limited to 'drivers/firewire/core.h')
-rw-r--r-- | drivers/firewire/core.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h index e6239f971be6..0fe4e4e6eda7 100644 --- a/drivers/firewire/core.h +++ b/drivers/firewire/core.h | |||
@@ -97,6 +97,8 @@ struct fw_card_driver { | |||
97 | struct fw_iso_buffer *buffer, | 97 | struct fw_iso_buffer *buffer, |
98 | unsigned long payload); | 98 | unsigned long payload); |
99 | 99 | ||
100 | void (*flush_queue_iso)(struct fw_iso_context *ctx); | ||
101 | |||
100 | int (*stop_iso)(struct fw_iso_context *ctx); | 102 | int (*stop_iso)(struct fw_iso_context *ctx); |
101 | }; | 103 | }; |
102 | 104 | ||
@@ -147,9 +149,6 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event); | |||
147 | /* -iso */ | 149 | /* -iso */ |
148 | 150 | ||
149 | int fw_iso_buffer_map(struct fw_iso_buffer *buffer, struct vm_area_struct *vma); | 151 | int fw_iso_buffer_map(struct fw_iso_buffer *buffer, struct vm_area_struct *vma); |
150 | void fw_iso_resource_manage(struct fw_card *card, int generation, | ||
151 | u64 channels_mask, int *channel, int *bandwidth, | ||
152 | bool allocate, __be32 buffer[2]); | ||
153 | 152 | ||
154 | 153 | ||
155 | /* -topology */ | 154 | /* -topology */ |
@@ -215,9 +214,11 @@ static inline bool is_next_generation(int new_generation, int old_generation) | |||
215 | 214 | ||
216 | /* -transaction */ | 215 | /* -transaction */ |
217 | 216 | ||
217 | #define TCODE_LINK_INTERNAL 0xe | ||
218 | |||
218 | #define TCODE_IS_READ_REQUEST(tcode) (((tcode) & ~1) == 4) | 219 | #define TCODE_IS_READ_REQUEST(tcode) (((tcode) & ~1) == 4) |
219 | #define TCODE_IS_BLOCK_PACKET(tcode) (((tcode) & 1) != 0) | 220 | #define TCODE_IS_BLOCK_PACKET(tcode) (((tcode) & 1) != 0) |
220 | #define TCODE_IS_LINK_INTERNAL(tcode) ((tcode) == 0xe) | 221 | #define TCODE_IS_LINK_INTERNAL(tcode) ((tcode) == TCODE_LINK_INTERNAL) |
221 | #define TCODE_IS_REQUEST(tcode) (((tcode) & 2) == 0) | 222 | #define TCODE_IS_REQUEST(tcode) (((tcode) & 2) == 0) |
222 | #define TCODE_IS_RESPONSE(tcode) (((tcode) & 2) != 0) | 223 | #define TCODE_IS_RESPONSE(tcode) (((tcode) & 2) != 0) |
223 | #define TCODE_HAS_REQUEST_DATA(tcode) (((tcode) & 12) != 4) | 224 | #define TCODE_HAS_REQUEST_DATA(tcode) (((tcode) & 12) != 4) |