staging/dt3155v4l: introduce state machine
PATCH 1/1 staging/dt3155v4l: introduce state machine
Hi Greg,
This patch introduces a v4l2 state machine, so now CONFIG_DT3155_STREAMING is no more needed.
Please, apply.
Thanks.
Marin Mitov
Signed-off-by Marin Mitov <[email protected]>
==========================================================
drivers/staging/dt3155v4l/Kconfig +0 -8
@@ -18,11 +18,3 @@ config DT3155_CCIR ---help--- Select it for CCIR/50Hz (European region), or leave it unselected for RS-170/60Hz (North America). - -config DT3155_STREAMING - bool "Selects mmap streaming instead of read method" - depends on VIDEO_DT3155 - default y - ---help--- - Select it if you wish to try mmap streaming, or - or leave it unselected for using read method.
drivers/staging/dt3155v4l/dt3155v4l.c +66 -14
160 lines not on this page · raw message
drivers/staging/dt3155v4l/dt3155v4l.h +3 -1
@@ -30,7 +30,7 @@#define DT3155_NAME "dt3155"#define DT3155_VER_MAJ 1#define DT3155_VER_MIN 0 -#define DT3155_VER_EXT 2 +#define DT3155_VER_EXT 3#define DT3155_VERSION __stringify(DT3155_VER_MAJ) "." \ __stringify(DT3155_VER_MIN) "." \ __stringify(DT3155_VER_EXT)
@@ -180,6 +180,7 @@ struct dt3155_stats {* * @vdev: pointer to video_device structure * @acq_fp pointer to filp that starts acquisition +* @streaming streaming is negotiated * @pdev: pointer to pci_dev structure * @vidq pointer to videobuf_queue structure * @curr_buf: pointer to curren buffer
@@ -200,6 +201,7 @@ struct dt3155_stats {struct dt3155_priv {struct video_device *vdev;struct file *acq_fp; +int streaming;struct pci_dev *pdev;struct videobuf_queue *vidq;struct videobuf_buffer *curr_buf;