diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-01-17 16:17:14 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2009-01-17 16:17:14 +0100 |
| commit | ebbb343f2622dae4d4f0539ce9cd29f45e6862fe (patch) | |
| tree | 561f01c6a9d7511cb4b4810dd99d84d0ce95cfb9 /linux/drivers/media/video/saa7134/saa7134.h | |
| parent | 385d1585c8f784ab1fed0e78761d2bf48995e00e (diff) | |
| download | mediapointer-dvb-s2-ebbb343f2622dae4d4f0539ce9cd29f45e6862fe.tar.gz mediapointer-dvb-s2-ebbb343f2622dae4d4f0539ce9cd29f45e6862fe.tar.bz2 | |
saa7134: convert to the new v4l2 framework.
From: Hans Verkuil <hverkuil@xs4all.nl>
Register v4l2_device and switch to v4l2_subdev to access the i2c modules.
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134.h')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index bb973d363..9e3b37c73 100644 --- a/linux/drivers/media/video/saa7134/saa7134.h +++ b/linux/drivers/media/video/saa7134/saa7134.h @@ -36,6 +36,7 @@ #include "compat.h" #include <media/v4l2-common.h> #include <media/v4l2-ioctl.h> +#include <media/v4l2-device.h> #include <media/tuner.h> #include <media/ir-common.h> #include <media/ir-kbd-i2c.h> @@ -487,6 +488,7 @@ struct saa7134_dev { struct mutex lock; spinlock_t slock; struct v4l2_prio_state prio; + struct v4l2_device v4l2_dev; /* workstruct for loading modules */ struct work_struct request_module_wk; @@ -577,7 +579,6 @@ struct saa7134_dev { enum saa7134_ts_status ts_state; unsigned int buff_cnt; struct saa7134_mpeg_ops *mops; - struct i2c_client *mpeg_i2c_client; /* SAA7134_MPEG_EMPRESS only */ struct video_device *empress_dev; @@ -621,6 +622,12 @@ struct saa7134_dev { V4L2_STD_NTSC | V4L2_STD_PAL_M | \ V4L2_STD_PAL_60) +#define GRP_EMPRESS (1) +#define saa_call_all(dev, o, f, args...) \ + v4l2_device_call_all(&(dev)->v4l2_dev, 0, o, f , ##args) +#define saa_call_empress(dev, o, f, args...) \ + v4l2_device_call_until_err(&(dev)->v4l2_dev, GRP_EMPRESS, o, f , ##args) + /* ----------------------------------------------------------- */ /* saa7134-core.c */ @@ -673,10 +680,6 @@ int saa7134_tuner_callback(void *priv, int component, int command, int arg); int saa7134_i2c_register(struct saa7134_dev *dev); int saa7134_i2c_unregister(struct saa7134_dev *dev); -void saa7134_i2c_call_clients(struct saa7134_dev *dev, - unsigned int cmd, void *arg); -int saa7134_i2c_call_saa6752(struct saa7134_dev *dev, - unsigned int cmd, void *arg); /* ----------------------------------------------------------- */ |