diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-21 10:32:06 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-21 10:32:06 -0400 |
| commit | 5ddac6bc1c4bfcbf645d18668a5033ca257a8ea7 (patch) | |
| tree | a8a74ef15a3622ecc3ab94a424321de8b111648b /include/media/v4l2-subdev.h | |
| parent | c33d4326b60a3aea5cd070a365043f488f81a3b0 (diff) | |
| parent | 89e1c3d0fffa0d610fa7292bbfafb5e87dc6be34 (diff) | |
Merge branch 'next-samsung-board' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/board
Diffstat (limited to 'include/media/v4l2-subdev.h')
| -rw-r--r-- | include/media/v4l2-subdev.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index 1562c4ff3a65..2884e3e69cb1 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h | |||
| @@ -173,16 +173,20 @@ struct v4l2_subdev_core_ops { | |||
| 173 | struct v4l2_event_subscription *sub); | 173 | struct v4l2_event_subscription *sub); |
| 174 | }; | 174 | }; |
| 175 | 175 | ||
| 176 | /* s_mode: switch the tuner to a specific tuner mode. Replacement of s_radio. | 176 | /* s_radio: v4l device was opened in radio mode. |
| 177 | 177 | ||
| 178 | s_radio: v4l device was opened in Radio mode, to be replaced by s_mode. | 178 | g_frequency: freq->type must be filled in. Normally done by video_ioctl2 |
| 179 | or the bridge driver. | ||
| 180 | |||
| 181 | g_tuner: | ||
| 182 | s_tuner: vt->type must be filled in. Normally done by video_ioctl2 or the | ||
| 183 | bridge driver. | ||
| 179 | 184 | ||
| 180 | s_type_addr: sets tuner type and its I2C addr. | 185 | s_type_addr: sets tuner type and its I2C addr. |
| 181 | 186 | ||
| 182 | s_config: sets tda9887 specific stuff, like port1, port2 and qss | 187 | s_config: sets tda9887 specific stuff, like port1, port2 and qss |
| 183 | */ | 188 | */ |
| 184 | struct v4l2_subdev_tuner_ops { | 189 | struct v4l2_subdev_tuner_ops { |
| 185 | int (*s_mode)(struct v4l2_subdev *sd, enum v4l2_tuner_type); | ||
| 186 | int (*s_radio)(struct v4l2_subdev *sd); | 190 | int (*s_radio)(struct v4l2_subdev *sd); |
| 187 | int (*s_frequency)(struct v4l2_subdev *sd, struct v4l2_frequency *freq); | 191 | int (*s_frequency)(struct v4l2_subdev *sd, struct v4l2_frequency *freq); |
| 188 | int (*g_frequency)(struct v4l2_subdev *sd, struct v4l2_frequency *freq); | 192 | int (*g_frequency)(struct v4l2_subdev *sd, struct v4l2_frequency *freq); |