tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

V4L/DVB (3269): ioctls cleanups.


- 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>

authored by

Michael Krufky and committed by
Mauro Carvalho Chehab 5e453dc7 37bdfa06

+267 -286
+1
drivers/media/video/bttv-cards.c
··· 38 38 #include <asm/io.h> 39 39 40 40 #include "bttvp.h" 41 + #include <media/v4l2-common.h> 41 42 42 43 /* fwd decl */ 43 44 static void boot_msp34xx(struct bttv *btv, int pin);
+4 -24
drivers/media/video/bttv-driver.c
··· 35 35 #include <linux/interrupt.h> 36 36 #include <linux/kdev_t.h> 37 37 #include "bttvp.h" 38 + #include <media/v4l2-common.h> 38 39 39 40 #include <linux/dma-mapping.h> 40 41 ··· 1521 1520 .buf_release = buffer_release, 1522 1521 }; 1523 1522 1524 - static const char *v4l1_ioctls[] = { 1525 - "?", "CGAP", "GCHAN", "SCHAN", "GTUNER", "STUNER", "GPICT", "SPICT", 1526 - "CCAPTURE", "GWIN", "SWIN", "GFBUF", "SFBUF", "KEY", "GFREQ", 1527 - "SFREQ", "GAUDIO", "SAUDIO", "SYNC", "MCAPTURE", "GMBUF", "GUNIT", 1528 - "GCAPTURE", "SCAPTURE", "SPLAYMODE", "SWRITEMODE", "GPLAYINFO", 1529 - "SMICROCODE", "GVBIFMT", "SVBIFMT" }; 1530 - #define V4L1_IOCTLS ARRAY_SIZE(v4l1_ioctls) 1531 - 1532 1523 static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg) 1533 1524 { 1534 1525 switch (cmd) { ··· 2209 2216 unsigned long flags; 2210 2217 int retval = 0; 2211 2218 2212 - if (bttv_debug > 1) { 2213 - switch (_IOC_TYPE(cmd)) { 2214 - case 'v': 2215 - printk("bttv%d: ioctl 0x%x (v4l1, VIDIOC%s)\n", 2216 - btv->c.nr, cmd, (_IOC_NR(cmd) < V4L1_IOCTLS) ? 2217 - v4l1_ioctls[_IOC_NR(cmd)] : "???"); 2218 - break; 2219 - case 'V': 2220 - printk("bttv%d: ioctl 0x%x (v4l2, %s)\n", 2221 - btv->c.nr, cmd, v4l2_ioctl_names[_IOC_NR(cmd)]); 2222 - break; 2223 - default: 2224 - printk("bttv%d: ioctl 0x%x (???)\n", 2225 - btv->c.nr, cmd); 2226 - } 2227 - } 2219 + if (bttv_debug > 1) 2220 + v4l_print_ioctl(btv->c.name, cmd); 2221 + 2228 2222 if (btv->errors) 2229 2223 bttv_reinit_bt848(btv); 2230 2224
+1
drivers/media/video/bttv-i2c.c
··· 30 30 #include <linux/delay.h> 31 31 32 32 #include "bttvp.h" 33 + #include <media/v4l2-common.h> 33 34 #include <linux/jiffies.h> 34 35 #include <asm/io.h> 35 36
+2 -1
drivers/media/video/cx88/cx88-blackbird.c
··· 32 32 #include <linux/firmware.h> 33 33 34 34 #include "cx88.h" 35 + #include <media/v4l2-common.h> 35 36 36 37 MODULE_DESCRIPTION("driver for cx2388x/cx23416 based mpeg encoder cards"); 37 38 MODULE_AUTHOR("Jelle Foks <jelle@foks.8m.com>, Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); ··· 1375 1374 struct cx88_core *core = dev->core; 1376 1375 1377 1376 if (debug > 1) 1378 - cx88_print_ioctl(core->name,cmd); 1377 + v4l_print_ioctl(core->name,cmd); 1379 1378 1380 1379 switch (cmd) { 1381 1380
+1 -55
drivers/media/video/cx88/cx88-core.c
··· 34 34 #include <linux/videodev2.h> 35 35 36 36 #include "cx88.h" 37 + #include <media/v4l2-common.h> 37 38 38 39 MODULE_DESCRIPTION("v4l2 driver module for cx2388x based TV cards"); 39 40 MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); ··· 77 76 static LIST_HEAD(cx88_devlist); 78 77 static DECLARE_MUTEX(devlist); 79 78 80 - /* ------------------------------------------------------------------ */ 81 - /* debug help functions */ 82 - 83 - static const char *v4l1_ioctls[] = { 84 - "0", "CGAP", "GCHAN", "SCHAN", "GTUNER", "STUNER", "GPICT", "SPICT", 85 - "CCAPTURE", "GWIN", "SWIN", "GFBUF", "SFBUF", "KEY", "GFREQ", 86 - "SFREQ", "GAUDIO", "SAUDIO", "SYNC", "MCAPTURE", "GMBUF", "GUNIT", 87 - "GCAPTURE", "SCAPTURE", "SPLAYMODE", "SWRITEMODE", "GPLAYINFO", 88 - "SMICROCODE", "GVBIFMT", "SVBIFMT" }; 89 - #define V4L1_IOCTLS ARRAY_SIZE(v4l1_ioctls) 90 - 91 - static const char *v4l2_ioctls[] = { 92 - "QUERYCAP", "1", "ENUM_PIXFMT", "ENUM_FBUFFMT", "G_FMT", "S_FMT", 93 - "G_COMP", "S_COMP", "REQBUFS", "QUERYBUF", "G_FBUF", "S_FBUF", 94 - "G_WIN", "S_WIN", "PREVIEW", "QBUF", "16", "DQBUF", "STREAMON", 95 - "STREAMOFF", "G_PERF", "G_PARM", "S_PARM", "G_STD", "S_STD", 96 - "ENUMSTD", "ENUMINPUT", "G_CTRL", "S_CTRL", "G_TUNER", "S_TUNER", 97 - "G_FREQ", "S_FREQ", "G_AUDIO", "S_AUDIO", "35", "QUERYCTRL", 98 - "QUERYMENU", "G_INPUT", "S_INPUT", "ENUMCVT", "41", "42", "43", 99 - "44", "45", "G_OUTPUT", "S_OUTPUT", "ENUMOUTPUT", "G_AUDOUT", 100 - "S_AUDOUT", "ENUMFX", "G_EFFECT", "S_EFFECT", "G_MODULATOR", 101 - "S_MODULATOR" 102 - }; 103 - #define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls) 104 - 105 - void cx88_print_ioctl(char *name, unsigned int cmd) 106 - { 107 - char *dir; 108 - 109 - switch (_IOC_DIR(cmd)) { 110 - case _IOC_NONE: dir = "--"; break; 111 - case _IOC_READ: dir = "r-"; break; 112 - case _IOC_WRITE: dir = "-w"; break; 113 - case _IOC_READ | _IOC_WRITE: dir = "rw"; break; 114 - default: dir = "??"; break; 115 - } 116 - switch (_IOC_TYPE(cmd)) { 117 - case 'v': 118 - printk(KERN_DEBUG "%s: ioctl 0x%08x (v4l1, %s, VIDIOC%s)\n", 119 - name, cmd, dir, (_IOC_NR(cmd) < V4L1_IOCTLS) ? 120 - v4l1_ioctls[_IOC_NR(cmd)] : "???"); 121 - break; 122 - case 'V': 123 - printk(KERN_DEBUG "%s: ioctl 0x%08x (v4l2, %s, VIDIOC_%s)\n", 124 - name, cmd, dir, (_IOC_NR(cmd) < V4L2_IOCTLS) ? 125 - v4l2_ioctls[_IOC_NR(cmd)] : "???"); 126 - break; 127 - default: 128 - printk(KERN_DEBUG "%s: ioctl 0x%08x (???, %s, #%d)\n", 129 - name, cmd, dir, _IOC_NR(cmd)); 130 - } 131 - } 132 - 133 - /* ------------------------------------------------------------------ */ 134 79 #define NO_SYNC_LINE (-1U) 135 80 136 81 static u32* cx88_risc_field(u32 *rp, struct scatterlist *sglist, ··· 1155 1208 1156 1209 /* ------------------------------------------------------------------ */ 1157 1210 1158 - EXPORT_SYMBOL(cx88_print_ioctl); 1159 1211 EXPORT_SYMBOL(cx88_print_irqbits); 1160 1212 1161 1213 EXPORT_SYMBOL(cx88_core_irq);
+1
drivers/media/video/cx88/cx88-dvb.c
··· 31 31 32 32 #include "cx88.h" 33 33 #include "dvb-pll.h" 34 + #include <media/v4l2-common.h> 34 35 35 36 #ifdef HAVE_MT352 36 37 # include "mt352.h"
+1
drivers/media/video/cx88/cx88-i2c.c
··· 30 30 #include <asm/io.h> 31 31 32 32 #include "cx88.h" 33 + #include <media/v4l2-common.h> 33 34 34 35 static unsigned int i2c_debug = 0; 35 36 module_param(i2c_debug, int, 0644);
+4 -3
drivers/media/video/cx88/cx88-video.c
··· 33 33 #include <asm/div64.h> 34 34 35 35 #include "cx88.h" 36 + #include <media/v4l2-common.h> 36 37 37 38 /* Include V4L1 specific functions. Should be removed soon */ 38 39 #include <linux/videodev.h> ··· 1119 1118 int err; 1120 1119 1121 1120 if (video_debug > 1) 1122 - cx88_print_ioctl(core->name,cmd); 1121 + v4l_print_ioctl(core->name,cmd); 1123 1122 switch (cmd) { 1124 1123 1125 1124 /* --- capabilities ------------------------------------------ */ ··· 1255 1254 1256 1255 dprintk( 1, "CORE IOCTL: 0x%x\n", cmd ); 1257 1256 if (video_debug > 1) 1258 - cx88_print_ioctl(core->name,cmd); 1257 + v4l_print_ioctl(core->name,cmd); 1259 1258 1260 1259 switch (cmd) { 1261 1260 /* ---------- tv norms ---------- */ ··· 1475 1474 struct cx88_core *core = dev->core; 1476 1475 1477 1476 if (video_debug > 1) 1478 - cx88_print_ioctl(core->name,cmd); 1477 + v4l_print_ioctl(core->name,cmd); 1479 1478 1480 1479 switch (cmd) { 1481 1480 case VIDIOC_QUERYCAP:
-1
drivers/media/video/cx88/cx88.h
··· 461 461 462 462 extern void cx88_print_irqbits(char *name, char *tag, char **strings, 463 463 u32 bits, u32 mask); 464 - extern void cx88_print_ioctl(char *name, unsigned int cmd); 465 464 466 465 extern int cx88_core_irq(struct cx88_core *core, u32 status); 467 466 extern void cx88_wakeup(struct cx88_core *core,
-53
drivers/media/video/em28xx/em28xx-core.c
··· 63 63 module_param(alt, int, 0644); 64 64 MODULE_PARM_DESC(alt, "alternate setting to use for video endpoint"); 65 65 66 - /* ------------------------------------------------------------------ */ 67 - /* debug help functions */ 68 - 69 - static const char *v4l1_ioctls[] = { 70 - "0", "CGAP", "GCHAN", "SCHAN", "GTUNER", "STUNER", "GPICT", "SPICT", 71 - "CCAPTURE", "GWIN", "SWIN", "GFBUF", "SFBUF", "KEY", "GFREQ", 72 - "SFREQ", "GAUDIO", "SAUDIO", "SYNC", "MCAPTURE", "GMBUF", "GUNIT", 73 - "GCAPTURE", "SCAPTURE", "SPLAYMODE", "SWRITEMODE", "GPLAYINFO", 74 - "SMICROCODE", "GVBIFMT", "SVBIFMT" }; 75 - #define V4L1_IOCTLS ARRAY_SIZE(v4l1_ioctls) 76 - 77 - static const char *v4l2_ioctls[] = { 78 - "QUERYCAP", "1", "ENUM_PIXFMT", "ENUM_FBUFFMT", "G_FMT", "S_FMT", 79 - "G_COMP", "S_COMP", "REQBUFS", "QUERYBUF", "G_FBUF", "S_FBUF", 80 - "G_WIN", "S_WIN", "PREVIEW", "QBUF", "16", "DQBUF", "STREAMON", 81 - "STREAMOFF", "G_PERF", "G_PARM", "S_PARM", "G_STD", "S_STD", 82 - "ENUMSTD", "ENUMINPUT", "G_CTRL", "S_CTRL", "G_TUNER", "S_TUNER", 83 - "G_FREQ", "S_FREQ", "G_AUDIO", "S_AUDIO", "35", "QUERYCTRL", 84 - "QUERYMENU", "G_INPUT", "S_INPUT", "ENUMCVT", "41", "42", "43", 85 - "44", "45", "G_OUTPUT", "S_OUTPUT", "ENUMOUTPUT", "G_AUDOUT", 86 - "S_AUDOUT", "ENUMFX", "G_EFFECT", "S_EFFECT", "G_MODULATOR", 87 - "S_MODULATOR" 88 - }; 89 - #define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls) 90 - 91 - void em28xx_print_ioctl(char *name, unsigned int cmd) 92 - { 93 - char *dir; 94 - 95 - switch (_IOC_DIR(cmd)) { 96 - case _IOC_NONE: dir = "--"; break; 97 - case _IOC_READ: dir = "r-"; break; 98 - case _IOC_WRITE: dir = "-w"; break; 99 - case _IOC_READ | _IOC_WRITE: dir = "rw"; break; 100 - default: dir = "??"; break; 101 - } 102 - switch (_IOC_TYPE(cmd)) { 103 - case 'v': 104 - printk(KERN_DEBUG "%s: ioctl 0x%08x (v4l1, %s, VIDIOC%s)\n", 105 - name, cmd, dir, (_IOC_NR(cmd) < V4L1_IOCTLS) ? 106 - v4l1_ioctls[_IOC_NR(cmd)] : "???"); 107 - break; 108 - case 'V': 109 - printk(KERN_DEBUG "%s: ioctl 0x%08x (v4l2, %s, VIDIOC_%s)\n", 110 - name, cmd, dir, (_IOC_NR(cmd) < V4L2_IOCTLS) ? 111 - v4l2_ioctls[_IOC_NR(cmd)] : "???"); 112 - break; 113 - default: 114 - printk(KERN_DEBUG "%s: ioctl 0x%08x (???, %s, #%d)\n", 115 - name, cmd, dir, _IOC_NR(cmd)); 116 - } 117 - } 118 - 119 66 120 67 /* 121 68 * em28xx_request_buffers()
+1
drivers/media/video/em28xx/em28xx-i2c.c
··· 28 28 #include <linux/video_decoder.h> 29 29 30 30 #include "em28xx.h" 31 + #include <media/v4l2-common.h> 31 32 #include <media/tuner.h> 32 33 33 34 /* ----------------------------------------------------------- */
+1 -1
drivers/media/video/em28xx/em28xx-video.c
··· 1269 1269 return -ENODEV; 1270 1270 1271 1271 if (video_debug > 1) 1272 - em28xx_print_ioctl(dev->name,cmd); 1272 + v4l_print_ioctl(dev->name,cmd); 1273 1273 1274 1274 switch (cmd) { 1275 1275
-2
drivers/media/video/em28xx/em28xx.h
··· 295 295 296 296 /* Provided by em28xx-core.c */ 297 297 298 - void em28xx_print_ioctl(char *name, unsigned int cmd); 299 - 300 298 u32 em28xx_request_buffers(struct em28xx *dev, u32 count); 301 299 void em28xx_queue_unusedframes(struct em28xx *dev); 302 300 void em28xx_release_buffers(struct em28xx *dev);
+1
drivers/media/video/mxb.c
··· 26 26 #include <media/saa7146_vv.h> 27 27 #include <media/tuner.h> 28 28 #include <linux/video_decoder.h> 29 + #include <media/v4l2-common.h> 29 30 30 31 #include "mxb.h" 31 32 #include "tea6415c.h"
+1
drivers/media/video/saa7134/saa7134-cards.c
··· 25 25 26 26 #include "saa7134-reg.h" 27 27 #include "saa7134.h" 28 + #include <media/v4l2-common.h> 28 29 29 30 /* commly used strings */ 30 31 static char name_mute[] = "mute";
-72
drivers/media/video/saa7134/saa7134-core.c
··· 95 95 #define dprintk(fmt, arg...) if (core_debug) \ 96 96 printk(KERN_DEBUG "%s/core: " fmt, dev->name , ## arg) 97 97 98 - /* ------------------------------------------------------------------ */ 99 - /* debug help functions */ 100 - 101 - static const char *v4l1_ioctls[] = { 102 - "0", "GCAP", "GCHAN", "SCHAN", "GTUNER", "STUNER", "GPICT", "SPICT", 103 - "CCAPTURE", "GWIN", "SWIN", "GFBUF", "SFBUF", "KEY", "GFREQ", 104 - "SFREQ", "GAUDIO", "SAUDIO", "SYNC", "MCAPTURE", "GMBUF", "GUNIT", 105 - "GCAPTURE", "SCAPTURE", "SPLAYMODE", "SWRITEMODE", "GPLAYINFO", 106 - "SMICROCODE", "GVBIFMT", "SVBIFMT" }; 107 - #define V4L1_IOCTLS ARRAY_SIZE(v4l1_ioctls) 108 - 109 - static const char *v4l2_ioctls[] = { 110 - "QUERYCAP", "1", "ENUM_PIXFMT", "ENUM_FBUFFMT", "G_FMT", "S_FMT", 111 - "G_COMP", "S_COMP", "REQBUFS", "QUERYBUF", "G_FBUF", "S_FBUF", 112 - "G_WIN", "S_WIN", "PREVIEW", "QBUF", "16", "DQBUF", "STREAMON", 113 - "STREAMOFF", "G_PERF", "G_PARM", "S_PARM", "G_STD", "S_STD", 114 - "ENUMSTD", "ENUMINPUT", "G_CTRL", "S_CTRL", "G_TUNER", "S_TUNER", 115 - "G_FREQ", "S_FREQ", "G_AUDIO", "S_AUDIO", "35", "QUERYCTRL", 116 - "QUERYMENU", "G_INPUT", "S_INPUT", "ENUMCVT", "41", "42", "43", 117 - "44", "45", "G_OUTPUT", "S_OUTPUT", "ENUMOUTPUT", "G_AUDOUT", 118 - "S_AUDOUT", "ENUMFX", "G_EFFECT", "S_EFFECT", "G_MODULATOR", 119 - "S_MODULATOR" 120 - }; 121 - #define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls) 122 - 123 - static const char *osspcm_ioctls[] = { 124 - "RESET", "SYNC", "SPEED", "STEREO", "GETBLKSIZE", "SETFMT", 125 - "CHANNELS", "?", "POST", "SUBDIVIDE", "SETFRAGMENT", "GETFMTS", 126 - "GETOSPACE", "GETISPACE", "NONBLOCK", "GETCAPS", "GET/SETTRIGGER", 127 - "GETIPTR", "GETOPTR", "MAPINBUF", "MAPOUTBUF", "SETSYNCRO", 128 - "SETDUPLEX", "GETODELAY" 129 - }; 130 - #define OSSPCM_IOCTLS ARRAY_SIZE(v4l2_ioctls) 131 - 132 - void saa7134_print_ioctl(char *name, unsigned int cmd) 133 - { 134 - char *dir; 135 - 136 - switch (_IOC_DIR(cmd)) { 137 - case _IOC_NONE: dir = "--"; break; 138 - case _IOC_READ: dir = "r-"; break; 139 - case _IOC_WRITE: dir = "-w"; break; 140 - case _IOC_READ | _IOC_WRITE: dir = "rw"; break; 141 - default: dir = "??"; break; 142 - } 143 - switch (_IOC_TYPE(cmd)) { 144 - case 'v': 145 - printk(KERN_DEBUG "%s: ioctl 0x%08x (v4l1, %s, VIDIOC%s)\n", 146 - name, cmd, dir, (_IOC_NR(cmd) < V4L1_IOCTLS) ? 147 - v4l1_ioctls[_IOC_NR(cmd)] : "???"); 148 - break; 149 - case 'V': 150 - printk(KERN_DEBUG "%s: ioctl 0x%08x (v4l2, %s, VIDIOC_%s)\n", 151 - name, cmd, dir, (_IOC_NR(cmd) < V4L2_IOCTLS) ? 152 - v4l2_ioctls[_IOC_NR(cmd)] : "???"); 153 - break; 154 - case 'P': 155 - printk(KERN_DEBUG "%s: ioctl 0x%08x (oss dsp, %s, SNDCTL_DSP_%s)\n", 156 - name, cmd, dir, (_IOC_NR(cmd) < OSSPCM_IOCTLS) ? 157 - osspcm_ioctls[_IOC_NR(cmd)] : "???"); 158 - break; 159 - case 'M': 160 - printk(KERN_DEBUG "%s: ioctl 0x%08x (oss mixer, %s, #%d)\n", 161 - name, cmd, dir, _IOC_NR(cmd)); 162 - break; 163 - default: 164 - printk(KERN_DEBUG "%s: ioctl 0x%08x (???, %s, #%d)\n", 165 - name, cmd, dir, _IOC_NR(cmd)); 166 - } 167 - } 168 - 169 98 void saa7134_track_gpio(struct saa7134_dev *dev, char *msg) 170 99 { 171 100 unsigned long mode,status; ··· 1102 1173 1103 1174 /* ----------------------------------------------------------- */ 1104 1175 1105 - EXPORT_SYMBOL(saa7134_print_ioctl); 1106 1176 EXPORT_SYMBOL(saa7134_i2c_call_clients); 1107 1177 EXPORT_SYMBOL(saa7134_devlist); 1108 1178 EXPORT_SYMBOL(saa7134_boards);
+1
drivers/media/video/saa7134/saa7134-dvb.c
··· 31 31 32 32 #include "saa7134-reg.h" 33 33 #include "saa7134.h" 34 + #include <media/v4l2-common.h> 34 35 35 36 #ifdef HAVE_MT352 36 37 # include "mt352.h"
+2 -1
drivers/media/video/saa7134/saa7134-empress.c
··· 29 29 #include "saa7134.h" 30 30 31 31 #include <media/saa6752hs.h> 32 + #include <media/v4l2-common.h> 32 33 33 34 /* ------------------------------------------------------------------ */ 34 35 ··· 164 163 struct saa7134_dev *dev = file->private_data; 165 164 166 165 if (debug > 1) 167 - saa7134_print_ioctl(dev->name,cmd); 166 + v4l_print_ioctl(dev->name,cmd); 168 167 switch (cmd) { 169 168 case VIDIOC_QUERYCAP: 170 169 {
+1
drivers/media/video/saa7134/saa7134-i2c.c
··· 30 30 31 31 #include "saa7134-reg.h" 32 32 #include "saa7134.h" 33 + #include <media/v4l2-common.h> 33 34 34 35 /* ----------------------------------------------------------- */ 35 36
+38 -2
drivers/media/video/saa7134/saa7134-oss.c
··· 373 373 return -EINVAL; 374 374 } 375 375 376 + static const char *osspcm_ioctls[] = { 377 + "RESET", "SYNC", "SPEED", "STEREO", "GETBLKSIZE", "SETFMT", 378 + "CHANNELS", "?", "POST", "SUBDIVIDE", "SETFRAGMENT", "GETFMTS", 379 + "GETOSPACE", "GETISPACE", "NONBLOCK", "GETCAPS", "GET/SETTRIGGER", 380 + "GETIPTR", "GETOPTR", "MAPINBUF", "MAPOUTBUF", "SETSYNCRO", 381 + "SETDUPLEX", "GETODELAY" 382 + }; 383 + #define OSSPCM_IOCTLS ARRAY_SIZE(osspcm_ioctls) 384 + 385 + static void saa7134_oss_print_ioctl(char *name, unsigned int cmd) 386 + { 387 + char *dir; 388 + 389 + switch (_IOC_DIR(cmd)) { 390 + case _IOC_NONE: dir = "--"; break; 391 + case _IOC_READ: dir = "r-"; break; 392 + case _IOC_WRITE: dir = "-w"; break; 393 + case _IOC_READ | _IOC_WRITE: dir = "rw"; break; 394 + default: dir = "??"; break; 395 + } 396 + switch (_IOC_TYPE(cmd)) { 397 + case 'P': 398 + printk(KERN_DEBUG "%s: ioctl 0x%08x (oss dsp, %s, SNDCTL_DSP_%s)\n", 399 + name, cmd, dir, (_IOC_NR(cmd) < OSSPCM_IOCTLS) ? 400 + osspcm_ioctls[_IOC_NR(cmd)] : "???"); 401 + break; 402 + case 'M': 403 + printk(KERN_DEBUG "%s: ioctl 0x%08x (oss mixer, %s, #%d)\n", 404 + name, cmd, dir, _IOC_NR(cmd)); 405 + break; 406 + default: 407 + printk(KERN_DEBUG "%s: ioctl 0x%08x (???, %s, #%d)\n", 408 + name, cmd, dir, _IOC_NR(cmd)); 409 + } 410 + } 411 + 376 412 static int dsp_ioctl(struct inode *inode, struct file *file, 377 413 unsigned int cmd, unsigned long arg) 378 414 { ··· 418 382 int val = 0; 419 383 420 384 if (debug > 1) 421 - saa7134_print_ioctl(dev->name,cmd); 385 + saa7134_oss_print_ioctl(dev->name,cmd); 422 386 switch (cmd) { 423 387 case OSS_GETVERSION: 424 388 return put_user(SOUND_VERSION, p); ··· 714 678 int __user *p = argp; 715 679 716 680 if (debug > 1) 717 - saa7134_print_ioctl(dev->name,cmd); 681 + saa7134_oss_print_ioctl(dev->name,cmd); 718 682 switch (cmd) { 719 683 case OSS_GETVERSION: 720 684 return put_user(SOUND_VERSION, p);
+3 -2
drivers/media/video/saa7134/saa7134-video.c
··· 29 29 30 30 #include "saa7134-reg.h" 31 31 #include "saa7134.h" 32 + #include <media/v4l2-common.h> 32 33 33 34 /* Include V4L1 specific functions. Should be removed soon */ 34 35 #include <linux/videodev.h> ··· 1690 1689 int err; 1691 1690 1692 1691 if (video_debug > 1) 1693 - saa7134_print_ioctl(dev->name,cmd); 1692 + v4l_print_ioctl(dev->name,cmd); 1694 1693 1695 1694 switch (cmd) { 1696 1695 case VIDIOC_S_CTRL: ··· 2143 2142 struct saa7134_dev *dev = fh->dev; 2144 2143 2145 2144 if (video_debug > 1) 2146 - saa7134_print_ioctl(dev->name,cmd); 2145 + v4l_print_ioctl(dev->name,cmd); 2147 2146 switch (cmd) { 2148 2147 case VIDIOC_QUERYCAP: 2149 2148 {
-1
drivers/media/video/saa7134/saa7134.h
··· 546 546 547 547 extern struct list_head saa7134_devlist; 548 548 549 - void saa7134_print_ioctl(char *name, unsigned int cmd); 550 549 void saa7134_track_gpio(struct saa7134_dev *dev, char *msg); 551 550 552 551 #define SAA7134_PGTABLE_SIZE 4096
+1 -1
drivers/media/video/tda9887.c
··· 9 9 #include <linux/slab.h> 10 10 #include <linux/delay.h> 11 11 12 - #include <media/audiochip.h> 12 + #include <media/v4l2-common.h> 13 13 #include <media/tuner.h> 14 14 15 15
+4 -8
drivers/media/video/tuner-core.c
··· 20 20 #include <linux/init.h> 21 21 22 22 #include <media/tuner.h> 23 + #include <media/v4l2-common.h> 23 24 #include <media/audiochip.h> 24 25 25 26 #include "msp3400.h" ··· 546 545 { 547 546 struct tuner *t = i2c_get_clientdata(client); 548 547 548 + if (tuner_debug>1) 549 + v4l_i2c_print_ioctl(&(t->i2c),cmd); 550 + 549 551 switch (cmd) { 550 552 /* --- configuration --- */ 551 553 case TUNER_SET_TYPE_ADDR: ··· 579 575 /* Should be implemented, since bttv calls it */ 580 576 tuner_dbg("VIDIOCSAUDIO not implemented.\n"); 581 577 582 - break; 583 - case MSP_SET_MATRIX: 584 - case TDA9887_SET_CONFIG: 585 578 break; 586 579 /* --- v4l ioctls --- */ 587 580 /* take care: bttv does userspace copying, we'll get a ··· 764 763 } 765 764 case VIDIOC_LOG_STATUS: 766 765 tuner_status(client); 767 - break; 768 - default: 769 - tuner_dbg("Unimplemented IOCTL 0x%08x(dir=%d,tp='%c',nr=%d,sz=%d)\n", 770 - cmd, _IOC_DIR(cmd), _IOC_TYPE(cmd), 771 - _IOC_NR(cmd), _IOC_SIZE(cmd)); 772 766 break; 773 767 } 774 768
+1
drivers/media/video/tvaudio.c
··· 31 31 #include <linux/smp_lock.h> 32 32 33 33 #include <media/audiochip.h> 34 + #include <media/v4l2-common.h> 34 35 35 36 #include "tvaudio.h" 36 37
+170 -49
drivers/media/video/v4l2-common.c
··· 58 58 #include <asm/pgtable.h> 59 59 #include <asm/io.h> 60 60 #include <asm/div64.h> 61 + #include <linux/video_decoder.h> 62 + #include <media/v4l2-common.h> 61 63 62 64 #ifdef CONFIG_KMOD 63 65 #include <linux/kmod.h> ··· 192 190 [V4L2_BUF_TYPE_VBI_OUTPUT] = "vbi-out", 193 191 }; 194 192 195 - char *v4l2_ioctl_names[256] = { 196 - [0 ... 255] = "UNKNOWN", 197 - [_IOC_NR(VIDIOC_QUERYCAP)] = "VIDIOC_QUERYCAP", 198 - [_IOC_NR(VIDIOC_RESERVED)] = "VIDIOC_RESERVED", 199 - [_IOC_NR(VIDIOC_ENUM_FMT)] = "VIDIOC_ENUM_FMT", 200 - [_IOC_NR(VIDIOC_G_FMT)] = "VIDIOC_G_FMT", 201 - [_IOC_NR(VIDIOC_S_FMT)] = "VIDIOC_S_FMT", 202 - [_IOC_NR(VIDIOC_REQBUFS)] = "VIDIOC_REQBUFS", 203 - [_IOC_NR(VIDIOC_QUERYBUF)] = "VIDIOC_QUERYBUF", 204 - [_IOC_NR(VIDIOC_G_FBUF)] = "VIDIOC_G_FBUF", 205 - [_IOC_NR(VIDIOC_S_FBUF)] = "VIDIOC_S_FBUF", 206 - [_IOC_NR(VIDIOC_OVERLAY)] = "VIDIOC_OVERLAY", 207 - [_IOC_NR(VIDIOC_QBUF)] = "VIDIOC_QBUF", 208 - [_IOC_NR(VIDIOC_DQBUF)] = "VIDIOC_DQBUF", 209 - [_IOC_NR(VIDIOC_STREAMON)] = "VIDIOC_STREAMON", 210 - [_IOC_NR(VIDIOC_STREAMOFF)] = "VIDIOC_STREAMOFF", 211 - [_IOC_NR(VIDIOC_G_PARM)] = "VIDIOC_G_PARM", 212 - [_IOC_NR(VIDIOC_S_PARM)] = "VIDIOC_S_PARM", 213 - [_IOC_NR(VIDIOC_G_STD)] = "VIDIOC_G_STD", 214 - [_IOC_NR(VIDIOC_S_STD)] = "VIDIOC_S_STD", 215 - [_IOC_NR(VIDIOC_ENUMSTD)] = "VIDIOC_ENUMSTD", 216 - [_IOC_NR(VIDIOC_ENUMINPUT)] = "VIDIOC_ENUMINPUT", 217 - [_IOC_NR(VIDIOC_G_CTRL)] = "VIDIOC_G_CTRL", 218 - [_IOC_NR(VIDIOC_S_CTRL)] = "VIDIOC_S_CTRL", 219 - [_IOC_NR(VIDIOC_G_TUNER)] = "VIDIOC_G_TUNER", 220 - [_IOC_NR(VIDIOC_S_TUNER)] = "VIDIOC_S_TUNER", 221 - [_IOC_NR(VIDIOC_G_AUDIO)] = "VIDIOC_G_AUDIO", 222 - [_IOC_NR(VIDIOC_S_AUDIO)] = "VIDIOC_S_AUDIO", 223 - [_IOC_NR(VIDIOC_QUERYCTRL)] = "VIDIOC_QUERYCTRL", 224 - [_IOC_NR(VIDIOC_QUERYMENU)] = "VIDIOC_QUERYMENU", 225 - [_IOC_NR(VIDIOC_G_INPUT)] = "VIDIOC_G_INPUT", 226 - [_IOC_NR(VIDIOC_S_INPUT)] = "VIDIOC_S_INPUT", 227 - [_IOC_NR(VIDIOC_G_OUTPUT)] = "VIDIOC_G_OUTPUT", 228 - [_IOC_NR(VIDIOC_S_OUTPUT)] = "VIDIOC_S_OUTPUT", 229 - [_IOC_NR(VIDIOC_ENUMOUTPUT)] = "VIDIOC_ENUMOUTPUT", 230 - [_IOC_NR(VIDIOC_G_AUDOUT)] = "VIDIOC_G_AUDOUT", 231 - [_IOC_NR(VIDIOC_S_AUDOUT)] = "VIDIOC_S_AUDOUT", 232 - [_IOC_NR(VIDIOC_G_MODULATOR)] = "VIDIOC_G_MODULATOR", 233 - [_IOC_NR(VIDIOC_S_MODULATOR)] = "VIDIOC_S_MODULATOR", 234 - [_IOC_NR(VIDIOC_G_FREQUENCY)] = "VIDIOC_G_FREQUENCY", 235 - [_IOC_NR(VIDIOC_S_FREQUENCY)] = "VIDIOC_S_FREQUENCY", 236 - [_IOC_NR(VIDIOC_CROPCAP)] = "VIDIOC_CROPCAP", 237 - [_IOC_NR(VIDIOC_G_CROP)] = "VIDIOC_G_CROP", 238 - [_IOC_NR(VIDIOC_S_CROP)] = "VIDIOC_S_CROP", 239 - [_IOC_NR(VIDIOC_G_JPEGCOMP)] = "VIDIOC_G_JPEGCOMP", 240 - [_IOC_NR(VIDIOC_S_JPEGCOMP)] = "VIDIOC_S_JPEGCOMP", 241 - [_IOC_NR(VIDIOC_QUERYSTD)] = "VIDIOC_QUERYSTD", 242 - [_IOC_NR(VIDIOC_TRY_FMT)] = "VIDIOC_TRY_FMT", 193 + /* ------------------------------------------------------------------ */ 194 + /* debug help functions */ 195 + 196 + #ifdef HAVE_V4L1 197 + static const char *v4l1_ioctls[] = { 198 + [_IOC_NR(VIDIOCGCAP)] = "VIDIOCGCAP", 199 + [_IOC_NR(VIDIOCGCHAN)] = "VIDIOCGCHAN", 200 + [_IOC_NR(VIDIOCSCHAN)] = "VIDIOCSCHAN", 201 + [_IOC_NR(VIDIOCGTUNER)] = "VIDIOCGTUNER", 202 + [_IOC_NR(VIDIOCSTUNER)] = "VIDIOCSTUNER", 203 + [_IOC_NR(VIDIOCGPICT)] = "VIDIOCGPICT", 204 + [_IOC_NR(VIDIOCSPICT)] = "VIDIOCSPICT", 205 + [_IOC_NR(VIDIOCCAPTURE)] = "VIDIOCCAPTURE", 206 + [_IOC_NR(VIDIOCGWIN)] = "VIDIOCGWIN", 207 + [_IOC_NR(VIDIOCSWIN)] = "VIDIOCSWIN", 208 + [_IOC_NR(VIDIOCGFBUF)] = "VIDIOCGFBUF", 209 + [_IOC_NR(VIDIOCSFBUF)] = "VIDIOCSFBUF", 210 + [_IOC_NR(VIDIOCKEY)] = "VIDIOCKEY", 211 + [_IOC_NR(VIDIOCGFREQ)] = "VIDIOCGFREQ", 212 + [_IOC_NR(VIDIOCSFREQ)] = "VIDIOCSFREQ", 213 + [_IOC_NR(VIDIOCGAUDIO)] = "VIDIOCGAUDIO", 214 + [_IOC_NR(VIDIOCSAUDIO)] = "VIDIOCSAUDIO", 215 + [_IOC_NR(VIDIOCSYNC)] = "VIDIOCSYNC", 216 + [_IOC_NR(VIDIOCMCAPTURE)] = "VIDIOCMCAPTURE", 217 + [_IOC_NR(VIDIOCGMBUF)] = "VIDIOCGMBUF", 218 + [_IOC_NR(VIDIOCGUNIT)] = "VIDIOCGUNIT", 219 + [_IOC_NR(VIDIOCGCAPTURE)] = "VIDIOCGCAPTURE", 220 + [_IOC_NR(VIDIOCSCAPTURE)] = "VIDIOCSCAPTURE", 221 + [_IOC_NR(VIDIOCSPLAYMODE)] = "VIDIOCSPLAYMODE", 222 + [_IOC_NR(VIDIOCSWRITEMODE)] = "VIDIOCSWRITEMODE", 223 + [_IOC_NR(VIDIOCGPLAYINFO)] = "VIDIOCGPLAYINFO", 224 + [_IOC_NR(VIDIOCSMICROCODE)] = "VIDIOCSMICROCODE", 225 + [_IOC_NR(VIDIOCGVBIFMT)] = "VIDIOCGVBIFMT", 226 + [_IOC_NR(VIDIOCSVBIFMT)] = "VIDIOCSVBIFMT" 243 227 }; 228 + #define V4L1_IOCTLS ARRAY_SIZE(v4l1_ioctls) 229 + #endif 230 + 231 + static const char *v4l2_ioctls[] = { 232 + [_IOC_NR(VIDIOC_QUERYCAP)] = "VIDIOC_QUERYCAP", 233 + [_IOC_NR(VIDIOC_RESERVED)] = "VIDIOC_RESERVED", 234 + [_IOC_NR(VIDIOC_ENUM_FMT)] = "VIDIOC_ENUM_FMT", 235 + [_IOC_NR(VIDIOC_G_FMT)] = "VIDIOC_G_FMT", 236 + [_IOC_NR(VIDIOC_S_FMT)] = "VIDIOC_S_FMT", 237 + [_IOC_NR(VIDIOC_G_MPEGCOMP)] = "VIDIOC_G_MPEGCOMP", 238 + [_IOC_NR(VIDIOC_S_MPEGCOMP)] = "VIDIOC_S_MPEGCOMP", 239 + [_IOC_NR(VIDIOC_REQBUFS)] = "VIDIOC_REQBUFS", 240 + [_IOC_NR(VIDIOC_QUERYBUF)] = "VIDIOC_QUERYBUF", 241 + [_IOC_NR(VIDIOC_G_FBUF)] = "VIDIOC_G_FBUF", 242 + [_IOC_NR(VIDIOC_S_FBUF)] = "VIDIOC_S_FBUF", 243 + [_IOC_NR(VIDIOC_OVERLAY)] = "VIDIOC_OVERLAY", 244 + [_IOC_NR(VIDIOC_QBUF)] = "VIDIOC_QBUF", 245 + [_IOC_NR(VIDIOC_DQBUF)] = "VIDIOC_DQBUF", 246 + [_IOC_NR(VIDIOC_STREAMON)] = "VIDIOC_STREAMON", 247 + [_IOC_NR(VIDIOC_STREAMOFF)] = "VIDIOC_STREAMOFF", 248 + [_IOC_NR(VIDIOC_G_PARM)] = "VIDIOC_G_PARM", 249 + [_IOC_NR(VIDIOC_S_PARM)] = "VIDIOC_S_PARM", 250 + [_IOC_NR(VIDIOC_G_STD)] = "VIDIOC_G_STD", 251 + [_IOC_NR(VIDIOC_S_STD)] = "VIDIOC_S_STD", 252 + [_IOC_NR(VIDIOC_ENUMSTD)] = "VIDIOC_ENUMSTD", 253 + [_IOC_NR(VIDIOC_ENUMINPUT)] = "VIDIOC_ENUMINPUT", 254 + [_IOC_NR(VIDIOC_G_CTRL)] = "VIDIOC_G_CTRL", 255 + [_IOC_NR(VIDIOC_S_CTRL)] = "VIDIOC_S_CTRL", 256 + [_IOC_NR(VIDIOC_G_TUNER)] = "VIDIOC_G_TUNER", 257 + [_IOC_NR(VIDIOC_S_TUNER)] = "VIDIOC_S_TUNER", 258 + [_IOC_NR(VIDIOC_G_AUDIO)] = "VIDIOC_G_AUDIO", 259 + [_IOC_NR(VIDIOC_S_AUDIO)] = "VIDIOC_S_AUDIO", 260 + [_IOC_NR(VIDIOC_QUERYCTRL)] = "VIDIOC_QUERYCTRL", 261 + [_IOC_NR(VIDIOC_QUERYMENU)] = "VIDIOC_QUERYMENU", 262 + [_IOC_NR(VIDIOC_G_INPUT)] = "VIDIOC_G_INPUT", 263 + [_IOC_NR(VIDIOC_S_INPUT)] = "VIDIOC_S_INPUT", 264 + [_IOC_NR(VIDIOC_G_OUTPUT)] = "VIDIOC_G_OUTPUT", 265 + [_IOC_NR(VIDIOC_S_OUTPUT)] = "VIDIOC_S_OUTPUT", 266 + [_IOC_NR(VIDIOC_ENUMOUTPUT)] = "VIDIOC_ENUMOUTPUT", 267 + [_IOC_NR(VIDIOC_G_AUDOUT)] = "VIDIOC_G_AUDOUT", 268 + [_IOC_NR(VIDIOC_S_AUDOUT)] = "VIDIOC_S_AUDOUT", 269 + [_IOC_NR(VIDIOC_G_MODULATOR)] = "VIDIOC_G_MODULATOR", 270 + [_IOC_NR(VIDIOC_S_MODULATOR)] = "VIDIOC_S_MODULATOR", 271 + [_IOC_NR(VIDIOC_G_FREQUENCY)] = "VIDIOC_G_FREQUENCY", 272 + [_IOC_NR(VIDIOC_S_FREQUENCY)] = "VIDIOC_S_FREQUENCY", 273 + [_IOC_NR(VIDIOC_CROPCAP)] = "VIDIOC_CROPCAP", 274 + [_IOC_NR(VIDIOC_G_CROP)] = "VIDIOC_G_CROP", 275 + [_IOC_NR(VIDIOC_S_CROP)] = "VIDIOC_S_CROP", 276 + [_IOC_NR(VIDIOC_G_JPEGCOMP)] = "VIDIOC_G_JPEGCOMP", 277 + [_IOC_NR(VIDIOC_S_JPEGCOMP)] = "VIDIOC_S_JPEGCOMP", 278 + [_IOC_NR(VIDIOC_QUERYSTD)] = "VIDIOC_QUERYSTD", 279 + [_IOC_NR(VIDIOC_TRY_FMT)] = "VIDIOC_TRY_FMT", 280 + [_IOC_NR(VIDIOC_ENUMAUDIO)] = "VIDIOC_ENUMAUDIO", 281 + [_IOC_NR(VIDIOC_ENUMAUDOUT)] = "VIDIOC_ENUMAUDOUT", 282 + [_IOC_NR(VIDIOC_G_PRIORITY)] = "VIDIOC_G_PRIORITY", 283 + [_IOC_NR(VIDIOC_S_PRIORITY)] = "VIDIOC_S_PRIORITY", 284 + #if 1 285 + [_IOC_NR(VIDIOC_G_SLICED_VBI_CAP)] = "VIDIOC_G_SLICED_VBI_CAP", 286 + #endif 287 + [_IOC_NR(VIDIOC_LOG_STATUS)] = "VIDIOC_LOG_STATUS" 288 + }; 289 + #define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls) 290 + 291 + static const char *v4l2_int_ioctls[] = { 292 + #ifdef HAVE_VIDEO_DECODER 293 + [_IOC_NR(DECODER_GET_CAPABILITIES)] = "DECODER_GET_CAPABILITIES", 294 + [_IOC_NR(DECODER_GET_STATUS)] = "DECODER_GET_STATUS", 295 + [_IOC_NR(DECODER_SET_NORM)] = "DECODER_SET_NORM", 296 + [_IOC_NR(DECODER_SET_INPUT)] = "DECODER_SET_INPUT", 297 + [_IOC_NR(DECODER_SET_OUTPUT)] = "DECODER_SET_OUTPUT", 298 + [_IOC_NR(DECODER_ENABLE_OUTPUT)] = "DECODER_ENABLE_OUTPUT", 299 + [_IOC_NR(DECODER_SET_PICTURE)] = "DECODER_SET_PICTURE", 300 + [_IOC_NR(DECODER_SET_GPIO)] = "DECODER_SET_GPIO", 301 + [_IOC_NR(DECODER_INIT)] = "DECODER_INIT", 302 + [_IOC_NR(DECODER_SET_VBI_BYPASS)] = "DECODER_SET_VBI_BYPASS", 303 + [_IOC_NR(DECODER_DUMP)] = "DECODER_DUMP", 304 + #endif 305 + [_IOC_NR(AUDC_SET_RADIO)] = "AUDC_SET_RADIO", 306 + [_IOC_NR(AUDC_SET_INPUT)] = "AUDC_SET_INPUT", 307 + 308 + [_IOC_NR(TUNER_SET_TYPE_ADDR)] = "TUNER_SET_TYPE_ADDR", 309 + [_IOC_NR(TUNER_SET_STANDBY)] = "TUNER_SET_STANDBY", 310 + [_IOC_NR(TDA9887_SET_CONFIG)] = "TDA9887_SET_CONFIG", 311 + 312 + [_IOC_NR(VIDIOC_INT_S_REGISTER)] = "VIDIOC_INT_S_REGISTER", 313 + [_IOC_NR(VIDIOC_INT_G_REGISTER)] = "VIDIOC_INT_G_REGISTER", 314 + [_IOC_NR(VIDIOC_INT_RESET)] = "VIDIOC_INT_RESET", 315 + [_IOC_NR(VIDIOC_INT_AUDIO_CLOCK_FREQ)] = "VIDIOC_INT_AUDIO_CLOCK_FREQ", 316 + [_IOC_NR(VIDIOC_INT_DECODE_VBI_LINE)] = "VIDIOC_INT_DECODE_VBI_LINE", 317 + [_IOC_NR(VIDIOC_INT_S_VBI_DATA)] = "VIDIOC_INT_S_VBI_DATA", 318 + [_IOC_NR(VIDIOC_INT_G_VBI_DATA)] = "VIDIOC_INT_G_VBI_DATA", 319 + [_IOC_NR(VIDIOC_INT_G_CHIP_IDENT)] = "VIDIOC_INT_G_CHIP_IDENT", 320 + [_IOC_NR(VIDIOC_INT_I2S_CLOCK_FREQ)] = "VIDIOC_INT_I2S_CLOCK_FREQ" 321 + }; 322 + #define V4L2_INT_IOCTLS ARRAY_SIZE(v4l2_int_ioctls) 323 + 324 + /* Common ioctl debug function. This function can be used by 325 + external ioctl messages as well as internal V4L ioctl */ 326 + void v4l_printk_ioctl(unsigned int cmd) 327 + { 328 + char *dir; 329 + 330 + switch (_IOC_DIR(cmd)) { 331 + case _IOC_NONE: dir = "--"; break; 332 + case _IOC_READ: dir = "r-"; break; 333 + case _IOC_WRITE: dir = "-w"; break; 334 + case _IOC_READ | _IOC_WRITE: dir = "rw"; break; 335 + default: dir = "*ERR*"; break; 336 + } 337 + switch (_IOC_TYPE(cmd)) { 338 + case 'd': 339 + printk("v4l2_int ioctl %s, dir=%s (0x%08x)\n", 340 + (_IOC_NR(cmd) < V4L2_INT_IOCTLS) ? 341 + v4l2_int_ioctls[_IOC_NR(cmd)] : "UNKNOWN", dir, cmd); 342 + break; 343 + #ifdef HAVE_V4L1 344 + case 'v': 345 + printk("v4l1 ioctl %s, dir=%s (0x%08x)\n", 346 + (_IOC_NR(cmd) < V4L1_IOCTLS) ? 347 + v4l1_ioctls[_IOC_NR(cmd)] : "UNKNOWN", dir, cmd); 348 + break; 349 + #endif 350 + case 'V': 351 + printk("v4l2 ioctl %s, dir=%s (0x%08x)\n", 352 + (_IOC_NR(cmd) < V4L2_IOCTLS) ? 353 + v4l2_ioctls[_IOC_NR(cmd)] : "UNKNOWN", dir, cmd); 354 + break; 355 + 356 + default: 357 + printk("unknown ioctl '%c', dir=%s, #%d (0x%08x)\n", 358 + _IOC_TYPE(cmd), dir, _IOC_NR(cmd), cmd); 359 + } 360 + } 244 361 245 362 /* ----------------------------------------------------------------- */ 246 363 ··· 374 253 375 254 EXPORT_SYMBOL(v4l2_field_names); 376 255 EXPORT_SYMBOL(v4l2_type_names); 377 - EXPORT_SYMBOL(v4l2_ioctl_names); 256 + EXPORT_SYMBOL(v4l_printk_ioctl); 378 257 379 258 /* 380 259 * Local variables:
+2
include/linux/video_decoder.h
··· 1 1 #ifndef _LINUX_VIDEO_DECODER_H 2 2 #define _LINUX_VIDEO_DECODER_H 3 3 4 + #define HAVE_VIDEO_DECODER 1 5 + 4 6 struct video_decoder_capability { /* this name is too long */ 5 7 __u32 flags; 6 8 #define VIDEO_DECODER_PAL 1 /* can decode PAL signal */
-1
include/linux/videodev2.h
··· 1116 1116 /* names for fancy debug output */ 1117 1117 extern char *v4l2_field_names[]; 1118 1118 extern char *v4l2_type_names[]; 1119 - extern char *v4l2_ioctl_names[]; 1120 1119 1121 1120 /* Compatibility layer interface -- v4l1-compat module */ 1122 1121 typedef int (*v4l2_kioctl)(struct inode *inode, struct file *file,
-5
include/media/audiochip.h
··· 23 23 24 24 /* ---------------------------------------------------------------------- */ 25 25 26 - /* v4l device was opened in Radio mode */ 27 - #define AUDC_SET_RADIO _IO('m',2) 28 - /* select from TV,radio,extern,MUTE */ 29 - #define AUDC_SET_INPUT _IOW('m',17,int) 30 - 31 26 /* audio inputs */ 32 27 #define AUDIO_TUNER 0x00 33 28 #define AUDIO_RADIO 0x01
-4
include/media/tuner.h
··· 115 115 #define TUNER_PHILIPS_TUV1236D 68 /* ATI HDTV Wonder */ 116 116 #define TUNER_TNF_5335MF 69 /* Sabrent Bt848 */ 117 117 118 - #define TUNER_SET_TYPE_ADDR _IOW('T',3,int) 119 - #define TUNER_SET_STANDBY _IOW('T',4,int) 120 - #define TDA9887_SET_CONFIG _IOW('t',5,int) 121 - 122 118 /* tv card specific */ 123 119 #define TDA9887_PRESENT (1<<0) 124 120 #define TDA9887_PORT1_INACTIVE (1<<1)
+25
include/media/v4l2-common.h
··· 63 63 V4L2_IDENT_CX25843 = 243, 64 64 }; 65 65 66 + /* audio ioctls */ 67 + /* v4l device was opened in Radio mode */ 68 + #define AUDC_SET_RADIO _IO('d',88) 69 + /* select from TV,radio,extern,MUTE */ 70 + #define AUDC_SET_INPUT _IOW('d',89,int) 71 + 72 + /* tuner ioctls */ 73 + /* Sets tuner type and its I2C addr */ 74 + #define TUNER_SET_TYPE_ADDR _IOW('d',90,int) 75 + /* Puts tuner on powersaving state, disabling it, except for i2c */ 76 + #define TUNER_SET_STANDBY _IOW('d',91,int) 77 + /* Sets tda9887 specific stuff, like port1, port2 and qss */ 78 + #define TDA9887_SET_CONFIG _IOW('d',92,int) 79 + 66 80 /* only implemented if CONFIG_VIDEO_ADV_DEBUG is defined */ 67 81 #define VIDIOC_INT_S_REGISTER _IOR ('d', 100, struct v4l2_register) 68 82 #define VIDIOC_INT_G_REGISTER _IOWR('d', 101, struct v4l2_register) ··· 122 108 If the frequency is not supported, then -EINVAL is returned. */ 123 109 #define VIDIOC_INT_I2S_CLOCK_FREQ _IOW ('d', 108, u32) 124 110 111 + /* Prints used ioctl */ 112 + extern void v4l_printk_ioctl(unsigned int cmd); 113 + 114 + #define v4l_print_ioctl(name,cmd) do {\ 115 + printk(KERN_DEBUG "%s: ", name); \ 116 + v4l_printk_ioctl(cmd); } while (0) 117 + 118 + #define v4l_i2c_print_ioctl(client,cmd) do {\ 119 + printk(KERN_DEBUG "%s %d-%04x: ", (client)->driver->name, \ 120 + i2c_adapter_id((client)->adapter),(client)->addr); \ 121 + v4l_printk_ioctl(cmd); } while (0) 125 122 126 123 #endif /* V4L2_COMMON_H_ */