[PATCH] tm6000: rewrite copy_streams
From: Stefan Ringel stefan.rin...@arcor.de
fusion function copy streams and copy_packets to new function copy_streams.
Signed-off-by: Stefan Ringel stefan.rin...@arcor.de
---
drivers/staging/tm6000/tm6000-usb-isoc.h |5 +-
drivers/staging/tm6000/tm6000-video.c| 326 +++---
2 files changed, 119 insertions(+), 212 deletions(-)
diff --git a/drivers/staging/tm6000/tm6000-usb-isoc.h
b/drivers/staging/tm6000/tm6000-usb-isoc.h
index 5a5049a..138716a 100644
--- a/drivers/staging/tm6000/tm6000-usb-isoc.h
+++ b/drivers/staging/tm6000/tm6000-usb-isoc.h
@@ -39,7 +39,7 @@ struct usb_isoc_ctl {
int pos, size, pktsize;
/* Last field: ODD or EVEN? */
- int field;
+ int vfield;
/* Stores incomplete commands */
u32 tmp_buf;
@@ -47,7 +47,4 @@ struct usb_isoc_ctl {
/* Stores already requested buffers */
struct tm6000_buffer*buf;
-
- /* Stores the number of received fields */
- int nfields;
};
diff --git a/drivers/staging/tm6000/tm6000-video.c
b/drivers/staging/tm6000/tm6000-video.c
index 4f7e743..9746fe7 100644
--- a/drivers/staging/tm6000/tm6000-video.c
+++ b/drivers/staging/tm6000/tm6000-video.c
@@ -186,229 +186,143 @@ const char *tm6000_msg_type[] = {
/*
* Identify the tm5600/6000 buffer header type and properly handles
*/
-static int copy_packet(struct urb *urb, u32 header, u8 **ptr, u8 *endp,
- u8 *out_p, struct tm6000_buffer **buf)
-{
- struct tm6000_dmaqueue *dma_q = urb-context;
- struct tm6000_core *dev = container_of(dma_q, struct tm6000_core, vidq);
- u8 c;
- unsigned int cmd, cpysize, pktsize, size, field, block, line, pos = 0;
- int rc = 0;
- /* FIXME: move to tm6000-isoc */
- static int last_line = -2, start_line = -2, last_field = -2;
-
- /* FIXME: this is the hardcoded window size
-*/
- unsigned int linewidth = (*buf)-vb.width 1;
-
- if (!dev-isoc_ctl.cmd) {
- c = (header 24) 0xff;
-
- /* split the header fields */
- size = ((header 0x7e) 1);
-
- if (size 0)
- size -= 4;
-
- block = (header 7) 0xf;
- field = (header 11) 0x1;
- line = (header 12) 0x1ff;
- cmd = (header 21) 0x7;
-
- /* Validates header fields */
- if(size TM6000_URB_MSG_LEN)
- size = TM6000_URB_MSG_LEN;
-
- if (cmd == TM6000_URB_MSG_VIDEO) {
- if ((block+1)*TM6000_URB_MSG_LENlinewidth)
- cmd = TM6000_URB_MSG_ERR;
-
- /* FIXME: Mounts the image as field0+field1
-* It should, instead, check if the user selected
-* entrelaced or non-entrelaced mode
-*/
- pos= ((line1)+field)*linewidth +
- block*TM6000_URB_MSG_LEN;
-
- /* Don't allow to write out of the buffer */
- if (pos+TM6000_URB_MSG_LEN (*buf)-vb.size) {
- dprintk(dev, V4L2_DEBUG_ISOC,
- ERR: size=%d, num=%d, line=%d,
- field=%d\n,
- size, block, line, field);
-
- cmd = TM6000_URB_MSG_ERR;
- }
- } else {
- pos=0;
- }
-
- /* Prints debug info */
- dprintk(dev, V4L2_DEBUG_ISOC, size=%d, num=%d,
-line=%d, field=%d\n,
- size, block, line, field);
-
- if ((last_line!=line)(last_line+1!=line)
- (cmd != TM6000_URB_MSG_ERR) ) {
- if (cmd != TM6000_URB_MSG_VIDEO) {
- dprintk(dev, V4L2_DEBUG_ISOC, cmd=%d,
- size=%d, num=%d, line=%d, field=%d\n,
- cmd, size, block, line, field);
- }
- if (start_line0)
- start_line=last_line;
- /* Prints debug info */
- dprintk(dev, V4L2_DEBUG_ISOC, lines= %d-%d,
- field=%d\n,
- start_line, last_line, field);
-
- if ((start_line6 last_line200)
- (last_field != field) ) {
-
- dev-isoc_ctl.nfields++;
- if (dev-isoc_ctl.nfields=2) {
-
[PATCH] tm6000: rewrite copy_streams
From: Stefan Ringel stefan.rin...@arcor.de
fusion function copy streams and copy_packets to new function copy_streams.
Signed-off-by: Stefan Ringel stefan.rin...@arcor.de
---
drivers/staging/tm6000/tm6000-usb-isoc.h |5 +-
drivers/staging/tm6000/tm6000-video.c| 335 +++---
2 files changed, 122 insertions(+), 218 deletions(-)
diff --git a/drivers/staging/tm6000/tm6000-usb-isoc.h
b/drivers/staging/tm6000/tm6000-usb-isoc.h
index 5a5049a..138716a 100644
--- a/drivers/staging/tm6000/tm6000-usb-isoc.h
+++ b/drivers/staging/tm6000/tm6000-usb-isoc.h
@@ -39,7 +39,7 @@ struct usb_isoc_ctl {
int pos, size, pktsize;
/* Last field: ODD or EVEN? */
- int field;
+ int vfield;
/* Stores incomplete commands */
u32 tmp_buf;
@@ -47,7 +47,4 @@ struct usb_isoc_ctl {
/* Stores already requested buffers */
struct tm6000_buffer*buf;
-
- /* Stores the number of received fields */
- int nfields;
};
diff --git a/drivers/staging/tm6000/tm6000-video.c
b/drivers/staging/tm6000/tm6000-video.c
index 2a61cc3..9746fe7 100644
--- a/drivers/staging/tm6000/tm6000-video.c
+++ b/drivers/staging/tm6000/tm6000-video.c
@@ -186,234 +186,145 @@ const char *tm6000_msg_type[] = {
/*
* Identify the tm5600/6000 buffer header type and properly handles
*/
-static int copy_packet(struct urb *urb, u32 header, u8 **ptr, u8 *endp,
- u8 *out_p, struct tm6000_buffer **buf)
-{
- struct tm6000_dmaqueue *dma_q = urb-context;
- struct tm6000_core *dev = container_of(dma_q, struct tm6000_core, vidq);
- u8 c;
- unsigned int cmd, cpysize, pktsize, size, field, block, line, pos = 0;
- int rc = 0;
- /* FIXME: move to tm6000-isoc */
- static int last_line = -2, start_line = -2, last_field = -2;
-
- /* FIXME: this is the hardcoded window size
-*/
- unsigned int linewidth = (*buf)-vb.width 1;
-
- if (!dev-isoc_ctl.cmd) {
- c = (header 24) 0xff;
-
- /* split the header fields */
- size = ((header 0x7e) 1);
-
- if (size 0)
- size -= 4;
-
- block = (header 7) 0xf;
- field = (header 11) 0x1;
- line = (header 12) 0x1ff;
- cmd = (header 21) 0x7;
-
- /* Validates header fields */
- if(size TM6000_URB_MSG_LEN)
- size = TM6000_URB_MSG_LEN;
-
- if (cmd == TM6000_URB_MSG_VIDEO) {
- if ((block+1)*TM6000_URB_MSG_LENlinewidth)
- cmd = TM6000_URB_MSG_ERR;
-
- /* FIXME: Mounts the image as field0+field1
-* It should, instead, check if the user selected
-* entrelaced or non-entrelaced mode
-*/
- pos= ((line1)+field)*linewidth +
- block*TM6000_URB_MSG_LEN;
-
- /* Don't allow to write out of the buffer */
- if (pos+TM6000_URB_MSG_LEN (*buf)-vb.size) {
- dprintk(dev, V4L2_DEBUG_ISOC,
- ERR: size=%d, num=%d, line=%d,
- field=%d\n,
- size, block, line, field);
-
- cmd = TM6000_URB_MSG_ERR;
- }
- } else {
- pos=0;
- }
-
- /* Prints debug info */
- dprintk(dev, V4L2_DEBUG_ISOC, size=%d, num=%d,
-line=%d, field=%d\n,
- size, block, line, field);
-
- if ((last_line!=line)(last_line+1!=line)
- (cmd != TM6000_URB_MSG_ERR) ) {
- if (cmd != TM6000_URB_MSG_VIDEO) {
- dprintk(dev, V4L2_DEBUG_ISOC, cmd=%d,
- size=%d, num=%d, line=%d, field=%d\n,
- cmd, size, block, line, field);
- }
- if (start_line0)
- start_line=last_line;
- /* Prints debug info */
- dprintk(dev, V4L2_DEBUG_ISOC, lines= %d-%d,
- field=%d\n,
- start_line, last_line, field);
-
- if ((start_line6 last_line200)
- (last_field != field) ) {
-
- dev-isoc_ctl.nfields++;
- if (dev-isoc_ctl.nfields=2) {
-
Re: [PATCH] tm6000: rewrite copy_streams
Em 31-05-2010 12:25, stefan.rin...@arcor.de escreveu:
From: Stefan Ringel stefan.rin...@arcor.de
fusion function copy streams and copy_packets to new function copy_streams.
There's something wrong with this patch:
$ patch -p1 -i /tmp/tm6000\:\ rewrite\ copy_streams.eml -l
(Stripping trailing CRs from patch.)
patching file drivers/staging/tm6000/tm6000-usb-isoc.h
(Stripping trailing CRs from patch.)
patching file drivers/staging/tm6000/tm6000-video.c
Hunk #1 FAILED at 186.
Hunk #2 FAILED at 439.
Hunk #3 FAILED at 451.
3 out of 6 hunks FAILED -- saving rejects to file
drivers/staging/tm6000/tm6000-video.c.rej
Please rebase it against git branch devel/for_v2.6.35 of my v4l-dvb.git tree.
Signed-off-by: Stefan Ringel stefan.rin...@arcor.de
---
drivers/staging/tm6000/tm6000-usb-isoc.h |5 +-
drivers/staging/tm6000/tm6000-video.c| 335
+++---
2 files changed, 122 insertions(+), 218 deletions(-)
diff --git a/drivers/staging/tm6000/tm6000-usb-isoc.h
b/drivers/staging/tm6000/tm6000-usb-isoc.h
index 5a5049a..138716a 100644
--- a/drivers/staging/tm6000/tm6000-usb-isoc.h
+++ b/drivers/staging/tm6000/tm6000-usb-isoc.h
@@ -39,7 +39,7 @@ struct usb_isoc_ctl {
int pos, size, pktsize;
/* Last field: ODD or EVEN? */
- int field;
+ int vfield;
/* Stores incomplete commands */
u32 tmp_buf;
@@ -47,7 +47,4 @@ struct usb_isoc_ctl {
/* Stores already requested buffers */
struct tm6000_buffer*buf;
-
- /* Stores the number of received fields */
- int nfields;
};
diff --git a/drivers/staging/tm6000/tm6000-video.c
b/drivers/staging/tm6000/tm6000-video.c
index 2a61cc3..9746fe7 100644
--- a/drivers/staging/tm6000/tm6000-video.c
+++ b/drivers/staging/tm6000/tm6000-video.c
@@ -186,234 +186,145 @@ const char *tm6000_msg_type[] = {
/*
* Identify the tm5600/6000 buffer header type and properly handles
*/
-static int copy_packet(struct urb *urb, u32 header, u8 **ptr, u8 *endp,
- u8 *out_p, struct tm6000_buffer **buf)
-{
- struct tm6000_dmaqueue *dma_q = urb-context;
- struct tm6000_core *dev = container_of(dma_q, struct tm6000_core, vidq);
- u8 c;
- unsigned int cmd, cpysize, pktsize, size, field, block, line, pos = 0;
- int rc = 0;
- /* FIXME: move to tm6000-isoc */
- static int last_line = -2, start_line = -2, last_field = -2;
-
- /* FIXME: this is the hardcoded window size
- */
- unsigned int linewidth = (*buf)-vb.width 1;
-
- if (!dev-isoc_ctl.cmd) {
- c = (header 24) 0xff;
-
- /* split the header fields */
- size = ((header 0x7e) 1);
-
- if (size 0)
- size -= 4;
-
- block = (header 7) 0xf;
- field = (header 11) 0x1;
- line = (header 12) 0x1ff;
- cmd = (header 21) 0x7;
-
- /* Validates header fields */
- if(size TM6000_URB_MSG_LEN)
- size = TM6000_URB_MSG_LEN;
-
- if (cmd == TM6000_URB_MSG_VIDEO) {
- if ((block+1)*TM6000_URB_MSG_LENlinewidth)
- cmd = TM6000_URB_MSG_ERR;
-
- /* FIXME: Mounts the image as field0+field1
- * It should, instead, check if the user selected
- * entrelaced or non-entrelaced mode
- */
- pos= ((line1)+field)*linewidth +
- block*TM6000_URB_MSG_LEN;
-
- /* Don't allow to write out of the buffer */
- if (pos+TM6000_URB_MSG_LEN (*buf)-vb.size) {
- dprintk(dev, V4L2_DEBUG_ISOC,
- ERR: size=%d, num=%d, line=%d,
- field=%d\n,
- size, block, line, field);
-
- cmd = TM6000_URB_MSG_ERR;
- }
- } else {
- pos=0;
- }
-
- /* Prints debug info */
- dprintk(dev, V4L2_DEBUG_ISOC, size=%d, num=%d,
- line=%d, field=%d\n,
- size, block, line, field);
-
- if ((last_line!=line)(last_line+1!=line)
- (cmd != TM6000_URB_MSG_ERR) ) {
- if (cmd != TM6000_URB_MSG_VIDEO) {
- dprintk(dev, V4L2_DEBUG_ISOC, cmd=%d,
- size=%d, num=%d, line=%d, field=%d\n,
- cmd, size, block, line, field);
- }
-
Re: [PATCH] tm6000: rewrite copy_streams
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Am 01.06.2010 00:09, schrieb Mauro Carvalho Chehab:
Em 31-05-2010 12:25, stefan.rin...@arcor.de escreveu:
From: Stefan Ringel stefan.rin...@arcor.de
fusion function copy streams and copy_packets to new function
copy_streams.
There's something wrong with this patch:
$ patch -p1 -i /tmp/tm6000\:\ rewrite\ copy_streams.eml -l
(Stripping trailing CRs from patch.)
patching file drivers/staging/tm6000/tm6000-usb-isoc.h
(Stripping trailing CRs from patch.)
patching file drivers/staging/tm6000/tm6000-video.c
Hunk #1 FAILED at 186.
Hunk #2 FAILED at 439.
Hunk #3 FAILED at 451.
3 out of 6 hunks FAILED -- saving rejects to file
drivers/staging/tm6000/tm6000-video.c.rej
Please rebase it against git branch devel/for_v2.6.35 of my
v4l-dvb.git tree.
Thanks, I rebase it and send it new today.
static int copy_streams(u8 *data, unsigned long len,
struct urb *urb)
{
struct tm6000_dmaqueue *dma_q = urb-context;
struct tm6000_core *dev= container_of(dma_q,struct tm6000_core,vidq);
-u8 *ptr=data, *endp=data+len;
+u8 *ptr=data, *endp=data+len, c;
unsigned long header=0;
int rc=0;
-struct tm6000_buffer *buf;
-char *outp = NULL;
-
-get_next_buf(dma_q, buf);
-if (buf)
-outp = videobuf_to_vmalloc(buf-vb);
+unsigned int cmd, cpysize, pktsize, size, field, block, line, pos
= 0;
+struct tm6000_buffer *vbuf;
+char *voutp = NULL;
+unsigned int linewidth;
-if (!outp)
+/* get video buffer */
+get_next_buf (dma_q, vbuf);
+if (!vbuf)
+return rc;
+voutp = videobuf_to_vmalloc(vbuf-vb);
+if (!voutp)
return 0;
-for (ptr=data; ptrendp;) {
+for (ptr = data; ptr endp;) {
if (!dev-isoc_ctl.cmd) {
-u8 *p=(u8 *)dev-isoc_ctl.tmp_buf;
-/* FIXME: This seems very complex
- * It just recovers up to 3 bytes of the header that
- * might be at the previous packet
- */
-if (dev-isoc_ctl.tmp_buf_len) {
-while (dev-isoc_ctl.tmp_buf_len) {
-if ( *(ptr+3-dev-isoc_ctl.tmp_buf_len) == 0x47) {
-break;
-}
-p++;
-dev-isoc_ctl.tmp_buf_len--;
-}
-if (dev-isoc_ctl.tmp_buf_len) {
-memcpy(header, p,
-dev-isoc_ctl.tmp_buf_len);
-memcpy((u8 *)header +
+/* Header */
+if (dev-isoc_ctl.tmp_buf_len 0) {
+/* from last urb or packet */
+header = dev-isoc_ctl.tmp_buf;
+if (4 - dev-isoc_ctl.tmp_buf_len 0) {
+memcpy ((u8 *)header +
dev-isoc_ctl.tmp_buf_len,
ptr,
4 - dev-isoc_ctl.tmp_buf_len);
ptr += 4 - dev-isoc_ctl.tmp_buf_len;
-goto HEADER;
}
+dev-isoc_ctl.tmp_buf_len = 0;
+} else {
+if (ptr + 3 = endp) {
+/* have incomplete header */
+dev-isoc_ctl.tmp_buf_len = endp - ptr;
+memcpy (dev-isoc_ctl.tmp_buf, ptr,
+dev-isoc_ctl.tmp_buf_len);
+return rc;
+}
+/* Seek for sync */
+for (; ptr endp - 3; ptr++) {
+if (*(ptr + 3) == 0x47)
+break;
+}
+/* Get message header */
+header = *(unsigned long *)ptr;
+ptr += 4;
}
-/* Seek for sync */
-for (;ptrendp-3;ptr++) {
-if (*(ptr+3)==0x47)
-break;
+/* split the header fields */
+c = (header 24) 0xff;
+size = ((header 0x7e) 1);
+if (size 0)
+size -= 4;
+block = (header 7) 0xf;
+field = (header 11) 0x1;
+line = (header 12) 0x1ff;
+cmd = (header 21) 0x7;
+/* Validates haeder fields */
+if (size TM6000_URB_MSG_LEN)
+size = TM6000_URB_MSG_LEN;
+pktsize = TM6000_URB_MSG_LEN;
+/* calculate position in buffer
+ * and change the buffer
+ */
+switch (cmd) {
+case TM6000_URB_MSG_VIDEO:
+if ((dev-isoc_ctl.vfield != field)
+(field == 1)) {
+/* Announces that a new buffer
+ * were filled
+ */
+buffer_filled (dev, dma_q, vbuf);
+dprintk (dev, V4L2_DEBUG_ISOC,
+new
[PATCH] tm6000: rewrite copy_streams
From: Stefan Ringel stefan.rin...@arcor.de
fusion function copy streams and copy_packets to new function copy_streams.
Signed-off-by: Stefan Ringel stefan.rin...@arcor.de
---
drivers/staging/tm6000/tm6000-usb-isoc.h |5 +-
drivers/staging/tm6000/tm6000-video.c| 329 +++---
2 files changed, 119 insertions(+), 215 deletions(-)
diff --git a/drivers/staging/tm6000/tm6000-usb-isoc.h
b/drivers/staging/tm6000/tm6000-usb-isoc.h
index 5a5049a..138716a 100644
--- a/drivers/staging/tm6000/tm6000-usb-isoc.h
+++ b/drivers/staging/tm6000/tm6000-usb-isoc.h
@@ -39,7 +39,7 @@ struct usb_isoc_ctl {
int pos, size, pktsize;
/* Last field: ODD or EVEN? */
- int field;
+ int vfield;
/* Stores incomplete commands */
u32 tmp_buf;
@@ -47,7 +47,4 @@ struct usb_isoc_ctl {
/* Stores already requested buffers */
struct tm6000_buffer*buf;
-
- /* Stores the number of received fields */
- int nfields;
};
diff --git a/drivers/staging/tm6000/tm6000-video.c
b/drivers/staging/tm6000/tm6000-video.c
index 2a61cc3..058c6e9 100644
--- a/drivers/staging/tm6000/tm6000-video.c
+++ b/drivers/staging/tm6000/tm6000-video.c
@@ -186,234 +186,145 @@ const char *tm6000_msg_type[] = {
/*
* Identify the tm5600/6000 buffer header type and properly handles
*/
-static int copy_packet(struct urb *urb, u32 header, u8 **ptr, u8 *endp,
- u8 *out_p, struct tm6000_buffer **buf)
-{
- struct tm6000_dmaqueue *dma_q = urb-context;
- struct tm6000_core *dev = container_of(dma_q, struct tm6000_core, vidq);
- u8 c;
- unsigned int cmd, cpysize, pktsize, size, field, block, line, pos = 0;
- int rc = 0;
- /* FIXME: move to tm6000-isoc */
- static int last_line = -2, start_line = -2, last_field = -2;
-
- /* FIXME: this is the hardcoded window size
-*/
- unsigned int linewidth = (*buf)-vb.width 1;
-
- if (!dev-isoc_ctl.cmd) {
- c = (header 24) 0xff;
-
- /* split the header fields */
- size = ((header 0x7e) 1);
-
- if (size 0)
- size -= 4;
-
- block = (header 7) 0xf;
- field = (header 11) 0x1;
- line = (header 12) 0x1ff;
- cmd = (header 21) 0x7;
-
- /* Validates header fields */
- if(size TM6000_URB_MSG_LEN)
- size = TM6000_URB_MSG_LEN;
-
- if (cmd == TM6000_URB_MSG_VIDEO) {
- if ((block+1)*TM6000_URB_MSG_LENlinewidth)
- cmd = TM6000_URB_MSG_ERR;
-
- /* FIXME: Mounts the image as field0+field1
-* It should, instead, check if the user selected
-* entrelaced or non-entrelaced mode
-*/
- pos= ((line1)+field)*linewidth +
- block*TM6000_URB_MSG_LEN;
-
- /* Don't allow to write out of the buffer */
- if (pos+TM6000_URB_MSG_LEN (*buf)-vb.size) {
- dprintk(dev, V4L2_DEBUG_ISOC,
- ERR: size=%d, num=%d, line=%d,
- field=%d\n,
- size, block, line, field);
-
- cmd = TM6000_URB_MSG_ERR;
- }
- } else {
- pos=0;
- }
-
- /* Prints debug info */
- dprintk(dev, V4L2_DEBUG_ISOC, size=%d, num=%d,
-line=%d, field=%d\n,
- size, block, line, field);
-
- if ((last_line!=line)(last_line+1!=line)
- (cmd != TM6000_URB_MSG_ERR) ) {
- if (cmd != TM6000_URB_MSG_VIDEO) {
- dprintk(dev, V4L2_DEBUG_ISOC, cmd=%d,
- size=%d, num=%d, line=%d, field=%d\n,
- cmd, size, block, line, field);
- }
- if (start_line0)
- start_line=last_line;
- /* Prints debug info */
- dprintk(dev, V4L2_DEBUG_ISOC, lines= %d-%d,
- field=%d\n,
- start_line, last_line, field);
-
- if ((start_line6 last_line200)
- (last_field != field) ) {
-
- dev-isoc_ctl.nfields++;
- if (dev-isoc_ctl.nfields=2) {
-
Re: [PATCH] tm6000: rewrite copy_streams
On Fri, May 28, 2010 at 08:03:40PM +0200, stefan.rin...@arcor.de wrote:
From: Stefan Ringel stefan.rin...@arcor.de
fusion function copy streams and copy_packets to new function copy_streams.
Signed-off-by: Stefan Ringel stefan.rin...@arcor.de
---
drivers/staging/tm6000/tm6000-usb-isoc.h |5 +-
drivers/staging/tm6000/tm6000-video.c| 329
+++---
2 files changed, 119 insertions(+), 215 deletions(-)
diff --git a/drivers/staging/tm6000/tm6000-usb-isoc.h
b/drivers/staging/tm6000/tm6000-usb-isoc.h
index 5a5049a..138716a 100644
--- a/drivers/staging/tm6000/tm6000-usb-isoc.h
+++ b/drivers/staging/tm6000/tm6000-usb-isoc.h
@@ -39,7 +39,7 @@ struct usb_isoc_ctl {
int pos, size, pktsize;
/* Last field: ODD or EVEN? */
- int field;
+ int vfield;
/* Stores incomplete commands */
u32 tmp_buf;
@@ -47,7 +47,4 @@ struct usb_isoc_ctl {
/* Stores already requested buffers */
struct tm6000_buffer*buf;
-
- /* Stores the number of received fields */
- int nfields;
};
diff --git a/drivers/staging/tm6000/tm6000-video.c
b/drivers/staging/tm6000/tm6000-video.c
index 2a61cc3..058c6e9 100644
--- a/drivers/staging/tm6000/tm6000-video.c
+++ b/drivers/staging/tm6000/tm6000-video.c
@@ -186,234 +186,145 @@ const char *tm6000_msg_type[] = {
/*
* Identify the tm5600/6000 buffer header type and properly handles
*/
-static int copy_packet(struct urb *urb, u32 header, u8 **ptr, u8 *endp,
- u8 *out_p, struct tm6000_buffer **buf)
-{
- struct tm6000_dmaqueue *dma_q = urb-context;
- struct tm6000_core *dev = container_of(dma_q, struct tm6000_core, vidq);
- u8 c;
- unsigned int cmd, cpysize, pktsize, size, field, block, line, pos = 0;
- int rc = 0;
- /* FIXME: move to tm6000-isoc */
- static int last_line = -2, start_line = -2, last_field = -2;
-
- /* FIXME: this is the hardcoded window size
- */
- unsigned int linewidth = (*buf)-vb.width 1;
-
- if (!dev-isoc_ctl.cmd) {
- c = (header 24) 0xff;
-
- /* split the header fields */
- size = ((header 0x7e) 1);
-
- if (size 0)
- size -= 4;
-
- block = (header 7) 0xf;
- field = (header 11) 0x1;
- line = (header 12) 0x1ff;
- cmd = (header 21) 0x7;
-
- /* Validates header fields */
- if(size TM6000_URB_MSG_LEN)
- size = TM6000_URB_MSG_LEN;
-
- if (cmd == TM6000_URB_MSG_VIDEO) {
- if ((block+1)*TM6000_URB_MSG_LENlinewidth)
- cmd = TM6000_URB_MSG_ERR;
-
- /* FIXME: Mounts the image as field0+field1
- * It should, instead, check if the user selected
- * entrelaced or non-entrelaced mode
- */
- pos= ((line1)+field)*linewidth +
- block*TM6000_URB_MSG_LEN;
-
- /* Don't allow to write out of the buffer */
- if (pos+TM6000_URB_MSG_LEN (*buf)-vb.size) {
- dprintk(dev, V4L2_DEBUG_ISOC,
- ERR: size=%d, num=%d, line=%d,
- field=%d\n,
- size, block, line, field);
-
- cmd = TM6000_URB_MSG_ERR;
- }
- } else {
- pos=0;
- }
-
- /* Prints debug info */
- dprintk(dev, V4L2_DEBUG_ISOC, size=%d, num=%d,
- line=%d, field=%d\n,
- size, block, line, field);
-
- if ((last_line!=line)(last_line+1!=line)
- (cmd != TM6000_URB_MSG_ERR) ) {
- if (cmd != TM6000_URB_MSG_VIDEO) {
- dprintk(dev, V4L2_DEBUG_ISOC, cmd=%d,
- size=%d, num=%d, line=%d, field=%d\n,
- cmd, size, block, line, field);
- }
- if (start_line0)
- start_line=last_line;
- /* Prints debug info */
- dprintk(dev, V4L2_DEBUG_ISOC, lines= %d-%d,
- field=%d\n,
- start_line, last_line, field);
-
- if ((start_line6 last_line200)
- (last_field != field) ) {
-
- dev-isoc_ctl.nfields++;
-
[PATCH] tm6000: rewrite copy_streams
From: Stefan Ringel stefan.rin...@arcor.de
fusion function copy streams and copy_packets to new function copy_streams.
Signed-off-by: Stefan Ringel stefan.rin...@arcor.de
---
drivers/staging/tm6000/tm6000-usb-isoc.h |5 +-
drivers/staging/tm6000/tm6000-video.c| 329 +++---
2 files changed, 119 insertions(+), 215 deletions(-)
diff --git a/drivers/staging/tm6000/tm6000-usb-isoc.h
b/drivers/staging/tm6000/tm6000-usb-isoc.h
index 5a5049a..138716a 100644
--- a/drivers/staging/tm6000/tm6000-usb-isoc.h
+++ b/drivers/staging/tm6000/tm6000-usb-isoc.h
@@ -39,7 +39,7 @@ struct usb_isoc_ctl {
int pos, size, pktsize;
/* Last field: ODD or EVEN? */
- int field;
+ int vfield;
/* Stores incomplete commands */
u32 tmp_buf;
@@ -47,7 +47,4 @@ struct usb_isoc_ctl {
/* Stores already requested buffers */
struct tm6000_buffer*buf;
-
- /* Stores the number of received fields */
- int nfields;
};
diff --git a/drivers/staging/tm6000/tm6000-video.c
b/drivers/staging/tm6000/tm6000-video.c
index 2a61cc3..058c6e9 100644
--- a/drivers/staging/tm6000/tm6000-video.c
+++ b/drivers/staging/tm6000/tm6000-video.c
@@ -186,234 +186,145 @@ const char *tm6000_msg_type[] = {
/*
* Identify the tm5600/6000 buffer header type and properly handles
*/
-static int copy_packet(struct urb *urb, u32 header, u8 **ptr, u8 *endp,
- u8 *out_p, struct tm6000_buffer **buf)
-{
- struct tm6000_dmaqueue *dma_q = urb-context;
- struct tm6000_core *dev = container_of(dma_q, struct tm6000_core, vidq);
- u8 c;
- unsigned int cmd, cpysize, pktsize, size, field, block, line, pos = 0;
- int rc = 0;
- /* FIXME: move to tm6000-isoc */
- static int last_line = -2, start_line = -2, last_field = -2;
-
- /* FIXME: this is the hardcoded window size
-*/
- unsigned int linewidth = (*buf)-vb.width 1;
-
- if (!dev-isoc_ctl.cmd) {
- c = (header 24) 0xff;
-
- /* split the header fields */
- size = ((header 0x7e) 1);
-
- if (size 0)
- size -= 4;
-
- block = (header 7) 0xf;
- field = (header 11) 0x1;
- line = (header 12) 0x1ff;
- cmd = (header 21) 0x7;
-
- /* Validates header fields */
- if(size TM6000_URB_MSG_LEN)
- size = TM6000_URB_MSG_LEN;
-
- if (cmd == TM6000_URB_MSG_VIDEO) {
- if ((block+1)*TM6000_URB_MSG_LENlinewidth)
- cmd = TM6000_URB_MSG_ERR;
-
- /* FIXME: Mounts the image as field0+field1
-* It should, instead, check if the user selected
-* entrelaced or non-entrelaced mode
-*/
- pos= ((line1)+field)*linewidth +
- block*TM6000_URB_MSG_LEN;
-
- /* Don't allow to write out of the buffer */
- if (pos+TM6000_URB_MSG_LEN (*buf)-vb.size) {
- dprintk(dev, V4L2_DEBUG_ISOC,
- ERR: size=%d, num=%d, line=%d,
- field=%d\n,
- size, block, line, field);
-
- cmd = TM6000_URB_MSG_ERR;
- }
- } else {
- pos=0;
- }
-
- /* Prints debug info */
- dprintk(dev, V4L2_DEBUG_ISOC, size=%d, num=%d,
-line=%d, field=%d\n,
- size, block, line, field);
-
- if ((last_line!=line)(last_line+1!=line)
- (cmd != TM6000_URB_MSG_ERR) ) {
- if (cmd != TM6000_URB_MSG_VIDEO) {
- dprintk(dev, V4L2_DEBUG_ISOC, cmd=%d,
- size=%d, num=%d, line=%d, field=%d\n,
- cmd, size, block, line, field);
- }
- if (start_line0)
- start_line=last_line;
- /* Prints debug info */
- dprintk(dev, V4L2_DEBUG_ISOC, lines= %d-%d,
- field=%d\n,
- start_line, last_line, field);
-
- if ((start_line6 last_line200)
- (last_field != field) ) {
-
- dev-isoc_ctl.nfields++;
- if (dev-isoc_ctl.nfields=2) {
-
Re: [PATCH] tm6000: rewrite copy_streams
Am 28.05.2010 20:03, schrieb stefan.rin...@arcor.de: From: Stefan Ringel stefan.rin...@arcor.de fusion function copy streams and copy_packets to new function copy_streams. Signed-off-by: Stefan Ringel stefan.rin...@arcor.de --- drivers/staging/tm6000/tm6000-usb-isoc.h |5 +- drivers/staging/tm6000/tm6000-video.c| 329 +++--- 2 files changed, 119 insertions(+), 215 deletions(-) diff --git a/drivers/staging/tm6000/tm6000-usb-isoc.h b/drivers/staging/tm6000/tm6000-usb-isoc.h -- snipp Mauro can you superseded the patch from 28.05.2010 , 18:03 h thanks Stefan Ringel -- Stefan Ringel stefan.rin...@arcor.de attachment: stefan_ringel.vcf
Re: [PATCH] tm6000: rewrite copy_streams
Em Fri, 28 May 2010 23:59:21 +0200 Stefan Ringel stefan.rin...@arcor.de escreveu: Am 28.05.2010 20:03, schrieb stefan.rin...@arcor.de: From: Stefan Ringel stefan.rin...@arcor.de fusion function copy streams and copy_packets to new function copy_streams. Signed-off-by: Stefan Ringel stefan.rin...@arcor.de --- drivers/staging/tm6000/tm6000-usb-isoc.h |5 +- drivers/staging/tm6000/tm6000-video.c| 329 +++--- 2 files changed, 119 insertions(+), 215 deletions(-) diff --git a/drivers/staging/tm6000/tm6000-usb-isoc.h b/drivers/staging/tm6000/tm6000-usb-isoc.h -- snipp Mauro can you superseded the patch from 28.05.2010 , 18:03 h Stefan, Please test your patches before sending. This is the second patch that you've sent that doesn't even compile. -- Cheers, Mauro -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
