aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-05-26 09:03:01 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-06-21 09:46:44 -0400
commitb71c99801e18eb172ae34851daf25044a3bf644a (patch)
treebf269d9d56c7a472022866e8cb186d6be6f060f4 /include/media
parent12869145718571ffa4f6e650a6f759934eeca0d9 (diff)
[media] v4l2-core: remove support for obsolete VIDIOC_DBG_G_CHIP_IDENT
This has been replaced by the new and much better VIDIOC_DBG_G_CHIP_INFO. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/v4l2-chip-ident.h354
-rw-r--r--include/media/v4l2-ioctl.h2
-rw-r--r--include/media/v4l2-subdev.h4
3 files changed, 1 insertions, 359 deletions
diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
deleted file mode 100644
index 543f89c18896..000000000000
--- a/include/media/v4l2-chip-ident.h
+++ /dev/null
@@ -1,354 +0,0 @@
1/*
2 v4l2 chip identifiers header
3
4 This header provides a list of chip identifiers that can be returned
5 through the VIDIOC_DBG_G_CHIP_IDENT ioctl.
6
7 Copyright (C) 2007 Hans Verkuil <hverkuil@xs4all.nl>
8
9 This program is free software; you can redistribute it and/or modify
10 it under the terms of the GNU General Public License as published by
11 the Free Software Foundation; either version 2 of the License, or
12 (at your option) any later version.
13
14 This program is distributed in the hope that it will be useful,
15 but WITHOUT ANY WARRANTY; without even the implied warranty of
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 GNU General Public License for more details.
18
19 You should have received a copy of the GNU General Public License
20 along with this program; if not, write to the Free Software
21 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22 */
23
24#ifndef V4L2_CHIP_IDENT_H_
25#define V4L2_CHIP_IDENT_H_
26
27/* VIDIOC_DBG_G_CHIP_IDENT: identifies the actual chip installed on the board */
28
29/* KEEP THIS LIST ORDERED BY ID!
30 Otherwise it will be hard to see which ranges are already in use when
31 adding support to a new chip family. */
32enum {
33 /* general idents: reserved range 0-49 */
34 V4L2_IDENT_NONE = 0, /* No chip matched */
35 V4L2_IDENT_AMBIGUOUS = 1, /* Match too general, multiple chips matched */
36 V4L2_IDENT_UNKNOWN = 2, /* Chip found, but cannot identify */
37
38 /* module tvaudio: reserved range 50-99 */
39 V4L2_IDENT_TVAUDIO = 50, /* A tvaudio chip, unknown which it is exactly */
40
41 /* Sony IMX074 */
42 V4L2_IDENT_IMX074 = 74,
43
44 /* module saa7110: just ident 100 */
45 V4L2_IDENT_SAA7110 = 100,
46
47 /* module saa7115: reserved range 101-149 */
48 V4L2_IDENT_SAA7111 = 101,
49 V4L2_IDENT_SAA7111A = 102,
50 V4L2_IDENT_SAA7113 = 103,
51 V4L2_IDENT_SAA7114 = 104,
52 V4L2_IDENT_SAA7115 = 105,
53 V4L2_IDENT_SAA7118 = 108,
54
55 V4L2_IDENT_GM7113C = 140,
56
57 /* module saa7127: reserved range 150-199 */
58 V4L2_IDENT_SAA7127 = 157,
59 V4L2_IDENT_SAA7129 = 159,
60
61 /* module cx25840: reserved range 200-249 */
62 V4L2_IDENT_CX25836 = 236,
63 V4L2_IDENT_CX25837 = 237,
64 V4L2_IDENT_CX25840 = 240,
65 V4L2_IDENT_CX25841 = 241,
66 V4L2_IDENT_CX25842 = 242,
67 V4L2_IDENT_CX25843 = 243,
68
69 /* OmniVision sensors: reserved range 250-299 */
70 V4L2_IDENT_OV7670 = 250,
71 V4L2_IDENT_OV7720 = 251,
72 V4L2_IDENT_OV7725 = 252,
73 V4L2_IDENT_OV7660 = 253,
74 V4L2_IDENT_OV9650 = 254,
75 V4L2_IDENT_OV9655 = 255,
76 V4L2_IDENT_SOI968 = 256,
77 V4L2_IDENT_OV9640 = 257,
78 V4L2_IDENT_OV6650 = 258,
79 V4L2_IDENT_OV2640 = 259,
80 V4L2_IDENT_OV9740 = 260,
81 V4L2_IDENT_OV5642 = 261,
82
83 /* module saa7146: reserved range 300-309 */
84 V4L2_IDENT_SAA7146 = 300,
85
86 /* Conexant MPEG encoder/decoders: reserved range 400-420 */
87 V4L2_IDENT_CX23418_843 = 403, /* Integrated A/V Decoder on the '418 */
88 V4L2_IDENT_CX23415 = 415,
89 V4L2_IDENT_CX23416 = 416,
90 V4L2_IDENT_CX23417 = 417,
91 V4L2_IDENT_CX23418 = 418,
92
93 /* module bt819: reserved range 810-819 */
94 V4L2_IDENT_BT815A = 815,
95 V4L2_IDENT_BT817A = 817,
96 V4L2_IDENT_BT819A = 819,
97
98 /* module au0828 */
99 V4L2_IDENT_AU0828 = 828,
100
101 /* module bttv: ident 848 + 849 */
102 V4L2_IDENT_BT848 = 848,
103 V4L2_IDENT_BT849 = 849,
104
105 /* module bt856: just ident 856 */
106 V4L2_IDENT_BT856 = 856,
107
108 /* module bt866: just ident 866 */
109 V4L2_IDENT_BT866 = 866,
110
111 /* module bttv: ident 878 + 879 */
112 V4L2_IDENT_BT878 = 878,
113 V4L2_IDENT_BT879 = 879,
114
115 /* module ks0127: reserved range 1120-1129 */
116 V4L2_IDENT_KS0122S = 1122,
117 V4L2_IDENT_KS0127 = 1127,
118 V4L2_IDENT_KS0127B = 1128,
119
120 /* module indycam: just ident 2000 */
121 V4L2_IDENT_INDYCAM = 2000,
122
123 /* module vp27smpx: just ident 2700 */
124 V4L2_IDENT_VP27SMPX = 2700,
125
126 /* module vpx3220: reserved range: 3210-3229 */
127 V4L2_IDENT_VPX3214C = 3214,
128 V4L2_IDENT_VPX3216B = 3216,
129 V4L2_IDENT_VPX3220A = 3220,
130
131 /* VX855 just ident 3409 */
132 /* Other via devs could use 3314, 3324, 3327, 3336, 3364, 3353 */
133 V4L2_IDENT_VIA_VX855 = 3409,
134
135 /* module tvp5150 */
136 V4L2_IDENT_TVP5150 = 5150,
137
138 /* module saa5246a: just ident 5246 */
139 V4L2_IDENT_SAA5246A = 5246,
140
141 /* module saa5249: just ident 5249 */
142 V4L2_IDENT_SAA5249 = 5249,
143
144 /* module cs5345: just ident 5345 */
145 V4L2_IDENT_CS5345 = 5345,
146
147 /* module tea6415c: just ident 6415 */
148 V4L2_IDENT_TEA6415C = 6415,
149
150 /* module tea6420: just ident 6420 */
151 V4L2_IDENT_TEA6420 = 6420,
152
153 /* module saa6588: just ident 6588 */
154 V4L2_IDENT_SAA6588 = 6588,
155
156 /* module vs6624: just ident 6624 */
157 V4L2_IDENT_VS6624 = 6624,
158
159 /* module saa6752hs: reserved range 6750-6759 */
160 V4L2_IDENT_SAA6752HS = 6752,
161 V4L2_IDENT_SAA6752HS_AC3 = 6753,
162
163 /* modules tef6862: just ident 6862 */
164 V4L2_IDENT_TEF6862 = 6862,
165
166 /* module tvp7002: just ident 7002 */
167 V4L2_IDENT_TVP7002 = 7002,
168
169 /* module adv7170: just ident 7170 */
170 V4L2_IDENT_ADV7170 = 7170,
171
172 /* module adv7175: just ident 7175 */
173 V4L2_IDENT_ADV7175 = 7175,
174
175 /* module adv7180: just ident 7180 */
176 V4L2_IDENT_ADV7180 = 7180,
177
178 /* module adv7183: just ident 7183 */
179 V4L2_IDENT_ADV7183 = 7183,
180
181 /* module saa7185: just ident 7185 */
182 V4L2_IDENT_SAA7185 = 7185,
183
184 /* module saa7191: just ident 7191 */
185 V4L2_IDENT_SAA7191 = 7191,
186
187 /* module ths7303: just ident 7303 */
188 V4L2_IDENT_THS7303 = 7303,
189
190 /* module adv7343: just ident 7343 */
191 V4L2_IDENT_ADV7343 = 7343,
192
193 /* module ths7353: just ident 7353 */
194 V4L2_IDENT_THS7353 = 7353,
195
196 /* module adv7393: just ident 7393 */
197 V4L2_IDENT_ADV7393 = 7393,
198
199 /* module adv7604: just ident 7604 */
200 V4L2_IDENT_ADV7604 = 7604,
201
202 /* module saa7706h: just ident 7706 */
203 V4L2_IDENT_SAA7706H = 7706,
204
205 /* module mt9v011, just ident 8243 */
206 V4L2_IDENT_MT9V011 = 8243,
207
208 /* module wm8739: just ident 8739 */
209 V4L2_IDENT_WM8739 = 8739,
210
211 /* module wm8775: just ident 8775 */
212 V4L2_IDENT_WM8775 = 8775,
213
214 /* Marvell controllers starting at 8801 */
215 V4L2_IDENT_CAFE = 8801,
216 V4L2_IDENT_ARMADA610 = 8802,
217
218 /* AKM AK8813/AK8814 */
219 V4L2_IDENT_AK8813 = 8813,
220 V4L2_IDENT_AK8814 = 8814,
221
222 /* module cx23885 and cx25840 */
223 V4L2_IDENT_CX23885 = 8850,
224 V4L2_IDENT_CX23885_AV = 8851, /* Integrated A/V decoder */
225 V4L2_IDENT_CX23887 = 8870,
226 V4L2_IDENT_CX23887_AV = 8871, /* Integrated A/V decoder */
227 V4L2_IDENT_CX23888 = 8880,
228 V4L2_IDENT_CX23888_AV = 8881, /* Integrated A/V decoder */
229 V4L2_IDENT_CX23888_IR = 8882, /* Integrated infrared controller */
230
231 /* module ad9389b: just ident 9389 */
232 V4L2_IDENT_AD9389B = 9389,
233
234 /* module tda9840: just ident 9840 */
235 V4L2_IDENT_TDA9840 = 9840,
236
237 /* module tw9910: just ident 9910 */
238 V4L2_IDENT_TW9910 = 9910,
239
240 /* module sn9c20x: just ident 10000 */
241 V4L2_IDENT_SN9C20X = 10000,
242
243 /* module cx231xx and cx25840 */
244 V4L2_IDENT_CX2310X_AV = 23099, /* Integrated A/V decoder; not in '100 */
245 V4L2_IDENT_CX23100 = 23100,
246 V4L2_IDENT_CX23101 = 23101,
247 V4L2_IDENT_CX23102 = 23102,
248
249 /* module msp3400: reserved range 34000-34999 for msp34xx */
250 V4L2_IDENT_MSPX4XX = 34000, /* generic MSPX4XX identifier, only
251 use internally (tveeprom.c). */
252
253 V4L2_IDENT_MSP3400B = 34002,
254 V4L2_IDENT_MSP3400C = 34003,
255 V4L2_IDENT_MSP3400D = 34004,
256 V4L2_IDENT_MSP3400G = 34007,
257 V4L2_IDENT_MSP3401G = 34017,
258 V4L2_IDENT_MSP3402G = 34027,
259 V4L2_IDENT_MSP3405D = 34054,
260 V4L2_IDENT_MSP3405G = 34057,
261 V4L2_IDENT_MSP3407D = 34074,
262 V4L2_IDENT_MSP3407G = 34077,
263
264 V4L2_IDENT_MSP3410B = 34102,
265 V4L2_IDENT_MSP3410C = 34103,
266 V4L2_IDENT_MSP3410D = 34104,
267 V4L2_IDENT_MSP3410G = 34107,
268 V4L2_IDENT_MSP3411G = 34117,
269 V4L2_IDENT_MSP3412G = 34127,
270 V4L2_IDENT_MSP3415D = 34154,
271 V4L2_IDENT_MSP3415G = 34157,
272 V4L2_IDENT_MSP3417D = 34174,
273 V4L2_IDENT_MSP3417G = 34177,
274
275 V4L2_IDENT_MSP3420G = 34207,
276 V4L2_IDENT_MSP3421G = 34217,
277 V4L2_IDENT_MSP3422G = 34227,
278 V4L2_IDENT_MSP3425G = 34257,
279 V4L2_IDENT_MSP3427G = 34277,
280
281 V4L2_IDENT_MSP3430G = 34307,
282 V4L2_IDENT_MSP3431G = 34317,
283 V4L2_IDENT_MSP3435G = 34357,
284 V4L2_IDENT_MSP3437G = 34377,
285
286 V4L2_IDENT_MSP3440G = 34407,
287 V4L2_IDENT_MSP3441G = 34417,
288 V4L2_IDENT_MSP3442G = 34427,
289 V4L2_IDENT_MSP3445G = 34457,
290 V4L2_IDENT_MSP3447G = 34477,
291
292 V4L2_IDENT_MSP3450G = 34507,
293 V4L2_IDENT_MSP3451G = 34517,
294 V4L2_IDENT_MSP3452G = 34527,
295 V4L2_IDENT_MSP3455G = 34557,
296 V4L2_IDENT_MSP3457G = 34577,
297
298 V4L2_IDENT_MSP3460G = 34607,
299 V4L2_IDENT_MSP3461G = 34617,
300 V4L2_IDENT_MSP3465G = 34657,
301 V4L2_IDENT_MSP3467G = 34677,
302
303 /* module msp3400: reserved range 44000-44999 for msp44xx */
304 V4L2_IDENT_MSP4400G = 44007,
305 V4L2_IDENT_MSP4408G = 44087,
306 V4L2_IDENT_MSP4410G = 44107,
307 V4L2_IDENT_MSP4418G = 44187,
308 V4L2_IDENT_MSP4420G = 44207,
309 V4L2_IDENT_MSP4428G = 44287,
310 V4L2_IDENT_MSP4440G = 44407,
311 V4L2_IDENT_MSP4448G = 44487,
312 V4L2_IDENT_MSP4450G = 44507,
313 V4L2_IDENT_MSP4458G = 44587,
314
315 /* Micron CMOS sensor chips: 45000-45099 */
316 V4L2_IDENT_MT9M001C12ST = 45000,
317 V4L2_IDENT_MT9M001C12STM = 45005,
318 V4L2_IDENT_MT9M111 = 45007,
319 V4L2_IDENT_MT9M112 = 45008,
320 V4L2_IDENT_MT9V022IX7ATC = 45010, /* No way to detect "normal" I77ATx */
321 V4L2_IDENT_MT9V022IX7ATM = 45015, /* and "lead free" IA7ATx chips */
322 V4L2_IDENT_MT9T031 = 45020,
323 V4L2_IDENT_MT9T111 = 45021,
324 V4L2_IDENT_MT9T112 = 45022,
325 V4L2_IDENT_MT9V111 = 45031,
326 V4L2_IDENT_MT9V112 = 45032,
327
328 /* HV7131R CMOS sensor: just ident 46000 */
329 V4L2_IDENT_HV7131R = 46000,
330
331 /* Sharp RJ54N1CB0C, 0xCB0C = 51980 */
332 V4L2_IDENT_RJ54N1CB0C = 51980,
333
334 /* module m52790: just ident 52790 */
335 V4L2_IDENT_M52790 = 52790,
336
337 /* module cs53132a: just ident 53132 */
338 V4L2_IDENT_CS53l32A = 53132,
339
340 /* modules upd61151 MPEG2 encoder: just ident 54000 */
341 V4L2_IDENT_UPD61161 = 54000,
342 /* modules upd61152 MPEG2 encoder with AC3: just ident 54001 */
343 V4L2_IDENT_UPD61162 = 54001,
344
345 /* module upd64031a: just ident 64031 */
346 V4L2_IDENT_UPD64031A = 64031,
347
348 /* module upd64083: just ident 64083 */
349 V4L2_IDENT_UPD64083 = 64083,
350
351 /* Don't just add new IDs at the end: KEEP THIS LIST ORDERED BY ID! */
352};
353
354#endif
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index 931652f0e2af..e0b74a430b3a 100644
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -247,8 +247,6 @@ struct v4l2_ioctl_ops {
247 int (*vidioc_g_chip_info) (struct file *file, void *fh, 247 int (*vidioc_g_chip_info) (struct file *file, void *fh,
248 struct v4l2_dbg_chip_info *chip); 248 struct v4l2_dbg_chip_info *chip);
249#endif 249#endif
250 int (*vidioc_g_chip_ident) (struct file *file, void *fh,
251 struct v4l2_dbg_chip_ident *chip);
252 250
253 int (*vidioc_enum_framesizes) (struct file *file, void *fh, 251 int (*vidioc_enum_framesizes) (struct file *file, void *fh,
254 struct v4l2_frmsizeenum *fsize); 252 struct v4l2_frmsizeenum *fsize);
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index 5298d678d0f3..21fc9e16d7be 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -88,7 +88,6 @@ struct v4l2_decode_vbi_line {
88 88
89/* Core ops: it is highly recommended to implement at least these ops: 89/* Core ops: it is highly recommended to implement at least these ops:
90 90
91 g_chip_ident
92 log_status 91 log_status
93 g_register 92 g_register
94 s_register 93 s_register
@@ -145,7 +144,6 @@ struct v4l2_subdev_io_pin_config {
145 performed later. It must not sleep. *Called from an IRQ context*. 144 performed later. It must not sleep. *Called from an IRQ context*.
146 */ 145 */
147struct v4l2_subdev_core_ops { 146struct v4l2_subdev_core_ops {
148 int (*g_chip_ident)(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip);
149 int (*log_status)(struct v4l2_subdev *sd); 147 int (*log_status)(struct v4l2_subdev *sd);
150 int (*s_io_pin_config)(struct v4l2_subdev *sd, size_t n, 148 int (*s_io_pin_config)(struct v4l2_subdev *sd, size_t n,
151 struct v4l2_subdev_io_pin_config *pincfg); 149 struct v4l2_subdev_io_pin_config *pincfg);
@@ -660,7 +658,7 @@ void v4l2_subdev_init(struct v4l2_subdev *sd,
660/* Call an ops of a v4l2_subdev, doing the right checks against 658/* Call an ops of a v4l2_subdev, doing the right checks against
661 NULL pointers. 659 NULL pointers.
662 660
663 Example: err = v4l2_subdev_call(sd, core, g_chip_ident, &chip); 661 Example: err = v4l2_subdev_call(sd, core, s_std, norm);
664 */ 662 */
665#define v4l2_subdev_call(sd, o, f, args...) \ 663#define v4l2_subdev_call(sd, o, f, args...) \
666 (!(sd) ? -ENODEV : (((sd)->ops->o && (sd)->ops->o->f) ? \ 664 (!(sd) ? -ENODEV : (((sd)->ops->o && (sd)->ops->o->f) ? \
generated by cgit v1.2.2 (git 2.25.0) at 2025-09-09 00:59:37 -0400