diff options
| author | Marin Mitov <mitov@issp.bas.bg> | 2010-05-14 11:15:38 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-14 14:00:55 -0700 |
| commit | fdd2d9341d50f3a67fc35394e41146f30a383a6b (patch) | |
| tree | c77d76cba5f658a4e862227f3024631ca4d345cc /drivers/staging/dt3155v4l/dt3155v4l.h | |
| parent | 3f56c109d0ef8437d89cdb84af02728ec9cc1150 (diff) | |
| download | kernel_samsung_smdk4412-fdd2d9341d50f3a67fc35394e41146f30a383a6b.zip kernel_samsung_smdk4412-fdd2d9341d50f3a67fc35394e41146f30a383a6b.tar.gz kernel_samsung_smdk4412-fdd2d9341d50f3a67fc35394e41146f30a383a6b.tar.bz2 | |
Staging: dt3155v4l: introduce state machine
This patch introduces a v4l2 state machine, so now
CONFIG_DT3155_STREAMING is no more needed.
Signed-off-by: Marin Mitov <mitov@issp.bas.bg>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/dt3155v4l/dt3155v4l.h')
| -rw-r--r-- | drivers/staging/dt3155v4l/dt3155v4l.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/dt3155v4l/dt3155v4l.h b/drivers/staging/dt3155v4l/dt3155v4l.h index 4c6a0ee..e65a81e 100644 --- a/drivers/staging/dt3155v4l/dt3155v4l.h +++ b/drivers/staging/dt3155v4l/dt3155v4l.h @@ -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; |