* scripts/cardlist:

        - Script updated to strip tail spaces
        - Correclty generates a tuner number for tea chip

        * doc/CARDLIST.cx88, doc/CARDLIST.saa7134, doc/CARDLIST.tuner:

        - Card definitions updated.

        Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>

5 files changed, 28 insertions, 11 deletions

diff --git a/linux/Documentation/video4linux/CARDLIST.cx88 b/linux/Documentation/video4linux/CARDLIST.cx88
index 4377aa11f..f8615f982 100644
--- a/linux/Documentation/video4linux/CARDLIST.cx88
+++ b/linux/Documentation/video4linux/CARDLIST.cx88
@@ -27,3 +27,4 @@ card=25 - Digital-Logic MICROSPACE Entertainment Center (MEC)
 card=26 - IODATA GV/BCTV7E
 card=27 - PixelView PlayTV Ultra Pro (Stereo)
 card=28 - DViCO FusionHDTV 3 Gold-T
+card=29 - ADS Tech Instant TV DVB-T PCI
diff --git a/linux/Documentation/video4linux/CARDLIST.saa7134 b/linux/Documentation/video4linux/CARDLIST.saa7134
index 52ae371b2..1b5a3a9ff 100644
--- a/linux/Documentation/video4linux/CARDLIST.saa7134
+++ b/linux/Documentation/video4linux/CARDLIST.saa7134
@@ -34,6 +34,7 @@
  33 -> AVerMedia DVD EZMaker                    [1461:10ff]
  34 -> Noval Prime TV 7133
  35 -> AverMedia AverTV Studio 305              [1461:2115]
+ 36 -> UPMOST PURPLE TV                         [12ab:0800]
  37 -> Items MuchTV Plus / IT-005
  38 -> Terratec Cinergy 200 TV                  [153B:1152]
  39 -> LifeView FlyTV Platinum Mini             [5168:0212]
@@ -43,20 +44,21 @@
  43 -> :Zolid Xpert TV7134
  44 -> Empire PCI TV-Radio LE
  45 -> Avermedia AVerTV Studio 307              [1461:9715]
- 46 -> AVerMedia Cardbus TV/Radio               [1461:d6ee]
+ 46 -> AVerMedia Cardbus TV/Radio (E500)        [1461:d6ee]
  47 -> Terratec Cinergy 400 mobile              [153b:1162]
  48 -> Terratec Cinergy 600 TV MK3              [153B:1158]
  49 -> Compro VideoMate Gold+ Pal               [185b:c200]
  50 -> Pinnacle PCTV 300i DVB-T + PAL           [11bd:002d]
  51 -> ProVideo PV952                           [1540:9524]
  52 -> AverMedia AverTV/305                     [1461:2108]
+ 53 -> ASUS TV-FM 7135                          [1043:4845]
  54 -> LifeView FlyTV Platinum FM               [5168:0214,1489:0214]
- 55 -> LifeView FlyDVB-T DUO                    [5168:0306]
+ 55 -> LifeView FlyDVB-T DUO                    [5168:0502,5168:0306]
  56 -> Avermedia AVerTV 307                     [1461:a70a]
  57 -> Avermedia AVerTV GO 007 FM               [1461:f31f]
  58 -> ADS Tech Instant TV (saa7135)            [1421:0350,1421:0370]
  59 -> Kworld/Tevion V-Stream Xpert TV PVR7134
- 60 -> Typhoon DVB-T Duo Digital/Analog Cardbus
- 61 -> Philips TOUGH DVB-T reference design
+ 60 -> Typhoon DVB-T Duo Digital/Analog Cardbus [4e42:0502]
+ 61 -> Philips TOUGH DVB-T reference design     [1131:2004]
  62 -> Compro VideoMate TV Gold+II
  63 -> Kworld Xpert TV PVR7134
diff --git a/linux/Documentation/video4linux/CARDLIST.tuner b/linux/Documentation/video4linux/CARDLIST.tuner
index e78020f68..d1b9d21ff 100644
--- a/linux/Documentation/video4linux/CARDLIST.tuner
+++ b/linux/Documentation/video4linux/CARDLIST.tuner
@@ -56,9 +56,9 @@ tuner=54 - tda8290+75
 tuner=55 - LG PAL (TAPE series)
 tuner=56 - Philips PAL/SECAM multi (FQ1216AME MK4)
 tuner=57 - Philips FQ1236A MK4
-tuner=58 - Ymec TVision TVF-8531MF
+tuner=58 - Ymec TVision TVF-8531MF/8831MF/8731MF
 tuner=59 - Ymec TVision TVF-5533MF
 tuner=60 - Thomson DDT 7611 (ATSC/NTSC)
-tuner=61 - Tena TNF9533-D/IF
+tuner=61 - Tena TNF9533-D/IF/TNF9533-B/DF
 tuner=62 - Philips TEA5767HN FM Radio
 tuner=63 - Philips FMD1216ME MK3 Hybrid Tuner
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index e9c33cdd1..4b475ed91 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,14 @@
+2005-06-22 23:20  mchehab
+	* scripts/cardlist:
+	- Script updated to strip tail spaces
+	- Correclty generates a tuner number for tea chip
+
+	* doc/CARDLIST.cx88, doc/CARDLIST.saa7134, doc/CARDLIST.tuner:
+
+	- Card definitions updated.
+
+	Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
 2005-06-22 22:47  mchehab
 	* bttv-cards.c, cx88-core.c, cx88.h, v4l1-compat.c,doc/CARDLIST.bttv,
 	  doc/CARDLIST.saa7134, doc/Cards:
diff --git a/v4l/scripts/cardlist b/v4l/scripts/cardlist
index 634ffc4dc..8e13b75a1 100644
--- a/v4l/scripts/cardlist
+++ b/v4l/scripts/cardlist
@@ -1,22 +1,25 @@
 #!/bin/sh
-
 cat bttv-cards.c \
 	| grep "\.name.*=" \
 	| perl -ne '/"([^"]+)"/; printf("card=%d - %s\n",$i++,$1)' \
-	> doc/CARDLIST.bttv
+	| perl -ne 's/[ \t]+$//; print' > doc/CARDLIST.bttv
 
 LINE="`grep -n "gdi_tuner\[\]" cx88-cards.c|cut -f1 -d:`"
 
 head -$LINE cx88-cards.c \
 	| grep "\.name.*=" \
 	| perl -ne '/"([^"]+)"/; printf("card=%d - %s\n",$i++,$1)' \
-	> doc/CARDLIST.cx88
+	| perl -ne 's/[ \t]+$//; print' > doc/CARDLIST.cx88
+
+TEA="`grep TEA5767_TUNER_NAME tuner.h|cut -d " " -f 3-`"
 
 cat tuner-simple.c \
+	| sed s/TEA5767_TUNER_NAME/"$TEA"/ \
 	| grep "{ \"" \
 	| perl -ne '/"([^"]+)"/; printf("tuner=%d - %s\n",$i++,$1)' \
-	> doc/CARDLIST.tuner
+	| perl -ne 's/[ \t]+$//; print' > doc/CARDLIST.tuner
 
 scripts/saa7134.pl saa7134.h saa7134-cards.c \
-	> doc/CARDLIST.saa7134
+	| perl -ne 's/[ \t]+$//; print' > doc/CARDLIST.saa7134
+