sync bttv, cx88 and saa7134 driver model lists with kernel-2.6.16-rc1-mm2

1 files changed, 97 insertions, 36 deletions

diff --git a/perl-install/harddrake/v4l.pm b/perl-install/harddrake/v4l.pm
index ac132e744..ae63399d9 100644
--- a/perl-install/harddrake/v4l.pm
+++ b/perl-install/harddrake/v4l.pm
@@ -45,7 +45,7 @@ my %tuners_lst =
      28 => "LG|PAL_BG+FM (TPI8PSB01D)",
      29 => "LG|PAL_BG (TPI8PSB11D)",
      30 => "Temic|PAL* auto + FM (4009 FN5)",
-     31 => "SHARP|NTSC_JP (2U5JF5540)",
+     31 => "SHARP NTSC_JP (2U5JF5540)",
      32 => "Samsung|PAL TCPM9091PD27",
      33 => "MT20xx universal",
      34 => "Temic|PAL_BG (4106 FH5)",
@@ -62,7 +62,7 @@ my %tuners_lst =
      45 => "Microtune|4049 FM5",
      46 => "Panasonic VP27s/ENGE4324D",
      47 => "LG|NTSC (TAPE series)",
-     48 => "Tenna TNF 8831 BGFF)",
+     48 => "Tena|TNF 8831 BGFF",
      49 => "Microtune|4042 FI5 ATSC/NTSC dual in",
      50 => "TCL 2002N",
      51 => "Philips|PAL/SECAM_D (FM 1256 I-H3)",
@@ -72,9 +72,19 @@ my %tuners_lst =
      55 => "LG|PAL (TAPE series)",
      56 => "Philips|PAL/SECAM multi (FQ1216AME MK4)",
      57 => "Philips|FQ1236A MK4",
-     58 => "Ymec TVision|TVF-8531MF",
-     59 => "Ymec TVision|TVF-5533MF",
+     58 => "Ymec|TVision|TVF-8531MF",
+     59 => "Ymec|TVision|TVF-5533MF",
      60 => "Thomson|DDT 7611 (ATSC/NTSC)",
+     61 => "Tena|TNF9533-D/IF/TNF9533-B/DF",
+     62 => "Philips|TEA5767HN FM Radio",
+     63 => "Philips|FMD1216ME MK3 Hybrid Tuner",
+     64 => "LG|TDVS-H062F/TUA6034",
+     65 => "Ymec|TVF66T5-B/DFF",
+     66 => "LG|NTSC (TALN mini series)",
+     67 => "Philips|TD1316 Hybrid Tuner",
+     68 => "Philips|TUV1236D ATSC/NTSC dual in",
+     69 => "Tena|TNF 5335 MF",
+     70 => "Samsung|TCPN 2121P30A",
 
      );
 
