From ea3f7ac6e931f9aaa45e0a8445406f14e2a62011 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sun, 14 Apr 2013 12:02:19 -0300 Subject: [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 Signed-off-by: Mauro Carvalho Chehab --- drivers/media/pci/cx25821/cx25821.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'drivers/media/pci/cx25821/cx25821.h') 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 { u32 upstream_riscbuf_size; u32 upstream_databuf_size; - struct workqueue_struct *_irq_queues; - struct work_struct _irq_work_entry; int is_60hz; int _frame_index; - char *input_filename; - char *vid_stdname; - int pixel_format; - char *_filename; - char *_defaultname; + int cur_frame_index; + int curpos; + wait_queue_head_t waitq; }; struct cx25821_channel { @@ -440,6 +436,8 @@ extern int cx25821_sram_channel_setup_audio(struct cx25821_dev *dev, extern int cx25821_vidupstream_init(struct cx25821_channel *chan, int pixel_format); extern int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select); +extern int cx25821_write_frame(struct cx25821_channel *chan, + const char __user *data, size_t count); extern void cx25821_free_mem_upstream(struct cx25821_channel *chan); extern void cx25821_free_mem_upstream_audio(struct cx25821_dev *dev); extern void cx25821_stop_upstream_video(struct cx25821_channel *chan); -- cgit v1.2.3