aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firewire/fw-transaction.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/firewire/fw-transaction.h')
-rw-r--r--drivers/firewire/fw-transaction.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h
index 855beb27216d..662149723e98 100644
--- a/drivers/firewire/fw-transaction.h
+++ b/drivers/firewire/fw-transaction.h
@@ -363,8 +363,6 @@ struct fw_iso_context {
363 int type; 363 int type;
364 int channel; 364 int channel;
365 int speed; 365 int speed;
366 int sync;
367 int tags;
368 size_t header_size; 366 size_t header_size;
369 fw_iso_callback_t callback; 367 fw_iso_callback_t callback;
370 void *callback_data; 368 void *callback_data;
@@ -382,8 +380,7 @@ fw_iso_buffer_destroy(struct fw_iso_buffer *buffer, struct fw_card *card);
382 380
383struct fw_iso_context * 381struct fw_iso_context *
384fw_iso_context_create(struct fw_card *card, int type, 382fw_iso_context_create(struct fw_card *card, int type,
385 int channel, int speed, 383 int channel, int speed, size_t header_size,
386 int sync, int tags, size_t header_size,
387 fw_iso_callback_t callback, void *callback_data); 384 fw_iso_callback_t callback, void *callback_data);
388 385
389void 386void
@@ -396,7 +393,8 @@ fw_iso_context_queue(struct fw_iso_context *ctx,
396 unsigned long payload); 393 unsigned long payload);
397 394
398int 395int
399fw_iso_context_start(struct fw_iso_context *ctx, int cycle); 396fw_iso_context_start(struct fw_iso_context *ctx,
397 int cycle, int sync, int tags);
400 398
401int 399int
402fw_iso_context_stop(struct fw_iso_context *ctx); 400fw_iso_context_stop(struct fw_iso_context *ctx);
@@ -436,11 +434,12 @@ struct fw_card_driver {
436 u64 (*get_bus_time) (struct fw_card *card); 434 u64 (*get_bus_time) (struct fw_card *card);
437 435
438 struct fw_iso_context * 436 struct fw_iso_context *
439 (*allocate_iso_context)(struct fw_card *card, int sync, int tags, 437 (*allocate_iso_context)(struct fw_card *card,
440 int type, size_t header_size); 438 int type, size_t header_size);
441 void (*free_iso_context)(struct fw_iso_context *ctx); 439 void (*free_iso_context)(struct fw_iso_context *ctx);
442 440
443 int (*start_iso)(struct fw_iso_context *ctx, s32 cycle); 441 int (*start_iso)(struct fw_iso_context *ctx,
442 s32 cycle, u32 sync, u32 tags);
444 443
445 int (*queue_iso)(struct fw_iso_context *ctx, 444 int (*queue_iso)(struct fw_iso_context *ctx,
446 struct fw_iso_packet *packet, 445 struct fw_iso_packet *packet,