#Applies against: 2.6.17
#Signed-off-by: Uwe Bugla <uwe.bugla@xxxxxx>
#Changes: fix type and / or tab errors, wipes out uncommented material
--- a/drivers/media/video/vivi.c 2006-05-27 14:03:00
+++ b/drivers/media/video/vivi.c 2006-05-30 13:05:00
@@ -41,13 +41,7 @@
#define WAKE_NUMERATOR 30
#define WAKE_DENOMINATOR 1001
#define BUFFER_TIMEOUT msecs_to_jiffies(500) /* 0.5 seconds */
-
-/* These timers are for 1 fps - used only for testing */
-//#define WAKE_DENOMINATOR 30 /* hack for testing purposes */
-//#define BUFFER_TIMEOUT msecs_to_jiffies(5000) /* 5 seconds */
-
#include "font.h"
-
#ifndef kzalloc
#define kzalloc(size, flags) \
({ \
@@ -581,11 +575,8 @@
buf = list_entry(dma_q->active.next, struct vivi_buffer, vb.queue);
dprintk(2,"restart_queue [%p/%d]: restart dma\n",
buf, buf->vb.i);
-
dprintk(1,"Restarting video dma\n");
vivi_stop_thread(dma_q);
-// vivi_start_thread(dma_q);
-
/* cancel all outstanding capture / vbi requests */
list_for_each(item,&dma_q->active) {
buf = list_entry(item, struct vivi_buffer, vb.queue);
@@ -693,9 +684,6 @@
struct vivi_fh *fh = vq->priv_data;
struct vivi_buffer *buf = container_of(vb,struct vivi_buffer,vb);
int rc, init_buffer = 0;
-
-// dprintk(1,"%s, field=%d\n",__FUNCTION__,field);
-
BUG_ON(NULL == fh->fmt);
if (fh->width < 48 || fh->width > norm_maxw() ||
fh->height < 32 || fh->height > norm_maxh())
@@ -726,10 +714,8 @@
rc=-ENOMEM;
goto fail;
}
-
return 0;
-
-fail:
+ fail:
free_buffer(vq,buf);
return rc;
}
@@ -818,9 +804,6 @@
int vivi_dma_sync_sg(void *dev,struct scatterlist *sglist,int nr_pages,
int direction)
{
-// dprintk(1,"%s\n",__FUNCTION__);
-
-// flush_write_buffers();
return 0;
}
@@ -852,11 +835,8 @@
return -EINVAL;
}
fmt=&format;
-
field = f->fmt.pix.field;
-
if (field == V4L2_FIELD_ANY) {
-// field=V4L2_FIELD_INTERLACED;
field=V4L2_FIELD_SEQ_TB;
} else if (V4L2_FIELD_INTERLACED != field) {
dprintk(1,"Field type invalid.\n");
@@ -1411,7 +1391,6 @@
.hardware = 0,
.fops = &vivi_fops,
.minor = -1,
-// .release = video_device_release,
};
/* ------------------------------------------------------------------
Initialization and module stuff
--
"Feel free" – 10 GB Mailbox, 100 FreeSMS/Monat ...
Jetzt GMX TopMail testen: http://www.gmx.net/de/go/topmail
_______________________________________________
linux-dvb@xxxxxxxxxxx
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linux-dvb
