summaryrefslogtreecommitdiff
path: root/linux/include/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-10-26 02:04:46 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-26 02:04:46 -0200
commit37ec66afc95aef6493a0f3617b1f5fff6bbef7cd (patch)
treea1ce6bf55008043cb777496cd2b120d8335c963c /linux/include/media
parentb296024463558f0e9fe5dff04fdfd91903f15bd5 (diff)
parent8d0865f57c653ef13eb27ce8ca78901ba6058d57 (diff)
downloadmediapointer-dvb-s2-37ec66afc95aef6493a0f3617b1f5fff6bbef7cd.tar.gz
mediapointer-dvb-s2-37ec66afc95aef6493a0f3617b1f5fff6bbef7cd.tar.bz2
merge: http://linuxtv.org/hg/~hverkuil/v4l-dvb-fixes
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include/media')
-rw-r--r--linux/include/media/v4l2-common.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/linux/include/media/v4l2-common.h b/linux/include/media/v4l2-common.h
index 3f6e53f72..ee1265433 100644
--- a/linux/include/media/v4l2-common.h
+++ b/linux/include/media/v4l2-common.h
@@ -125,6 +125,11 @@ struct v4l2_decode_vbi_line {
u32 type; /* VBI service type (V4L2_SLICED_*). 0 if no service found */
};
+struct v4l2_priv_tun_config {
+ int tuner;
+ void *priv;
+};
+
/* audio ioctls */
/* v4l device was opened in Radio mode, to be replaced by VIDIOC_INT_S_TUNER_MODE */
@@ -140,7 +145,7 @@ struct v4l2_decode_vbi_line {
#define TUNER_SET_STANDBY _IOW('d', 91, int)
/* Sets tda9887 specific stuff, like port1, port2 and qss */
-#define TDA9887_SET_CONFIG _IOW('d', 92, int)
+#define TUNER_SET_CONFIG _IOW('d', 92, struct v4l2_priv_tun_config)
/* Switch the tuner to a specific tuner mode. Replacement of AUDC_SET_RADIO */
#define VIDIOC_INT_S_TUNER_MODE _IOW('d', 93, enum v4l2_tuner_type)