Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 47321
b: refs/heads/master
c: a578201
h: refs/heads/master
i:
  47319: 434ce6c
v: v3
  • Loading branch information
David Moore authored and Stefan Richter committed Feb 8, 2007
1 parent e960397 commit 0406a61
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0fe4c6fcacb28bda75b31f63d3629f640a6b9bf9
refs/heads/master: a5782010b4e75cba571357efaa27df22a89427c2
8 changes: 8 additions & 0 deletions trunk/drivers/ieee1394/video1394.c
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,9 @@ static void wakeup_dma_ir_ctx(unsigned long l)
reset_ir_status(d, i);
d->buffer_status[d->buffer_prg_assignment[i]] = VIDEO1394_BUFFER_READY;
do_gettimeofday(&d->buffer_time[d->buffer_prg_assignment[i]]);
dma_region_sync_for_cpu(&d->dma,
d->buffer_prg_assignment[i] * d->buf_size,
d->buf_size);
}
}

Expand Down Expand Up @@ -1096,6 +1099,8 @@ static long video1394_ioctl(struct file *file,
DBGMSG(ohci->host->id, "Starting iso transmit DMA ctx=%d",
d->ctx);
put_timestamp(ohci, d, d->last_buffer);
dma_region_sync_for_device(&d->dma,
v.buffer * d->buf_size, d->buf_size);

/* Tell the controller where the first program is */
reg_write(ohci, d->cmdPtr,
Expand All @@ -1111,6 +1116,9 @@ static long video1394_ioctl(struct file *file,
"Waking up iso transmit dma ctx=%d",
d->ctx);
put_timestamp(ohci, d, d->last_buffer);
dma_region_sync_for_device(&d->dma,
v.buffer * d->buf_size, d->buf_size);

reg_write(ohci, d->ctrlSet, 0x1000);
}
}
Expand Down

0 comments on commit 0406a61

Please sign in to comment.