diff options
author | Michael Krufky <mkrufky@m1k.net> | 2006-01-09 12:32:31 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-09 12:32:31 -0500 |
commit | 5e453dc757385ec892a818e4e3b5de027987ced9 (patch) | |
tree | c6e5c4ffeb7557c6f3861f39cb4d28532dc3fe39 /drivers/media/video/saa7134/saa7134-core.c | |
parent | 37bdfa06b6bbf085b55d64eb5d9ed112418ed5ad (diff) |
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>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-core.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-core.c | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index 0bdbd99d0ae6..d4be1fd20a36 100644 --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c | |||
@@ -95,77 +95,6 @@ int (*dmasound_exit)(struct saa7134_dev *dev); | |||
95 | #define dprintk(fmt, arg...) if (core_debug) \ | 95 | #define dprintk(fmt, arg...) if (core_debug) \ |
96 | printk(KERN_DEBUG "%s/core: " fmt, dev->name , ## arg) | 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 | void saa7134_track_gpio(struct saa7134_dev *dev, char *msg) | 98 | void saa7134_track_gpio(struct saa7134_dev *dev, char *msg) |
170 | { | 99 | { |
171 | unsigned long mode,status; | 100 | unsigned long mode,status; |
@@ -1173,7 +1102,6 @@ module_exit(saa7134_fini); | |||
1173 | 1102 | ||
1174 | /* ----------------------------------------------------------- */ | 1103 | /* ----------------------------------------------------------- */ |
1175 | 1104 | ||
1176 | EXPORT_SYMBOL(saa7134_print_ioctl); | ||
1177 | EXPORT_SYMBOL(saa7134_i2c_call_clients); | 1105 | EXPORT_SYMBOL(saa7134_i2c_call_clients); |
1178 | EXPORT_SYMBOL(saa7134_devlist); | 1106 | EXPORT_SYMBOL(saa7134_devlist); |
1179 | EXPORT_SYMBOL(saa7134_boards); | 1107 | EXPORT_SYMBOL(saa7134_boards); |