From Markus Rechberger <mrechberger@gmail.com>,Ludovico Cavedon <cavedon@sssup.it>,Mauro Carvalho Chehab <mchehab@brturbo.com.br>

- Added support for Empia EM2820/2840 USB video capture devices.
  Current support is working for:
	Terratec Cinergy 250 USB
	Pinnacle PCTV USB 2
	Hauppauge WinTV USB 2
  Support is not working for:
	Terratec Cinergy 250 USB (em2800 based)
	MSI VOX USB 2.0 (saa7114 decoder based)

Signed-off-by: Markus Rechberger <mrechberger@gmail.com>
Signed-off-by: Ludovico Cavedon <cavedon@sssup.it>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>

4 files changed, 38 insertions, 4 deletions

diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 52bd6da6e..2337cca7d 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,18 @@
+2005-10-06 14:26  mchehab
+
+	* Make.config,Makefile,compat.h,em2820-cards.c,em2820-core.c,
+	  em2820-video.c,em2820.h:
+	- Added support for Empia Tech em2820/2840 chipset boards.
+	* tvp5150.c: (tvp5150_write), (tvp5150_selmux), (tvp5150_reset),
+	(tvp5150_get_ctrl), (tvp5150_set_ctrl), (tvp5150_command),
+	(tvp5150_detect_client), (tvp5150_attach_adapter),
+	(tvp5150_detach_client), (tvp5150_init), (tvp5150_exit):
+	- Added some V4L2 API calls.
+
+	Signed-off-by: Markus Rechberger <mrechberger@gmail.com>
+	Signed-off-by: Ludovico Cavedon <cavedon@sssup.it>
+	Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
 2005-10-06 03:07  mkrufky
 
 	* bttv-cards.c:
diff --git a/v4l/Make.config b/v4l/Make.config
index 37e1a77a5..9c62b1c09 100644
--- a/v4l/Make.config
+++ b/v4l/Make.config
@@ -1,7 +1,6 @@
 MDIR			:= v4l2
 snap			:= video4linux
 
-CONFIG_TVP5150		:= n
 CONFIG_VIDEO_BTTV	:= m
 CONFIG_VIDEO_SAA7134	:= m
 CONFIG_VIDEO_IR		:= m
@@ -9,6 +8,10 @@ CONFIG_VIDEO_TUNER	:= m
 CONFIG_VIDEO_TVAUDIO	:= m
 CONFIG_VIDEO_CX88	:= m
 
+CONFIG_TVP5150		:= m
+CONFIG_SAA7113          := m
+CONFIG_EM2820		:= m
+
 CONFIG_VIDEO_ALSA	:= n
 
 # doesn't build on kernels older than 2.6.12
diff --git a/v4l/Makefile b/v4l/Makefile
index 4d05c93b4..8277180eb 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -25,9 +25,10 @@ cx88xx-objs     := cx88-cards.o cx88-core.o cx88-i2c.o cx88-tvaudio.o \
                    cx88-input.o
 cx8800-objs     := cx88-video.o cx88-vbi.o
 cx8802-objs     := cx88-mpeg.o
-ti5150-objs     := tvp5150.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
+
 
 # what to build
 obj-m				:= video-buf.o v4l1-compat.o v4l2-common.o
@@ -35,6 +36,8 @@ obj-$(CONFIG_VIDEO_BTTV)	+= btcx-risc.o ir-common.o bttv.o tveeprom.o
 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_SAA7113)		+= saa7113.o
+obj-$(CONFIG_EM2820)		+= em2820.o
 
 # THIS IS NOT FINISHED YET --- IT IS HERE ONLY FOR DEVELOPERS !!!!
 ifeq ($(CONFIG_VIDEO_ALSA),m)
@@ -125,6 +128,8 @@ KDIR		:= /lib/modules/$(KERNELRELEASE)/build
 PWD		:= $(shell pwd)
 DEST		:= /lib/modules/$(KERNELRELEASE)/$(MDIR)
 KDIR26		:= /lib/modules/$(KERNELRELEASE)/kernel/drivers/media
+KDIRUSB         := /lib/modules/$(KERNELRELEASE)/kernel/drivers/usb/media
+
 
 # which files to install?
 inst-m		:= $(wildcard *.ko)
@@ -137,9 +142,11 @@ inst_video := btcx-risc.ko bttv.ko tda9887.ko tuner.ko tvaudio.ko tveeprom.ko sa
 inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko
 inst_video += video-buf.ko video-buf-dvb.ko
 inst_video += ir-kbd-gpio.ko ir-kbd-i2c.ko msp3400.ko
+inst_video += tvp5150.ko saa7113.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
 
 v4l_modules := $(shell lsmod|cut -d' ' -f1 ) $(patsubst %.ko,%,$(inst-m))
 
@@ -168,6 +175,9 @@ 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)/
+
 	/sbin/depmod -a
 
 v4l_install:: rminstall
@@ -189,11 +199,13 @@ rminstall::
 		$(addprefix $(KDIR26)/video/, $(inst_video)) \
 		$(addprefix $(KDIR26)/video/cx88/, $(inst_cx88)) \
 		$(addprefix $(KDIR26)/video/saa7134/, $(inst_saa7134)) \
+		$(addprefix $(KDIRUSB)/, $(inst_usb)) \
 		$(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 $(KDIR26)/video/saa7134/, $(addsuffix .gz,$(inst_saa7134))) 2>/dev/null \
+		$(addprefix $(KDIRUSB)/, $(addsuffix .gz,$(inst_usb))) 2>/dev/null
 	@echo
 
 rmmodules::
diff --git a/v4l/compat.h b/v4l/compat.h
index 66f10d155..6e9f5091f 100644
--- a/v4l/compat.h
+++ b/v4l/compat.h
@@ -1,5 +1,5 @@
 /*
- * $Id: compat.h,v 1.20 2005/09/24 17:22:52 mkrufky Exp $
+ * $Id: compat.h,v 1.21 2005/10/06 14:38:52 mchehab Exp $
  */
 
 #ifndef _COMPAT_H
@@ -63,6 +63,10 @@
 # define I2C_HW_SAA7146 I2C_ALGO_SAA7146
 #endif
 
+#if !defined(I2C_HW_B_EM2820)
+#define I2C_HW_B_EM2820 I2C_HW_B_BT848
+#endif
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)
 #define __le32 __u32
 #endif