- module em2820 renamed to em28xx and moved to V4L dir.

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

5 files changed, 50 insertions, 72 deletions

diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 4b946df37..dc0b66ef5 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,38 @@
+2005-10-28 21:01  mchehab
+
+	* ../linux/Documentation/video4linux/CARDLIST.em28xx:
+	* ../linux/drivers/media/video/em28xx/em28xx-cards.c:
+	* ../linux/drivers/media/video/em28xx/em28xx-core.c:
+	* ../linux/drivers/media/video/em28xx/em28xx-i2c.c:
+	* ../linux/drivers/media/video/em28xx/em28xx-input.c:
+	* ../linux/drivers/media/video/em28xx/em28xx-video.c:
+	* ../v4l/Make.config:
+	* ../v4l/Makefile:
+	* ../v4l/scripts/cardlist:
+	* ../v4l/scripts/em2820.pl:
+	- module em2820 renamed to em28xx and moved to V4L dir.
+
+	Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
+2005-10-28 20:52  mchehab
+
+	* ../linux/Documentation/video4linux/CARDLIST.em2820:
+	* ../linux/drivers/media/video/em28xx/em28xx-cards.c:
+	* ../linux/drivers/media/video/em28xx/em28xx-core.c:
+	* ../linux/drivers/media/video/em28xx/em28xx-i2c.c:
+	* ../linux/drivers/media/video/em28xx/em28xx-input.c:
+	* ../linux/drivers/media/video/em28xx/em28xx-video.c:
+	* ../linux/drivers/usb/media/em2820-cards.c:
+	* ../linux/drivers/usb/media/em2820-core.c:
+	* ../linux/drivers/usb/media/em2820-i2c.c:
+	* ../linux/drivers/usb/media/em2820-input.c:
+	* ../linux/drivers/usb/media/em2820-video.c:
+	* ../linux/drivers/usb/media/em2820.h:
+	* ../v4l/Make.config:
+	* ../v4l/Makefile:
+
+	Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
 2005-10-28 11:46  mchehab
 
 	* ../linux/include/linux/videodev2.h:
diff --git a/v4l/Make.config b/v4l/Make.config
index 2b75f1f13..9abcc6e33 100644
--- a/v4l/Make.config
+++ b/v4l/Make.config
@@ -10,7 +10,7 @@ CONFIG_VIDEO_CX88	:= m
 
 CONFIG_TVP5150		:= m
 CONFIG_SAA711X          := m
-CONFIG_EM2820		:= m
+CONFIG_EM28xx		:= m
 
 CONFIG_VIDEO_ALSA	:= n
 
diff --git a/v4l/Makefile b/v4l/Makefile
index faec87de2..2a8dc144f 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -26,8 +26,8 @@ cx8800-objs     := cx88-video.o cx88-vbi.o
 cx8802-objs     := cx88-mpeg.o
 tuner-objs	:= tuner-core.o tuner-simple.o mt20xx.o tda8290.o tea5767.o
 list-multi	:= bttv.o saa7134.o cx88xx.o cx8800.o cx88-alsa.o cx8802.o
-em2820-objs     := em2820-video.o em2820-i2c.o em2820-cards.o em2820-core.o \
-		   em2820-input.o
+em28xx-objs     := em28xx-video.o em28xx-i2c.o em28xx-cards.o em28xx-core.o \
+		   em28xx-input.o
 
 # what to build
 obj-m				:= video-buf.o v4l1-compat.o v4l2-common.o
@@ -36,7 +36,7 @@ obj-$(CONFIG_VIDEO_CX88)	+= btcx-risc.o cx88xx.o cx8800.o cx8802.o \
                                    cx88-blackbird.o tveeprom.o
 obj-$(CONFIG_TVP5150)           += tvp5150.o
 obj-$(CONFIG_SAA711X)           += saa711x.o
-obj-$(CONFIG_EM2820)		+= em2820.o
+obj-$(CONFIG_EM28xx)		+= em28xx.o
 
 # THIS IS NOT FINISHED YET --- IT IS HERE ONLY FOR DEVELOPERS !!!!
 ifeq ($(CONFIG_VIDEO_ALSA),m)
