- Included support for em2800.

        - Included card insmod parameter.
        - Now it will not try to register audio anymore.

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

3 files changed, 47 insertions, 9 deletions

diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index ba4c643ce..8cfe7caa2 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,26 @@
+2005-10-11 16:48  mchehab
+
+	* ../linux/Documentation/video4linux/CARDLIST.em2820:
+	* ../linux/drivers/usb/media/em2820-cards.c:
+	* ../linux/drivers/usb/media/em2820-core.c:
+	(em2820_isoc_video_copy), (em2820_set_alternate):
+	* ../linux/drivers/usb/media/em2820-i2c.c: (em2800_i2c_send_max4),
+	(em2800_i2c_send_bytes), (em2800_i2c_check_for_device),
+	(em2800_i2c_recv_bytes), (em2820_i2c_send_bytes),
+	(em2820_i2c_recv_bytes), (em2820_i2c_check_for_device),
+	(em2820_i2c_xfer), (em2820_i2c_eeprom), (do_i2c_scan):
+	* ../linux/drivers/usb/media/em2820-video.c: (em2820_do_ioctl),
+	(em2820_init_dev), (em2820_usb_probe):
+	* ../linux/drivers/usb/media/em2820.h:
+	* ../v4l/scripts/cardlist:
+	* ../v4l/scripts/em2820.pl:
+
+	- Included support for em2800.
+	- Included card insmod parameter.
+	- Now it will not try to register audio anymore.
+
+	Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
 2005-10-11 05:17  mkrufky
 
 	* ../linux/Documentation/video4linux/CARDLIST.cx88:
diff --git a/v4l/scripts/cardlist b/v4l/scripts/cardlist
index ae8bfb59f..a4c59763e 100644
--- a/v4l/scripts/cardlist
+++ b/v4l/scripts/cardlist
@@ -6,7 +6,7 @@ scripts/bttv.pl ../linux/drivers/media/video/bttv.h  ../linux/drivers/media/vide
 scripts/cx88.pl ../linux/drivers/media/video/cx88/cx88.h ../linux/drivers/media/video/cx88/cx88-cards.c \
 	| perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.cx88
 
-./scripts/em2820.pl ../linux/drivers/usb/media/em2820-cards.c \
+./scripts/em2820.pl ../linux/drivers/usb/media/em2820.h ../linux/drivers/usb/media/em2820-cards.c \
 	| perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.em2820
 cat ../linux/drivers/media/video/tuner-simple.c \
 	| grep "{ \"" \
diff --git a/v4l/scripts/em2820.pl b/v4l/scripts/em2820.pl
index ba498f0fd..278dfc214 100644
--- a/v4l/scripts/em2820.pl
+++ b/v4l/scripts/em2820.pl
@@ -8,18 +8,27 @@ my %data;
 
 while (<>) {
 	# defines in header file
-#	if (/#define\s+(EM2820_BOARD_\w+)\s+(\d+)/) {
-#		$data{$1}->{nr} = $2;
-#		next;
-#	}
+	if (/#define\s+(EM2820_BOARD_\w+)\s+(\d+)/) {
+		$data{$1}->{nr} = $2;
+		next;
+	}
+	if (/#define\s+(EM2800_BOARD_\w+)\s+(\d+)/) {
+		$data{$1}->{nr} = $2;
+		next;
+	}
 	# em2820_boards
 	if (/\[(EM2820_BOARD_\w+)\]/) {
 		$id = $1;
 		$data{$id}->{id} = $id;
-                $data{$id}->{nr} = $nr++;
+		$data{$id}->{type} = "(em2820/em2840)";
+#		$data{$id}->{nr} = $nr++;
+	};
+	if (/\[(EM2800_BOARD_\w+)\]/) {
+		$id = $1;
+		$data{$id}->{id} = $id;
+		$data{$id}->{type} = "(em2800)";
+#		$data{$id}->{nr} = $nr++;
 	};
-
-#        { USB_DEVICE(0x0ccd, 0x0036), .driver_info = EM2820_BOARD_TERRATEC_CINERGY_250 },
 
 	next unless defined($id);
 
@@ -29,6 +38,12 @@ while (<>) {
                 push @{$data{$3}->{subid}}, "$subvendor:$subdevice";
 	}
 
+	if (/USB_DEVICE.*0x([0-9a-fA-F]*).*0x([0-9a-fA-F]*).*driver_info.*(EM2800_BOARD_\w+)/ ) {
+		$subvendor=$1;
+		$subdevice=$2;
+                push @{$data{$3}->{subid}}, "$subvendor:$subdevice";
+	}
+
 
         if (!defined($data{$id}) || !defined($data{$id}->{name})) {
                 $data{$id}->{name} = $1 if (/\.name\s*=\s*\"([^\"]+)\"/);
@@ -40,7 +55,7 @@ while (<>) {
 }
 
 foreach my $item (sort { $data{$a}->{nr} <=> $data{$b}->{nr} } keys %data) {
-	printf("%3d -> %-51s", $data{$item}->{nr}, $data{$item}->{name});
+	printf("%3d -> %-40s %-15s", $data{$item}->{nr}, $data{$item}->{name},$data{$item}->{type});
 	printf(" [%s]",join(",",@{$data{$item}->{subid}}))
 	  if defined($data{$item}->{subid});
 	print "\n";