diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-11 18:17:50 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-11 18:17:50 -0300 |
| commit | fd4694cdbe15f591792ec5166c3d9791c4b1e34f (patch) | |
| tree | 99866153be11055c726828017b089a40e7f8daa1 /linux/drivers/media/video/saa7134/saa7134.h | |
| parent | 4b038fe7fa0a646fedf0e49aa2bfba38c814e3ad (diff) | |
| parent | aaaaa6a00dd372109ceb39c63aef9088ec86e344 (diff) | |
| download | mediapointer-dvb-s2-fd4694cdbe15f591792ec5166c3d9791c4b1e34f.tar.gz mediapointer-dvb-s2-fd4694cdbe15f591792ec5166c3d9791c4b1e34f.tar.bz2 | |
merge: http://linuxtv.org/hg/~awalls/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134.h')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index 385bc26bd..454802e73 100644 --- a/linux/drivers/media/video/saa7134/saa7134.h +++ b/linux/drivers/media/video/saa7134/saa7134.h @@ -498,12 +498,6 @@ struct saa7134_mpeg_ops { void (*signal_change)(struct saa7134_dev *dev); }; -enum saa7134_ts_status { - SAA7134_TS_STOPPED, - SAA7134_TS_BUFF_DONE, - SAA7134_TS_STARTED, -}; - /* global device status */ struct saa7134_dev { struct list_head devlist; @@ -598,8 +592,7 @@ struct saa7134_dev { /* SAA7134_MPEG_* */ struct saa7134_ts ts; struct saa7134_dmaqueue ts_q; - enum saa7134_ts_status ts_state; - unsigned int buff_cnt; + int ts_started; struct saa7134_mpeg_ops *mops; /* SAA7134_MPEG_EMPRESS only */ @@ -757,6 +750,9 @@ void saa7134_ts_unregister(struct saa7134_mpeg_ops *ops); int saa7134_ts_init_hw(struct saa7134_dev *dev); +int saa7134_ts_start(struct saa7134_dev *dev); +int saa7134_ts_stop(struct saa7134_dev *dev); + /* ----------------------------------------------------------- */ /* saa7134-vbi.c */ |