V4L/DVB (12798): tm6000: Split header processing from header find

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

drivers/staging/tm6000/tm6000-video.c

@@ -185,16 +185,14 @@ static void inline buffer_filled (struct tm6000_core *dev,
 /*
  * Identify the tm5600/6000 buffer header type and properly handles
  */
-static int copy_streams(u8 *data, u8 *out_p, unsigned long len,
-			struct urb *urb, struct tm6000_buffer **buf)
+static u8 *copy_packet (struct urb *urb, u32 header, u8 *data, 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 *ptr=data, *endp=data+len;
+	u8 *ptr=data;
 	u8 c;
 	unsigned int cmd, cpysize, pktsize, size, field, block, line, pos=0;
-	unsigned long header;
-	int rc=0;
 
 	/* FIXME: this is the hardcoded window size
 	 */
@@ -202,21 +200,7 @@ static int copy_streams(u8 *data, u8 *out_p, unsigned long len,
 
 //static int last_line=-2;
 
-	for (ptr=data; ptr<endp;) {
 	if (!dev->isoc_ctl.cmd) {
-			/* Seek for sync */
-			for (ptr+=3;ptr<endp;ptr++) {
-				if (*ptr==0x47) {
-					ptr-=3;
-					break;
-				}
-			}
-			if (ptr>=endp)
-				return rc;
-
-			/* Get message header */
-			header=*(unsigned long *)ptr;
-			ptr+=4;
 		c=(header>>24) & 0xff;
 
 		/* split the header fields */
@@ -226,10 +210,6 @@ static int copy_streams(u8 *data, u8 *out_p, unsigned long len,
 		line  = (header>>12) & 0x1ff;
 		cmd   = (header>>21) & 0x7;
 
-			/* FIXME: Maximum possible line is 511.
-			 * This doesn't seem to be enough for PAL standards
-			 */
-
 		/* Validates header fields */
 		if(size>TM6000_URB_MSG_LEN)
 			size=TM6000_URB_MSG_LEN;
@@ -243,8 +223,6 @@ static int copy_streams(u8 *data, u8 *out_p, unsigned long len,
 		pos=((line<<1)+field)*linesize+
 					block*TM6000_URB_MSG_LEN;
 
-
-
 		/* Don't allow to write out of the buffer */
 		if (pos+TM6000_URB_MSG_LEN > (*buf)->vb.size)
 			cmd = TM6000_URB_MSG_ERR;
@@ -254,16 +232,18 @@ static int copy_streams(u8 *data, u8 *out_p, unsigned long len,
 				" line=%d, field=%d\n",
 				size, block, line, field);
 
-			dev->isoc_ctl.cmd  = cmd;
-			dev->isoc_ctl.size = size;
-			dev->isoc_ctl.pos  = pos;
-			dev->isoc_ctl.pktsize = pktsize = TM6000_URB_MSG_LEN;
+		pktsize = TM6000_URB_MSG_LEN;
+/////////////////////////////
+/// nao seria size???
+
 	} else {
+		/* Continue the last copy */
 		cmd = dev->isoc_ctl.cmd;
 		size= dev->isoc_ctl.size;
 		pos = dev->isoc_ctl.pos;
 		pktsize = dev->isoc_ctl.pktsize;
 	}
+
 	cpysize=(endp-ptr>size)?size:endp-ptr;
 
 	if (cpysize) {
@@ -288,6 +268,38 @@ static int copy_streams(u8 *data, u8 *out_p, unsigned long len,
 		dev->isoc_ctl.cmd = 0;
 		ptr+=pktsize;
 	}
+
+	return ptr;
+}
+
+static int copy_streams(u8 *data, u8 *out_p, unsigned long len,
+			struct urb *urb, struct tm6000_buffer **buf)
+{
+	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;
+	u32 header=0;
+	int rc=0;
+
+	for (ptr=data; ptr<endp;) {
+		if (!dev->isoc_ctl.cmd) {
+			/* Seek for sync */
+			for (ptr+=3;ptr<endp;ptr++) {
+				if (*ptr==0x47) {
+					ptr-=3;
+					break;
+				}
+			}
+			if (ptr>=endp)
+				return rc;
+
+			/* Get message header */
+			header=*(unsigned long *)ptr;
+			ptr+=4;
+		}
+
+		/* Copy or continue last copy */
+		ptr=copy_packet(urb,header,ptr,endp,out_p,buf);
 	}
 
 	return rc;
@@ -810,7 +822,6 @@ buffer_prepare(struct videobuf_queue *vq, struct videobuf_buffer *vb,
 		/* Round to an enough number of URBs */
 		urbsize=(urbsize+dev->max_isoc_in-1)/dev->max_isoc_in;
 
-
 printk("Allocating %d packets to handle %lu size\n",  urbsize,buf->vb.size);
 
 		dprintk(dev, V4L2_DEBUG_QUEUE, "Allocating %d packets to handle "