Commit 0fc0686e authored by Brandon Philips's avatar Brandon Philips Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (6600): V4L: videobuf: don't chew up namespace STATE_.*, convert to VIDEOBUF_ 



s/STATE_NEEDS_INIT/VIDEOBUF_NEEDS_INIT/g
s/STATE_PREPARED/VIDEOBUF_PREPARED/g
s/STATE_QUEUED/VIDEOBUF_QUEUED/g
s/STATE_ACTIVE/VIDEOBUF_ACTIVE/g
s/STATE_DONE/VIDEOBUF_DONE/g
s/STATE_ERROR/VIDEOBUF_ERROR/g
s/STATE_IDLE/VIDEOBUF_IDLE/g

Signed-off-by: default avatarBrandon Philips <bphilips@suse.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 1414becf

drivers/media/common/saa7146_fops.c

+4 −4
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ void saa7146_dma_free(struct saa7146_dev *dev,struct videobuf_queue *q, 
	videobuf_waiton(&buf->vb,0,0);

	videobuf_dma_unmap(q, dma);

	videobuf_dma_free(dma);

	buf->vb.state = STATE_NEEDS_INIT;

	buf->vb.state = VIDEOBUF_NEEDS_INIT;

}
@@ -83,7 +83,7 @@ int saa7146_buffer_queue(struct saa7146_dev *dev, 
		buf->activate(dev,buf,NULL);

	} else {

		list_add_tail(&buf->vb.queue,&q->queue);

		buf->vb.state = STATE_QUEUED;

		buf->vb.state = VIDEOBUF_QUEUED;

		DEB_D(("adding buffer %p to queue. (active buffer present)\n", buf));

	}

	return 0;
@@ -174,7 +174,7 @@ void saa7146_buffer_timeout(unsigned long data) 
	spin_lock_irqsave(&dev->slock,flags);

	if (q->curr) {

		DEB_D(("timeout on %p\n", q->curr));

		saa7146_buffer_finish(dev,q,STATE_ERROR);

		saa7146_buffer_finish(dev,q,VIDEOBUF_ERROR);

	}



	/* we don't restart the transfer here like other drivers do. when
@@ -366,7 +366,7 @@ static unsigned int fops_poll(struct file *file, struct poll_table_struct *wait) 
	}



	poll_wait(file, &buf->done, wait);

	if (buf->state == STATE_DONE || buf->state == STATE_ERROR) {

	if (buf->state == VIDEOBUF_DONE || buf->state == VIDEOBUF_ERROR) {

		DEB_D(("poll succeeded!\n"));

		return POLLIN|POLLRDNORM;

	}

drivers/media/common/saa7146_vbi.c

+5 −5
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static int buffer_activate(struct saa7146_dev *dev, 
			   struct saa7146_buf *next)

{

	struct saa7146_vv *vv = dev->vv_data;

	buf->vb.state = STATE_ACTIVE;

	buf->vb.state = VIDEOBUF_ACTIVE;



	DEB_VBI(("dev:%p, buf:%p, next:%p\n",dev,buf,next));

	saa7146_set_vbi_capture(dev,buf,next);
@@ -238,7 +238,7 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,e 
	if (buf->vb.size != size)

		saa7146_dma_free(dev,q,buf);



	if (STATE_NEEDS_INIT == buf->vb.state) {

	if (VIDEOBUF_NEEDS_INIT == buf->vb.state) {

		struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);



		buf->vb.width  = llength;
@@ -257,7 +257,7 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,e 
		if (0 != err)

			return err;

	}

	buf->vb.state = STATE_PREPARED;

	buf->vb.state = VIDEOBUF_PREPARED;

	buf->activate = buffer_activate;



	return 0;
@@ -335,7 +335,7 @@ static void vbi_stop(struct saa7146_fh *fh, struct file *file) 
	saa7146_write(dev, MC1, MASK_20);



	if (vv->vbi_q.curr) {

		saa7146_buffer_finish(dev,&vv->vbi_q,STATE_DONE);

		saa7146_buffer_finish(dev,&vv->vbi_q,VIDEOBUF_DONE);

	}



	videobuf_queue_cancel(&fh->vbi_q);
@@ -458,7 +458,7 @@ static void vbi_irq_done(struct saa7146_dev *dev, unsigned long status) 
		/* this must be += 2, one count for each field */

		vv->vbi_fieldcount+=2;

		vv->vbi_q.curr->vb.field_count = vv->vbi_fieldcount;

		saa7146_buffer_finish(dev,&vv->vbi_q,STATE_DONE);

		saa7146_buffer_finish(dev,&vv->vbi_q,VIDEOBUF_DONE);

	} else {

		DEB_VBI(("dev:%p\n",dev));

	}

