aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx/em28xx-cards.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2005-11-09 00:38:27 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:27 -0500
commit3acf28095009509c9ca1e283de821b5be9ddede6 (patch)
tree824f31e6942ac09d977103f4a010e0a349b3afa2 /drivers/media/video/em28xx/em28xx-cards.c
parente0ec29b7e5aa1f4f1ff73ebd3003336dbe83e174 (diff)
[PATCH] v4l: 886: renamed common structures to em28xx
- Renamed common structures to em28xx Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-cards.c')
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c94
1 files changed, 47 insertions, 47 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index ecfc8a3374db..49107fd0c0d3 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -34,7 +34,7 @@
34 34
35#include "em28xx.h" 35#include "em28xx.h"
36 36
37struct em2820_board em2820_boards[] = { 37struct em28xx_board em28xx_boards[] = {
38 [EM2800_BOARD_UNKNOWN] = { 38 [EM2800_BOARD_UNKNOWN] = {
39 .name = "Unknown EM2800 video grabber", 39 .name = "Unknown EM2800 video grabber",
40 .is_em2800 = 1, 40 .is_em2800 = 1,
@@ -42,13 +42,13 @@ struct em2820_board em2820_boards[] = {
42 .norm = VIDEO_MODE_PAL, 42 .norm = VIDEO_MODE_PAL,
43 .tda9887_conf = TDA9887_PRESENT, 43 .tda9887_conf = TDA9887_PRESENT,
44 .has_tuner = 1, 44 .has_tuner = 1,
45 .decoder = EM2820_SAA7113, 45 .decoder = EM28XX_SAA7113,
46 .input = {{ 46 .input = {{
47 .type = EM2820_VMUX_COMPOSITE1, 47 .type = EM28XX_VMUX_COMPOSITE1,
48 .vmux = 0, 48 .vmux = 0,
49 .amux = 1, 49 .amux = 1,
50 },{ 50 },{
51 .type = EM2820_VMUX_SVIDEO, 51 .type = EM28XX_VMUX_SVIDEO,
52 .vmux = 9, 52 .vmux = 9,
53 .amux = 1, 53 .amux = 1,
54 }}, 54 }},
@@ -60,13 +60,13 @@ struct em2820_board em2820_boards[] = {
60 .norm = VIDEO_MODE_PAL, 60 .norm = VIDEO_MODE_PAL,
61 .tda9887_conf = TDA9887_PRESENT, 61 .tda9887_conf = TDA9887_PRESENT,
62 .has_tuner = 1, 62 .has_tuner = 1,
63 .decoder = EM2820_SAA7113, 63 .decoder = EM28XX_SAA7113,
64 .input = {{ 64 .input = {{
65 .type = EM2820_VMUX_COMPOSITE1, 65 .type = EM28XX_VMUX_COMPOSITE1,
66 .vmux = 0, 66 .vmux = 0,
67 .amux = 1, 67 .amux = 1,
68 },{ 68 },{
69 .type = EM2820_VMUX_SVIDEO, 69 .type = EM28XX_VMUX_SVIDEO,
70 .vmux = 9, 70 .vmux = 9,
71 .amux = 1, 71 .amux = 1,
72 }}, 72 }},
@@ -78,17 +78,17 @@ struct em2820_board em2820_boards[] = {
78 .tuner_type = TUNER_LG_PAL_NEW_TAPC, 78 .tuner_type = TUNER_LG_PAL_NEW_TAPC,
79 .tda9887_conf = TDA9887_PRESENT, 79 .tda9887_conf = TDA9887_PRESENT,
80 .has_tuner = 1, 80 .has_tuner = 1,
81 .decoder = EM2820_SAA7113, 81 .decoder = EM28XX_SAA7113,
82 .input = {{ 82 .input = {{
83 .type = EM2820_VMUX_TELEVISION, 83 .type = EM28XX_VMUX_TELEVISION,
84 .vmux = 2, 84 .vmux = 2,
85 .amux = 0, 85 .amux = 0,
86 },{ 86 },{
87 .type = EM2820_VMUX_COMPOSITE1, 87 .type = EM28XX_VMUX_COMPOSITE1,
88 .vmux = 0, 88 .vmux = 0,
89 .amux = 1, 89 .amux = 1,
90 },{ 90 },{
91 .type = EM2820_VMUX_SVIDEO, 91 .type = EM28XX_VMUX_SVIDEO,
92 .vmux = 9, 92 .vmux = 9,
93 .amux = 1, 93 .amux = 1,
94 }}, 94 }},
@@ -100,17 +100,17 @@ struct em2820_board em2820_boards[] = {
100 .tuner_type = TUNER_LG_PAL_NEW_TAPC, 100 .tuner_type = TUNER_LG_PAL_NEW_TAPC,
101 .tda9887_conf = TDA9887_PRESENT, 101 .tda9887_conf = TDA9887_PRESENT,
102 .has_tuner = 1, 102 .has_tuner = 1,
103 .decoder = EM2820_SAA7113, 103 .decoder = EM28XX_SAA7113,
104 .input = {{ 104 .input = {{
105 .type = EM2820_VMUX_TELEVISION, 105 .type = EM28XX_VMUX_TELEVISION,
106 .vmux = 2, 106 .vmux = 2,
107 .amux = 0, 107 .amux = 0,
108 },{ 108 },{
109 .type = EM2820_VMUX_COMPOSITE1, 109 .type = EM28XX_VMUX_COMPOSITE1,
110 .vmux = 0, 110 .vmux = 0,
111 .amux = 1, 111 .amux = 1,
112 },{ 112 },{
113 .type = EM2820_VMUX_SVIDEO, 113 .type = EM28XX_VMUX_SVIDEO,
114 .vmux = 9, 114 .vmux = 9,
115 .amux = 1, 115 .amux = 1,
116 }}, 116 }},
@@ -122,15 +122,15 @@ struct em2820_board em2820_boards[] = {
122 .tuner_type = TUNER_PHILIPS_FM1236_MK3, 122 .tuner_type = TUNER_PHILIPS_FM1236_MK3,
123 .tda9887_conf = TDA9887_PRESENT|TDA9887_PORT1_ACTIVE|TDA9887_PORT2_ACTIVE, 123 .tda9887_conf = TDA9887_PRESENT|TDA9887_PORT1_ACTIVE|TDA9887_PORT2_ACTIVE,
124 .has_tuner = 1, 124 .has_tuner = 1,
125 .decoder = EM2820_TVP5150, 125 .decoder = EM28XX_TVP5150,
126 .has_msp34xx = 1, 126 .has_msp34xx = 1,
127 /*FIXME: S-Video not tested */ 127 /*FIXME: S-Video not tested */
128 .input = {{ 128 .input = {{
129 .type = EM2820_VMUX_TELEVISION, 129 .type = EM28XX_VMUX_TELEVISION,
130 .vmux = 0, 130 .vmux = 0,
131 .amux = 0, 131 .amux = 0,
132 },{ 132 },{
133 .type = EM2820_VMUX_SVIDEO, 133 .type = EM28XX_VMUX_SVIDEO,
134 .vmux = 2, 134 .vmux = 2,
135 .amux = 1, 135 .amux = 1,
136 }}, 136 }},
@@ -142,17 +142,17 @@ struct em2820_board em2820_boards[] = {
142 .tuner_type = TUNER_LG_PAL_NEW_TAPC, 142 .tuner_type = TUNER_LG_PAL_NEW_TAPC,
143 .tda9887_conf = TDA9887_PRESENT|TDA9887_PORT1_ACTIVE|TDA9887_PORT2_ACTIVE, 143 .tda9887_conf = TDA9887_PRESENT|TDA9887_PORT1_ACTIVE|TDA9887_PORT2_ACTIVE,
144 .has_tuner = 1, 144 .has_tuner = 1,
145 .decoder = EM2820_SAA7114, 145 .decoder = EM28XX_SAA7114,
146 .input = {{ 146 .input = {{
147 .type = EM2820_VMUX_TELEVISION, 147 .type = EM28XX_VMUX_TELEVISION,
148 .vmux = 4, 148 .vmux = 4,
149 .amux = 0, 149 .amux = 0,
150 },{ 150 },{
151 .type = EM2820_VMUX_COMPOSITE1, 151 .type = EM28XX_VMUX_COMPOSITE1,
152 .vmux = 0, 152 .vmux = 0,
153 .amux = 1, 153 .amux = 1,
154 },{ 154 },{
155 .type = EM2820_VMUX_SVIDEO, 155 .type = EM28XX_VMUX_SVIDEO,
156 .vmux = 9, 156 .vmux = 9,
157 .amux = 1, 157 .amux = 1,
158 }}, 158 }},
@@ -165,17 +165,17 @@ struct em2820_board em2820_boards[] = {
165 .tuner_type = TUNER_LG_PAL_NEW_TAPC, 165 .tuner_type = TUNER_LG_PAL_NEW_TAPC,
166 .tda9887_conf = TDA9887_PRESENT, 166 .tda9887_conf = TDA9887_PRESENT,
167 .has_tuner = 1, 167 .has_tuner = 1,
168 .decoder = EM2820_SAA7113, 168 .decoder = EM28XX_SAA7113,
169 .input = {{ 169 .input = {{
170 .type = EM2820_VMUX_TELEVISION, 170 .type = EM28XX_VMUX_TELEVISION,
171 .vmux = 2, 171 .vmux = 2,
172 .amux = 0, 172 .amux = 0,
173 },{ 173 },{
174 .type = EM2820_VMUX_COMPOSITE1, 174 .type = EM28XX_VMUX_COMPOSITE1,
175 .vmux = 0, 175 .vmux = 0,
176 .amux = 1, 176 .amux = 1,
177 },{ 177 },{
178 .type = EM2820_VMUX_SVIDEO, 178 .type = EM28XX_VMUX_SVIDEO,
179 .vmux = 9, 179 .vmux = 9,
180 .amux = 1, 180 .amux = 1,
181 }}, 181 }},
@@ -188,17 +188,17 @@ struct em2820_board em2820_boards[] = {
188 .tuner_type = TUNER_LG_PAL_NEW_TAPC, 188 .tuner_type = TUNER_LG_PAL_NEW_TAPC,
189 .tda9887_conf = TDA9887_PRESENT, 189 .tda9887_conf = TDA9887_PRESENT,
190 .has_tuner = 1, 190 .has_tuner = 1,
191 .decoder = EM2820_SAA7113, 191 .decoder = EM28XX_SAA7113,
192 .input = {{ 192 .input = {{
193 .type = EM2820_VMUX_TELEVISION, 193 .type = EM28XX_VMUX_TELEVISION,
194 .vmux = 2, 194 .vmux = 2,
195 .amux = 0, 195 .amux = 0,
196 },{ 196 },{
197 .type = EM2820_VMUX_COMPOSITE1, 197 .type = EM28XX_VMUX_COMPOSITE1,
198 .vmux = 0, 198 .vmux = 0,
199 .amux = 1, 199 .amux = 1,
200 },{ 200 },{
201 .type = EM2820_VMUX_SVIDEO, 201 .type = EM28XX_VMUX_SVIDEO,
202 .vmux = 9, 202 .vmux = 9,
203 .amux = 1, 203 .amux = 1,
204 }}, 204 }},
@@ -211,17 +211,17 @@ struct em2820_board em2820_boards[] = {
211 .tuner_type = TUNER_PHILIPS_ATSC, 211 .tuner_type = TUNER_PHILIPS_ATSC,
212 .tda9887_conf = TDA9887_PRESENT, 212 .tda9887_conf = TDA9887_PRESENT,
213 .has_tuner = 1, 213 .has_tuner = 1,
214 .decoder = EM2820_SAA7113, 214 .decoder = EM28XX_SAA7113,
215 .input = {{ 215 .input = {{
216 .type = EM2820_VMUX_TELEVISION, 216 .type = EM28XX_VMUX_TELEVISION,
217 .vmux = 2, 217 .vmux = 2,
218 .amux = 0, 218 .amux = 0,
219 },{ 219 },{
220 .type = EM2820_VMUX_COMPOSITE1, 220 .type = EM28XX_VMUX_COMPOSITE1,
221 .vmux = 0, 221 .vmux = 0,
222 .amux = 1, 222 .amux = 1,
223 },{ 223 },{
224 .type = EM2820_VMUX_SVIDEO, 224 .type = EM28XX_VMUX_SVIDEO,
225 .vmux = 9, 225 .vmux = 9,
226 .amux = 1, 226 .amux = 1,
227 }}, 227 }},
@@ -231,22 +231,22 @@ struct em2820_board em2820_boards[] = {
231 .vchannels = 3, 231 .vchannels = 3,
232 .norm = VIDEO_MODE_PAL, 232 .norm = VIDEO_MODE_PAL,
233 .has_tuner = 0, 233 .has_tuner = 0,
234 .decoder = EM2820_SAA7113, 234 .decoder = EM28XX_SAA7113,
235 .input = {{ 235 .input = {{
236 .type = EM2820_VMUX_COMPOSITE1, 236 .type = EM28XX_VMUX_COMPOSITE1,
237 .vmux = 0, 237 .vmux = 0,
238 .amux = 1, 238 .amux = 1,
239 },{ 239 },{
240 .type = EM2820_VMUX_SVIDEO, 240 .type = EM28XX_VMUX_SVIDEO,
241 .vmux = 9, 241 .vmux = 9,
242 .amux = 1, 242 .amux = 1,
243 }}, 243 }},
244 }, 244 },
245}; 245};
246const unsigned int em2820_bcount = ARRAY_SIZE(em2820_boards); 246const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards);
247 247
248/* table of devices that work with this driver */ 248/* table of devices that work with this driver */
249struct usb_device_id em2820_id_table [] = { 249struct usb_device_id em28xx_id_table [] = {
250 { USB_DEVICE(0xeb1a, 0x2800), .driver_info = EM2800_BOARD_UNKNOWN }, 250 { USB_DEVICE(0xeb1a, 0x2800), .driver_info = EM2800_BOARD_UNKNOWN },
251 { USB_DEVICE(0xeb1a, 0x2820), .driver_info = EM2820_BOARD_MSI_VOX_USB_2 }, 251 { USB_DEVICE(0xeb1a, 0x2820), .driver_info = EM2820_BOARD_MSI_VOX_USB_2 },
252 { USB_DEVICE(0x0ccd, 0x0036), .driver_info = EM2820_BOARD_TERRATEC_CINERGY_250 }, 252 { USB_DEVICE(0x0ccd, 0x0036), .driver_info = EM2820_BOARD_TERRATEC_CINERGY_250 },
@@ -256,7 +256,7 @@ struct usb_device_id em2820_id_table [] = {
256 { }, 256 { },
257}; 257};
258 258
259void em2820_card_setup(struct em2820 *dev) 259void em28xx_card_setup(struct em28xx *dev)
260{ 260{
261 /* request some modules */ 261 /* request some modules */
262 if (dev->model == EM2820_BOARD_HAUPPAUGE_WINTV_USB_2) { 262 if (dev->model == EM2820_BOARD_HAUPPAUGE_WINTV_USB_2) {
@@ -274,14 +274,14 @@ void em2820_card_setup(struct em2820 *dev)
274 if (tv.audio_processor == AUDIO_CHIP_MSP34XX) { 274 if (tv.audio_processor == AUDIO_CHIP_MSP34XX) {
275 dev->has_msp34xx=1; 275 dev->has_msp34xx=1;
276 } else dev->has_msp34xx=0; 276 } else dev->has_msp34xx=0;
277 em2820_write_regs_req(dev,0x06,0x00,"\x40",1);// Serial Bus Frequency Select Register 277 em28xx_write_regs_req(dev,0x06,0x00,"\x40",1);// Serial Bus Frequency Select Register
278 em2820_write_regs_req(dev,0x0f,0x00,"\x87",1);// XCLK Frequency Select Register 278 em28xx_write_regs_req(dev,0x0f,0x00,"\x87",1);// XCLK Frequency Select Register
279 em2820_write_regs_req(dev,0x88,0x0d,"\xd0",1); 279 em28xx_write_regs_req(dev,0x88,0x0d,"\xd0",1);
280 } 280 }
281} 281}
282 282
283EXPORT_SYMBOL(em2820_boards); 283EXPORT_SYMBOL(em28xx_boards);
284EXPORT_SYMBOL(em2820_bcount); 284EXPORT_SYMBOL(em28xx_bcount);
285EXPORT_SYMBOL(em2820_id_table); 285EXPORT_SYMBOL(em28xx_id_table);
286 286
287MODULE_DEVICE_TABLE (usb, em2820_id_table); 287MODULE_DEVICE_TABLE (usb, em28xx_id_table);
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-19 17:34:55 -0500