@@ -118,7 +128,7 @@ my $cards_lst = {
         N("Unknown|CPH05X (bt878) [many vendors]") => 24,
         N("Unknown|CPH06X (bt878) [many vendors]") => 24,
         "T|Terratec|Terra TV+ Version 1.0 (Bt848)" => 25,
-        "Vobis|TV-Boostar" => 25,
+        "V|Vobis TV-Boostar" => 25,
         "T|Terratec|TV-Boostar" => 25,
         "H|Hauppauge|WinCam newer (bt878)" => 26,
         "L|Lifeview|FlyVideo 98" => 27,
@@ -198,22 +208,22 @@ my $cards_lst = {
         "P|Powercolor|MTV878F" => 75,
         "C|Canopus WinDVR PCI (COMPAQ Presario 3524JP, 5112JP)" => 76,
         "G|GrandTec|Multi Capture Card (Bt878)" => 77,
-        "Jetway|TV/Capture JW-TV878-FBK" => 78,
+        "Jetway TV/Capture JW-TV878-FBK" => 78,
         "K|Kworld KW-TV878RF" => 78,
         "D|DSP Design TCVIDEO" => 79,
         "H|Hauppauge|WinTV PVR" => 80,
         "G|GV-BCTV5/PCI" => 81,
-        "O|Osprey|100/150 (878)" => 82,
-        "O|Osprey|100/150 (848)" => 83,
-        "O|Osprey|101 (848)" => 84,
-        "O|Osprey|101/151" => 85,
-        "O|Osprey|101/151 w/ svid" => 86,
-        "O|Osprey|200/201/250/251" => 87,
-        "O|Osprey|200/250" => 88,
-        "O|Osprey|210/220" => 89,
-        "O|Osprey|500" => 90,
-        "O|Osprey|540" => 91,
-        "O|Osprey|2000" => 92,
+        "Osprey|100/150 (878)" => 82,
+        "Osprey|100/150 (848)" => 83,
+        "Osprey|101 (848)" => 84,
+        "Osprey|101/151" => 85,
+        "Osprey|101/151 w/ svid" => 86,
+        "Osprey|200/201/250/251" => 87,
+        "Osprey|200/250" => 88,
+        "Osprey|210/220" => 89,
+        "Osprey|500" => 90,
+        "Osprey|540" => 91,
+        "Osprey|2000" => 92,
         "I|IDS Eagle" => 93,
         "P|Pinnacle|PCTV Sat" => 94,
         "Formac|ProTV II (bt878)" => 95,
@@ -224,7 +234,7 @@ my $cards_lst = {
         "H|Hercules Smart TV Stereo" => 100,
         "P|Pace TV & Radio Card" => 101,
         "I|IVC|200" => 102,
-        "G|Grand X-Guard / Trust 814PCI" => 103,
+        "G|GrandTec|Grand X-Guard / Trust 814PCI" => 103,
         "N|Nebula Electronics DigiTV" => 104,
         "P|ProVideo|PV143" => 105,
         "P|PHYTEC|VD-009-X1 MiniDIN (bt878)" => 106,
@@ -241,7 +251,7 @@ my $cards_lst = {
         "N|NGS NGSTV+" => 117,
         "L|LMLBT4" => 118,
         "T|Tekram M205 PRO" => 119,
-        "C|Conceptronic CONTVFMi" => 120,
+        "C|Conceptronic|CONTVFMi" => 120,
         "E|Euresys|Picolo Tetra" => 121,
         "S|Spirit TV Tuner" => 122,
         "A|AverMedia|AVerTV DVB-T 771" => 123,
@@ -249,13 +259,23 @@ my $cards_lst = {
         "M|MATRIX Vision|Sigma-SQ" => 125,
         "M|MATRIX Vision|Sigma-SLC" => 126,
         "A|APAC Viewcomp 878(AMAX)" => 127,
-        "D|DVICO FusionHDTV DVB-T Lite" => 128,
+        "D|DViCO|FusionHDTV DVB-T Lite" => 128,
         "V|V-Gear MyVCD" => 129,
         "S|Super TV Tuner" => 130,
         "T|Tibet Systems 'Progress DVR' CS16" => 131,
         "K|Kodicom|4400R (master)" => 132,
         "K|Kodicom|4400R (slave)" => 133,
         "A|Adlink|RTV24" => 134,
+        "D|DViCO|FusionHDTV 5 Lite" => 135,
+        "A|Acorp|Y878F" => 136,
+        "C|Conceptronic|CTVFMi v2" => 137,
+        "P|Prolink|Pixelview PV-BT878P+ (Rev.2E)" => 138,
+        "P|Prolink|PixelView PlayTV MPEG2 PV-M4900" => 139,
+        "Osprey|440" => 140,
+        "A|Asound|Skyeye PCTV" => 141,
+        "S|Sabrent TV-FM (bttv version)" => 142,
+        "H|Hauppauge|ImpactVCB (bt878)" => 143,
+        "M|MagicTV" => 144,
 
     },
     
@@ -264,9 +284,9 @@ my $cards_lst = {
         "Hauppauge|WinTV 34xxx models" => 1,
         "GDI Black Gold" => 2,
         "PixelView|???" => 3,
-        "ATI TV Wonder Pro" => 4,
+        "ATI|TV Wonder Pro" => 4,
         "Leadtek|Winfast 2000XP Expert" => 5,
-        "AverTV Studio 303 (M126)               " => 6,
+        "AVerTV|Studio 303 (M126)               " => 6,
         'MSI|TV-@nywhere Master' => 7,
         "Leadtek|Winfast DV2000" => 8,
         "Leadtek|PVR 2000" => 9,
@@ -274,21 +294,39 @@ my $cards_lst = {
         "Prolink PlayTV PVR" => 11,
         "ASUS PVR-416" => 12,
         'MSI|TV-@nywhere' => 13,
-        "KWorld/VStream XPert DVB-T" => 14,
+        "VStream|XPert DVB-T" => 14,
+        "KWorld|XPert DVB-T" => 14,
         "DViCO|FusionHDTV DVB-T1" => 15,
-        "KWorld LTV883RF" => 16,
+        "KWorld|LTV883RF" => 16,
         "DViCO|FusionHDTV 3 Gold" => 17,
         "Hauppauge|Nova-T DVB-T" => 18,
         "Conexant DVB-T reference design" => 19,
         "Provideo PV259" => 20,
         "DViCO|FusionHDTV DVB-T Plus" => 21,
-        "digitalnow DNTV Live! DVB-T" => 22,
+        "digitalnow|DNTV Live! DVB-T" => 22,
         "pcHDTV HD3000 HDTV" => 23,
         "Hauppauge|WinTV 28xxx (Roslyn) models" => 24,
         "Digital-Logic MICROSPACE Entertainment Center (MEC)" => 25,
         "IODATA|GV/BCTV7E" => 26,
         "PixelView|PlayTV Ultra Pro (Stereo)" => 27,
         "DViCO|FusionHDTV 3 Gold-T" => 28,
+        "ADS Tech Instant TV DVB-T PCI" => 29,
+        "TerraTec Cinergy 1400 DVB-T" => 30,
+        "DViCO|FusionHDTV 5 Gold" => 31,
+        "AverMedia UltraTV Media Center PCI 550" => 32,
+        "KWorld|V-Stream Xpert DVD" => 33,
+        "ATI|HDTV Wonder" => 34,
+        "WinFast DTV1000-T" => 35,
+        "AVerTV|303 (M126)" => 36,
+        "Hauppauge|Nova-S-Plus DVB-S" => 37,
+        "Hauppauge|Nova-SE2 DVB-S" => 38,
+        "KWorld|VB-S 100" => 39,
+        "Hauppauge|WinTV-HVR1100 DVB-T/Hybrid" => 40,
+        "Hauppauge|WinTV-HVR1100 DVB-T/Hybrid (Low Profile)  [0070:9800,0070:9802]" => 41,
+        "digitalnow|DNTV Live! DVB-T Pro" => 42,
+        "VStream|XPert DVB-T with cx22702" => 43,
+        "KWorld|XPert DVB-T with cx22702" => 43,
+        "DViCO|FusionHDTV DVB-T Dual Digital" => 44,
 
     },
 
@@ -298,13 +336,14 @@ my $cards_lst = {
         "LifeView|FlyVIDEO3000" => 2,
         "LifeView|FlyVIDEO2000" => 3,
         "EMPRESS" => 4,
-        "SKNet Monster TV" => 5,
-        "Tevion MD 9717" => 6,
-        "KNC One TV-Station RDS" => 7,
-        "Typhoon TV Tuner RDS" => 7,
+        "SKNet|Monster TV" => 5,
+        "Tevion|MD 9717" => 6,
+        "KNC|One TV-Station RDS" => 7,
+        "Typhoon|TV Tuner RDS" => 7,
         "Terratec|Cinergy 400 TV" => 8,
         "Medion|5044" => 9,
-        "Kworld/KuroutoShikou SAA7130-TVPCI" => 10,
+        "Kworld|SAA7130-TVPCI" => 10,
+        "KuroutoShikou SAA7130-TVPCI" => 10,
         "Terratec|Cinergy 600 TV" => 11,
         "Medion|7134" => 12,
         "Typhoon|TV+Radio 90031" => 13,
@@ -331,7 +370,7 @@ my $cards_lst = {
         "AverMedia|DVD EZMaker" => 33,
         "Noval Prime TV 7133" => 34,
         "AverMedia|AverTV Studio 305" => 35,
-        "UPMOST|PURPLE TV" => 36,
+        "UPMOST PURPLE TV" => 36,
         "Items MuchTV Plus / IT-005" => 37,
         "Terratec|Cinergy 200 TV" => 38,
         "LifeView|FlyTV Platinum Mini" => 39,
@@ -354,11 +393,33 @@ my $cards_lst = {
         "AverMedia|AVerTV 307" => 56,
         "AverMedia|AVerTV GO 007 FM" => 57,
         "ADS Tech Instant TV (saa7135)" => 58,
-        "Kworld/Tevion V-Stream Xpert TV PVR7134" => 59,
-        "Typhoon DVB-T Duo Digital/Analog Cardbus" => 60,
-        "Philips TOUGH DVB-T reference design" => 61,
-        "Compro VideoMate TV Gold+II" => 62,
-        "Kworld Xpert TV PVR7134" => 63,
+        "Kworld|V-Stream Xpert TV PVR7134" => 59,
+        "Tevion|V-Stream Xpert TV PVR7134" => 59,
+        "Typhoon|DVB-T Duo Digital/Analog Cardbus" => 60,
+        "Philips|TOUGH DVB-T reference design" => 61,
+        "Compro|VideoMate TV Gold+II" => 62,
+        "Kworld|Xpert TV PVR7134" => 63,
+        "FlyTV mini Asus Digimatrix" => 64,
+        "Kworld|V-Stream Studio TV Terminator" => 65,
+        "Yuan TUN-900 (saa7135)" => 66,
+        "Beholder BeholdTV 409 FM" => 67,
+        "GoTView 7135 PCI" => 68,
+        "Philips|EUROPA V3 reference design" => 69,
+        "Compro|Videomate DVB-T300" => 70,
+        "Compro|Videomate DVB-T200" => 71,
+        "RTD|Embedded Technologies VFG7350" => 72,
+        "RTD|Embedded Technologies VFG7330" => 73,
+        "LifeView|FlyTV Platinum Mini2" => 74,
+        "AverMedia|AVerTVHD MCE A180" => 75,
+        "SKNet|MonsterTV Mobile" => 76,
+        "Pinnacle|PCTV 110i (saa7133)" => 77,
+        "ASUSTeK P7131 Dual" => 78,
+        "Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B)" => 79,
+        "ASUS|Digimatrix TV" => 80,
+        "Philips|Tiger reference design" => 81,
+        "MSI TV\@Anywhere plus" => 82,
+        "Terratec|Cinergy 250 PCI TV" => 83,
+        "LifeView|FlyDVB Trio" => 84,
 
     }
 };