aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-04-01 02:15:52 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-06 20:44:26 -0400
commit3ff4ad815c5824ab35375d72ea8fe14fb3230daa (patch)
tree58f3b75b5b97f5dbf0bb129423c766c1fa4c86fd /include/media
parent940088a16221fa517f5b921266afa8e46f49b784 (diff)
V4L/DVB (11377): v4l: increase version numbers of drivers converted to v4l2_subdev.
With all the v4l2_subdev changes that were made to these drivers it is a good idea to increase the version number of each driver. It's just the patch level that is increased, except for the zoran and saa7146 drivers where the minor number was increased due to the more substantial changes that were made to those two drivers. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/saa7146.h2
-rw-r--r--include/media/v4l2-subdev.h12
2 files changed, 4 insertions, 10 deletions
diff --git a/include/media/saa7146.h b/include/media/saa7146.h
index fff4235adae5..7a9f76ecbbbd 100644
--- a/include/media/saa7146.h
+++ b/include/media/saa7146.h
@@ -18,7 +18,7 @@
18#include <linux/vmalloc.h> /* for vmalloc() */ 18#include <linux/vmalloc.h> /* for vmalloc() */
19#include <linux/mm.h> /* for vmalloc_to_page() */ 19#include <linux/mm.h> /* for vmalloc_to_page() */
20 20
21#define SAA7146_VERSION_CODE 0x000500 /* 0.5.0 */ 21#define SAA7146_VERSION_CODE 0x000600 /* 0.6.0 */
22 22
23#define saa7146_write(sxy,adr,dat) writel((dat),(sxy->mem+(adr))) 23#define saa7146_write(sxy,adr,dat) writel((dat),(sxy->mem+(adr)))
24#define saa7146_read(sxy,adr) readl(sxy->mem+(adr)) 24#define saa7146_read(sxy,adr) readl(sxy->mem+(adr))
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index b4e48dc3f2ba..df4a76800bd6 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -37,12 +37,6 @@ struct v4l2_decode_vbi_line {
37 u32 type; /* VBI service type (V4L2_SLICED_*). 0 if no service found */ 37 u32 type; /* VBI service type (V4L2_SLICED_*). 0 if no service found */
38}; 38};
39 39
40/* s_crystal_freq */
41struct v4l2_crystal_freq {
42 u32 freq; /* frequency in Hz of the crystal */
43 u32 flags; /* device specific flags */
44};
45
46/* Sub-devices are devices that are connected somehow to the main bridge 40/* Sub-devices are devices that are connected somehow to the main bridge
47 device. These devices are usually audio/video muxers/encoders/decoders or 41 device. These devices are usually audio/video muxers/encoders/decoders or
48 sensors and webcam controllers. 42 sensors and webcam controllers.
@@ -194,8 +188,8 @@ struct v4l2_subdev_audio_ops {
194 s_std_output: set v4l2_std_id for video OUTPUT devices. This is ignored by 188 s_std_output: set v4l2_std_id for video OUTPUT devices. This is ignored by
195 video input devices. 189 video input devices.
196 190
197 s_crystal_freq: sets the frequency of the crystal used to generate the 191 s_crystal_freq: sets the frequency of the crystal used to generate the
198 clocks. An extra flags field allows device specific configuration 192 clocks in Hz. An extra flags field allows device specific configuration
199 regarding clock frequency dividers, etc. If not used, then set flags 193 regarding clock frequency dividers, etc. If not used, then set flags
200 to 0. If the frequency is not supported, then -EINVAL is returned. 194 to 0. If the frequency is not supported, then -EINVAL is returned.
201 195
@@ -207,7 +201,7 @@ struct v4l2_subdev_audio_ops {
207 */ 201 */
208struct v4l2_subdev_video_ops { 202struct v4l2_subdev_video_ops {
209 int (*s_routing)(struct v4l2_subdev *sd, const struct v4l2_routing *route); 203 int (*s_routing)(struct v4l2_subdev *sd, const struct v4l2_routing *route);
210 int (*s_crystal_freq)(struct v4l2_subdev *sd, struct v4l2_crystal_freq *freq); 204 int (*s_crystal_freq)(struct v4l2_subdev *sd, u32 freq, u32 flags);
211 int (*decode_vbi_line)(struct v4l2_subdev *sd, struct v4l2_decode_vbi_line *vbi_line); 205 int (*decode_vbi_line)(struct v4l2_subdev *sd, struct v4l2_decode_vbi_line *vbi_line);
212 int (*s_vbi_data)(struct v4l2_subdev *sd, const struct v4l2_sliced_vbi_data *vbi_data); 206 int (*s_vbi_data)(struct v4l2_subdev *sd, const struct v4l2_sliced_vbi_data *vbi_data);
213 int (*g_vbi_data)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_data *vbi_data); 207 int (*g_vbi_data)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_data *vbi_data);