summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-04-02 11:37:41 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-06 21:44:28 -0300
commit6c31e598368bfff49fc3e694c5b7624635871acb (patch)
treec002301857834622e14faedd5dc3cb3cd8ab4f32 /include
parent5325b4272a53b43f55b82cc369c310c2fcacdca1 (diff)
downloadlinux-6c31e598368bfff49fc3e694c5b7624635871acb.tar.bz2
V4L/DVB (11381): ivtv/cx18: remove VIDIOC_INT_S_AUDIO_ROUTING debug support.
Remove support for the debug call VIDIOC_INT_S_AUDIO_ROUTING from cx18 and ivtv. These internal ioctls shouldn't be exposed. These were only used through the cx18-ctl and ivtv-ctl utilities, and only when testing a new card variant. This cleanup allows the removal of this ioctl from v4l2-common.h. Cc: Andy Walls <awalls@radix.net> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/media/v4l2-common.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 01302f19bc91..c48c24e4d0fa 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -174,10 +174,10 @@ const unsigned short *v4l2_i2c_tuner_addrs(enum v4l2_i2c_tuner_type type);
/* ------------------------------------------------------------------------- */
-/* Note: these remaining ioctls should be removed as well, but they are still
- used in tuner-simple.c (TUNER_SET_CONFIG) and cx18/ivtv (RESET and
- S_AUDIO_ROUTING). To remove these ioctls some more cleanup is needed in
- those modules. */
+/* Note: these remaining ioctls/structs should be removed as well, but they are
+ still used in tuner-simple.c (TUNER_SET_CONFIG), cx18/ivtv (RESET) and
+ v4l2-int-device.h (v4l2_routing). To remove these ioctls some more cleanup
+ is needed in those modules. */
/* s_config */
struct v4l2_priv_tun_config {
@@ -186,13 +186,11 @@ struct v4l2_priv_tun_config {
};
#define TUNER_SET_CONFIG _IOW('d', 92, struct v4l2_priv_tun_config)
-/* s_routing: routing definition, device dependent. It specifies which inputs
- (if any) should be routed to which outputs (if any). */
+#define VIDIOC_INT_RESET _IOW ('d', 102, u32)
+
struct v4l2_routing {
u32 input;
u32 output;
};
-#define VIDIOC_INT_S_AUDIO_ROUTING _IOW ('d', 109, struct v4l2_routing)
-#define VIDIOC_INT_RESET _IOW ('d', 102, u32)
#endif /* V4L2_COMMON_H_ */