diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-12-14 08:28:23 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-01-07 07:16:07 -0200 |
| commit | 9db0fb182ea8a42c5bfd322b169d65728721fd71 (patch) | |
| tree | 04fe9c9486e8dfb4227fe6e3951962fadd7f8620 /drivers/media/pci/saa7134/saa7134.h | |
| parent | dc18d1bea679c6b6bfdc570469160aec5c1d3689 (diff) | |
| download | talos-obmc-linux-9db0fb182ea8a42c5bfd322b169d65728721fd71.tar.gz talos-obmc-linux-9db0fb182ea8a42c5bfd322b169d65728721fd71.zip | |
[media] saa7134: move the queue data from saa7134_fh to saa7134_dev
These fields are global, not per-filehandle.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/pci/saa7134/saa7134.h')
| -rw-r--r-- | drivers/media/pci/saa7134/saa7134.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h index 8d1453a48014..96b7ccf9a384 100644 --- a/drivers/media/pci/saa7134/saa7134.h +++ b/drivers/media/pci/saa7134/saa7134.h @@ -472,14 +472,6 @@ struct saa7134_fh { struct v4l2_fh fh; struct saa7134_dev *dev; unsigned int resources; - - /* video capture */ - struct videobuf_queue cap; - struct saa7134_pgtable pt_cap; - - /* vbi capture */ - struct videobuf_queue vbi; - struct saa7134_pgtable pt_vbi; }; /* dmasound dsp status */ @@ -589,7 +581,11 @@ struct saa7134_dev { /* video+ts+vbi capture */ struct saa7134_dmaqueue video_q; + struct videobuf_queue cap; + struct saa7134_pgtable pt_cap; struct saa7134_dmaqueue vbi_q; + struct videobuf_queue vbi; + struct saa7134_pgtable pt_vbi; unsigned int video_fieldcount; unsigned int vbi_fieldcount; struct saa7134_format *fmt; @@ -773,6 +769,7 @@ int saa7134_video_init1(struct saa7134_dev *dev); int saa7134_video_init2(struct saa7134_dev *dev); void saa7134_irq_video_signalchange(struct saa7134_dev *dev); void saa7134_irq_video_done(struct saa7134_dev *dev, unsigned long status); +void saa7134_video_fini(struct saa7134_dev *dev); /* ----------------------------------------------------------- */ |
