Skip to content

Commit

Permalink
Fix incorrect video1394 timestamps.
Browse files Browse the repository at this point in the history
This patch fixes the incoherent timestamps generated by video1394 since
the single-buffer patch was applied in 2.6.11. Credits have also been
removed from the header and a "//" comment was changed to "/* */".

Signed-off-by: Damien Douxchamps <ddouxchamps@users.sf.net>
Signed-off-by: Jody McIntyre <scjody@modernduck.com>
  • Loading branch information
Damien Douxchamps authored and scjody committed Nov 20, 2005
1 parent e27d301 commit e4cda16
Showing 1 changed file with 2 additions and 15 deletions.
17 changes: 2 additions & 15 deletions drivers/ieee1394/video1394.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@
*
* NOTES:
*
* jds -- add private data to file to keep track of iso contexts associated
* with each open -- so release won't kill all iso transfers.
*
* Damien Douxchamps: Fix failure when the number of DMA pages per frame is
* one.
*
* ioctl return codes:
* EFAULT is only for invalid address for the argp
* EINVAL for out of range values
Expand All @@ -34,12 +28,6 @@
* ENOTTY for unsupported ioctl request
*
*/

/* Markus Tavenrath <speedygoo@speedygoo.de> :
- fixed checks for valid buffer-numbers in video1394_icotl
- changed the ways the dma prg's are used, now it's possible to use
even a single dma buffer
*/
#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/list.h>
Expand Down Expand Up @@ -503,7 +491,7 @@ static void wakeup_dma_ir_ctx(unsigned long l)
if (d->ir_prg[i][d->nb_cmd-1].status & cpu_to_le32(0xFFFF0000)) {
reset_ir_status(d, i);
d->buffer_status[d->buffer_prg_assignment[i]] = VIDEO1394_BUFFER_READY;
do_gettimeofday(&d->buffer_time[i]);
do_gettimeofday(&d->buffer_time[d->buffer_prg_assignment[i]]);
}
}

Expand Down Expand Up @@ -1010,7 +998,6 @@ static int __video1394_ioctl(struct file *file,

/* set time of buffer */
v.filltime = d->buffer_time[v.buffer];
// printk("Buffer %d time %d\n", v.buffer, (d->buffer_time[v.buffer]).tv_usec);

/*
* Look ahead to see how many more buffers have been received
Expand Down Expand Up @@ -1068,7 +1055,7 @@ static int __video1394_ioctl(struct file *file,

spin_lock_irqsave(&d->lock,flags);

// last_buffer is last_prg
/* last_buffer is last_prg */
next_prg = (d->last_buffer + 1) % d->num_desc;
if (d->buffer_status[v.buffer]!=VIDEO1394_BUFFER_FREE) {
PRINT(KERN_ERR, ohci->host->id,
Expand Down

0 comments on commit e4cda16

Please sign in to comment.