diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-11 12:15:34 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 16:02:08 -0500 |
commit | 7d497f8afa80128bb99a425a6d7a766a863128a5 (patch) | |
tree | d264804a02bf1cd13ccfd3ef4c03de7c7a1b2191 /drivers/media/video/em28xx/em28xx-cards.c | |
parent | cb77d010221e66c63f4a71546fed73be9b12b9a3 (diff) |
V4L/DVB (6587): Cleanup at tv norm selection
With the conversion to the vidio_ioctl2, tvnorms array is not required anymore.
Also, removed some code from V4L1 time (VIDEO_MODE_foo), specied at the
non-used video_decoder.h.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-cards.c')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index a2c0794821b..fd64058a04e 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c | |||
@@ -52,7 +52,6 @@ struct em28xx_board em28xx_boards[] = { | |||
52 | .name = "Unknown EM2800 video grabber", | 52 | .name = "Unknown EM2800 video grabber", |
53 | .is_em2800 = 1, | 53 | .is_em2800 = 1, |
54 | .vchannels = 2, | 54 | .vchannels = 2, |
55 | .norm = VIDEO_MODE_PAL, | ||
56 | .tda9887_conf = TDA9887_PRESENT, | 55 | .tda9887_conf = TDA9887_PRESENT, |
57 | .has_tuner = 1, | 56 | .has_tuner = 1, |
58 | .decoder = EM28XX_SAA7113, | 57 | .decoder = EM28XX_SAA7113, |
@@ -74,7 +73,6 @@ struct em28xx_board em28xx_boards[] = { | |||
74 | .name = "Kworld PVR TV 2800 RF", | 73 | .name = "Kworld PVR TV 2800 RF", |
75 | .is_em2800 = 0, | 74 | .is_em2800 = 0, |
76 | .vchannels = 2, | 75 | .vchannels = 2, |
77 | .norm = VIDEO_MODE_PAL, | ||
78 | .tda9887_conf = TDA9887_PRESENT, | 76 | .tda9887_conf = TDA9887_PRESENT, |
79 | .has_tuner = 1, | 77 | .has_tuner = 1, |
80 | .decoder = EM28XX_SAA7113, | 78 | .decoder = EM28XX_SAA7113, |
@@ -91,7 +89,6 @@ struct em28xx_board em28xx_boards[] = { | |||
91 | [EM2820_BOARD_TERRATEC_CINERGY_250] = { | 89 | [EM2820_BOARD_TERRATEC_CINERGY_250] = { |
92 | .name = "Terratec Cinergy 250 USB", | 90 | .name = "Terratec Cinergy 250 USB", |
93 | .vchannels = 3, | 91 | .vchannels = 3, |
94 | .norm = VIDEO_MODE_PAL, | ||
95 | .tuner_type = TUNER_LG_PAL_NEW_TAPC, | 92 | .tuner_type = TUNER_LG_PAL_NEW_TAPC, |
96 | .tda9887_conf = TDA9887_PRESENT, | 93 | .tda9887_conf = TDA9887_PRESENT, |
97 | .has_tuner = 1, | 94 | .has_tuner = 1, |
@@ -113,7 +110,6 @@ struct em28xx_board em28xx_boards[] = { | |||
113 | [EM2820_BOARD_PINNACLE_USB_2] = { | 110 | [EM2820_BOARD_PINNACLE_USB_2] = { |
114 | .name = "Pinnacle PCTV USB 2", | 111 | .name = "Pinnacle PCTV USB 2", |
115 | .vchannels = 3, | 112 | .vchannels = 3, |
116 | .norm = VIDEO_MODE_PAL, | ||
117 | .tuner_type = TUNER_LG_PAL_NEW_TAPC, | 113 | .tuner_type = TUNER_LG_PAL_NEW_TAPC, |
118 | .tda9887_conf = TDA9887_PRESENT, | 114 | .tda9887_conf = TDA9887_PRESENT, |
119 | .has_tuner = 1, | 115 | .has_tuner = 1, |
@@ -135,7 +131,6 @@ struct em28xx_board em28xx_boards[] = { | |||
135 | [EM2820_BOARD_HAUPPAUGE_WINTV_USB_2] = { | 131 | [EM2820_BOARD_HAUPPAUGE_WINTV_USB_2] = { |
136 | .name = "Hauppauge WinTV USB 2", | 132 | .name = "Hauppauge WinTV USB 2", |
137 | .vchannels = 3, | 133 | .vchannels = 3, |
138 | .norm = VIDEO_MODE_NTSC, | ||
139 | .tuner_type = TUNER_PHILIPS_FM1236_MK3, | 134 | .tuner_type = TUNER_PHILIPS_FM1236_MK3, |
140 | .tda9887_conf = TDA9887_PRESENT|TDA9887_PORT1_ACTIVE|TDA9887_PORT2_ACTIVE, | 135 | .tda9887_conf = TDA9887_PRESENT|TDA9887_PORT1_ACTIVE|TDA9887_PORT2_ACTIVE, |
141 | .has_tuner = 1, | 136 | .has_tuner = 1, |
@@ -156,7 +151,6 @@ struct em28xx_board em28xx_boards[] = { | |||
156 | [EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900] = { | 151 | [EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900] = { |
157 | .name = "Hauppauge WinTV HVR 900/950", | 152 | .name = "Hauppauge WinTV HVR 900/950", |
158 | .vchannels = 3, | 153 | .vchannels = 3, |
159 | .norm = VIDEO_MODE_PAL, | ||
160 | .tda9887_conf = TDA9887_PRESENT, | 154 | .tda9887_conf = TDA9887_PRESENT, |
161 | .tuner_type = TUNER_XC2028, | 155 | .tuner_type = TUNER_XC2028, |
162 | .has_tuner = 1, | 156 | .has_tuner = 1, |
@@ -178,7 +172,6 @@ struct em28xx_board em28xx_boards[] = { | |||
178 | [EM2880_BOARD_TERRATEC_HYBRID_XS] = { | 172 | [EM2880_BOARD_TERRATEC_HYBRID_XS] = { |
179 | .name = "Terratec Hybrid XS", | 173 | .name = "Terratec Hybrid XS", |
180 | .vchannels = 3, | 174 | .vchannels = 3, |
181 | .norm = VIDEO_MODE_PAL, | ||
182 | .tda9887_conf = TDA9887_PRESENT, | 175 | .tda9887_conf = TDA9887_PRESENT, |
183 | .has_tuner = 1, | 176 | .has_tuner = 1, |
184 | .tuner_type = TUNER_XC2028, | 177 | .tuner_type = TUNER_XC2028, |
@@ -202,7 +195,6 @@ struct em28xx_board em28xx_boards[] = { | |||
202 | [EM2880_BOARD_TERRATEC_PRODIGY_XS] = { | 195 | [EM2880_BOARD_TERRATEC_PRODIGY_XS] = { |
203 | .name = "Terratec Prodigy XS", | 196 | .name = "Terratec Prodigy XS", |
204 | .vchannels = 3, | 197 | .vchannels = 3, |
205 | .norm = VIDEO_MODE_PAL, | ||
206 | .tda9887_conf = TDA9887_PRESENT, | 198 | .tda9887_conf = TDA9887_PRESENT, |
207 | .has_tuner = 1, | 199 | .has_tuner = 1, |
208 | .tuner_type = TUNER_XC2028, | 200 | .tuner_type = TUNER_XC2028, |
@@ -224,7 +216,6 @@ struct em28xx_board em28xx_boards[] = { | |||
224 | [EM2820_BOARD_MSI_VOX_USB_2] = { | 216 | [EM2820_BOARD_MSI_VOX_USB_2] = { |
225 | .name = "MSI VOX USB 2.0", | 217 | .name = "MSI VOX USB 2.0", |
226 | .vchannels = 3, | 218 | .vchannels = 3, |
227 | .norm = VIDEO_MODE_PAL, | ||
228 | .tuner_type = TUNER_LG_PAL_NEW_TAPC, | 219 | .tuner_type = TUNER_LG_PAL_NEW_TAPC, |
229 | .tda9887_conf = TDA9887_PRESENT|TDA9887_PORT1_ACTIVE|TDA9887_PORT2_ACTIVE, | 220 | .tda9887_conf = TDA9887_PRESENT|TDA9887_PORT1_ACTIVE|TDA9887_PORT2_ACTIVE, |
230 | .has_tuner = 1, | 221 | .has_tuner = 1, |
@@ -247,7 +238,6 @@ struct em28xx_board em28xx_boards[] = { | |||
247 | .name = "Terratec Cinergy 200 USB", | 238 | .name = "Terratec Cinergy 200 USB", |
248 | .is_em2800 = 1, | 239 | .is_em2800 = 1, |
249 | .vchannels = 3, | 240 | .vchannels = 3, |
250 | .norm = VIDEO_MODE_PAL, | ||
251 | .tuner_type = TUNER_LG_PAL_NEW_TAPC, | 241 | .tuner_type = TUNER_LG_PAL_NEW_TAPC, |
252 | .tda9887_conf = TDA9887_PRESENT, | 242 | .tda9887_conf = TDA9887_PRESENT, |
253 | .has_tuner = 1, | 243 | .has_tuner = 1, |
@@ -270,7 +260,6 @@ struct em28xx_board em28xx_boards[] = { | |||
270 | .name = "Leadtek Winfast USB II", | 260 | .name = "Leadtek Winfast USB II", |
271 | .is_em2800 = 1, | 261 | .is_em2800 = 1, |
272 | .vchannels = 3, | 262 | .vchannels = 3, |
273 | .norm = VIDEO_MODE_PAL, | ||
274 | .tuner_type = TUNER_LG_PAL_NEW_TAPC, | 263 | .tuner_type = TUNER_LG_PAL_NEW_TAPC, |
275 | .tda9887_conf = TDA9887_PRESENT, | 264 | .tda9887_conf = TDA9887_PRESENT, |
276 | .has_tuner = 1, | 265 | .has_tuner = 1, |
@@ -293,7 +282,6 @@ struct em28xx_board em28xx_boards[] = { | |||
293 | .name = "Kworld USB2800", | 282 | .name = "Kworld USB2800", |
294 | .is_em2800 = 1, | 283 | .is_em2800 = 1, |
295 | .vchannels = 3, | 284 | .vchannels = 3, |
296 | .norm = VIDEO_MODE_PAL, | ||
297 | .tuner_type = TUNER_PHILIPS_ATSC, | 285 | .tuner_type = TUNER_PHILIPS_ATSC, |
298 | .tda9887_conf = TDA9887_PRESENT, | 286 | .tda9887_conf = TDA9887_PRESENT, |
299 | .has_tuner = 1, | 287 | .has_tuner = 1, |
@@ -315,7 +303,6 @@ struct em28xx_board em28xx_boards[] = { | |||
315 | [EM2820_BOARD_PINNACLE_DVC_90] = { | 303 | [EM2820_BOARD_PINNACLE_DVC_90] = { |
316 | .name = "Pinnacle Dazzle DVC 90", | 304 | .name = "Pinnacle Dazzle DVC 90", |
317 | .vchannels = 3, | 305 | .vchannels = 3, |
318 | .norm = VIDEO_MODE_PAL, | ||
319 | .has_tuner = 0, | 306 | .has_tuner = 0, |
320 | .decoder = EM28XX_SAA7113, | 307 | .decoder = EM28XX_SAA7113, |
321 | .input = {{ | 308 | .input = {{ |
@@ -332,7 +319,6 @@ struct em28xx_board em28xx_boards[] = { | |||
332 | .name = "V-Gear PocketTV", | 319 | .name = "V-Gear PocketTV", |
333 | .is_em2800 = 1, | 320 | .is_em2800 = 1, |
334 | .vchannels = 3, | 321 | .vchannels = 3, |
335 | .norm = VIDEO_MODE_PAL, | ||
336 | .tuner_type = TUNER_LG_PAL_NEW_TAPC, | 322 | .tuner_type = TUNER_LG_PAL_NEW_TAPC, |
337 | .tda9887_conf = TDA9887_PRESENT, | 323 | .tda9887_conf = TDA9887_PRESENT, |
338 | .has_tuner = 1, | 324 | .has_tuner = 1, |