drivers/media/common/saa7146_video.c

+4 −4
Original line number Diff line number Diff line
@@ -1235,7 +1235,7 @@ static int buffer_activate (struct saa7146_dev *dev, 
{

	struct saa7146_vv *vv = dev->vv_data;



	buf->vb.state = STATE_ACTIVE;

	buf->vb.state = VIDEOBUF_ACTIVE;

	saa7146_set_capture(dev,buf,next);



	mod_timer(&vv->video_q.timeout, jiffies+BUFFER_TIMEOUT);
@@ -1281,7 +1281,7 @@ static int buffer_prepare(struct videobuf_queue *q, 
		saa7146_dma_free(dev,q,buf);

	}



	if (STATE_NEEDS_INIT == buf->vb.state) {

	if (VIDEOBUF_NEEDS_INIT == buf->vb.state) {

		struct saa7146_format *sfmt;



		buf->vb.bytesperline  = fh->video_fmt.bytesperline;
@@ -1314,7 +1314,7 @@ static int buffer_prepare(struct videobuf_queue *q, 
		if (err)

			goto oops;

	}

	buf->vb.state = STATE_PREPARED;

	buf->vb.state = VIDEOBUF_PREPARED;

	buf->activate = buffer_activate;



	return 0;
@@ -1453,7 +1453,7 @@ static void video_irq_done(struct saa7146_dev *dev, unsigned long st) 


	/* only finish the buffer if we have one... */

	if( NULL != q->curr ) {

		saa7146_buffer_finish(dev,q,STATE_DONE);

		saa7146_buffer_finish(dev,q,VIDEOBUF_DONE);

	}

	saa7146_buffer_next(dev,q,0);

drivers/media/video/bt8xx/bttv-driver.c

+13 −13
Original line number Diff line number Diff line
@@ -1638,7 +1638,7 @@ bttv_switch_overlay(struct bttv *btv, struct bttv_fh *fh, 


	dprintk("switch_overlay: enter [new=%p]\n",new);

	if (new)

		new->vb.state = STATE_DONE;

		new->vb.state = VIDEOBUF_DONE;

	spin_lock_irqsave(&btv->s_lock,flags);

	old = btv->screen;

	btv->screen = new;
@@ -1749,7 +1749,7 @@ static int bttv_prepare_buffer(struct videobuf_queue *q,struct bttv *btv, 
	}



	/* alloc risc memory */

	if (STATE_NEEDS_INIT == buf->vb.state) {

	if (VIDEOBUF_NEEDS_INIT == buf->vb.state) {

		redo_dma_risc = 1;

		if (0 != (rc = videobuf_iolock(q,&buf->vb,&btv->fbuf)))

			goto fail;
@@ -1759,7 +1759,7 @@ static int bttv_prepare_buffer(struct videobuf_queue *q,struct bttv *btv, 
		if (0 != (rc = bttv_buffer_risc(btv,buf)))

			goto fail;



	buf->vb.state = STATE_PREPARED;

	buf->vb.state = VIDEOBUF_PREPARED;

	return 0;



 fail:
@@ -1798,7 +1798,7 @@ buffer_queue(struct videobuf_queue *q, struct videobuf_buffer *vb) 
	struct bttv_fh *fh = q->priv_data;

	struct bttv    *btv = fh->btv;



	buf->vb.state = STATE_QUEUED;

	buf->vb.state = VIDEOBUF_QUEUED;

	list_add_tail(&buf->vb.queue,&btv->capture);

	if (!btv->curr.frame_irq) {

		btv->loop_irq |= 1;
@@ -3102,8 +3102,8 @@ static unsigned int bttv_poll(struct file *file, poll_table *wait) 
	}



	poll_wait(file, &buf->vb.done, wait);

	if (buf->vb.state == STATE_DONE ||

	    buf->vb.state == STATE_ERROR)

	if (buf->vb.state == VIDEOBUF_DONE ||

	    buf->vb.state == VIDEOBUF_ERROR)

		return POLLIN|POLLRDNORM;

	return 0;

}
@@ -3699,20 +3699,20 @@ static void bttv_irq_timeout(unsigned long data) 
	bttv_set_dma(btv, 0);



	/* wake up */

	bttv_irq_wakeup_video(btv, &old, &new, STATE_ERROR);

	bttv_irq_wakeup_vbi(btv, ovbi, STATE_ERROR);

	bttv_irq_wakeup_video(btv, &old, &new, VIDEOBUF_ERROR);

	bttv_irq_wakeup_vbi(btv, ovbi, VIDEOBUF_ERROR);



	/* cancel all outstanding capture / vbi requests */

	while (!list_empty(&btv->capture)) {

		item = list_entry(btv->capture.next, struct bttv_buffer, vb.queue);

		list_del(&item->vb.queue);

		item->vb.state = STATE_ERROR;

		item->vb.state = VIDEOBUF_ERROR;

		wake_up(&item->vb.done);

	}

	while (!list_empty(&btv->vcapture)) {

		item = list_entry(btv->vcapture.next, struct bttv_buffer, vb.queue);

		list_del(&item->vb.queue);

		item->vb.state = STATE_ERROR;

		item->vb.state = VIDEOBUF_ERROR;

		wake_up(&item->vb.done);

	}
@@ -3735,7 +3735,7 @@ bttv_irq_wakeup_top(struct bttv *btv) 


	do_gettimeofday(&wakeup->vb.ts);

	wakeup->vb.field_count = btv->field_count;

	wakeup->vb.state = STATE_DONE;

	wakeup->vb.state = VIDEOBUF_DONE;

	wake_up(&wakeup->vb.done);

	spin_unlock(&btv->s_lock);

}
@@ -3784,7 +3784,7 @@ bttv_irq_switch_video(struct bttv *btv) 
	}



	/* wake up finished buffers */

	bttv_irq_wakeup_video(btv, &old, &new, STATE_DONE);

	bttv_irq_wakeup_video(btv, &old, &new, VIDEOBUF_DONE);

	spin_unlock(&btv->s_lock);

}
@@ -3817,7 +3817,7 @@ bttv_irq_switch_vbi(struct bttv *btv) 
	bttv_buffer_activate_vbi(btv, new);

	bttv_set_dma(btv, 0);



	bttv_irq_wakeup_vbi(btv, old, STATE_DONE);

	bttv_irq_wakeup_vbi(btv, old, VIDEOBUF_DONE);

	spin_unlock(&btv->s_lock);

}

drivers/media/video/bt8xx/bttv-risc.c

+7 −7
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ bttv_dma_free(struct videobuf_queue *q,struct bttv *btv, struct bttv_buffer *buf 
	videobuf_dma_free(dma);

	btcx_riscmem_free(btv->c.pci,&buf->bottom);

	btcx_riscmem_free(btv->c.pci,&buf->top);

	buf->vb.state = STATE_NEEDS_INIT;

	buf->vb.state = VIDEOBUF_NEEDS_INIT;

}



int
@@ -602,7 +602,7 @@ bttv_buffer_activate_vbi(struct bttv *btv, 
	if (vbi) {

		unsigned int crop, vdelay;



		vbi->vb.state = STATE_ACTIVE;

		vbi->vb.state = VIDEOBUF_ACTIVE;

		list_del(&vbi->vb.queue);



		/* VDELAY is start of video, end of VBI capturing. */
@@ -644,12 +644,12 @@ bttv_buffer_activate_video(struct bttv *btv, 
	/* video capture */

	if (NULL != set->top  &&  NULL != set->bottom) {

		if (set->top == set->bottom) {

			set->top->vb.state    = STATE_ACTIVE;

			set->top->vb.state    = VIDEOBUF_ACTIVE;

			if (set->top->vb.queue.next)

				list_del(&set->top->vb.queue);

		} else {

			set->top->vb.state    = STATE_ACTIVE;

			set->bottom->vb.state = STATE_ACTIVE;

			set->top->vb.state    = VIDEOBUF_ACTIVE;

			set->bottom->vb.state = VIDEOBUF_ACTIVE;

			if (set->top->vb.queue.next)

				list_del(&set->top->vb.queue);

			if (set->bottom->vb.queue.next)
@@ -666,7 +666,7 @@ bttv_buffer_activate_video(struct bttv *btv, 
		btaor((set->top->btswap & 0x0a) | (set->bottom->btswap & 0x05),

		      ~0x0f, BT848_COLOR_CTL);

	} else if (NULL != set->top) {

		set->top->vb.state  = STATE_ACTIVE;

		set->top->vb.state  = VIDEOBUF_ACTIVE;

		if (set->top->vb.queue.next)

			list_del(&set->top->vb.queue);

		bttv_apply_geo(btv, &set->top->geo,1);
@@ -677,7 +677,7 @@ bttv_buffer_activate_video(struct bttv *btv, 
		btaor(set->top->btformat & 0xff, ~0xff, BT848_COLOR_FMT);

		btaor(set->top->btswap & 0x0f,   ~0x0f, BT848_COLOR_CTL);

	} else if (NULL != set->bottom) {

		set->bottom->vb.state = STATE_ACTIVE;

		set->bottom->vb.state = VIDEOBUF_ACTIVE;

		if (set->bottom->vb.queue.next)

			list_del(&set->bottom->vb.queue);

		bttv_apply_geo(btv, &set->bottom->geo,1);