diff options
author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
---|---|---|
committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /Documentation | |
parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'Documentation')
28 files changed, 1043 insertions, 330 deletions
diff --git a/Documentation/connector/cn_test.c b/Documentation/connector/cn_test.c index b7de82e9c0e0..3e73231695b3 100644 --- a/Documentation/connector/cn_test.c +++ b/Documentation/connector/cn_test.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <linux/skbuff.h> | 25 | #include <linux/skbuff.h> |
26 | #include <linux/timer.h> | 26 | #include <linux/timer.h> |
27 | 27 | ||
28 | #include "connector.h" | 28 | #include <linux/connector.h> |
29 | 29 | ||
30 | static struct cb_id cn_test_id = { 0x123, 0x456 }; | 30 | static struct cb_id cn_test_id = { 0x123, 0x456 }; |
31 | static char cn_test_name[] = "cn_test"; | 31 | static char cn_test_name[] = "cn_test"; |
@@ -104,7 +104,7 @@ static int cn_test_want_notify(void) | |||
104 | req->first = cn_test_id.val + 20; | 104 | req->first = cn_test_id.val + 20; |
105 | req->range = 10; | 105 | req->range = 10; |
106 | 106 | ||
107 | NETLINK_CB(skb).dst_groups = ctl->group; | 107 | NETLINK_CB(skb).dst_group = ctl->group; |
108 | //netlink_broadcast(nls, skb, 0, ctl->group, GFP_ATOMIC); | 108 | //netlink_broadcast(nls, skb, 0, ctl->group, GFP_ATOMIC); |
109 | netlink_unicast(nls, skb, 0, 0); | 109 | netlink_unicast(nls, skb, 0, 0); |
110 | 110 | ||
diff --git a/Documentation/dvb/bt8xx.txt b/Documentation/dvb/bt8xx.txt index cb63b7a93c82..df6c05453cb5 100644 --- a/Documentation/dvb/bt8xx.txt +++ b/Documentation/dvb/bt8xx.txt | |||
@@ -1,5 +1,5 @@ | |||
1 | How to get the Nebula, PCTV and Twinhan DST cards working | 1 | How to get the Nebula, PCTV, FusionHDTV Lite and Twinhan DST cards working |
2 | ========================================================= | 2 | ========================================================================== |
3 | 3 | ||
4 | This class of cards has a bt878a as the PCI interface, and | 4 | This class of cards has a bt878a as the PCI interface, and |
5 | require the bttv driver. | 5 | require the bttv driver. |
@@ -26,27 +26,31 @@ Furthermore you need to enable | |||
26 | 26 | ||
27 | In general you need to load the bttv driver, which will handle the gpio and | 27 | In general you need to load the bttv driver, which will handle the gpio and |
28 | i2c communication for us, plus the common dvb-bt8xx device driver. | 28 | i2c communication for us, plus the common dvb-bt8xx device driver. |
29 | The frontends for Nebula (nxt6000), Pinnacle PCTV (cx24110) and | 29 | The frontends for Nebula (nxt6000), Pinnacle PCTV (cx24110), TwinHan (dst), |
30 | TwinHan (dst) are loaded automatically by the dvb-bt8xx device driver. | 30 | FusionHDTV DVB-T Lite (mt352) and FusionHDTV5 Lite (lgdt330x) are loaded |
31 | automatically by the dvb-bt8xx device driver. | ||
31 | 32 | ||
32 | 3a) Nebula / Pinnacle PCTV | 33 | 3a) Nebula / Pinnacle PCTV / FusionHDTV Lite |
33 | -------------------------- | 34 | --------------------------------------------- |
34 | 35 | ||
35 | $ modprobe bttv (normally bttv is being loaded automatically by kmod) | 36 | $ modprobe bttv (normally bttv is being loaded automatically by kmod) |
36 | $ modprobe dvb-bt8xx (or just place dvb-bt8xx in /etc/modules for automatic loading) | 37 | $ modprobe dvb-bt8xx |
38 | |||
39 | (or just place dvb-bt8xx in /etc/modules for automatic loading) | ||
37 | 40 | ||
38 | 41 | ||
39 | 3b) TwinHan and Clones | 42 | 3b) TwinHan and Clones |
40 | -------------------------- | 43 | -------------------------- |
41 | 44 | ||
42 | $ modprobe bttv i2c_hw=1 card=0x71 | 45 | $ modprobe bttv card=0x71 |
43 | $ modprobe dvb-bt8xx | 46 | $ modprobe dvb-bt8xx |
44 | $ modprobe dst | 47 | $ modprobe dst |
45 | 48 | ||
46 | The value 0x71 will override the PCI type detection for dvb-bt8xx, | 49 | The value 0x71 will override the PCI type detection for dvb-bt8xx, |
47 | which is necessary for TwinHan cards. | 50 | which is necessary for TwinHan cards. Omission of this parameter might result |
51 | in a system lockup. | ||
48 | 52 | ||
49 | If you're having an older card (blue color circuit) and card=0x71 locks | 53 | If you're having an older card (blue color PCB) and card=0x71 locks up |
50 | your machine, try using 0x68, too. If that does not work, ask on the | 54 | your machine, try using 0x68, too. If that does not work, ask on the |
51 | mailing list. | 55 | mailing list. |
52 | 56 | ||
@@ -64,11 +68,47 @@ verbose=0 means complete disabling of messages | |||
64 | dst_addons takes values 0 and 0x20. A value of 0 means it is a FTA card. | 68 | dst_addons takes values 0 and 0x20. A value of 0 means it is a FTA card. |
65 | 0x20 means it has a Conditional Access slot. | 69 | 0x20 means it has a Conditional Access slot. |
66 | 70 | ||
67 | The autodected values are determined bythe cards 'response | 71 | The autodetected values are determined by the cards 'response string' |
68 | string' which you can see in your logs e.g. | 72 | which you can see in your logs e.g. |
69 | 73 | ||
70 | dst_get_device_id: Recognise [DSTMCI] | 74 | dst_get_device_id: Recognise [DSTMCI] |
71 | 75 | ||
76 | If you need to sent in bug reports on the dst, please do send in a complete | ||
77 | log with the verbose=4 module parameter. For general usage, the default setting | ||
78 | of verbose=1 is ideal. | ||
79 | |||
80 | |||
81 | 4) Multiple cards | ||
82 | -------------------------- | ||
83 | |||
84 | If you happen to be running multiple cards, it would be advisable to load | ||
85 | the bttv module with the card id. This would help to solve any module loading | ||
86 | problems that you might face. | ||
87 | |||
88 | For example, if you have a Twinhan and Clones card along with a FusionHDTV5 Lite | ||
89 | |||
90 | $ modprobe bttv card=0x71 card=0x87 | ||
91 | |||
92 | Here the order of the card id is important and should be the same as that of the | ||
93 | physical order of the cards. Here card=0x71 represents the Twinhan and clones | ||
94 | and card=0x87 represents Fusion HDTV5 Lite. These arguments can also be | ||
95 | specified in decimal, rather than hex: | ||
96 | |||
97 | $ modprobe bttv card=113 card=135 | ||
98 | |||
99 | Some examples of card-id's | ||
100 | |||
101 | Pinnacle Sat 0x5e (94) | ||
102 | Nebula Digi TV 0x68 (104) | ||
103 | PC HDTV 0x70 (112) | ||
104 | Twinhan 0x71 (113) | ||
105 | FusionHDTV DVB-T Lite 0x80 (128) | ||
106 | FusionHDTV5 Lite 0x87 (135) | ||
107 | |||
108 | For a full list of card-id's, see the V4L Documentation within the kernel | ||
109 | source: linux/Documentation/video4linux/CARDLIST.bttv | ||
110 | |||
111 | If you have problems with this please do ask on the mailing list. | ||
72 | 112 | ||
73 | -- | 113 | -- |
74 | Authors: Richard Walker, Jamie Honan, Michael Hunold, Manu Abraham | 114 | Authors: Richard Walker, Jamie Honan, Michael Hunold, Manu Abraham |
diff --git a/Documentation/dvb/cards.txt b/Documentation/dvb/cards.txt index efdc4ee9d40c..19329cf7b097 100644 --- a/Documentation/dvb/cards.txt +++ b/Documentation/dvb/cards.txt | |||
@@ -41,6 +41,12 @@ o Frontends drivers: | |||
41 | - dib3000mb : DiBcom 3000-MB demodulator | 41 | - dib3000mb : DiBcom 3000-MB demodulator |
42 | DVB-S/C/T: | 42 | DVB-S/C/T: |
43 | - dst : TwinHan DST Frontend | 43 | - dst : TwinHan DST Frontend |
44 | ATSC: | ||
45 | - nxt200x : Nxtwave NXT2002 & NXT2004 | ||
46 | - or51211 : or51211 based (pcHDTV HD2000 card) | ||
47 | - or51132 : or51132 based (pcHDTV HD3000 card) | ||
48 | - bcm3510 : Broadcom BCM3510 | ||
49 | - lgdt330x : LG Electronics DT3302 & DT3303 | ||
44 | 50 | ||
45 | 51 | ||
46 | o Cards based on the Phillips saa7146 multimedia PCI bridge chip: | 52 | o Cards based on the Phillips saa7146 multimedia PCI bridge chip: |
@@ -62,6 +68,10 @@ o Cards based on the Conexant Bt8xx PCI bridge: | |||
62 | - Nebula Electronics DigiTV | 68 | - Nebula Electronics DigiTV |
63 | - TwinHan DST | 69 | - TwinHan DST |
64 | - Avermedia DVB-T | 70 | - Avermedia DVB-T |
71 | - ChainTech digitop DST-1000 DVB-S | ||
72 | - pcHDTV HD-2000 TV | ||
73 | - DViCO FusionHDTV DVB-T Lite | ||
74 | - DViCO FusionHDTV5 Lite | ||
65 | 75 | ||
66 | o Technotrend / Hauppauge DVB USB devices: | 76 | o Technotrend / Hauppauge DVB USB devices: |
67 | - Nova USB | 77 | - Nova USB |
@@ -83,3 +93,30 @@ o DiBcom DVB-T USB based devices: | |||
83 | - DiBcom USB2.0 DVB-T reference device (non-public) | 93 | - DiBcom USB2.0 DVB-T reference device (non-public) |
84 | 94 | ||
85 | o Experimental support for the analog module of the Siemens DVB-C PCI card | 95 | o Experimental support for the analog module of the Siemens DVB-C PCI card |
96 | |||
97 | o Cards based on the Conexant cx2388x PCI bridge: | ||
98 | - ADS Tech Instant TV DVB-T PCI | ||
99 | - ATI HDTV Wonder | ||
100 | - digitalnow DNTV Live! DVB-T | ||
101 | - DViCO FusionHDTV DVB-T1 | ||
102 | - DViCO FusionHDTV DVB-T Plus | ||
103 | - DViCO FusionHDTV3 Gold-Q | ||
104 | - DViCO FusionHDTV3 Gold-T | ||
105 | - DViCO FusionHDTV5 Gold | ||
106 | - Hauppauge Nova-T DVB-T | ||
107 | - KWorld/VStream XPert DVB-T | ||
108 | - pcHDTV HD3000 HDTV | ||
109 | - TerraTec Cinergy 1400 DVB-T | ||
110 | - WinFast DTV1000-T | ||
111 | |||
112 | o Cards based on the Phillips saa7134 PCI bridge: | ||
113 | - Medion 7134 | ||
114 | - Pinnacle PCTV 300i DVB-T + PAL | ||
115 | - LifeView FlyDVB-T DUO | ||
116 | - Typhoon DVB-T Duo Digital/Analog Cardbus | ||
117 | - Philips TOUGH DVB-T reference design | ||
118 | - Philips EUROPA V3 reference design | ||
119 | - Compro Videomate DVB-T300 | ||
120 | - Compro Videomate DVB-T200 | ||
121 | - AVerMedia AVerTVHD MCE A180 | ||
122 | |||
diff --git a/Documentation/dvb/contributors.txt b/Documentation/dvb/contributors.txt index c9d5ce370701..2cbd2d0f6fdf 100644 --- a/Documentation/dvb/contributors.txt +++ b/Documentation/dvb/contributors.txt | |||
@@ -75,5 +75,22 @@ Ernst Peinlich <e.peinlich@inode.at> | |||
75 | Peter Beutner <p.beutner@gmx.net> | 75 | Peter Beutner <p.beutner@gmx.net> |
76 | for the IR code for the ttusb-dec driver | 76 | for the IR code for the ttusb-dec driver |
77 | 77 | ||
78 | Wilson Michaels <wilsonmichaels@earthlink.net> | ||
79 | for the lgdt330x frontend driver, and various bugfixes | ||
80 | |||
81 | Michael Krufky <mkrufky@m1k.net> | ||
82 | for maintaining v4l/dvb inter-tree dependencies | ||
83 | |||
84 | Taylor Jacob <rtjacob@earthlink.net> | ||
85 | for the nxt2002 frontend driver | ||
86 | |||
87 | Jean-Francois Thibert <jeanfrancois@sagetv.com> | ||
88 | for the nxt2004 frontend driver | ||
89 | |||
90 | Kirk Lapray <kirk.lapray@gmail.com> | ||
91 | for the or51211 and or51132 frontend drivers, and | ||
92 | for merging the nxt2002 and nxt2004 modules into a | ||
93 | single nxt200x frontend driver. | ||
94 | |||
78 | (If you think you should be in this list, but you are not, drop a | 95 | (If you think you should be in this list, but you are not, drop a |
79 | line to the DVB mailing list) | 96 | line to the DVB mailing list) |
diff --git a/Documentation/dvb/get_dvb_firmware b/Documentation/dvb/get_dvb_firmware index a750f0101d9d..be6eb4c75991 100644 --- a/Documentation/dvb/get_dvb_firmware +++ b/Documentation/dvb/get_dvb_firmware | |||
@@ -22,7 +22,7 @@ use File::Temp qw/ tempdir /; | |||
22 | use IO::Handle; | 22 | use IO::Handle; |
23 | 23 | ||
24 | @components = ( "sp8870", "sp887x", "tda10045", "tda10046", "av7110", "dec2000t", | 24 | @components = ( "sp8870", "sp887x", "tda10045", "tda10046", "av7110", "dec2000t", |
25 | "dec2540t", "dec3000s", "vp7041", "dibusb", "nxt2002", | 25 | "dec2540t", "dec3000s", "vp7041", "dibusb", "nxt2002", "nxt2004", |
26 | "or51211", "or51132_qam", "or51132_vsb"); | 26 | "or51211", "or51132_qam", "or51132_vsb"); |
27 | 27 | ||
28 | # Check args | 28 | # Check args |
@@ -252,6 +252,23 @@ sub nxt2002 { | |||
252 | $outfile; | 252 | $outfile; |
253 | } | 253 | } |
254 | 254 | ||
255 | sub nxt2004 { | ||
256 | my $sourcefile = "AVerTVHD_MCE_A180_Drv_v1.2.2.16.zip"; | ||
257 | my $url = "http://www.aver.com/support/Drivers/$sourcefile"; | ||
258 | my $hash = "111cb885b1e009188346d72acfed024c"; | ||
259 | my $outfile = "dvb-fe-nxt2004.fw"; | ||
260 | my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1); | ||
261 | |||
262 | checkstandard(); | ||
263 | |||
264 | wgetfile($sourcefile, $url); | ||
265 | unzip($sourcefile, $tmpdir); | ||
266 | verify("$tmpdir/3xHybrid.sys", $hash); | ||
267 | extract("$tmpdir/3xHybrid.sys", 465304, 9584, $outfile); | ||
268 | |||
269 | $outfile; | ||
270 | } | ||
271 | |||
255 | sub or51211 { | 272 | sub or51211 { |
256 | my $fwfile = "dvb-fe-or51211.fw"; | 273 | my $fwfile = "dvb-fe-or51211.fw"; |
257 | my $url = "http://linuxtv.org/downloads/firmware/$fwfile"; | 274 | my $url = "http://linuxtv.org/downloads/firmware/$fwfile"; |
diff --git a/Documentation/fb/fbcon.txt b/Documentation/fb/fbcon.txt new file mode 100644 index 000000000000..08dce0f631bf --- /dev/null +++ b/Documentation/fb/fbcon.txt | |||
@@ -0,0 +1,152 @@ | |||
1 | The Framebuffer Console | ||
2 | ======================= | ||
3 | |||
4 | The framebuffer console (fbcon), as its name implies, is a text | ||
5 | console running on top of the framebuffer device. It has the functionality of | ||
6 | any standard text console driver, such as the VGA console, with the added | ||
7 | features that can be attributed to the graphical nature of the framebuffer. | ||
8 | |||
9 | In the x86 architecture, the framebuffer console is optional, and | ||
10 | some even treat it as a toy. For other architectures, it is the only available | ||
11 | display device, text or graphical. | ||
12 | |||
13 | What are the features of fbcon? The framebuffer console supports | ||
14 | high resolutions, varying font types, display rotation, primitive multihead, | ||
15 | etc. Theoretically, multi-colored fonts, blending, aliasing, and any feature | ||
16 | made available by the underlying graphics card are also possible. | ||
17 | |||
18 | A. Configuration | ||
19 | |||
20 | The framebuffer console can be enabled by using your favorite kernel | ||
21 | configuration tool. It is under Device Drivers->Graphics Support->Support for | ||
22 | framebuffer devices->Framebuffer Console Support. Select 'y' to compile | ||
23 | support statically, or 'm' for module support. The module will be fbcon. | ||
24 | |||
25 | In order for fbcon to activate, at least one framebuffer driver is | ||
26 | required, so choose from any of the numerous drivers available. For x86 | ||
27 | systems, they almost universally have VGA cards, so vga16fb and vesafb will | ||
28 | always be available. However, using a chipset-specific driver will give you | ||
29 | more speed and features, such as the ability to change the video mode | ||
30 | dynamically. | ||
31 | |||
32 | To display the penguin logo, choose any logo available in Logo | ||
33 | Configuration->Boot up logo. | ||
34 | |||
35 | Also, you will need to select at least one compiled-in fonts, but if | ||
36 | you don't do anything, the kernel configuration tool will select one for you, | ||
37 | usually an 8x16 font. | ||
38 | |||
39 | GOTCHA: A common bug report is enabling the framebuffer without enabling the | ||
40 | framebuffer console. Depending on the driver, you may get a blanked or | ||
41 | garbled display, but the system still boots to completion. If you are | ||
42 | fortunate to have a driver that does not alter the graphics chip, then you | ||
43 | will still get a VGA console. | ||
44 | |||
45 | B. Loading | ||
46 | |||
47 | Possible scenarios: | ||
48 | |||
49 | 1. Driver and fbcon are compiled statically | ||
50 | |||
51 | Usually, fbcon will automatically take over your console. The notable | ||
52 | exception is vesafb. It needs to be explicitly activated with the | ||
53 | vga= boot option parameter. | ||
54 | |||
55 | 2. Driver is compiled statically, fbcon is compiled as a module | ||
56 | |||
57 | Depending on the driver, you either get a standard console, or a | ||
58 | garbled display, as mentioned above. To get a framebuffer console, | ||
59 | do a 'modprobe fbcon'. | ||
60 | |||
61 | 3. Driver is compiled as a module, fbcon is compiled statically | ||
62 | |||
63 | You get your standard console. Once the driver is loaded with | ||
64 | 'modprobe xxxfb', fbcon automatically takes over the console with | ||
65 | the possible exception of using the fbcon=map:n option. See below. | ||
66 | |||
67 | 4. Driver and fbcon are compiled as a module. | ||
68 | |||
69 | You can load them in any order. Once both are loaded, fbcon will take | ||
70 | over the console. | ||
71 | |||
72 | C. Boot options | ||
73 | |||
74 | The framebuffer console has several, largely unknown, boot options | ||
75 | that can change its behavior. | ||
76 | |||
77 | 1. fbcon=font:<name> | ||
78 | |||
79 | Select the initial font to use. The value 'name' can be any of the | ||
80 | compiled-in fonts: VGA8x16, 7x14, 10x18, VGA8x8, MINI4x6, RomanLarge, | ||
81 | SUN8x16, SUN12x22, ProFont6x11, Acorn8x8, PEARL8x8. | ||
82 | |||
83 | Note, not all drivers can handle font with widths not divisible by 8, | ||
84 | such as vga16fb. | ||
85 | |||
86 | 2. fbcon=scrollback:<value>[k] | ||
87 | |||
88 | The scrollback buffer is memory that is used to preserve display | ||
89 | contents that has already scrolled past your view. This is accessed | ||
90 | by using the Shift-PageUp key combination. The value 'value' is any | ||
91 | integer. It defaults to 32KB. The 'k' suffix is optional, and will | ||
92 | multiply the 'value' by 1024. | ||
93 | |||
94 | 3. fbcon=map:<0123> | ||
95 | |||
96 | This is an interesting option. It tells which driver gets mapped to | ||
97 | which console. The value '0123' is a sequence that gets repeated until | ||
98 | the total length is 64 which is the number of consoles available. In | ||
99 | the above example, it is expanded to 012301230123... and the mapping | ||
100 | will be: | ||
101 | |||
102 | tty | 1 2 3 4 5 6 7 8 9 ... | ||
103 | fb | 0 1 2 3 0 1 2 3 0 ... | ||
104 | |||
105 | ('cat /proc/fb' should tell you what the fb numbers are) | ||
106 | |||
107 | One side effect that may be useful is using a map value that exceeds | ||
108 | the number of loaded fb drivers. For example, if only one driver is | ||
109 | available, fb0, adding fbcon=map:1 tells fbcon not to take over the | ||
110 | console. | ||
111 | |||
112 | Later on, when you want to map the console the to the framebuffer | ||
113 | device, you can use the con2fbmap utility. | ||
114 | |||
115 | 4. fbcon=vc:<n1>-<n2> | ||
116 | |||
117 | This option tells fbcon to take over only a range of consoles as | ||
118 | specified by the values 'n1' and 'n2'. The rest of the consoles | ||
119 | outside the given range will still be controlled by the standard | ||
120 | console driver. | ||
121 | |||
122 | NOTE: For x86 machines, the standard console is the VGA console which | ||
123 | is typically located on the same video card. Thus, the consoles that | ||
124 | are controlled by the VGA console will be garbled. | ||
125 | |||
126 | 4. fbcon=rotate:<n> | ||
127 | |||
128 | This option changes the orientation angle of the console display. The | ||
129 | value 'n' accepts the following: | ||
130 | |||
131 | 0 - normal orientation (0 degree) | ||
132 | 1 - clockwise orientation (90 degrees) | ||
133 | 2 - upside down orientation (180 degrees) | ||
134 | 3 - counterclockwise orientation (270 degrees) | ||
135 | |||
136 | The angle can be changed anytime afterwards by 'echoing' the same | ||
137 | numbers to any one of the 2 attributes found in | ||
138 | /sys/class/graphics/fb{x} | ||
139 | |||
140 | con_rotate - rotate the display of the active console | ||
141 | con_rotate_all - rotate the display of all consoles | ||
142 | |||
143 | Console rotation will only become available if Console Rotation | ||
144 | Support is compiled in your kernel. | ||
145 | |||
146 | NOTE: This is purely console rotation. Any other applications that | ||
147 | use the framebuffer will remain at their 'normal'orientation. | ||
148 | Actually, the underlying fb driver is totally ignorant of console | ||
149 | rotation. | ||
150 | |||
151 | --- | ||
152 | Antonino Daplas <adaplas@pol.net> | ||
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index decdf9917e0d..429db4bf98ec 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
@@ -25,6 +25,13 @@ Who: Adrian Bunk <bunk@stusta.de> | |||
25 | 25 | ||
26 | --------------------------- | 26 | --------------------------- |
27 | 27 | ||
28 | What: drivers depending on OBSOLETE_OSS_DRIVER | ||
29 | When: January 2006 | ||
30 | Why: OSS drivers with ALSA replacements | ||
31 | Who: Adrian Bunk <bunk@stusta.de> | ||
32 | |||
33 | --------------------------- | ||
34 | |||
28 | What: RCU API moves to EXPORT_SYMBOL_GPL | 35 | What: RCU API moves to EXPORT_SYMBOL_GPL |
29 | When: April 2006 | 36 | When: April 2006 |
30 | Files: include/linux/rcupdate.h, kernel/rcupdate.c | 37 | Files: include/linux/rcupdate.h, kernel/rcupdate.c |
@@ -60,6 +67,21 @@ Who: Jody McIntyre <scjody@steamballoon.com> | |||
60 | 67 | ||
61 | --------------------------- | 68 | --------------------------- |
62 | 69 | ||
70 | What: Video4Linux API 1 ioctls and video_decoder.h from Video devices. | ||
71 | When: July 2006 | ||
72 | Why: V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6 | ||
73 | series. The old API have lots of drawbacks and don't provide enough | ||
74 | means to work with all video and audio standards. The newer API is | ||
75 | already available on the main drivers and should be used instead. | ||
76 | Newer drivers should use v4l_compat_translate_ioctl function to handle | ||
77 | old calls, replacing to newer ones. | ||
78 | Decoder iocts are using internally to allow video drivers to | ||
79 | communicate with video decoders. This should also be improved to allow | ||
80 | V4L2 calls being translated into compatible internal ioctls. | ||
81 | Who: Mauro Carvalho Chehab <mchehab@brturbo.com.br> | ||
82 | |||
83 | --------------------------- | ||
84 | |||
63 | What: i2c sysfs name change: in1_ref, vid deprecated in favour of cpu0_vid | 85 | What: i2c sysfs name change: in1_ref, vid deprecated in favour of cpu0_vid |
64 | When: November 2005 | 86 | When: November 2005 |
65 | Files: drivers/i2c/chips/adm1025.c, drivers/i2c/chips/adm1026.c | 87 | Files: drivers/i2c/chips/adm1025.c, drivers/i2c/chips/adm1026.c |
@@ -111,3 +133,10 @@ Why: This interface has been obsoleted by the new layer3-independent | |||
111 | to link against API-compatible library on top of libnfnetlink_queue | 133 | to link against API-compatible library on top of libnfnetlink_queue |
112 | instead of the current 'libipq'. | 134 | instead of the current 'libipq'. |
113 | Who: Harald Welte <laforge@netfilter.org> | 135 | Who: Harald Welte <laforge@netfilter.org> |
136 | |||
137 | --------------------------- | ||
138 | |||
139 | What: EXPORT_SYMBOL(lookup_hash) | ||
140 | When: January 2006 | ||
141 | Why: Too low-level interface. Use lookup_one_len or lookup_create instead. | ||
142 | Who: Christoph Hellwig <hch@lst.de> | ||
diff --git a/Documentation/filesystems/ext2.txt b/Documentation/filesystems/ext2.txt index d16334ec48ba..a8edb376b041 100644 --- a/Documentation/filesystems/ext2.txt +++ b/Documentation/filesystems/ext2.txt | |||
@@ -17,8 +17,6 @@ set using tune2fs(8). Kernel-determined defaults are indicated by (*). | |||
17 | bsddf (*) Makes `df' act like BSD. | 17 | bsddf (*) Makes `df' act like BSD. |
18 | minixdf Makes `df' act like Minix. | 18 | minixdf Makes `df' act like Minix. |
19 | 19 | ||
20 | check Check block and inode bitmaps at mount time | ||
21 | (requires CONFIG_EXT2_CHECK). | ||
22 | check=none, nocheck (*) Don't do extra checking of bitmaps on mount | 20 | check=none, nocheck (*) Don't do extra checking of bitmaps on mount |
23 | (check=normal and check=strict options removed) | 21 | (check=normal and check=strict options removed) |
24 | 22 | ||
diff --git a/Documentation/i2c/busses/i2c-viapro b/Documentation/i2c/busses/i2c-viapro index 9363b8bd6109..16775663b9f5 100644 --- a/Documentation/i2c/busses/i2c-viapro +++ b/Documentation/i2c/busses/i2c-viapro | |||
@@ -7,12 +7,10 @@ Supported adapters: | |||
7 | * VIA Technologies, Inc. VT82C686A/B | 7 | * VIA Technologies, Inc. VT82C686A/B |
8 | Datasheet: Sometimes available at the VIA website | 8 | Datasheet: Sometimes available at the VIA website |
9 | 9 | ||
10 | * VIA Technologies, Inc. VT8231, VT8233, VT8233A, VT8235, VT8237 | 10 | * VIA Technologies, Inc. VT8231, VT8233, VT8233A, VT8235, VT8237R |
11 | Datasheet: available on request from Via | 11 | Datasheet: available on request from VIA |
12 | 12 | ||
13 | Authors: | 13 | Authors: |
14 | Frodo Looijaard <frodol@dds.nl>, | ||
15 | Philip Edelbrock <phil@netroedge.com>, | ||
16 | Ky�sti M�lkki <kmalkki@cc.hut.fi>, | 14 | Ky�sti M�lkki <kmalkki@cc.hut.fi>, |
17 | Mark D. Studebaker <mdsxyz123@yahoo.com>, | 15 | Mark D. Studebaker <mdsxyz123@yahoo.com>, |
18 | Jean Delvare <khali@linux-fr.org> | 16 | Jean Delvare <khali@linux-fr.org> |
diff --git a/Documentation/i2c/writing-clients b/Documentation/i2c/writing-clients index cff7b652588a..d19993cc0604 100644 --- a/Documentation/i2c/writing-clients +++ b/Documentation/i2c/writing-clients | |||
@@ -412,7 +412,7 @@ For now, you can ignore the `flags' parameter. It is there for future use. | |||
412 | release_region(address,FOO_EXTENT); | 412 | release_region(address,FOO_EXTENT); |
413 | /* SENSORS ONLY END */ | 413 | /* SENSORS ONLY END */ |
414 | ERROR1: | 414 | ERROR1: |
415 | kfree(new_client); | 415 | kfree(data); |
416 | ERROR0: | 416 | ERROR0: |
417 | return err; | 417 | return err; |
418 | } | 418 | } |
@@ -443,7 +443,7 @@ much simpler than the attachment code, fortunately! | |||
443 | release_region(client->addr,LM78_EXTENT); | 443 | release_region(client->addr,LM78_EXTENT); |
444 | /* HYBRID SENSORS CHIP ONLY END */ | 444 | /* HYBRID SENSORS CHIP ONLY END */ |
445 | 445 | ||
446 | kfree(data); | 446 | kfree(i2c_get_clientdata(client)); |
447 | return 0; | 447 | return 0; |
448 | } | 448 | } |
449 | 449 | ||
diff --git a/Documentation/md.txt b/Documentation/md.txt index e2b536992a27..23e6cce40f9c 100644 --- a/Documentation/md.txt +++ b/Documentation/md.txt | |||
@@ -116,3 +116,122 @@ and it's role in the array. | |||
116 | 116 | ||
117 | Once started with RUN_ARRAY, uninitialized spares can be added with | 117 | Once started with RUN_ARRAY, uninitialized spares can be added with |
118 | HOT_ADD_DISK. | 118 | HOT_ADD_DISK. |
119 | |||
120 | |||
121 | |||
122 | MD devices in sysfs | ||
123 | ------------------- | ||
124 | md devices appear in sysfs (/sys) as regular block devices, | ||
125 | e.g. | ||
126 | /sys/block/md0 | ||
127 | |||
128 | Each 'md' device will contain a subdirectory called 'md' which | ||
129 | contains further md-specific information about the device. | ||
130 | |||
131 | All md devices contain: | ||
132 | level | ||
133 | a text file indicating the 'raid level'. This may be a standard | ||
134 | numerical level prefixed by "RAID-" - e.g. "RAID-5", or some | ||
135 | other name such as "linear" or "multipath". | ||
136 | If no raid level has been set yet (array is still being | ||
137 | assembled), this file will be empty. | ||
138 | |||
139 | raid_disks | ||
140 | a text file with a simple number indicating the number of devices | ||
141 | in a fully functional array. If this is not yet known, the file | ||
142 | will be empty. If an array is being resized (not currently | ||
143 | possible) this will contain the larger of the old and new sizes. | ||
144 | |||
145 | As component devices are added to an md array, they appear in the 'md' | ||
146 | directory as new directories named | ||
147 | dev-XXX | ||
148 | where XXX is a name that the kernel knows for the device, e.g. hdb1. | ||
149 | Each directory contains: | ||
150 | |||
151 | block | ||
152 | a symlink to the block device in /sys/block, e.g. | ||
153 | /sys/block/md0/md/dev-hdb1/block -> ../../../../block/hdb/hdb1 | ||
154 | |||
155 | super | ||
156 | A file containing an image of the superblock read from, or | ||
157 | written to, that device. | ||
158 | |||
159 | state | ||
160 | A file recording the current state of the device in the array | ||
161 | which can be a comma separated list of | ||
162 | faulty - device has been kicked from active use due to | ||
163 | a detected fault | ||
164 | in_sync - device is a fully in-sync member of the array | ||
165 | spare - device is working, but not a full member. | ||
166 | This includes spares that are in the process | ||
167 | of being recoverred to | ||
168 | This list make grow in future. | ||
169 | |||
170 | |||
171 | An active md device will also contain and entry for each active device | ||
172 | in the array. These are named | ||
173 | |||
174 | rdNN | ||
175 | |||
176 | where 'NN' is the possition in the array, starting from 0. | ||
177 | So for a 3 drive array there will be rd0, rd1, rd2. | ||
178 | These are symbolic links to the appropriate 'dev-XXX' entry. | ||
179 | Thus, for example, | ||
180 | cat /sys/block/md*/md/rd*/state | ||
181 | will show 'in_sync' on every line. | ||
182 | |||
183 | |||
184 | |||
185 | Active md devices for levels that support data redundancy (1,4,5,6) | ||
186 | also have | ||
187 | |||
188 | sync_action | ||
189 | a text file that can be used to monitor and control the rebuild | ||
190 | process. It contains one word which can be one of: | ||
191 | resync - redundancy is being recalculated after unclean | ||
192 | shutdown or creation | ||
193 | recover - a hot spare is being built to replace a | ||
194 | failed/missing device | ||
195 | idle - nothing is happening | ||
196 | check - A full check of redundancy was requested and is | ||
197 | happening. This reads all block and checks | ||
198 | them. A repair may also happen for some raid | ||
199 | levels. | ||
200 | repair - A full check and repair is happening. This is | ||
201 | similar to 'resync', but was requested by the | ||
202 | user, and the write-intent bitmap is NOT used to | ||
203 | optimise the process. | ||
204 | |||
205 | This file is writable, and each of the strings that could be | ||
206 | read are meaningful for writing. | ||
207 | |||
208 | 'idle' will stop an active resync/recovery etc. There is no | ||
209 | guarantee that another resync/recovery may not be automatically | ||
210 | started again, though some event will be needed to trigger | ||
211 | this. | ||
212 | 'resync' or 'recovery' can be used to restart the | ||
213 | corresponding operation if it was stopped with 'idle'. | ||
214 | 'check' and 'repair' will start the appropriate process | ||
215 | providing the current state is 'idle'. | ||
216 | |||
217 | mismatch_count | ||
218 | When performing 'check' and 'repair', and possibly when | ||
219 | performing 'resync', md will count the number of errors that are | ||
220 | found. The count in 'mismatch_cnt' is the number of sectors | ||
221 | that were re-written, or (for 'check') would have been | ||
222 | re-written. As most raid levels work in units of pages rather | ||
223 | than sectors, this my be larger than the number of actual errors | ||
224 | by a factor of the number of sectors in a page. | ||
225 | |||
226 | Each active md device may also have attributes specific to the | ||
227 | personality module that manages it. | ||
228 | These are specific to the implementation of the module and could | ||
229 | change substantially if the implementation changes. | ||
230 | |||
231 | These currently include | ||
232 | |||
233 | stripe_cache_size (currently raid5 only) | ||
234 | number of entries in the stripe cache. This is writable, but | ||
235 | there are upper and lower limits (32768, 16). Default is 128. | ||
236 | strip_cache_active (currently raid5 only) | ||
237 | number of active entries in the stripe cache | ||
diff --git a/Documentation/networking/README.ipw2100 b/Documentation/networking/README.ipw2100 index 2046948b020d..3ab40379d1cf 100644 --- a/Documentation/networking/README.ipw2100 +++ b/Documentation/networking/README.ipw2100 | |||
@@ -1,27 +1,82 @@ | |||
1 | 1 | ||
2 | =========================== | 2 | Intel(R) PRO/Wireless 2100 Driver for Linux in support of: |
3 | Intel(R) PRO/Wireless 2100 Network Connection Driver for Linux | 3 | |
4 | Intel(R) PRO/Wireless 2100 Network Connection | ||
5 | |||
6 | Copyright (C) 2003-2005, Intel Corporation | ||
7 | |||
4 | README.ipw2100 | 8 | README.ipw2100 |
5 | 9 | ||
6 | March 14, 2005 | 10 | Version: 1.1.3 |
11 | Date : October 17, 2005 | ||
7 | 12 | ||
8 | =========================== | ||
9 | Index | 13 | Index |
10 | --------------------------- | 14 | ----------------------------------------------- |
11 | 0. Introduction | 15 | 0. IMPORTANT INFORMATION BEFORE USING THIS DRIVER |
12 | 1. Release 1.1.0 Current Features | 16 | 1. Introduction |
13 | 2. Command Line Parameters | 17 | 2. Release 1.1.3 Current Features |
14 | 3. Sysfs Helper Files | 18 | 3. Command Line Parameters |
15 | 4. Radio Kill Switch | 19 | 4. Sysfs Helper Files |
16 | 5. Dynamic Firmware | 20 | 5. Radio Kill Switch |
17 | 6. Power Management | 21 | 6. Dynamic Firmware |
18 | 7. Support | 22 | 7. Power Management |
19 | 8. License | 23 | 8. Support |
20 | 24 | 9. License | |
21 | 25 | ||
22 | =========================== | 26 | |
23 | 0. Introduction | 27 | 0. IMPORTANT INFORMATION BEFORE USING THIS DRIVER |
24 | ------------ ----- ----- ---- --- -- - | 28 | ----------------------------------------------- |
29 | |||
30 | Important Notice FOR ALL USERS OR DISTRIBUTORS!!!! | ||
31 | |||
32 | Intel wireless LAN adapters are engineered, manufactured, tested, and | ||
33 | quality checked to ensure that they meet all necessary local and | ||
34 | governmental regulatory agency requirements for the regions that they | ||
35 | are designated and/or marked to ship into. Since wireless LANs are | ||
36 | generally unlicensed devices that share spectrum with radars, | ||
37 | satellites, and other licensed and unlicensed devices, it is sometimes | ||
38 | necessary to dynamically detect, avoid, and limit usage to avoid | ||
39 | interference with these devices. In many instances Intel is required to | ||
40 | provide test data to prove regional and local compliance to regional and | ||
41 | governmental regulations before certification or approval to use the | ||
42 | product is granted. Intel's wireless LAN's EEPROM, firmware, and | ||
43 | software driver are designed to carefully control parameters that affect | ||
44 | radio operation and to ensure electromagnetic compliance (EMC). These | ||
45 | parameters include, without limitation, RF power, spectrum usage, | ||
46 | channel scanning, and human exposure. | ||
47 | |||
48 | For these reasons Intel cannot permit any manipulation by third parties | ||
49 | of the software provided in binary format with the wireless WLAN | ||
50 | adapters (e.g., the EEPROM and firmware). Furthermore, if you use any | ||
51 | patches, utilities, or code with the Intel wireless LAN adapters that | ||
52 | have been manipulated by an unauthorized party (i.e., patches, | ||
53 | utilities, or code (including open source code modifications) which have | ||
54 | not been validated by Intel), (i) you will be solely responsible for | ||
55 | ensuring the regulatory compliance of the products, (ii) Intel will bear | ||
56 | no liability, under any theory of liability for any issues associated | ||
57 | with the modified products, including without limitation, claims under | ||
58 | the warranty and/or issues arising from regulatory non-compliance, and | ||
59 | (iii) Intel will not provide or be required to assist in providing | ||
60 | support to any third parties for such modified products. | ||
61 | |||
62 | Note: Many regulatory agencies consider Wireless LAN adapters to be | ||
63 | modules, and accordingly, condition system-level regulatory approval | ||
64 | upon receipt and review of test data documenting that the antennas and | ||
65 | system configuration do not cause the EMC and radio operation to be | ||
66 | non-compliant. | ||
67 | |||
68 | The drivers available for download from SourceForge are provided as a | ||
69 | part of a development project. Conformance to local regulatory | ||
70 | requirements is the responsibility of the individual developer. As | ||
71 | such, if you are interested in deploying or shipping a driver as part of | ||
72 | solution intended to be used for purposes other than development, please | ||
73 | obtain a tested driver from Intel Customer Support at: | ||
74 | |||
75 | http://support.intel.com/support/notebook/sb/CS-006408.htm | ||
76 | |||
77 | |||
78 | 1. Introduction | ||
79 | ----------------------------------------------- | ||
25 | 80 | ||
26 | This document provides a brief overview of the features supported by the | 81 | This document provides a brief overview of the features supported by the |
27 | IPW2100 driver project. The main project website, where the latest | 82 | IPW2100 driver project. The main project website, where the latest |
@@ -34,9 +89,8 @@ potential fixes and patches, as well as links to the development mailing list | |||
34 | for the driver project. | 89 | for the driver project. |
35 | 90 | ||
36 | 91 | ||
37 | =========================== | 92 | 2. Release 1.1.3 Current Supported Features |
38 | 1. Release 1.1.0 Current Supported Features | 93 | ----------------------------------------------- |
39 | --------------------------- | ||
40 | - Managed (BSS) and Ad-Hoc (IBSS) | 94 | - Managed (BSS) and Ad-Hoc (IBSS) |
41 | - WEP (shared key and open) | 95 | - WEP (shared key and open) |
42 | - Wireless Tools support | 96 | - Wireless Tools support |
@@ -51,9 +105,8 @@ on the amount of validation and interoperability testing that has been | |||
51 | performed on a given feature. | 105 | performed on a given feature. |
52 | 106 | ||
53 | 107 | ||
54 | =========================== | 108 | 3. Command Line Parameters |
55 | 2. Command Line Parameters | 109 | ----------------------------------------------- |
56 | --------------------------- | ||
57 | 110 | ||
58 | If the driver is built as a module, the following optional parameters are used | 111 | If the driver is built as a module, the following optional parameters are used |
59 | by entering them on the command line with the modprobe command using this | 112 | by entering them on the command line with the modprobe command using this |
@@ -75,9 +128,9 @@ associate boolean associate=0 /* Do NOT auto associate */ | |||
75 | disable boolean disable=1 /* Do not power the HW */ | 128 | disable boolean disable=1 /* Do not power the HW */ |
76 | 129 | ||
77 | 130 | ||
78 | =========================== | 131 | 4. Sysfs Helper Files |
79 | 3. Sysfs Helper Files | ||
80 | --------------------------- | 132 | --------------------------- |
133 | ----------------------------------------------- | ||
81 | 134 | ||
82 | There are several ways to control the behavior of the driver. Many of the | 135 | There are several ways to control the behavior of the driver. Many of the |
83 | general capabilities are exposed through the Wireless Tools (iwconfig). There | 136 | general capabilities are exposed through the Wireless Tools (iwconfig). There |
@@ -120,9 +173,8 @@ For the device level files, see /sys/bus/pci/drivers/ipw2100: | |||
120 | based RF kill from ON -> OFF -> ON, the radio will NOT come back on | 173 | based RF kill from ON -> OFF -> ON, the radio will NOT come back on |
121 | 174 | ||
122 | 175 | ||
123 | =========================== | 176 | 5. Radio Kill Switch |
124 | 4. Radio Kill Switch | 177 | ----------------------------------------------- |
125 | --------------------------- | ||
126 | Most laptops provide the ability for the user to physically disable the radio. | 178 | Most laptops provide the ability for the user to physically disable the radio. |
127 | Some vendors have implemented this as a physical switch that requires no | 179 | Some vendors have implemented this as a physical switch that requires no |
128 | software to turn the radio off and on. On other laptops, however, the switch | 180 | software to turn the radio off and on. On other laptops, however, the switch |
@@ -134,9 +186,8 @@ See the Sysfs helper file 'rf_kill' for determining the state of the RF switch | |||
134 | on your system. | 186 | on your system. |
135 | 187 | ||
136 | 188 | ||
137 | =========================== | 189 | 6. Dynamic Firmware |
138 | 5. Dynamic Firmware | 190 | ----------------------------------------------- |
139 | --------------------------- | ||
140 | As the firmware is licensed under a restricted use license, it can not be | 191 | As the firmware is licensed under a restricted use license, it can not be |
141 | included within the kernel sources. To enable the IPW2100 you will need a | 192 | included within the kernel sources. To enable the IPW2100 you will need a |
142 | firmware image to load into the wireless NIC's processors. | 193 | firmware image to load into the wireless NIC's processors. |
@@ -146,9 +197,8 @@ You can obtain these images from <http://ipw2100.sf.net/firmware.php>. | |||
146 | See INSTALL for instructions on installing the firmware. | 197 | See INSTALL for instructions on installing the firmware. |
147 | 198 | ||
148 | 199 | ||
149 | =========================== | 200 | 7. Power Management |
150 | 6. Power Management | 201 | ----------------------------------------------- |
151 | --------------------------- | ||
152 | The IPW2100 supports the configuration of the Power Save Protocol | 202 | The IPW2100 supports the configuration of the Power Save Protocol |
153 | through a private wireless extension interface. The IPW2100 supports | 203 | through a private wireless extension interface. The IPW2100 supports |
154 | the following different modes: | 204 | the following different modes: |
@@ -200,9 +250,8 @@ xxxx/yyyy will be replaced with 'off' -- the level reported will be the active | |||
200 | level if `iwconfig eth1 power on` is invoked. | 250 | level if `iwconfig eth1 power on` is invoked. |
201 | 251 | ||
202 | 252 | ||
203 | =========================== | 253 | 8. Support |
204 | 7. Support | 254 | ----------------------------------------------- |
205 | --------------------------- | ||
206 | 255 | ||
207 | For general development information and support, | 256 | For general development information and support, |
208 | go to: | 257 | go to: |
@@ -218,9 +267,8 @@ For installation support on the ipw2100 1.1.0 driver on Linux kernels | |||
218 | 267 | ||
219 | http://supportmail.intel.com | 268 | http://supportmail.intel.com |
220 | 269 | ||
221 | =========================== | 270 | 9. License |
222 | 8. License | 271 | ----------------------------------------------- |
223 | --------------------------- | ||
224 | 272 | ||
225 | Copyright(c) 2003 - 2005 Intel Corporation. All rights reserved. | 273 | Copyright(c) 2003 - 2005 Intel Corporation. All rights reserved. |
226 | 274 | ||
diff --git a/Documentation/networking/README.ipw2200 b/Documentation/networking/README.ipw2200 index 6916080c5f03..c6492d3839fa 100644 --- a/Documentation/networking/README.ipw2200 +++ b/Documentation/networking/README.ipw2200 | |||
@@ -1,33 +1,89 @@ | |||
1 | 1 | ||
2 | Intel(R) PRO/Wireless 2915ABG Driver for Linux in support of: | 2 | Intel(R) PRO/Wireless 2915ABG Driver for Linux in support of: |
3 | 3 | ||
4 | Intel(R) PRO/Wireless 2200BG Network Connection | 4 | Intel(R) PRO/Wireless 2200BG Network Connection |
5 | Intel(R) PRO/Wireless 2915ABG Network Connection | 5 | Intel(R) PRO/Wireless 2915ABG Network Connection |
6 | 6 | ||
7 | Note: The Intel(R) PRO/Wireless 2915ABG Driver for Linux and Intel(R) | 7 | Note: The Intel(R) PRO/Wireless 2915ABG Driver for Linux and Intel(R) |
8 | PRO/Wireless 2200BG Driver for Linux is a unified driver that works on | 8 | PRO/Wireless 2200BG Driver for Linux is a unified driver that works on |
9 | both hardware adapters listed above. In this document the Intel(R) | 9 | both hardware adapters listed above. In this document the Intel(R) |
10 | PRO/Wireless 2915ABG Driver for Linux will be used to reference the | 10 | PRO/Wireless 2915ABG Driver for Linux will be used to reference the |
11 | unified driver. | 11 | unified driver. |
12 | 12 | ||
13 | Copyright (C) 2004-2005, Intel Corporation | 13 | Copyright (C) 2004-2005, Intel Corporation |
14 | 14 | ||
15 | README.ipw2200 | 15 | README.ipw2200 |
16 | 16 | ||
17 | Version: 1.0.0 | 17 | Version: 1.0.8 |
18 | Date : January 31, 2005 | 18 | Date : October 20, 2005 |
19 | 19 | ||
20 | 20 | ||
21 | Index | 21 | Index |
22 | ----------------------------------------------- | 22 | ----------------------------------------------- |
23 | 0. IMPORTANT INFORMATION BEFORE USING THIS DRIVER | ||
23 | 1. Introduction | 24 | 1. Introduction |
24 | 1.1. Overview of features | 25 | 1.1. Overview of features |
25 | 1.2. Module parameters | 26 | 1.2. Module parameters |
26 | 1.3. Wireless Extension Private Methods | 27 | 1.3. Wireless Extension Private Methods |
27 | 1.4. Sysfs Helper Files | 28 | 1.4. Sysfs Helper Files |
28 | 2. About the Version Numbers | 29 | 2. Ad-Hoc Networking |
29 | 3. Support | 30 | 3. Interacting with Wireless Tools |
30 | 4. License | 31 | 3.1. iwconfig mode |
32 | 4. About the Version Numbers | ||
33 | 5. Firmware installation | ||
34 | 6. Support | ||
35 | 7. License | ||
36 | |||
37 | |||
38 | 0. IMPORTANT INFORMATION BEFORE USING THIS DRIVER | ||
39 | ----------------------------------------------- | ||
40 | |||
41 | Important Notice FOR ALL USERS OR DISTRIBUTORS!!!! | ||
42 | |||
43 | Intel wireless LAN adapters are engineered, manufactured, tested, and | ||
44 | quality checked to ensure that they meet all necessary local and | ||
45 | governmental regulatory agency requirements for the regions that they | ||
46 | are designated and/or marked to ship into. Since wireless LANs are | ||
47 | generally unlicensed devices that share spectrum with radars, | ||
48 | satellites, and other licensed and unlicensed devices, it is sometimes | ||
49 | necessary to dynamically detect, avoid, and limit usage to avoid | ||
50 | interference with these devices. In many instances Intel is required to | ||
51 | provide test data to prove regional and local compliance to regional and | ||
52 | governmental regulations before certification or approval to use the | ||
53 | product is granted. Intel's wireless LAN's EEPROM, firmware, and | ||
54 | software driver are designed to carefully control parameters that affect | ||
55 | radio operation and to ensure electromagnetic compliance (EMC). These | ||
56 | parameters include, without limitation, RF power, spectrum usage, | ||
57 | channel scanning, and human exposure. | ||
58 | |||
59 | For these reasons Intel cannot permit any manipulation by third parties | ||
60 | of the software provided in binary format with the wireless WLAN | ||
61 | adapters (e.g., the EEPROM and firmware). Furthermore, if you use any | ||
62 | patches, utilities, or code with the Intel wireless LAN adapters that | ||
63 | have been manipulated by an unauthorized party (i.e., patches, | ||
64 | utilities, or code (including open source code modifications) which have | ||
65 | not been validated by Intel), (i) you will be solely responsible for | ||
66 | ensuring the regulatory compliance of the products, (ii) Intel will bear | ||
67 | no liability, under any theory of liability for any issues associated | ||
68 | with the modified products, including without limitation, claims under | ||
69 | the warranty and/or issues arising from regulatory non-compliance, and | ||
70 | (iii) Intel will not provide or be required to assist in providing | ||
71 | support to any third parties for such modified products. | ||
72 | |||
73 | Note: Many regulatory agencies consider Wireless LAN adapters to be | ||
74 | modules, and accordingly, condition system-level regulatory approval | ||
75 | upon receipt and review of test data documenting that the antennas and | ||
76 | system configuration do not cause the EMC and radio operation to be | ||
77 | non-compliant. | ||
78 | |||
79 | The drivers available for download from SourceForge are provided as a | ||
80 | part of a development project. Conformance to local regulatory | ||
81 | requirements is the responsibility of the individual developer. As | ||
82 | such, if you are interested in deploying or shipping a driver as part of | ||
83 | solution intended to be used for purposes other than development, please | ||
84 | obtain a tested driver from Intel Customer Support at: | ||
85 | |||
86 | http://support.intel.com/support/notebook/sb/CS-006408.htm | ||
31 | 87 | ||
32 | 88 | ||
33 | 1. Introduction | 89 | 1. Introduction |
@@ -45,7 +101,7 @@ file. | |||
45 | 101 | ||
46 | 1.1. Overview of Features | 102 | 1.1. Overview of Features |
47 | ----------------------------------------------- | 103 | ----------------------------------------------- |
48 | The current release (1.0.0) supports the following features: | 104 | The current release (1.0.8) supports the following features: |
49 | 105 | ||
50 | + BSS mode (Infrastructure, Managed) | 106 | + BSS mode (Infrastructure, Managed) |
51 | + IBSS mode (Ad-Hoc) | 107 | + IBSS mode (Ad-Hoc) |
@@ -56,17 +112,27 @@ The current release (1.0.0) supports the following features: | |||
56 | + Full A rate support (2915 only) | 112 | + Full A rate support (2915 only) |
57 | + Transmit power control | 113 | + Transmit power control |
58 | + S state support (ACPI suspend/resume) | 114 | + S state support (ACPI suspend/resume) |
115 | |||
116 | The following features are currently enabled, but not officially | ||
117 | supported: | ||
118 | |||
119 | + WPA | ||
59 | + long/short preamble support | 120 | + long/short preamble support |
121 | + Monitor mode (aka RFMon) | ||
122 | |||
123 | The distinction between officially supported and enabled is a reflection | ||
124 | on the amount of validation and interoperability testing that has been | ||
125 | performed on a given feature. | ||
60 | 126 | ||
61 | 127 | ||
62 | 128 | ||
63 | 1.2. Command Line Parameters | 129 | 1.2. Command Line Parameters |
64 | ----------------------------------------------- | 130 | ----------------------------------------------- |
65 | 131 | ||
66 | Like many modules used in the Linux kernel, the Intel(R) PRO/Wireless | 132 | Like many modules used in the Linux kernel, the Intel(R) PRO/Wireless |
67 | 2915ABG Driver for Linux allows certain configuration options to be | 133 | 2915ABG Driver for Linux allows configuration options to be provided |
68 | provided as module parameters. The most common way to specify a module | 134 | as module parameters. The most common way to specify a module parameter |
69 | parameter is via the command line. | 135 | is via the command line. |
70 | 136 | ||
71 | The general form is: | 137 | The general form is: |
72 | 138 | ||
@@ -96,14 +162,18 @@ Where the supported parameter are: | |||
96 | 162 | ||
97 | debug | 163 | debug |
98 | If using a debug build, this is used to control the amount of debug | 164 | If using a debug build, this is used to control the amount of debug |
99 | info is logged. See the 'dval' and 'load' script for more info on | 165 | info is logged. See the 'dvals' and 'load' script for more info on |
100 | how to use this (the dval and load scripts are provided as part | 166 | how to use this (the dvals and load scripts are provided as part |
101 | of the ipw2200 development snapshot releases available from the | 167 | of the ipw2200 development snapshot releases available from the |
102 | SourceForge project at http://ipw2200.sf.net) | 168 | SourceForge project at http://ipw2200.sf.net) |
169 | |||
170 | led | ||
171 | Can be used to turn on experimental LED code. | ||
172 | 0 = Off, 1 = On. Default is 0. | ||
103 | 173 | ||
104 | mode | 174 | mode |
105 | Can be used to set the default mode of the adapter. | 175 | Can be used to set the default mode of the adapter. |
106 | 0 = Managed, 1 = Ad-Hoc | 176 | 0 = Managed, 1 = Ad-Hoc, 2 = Monitor |
107 | 177 | ||
108 | 178 | ||
109 | 1.3. Wireless Extension Private Methods | 179 | 1.3. Wireless Extension Private Methods |
@@ -164,8 +234,8 @@ The supported private methods are: | |||
164 | ----------------------------------------------- | 234 | ----------------------------------------------- |
165 | 235 | ||
166 | The Linux kernel provides a pseudo file system that can be used to | 236 | The Linux kernel provides a pseudo file system that can be used to |
167 | access various components of the operating system. The Intel(R) | 237 | access various components of the operating system. The Intel(R) |
168 | PRO/Wireless 2915ABG Driver for Linux exposes several configuration | 238 | PRO/Wireless 2915ABG Driver for Linux exposes several configuration |
169 | parameters through this mechanism. | 239 | parameters through this mechanism. |
170 | 240 | ||
171 | An entry in the sysfs can support reading and/or writing. You can | 241 | An entry in the sysfs can support reading and/or writing. You can |
@@ -184,13 +254,13 @@ You can set the debug level via: | |||
184 | 254 | ||
185 | Where $VALUE would be a number in the case of this sysfs entry. The | 255 | Where $VALUE would be a number in the case of this sysfs entry. The |
186 | input to sysfs files does not have to be a number. For example, the | 256 | input to sysfs files does not have to be a number. For example, the |
187 | firmware loader used by hotplug utilizes sysfs entries for transferring | 257 | firmware loader used by hotplug utilizes sysfs entries for transfering |
188 | the firmware image from user space into the driver. | 258 | the firmware image from user space into the driver. |
189 | 259 | ||
190 | The Intel(R) PRO/Wireless 2915ABG Driver for Linux exposes sysfs entries | 260 | The Intel(R) PRO/Wireless 2915ABG Driver for Linux exposes sysfs entries |
191 | at two levels -- driver level, which apply to all instances of the | 261 | at two levels -- driver level, which apply to all instances of the driver |
192 | driver (in the event that there are more than one device installed) and | 262 | (in the event that there are more than one device installed) and device |
193 | device level, which applies only to the single specific instance. | 263 | level, which applies only to the single specific instance. |
194 | 264 | ||
195 | 265 | ||
196 | 1.4.1 Driver Level Sysfs Helper Files | 266 | 1.4.1 Driver Level Sysfs Helper Files |
@@ -203,6 +273,7 @@ For the driver level files, look in /sys/bus/pci/drivers/ipw2200/ | |||
203 | This controls the same global as the 'debug' module parameter | 273 | This controls the same global as the 'debug' module parameter |
204 | 274 | ||
205 | 275 | ||
276 | |||
206 | 1.4.2 Device Level Sysfs Helper Files | 277 | 1.4.2 Device Level Sysfs Helper Files |
207 | ----------------------------------------------- | 278 | ----------------------------------------------- |
208 | 279 | ||
@@ -213,7 +284,7 @@ For the device level files, look in | |||
213 | For example: | 284 | For example: |
214 | /sys/bus/pci/drivers/ipw2200/0000:02:01.0 | 285 | /sys/bus/pci/drivers/ipw2200/0000:02:01.0 |
215 | 286 | ||
216 | For the device level files, see /sys/bus/pci/[drivers/ipw2200: | 287 | For the device level files, see /sys/bus/pci/drivers/ipw2200: |
217 | 288 | ||
218 | rf_kill | 289 | rf_kill |
219 | read - | 290 | read - |
@@ -231,8 +302,59 @@ For the device level files, see /sys/bus/pci/[drivers/ipw2200: | |||
231 | ucode | 302 | ucode |
232 | read-only access to the ucode version number | 303 | read-only access to the ucode version number |
233 | 304 | ||
305 | led | ||
306 | read - | ||
307 | 0 = LED code disabled | ||
308 | 1 = LED code enabled | ||
309 | write - | ||
310 | 0 = Disable LED code | ||
311 | 1 = Enable LED code | ||
312 | |||
313 | NOTE: The LED code has been reported to hang some systems when | ||
314 | running ifconfig and is therefore disabled by default. | ||
315 | |||
316 | |||
317 | 2. Ad-Hoc Networking | ||
318 | ----------------------------------------------- | ||
319 | |||
320 | When using a device in an Ad-Hoc network, it is useful to understand the | ||
321 | sequence and requirements for the driver to be able to create, join, or | ||
322 | merge networks. | ||
323 | |||
324 | The following attempts to provide enough information so that you can | ||
325 | have a consistent experience while using the driver as a member of an | ||
326 | Ad-Hoc network. | ||
327 | |||
328 | 2.1. Joining an Ad-Hoc Network | ||
329 | ----------------------------------------------- | ||
330 | |||
331 | The easiest way to get onto an Ad-Hoc network is to join one that | ||
332 | already exists. | ||
234 | 333 | ||
235 | 2. About the Version Numbers | 334 | 2.2. Creating an Ad-Hoc Network |
335 | ----------------------------------------------- | ||
336 | |||
337 | An Ad-Hoc networks is created using the syntax of the Wireless tool. | ||
338 | |||
339 | For Example: | ||
340 | iwconfig eth1 mode ad-hoc essid testing channel 2 | ||
341 | |||
342 | 2.3. Merging Ad-Hoc Networks | ||
343 | ----------------------------------------------- | ||
344 | |||
345 | |||
346 | 3. Interaction with Wireless Tools | ||
347 | ----------------------------------------------- | ||
348 | |||
349 | 3.1 iwconfig mode | ||
350 | ----------------------------------------------- | ||
351 | |||
352 | When configuring the mode of the adapter, all run-time configured parameters | ||
353 | are reset to the value used when the module was loaded. This includes | ||
354 | channels, rates, ESSID, etc. | ||
355 | |||
356 | |||
357 | 4. About the Version Numbers | ||
236 | ----------------------------------------------- | 358 | ----------------------------------------------- |
237 | 359 | ||
238 | Due to the nature of open source development projects, there are | 360 | Due to the nature of open source development projects, there are |
@@ -259,12 +381,23 @@ available as quickly as possible, unknown anomalies should be expected. | |||
259 | The major version number will be incremented when significant changes | 381 | The major version number will be incremented when significant changes |
260 | are made to the driver. Currently, there are no major changes planned. | 382 | are made to the driver. Currently, there are no major changes planned. |
261 | 383 | ||
384 | 5. Firmware installation | ||
385 | ---------------------------------------------- | ||
386 | |||
387 | The driver requires a firmware image, download it and extract the | ||
388 | files under /lib/firmware (or wherever your hotplug's firmware.agent | ||
389 | will look for firmware files) | ||
390 | |||
391 | The firmware can be downloaded from the following URL: | ||
262 | 392 | ||
263 | 3. Support | 393 | http://ipw2200.sf.net/ |
394 | |||
395 | |||
396 | 6. Support | ||
264 | ----------------------------------------------- | 397 | ----------------------------------------------- |
265 | 398 | ||
266 | For installation support of the 1.0.0 version, you can contact | 399 | For direct support of the 1.0.0 version, you can contact |
267 | http://supportmail.intel.com, or you can use the open source project | 400 | http://supportmail.intel.com, or you can use the open source project |
268 | support. | 401 | support. |
269 | 402 | ||
270 | For general information and support, go to: | 403 | For general information and support, go to: |
@@ -272,7 +405,7 @@ For general information and support, go to: | |||
272 | http://ipw2200.sf.net/ | 405 | http://ipw2200.sf.net/ |
273 | 406 | ||
274 | 407 | ||
275 | 4. License | 408 | 7. License |
276 | ----------------------------------------------- | 409 | ----------------------------------------------- |
277 | 410 | ||
278 | Copyright(c) 2003 - 2005 Intel Corporation. All rights reserved. | 411 | Copyright(c) 2003 - 2005 Intel Corporation. All rights reserved. |
@@ -297,4 +430,3 @@ For general information and support, go to: | |||
297 | James P. Ketrenos <ipw2100-admin@linux.intel.com> | 430 | James P. Ketrenos <ipw2100-admin@linux.intel.com> |
298 | Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 | 431 | Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 |
299 | 432 | ||
300 | |||
diff --git a/Documentation/s390/Debugging390.txt b/Documentation/s390/Debugging390.txt index adbfe620c061..844c03fe7921 100644 --- a/Documentation/s390/Debugging390.txt +++ b/Documentation/s390/Debugging390.txt | |||
@@ -871,7 +871,7 @@ by playing with the --adjust-vma parameter to objdump. | |||
871 | 871 | ||
872 | 872 | ||
873 | 873 | ||
874 | extern inline void spin_lock(spinlock_t *lp) | 874 | static inline void spin_lock(spinlock_t *lp) |
875 | { | 875 | { |
876 | a0: 18 34 lr %r3,%r4 | 876 | a0: 18 34 lr %r3,%r4 |
877 | a2: a7 3a 03 bc ahi %r3,956 | 877 | a2: a7 3a 03 bc ahi %r3,956 |
diff --git a/Documentation/sched-arch.txt b/Documentation/sched-arch.txt new file mode 100644 index 000000000000..941615a9769b --- /dev/null +++ b/Documentation/sched-arch.txt | |||
@@ -0,0 +1,89 @@ | |||
1 | CPU Scheduler implementation hints for architecture specific code | ||
2 | |||
3 | Nick Piggin, 2005 | ||
4 | |||
5 | Context switch | ||
6 | ============== | ||
7 | 1. Runqueue locking | ||
8 | By default, the switch_to arch function is called with the runqueue | ||
9 | locked. This is usually not a problem unless switch_to may need to | ||
10 | take the runqueue lock. This is usually due to a wake up operation in | ||
11 | the context switch. See include/asm-ia64/system.h for an example. | ||
12 | |||
13 | To request the scheduler call switch_to with the runqueue unlocked, | ||
14 | you must `#define __ARCH_WANT_UNLOCKED_CTXSW` in a header file | ||
15 | (typically the one where switch_to is defined). | ||
16 | |||
17 | Unlocked context switches introduce only a very minor performance | ||
18 | penalty to the core scheduler implementation in the CONFIG_SMP case. | ||
19 | |||
20 | 2. Interrupt status | ||
21 | By default, the switch_to arch function is called with interrupts | ||
22 | disabled. Interrupts may be enabled over the call if it is likely to | ||
23 | introduce a significant interrupt latency by adding the line | ||
24 | `#define __ARCH_WANT_INTERRUPTS_ON_CTXSW` in the same place as for | ||
25 | unlocked context switches. This define also implies | ||
26 | `__ARCH_WANT_UNLOCKED_CTXSW`. See include/asm-arm/system.h for an | ||
27 | example. | ||
28 | |||
29 | |||
30 | CPU idle | ||
31 | ======== | ||
32 | Your cpu_idle routines need to obey the following rules: | ||
33 | |||
34 | 1. Preempt should now disabled over idle routines. Should only | ||
35 | be enabled to call schedule() then disabled again. | ||
36 | |||
37 | 2. need_resched/TIF_NEED_RESCHED is only ever set, and will never | ||
38 | be cleared until the running task has called schedule(). Idle | ||
39 | threads need only ever query need_resched, and may never set or | ||
40 | clear it. | ||
41 | |||
42 | 3. When cpu_idle finds (need_resched() == 'true'), it should call | ||
43 | schedule(). It should not call schedule() otherwise. | ||
44 | |||
45 | 4. The only time interrupts need to be disabled when checking | ||
46 | need_resched is if we are about to sleep the processor until | ||
47 | the next interrupt (this doesn't provide any protection of | ||
48 | need_resched, it prevents losing an interrupt). | ||
49 | |||
50 | 4a. Common problem with this type of sleep appears to be: | ||
51 | local_irq_disable(); | ||
52 | if (!need_resched()) { | ||
53 | local_irq_enable(); | ||
54 | *** resched interrupt arrives here *** | ||
55 | __asm__("sleep until next interrupt"); | ||
56 | } | ||
57 | |||
58 | 5. TIF_POLLING_NRFLAG can be set by idle routines that do not | ||
59 | need an interrupt to wake them up when need_resched goes high. | ||
60 | In other words, they must be periodically polling need_resched, | ||
61 | although it may be reasonable to do some background work or enter | ||
62 | a low CPU priority. | ||
63 | |||
64 | 5a. If TIF_POLLING_NRFLAG is set, and we do decide to enter | ||
65 | an interrupt sleep, it needs to be cleared then a memory | ||
66 | barrier issued (followed by a test of need_resched with | ||
67 | interrupts disabled, as explained in 3). | ||
68 | |||
69 | arch/i386/kernel/process.c has examples of both polling and | ||
70 | sleeping idle functions. | ||
71 | |||
72 | |||
73 | Possible arch/ problems | ||
74 | ======================= | ||
75 | |||
76 | Possible arch problems I found (and either tried to fix or didn't): | ||
77 | |||
78 | h8300 - Is such sleeping racy vs interrupts? (See #4a). | ||
79 | The H8/300 manual I found indicates yes, however disabling IRQs | ||
80 | over the sleep mean only NMIs can wake it up, so can't fix easily | ||
81 | without doing spin waiting. | ||
82 | |||
83 | ia64 - is safe_halt call racy vs interrupts? (does it sleep?) (See #4a) | ||
84 | |||
85 | sh64 - Is sleeping racy vs interrupts? (See #4a) | ||
86 | |||
87 | sparc - IRQs on at this point(?), change local_irq_save to _disable. | ||
88 | - TODO: needs secondary CPUs to disable preempt (See #1) | ||
89 | |||
diff --git a/Documentation/video4linux/API.html b/Documentation/video4linux/API.html index 441407b12a9f..afbe9ae7ee96 100644 --- a/Documentation/video4linux/API.html +++ b/Documentation/video4linux/API.html | |||
@@ -8,7 +8,7 @@ V4L original API</a> | |||
8 | </td><td> | 8 | </td><td> |
9 | Obsoleted by V4L2 API | 9 | Obsoleted by V4L2 API |
10 | </td></tr><tr><td> | 10 | </td></tr><tr><td> |
11 | <A HREF=http://www.linuxtv.org/downloads/video4linux/API/V4L2_API.html> | 11 | <A HREF=http://www.linuxtv.org/downloads/video4linux/API/V4L2_API> |
12 | V4L2 API</a> | 12 | V4L2 API</a> |
13 | </td><td> | 13 | </td><td> |
14 | Should be used for new projects | 14 | Should be used for new projects |
diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv index ec785f9f15a3..2404099996ac 100644 --- a/Documentation/video4linux/CARDLIST.bttv +++ b/Documentation/video4linux/CARDLIST.bttv | |||
@@ -1,137 +1,142 @@ | |||
1 | card=0 - *** UNKNOWN/GENERIC *** | 1 | 0 -> *** UNKNOWN/GENERIC *** |
2 | card=1 - MIRO PCTV | 2 | 1 -> MIRO PCTV |
3 | card=2 - Hauppauge (bt848) | 3 | 2 -> Hauppauge (bt848) |
4 | card=3 - STB, Gateway P/N 6000699 (bt848) | 4 | 3 -> STB, Gateway P/N 6000699 (bt848) |
5 | card=4 - Intel Create and Share PCI/ Smart Video Recorder III | 5 | 4 -> Intel Create and Share PCI/ Smart Video Recorder III |
6 | card=5 - Diamond DTV2000 | 6 | 5 -> Diamond DTV2000 |
7 | card=6 - AVerMedia TVPhone | 7 | 6 -> AVerMedia TVPhone |
8 | card=7 - MATRIX-Vision MV-Delta | 8 | 7 -> MATRIX-Vision MV-Delta |
9 | card=8 - Lifeview FlyVideo II (Bt848) LR26 / MAXI TV Video PCI2 LR26 | 9 | 8 -> Lifeview FlyVideo II (Bt848) LR26 / MAXI TV Video PCI2 LR26 |
10 | card=9 - IMS/IXmicro TurboTV | 10 | 9 -> IMS/IXmicro TurboTV |
11 | card=10 - Hauppauge (bt878) | 11 | 10 -> Hauppauge (bt878) [0070:13eb,0070:3900,2636:10b4] |
12 | card=11 - MIRO PCTV pro | 12 | 11 -> MIRO PCTV pro |
13 | card=12 - ADS Technologies Channel Surfer TV (bt848) | 13 | 12 -> ADS Technologies Channel Surfer TV (bt848) |
14 | card=13 - AVerMedia TVCapture 98 | 14 | 13 -> AVerMedia TVCapture 98 [1461:0002,1461:0004,1461:0300] |
15 | card=14 - Aimslab Video Highway Xtreme (VHX) | 15 | 14 -> Aimslab Video Highway Xtreme (VHX) |
16 | card=15 - Zoltrix TV-Max | 16 | 15 -> Zoltrix TV-Max [a1a0:a0fc] |
17 | card=16 - Prolink Pixelview PlayTV (bt878) | 17 | 16 -> Prolink Pixelview PlayTV (bt878) |
18 | card=17 - Leadtek WinView 601 | 18 | 17 -> Leadtek WinView 601 |
19 | card=18 - AVEC Intercapture | 19 | 18 -> AVEC Intercapture |
20 | card=19 - Lifeview FlyVideo II EZ /FlyKit LR38 Bt848 (capture only) | 20 | 19 -> Lifeview FlyVideo II EZ /FlyKit LR38 Bt848 (capture only) |
21 | card=20 - CEI Raffles Card | 21 | 20 -> CEI Raffles Card |
22 | card=21 - Lifeview FlyVideo 98/ Lucky Star Image World ConferenceTV LR50 | 22 | 21 -> Lifeview FlyVideo 98/ Lucky Star Image World ConferenceTV LR50 |
23 | card=22 - Askey CPH050/ Phoebe Tv Master + FM | 23 | 22 -> Askey CPH050/ Phoebe Tv Master + FM [14ff:3002] |
24 | card=23 - Modular Technology MM201/MM202/MM205/MM210/MM215 PCTV, bt878 | 24 | 23 -> Modular Technology MM201/MM202/MM205/MM210/MM215 PCTV, bt878 [14c7:0101] |
25 | card=24 - Askey CPH05X/06X (bt878) [many vendors] | 25 | 24 -> Askey CPH05X/06X (bt878) [many vendors] [144f:3002,144f:3005,144f:5000,14ff:3000] |
26 | card=25 - Terratec TerraTV+ Version 1.0 (Bt848)/ Terra TValue Version 1.0/ Vobis TV-Boostar | 26 | 25 -> Terratec TerraTV+ Version 1.0 (Bt848)/ Terra TValue Version 1.0/ Vobis TV-Boostar |
27 | card=26 - Hauppauge WinCam newer (bt878) | 27 | 26 -> Hauppauge WinCam newer (bt878) |
28 | card=27 - Lifeview FlyVideo 98/ MAXI TV Video PCI2 LR50 | 28 | 27 -> Lifeview FlyVideo 98/ MAXI TV Video PCI2 LR50 |
29 | card=28 - Terratec TerraTV+ Version 1.1 (bt878) | 29 | 28 -> Terratec TerraTV+ Version 1.1 (bt878) [153b:1127,1852:1852] |
30 | card=29 - Imagenation PXC200 | 30 | 29 -> Imagenation PXC200 [1295:200a] |
31 | card=30 - Lifeview FlyVideo 98 LR50 | 31 | 30 -> Lifeview FlyVideo 98 LR50 [1f7f:1850] |
32 | card=31 - Formac iProTV, Formac ProTV I (bt848) | 32 | 31 -> Formac iProTV, Formac ProTV I (bt848) |
33 | card=32 - Intel Create and Share PCI/ Smart Video Recorder III | 33 | 32 -> Intel Create and Share PCI/ Smart Video Recorder III |
34 | card=33 - Terratec TerraTValue Version Bt878 | 34 | 33 -> Terratec TerraTValue Version Bt878 [153b:1117,153b:1118,153b:1119,153b:111a,153b:1134,153b:5018] |
35 | card=34 - Leadtek WinFast 2000/ WinFast 2000 XP | 35 | 34 -> Leadtek WinFast 2000/ WinFast 2000 XP [107d:6606,107d:6609,6606:217d,f6ff:fff6] |
36 | card=35 - Lifeview FlyVideo 98 LR50 / Chronos Video Shuttle II | 36 | 35 -> Lifeview FlyVideo 98 LR50 / Chronos Video Shuttle II [1851:1850,1851:a050] |
37 | card=36 - Lifeview FlyVideo 98FM LR50 / Typhoon TView TV/FM Tuner | 37 | 36 -> Lifeview FlyVideo 98FM LR50 / Typhoon TView TV/FM Tuner [1852:1852] |
38 | card=37 - Prolink PixelView PlayTV pro | 38 | 37 -> Prolink PixelView PlayTV pro |
39 | card=38 - Askey CPH06X TView99 | 39 | 38 -> Askey CPH06X TView99 [144f:3000,144f:a005,a04f:a0fc] |
40 | card=39 - Pinnacle PCTV Studio/Rave | 40 | 39 -> Pinnacle PCTV Studio/Rave [11bd:0012,bd11:1200,bd11:ff00,11bd:ff12] |
41 | card=40 - STB TV PCI FM, Gateway P/N 6000704 (bt878), 3Dfx VoodooTV 100 | 41 | 40 -> STB TV PCI FM, Gateway P/N 6000704 (bt878), 3Dfx VoodooTV 100 [10b4:2636,10b4:2645,121a:3060] |
42 | card=41 - AVerMedia TVPhone 98 | 42 | 41 -> AVerMedia TVPhone 98 [1461:0001,1461:0003] |
43 | card=42 - ProVideo PV951 | 43 | 42 -> ProVideo PV951 [aa0c:146c] |
44 | card=43 - Little OnAir TV | 44 | 43 -> Little OnAir TV |
45 | card=44 - Sigma TVII-FM | 45 | 44 -> Sigma TVII-FM |
46 | card=45 - MATRIX-Vision MV-Delta 2 | 46 | 45 -> MATRIX-Vision MV-Delta 2 |
47 | card=46 - Zoltrix Genie TV/FM | 47 | 46 -> Zoltrix Genie TV/FM [15b0:4000,15b0:400a,15b0:400d,15b0:4010,15b0:4016] |
48 | card=47 - Terratec TV/Radio+ | 48 | 47 -> Terratec TV/Radio+ [153b:1123] |
49 | card=48 - Askey CPH03x/ Dynalink Magic TView | 49 | 48 -> Askey CPH03x/ Dynalink Magic TView |
50 | card=49 - IODATA GV-BCTV3/PCI | 50 | 49 -> IODATA GV-BCTV3/PCI [10fc:4020] |
51 | card=50 - Prolink PV-BT878P+4E / PixelView PlayTV PAK / Lenco MXTV-9578 CP | 51 | 50 -> Prolink PV-BT878P+4E / PixelView PlayTV PAK / Lenco MXTV-9578 CP |
52 | card=51 - Eagle Wireless Capricorn2 (bt878A) | 52 | 51 -> Eagle Wireless Capricorn2 (bt878A) |
53 | card=52 - Pinnacle PCTV Studio Pro | 53 | 52 -> Pinnacle PCTV Studio Pro |
54 | card=53 - Typhoon TView RDS + FM Stereo / KNC1 TV Station RDS | 54 | 53 -> Typhoon TView RDS + FM Stereo / KNC1 TV Station RDS |
55 | card=54 - Lifeview FlyVideo 2000 /FlyVideo A2/ Lifetec LT 9415 TV [LR90] | 55 | 54 -> Lifeview FlyVideo 2000 /FlyVideo A2/ Lifetec LT 9415 TV [LR90] |
56 | card=55 - Askey CPH031/ BESTBUY Easy TV | 56 | 55 -> Askey CPH031/ BESTBUY Easy TV |
57 | card=56 - Lifeview FlyVideo 98FM LR50 | 57 | 56 -> Lifeview FlyVideo 98FM LR50 [a051:41a0] |
58 | card=57 - GrandTec 'Grand Video Capture' (Bt848) | 58 | 57 -> GrandTec 'Grand Video Capture' (Bt848) [4344:4142] |
59 | card=58 - Askey CPH060/ Phoebe TV Master Only (No FM) | 59 | 58 -> Askey CPH060/ Phoebe TV Master Only (No FM) |
60 | card=59 - Askey CPH03x TV Capturer | 60 | 59 -> Askey CPH03x TV Capturer |
61 | card=60 - Modular Technology MM100PCTV | 61 | 60 -> Modular Technology MM100PCTV |
62 | card=61 - AG Electronics GMV1 | 62 | 61 -> AG Electronics GMV1 [15cb:0101] |
63 | card=62 - Askey CPH061/ BESTBUY Easy TV (bt878) | 63 | 62 -> Askey CPH061/ BESTBUY Easy TV (bt878) |
64 | card=63 - ATI TV-Wonder | 64 | 63 -> ATI TV-Wonder [1002:0001] |
65 | card=64 - ATI TV-Wonder VE | 65 | 64 -> ATI TV-Wonder VE [1002:0003] |
66 | card=65 - Lifeview FlyVideo 2000S LR90 | 66 | 65 -> Lifeview FlyVideo 2000S LR90 |
67 | card=66 - Terratec TValueRadio | 67 | 66 -> Terratec TValueRadio [153b:1135,153b:ff3b] |
68 | card=67 - IODATA GV-BCTV4/PCI | 68 | 67 -> IODATA GV-BCTV4/PCI [10fc:4050] |
69 | card=68 - 3Dfx VoodooTV FM (Euro), VoodooTV 200 (USA) | 69 | 68 -> 3Dfx VoodooTV FM (Euro), VoodooTV 200 (USA) [121a:3000,10b4:2637] |
70 | card=69 - Active Imaging AIMMS | 70 | 69 -> Active Imaging AIMMS |
71 | card=70 - Prolink Pixelview PV-BT878P+ (Rev.4C,8E) | 71 | 70 -> Prolink Pixelview PV-BT878P+ (Rev.4C,8E) |
72 | card=71 - Lifeview FlyVideo 98EZ (capture only) LR51 | 72 | 71 -> Lifeview FlyVideo 98EZ (capture only) LR51 [1851:1851] |
73 | card=72 - Prolink Pixelview PV-BT878P+9B (PlayTV Pro rev.9B FM+NICAM) | 73 | 72 -> Prolink Pixelview PV-BT878P+9B (PlayTV Pro rev.9B FM+NICAM) [1554:4011] |
74 | card=73 - Sensoray 311 | 74 | 73 -> Sensoray 311 [6000:0311] |
75 | card=74 - RemoteVision MX (RV605) | 75 | 74 -> RemoteVision MX (RV605) |
76 | card=75 - Powercolor MTV878/ MTV878R/ MTV878F | 76 | 75 -> Powercolor MTV878/ MTV878R/ MTV878F |
77 | card=76 - Canopus WinDVR PCI (COMPAQ Presario 3524JP, 5112JP) | 77 | 76 -> Canopus WinDVR PCI (COMPAQ Presario 3524JP, 5112JP) [0e11:0079] |
78 | card=77 - GrandTec Multi Capture Card (Bt878) | 78 | 77 -> GrandTec Multi Capture Card (Bt878) |
79 | card=78 - Jetway TV/Capture JW-TV878-FBK, Kworld KW-TV878RF | 79 | 78 -> Jetway TV/Capture JW-TV878-FBK, Kworld KW-TV878RF [0a01:17de] |
80 | card=79 - DSP Design TCVIDEO | 80 | 79 -> DSP Design TCVIDEO |
81 | card=80 - Hauppauge WinTV PVR | 81 | 80 -> Hauppauge WinTV PVR [0070:4500] |
82 | card=81 - IODATA GV-BCTV5/PCI | 82 | 81 -> IODATA GV-BCTV5/PCI [10fc:4070,10fc:d018] |
83 | card=82 - Osprey 100/150 (878) | 83 | 82 -> Osprey 100/150 (878) [0070:ff00] |
84 | card=83 - Osprey 100/150 (848) | 84 | 83 -> Osprey 100/150 (848) |
85 | card=84 - Osprey 101 (848) | 85 | 84 -> Osprey 101 (848) |
86 | card=85 - Osprey 101/151 | 86 | 85 -> Osprey 101/151 |
87 | card=86 - Osprey 101/151 w/ svid | 87 | 86 -> Osprey 101/151 w/ svid |
88 | card=87 - Osprey 200/201/250/251 | 88 | 87 -> Osprey 200/201/250/251 |
89 | card=88 - Osprey 200/250 | 89 | 88 -> Osprey 200/250 [0070:ff01] |
90 | card=89 - Osprey 210/220 | 90 | 89 -> Osprey 210/220 |
91 | card=90 - Osprey 500 | 91 | 90 -> Osprey 500 [0070:ff02] |
92 | card=91 - Osprey 540 | 92 | 91 -> Osprey 540 [0070:ff04] |
93 | card=92 - Osprey 2000 | 93 | 92 -> Osprey 2000 [0070:ff03] |
94 | card=93 - IDS Eagle | 94 | 93 -> IDS Eagle |
95 | card=94 - Pinnacle PCTV Sat | 95 | 94 -> Pinnacle PCTV Sat [11bd:001c] |
96 | card=95 - Formac ProTV II (bt878) | 96 | 95 -> Formac ProTV II (bt878) |
97 | card=96 - MachTV | 97 | 96 -> MachTV |
98 | card=97 - Euresys Picolo | 98 | 97 -> Euresys Picolo |
99 | card=98 - ProVideo PV150 | 99 | 98 -> ProVideo PV150 [aa00:1460,aa01:1461,aa02:1462,aa03:1463,aa04:1464,aa05:1465,aa06:1466,aa07:1467] |
100 | card=99 - AD-TVK503 | 100 | 99 -> AD-TVK503 |
101 | card=100 - Hercules Smart TV Stereo | 101 | 100 -> Hercules Smart TV Stereo |
102 | card=101 - Pace TV & Radio Card | 102 | 101 -> Pace TV & Radio Card |
103 | card=102 - IVC-200 | 103 | 102 -> IVC-200 [0000:a155,0001:a155,0002:a155,0003:a155,0100:a155,0101:a155,0102:a155,0103:a155] |
104 | card=103 - Grand X-Guard / Trust 814PCI | 104 | 103 -> Grand X-Guard / Trust 814PCI [0304:0102] |
105 | card=104 - Nebula Electronics DigiTV | 105 | 104 -> Nebula Electronics DigiTV [0071:0101] |
106 | card=105 - ProVideo PV143 | 106 | 105 -> ProVideo PV143 [aa00:1430,aa00:1431,aa00:1432,aa00:1433,aa03:1433] |
107 | card=106 - PHYTEC VD-009-X1 MiniDIN (bt878) | 107 | 106 -> PHYTEC VD-009-X1 MiniDIN (bt878) |
108 | card=107 - PHYTEC VD-009-X1 Combi (bt878) | 108 | 107 -> PHYTEC VD-009-X1 Combi (bt878) |
109 | card=108 - PHYTEC VD-009 MiniDIN (bt878) | 109 | 108 -> PHYTEC VD-009 MiniDIN (bt878) |
110 | card=109 - PHYTEC VD-009 Combi (bt878) | 110 | 109 -> PHYTEC VD-009 Combi (bt878) |
111 | card=110 - IVC-100 | 111 | 110 -> IVC-100 [ff00:a132] |
112 | card=111 - IVC-120G | 112 | 111 -> IVC-120G [ff00:a182,ff01:a182,ff02:a182,ff03:a182,ff04:a182,ff05:a182,ff06:a182,ff07:a182,ff08:a182,ff09:a182,ff0a:a182,ff0b:a182,ff0c:a182,ff0d:a182,ff0e:a182,ff0f:a182] |
113 | card=112 - pcHDTV HD-2000 TV | 113 | 112 -> pcHDTV HD-2000 TV [7063:2000] |
114 | card=113 - Twinhan DST + clones | 114 | 113 -> Twinhan DST + clones [11bd:0026,1822:0001,270f:fc00] |
115 | card=114 - Winfast VC100 | 115 | 114 -> Winfast VC100 [107d:6607] |
116 | card=115 - Teppro TEV-560/InterVision IV-560 | 116 | 115 -> Teppro TEV-560/InterVision IV-560 |
117 | card=116 - SIMUS GVC1100 | 117 | 116 -> SIMUS GVC1100 [aa6a:82b2] |
118 | card=117 - NGS NGSTV+ | 118 | 117 -> NGS NGSTV+ |
119 | card=118 - LMLBT4 | 119 | 118 -> LMLBT4 |
120 | card=119 - Tekram M205 PRO | 120 | 119 -> Tekram M205 PRO |
121 | card=120 - Conceptronic CONTVFMi | 121 | 120 -> Conceptronic CONTVFMi |
122 | card=121 - Euresys Picolo Tetra | 122 | 121 -> Euresys Picolo Tetra [1805:0105,1805:0106,1805:0107,1805:0108] |
123 | card=122 - Spirit TV Tuner | 123 | 122 -> Spirit TV Tuner |
124 | card=123 - AVerMedia AVerTV DVB-T 771 | 124 | 123 -> AVerMedia AVerTV DVB-T 771 [1461:0771] |
125 | card=124 - AverMedia AverTV DVB-T 761 | 125 | 124 -> AverMedia AverTV DVB-T 761 [1461:0761] |
126 | card=125 - MATRIX Vision Sigma-SQ | 126 | 125 -> MATRIX Vision Sigma-SQ |
127 | card=126 - MATRIX Vision Sigma-SLC | 127 | 126 -> MATRIX Vision Sigma-SLC |
128 | card=127 - APAC Viewcomp 878(AMAX) | 128 | 127 -> APAC Viewcomp 878(AMAX) |
129 | card=128 - DViCO FusionHDTV DVB-T Lite | 129 | 128 -> DViCO FusionHDTV DVB-T Lite [18ac:db10] |
130 | card=129 - V-Gear MyVCD | 130 | 129 -> V-Gear MyVCD |
131 | card=130 - Super TV Tuner | 131 | 130 -> Super TV Tuner |
132 | card=131 - Tibet Systems 'Progress DVR' CS16 | 132 | 131 -> Tibet Systems 'Progress DVR' CS16 |
133 | card=132 - Kodicom 4400R (master) | 133 | 132 -> Kodicom 4400R (master) |
134 | card=133 - Kodicom 4400R (slave) | 134 | 133 -> Kodicom 4400R (slave) |
135 | card=134 - Adlink RTV24 | 135 | 134 -> Adlink RTV24 |
136 | card=135 - DViCO FusionHDTV 5 Lite | 136 | 135 -> DViCO FusionHDTV 5 Lite [18ac:d500] |
137 | card=136 - Acorp Y878F | 137 | 136 -> Acorp Y878F [9511:1540] |
138 | 137 -> Conceptronic CTVFMi v2 | ||
139 | 138 -> Prolink Pixelview PV-BT878P+ (Rev.2E) | ||
140 | 139 -> Prolink PixelView PlayTV MPEG2 PV-M4900 | ||
141 | 140 -> Osprey 440 [0070:ff07] | ||
142 | 141 -> Asound Skyeye PCTV | ||
diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88 index 03deb0726aa4..a1017d1a85d4 100644 --- a/Documentation/video4linux/CARDLIST.cx88 +++ b/Documentation/video4linux/CARDLIST.cx88 | |||
@@ -1,32 +1,37 @@ | |||
1 | card=0 - UNKNOWN/GENERIC | 1 | 0 -> UNKNOWN/GENERIC |
2 | card=1 - Hauppauge WinTV 34xxx models | 2 | 1 -> Hauppauge WinTV 34xxx models [0070:3400,0070:3401] |
3 | card=2 - GDI Black Gold | 3 | 2 -> GDI Black Gold [14c7:0106,14c7:0107] |
4 | card=3 - PixelView | 4 | 3 -> PixelView [1554:4811] |
5 | card=4 - ATI TV Wonder Pro | 5 | 4 -> ATI TV Wonder Pro [1002:00f8] |
6 | card=5 - Leadtek Winfast 2000XP Expert | 6 | 5 -> Leadtek Winfast 2000XP Expert [107d:6611,107d:6613] |
7 | card=6 - AverTV Studio 303 (M126) | 7 | 6 -> AverTV Studio 303 (M126) [1461:000b] |
8 | card=7 - MSI TV-@nywhere Master | 8 | 7 -> MSI TV-@nywhere Master [1462:8606] |
9 | card=8 - Leadtek Winfast DV2000 | 9 | 8 -> Leadtek Winfast DV2000 [107d:6620] |
10 | card=9 - Leadtek PVR 2000 | 10 | 9 -> Leadtek PVR 2000 [107d:663b,107d:663C] |
11 | card=10 - IODATA GV-VCP3/PCI | 11 | 10 -> IODATA GV-VCP3/PCI [10fc:d003] |
12 | card=11 - Prolink PlayTV PVR | 12 | 11 -> Prolink PlayTV PVR |
13 | card=12 - ASUS PVR-416 | 13 | 12 -> ASUS PVR-416 [1043:4823] |
14 | card=13 - MSI TV-@nywhere | 14 | 13 -> MSI TV-@nywhere |
15 | card=14 - KWorld/VStream XPert DVB-T | 15 | 14 -> KWorld/VStream XPert DVB-T [17de:08a6] |
16 | card=15 - DViCO FusionHDTV DVB-T1 | 16 | 15 -> DViCO FusionHDTV DVB-T1 [18ac:db00] |
17 | card=16 - KWorld LTV883RF | 17 | 16 -> KWorld LTV883RF |
18 | card=17 - DViCO FusionHDTV 3 Gold-Q | 18 | 17 -> DViCO FusionHDTV 3 Gold-Q [18ac:d810] |
19 | card=18 - Hauppauge Nova-T DVB-T | 19 | 18 -> Hauppauge Nova-T DVB-T [0070:9002] |
20 | card=19 - Conexant DVB-T reference design | 20 | 19 -> Conexant DVB-T reference design [14f1:0187] |
21 | card=20 - Provideo PV259 | 21 | 20 -> Provideo PV259 [1540:2580] |
22 | card=21 - DViCO FusionHDTV DVB-T Plus | 22 | 21 -> DViCO FusionHDTV DVB-T Plus [18ac:db10] |
23 | card=22 - digitalnow DNTV Live! DVB-T | 23 | 22 -> pcHDTV HD3000 HDTV [7063:3000] |
24 | card=23 - pcHDTV HD3000 HDTV | 24 | 23 -> digitalnow DNTV Live! DVB-T [17de:a8a6] |
25 | card=24 - Hauppauge WinTV 28xxx (Roslyn) models | 25 | 24 -> Hauppauge WinTV 28xxx (Roslyn) models [0070:2801] |
26 | card=25 - Digital-Logic MICROSPACE Entertainment Center (MEC) | 26 | 25 -> Digital-Logic MICROSPACE Entertainment Center (MEC) [14f1:0342] |
27 | card=26 - IODATA GV/BCTV7E | 27 | 26 -> IODATA GV/BCTV7E [10fc:d035] |
28 | card=27 - PixelView PlayTV Ultra Pro (Stereo) | 28 | 27 -> PixelView PlayTV Ultra Pro (Stereo) |
29 | card=28 - DViCO FusionHDTV 3 Gold-T | 29 | 28 -> DViCO FusionHDTV 3 Gold-T [18ac:d820] |
30 | card=29 - ADS Tech Instant TV DVB-T PCI | 30 | 29 -> ADS Tech Instant TV DVB-T PCI [1421:0334] |
31 | card=30 - TerraTec Cinergy 1400 DVB-T | 31 | 30 -> TerraTec Cinergy 1400 DVB-T [153b:1166] |
32 | card=31 - DViCO FusionHDTV 5 Gold | 32 | 31 -> DViCO FusionHDTV 5 Gold [18ac:d500] |
33 | 32 -> AverMedia UltraTV Media Center PCI 550 [1461:8011] | ||
34 | 33 -> Kworld V-Stream Xpert DVD | ||
35 | 34 -> ATI HDTV Wonder [1002:a101] | ||
36 | 35 -> WinFast DTV1000-T [107d:665f] | ||
37 | 36 -> AVerTV 303 (M126) [1461:000a] | ||
diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx new file mode 100644 index 000000000000..a0c7cad20971 --- /dev/null +++ b/Documentation/video4linux/CARDLIST.em28xx | |||
@@ -0,0 +1,10 @@ | |||
1 | 0 -> Unknown EM2800 video grabber (em2800) [eb1a:2800] | ||
2 | 1 -> Unknown EM2820/2840 video grabber (em2820/em2840) | ||
3 | 2 -> Terratec Cinergy 250 USB (em2820/em2840) [0ccd:0036] | ||
4 | 3 -> Pinnacle PCTV USB 2 (em2820/em2840) [2304:0208] | ||
5 | 4 -> Hauppauge WinTV USB 2 (em2820/em2840) [2040:4200] | ||
6 | 5 -> MSI VOX USB 2.0 (em2820/em2840) [eb1a:2820] | ||
7 | 6 -> Terratec Cinergy 200 USB (em2800) | ||
8 | 7 -> Leadtek Winfast USB II (em2800) | ||
9 | 8 -> Kworld USB2800 (em2800) | ||
10 | 9 -> Pinnacle Dazzle DVC 90 (em2820/em2840) [2304:0207] | ||
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134 index dc57225f39be..57c9d631db56 100644 --- a/Documentation/video4linux/CARDLIST.saa7134 +++ b/Documentation/video4linux/CARDLIST.saa7134 | |||
@@ -6,10 +6,10 @@ | |||
6 | 5 -> SKNet Monster TV [1131:4e85] | 6 | 5 -> SKNet Monster TV [1131:4e85] |
7 | 6 -> Tevion MD 9717 | 7 | 6 -> Tevion MD 9717 |
8 | 7 -> KNC One TV-Station RDS / Typhoon TV Tuner RDS [1131:fe01,1894:fe01] | 8 | 7 -> KNC One TV-Station RDS / Typhoon TV Tuner RDS [1131:fe01,1894:fe01] |
9 | 8 -> Terratec Cinergy 400 TV [153B:1142] | 9 | 8 -> Terratec Cinergy 400 TV [153b:1142] |
10 | 9 -> Medion 5044 | 10 | 9 -> Medion 5044 |
11 | 10 -> Kworld/KuroutoShikou SAA7130-TVPCI | 11 | 10 -> Kworld/KuroutoShikou SAA7130-TVPCI |
12 | 11 -> Terratec Cinergy 600 TV [153B:1143] | 12 | 11 -> Terratec Cinergy 600 TV [153b:1143] |
13 | 12 -> Medion 7134 [16be:0003] | 13 | 12 -> Medion 7134 [16be:0003] |
14 | 13 -> Typhoon TV+Radio 90031 | 14 | 13 -> Typhoon TV+Radio 90031 |
15 | 14 -> ELSA EX-VISION 300TV [1048:226b] | 15 | 14 -> ELSA EX-VISION 300TV [1048:226b] |
@@ -36,8 +36,8 @@ | |||
36 | 35 -> AverMedia AverTV Studio 305 [1461:2115] | 36 | 35 -> AverMedia AverTV Studio 305 [1461:2115] |
37 | 36 -> UPMOST PURPLE TV [12ab:0800] | 37 | 36 -> UPMOST PURPLE TV [12ab:0800] |
38 | 37 -> Items MuchTV Plus / IT-005 | 38 | 37 -> Items MuchTV Plus / IT-005 |
39 | 38 -> Terratec Cinergy 200 TV [153B:1152] | 39 | 38 -> Terratec Cinergy 200 TV [153b:1152] |
40 | 39 -> LifeView FlyTV Platinum Mini [5168:0212] | 40 | 39 -> LifeView FlyTV Platinum Mini [5168:0212,4e42:0212] |
41 | 40 -> Compro VideoMate TV PVR/FM [185b:c100] | 41 | 40 -> Compro VideoMate TV PVR/FM [185b:c100] |
42 | 41 -> Compro VideoMate TV Gold+ [185b:c100] | 42 | 41 -> Compro VideoMate TV Gold+ [185b:c100] |
43 | 42 -> Sabrent SBT-TVFM (saa7130) | 43 | 42 -> Sabrent SBT-TVFM (saa7130) |
@@ -46,7 +46,7 @@ | |||
46 | 45 -> Avermedia AVerTV Studio 307 [1461:9715] | 46 | 45 -> Avermedia AVerTV Studio 307 [1461:9715] |
47 | 46 -> AVerMedia Cardbus TV/Radio (E500) [1461:d6ee] | 47 | 46 -> AVerMedia Cardbus TV/Radio (E500) [1461:d6ee] |
48 | 47 -> Terratec Cinergy 400 mobile [153b:1162] | 48 | 47 -> Terratec Cinergy 400 mobile [153b:1162] |
49 | 48 -> Terratec Cinergy 600 TV MK3 [153B:1158] | 49 | 48 -> Terratec Cinergy 600 TV MK3 [153b:1158] |
50 | 49 -> Compro VideoMate Gold+ Pal [185b:c200] | 50 | 49 -> Compro VideoMate Gold+ Pal [185b:c200] |
51 | 50 -> Pinnacle PCTV 300i DVB-T + PAL [11bd:002d] | 51 | 50 -> Pinnacle PCTV 300i DVB-T + PAL [11bd:002d] |
52 | 51 -> ProVideo PV952 [1540:9524] | 52 | 51 -> ProVideo PV952 [1540:9524] |
@@ -56,12 +56,27 @@ | |||
56 | 55 -> LifeView FlyDVB-T DUO [5168:0502,5168:0306] | 56 | 55 -> LifeView FlyDVB-T DUO [5168:0502,5168:0306] |
57 | 56 -> Avermedia AVerTV 307 [1461:a70a] | 57 | 56 -> Avermedia AVerTV 307 [1461:a70a] |
58 | 57 -> Avermedia AVerTV GO 007 FM [1461:f31f] | 58 | 57 -> Avermedia AVerTV GO 007 FM [1461:f31f] |
59 | 58 -> ADS Tech Instant TV (saa7135) [1421:0350,1421:0370] | 59 | 58 -> ADS Tech Instant TV (saa7135) [1421:0350,1421:0370,1421:1370] |
60 | 59 -> Kworld/Tevion V-Stream Xpert TV PVR7134 | 60 | 59 -> Kworld/Tevion V-Stream Xpert TV PVR7134 |
61 | 60 -> Typhoon DVB-T Duo Digital/Analog Cardbus [4e42:0502] | 61 | 60 -> Typhoon DVB-T Duo Digital/Analog Cardbus [4e42:0502] |
62 | 61 -> Philips TOUGH DVB-T reference design [1131:2004] | 62 | 61 -> Philips TOUGH DVB-T reference design [1131:2004] |
63 | 62 -> Compro VideoMate TV Gold+II | 63 | 62 -> Compro VideoMate TV Gold+II |
64 | 63 -> Kworld Xpert TV PVR7134 | 64 | 63 -> Kworld Xpert TV PVR7134 |
65 | 64 -> FlyTV mini Asus Digimatrix [1043:0210,1043:0210] | 65 | 64 -> FlyTV mini Asus Digimatrix [1043:0210] |
66 | 65 -> V-Stream Studio TV Terminator | 66 | 65 -> V-Stream Studio TV Terminator |
67 | 66 -> Yuan TUN-900 (saa7135) | 67 | 66 -> Yuan TUN-900 (saa7135) |
68 | 67 -> Beholder BeholdTV 409 FM [0000:4091] | ||
69 | 68 -> GoTView 7135 PCI [5456:7135] | ||
70 | 69 -> Philips EUROPA V3 reference design [1131:2004] | ||
71 | 70 -> Compro Videomate DVB-T300 [185b:c900] | ||
72 | 71 -> Compro Videomate DVB-T200 [185b:c901] | ||
73 | 72 -> RTD Embedded Technologies VFG7350 [1435:7350] | ||
74 | 73 -> RTD Embedded Technologies VFG7330 [1435:7330] | ||
75 | 74 -> LifeView FlyTV Platinum Mini2 [14c0:1212] | ||
76 | 75 -> AVerMedia AVerTVHD MCE A180 [1461:1044] | ||
77 | 76 -> SKNet MonsterTV Mobile [1131:4ee9] | ||
78 | 77 -> Pinnacle PCTV 110i (saa7133) [11bd:002e] | ||
79 | 78 -> ASUSTeK P7131 Dual [1043:4862] | ||
80 | 79 -> Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B) | ||
81 | 80 -> ASUS Digimatrix TV [1043:0210] | ||
82 | 81 -> Philips Tiger reference design [1131:2018] | ||
diff --git a/Documentation/video4linux/CARDLIST.tuner b/Documentation/video4linux/CARDLIST.tuner index f5876be658a6..ec840ca6f455 100644 --- a/Documentation/video4linux/CARDLIST.tuner +++ b/Documentation/video4linux/CARDLIST.tuner | |||
@@ -53,7 +53,7 @@ tuner=51 - Philips PAL/SECAM_D (FM 1256 I-H3) | |||
53 | tuner=52 - Thomson DDT 7610 (ATSC/NTSC) | 53 | tuner=52 - Thomson DDT 7610 (ATSC/NTSC) |
54 | tuner=53 - Philips FQ1286 | 54 | tuner=53 - Philips FQ1286 |
55 | tuner=54 - tda8290+75 | 55 | tuner=54 - tda8290+75 |
56 | tuner=55 - LG PAL (TAPE series) | 56 | tuner=55 - TCL 2002MB |
57 | tuner=56 - Philips PAL/SECAM multi (FQ1216AME MK4) | 57 | tuner=56 - Philips PAL/SECAM multi (FQ1216AME MK4) |
58 | tuner=57 - Philips FQ1236A MK4 | 58 | tuner=57 - Philips FQ1236A MK4 |
59 | tuner=58 - Ymec TVision TVF-8531MF/8831MF/8731MF | 59 | tuner=58 - Ymec TVision TVF-8531MF/8831MF/8731MF |
@@ -65,3 +65,5 @@ tuner=63 - Philips FMD1216ME MK3 Hybrid Tuner | |||
65 | tuner=64 - LG TDVS-H062F/TUA6034 | 65 | tuner=64 - LG TDVS-H062F/TUA6034 |
66 | tuner=65 - Ymec TVF66T5-B/DFF | 66 | tuner=65 - Ymec TVF66T5-B/DFF |
67 | tuner=66 - LG NTSC (TALN mini series) | 67 | tuner=66 - LG NTSC (TALN mini series) |
68 | tuner=67 - Philips TD1316 Hybrid Tuner | ||
69 | tuner=68 - Philips TUV1236D ATSC/NTSC dual in | ||
diff --git a/Documentation/video4linux/README.cx88 b/Documentation/video4linux/README.cx88 index 897ab834839a..06a33a4f52fd 100644 --- a/Documentation/video4linux/README.cx88 +++ b/Documentation/video4linux/README.cx88 | |||
@@ -17,9 +17,9 @@ audio | |||
17 | - The chip specs for the on-chip TV sound decoder are next | 17 | - The chip specs for the on-chip TV sound decoder are next |
18 | to useless :-/ | 18 | to useless :-/ |
19 | - Neverless the builtin TV sound decoder starts working now, | 19 | - Neverless the builtin TV sound decoder starts working now, |
20 | at least for PAL-BG. Other TV norms need other code ... | 20 | at least for PAL-BG. Other TV norms need other code ... |
21 | FOR ANY REPORTS ON THIS PLEASE MENTION THE TV NORM YOU ARE | 21 | FOR ANY REPORTS ON THIS PLEASE MENTION THE TV NORM YOU ARE |
22 | USING. | 22 | USING. |
23 | - Most tuner chips do provide mono sound, which may or may not | 23 | - Most tuner chips do provide mono sound, which may or may not |
24 | be useable depending on the board design. With the Hauppauge | 24 | be useable depending on the board design. With the Hauppauge |
25 | cards it works, so there is mono sound available as fallback. | 25 | cards it works, so there is mono sound available as fallback. |
@@ -65,5 +65,5 @@ Have fun, | |||
65 | 65 | ||
66 | Gerd | 66 | Gerd |
67 | 67 | ||
68 | -- | 68 | -- |
69 | Gerd Knorr <kraxel@bytesex.org> [SuSE Labs] | 69 | Gerd Knorr <kraxel@bytesex.org> [SuSE Labs] |
diff --git a/Documentation/video4linux/README.saa7134 b/Documentation/video4linux/README.saa7134 index 1f788e498eff..b911f0871874 100644 --- a/Documentation/video4linux/README.saa7134 +++ b/Documentation/video4linux/README.saa7134 | |||
@@ -78,5 +78,5 @@ Have fun, | |||
78 | 78 | ||
79 | Gerd | 79 | Gerd |
80 | 80 | ||
81 | -- | 81 | -- |
82 | Gerd Knorr <kraxel@bytesex.org> [SuSE Labs] | 82 | Gerd Knorr <kraxel@bytesex.org> [SuSE Labs] |
diff --git a/Documentation/video4linux/bttv/Cards b/Documentation/video4linux/bttv/Cards index 8f1941ede4da..d3389655ad96 100644 --- a/Documentation/video4linux/bttv/Cards +++ b/Documentation/video4linux/bttv/Cards | |||
@@ -149,11 +149,11 @@ Lifeview Flyvideo Series: | |||
149 | 2) There is a print on the PCB: | 149 | 2) There is a print on the PCB: |
150 | LR25 = Flyvideo (Zoran ZR36120, SAA7110A) | 150 | LR25 = Flyvideo (Zoran ZR36120, SAA7110A) |
151 | LR26 Rev.N = Flyvideo II (Bt848) | 151 | LR26 Rev.N = Flyvideo II (Bt848) |
152 | Rev.O = Flyvideo II (Bt878) | 152 | Rev.O = Flyvideo II (Bt878) |
153 | LR37 Rev.C = Flyvideo EZ (Capture only, ZR36120 + SAA7110) | 153 | LR37 Rev.C = Flyvideo EZ (Capture only, ZR36120 + SAA7110) |
154 | LR38 Rev.A1= Flyvideo II EZ (Bt848 capture only) | 154 | LR38 Rev.A1= Flyvideo II EZ (Bt848 capture only) |
155 | LR50 Rev.Q = Flyvideo 98 (w/eeprom and PCI subsystem ID) | 155 | LR50 Rev.Q = Flyvideo 98 (w/eeprom and PCI subsystem ID) |
156 | Rev.W = Flyvideo 98 (no eeprom) | 156 | Rev.W = Flyvideo 98 (no eeprom) |
157 | LR51 Rev.E = Flyvideo 98 EZ (capture only) | 157 | LR51 Rev.E = Flyvideo 98 EZ (capture only) |
158 | LR90 = Flyvideo 2000 (Bt878) | 158 | LR90 = Flyvideo 2000 (Bt878) |
159 | Flyvideo 2000S (Bt878) w/Stereo TV (Package incl. LR91 daughterboard) | 159 | Flyvideo 2000S (Bt878) w/Stereo TV (Package incl. LR91 daughterboard) |
@@ -163,7 +163,7 @@ Lifeview Flyvideo Series: | |||
163 | LR136 = Flyvideo 2100/3100 (Low profile, SAA7130/SAA7134) | 163 | LR136 = Flyvideo 2100/3100 (Low profile, SAA7130/SAA7134) |
164 | LR137 = Flyvideo DV2000/DV3000 (SAA7130/SAA7134 + IEEE1394) | 164 | LR137 = Flyvideo DV2000/DV3000 (SAA7130/SAA7134 + IEEE1394) |
165 | LR138 Rev.C= Flyvideo 2000 (SAA7130) | 165 | LR138 Rev.C= Flyvideo 2000 (SAA7130) |
166 | or Flyvideo 3000 (SAA7134) w/Stereo TV | 166 | or Flyvideo 3000 (SAA7134) w/Stereo TV |
167 | These exist in variations w/FM and w/Remote sometimes denoted | 167 | These exist in variations w/FM and w/Remote sometimes denoted |
168 | by suffixes "FM" and "R". | 168 | by suffixes "FM" and "R". |
169 | 3) You have a laptop (miniPCI card): | 169 | 3) You have a laptop (miniPCI card): |
@@ -197,7 +197,7 @@ Typhoon TV card series: | |||
197 | 50680 "TV Tuner Pal BG" (blue package)= Pixelview PV-BT878P+ (Rev 9B) | 197 | 50680 "TV Tuner Pal BG" (blue package)= Pixelview PV-BT878P+ (Rev 9B) |
198 | 50681 "TV Tuner PCI Pal I" (variant of 50680) | 198 | 50681 "TV Tuner PCI Pal I" (variant of 50680) |
199 | 50682 "TView TV/FM Tuner Pal BG" = Flyvideo 98FM (LR50 Rev.Q) | 199 | 50682 "TView TV/FM Tuner Pal BG" = Flyvideo 98FM (LR50 Rev.Q) |
200 | Note: The package has a picture of CPH05x (which would be a real TView) | 200 | Note: The package has a picture of CPH05x (which would be a real TView) |
201 | 50683 "TV Tuner PCI SECAM" (variant of 50680) | 201 | 50683 "TV Tuner PCI SECAM" (variant of 50680) |
202 | 50684 "TV Tuner Pal BG" = Pixelview 878TV(Rev.3D) | 202 | 50684 "TV Tuner Pal BG" = Pixelview 878TV(Rev.3D) |
203 | 50686 "TV Tuner" = KNC1 TV Station | 203 | 50686 "TV Tuner" = KNC1 TV Station |
@@ -418,9 +418,9 @@ Lifetec/Medion/Tevion/Aldi | |||
418 | -------------------------- | 418 | -------------------------- |
419 | LT9306/MD9306 = CPH061 | 419 | LT9306/MD9306 = CPH061 |
420 | LT9415/MD9415 = LR90 Rev.F or Rev.G | 420 | LT9415/MD9415 = LR90 Rev.F or Rev.G |
421 | MD9592 = Avermedia TVphone98 (PCI_ID=1461:0003), PCB-Rev=M168II-B (w/TDA9873H) | 421 | MD9592 = Avermedia TVphone98 (PCI_ID=1461:0003), PCB-Rev=M168II-B (w/TDA9873H) |
422 | MD9717 = KNC One (Rev D4, saa7134, FM1216 MK2 tuner) | 422 | MD9717 = KNC One (Rev D4, saa7134, FM1216 MK2 tuner) |
423 | MD5044 = KNC One (Rev D4, saa7134, FM1216ME MK3 tuner) | 423 | MD5044 = KNC One (Rev D4, saa7134, FM1216ME MK3 tuner) |
424 | 424 | ||
425 | Modular Technologies (www.modulartech.com) UK | 425 | Modular Technologies (www.modulartech.com) UK |
426 | --------------------------------------------- | 426 | --------------------------------------------- |
@@ -453,10 +453,10 @@ Technisat | |||
453 | Discos ADR PC-Karte ISA (no TV!) | 453 | Discos ADR PC-Karte ISA (no TV!) |
454 | Discos ADR PC-Karte PCI (probably no TV?) | 454 | Discos ADR PC-Karte PCI (probably no TV?) |
455 | Techni-PC-Sat (Sat. analog) | 455 | Techni-PC-Sat (Sat. analog) |
456 | Rev 1.2 (zr36120, vpx3220, stv0030, saa5246, BSJE3-494A) | 456 | Rev 1.2 (zr36120, vpx3220, stv0030, saa5246, BSJE3-494A) |
457 | Mediafocus I (zr36120/zr36125, drp3510, Sat. analog + ADR Radio) | 457 | Mediafocus I (zr36120/zr36125, drp3510, Sat. analog + ADR Radio) |
458 | Mediafocus II (saa7146, Sat. analog) | 458 | Mediafocus II (saa7146, Sat. analog) |
459 | SatADR Rev 2.1 (saa7146a, saa7113h, stv0056a, msp3400c, drp3510a, BSKE3-307A) | 459 | SatADR Rev 2.1 (saa7146a, saa7113h, stv0056a, msp3400c, drp3510a, BSKE3-307A) |
460 | SkyStar 1 DVB (AV7110) = Technotrend Premium | 460 | SkyStar 1 DVB (AV7110) = Technotrend Premium |
461 | SkyStar 2 DVB (B2C2) (=Sky2PC) | 461 | SkyStar 2 DVB (B2C2) (=Sky2PC) |
462 | 462 | ||
diff --git a/Documentation/video4linux/bttv/README b/Documentation/video4linux/bttv/README index a72f4c94fb0b..7ca2154c2bf5 100644 --- a/Documentation/video4linux/bttv/README +++ b/Documentation/video4linux/bttv/README | |||
@@ -42,9 +42,9 @@ bttv uses the PCI Subsystem ID to autodetect the card type. lspci lists | |||
42 | the Subsystem ID in the second line, looks like this: | 42 | the Subsystem ID in the second line, looks like this: |
43 | 43 | ||
44 | 00:0a.0 Multimedia video controller: Brooktree Corporation Bt878 (rev 02) | 44 | 00:0a.0 Multimedia video controller: Brooktree Corporation Bt878 (rev 02) |
45 | Subsystem: Hauppauge computer works Inc. WinTV/GO | 45 | Subsystem: Hauppauge computer works Inc. WinTV/GO |
46 | Flags: bus master, medium devsel, latency 32, IRQ 5 | 46 | Flags: bus master, medium devsel, latency 32, IRQ 5 |
47 | Memory at e2000000 (32-bit, prefetchable) [size=4K] | 47 | Memory at e2000000 (32-bit, prefetchable) [size=4K] |
48 | 48 | ||
49 | only bt878-based cards can have a subsystem ID (which does not mean | 49 | only bt878-based cards can have a subsystem ID (which does not mean |
50 | that every card really has one). bt848 cards can't have a Subsystem | 50 | that every card really has one). bt848 cards can't have a Subsystem |
diff --git a/Documentation/video4linux/bttv/Sound-FAQ b/Documentation/video4linux/bttv/Sound-FAQ index b8c9c2605ce2..1e6328f91083 100644 --- a/Documentation/video4linux/bttv/Sound-FAQ +++ b/Documentation/video4linux/bttv/Sound-FAQ | |||
@@ -61,8 +61,8 @@ line for your board. The important fields are these two: | |||
61 | struct tvcard | 61 | struct tvcard |
62 | { | 62 | { |
63 | [ ... ] | 63 | [ ... ] |
64 | u32 gpiomask; | 64 | u32 gpiomask; |
65 | u32 audiomux[6]; /* Tuner, Radio, external, internal, mute, stereo */ | 65 | u32 audiomux[6]; /* Tuner, Radio, external, internal, mute, stereo */ |
66 | }; | 66 | }; |
67 | 67 | ||
68 | gpiomask specifies which pins are used to control the audio mux chip. | 68 | gpiomask specifies which pins are used to control the audio mux chip. |
@@ -126,11 +126,11 @@ muxsel - video mux, input->registervalue mapping | |||
126 | pll - same as pll= insmod option | 126 | pll - same as pll= insmod option |
127 | tuner_type - same as tuner= insmod option | 127 | tuner_type - same as tuner= insmod option |
128 | *_modulename - hint whenever some card needs this or that audio | 128 | *_modulename - hint whenever some card needs this or that audio |
129 | module loaded to work properly. | 129 | module loaded to work properly. |
130 | has_radio - whenever this TV card has a radio tuner. | 130 | has_radio - whenever this TV card has a radio tuner. |
131 | no_msp34xx - "1" disables loading of msp3400.o module | 131 | no_msp34xx - "1" disables loading of msp3400.o module |
132 | no_tda9875 - "1" disables loading of tda9875.o module | 132 | no_tda9875 - "1" disables loading of tda9875.o module |
133 | needs_tvaudio - set to "1" to load tvaudio.o module | 133 | needs_tvaudio - set to "1" to load tvaudio.o module |
134 | 134 | ||
135 | If some config item is specified both from the tvcards array and as | 135 | If some config item is specified both from the tvcards array and as |
136 | insmod option, the insmod option takes precedence. | 136 | insmod option, the insmod option takes precedence. |
@@ -144,5 +144,5 @@ Good luck, | |||
144 | 144 | ||
145 | PS: If you have a new working entry, mail it to me. | 145 | PS: If you have a new working entry, mail it to me. |
146 | 146 | ||
147 | -- | 147 | -- |
148 | Gerd Knorr <kraxel@bytesex.org> | 148 | Gerd Knorr <kraxel@bytesex.org> |
diff --git a/Documentation/video4linux/bttv/Tuners b/Documentation/video4linux/bttv/Tuners index d18fbc70c0e0..0a371d349542 100644 --- a/Documentation/video4linux/bttv/Tuners +++ b/Documentation/video4linux/bttv/Tuners | |||
@@ -21,7 +21,7 @@ SAMSUNG Tuner identification: (e.g. TCPM9091PD27) | |||
21 | J= NTSC-Japan | 21 | J= NTSC-Japan |
22 | L= Secam LL | 22 | L= Secam LL |
23 | M= BG+I+DK | 23 | M= BG+I+DK |
24 | N= NTSC | 24 | N= NTSC |
25 | Q= BG+I+DK+LL | 25 | Q= BG+I+DK+LL |
26 | [89]: ? | 26 | [89]: ? |
27 | [125]: | 27 | [125]: |
@@ -96,7 +96,7 @@ LG Innotek Tuner: | |||
96 | TADC-H002F: NTSC (L,175/410?; 2-B, C-W+11, W+12-69) | 96 | TADC-H002F: NTSC (L,175/410?; 2-B, C-W+11, W+12-69) |
97 | TADC-M201D: PAL D/K+B/G+I (L,143/425) (sound control at I2C address 0xc8) | 97 | TADC-M201D: PAL D/K+B/G+I (L,143/425) (sound control at I2C address 0xc8) |
98 | TADC-T003F: NTSC Taiwan (L,175/410?; 2-B, C-W+11, W+12-69) | 98 | TADC-T003F: NTSC Taiwan (L,175/410?; 2-B, C-W+11, W+12-69) |
99 | Suffix: | 99 | Suffix: |
100 | P= Standard phono female socket | 100 | P= Standard phono female socket |
101 | D= IEC female socket | 101 | D= IEC female socket |
102 | F= F-connector | 102 | F= F-connector |
diff --git a/Documentation/video4linux/lifeview.txt b/Documentation/video4linux/lifeview.txt index b07ea79c2b7e..05f9eb57aac9 100644 --- a/Documentation/video4linux/lifeview.txt +++ b/Documentation/video4linux/lifeview.txt | |||
@@ -10,33 +10,33 @@ bt878: | |||
10 | ------------------------------------------------------------------------------ | 10 | ------------------------------------------------------------------------------ |
11 | 11 | ||
12 | saa7134: | 12 | saa7134: |
13 | /* LifeView FlyTV Platinum FM (LR214WF) */ | 13 | /* LifeView FlyTV Platinum FM (LR214WF) */ |
14 | /* "Peter Missel <peter.missel@onlinehome.de> */ | 14 | /* "Peter Missel <peter.missel@onlinehome.de> */ |
15 | .name = "LifeView FlyTV Platinum FM", | 15 | .name = "LifeView FlyTV Platinum FM", |
16 | /* GP27 MDT2005 PB4 pin 10 */ | 16 | /* GP27 MDT2005 PB4 pin 10 */ |
17 | /* GP26 MDT2005 PB3 pin 9 */ | 17 | /* GP26 MDT2005 PB3 pin 9 */ |
18 | /* GP25 MDT2005 PB2 pin 8 */ | 18 | /* GP25 MDT2005 PB2 pin 8 */ |
19 | /* GP23 MDT2005 PB1 pin 7 */ | 19 | /* GP23 MDT2005 PB1 pin 7 */ |
20 | /* GP22 MDT2005 PB0 pin 6 */ | 20 | /* GP22 MDT2005 PB0 pin 6 */ |
21 | /* GP21 MDT2005 PB5 pin 11 */ | 21 | /* GP21 MDT2005 PB5 pin 11 */ |
22 | /* GP20 MDT2005 PB6 pin 12 */ | 22 | /* GP20 MDT2005 PB6 pin 12 */ |
23 | /* GP19 MDT2005 PB7 pin 13 */ | 23 | /* GP19 MDT2005 PB7 pin 13 */ |
24 | /* nc MDT2005 PA3 pin 2 */ | 24 | /* nc MDT2005 PA3 pin 2 */ |
25 | /* Remote MDT2005 PA2 pin 1 */ | 25 | /* Remote MDT2005 PA2 pin 1 */ |
26 | /* GP18 MDT2005 PA1 pin 18 */ | 26 | /* GP18 MDT2005 PA1 pin 18 */ |
27 | /* nc MDT2005 PA0 pin 17 strap low */ | 27 | /* nc MDT2005 PA0 pin 17 strap low */ |
28 | 28 | ||
29 | /* GP17 Strap "GP7"=High */ | 29 | /* GP17 Strap "GP7"=High */ |
30 | /* GP16 Strap "GP6"=High | 30 | /* GP16 Strap "GP6"=High |
31 | 0=Radio 1=TV | 31 | 0=Radio 1=TV |
32 | Drives SA630D ENCH1 and HEF4052 A1 pins | 32 | Drives SA630D ENCH1 and HEF4052 A1 pins |
33 | to do FM radio through SIF input */ | 33 | to do FM radio through SIF input */ |
34 | /* GP15 nc */ | 34 | /* GP15 nc */ |
35 | /* GP14 nc */ | 35 | /* GP14 nc */ |
36 | /* GP13 nc */ | 36 | /* GP13 nc */ |
37 | /* GP12 Strap "GP5" = High */ | 37 | /* GP12 Strap "GP5" = High */ |
38 | /* GP11 Strap "GP4" = High */ | 38 | /* GP11 Strap "GP4" = High */ |
39 | /* GP10 Strap "GP3" = High */ | 39 | /* GP10 Strap "GP3" = High */ |
40 | /* GP09 Strap "GP2" = Low */ | 40 | /* GP09 Strap "GP2" = Low */ |
41 | /* GP08 Strap "GP1" = Low */ | 41 | /* GP08 Strap "GP1" = Low */ |
42 | /* GP07.00 nc */ | 42 | /* GP07.00 nc */ |