aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/cx25821/cx25821.h
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-04-14 11:02:19 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-04-16 17:12:34 -0400
commitea3f7ac6e931f9aaa45e0a8445406f14e2a62011 (patch)
tree7d1bdfbe00e326943c3c69640c5cc10c1b917f34 /drivers/media/pci/cx25821/cx25821.h
parent7087d31b0c9dddbca71b8e33d3f0a3b719afa397 (diff)
[media] cx25821: replace custom ioctls with write()
Ideally this should be implemented with vb2, but it'll do for now. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci/cx25821/cx25821.h')
-rw-r--r--drivers/media/pci/cx25821/cx25821.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/media/pci/cx25821/cx25821.h b/drivers/media/pci/cx25821/cx25821.h
index b0bc2e626ae7..90bdc196929f 100644
--- a/drivers/media/pci/cx25821/cx25821.h
+++ b/drivers/media/pci/cx25821/cx25821.h
@@ -197,15 +197,11 @@ struct cx25821_video_out_data {
197 197
198 u32 upstream_riscbuf_size; 198 u32 upstream_riscbuf_size;
199 u32 upstream_databuf_size; 199 u32 upstream_databuf_size;
200 struct workqueue_struct *_irq_queues;
201 struct work_struct _irq_work_entry;
202 int is_60hz; 200 int is_60hz;
203 int _frame_index; 201 int _frame_index;
204 char *input_filename; 202 int cur_frame_index;
205 char *vid_stdname; 203 int curpos;
206 int pixel_format; 204 wait_queue_head_t waitq;
207 char *_filename;
208 char *_defaultname;
209}; 205};
210 206
211struct cx25821_channel { 207struct cx25821_channel {
@@ -440,6 +436,8 @@ extern int cx25821_sram_channel_setup_audio(struct cx25821_dev *dev,
440extern int cx25821_vidupstream_init(struct cx25821_channel *chan, int pixel_format); 436extern int cx25821_vidupstream_init(struct cx25821_channel *chan, int pixel_format);
441extern int cx25821_audio_upstream_init(struct cx25821_dev *dev, 437extern int cx25821_audio_upstream_init(struct cx25821_dev *dev,
442 int channel_select); 438 int channel_select);
439extern int cx25821_write_frame(struct cx25821_channel *chan,
440 const char __user *data, size_t count);
443extern void cx25821_free_mem_upstream(struct cx25821_channel *chan); 441extern void cx25821_free_mem_upstream(struct cx25821_channel *chan);
444extern void cx25821_free_mem_upstream_audio(struct cx25821_dev *dev); 442extern void cx25821_free_mem_upstream_audio(struct cx25821_dev *dev);
445extern void cx25821_stop_upstream_video(struct cx25821_channel *chan); 443extern void cx25821_stop_upstream_video(struct cx25821_channel *chan);