diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2007-03-14 17:34:54 -0400 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-03-15 18:21:36 +0100 |
| commit | eb0306eac0aad0b7da18d8fbfb777f155b2c010d (patch) | |
| tree | ac0d1922362804b9687deb5bffb8179ac670149a /drivers/firewire/fw-transaction.h | |
| parent | c70dc788fd8d3870b41231b6a53a64afb98cfd13 (diff) | |
firewire: Move sync and tag parameters to start_iso ioctl.
Setting these at create_context time or start_iso time doesn't matter
much, but raw1394 sets them at start_iso time so that will be easier to
emulate this way.
Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire/fw-transaction.h')
| -rw-r--r-- | drivers/firewire/fw-transaction.h | 13 |
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 { int type; int channel; int speed; - int sync; - int tags; size_t header_size; fw_iso_callback_t callback; void *callback_data; @@ -382,8 +380,7 @@ fw_iso_buffer_destroy(struct fw_iso_buffer *buffer, struct fw_card *card); struct fw_iso_context * fw_iso_context_create(struct fw_card *card, int type, - int channel, int speed, - int sync, int tags, size_t header_size, + int channel, int speed, size_t header_size, fw_iso_callback_t callback, void *callback_data); void @@ -396,7 +393,8 @@ fw_iso_context_queue(struct fw_iso_context *ctx, unsigned long payload); int -fw_iso_context_start(struct fw_iso_context *ctx, int cycle); +fw_iso_context_start(struct fw_iso_context *ctx, + int cycle, int sync, int tags); int fw_iso_context_stop(struct fw_iso_context *ctx); @@ -436,11 +434,12 @@ struct fw_card_driver { u64 (*get_bus_time) (struct fw_card *card); struct fw_iso_context * - (*allocate_iso_context)(struct fw_card *card, int sync, int tags, + (*allocate_iso_context)(struct fw_card *card, int type, size_t header_size); void (*free_iso_context)(struct fw_iso_context *ctx); - int (*start_iso)(struct fw_iso_context *ctx, s32 cycle); + int (*start_iso)(struct fw_iso_context *ctx, + s32 cycle, u32 sync, u32 tags); int (*queue_iso)(struct fw_iso_context *ctx, struct fw_iso_packet *packet, |