diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2007-03-28 14:26:10 -0400 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-03-28 21:37:54 +0200 |
| commit | 8a2f7d932fc6a4881ff837738e23b41a1c228338 (patch) | |
| tree | f8dd2b550d8b5d2462b64e1d1595493f227a9060 | |
| parent | ef370ee74b7a9cb769d50bfb73b4023ee3e37719 (diff) | |
| download | blackbird-op-linux-8a2f7d932fc6a4881ff837738e23b41a1c228338.tar.gz blackbird-op-linux-8a2f7d932fc6a4881ff837738e23b41a1c228338.zip | |
firewire: Fix start on cycle 0 for IT, implement start on cycle for IR.
Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
| -rw-r--r-- | drivers/firewire/fw-ohci.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c index afd18173cca1..b941239671d6 100644 --- a/drivers/firewire/fw-ohci.c +++ b/drivers/firewire/fw-ohci.c @@ -1362,28 +1362,32 @@ static int ohci_start_iso(struct fw_iso_context *base, { struct iso_context *ctx = container_of(base, struct iso_context, base); struct fw_ohci *ohci = ctx->context.ohci; - u32 cycle_match = 0; + u32 control, match; int index; if (ctx->base.type == FW_ISO_CONTEXT_TRANSMIT) { index = ctx - ohci->it_context_list; - if (cycle > 0) - cycle_match = IT_CONTEXT_CYCLE_MATCH_ENABLE | + match = 0; + if (cycle >= 0) + match = IT_CONTEXT_CYCLE_MATCH_ENABLE | (cycle & 0x7fff) << 16; reg_write(ohci, OHCI1394_IsoXmitIntEventClear, 1 << index); reg_write(ohci, OHCI1394_IsoXmitIntMaskSet, 1 << index); - context_run(&ctx->context, cycle_match); + context_run(&ctx->context, match); } else { index = ctx - ohci->ir_context_list; + control = IR_CONTEXT_DUAL_BUFFER_MODE | IR_CONTEXT_ISOCH_HEADER; + match = (tags << 28) | (sync << 8) | ctx->base.channel; + if (cycle >= 0) { + match |= (cycle & 0x07fff) << 12; + control |= IR_CONTEXT_CYCLE_MATCH_ENABLE; + } reg_write(ohci, OHCI1394_IsoRecvIntEventClear, 1 << index); reg_write(ohci, OHCI1394_IsoRecvIntMaskSet, 1 << index); - reg_write(ohci, context_match(ctx->context.regs), - (tags << 28) | (sync << 8) | ctx->base.channel); - context_run(&ctx->context, - IR_CONTEXT_DUAL_BUFFER_MODE | - IR_CONTEXT_ISOCH_HEADER); + reg_write(ohci, context_match(ctx->context.regs), match); + context_run(&ctx->context, control); } return 0; |