@@ -159,7 +159,7 @@ inst_video += tvp5150.ko saa711x.ko
 inst_cx88 := cx8800.ko cx8802.ko cx88-alsa.ko 
 inst_cx88 += cx88-blackbird.ko cx88xx.ko cx88-dvb.ko
 inst_saa7134 := saa6752hs.ko saa7134.ko saa7134-empress.ko saa7134-dvb.ko
-inst_usb := em2820.ko
+inst_em28xx := em28xx.ko
 inst_bt8xx := bt878.ko dvb-bt8xx.ko dst.ko dst_ca.ko
 inst_frontends := cx22702.ko dvb-pll.ko lgdt330x.ko or51132.ko tda1004x.ko
 inst_frontends += mt352.ko sp887x.ko nxt6000.ko cx24110.ko or51211.ko nxt200x.ko
@@ -203,8 +203,11 @@ install:: rminstall
 	-install -d $(KDIR26)/video/saa7134
 	-install -m 644 -c $(inst_saa7134) $(KDIR26)/video/saa7134
 
-	-install -d $(KDIRUSB)
-	-install -m 644 -c $(inst_usb) $(KDIRUSB)/
+	-install -d $(KDIR26)/video/em28xx
+	-install -m 644 -c $(inst_saa7134) $(KDIR26)/video/em28xx
+
+#	-install -d $(KDIRUSB)
+#	-install -m 644 -c $(inst_usb) $(KDIRUSB)/
 
 	/sbin/depmod -a
 
@@ -258,13 +261,15 @@ rminstall::
 		$(addprefix $(KDIR26)/video/, $(inst_video)) \
 		$(addprefix $(KDIR26)/video/cx88/, $(inst_cx88)) \
 		$(addprefix $(KDIR26)/video/saa7134/, $(inst_saa7134)) \
-		$(addprefix $(KDIRUSB)/, $(inst_usb)) \
+		$(addprefix $(KDIR26)/video/em28xx/, $(inst_em28xx)) \
+		$(addprefix $(KDIRUSB)/, $(inst_em28xx)) \
 		$(addprefix $(KDIR26)/common/, $(addsuffix .gz,$(inst_common))) \
 		$(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) \
 		$(addprefix $(KDIR26)/video/, $(addsuffix .gz,$(inst_video))) \
 		$(addprefix $(KDIR26)/video/cx88/, $(addsuffix .gz,$(inst_cx88))) \
 		$(addprefix $(KDIR26)/video/saa7134/, $(addsuffix .gz,$(inst_saa7134))) 2>/dev/null \
-		$(addprefix $(KDIRUSB)/, $(addsuffix .gz,$(inst_usb))) 2>/dev/null
+		$(addprefix $(KDIR26)/video/em28xx/, $(addsuffix .gz,$(inst_em28xx))) 2>/dev/null \
+		$(addprefix $(KDIRUSB)/, $(addsuffix .gz,$(inst_em28xx))) 2>/dev/null
 	@echo
 
 rmmodules::
diff --git a/v4l/scripts/cardlist b/v4l/scripts/cardlist
index a4c59763e..475e35649 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.h ../linux/drivers/usb/media/em2820-cards.c \
+scripts/em28xx.pl ../linux/drivers/media/video/em28xx/em28xx.h ../linux/drivers/media/video/em28xx/em28xx-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
deleted file mode 100644
index 278dfc214..000000000
--- a/v4l/scripts/em2820.pl
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-
-my $new_entry = -1;
-my $nr = 0;
-my ($id,$subvendor,$subdevice);
-my %data;
-
-while (<>) {
-	# defines in header file
-	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}->{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++;
-	};
-
-	next unless defined($id);
-
-	if (/USB_DEVICE.*0x([0-9a-fA-F]*).*0x([0-9a-fA-F]*).*driver_info.*(EM2820_BOARD_\w+)/ ) {
-		$subvendor=$1;
-		$subdevice=$2;
-                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*\"([^\"]+)\"/);
-        }
-
-	# em2820_USB_tbl
-
-
-}
-
-foreach my $item (sort { $data{$a}->{nr} <=> $data{$b}->{nr} } keys %data) {
-	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";
-}