diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-05-08 23:01:21 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2006-05-08 23:01:21 +0200 |
| commit | 09036418acae9168c24f02a17513bda867e9d42a (patch) | |
| tree | 66a761d531552125aceb2c9a0f2794b9569a3b95 /linux/drivers/media/video/cx25840/cx25840-core.h | |
| parent | 1b0cb8ac7fbb1369e34b40e7cc05c4c948ae4ce1 (diff) | |
| parent | 1de6f4cd655f4ebf23c5df5734b40dab8e6c905a (diff) | |
| download | mediapointer-dvb-s2-09036418acae9168c24f02a17513bda867e9d42a.tar.gz mediapointer-dvb-s2-09036418acae9168c24f02a17513bda867e9d42a.tar.bz2 | |
Merge: from master.
From: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/cx25840/cx25840-core.h')
| -rw-r--r-- | linux/drivers/media/video/cx25840/cx25840-core.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-core.h b/linux/drivers/media/video/cx25840/cx25840-core.h index b4bdc8e8e..fe3d1ece1 100644 --- a/linux/drivers/media/video/cx25840/cx25840-core.h +++ b/linux/drivers/media/video/cx25840/cx25840-core.h @@ -34,12 +34,15 @@ #define CX25840_CID_ENABLE_PVR150_WORKAROUND (V4L2_CID_PRIVATE_BASE+0) struct cx25840_state { + struct i2c_client c; int pvr150_workaround; int radio; enum cx25840_video_input vid_input; enum cx25840_audio_input aud_input; u32 audclk_freq; int audmode; + enum v4l2_chip_ident id; + int is_cx25836; }; /* ----------------------------------------------------------------------- */ @@ -48,7 +51,7 @@ int cx25840_write(struct i2c_client *client, u16 addr, u8 value); int cx25840_write4(struct i2c_client *client, u16 addr, u32 value); u8 cx25840_read(struct i2c_client *client, u16 addr); u32 cx25840_read4(struct i2c_client *client, u16 addr); -int cx25840_and_or(struct i2c_client *client, u16 addr, u8 mask, u8 value); +int cx25840_and_or(struct i2c_client *client, u16 addr, unsigned mask, u8 value); v4l2_std_id cx25840_get_v4lstd(struct i2c_client *client); /* ----------------------------------------------------------------------- */ |