diff options
Diffstat (limited to 'Documentation/video4linux')
-rw-r--r-- | Documentation/video4linux/CARDLIST.cx23885 | 2 | ||||
-rw-r--r-- | Documentation/video4linux/CARDLIST.cx88 | 1 | ||||
-rw-r--r-- | Documentation/video4linux/CARDLIST.em28xx | 3 | ||||
-rw-r--r-- | Documentation/video4linux/CARDLIST.saa7134 | 2 | ||||
-rw-r--r-- | Documentation/video4linux/gspca.txt | 19 | ||||
-rw-r--r-- | Documentation/video4linux/si4713.txt | 2 | ||||
-rw-r--r-- | Documentation/video4linux/zr364xx.txt | 1 |
7 files changed, 20 insertions, 10 deletions
diff --git a/Documentation/video4linux/CARDLIST.cx23885 b/Documentation/video4linux/CARDLIST.cx23885 index 5f33d8486102..7539e8fa1ffd 100644 --- a/Documentation/video4linux/CARDLIST.cx23885 +++ b/Documentation/video4linux/CARDLIST.cx23885 | |||
@@ -24,3 +24,5 @@ | |||
24 | 23 -> Magic-Pro ProHDTV Extreme 2 [14f1:8657] | 24 | 23 -> Magic-Pro ProHDTV Extreme 2 [14f1:8657] |
25 | 24 -> Hauppauge WinTV-HVR1850 [0070:8541] | 25 | 24 -> Hauppauge WinTV-HVR1850 [0070:8541] |
26 | 25 -> Compro VideoMate E800 [1858:e800] | 26 | 25 -> Compro VideoMate E800 [1858:e800] |
27 | 26 -> Hauppauge WinTV-HVR1290 [0070:8551] | ||
28 | 27 -> Mygica X8558 PRO DMB-TH [14f1:8578] | ||
diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88 index 3385f8b094a5..7ec3c4e4b60f 100644 --- a/Documentation/video4linux/CARDLIST.cx88 +++ b/Documentation/video4linux/CARDLIST.cx88 | |||
@@ -81,3 +81,4 @@ | |||
81 | 80 -> Hauppauge WinTV-IR Only [0070:9290] | 81 | 80 -> Hauppauge WinTV-IR Only [0070:9290] |
82 | 81 -> Leadtek WinFast DTV1800 Hybrid [107d:6654] | 82 | 81 -> Leadtek WinFast DTV1800 Hybrid [107d:6654] |
83 | 82 -> WinFast DTV2000 H rev. J [107d:6f2b] | 83 | 82 -> WinFast DTV2000 H rev. J [107d:6f2b] |
84 | 83 -> Prof 7301 DVB-S/S2 [b034:3034] | ||
diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx index b8afef4c0e01..0c166ff003a0 100644 --- a/Documentation/video4linux/CARDLIST.em28xx +++ b/Documentation/video4linux/CARDLIST.em28xx | |||
@@ -1,5 +1,5 @@ | |||
1 | 0 -> Unknown EM2800 video grabber (em2800) [eb1a:2800] | 1 | 0 -> Unknown EM2800 video grabber (em2800) [eb1a:2800] |
2 | 1 -> Unknown EM2750/28xx video grabber (em2820/em2840) [eb1a:2710,eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883,eb1a:2868] | 2 | 1 -> Unknown EM2750/28xx video grabber (em2820/em2840) [eb1a:2710,eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2862,eb1a:2870,eb1a:2881,eb1a:2883,eb1a:2868] |
3 | 2 -> Terratec Cinergy 250 USB (em2820/em2840) [0ccd:0036] | 3 | 2 -> Terratec Cinergy 250 USB (em2820/em2840) [0ccd:0036] |
4 | 3 -> Pinnacle PCTV USB 2 (em2820/em2840) [2304:0208] | 4 | 3 -> Pinnacle PCTV USB 2 (em2820/em2840) [2304:0208] |
5 | 4 -> Hauppauge WinTV USB 2 (em2820/em2840) [2040:4200,2040:4201] | 5 | 4 -> Hauppauge WinTV USB 2 (em2820/em2840) [2040:4200,2040:4201] |
@@ -69,3 +69,4 @@ | |||
69 | 71 -> Silvercrest Webcam 1.3mpix (em2820/em2840) | 69 | 71 -> Silvercrest Webcam 1.3mpix (em2820/em2840) |
70 | 72 -> Gadmei UTV330+ (em2861) | 70 | 72 -> Gadmei UTV330+ (em2861) |
71 | 73 -> Reddo DVB-C USB TV Box (em2870) | 71 | 73 -> Reddo DVB-C USB TV Box (em2870) |
72 | 74 -> Actionmaster/LinXcel/Digitus VC211A (em2800) | ||
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134 index 2620d60341ee..fce1e7eb0474 100644 --- a/Documentation/video4linux/CARDLIST.saa7134 +++ b/Documentation/video4linux/CARDLIST.saa7134 | |||
@@ -172,3 +172,5 @@ | |||
172 | 171 -> Beholder BeholdTV X7 [5ace:7595] | 172 | 171 -> Beholder BeholdTV X7 [5ace:7595] |
173 | 172 -> RoverMedia TV Link Pro FM [19d1:0138] | 173 | 172 -> RoverMedia TV Link Pro FM [19d1:0138] |
174 | 173 -> Zolid Hybrid TV Tuner PCI [1131:2004] | 174 | 173 -> Zolid Hybrid TV Tuner PCI [1131:2004] |
175 | 174 -> Asus Europa Hybrid OEM [1043:4847] | ||
176 | 175 -> Leadtek Winfast DTV1000S [107d:6655] | ||
diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt index 6b29555b58b7..319d9838e87e 100644 --- a/Documentation/video4linux/gspca.txt +++ b/Documentation/video4linux/gspca.txt | |||
@@ -7,6 +7,7 @@ The modules are: | |||
7 | xxxx vend:prod | 7 | xxxx vend:prod |
8 | ---- | 8 | ---- |
9 | spca501 0000:0000 MystFromOri Unknown Camera | 9 | spca501 0000:0000 MystFromOri Unknown Camera |
10 | spca508 0130:0130 Clone Digital Webcam 11043 | ||
10 | m5602 0402:5602 ALi Video Camera Controller | 11 | m5602 0402:5602 ALi Video Camera Controller |
11 | spca501 040a:0002 Kodak DVC-325 | 12 | spca501 040a:0002 Kodak DVC-325 |
12 | spca500 040a:0300 Kodak EZ200 | 13 | spca500 040a:0300 Kodak EZ200 |
@@ -37,6 +38,7 @@ ov519 041e:405f Creative Live! VISTA VF0330 | |||
37 | ov519 041e:4060 Creative Live! VISTA VF0350 | 38 | ov519 041e:4060 Creative Live! VISTA VF0350 |
38 | ov519 041e:4061 Creative Live! VISTA VF0400 | 39 | ov519 041e:4061 Creative Live! VISTA VF0400 |
39 | ov519 041e:4064 Creative Live! VISTA VF0420 | 40 | ov519 041e:4064 Creative Live! VISTA VF0420 |
41 | ov519 041e:4067 Creative Live! Cam Video IM (VF0350) | ||
40 | ov519 041e:4068 Creative Live! VISTA VF0470 | 42 | ov519 041e:4068 Creative Live! VISTA VF0470 |
41 | spca561 0458:7004 Genius VideoCAM Express V2 | 43 | spca561 0458:7004 Genius VideoCAM Express V2 |
42 | sunplus 0458:7006 Genius Dsc 1.3 Smart | 44 | sunplus 0458:7006 Genius Dsc 1.3 Smart |
@@ -68,12 +70,12 @@ zc3xx 046d:08a3 Logitech QC Chat | |||
68 | zc3xx 046d:08a6 Logitech QCim | 70 | zc3xx 046d:08a6 Logitech QCim |
69 | zc3xx 046d:08a7 Logitech QuickCam Image | 71 | zc3xx 046d:08a7 Logitech QuickCam Image |
70 | zc3xx 046d:08a9 Logitech Notebook Deluxe | 72 | zc3xx 046d:08a9 Logitech Notebook Deluxe |
71 | zc3xx 046d:08aa Labtec Webcam Notebook | 73 | zc3xx 046d:08aa Labtec Webcam Notebook |
72 | zc3xx 046d:08ac Logitech QuickCam Cool | 74 | zc3xx 046d:08ac Logitech QuickCam Cool |
73 | zc3xx 046d:08ad Logitech QCCommunicate STX | 75 | zc3xx 046d:08ad Logitech QCCommunicate STX |
74 | zc3xx 046d:08ae Logitech QuickCam for Notebooks | 76 | zc3xx 046d:08ae Logitech QuickCam for Notebooks |
75 | zc3xx 046d:08af Logitech QuickCam Cool | 77 | zc3xx 046d:08af Logitech QuickCam Cool |
76 | zc3xx 046d:08b9 Logitech QC IM ??? | 78 | zc3xx 046d:08b9 Logitech QuickCam Express |
77 | zc3xx 046d:08d7 Logitech QCam STX | 79 | zc3xx 046d:08d7 Logitech QCam STX |
78 | zc3xx 046d:08d9 Logitech QuickCam IM/Connect | 80 | zc3xx 046d:08d9 Logitech QuickCam IM/Connect |
79 | zc3xx 046d:08d8 Logitech Notebook Deluxe | 81 | zc3xx 046d:08d8 Logitech Notebook Deluxe |
@@ -82,7 +84,7 @@ zc3xx 046d:08dd Logitech QuickCam for Notebooks | |||
82 | spca500 046d:0900 Logitech Inc. ClickSmart 310 | 84 | spca500 046d:0900 Logitech Inc. ClickSmart 310 |
83 | spca500 046d:0901 Logitech Inc. ClickSmart 510 | 85 | spca500 046d:0901 Logitech Inc. ClickSmart 510 |
84 | sunplus 046d:0905 Logitech ClickSmart 820 | 86 | sunplus 046d:0905 Logitech ClickSmart 820 |
85 | tv8532 046d:0920 QC Express | 87 | tv8532 046d:0920 Logitech QuickCam Express |
86 | tv8532 046d:0921 Labtec Webcam | 88 | tv8532 046d:0921 Labtec Webcam |
87 | spca561 046d:0928 Logitech QC Express Etch2 | 89 | spca561 046d:0928 Logitech QC Express Etch2 |
88 | spca561 046d:0929 Labtec Webcam Elch2 | 90 | spca561 046d:0929 Labtec Webcam Elch2 |
@@ -91,7 +93,7 @@ spca561 046d:092b Labtec Webcam Plus | |||
91 | spca561 046d:092c Logitech QC chat Elch2 | 93 | spca561 046d:092c Logitech QC chat Elch2 |
92 | spca561 046d:092d Logitech QC Elch2 | 94 | spca561 046d:092d Logitech QC Elch2 |
93 | spca561 046d:092e Logitech QC Elch2 | 95 | spca561 046d:092e Logitech QC Elch2 |
94 | spca561 046d:092f Logitech QuickCam Express Plus | 96 | spca561 046d:092f Logitech QuickCam Express Plus |
95 | sunplus 046d:0960 Logitech ClickSmart 420 | 97 | sunplus 046d:0960 Logitech ClickSmart 420 |
96 | sunplus 0471:0322 Philips DMVC1300K | 98 | sunplus 0471:0322 Philips DMVC1300K |
97 | zc3xx 0471:0325 Philips SPC 200 NC | 99 | zc3xx 0471:0325 Philips SPC 200 NC |
@@ -187,7 +189,6 @@ sonixj 06f8:3004 Hercules Classic Silver | |||
187 | sonixj 06f8:3008 Hercules Deluxe Optical Glass | 189 | sonixj 06f8:3008 Hercules Deluxe Optical Glass |
188 | pac7311 06f8:3009 Hercules Classic Link | 190 | pac7311 06f8:3009 Hercules Classic Link |
189 | spca508 0733:0110 ViewQuest VQ110 | 191 | spca508 0733:0110 ViewQuest VQ110 |
190 | spca508 0130:0130 Clone Digital Webcam 11043 | ||
191 | spca501 0733:0401 Intel Create and Share | 192 | spca501 0733:0401 Intel Create and Share |
192 | spca501 0733:0402 ViewQuest M318B | 193 | spca501 0733:0402 ViewQuest M318B |
193 | spca505 0733:0430 Intel PC Camera Pro | 194 | spca505 0733:0430 Intel PC Camera Pro |
@@ -202,6 +203,7 @@ spca500 084d:0003 D-Link DSC-350 | |||
202 | spca500 08ca:0103 Aiptek PocketDV | 203 | spca500 08ca:0103 Aiptek PocketDV |
203 | sunplus 08ca:0104 Aiptek PocketDVII 1.3 | 204 | sunplus 08ca:0104 Aiptek PocketDVII 1.3 |
204 | sunplus 08ca:0106 Aiptek Pocket DV3100+ | 205 | sunplus 08ca:0106 Aiptek Pocket DV3100+ |
206 | mr97310a 08ca:0110 Trust Spyc@m 100 | ||
205 | mr97310a 08ca:0111 Aiptek PenCam VGA+ | 207 | mr97310a 08ca:0111 Aiptek PenCam VGA+ |
206 | sunplus 08ca:2008 Aiptek Mini PenCam 2 M | 208 | sunplus 08ca:2008 Aiptek Mini PenCam 2 M |
207 | sunplus 08ca:2010 Aiptek PocketCam 3M | 209 | sunplus 08ca:2010 Aiptek PocketCam 3M |
@@ -222,7 +224,7 @@ pac207 093a:2460 Qtec Webcam 100 | |||
222 | pac207 093a:2461 HP Webcam | 224 | pac207 093a:2461 HP Webcam |
223 | pac207 093a:2463 Philips SPC 220 NC | 225 | pac207 093a:2463 Philips SPC 220 NC |
224 | pac207 093a:2464 Labtec Webcam 1200 | 226 | pac207 093a:2464 Labtec Webcam 1200 |
225 | pac207 093a:2468 PAC207 | 227 | pac207 093a:2468 Webcam WB-1400T |
226 | pac207 093a:2470 Genius GF112 | 228 | pac207 093a:2470 Genius GF112 |
227 | pac207 093a:2471 Genius VideoCam ge111 | 229 | pac207 093a:2471 Genius VideoCam ge111 |
228 | pac207 093a:2472 Genius VideoCam ge110 | 230 | pac207 093a:2472 Genius VideoCam ge110 |
@@ -230,7 +232,7 @@ pac207 093a:2474 Genius iLook 111 | |||
230 | pac207 093a:2476 Genius e-Messenger 112 | 232 | pac207 093a:2476 Genius e-Messenger 112 |
231 | pac7311 093a:2600 PAC7311 Typhoon | 233 | pac7311 093a:2600 PAC7311 Typhoon |
232 | pac7311 093a:2601 Philips SPC 610 NC | 234 | pac7311 093a:2601 Philips SPC 610 NC |
233 | pac7311 093a:2603 PAC7312 | 235 | pac7311 093a:2603 Philips SPC 500 NC |
234 | pac7311 093a:2608 Trust WB-3300p | 236 | pac7311 093a:2608 Trust WB-3300p |
235 | pac7311 093a:260e Gigaware VGA PC Camera, Trust WB-3350p, SIGMA cam 2350 | 237 | pac7311 093a:260e Gigaware VGA PC Camera, Trust WB-3350p, SIGMA cam 2350 |
236 | pac7311 093a:260f SnakeCam | 238 | pac7311 093a:260f SnakeCam |
@@ -239,6 +241,7 @@ pac7311 093a:2621 PAC731x | |||
239 | pac7311 093a:2622 Genius Eye 312 | 241 | pac7311 093a:2622 Genius Eye 312 |
240 | pac7311 093a:2624 PAC7302 | 242 | pac7311 093a:2624 PAC7302 |
241 | pac7311 093a:2626 Labtec 2200 | 243 | pac7311 093a:2626 Labtec 2200 |
244 | pac7311 093a:2628 Genius iLook 300 | ||
242 | pac7311 093a:2629 Genious iSlim 300 | 245 | pac7311 093a:2629 Genious iSlim 300 |
243 | pac7311 093a:262a Webcam 300k | 246 | pac7311 093a:262a Webcam 300k |
244 | pac7311 093a:262c Philips SPC 230 NC | 247 | pac7311 093a:262c Philips SPC 230 NC |
@@ -250,7 +253,7 @@ vc032x 0ac8:0328 A4Tech PK-130MG | |||
250 | zc3xx 0ac8:301b Z-Star zc301b | 253 | zc3xx 0ac8:301b Z-Star zc301b |
251 | zc3xx 0ac8:303b Vimicro 0x303b | 254 | zc3xx 0ac8:303b Vimicro 0x303b |
252 | zc3xx 0ac8:305b Z-star Vimicro zc0305b | 255 | zc3xx 0ac8:305b Z-star Vimicro zc0305b |
253 | zc3xx 0ac8:307b Ldlc VC302+Ov7620 | 256 | zc3xx 0ac8:307b PC Camera (ZS0211) |
254 | vc032x 0ac8:c001 Sony embedded vimicro | 257 | vc032x 0ac8:c001 Sony embedded vimicro |
255 | vc032x 0ac8:c002 Sony embedded vimicro | 258 | vc032x 0ac8:c002 Sony embedded vimicro |
256 | vc032x 0ac8:c301 Samsung Q1 Ultra Premium | 259 | vc032x 0ac8:c301 Samsung Q1 Ultra Premium |
diff --git a/Documentation/video4linux/si4713.txt b/Documentation/video4linux/si4713.txt index 25abdb78209d..2e7392a4fee1 100644 --- a/Documentation/video4linux/si4713.txt +++ b/Documentation/video4linux/si4713.txt | |||
@@ -164,7 +164,7 @@ Stereo/Mono and RDS subchannels | |||
164 | 164 | ||
165 | The device can also be configured using the available sub channels for | 165 | The device can also be configured using the available sub channels for |
166 | transmission. To do that use S/G_MODULATOR ioctl and configure txsubchans properly. | 166 | transmission. To do that use S/G_MODULATOR ioctl and configure txsubchans properly. |
167 | Refer to v4l2-spec for proper use of this ioctl. | 167 | Refer to the V4L2 API specification for proper use of this ioctl. |
168 | 168 | ||
169 | Testing | 169 | Testing |
170 | ======= | 170 | ======= |
diff --git a/Documentation/video4linux/zr364xx.txt b/Documentation/video4linux/zr364xx.txt index 7f3d1955d214..d98e4d302977 100644 --- a/Documentation/video4linux/zr364xx.txt +++ b/Documentation/video4linux/zr364xx.txt | |||
@@ -66,3 +66,4 @@ Vendor Product Distributor Model | |||
66 | 0x0a17 0x004e Pentax Optio 50 | 66 | 0x0a17 0x004e Pentax Optio 50 |
67 | 0x041e 0x405d Creative DiVi CAM 516 | 67 | 0x041e 0x405d Creative DiVi CAM 516 |
68 | 0x08ca 0x2102 Aiptek DV T300 | 68 | 0x08ca 0x2102 Aiptek DV T300 |
69 | 0x06d6 0x003d Trust Powerc@m 910Z | ||