Skip to contentSkip to conversation

v4l: documentation update

PATCH In review Gerd Knorr 3 participants 3 messages Apr 5, 2004 Documentation

lore
Share & tools
lore

Gerd Knorr

author
#0 lore raw

PATCH 1/1 v4l: documentation update

Hi,

This patch updates the documentation for the v4l drivers.

I'd like also remove the Documentation/video4linux/bttv/Mod*.conf files, how to do that best? Tell Linus to "bk remove" them? Just mail a GNU patch which does?

Gerd

Documentation/video4linux/CARDLIST.bttv +6 -0
diff -up linux-2.6.5/Documentation/video4linux/CARDLIST.bttv linux/Documentation/video4linux/CARDLIST.bttv
@@ -113,3 +113,9 @@ card=111 - IVC-120G
 card=112 - pcHDTV HD-2000 TV
 card=113 - Twinhan DST + clones
 card=114 - Winfast VC100
+card=115 - Teppro TEV-560/InterVision IV-560
+card=116 - SIMUS GVC1100
+card=117 - NGS NGSTV+
+card=118 - LMLBT4
+card=119 - Tekram M205 PRO
+card=120 - Conceptronic CONTVFMi
Documentation/video4linux/CARDLIST.saa7134 +28 -17

51 lines not on this page · raw message

Documentation/video4linux/CARDLIST.tuner +4 -1
diff -up linux-2.6.5/Documentation/video4linux/CARDLIST.tuner linux/Documentation/video4linux/CARDLIST.tuner
@@ -31,7 +31,7 @@ tuner=29 - LG PAL_BG (TPI8PSB11D)
 tuner=30 - Temic PAL* auto + FM (4009 FN5)
 tuner=31 - SHARP NTSC_JP (2U5JF5540)
 tuner=32 - Samsung PAL TCPM9091PD27
-tuner=33 - MT2032 universal
+tuner=33 - MT20xx universal
 tuner=34 - Temic PAL_BG (4106 FH5)
 tuner=35 - Temic PAL_DK/SECAM_L (4012 FY5)
 tuner=36 - Temic NTSC (4136 FY5)

@@ -41,3 +41,6 @@ tuner=39 - LG NTSC (newer TAPC series)
 tuner=40 - HITACHI V7-J180AT
 tuner=41 - Philips PAL_MK (FI1216 MK)
 tuner=42 - Philips 1236D ATSC/NTSC daul in
+tuner=43 - Philips NTSC MK3 (FM1236MK3 or FM1236/F)
+tuner=44 - Philips 4 in 1 (ATI TV Wonder Pro/Conexant)
+tuner=45 - Microtune 4049 FM5
Documentation/video4linux/README.cx88 +34 -21

72 lines not on this page · raw message

Signature · 1 line
http://bigendian.bytesex.org
#1 lore raw
Quoted 1 line · On Mon, 5 Apr 2004 14:41:03 +0200 Gerd Knorr wrote:

This patch updates the documentation for the v4l drivers.

[skip]

The update to linux/Documentation/video4linux/CARDLIST.saa7134 is buggy - I have just noticed this problem when building your drivers. Here is the fix for your scripts which generate this file:

scripts/saa7134.pl renamed from scripts/saa7134.pl.saa7134-list-fix +4 -1
@@ -21,11 +21,14 @@
 my %data;
 
 while (<>) {
+	if (/#define\s+(SAA7134_BOARD_\w+)\s+(\d+)/) {
+		$data{$1}->{nr} = $2;
+		next;
+	}
 	# saa7134_boards
 	if (/\[(SAA7134_BOARD_\w+)\]/) {
 		$id = $1;
 		$data{$id}->{id} = $id;
-		$data{$id}->{nr} = $nr++;
 	};
 	next unless defined($id);
scripts/cardlist renamed from scripts/cardlist.saa7134-list-fix +1 -1
@@ -10,6 +10,6 @@
 	| perl -ne '/"([^"]+)"/; printf("tuner=%d - %s\n",$i++,$1)' \
 	> doc/CARDLIST.tuner
 
-scripts/saa7134.pl saa7134-cards.c \
+scripts/saa7134.pl saa7134.h saa7134-cards.c \
 	> doc/CARDLIST.saa7134
#2 lore raw
In reply to Gerd Knorr
Quoted 4 lines · Gerd Knorr

I'd like also remove the Documentation/video4linux/bttv/Mod*.conf files, how to do that best? Tell Linus to "bk remove" them? Just mail a GNU patch which does?

'bk rm' is best. Please wait until this patch is merged into Linus's tree and then send us a reminder.