diff options
Diffstat (limited to 'drivers/firewire/fw-iso.c')
-rw-r--r-- | drivers/firewire/fw-iso.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/drivers/firewire/fw-iso.c b/drivers/firewire/fw-iso.c index cb32b20da9a0..3ff2cfc1bba6 100644 --- a/drivers/firewire/fw-iso.c +++ b/drivers/firewire/fw-iso.c | |||
@@ -28,9 +28,8 @@ | |||
28 | #include "fw-topology.h" | 28 | #include "fw-topology.h" |
29 | #include "fw-device.h" | 29 | #include "fw-device.h" |
30 | 30 | ||
31 | int | 31 | int fw_iso_buffer_init(struct fw_iso_buffer *buffer, struct fw_card *card, |
32 | fw_iso_buffer_init(struct fw_iso_buffer *buffer, struct fw_card *card, | 32 | int page_count, enum dma_data_direction direction) |
33 | int page_count, enum dma_data_direction direction) | ||
34 | { | 33 | { |
35 | int i, j; | 34 | int i, j; |
36 | dma_addr_t address; | 35 | dma_addr_t address; |
@@ -105,10 +104,9 @@ void fw_iso_buffer_destroy(struct fw_iso_buffer *buffer, | |||
105 | buffer->pages = NULL; | 104 | buffer->pages = NULL; |
106 | } | 105 | } |
107 | 106 | ||
108 | struct fw_iso_context * | 107 | struct fw_iso_context *fw_iso_context_create(struct fw_card *card, |
109 | fw_iso_context_create(struct fw_card *card, int type, | 108 | int type, int channel, int speed, size_t header_size, |
110 | int channel, int speed, size_t header_size, | 109 | fw_iso_callback_t callback, void *callback_data) |
111 | fw_iso_callback_t callback, void *callback_data) | ||
112 | { | 110 | { |
113 | struct fw_iso_context *ctx; | 111 | struct fw_iso_context *ctx; |
114 | 112 | ||
@@ -134,25 +132,23 @@ void fw_iso_context_destroy(struct fw_iso_context *ctx) | |||
134 | card->driver->free_iso_context(ctx); | 132 | card->driver->free_iso_context(ctx); |
135 | } | 133 | } |
136 | 134 | ||
137 | int | 135 | int fw_iso_context_start(struct fw_iso_context *ctx, |
138 | fw_iso_context_start(struct fw_iso_context *ctx, int cycle, int sync, int tags) | 136 | int cycle, int sync, int tags) |
139 | { | 137 | { |
140 | return ctx->card->driver->start_iso(ctx, cycle, sync, tags); | 138 | return ctx->card->driver->start_iso(ctx, cycle, sync, tags); |
141 | } | 139 | } |
142 | 140 | ||
143 | int | 141 | int fw_iso_context_queue(struct fw_iso_context *ctx, |
144 | fw_iso_context_queue(struct fw_iso_context *ctx, | 142 | struct fw_iso_packet *packet, |
145 | struct fw_iso_packet *packet, | 143 | struct fw_iso_buffer *buffer, |
146 | struct fw_iso_buffer *buffer, | 144 | unsigned long payload) |
147 | unsigned long payload) | ||
148 | { | 145 | { |
149 | struct fw_card *card = ctx->card; | 146 | struct fw_card *card = ctx->card; |
150 | 147 | ||
151 | return card->driver->queue_iso(ctx, packet, buffer, payload); | 148 | return card->driver->queue_iso(ctx, packet, buffer, payload); |
152 | } | 149 | } |
153 | 150 | ||
154 | int | 151 | int fw_iso_context_stop(struct fw_iso_context *ctx) |
155 | fw_iso_context_stop(struct fw_iso_context *ctx) | ||
156 | { | 152 | { |
157 | return ctx->card->driver->stop_iso(ctx); | 153 | return ctx->card->driver->stop_iso(ctx); |
158 | } | 154 | } |