diff options
author | Brandon Philips <brandon@ifup.org> | 2007-11-06 18:02:36 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 16:02:11 -0500 |
commit | 0fc0686e64d21a6abded96af2b1a895dfa8b2530 (patch) | |
tree | 6c7a696c13bccb98e9b4a95e995b7992605ed419 /drivers/media/video/bt8xx/bttv-risc.c | |
parent | 1414becf15da1701b0c45e9c82b1f120cb676a36 (diff) |
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: Brandon Philips <bphilips@suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/bt8xx/bttv-risc.c')
-rw-r--r-- | drivers/media/video/bt8xx/bttv-risc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/video/bt8xx/bttv-risc.c b/drivers/media/video/bt8xx/bttv-risc.c index 58986f1a5f1a..e5979f77504c 100644 --- a/drivers/media/video/bt8xx/bttv-risc.c +++ b/drivers/media/video/bt8xx/bttv-risc.c | |||
@@ -582,7 +582,7 @@ bttv_dma_free(struct videobuf_queue *q,struct bttv *btv, struct bttv_buffer *buf | |||
582 | videobuf_dma_free(dma); | 582 | videobuf_dma_free(dma); |
583 | btcx_riscmem_free(btv->c.pci,&buf->bottom); | 583 | btcx_riscmem_free(btv->c.pci,&buf->bottom); |
584 | btcx_riscmem_free(btv->c.pci,&buf->top); | 584 | btcx_riscmem_free(btv->c.pci,&buf->top); |
585 | buf->vb.state = STATE_NEEDS_INIT; | 585 | buf->vb.state = VIDEOBUF_NEEDS_INIT; |
586 | } | 586 | } |
587 | 587 | ||
588 | int | 588 | int |
@@ -602,7 +602,7 @@ bttv_buffer_activate_vbi(struct bttv *btv, | |||
602 | if (vbi) { | 602 | if (vbi) { |
603 | unsigned int crop, vdelay; | 603 | unsigned int crop, vdelay; |
604 | 604 | ||
605 | vbi->vb.state = STATE_ACTIVE; | 605 | vbi->vb.state = VIDEOBUF_ACTIVE; |
606 | list_del(&vbi->vb.queue); | 606 | list_del(&vbi->vb.queue); |
607 | 607 | ||
608 | /* VDELAY is start of video, end of VBI capturing. */ | 608 | /* VDELAY is start of video, end of VBI capturing. */ |
@@ -644,12 +644,12 @@ bttv_buffer_activate_video(struct bttv *btv, | |||
644 | /* video capture */ | 644 | /* video capture */ |
645 | if (NULL != set->top && NULL != set->bottom) { | 645 | if (NULL != set->top && NULL != set->bottom) { |
646 | if (set->top == set->bottom) { | 646 | if (set->top == set->bottom) { |
647 | set->top->vb.state = STATE_ACTIVE; | 647 | set->top->vb.state = VIDEOBUF_ACTIVE; |
648 | if (set->top->vb.queue.next) | 648 | if (set->top->vb.queue.next) |
649 | list_del(&set->top->vb.queue); | 649 | list_del(&set->top->vb.queue); |
650 | } else { | 650 | } else { |
651 | set->top->vb.state = STATE_ACTIVE; | 651 | set->top->vb.state = VIDEOBUF_ACTIVE; |
652 | set->bottom->vb.state = STATE_ACTIVE; | 652 | set->bottom->vb.state = VIDEOBUF_ACTIVE; |
653 | if (set->top->vb.queue.next) | 653 | if (set->top->vb.queue.next) |
654 | list_del(&set->top->vb.queue); | 654 | list_del(&set->top->vb.queue); |
655 | if (set->bottom->vb.queue.next) | 655 | if (set->bottom->vb.queue.next) |
@@ -666,7 +666,7 @@ bttv_buffer_activate_video(struct bttv *btv, | |||
666 | btaor((set->top->btswap & 0x0a) | (set->bottom->btswap & 0x05), | 666 | btaor((set->top->btswap & 0x0a) | (set->bottom->btswap & 0x05), |
667 | ~0x0f, BT848_COLOR_CTL); | 667 | ~0x0f, BT848_COLOR_CTL); |
668 | } else if (NULL != set->top) { | 668 | } else if (NULL != set->top) { |
669 | set->top->vb.state = STATE_ACTIVE; | 669 | set->top->vb.state = VIDEOBUF_ACTIVE; |
670 | if (set->top->vb.queue.next) | 670 | if (set->top->vb.queue.next) |
671 | list_del(&set->top->vb.queue); | 671 | list_del(&set->top->vb.queue); |
672 | bttv_apply_geo(btv, &set->top->geo,1); | 672 | bttv_apply_geo(btv, &set->top->geo,1); |
@@ -677,7 +677,7 @@ bttv_buffer_activate_video(struct bttv *btv, | |||
677 | btaor(set->top->btformat & 0xff, ~0xff, BT848_COLOR_FMT); | 677 | btaor(set->top->btformat & 0xff, ~0xff, BT848_COLOR_FMT); |
678 | btaor(set->top->btswap & 0x0f, ~0x0f, BT848_COLOR_CTL); | 678 | btaor(set->top->btswap & 0x0f, ~0x0f, BT848_COLOR_CTL); |
679 | } else if (NULL != set->bottom) { | 679 | } else if (NULL != set->bottom) { |
680 | set->bottom->vb.state = STATE_ACTIVE; | 680 | set->bottom->vb.state = VIDEOBUF_ACTIVE; |
681 | if (set->bottom->vb.queue.next) | 681 | if (set->bottom->vb.queue.next) |
682 | list_del(&set->bottom->vb.queue); | 682 | list_del(&set->bottom->vb.queue); |
683 | bttv_apply_geo(btv, &set->bottom->geo,1); | 683 | bttv_apply_geo(btv, &set->bottom->geo,1); |