aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx23885
diff options
context:
space:
mode:
authorBrandon Philips <brandon@ifup.org>2007-11-06 18:02:36 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 16:02:11 -0500
commit0fc0686e64d21a6abded96af2b1a895dfa8b2530 (patch)
tree6c7a696c13bccb98e9b4a95e995b7992605ed419 /drivers/media/video/cx23885
parent1414becf15da1701b0c45e9c82b1f120cb676a36 (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/cx23885')
-rw-r--r--drivers/media/video/cx23885/cx23885-core.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index 0c9c9af0efb7..f205ad6354e7 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -378,7 +378,7 @@ static void cx23885_wakeup(struct cx23885_tsport *port,
378 do_gettimeofday(&buf->vb.ts); 378 do_gettimeofday(&buf->vb.ts);
379 dprintk(2, "[%p/%d] wakeup reg=%d buf=%d\n", buf, buf->vb.i, 379 dprintk(2, "[%p/%d] wakeup reg=%d buf=%d\n", buf, buf->vb.i,
380 count, buf->count); 380 count, buf->count);
381 buf->vb.state = STATE_DONE; 381 buf->vb.state = VIDEOBUF_DONE;
382 list_del(&buf->vb.queue); 382 list_del(&buf->vb.queue);
383 wake_up(&buf->vb.done); 383 wake_up(&buf->vb.done);
384 } 384 }
@@ -972,7 +972,7 @@ void cx23885_free_buffer(struct videobuf_queue *q, struct cx23885_buffer *buf)
972 videobuf_dma_unmap(q, dma); 972 videobuf_dma_unmap(q, dma);
973 videobuf_dma_free(dma); 973 videobuf_dma_free(dma);
974 btcx_riscmem_free((struct pci_dev *)q->dev, &buf->risc); 974 btcx_riscmem_free((struct pci_dev *)q->dev, &buf->risc);
975 buf->vb.state = STATE_NEEDS_INIT; 975 buf->vb.state = VIDEOBUF_NEEDS_INIT;
976} 976}
977 977
978static int cx23885_start_dma(struct cx23885_tsport *port, 978static int cx23885_start_dma(struct cx23885_tsport *port,
@@ -1075,7 +1075,7 @@ static int cx23885_restart_queue(struct cx23885_tsport *port,
1075 list_del(&buf->vb.queue); 1075 list_del(&buf->vb.queue);
1076 list_add_tail(&buf->vb.queue, &q->active); 1076 list_add_tail(&buf->vb.queue, &q->active);
1077 cx23885_start_dma(port, q, buf); 1077 cx23885_start_dma(port, q, buf);
1078 buf->vb.state = STATE_ACTIVE; 1078 buf->vb.state = VIDEOBUF_ACTIVE;
1079 buf->count = q->count++; 1079 buf->count = q->count++;
1080 mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT); 1080 mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
1081 dprintk(5, "[%p/%d] restart_queue - first active\n", 1081 dprintk(5, "[%p/%d] restart_queue - first active\n",
@@ -1086,7 +1086,7 @@ static int cx23885_restart_queue(struct cx23885_tsport *port,
1086 prev->fmt == buf->fmt) { 1086 prev->fmt == buf->fmt) {
1087 list_del(&buf->vb.queue); 1087 list_del(&buf->vb.queue);
1088 list_add_tail(&buf->vb.queue, &q->active); 1088 list_add_tail(&buf->vb.queue, &q->active);
1089 buf->vb.state = STATE_ACTIVE; 1089 buf->vb.state = VIDEOBUF_ACTIVE;
1090 buf->count = q->count++; 1090 buf->count = q->count++;
1091 prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma); 1091 prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
1092 prev->risc.jmp[2] = cpu_to_le32(0); /* 64 bit bits 63-32 */ 1092 prev->risc.jmp[2] = cpu_to_le32(0); /* 64 bit bits 63-32 */
@@ -1123,7 +1123,7 @@ int cx23885_buf_prepare(struct videobuf_queue *q, struct cx23885_tsport *port,
1123 if (0 != buf->vb.baddr && buf->vb.bsize < size) 1123 if (0 != buf->vb.baddr && buf->vb.bsize < size)
1124 return -EINVAL; 1124 return -EINVAL;
1125 1125
1126 if (STATE_NEEDS_INIT == buf->vb.state) { 1126 if (VIDEOBUF_NEEDS_INIT == buf->vb.state) {
1127 buf->vb.width = port->ts_packet_size; 1127 buf->vb.width = port->ts_packet_size;
1128 buf->vb.height = port->ts_packet_count; 1128 buf->vb.height = port->ts_packet_count;
1129 buf->vb.size = size; 1129 buf->vb.size = size;
@@ -1135,7 +1135,7 @@ int cx23885_buf_prepare(struct videobuf_queue *q, struct cx23885_tsport *port,
1135 videobuf_to_dma(&buf->vb)->sglist, 1135 videobuf_to_dma(&buf->vb)->sglist,
1136 buf->vb.width, buf->vb.height); 1136 buf->vb.width, buf->vb.height);
1137 } 1137 }
1138 buf->vb.state = STATE_PREPARED; 1138 buf->vb.state = VIDEOBUF_PREPARED;
1139 return 0; 1139 return 0;
1140 1140
1141 fail: 1141 fail:
@@ -1158,7 +1158,7 @@ void cx23885_buf_queue(struct cx23885_tsport *port, struct cx23885_buffer *buf)
1158 dprintk( 1, "queue is empty - first active\n" ); 1158 dprintk( 1, "queue is empty - first active\n" );
1159 list_add_tail(&buf->vb.queue, &cx88q->active); 1159 list_add_tail(&buf->vb.queue, &cx88q->active);
1160 cx23885_start_dma(port, cx88q, buf); 1160 cx23885_start_dma(port, cx88q, buf);
1161 buf->vb.state = STATE_ACTIVE; 1161 buf->vb.state = VIDEOBUF_ACTIVE;
1162 buf->count = cx88q->count++; 1162 buf->count = cx88q->count++;
1163 mod_timer(&cx88q->timeout, jiffies + BUFFER_TIMEOUT); 1163 mod_timer(&cx88q->timeout, jiffies + BUFFER_TIMEOUT);
1164 dprintk(1, "[%p/%d] %s - first active\n", 1164 dprintk(1, "[%p/%d] %s - first active\n",
@@ -1168,7 +1168,7 @@ void cx23885_buf_queue(struct cx23885_tsport *port, struct cx23885_buffer *buf)
1168 prev = list_entry(cx88q->active.prev, struct cx23885_buffer, 1168 prev = list_entry(cx88q->active.prev, struct cx23885_buffer,
1169 vb.queue); 1169 vb.queue);
1170 list_add_tail(&buf->vb.queue, &cx88q->active); 1170 list_add_tail(&buf->vb.queue, &cx88q->active);
1171 buf->vb.state = STATE_ACTIVE; 1171 buf->vb.state = VIDEOBUF_ACTIVE;
1172 buf->count = cx88q->count++; 1172 buf->count = cx88q->count++;
1173 prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma); 1173 prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
1174 prev->risc.jmp[2] = cpu_to_le32(0); /* 64 bit bits 63-32 */ 1174 prev->risc.jmp[2] = cpu_to_le32(0); /* 64 bit bits 63-32 */
@@ -1192,7 +1192,7 @@ static void do_cancel_buffers(struct cx23885_tsport *port, char *reason,
1192 buf = list_entry(q->active.next, struct cx23885_buffer, 1192 buf = list_entry(q->active.next, struct cx23885_buffer,
1193 vb.queue); 1193 vb.queue);
1194 list_del(&buf->vb.queue); 1194 list_del(&buf->vb.queue);
1195 buf->vb.state = STATE_ERROR; 1195 buf->vb.state = VIDEOBUF_ERROR;
1196 wake_up(&buf->vb.done); 1196 wake_up(&buf->vb.done);
1197 dprintk(1, "[%p/%d] %s - dma=0x%08lx\n", 1197 dprintk(1, "[%p/%d] %s - dma=0x%08lx\n",
1198 buf, buf->vb.i, reason, (unsigned long)buf->risc.dma); 1198 buf, buf->vb.i, reason, (unsigned long)buf->risc.dma);