ioctls cleanups.

From: Mauro Carvalho Chehab <mchehab@brturbo.com.br>

- Now, all internal ioctls are at v4l2-common.h
- removed unused ioctl at saa6752hs.h
- all debug ioctl code moved to v4l2-common.c
- removed duplicated stuff from other cards

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>

6 files changed, 29 insertions, 14 deletions

diff --git a/linux/include/linux/video_decoder.h b/linux/include/linux/video_decoder.h
index 0e9e48b83..121e26da2 100644
--- a/linux/include/linux/video_decoder.h
+++ b/linux/include/linux/video_decoder.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_VIDEO_DECODER_H
 #define _LINUX_VIDEO_DECODER_H
 
+#define HAVE_VIDEO_DECODER 1
+
 struct video_decoder_capability { /* this name is too long */
 	__u32	flags;
 #define	VIDEO_DECODER_PAL	1	/* can decode PAL signal */
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h
index 61107ef4b..8c2da9f21 100644
--- a/linux/include/linux/videodev2.h
+++ b/linux/include/linux/videodev2.h
@@ -1144,7 +1144,6 @@ int v4l2_prio_check(struct v4l2_prio_state *global, enum v4l2_priority *local);
 /* names for fancy debug output */
 extern char *v4l2_field_names[];
 extern char *v4l2_type_names[];
-extern char *v4l2_ioctl_names[];
 
 /*  Compatibility layer interface  --  v4l1-compat module */
 typedef int (*v4l2_kioctl)(struct inode *inode, struct file *file,
diff --git a/linux/include/media/audiochip.h b/linux/include/media/audiochip.h
index cfbfdd573..4589fd95f 100644
--- a/linux/include/media/audiochip.h
+++ b/linux/include/media/audiochip.h
@@ -1,5 +1,5 @@
 /*
- * $Id: audiochip.h,v 1.8 2005/12/04 12:21:15 hverkuil Exp $
+ * $Id: audiochip.h,v 1.9 2006/01/01 17:17:39 mchehab Exp $
  */
 
 #ifndef AUDIOCHIP_H
@@ -24,11 +24,6 @@ enum audiochip {
 
 /* ---------------------------------------------------------------------- */
 
-/* v4l device was opened in Radio mode */
-#define AUDC_SET_RADIO        _IO('m',2)
-/* select from TV,radio,extern,MUTE */
-#define AUDC_SET_INPUT        _IOW('m',17,int)
-
 /* audio inputs */
 #define AUDIO_TUNER        0x00
 #define AUDIO_RADIO        0x01
diff --git a/linux/include/media/saa6752hs.h b/linux/include/media/saa6752hs.h
index 3f81c0d9e..2e099ddbb 100644
--- a/linux/include/media/saa6752hs.h
+++ b/linux/include/media/saa6752hs.h
@@ -64,8 +64,6 @@ struct mpeg_params {
 	enum mpeg_video_format video_format;
 };
 
-#define MPEG_SETPARAMS             _IOW('6',100,struct mpeg_params)
-
 #endif // _SAA6752HS_H
 
 /*
diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h
index afa302fec..c125fd385 100644
--- a/linux/include/media/tuner.h
+++ b/linux/include/media/tuner.h
@@ -1,5 +1,5 @@
 /*
-    $Id: tuner.h,v 1.69 2005/12/28 12:56:04 mchehab Exp $
+    $Id: tuner.h,v 1.70 2006/01/01 17:17:39 mchehab Exp $
     tuner.h - definition for different tuners
 
     Copyright (C) 1997 Markus Schroeder (schroedm@uni-duesseldorf.de)
@@ -116,10 +116,6 @@
 #define TUNER_PHILIPS_TUV1236D		68	/* ATI HDTV Wonder */
 #define TUNER_TNF_5335MF                69	/* Sabrent Bt848   */
 
-#define TUNER_SET_TYPE_ADDR          _IOW('T',3,int)
-#define TUNER_SET_STANDBY            _IOW('T',4,int)
-#define TDA9887_SET_CONFIG           _IOW('t',5,int)
-
 /* tv card specific */
 #define TDA9887_PRESENT 		(1<<0)
 #define TDA9887_PORT1_INACTIVE 		(1<<1)
diff --git a/linux/include/media/v4l2-common.h b/linux/include/media/v4l2-common.h
index 90248d29e..9ee616261 100644
--- a/linux/include/media/v4l2-common.h
+++ b/linux/include/media/v4l2-common.h
@@ -63,6 +63,20 @@ enum v4l2_chip_ident {
 	V4L2_IDENT_CX25843 = 243,
 };
 
+/* audio ioctls */
+/* v4l device was opened in Radio mode */
+#define AUDC_SET_RADIO        _IO('d',88)
+/* select from TV,radio,extern,MUTE */
+#define AUDC_SET_INPUT        _IOW('d',89,int)
+
+/* tuner ioctls */
+/* Sets tuner type and its I2C addr */
+#define TUNER_SET_TYPE_ADDR          _IOW('d',90,int)
+/* Puts tuner on powersaving state, disabling it, except for i2c */
+#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)
+
 /* only implemented if CONFIG_VIDEO_ADV_DEBUG is defined */
 #define	VIDIOC_INT_S_REGISTER 		_IOR ('d', 100, struct v4l2_register)
 #define	VIDIOC_INT_G_REGISTER 		_IOWR('d', 101, struct v4l2_register)
@@ -108,5 +122,16 @@ enum v4l2_chip_ident {
    If the frequency is not supported, then -EINVAL is returned. */
 #define VIDIOC_INT_I2S_CLOCK_FREQ 	_IOW ('d', 108, u32)
 
+/* Prints used ioctl */
+extern void v4l_printk_ioctl(unsigned int cmd);
+
+#define v4l_print_ioctl(name,cmd) do {\
+	printk(KERN_DEBUG "%s: ", name); \
+	v4l_printk_ioctl(cmd); } while (0)
+
+#define v4l_i2c_print_ioctl(client,cmd) do {\
+	printk(KERN_DEBUG "%s %d-%04x: ", (client)->driver->name, \
+			i2c_adapter_id((client)->adapter),(client)->addr); \
+	v4l_printk_ioctl(cmd); } while (0)
 
 #endif /* V4L2_COMMON_H_ */