The patch number 10516 was added via Mauro Carvalho Chehab <mche...@redhat.com>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <linux-me...@vger.kernel.org>
------
From: Mauro Carvalho Chehab <mche...@redhat.com>
em28xx: Add support for Easy Cap Capture DC-60
Thanks to Peter Senna Tschudin <peter.se...@gmail.com> for borrow me one
of those devices.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mche...@redhat.com>
---
linux/Documentation/video4linux/CARDLIST.em28xx | 3 +-
linux/drivers/media/video/em28xx/em28xx-cards.c | 21 +++++++++++++++-
linux/drivers/media/video/em28xx/em28xx.h | 3 +-
3 files changed, 24 insertions(+), 3 deletions(-)
diff -r 844767f3721e -r b07848302e6c
linux/Documentation/video4linux/CARDLIST.em28xx
--- a/linux/Documentation/video4linux/CARDLIST.em28xx Wed Feb 11 15:15:14
2009 -0200
+++ b/linux/Documentation/video4linux/CARDLIST.em28xx Wed Feb 11 15:18:36
2009 -0200
@@ -57,6 +57,7 @@
57 -> Kworld PlusTV HD Hybrid 330 (em2883) [eb1a:a316]
58 -> Compro VideoMate ForYou/Stereo (em2820/em2840) [185b:2041]
60 -> Hauppauge WinTV HVR 850 (em2883) [2040:651f]
- 61 -> Kaiomy TVnPC U2 (em2860) [eb1a:e303]
61 -> Pixelview PlayTV Box 4 USB 2.0 (em2820/em2840)
62 -> Gadmei TVR200 (em2820/em2840)
+ 63 -> Kaiomy TVnPC U2 (em2860) [eb1a:e303]
+ 64 -> Easy Cap Capture DC-60 (em2860)
diff -r 844767f3721e -r b07848302e6c
linux/drivers/media/video/em28xx/em28xx-cards.c
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c Wed Feb 11 15:15:14
2009 -0200
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c Wed Feb 11 15:18:36
2009 -0200
@@ -1344,7 +1344,22 @@ struct em28xx_board em28xx_boards[] = {
.type = EM28XX_RADIO,
.amux = EM28XX_AMUX_LINE_IN,
}
- }
+ },
+ [EM2860_BOARD_EASYCAP] = {
+ .name = "Easy Cap Capture DC-60",
+ .vchannels = 2,
+ .tuner_type = TUNER_ABSENT,
+ .decoder = EM28XX_SAA711X,
+ .input = { {
+ .type = EM28XX_VMUX_COMPOSITE1,
+ .vmux = SAA7115_COMPOSITE0,
+ .amux = EM28XX_AMUX_LINE_IN,
+ }, {
+ .type = EM28XX_VMUX_SVIDEO,
+ .vmux = SAA7115_SVIDEO3,
+ .amux = EM28XX_AMUX_LINE_IN,
+ } },
+ },
};
const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards);
@@ -1637,6 +1652,10 @@ void em28xx_pre_card_setup(struct em28xx
em28xx_write_regs(dev, 0x08, "\x6b", 1);
break;
+ case EM2860_BOARD_EASYCAP:
+ em28xx_write_regs(dev, 0x08, "\xf8", 1);
+ break;
+
}
em28xx_gpio_set(dev, dev->board.tuner_gpio);
diff -r 844767f3721e -r b07848302e6c linux/drivers/media/video/em28xx/em28xx.h
--- a/linux/drivers/media/video/em28xx/em28xx.h Wed Feb 11 15:15:14 2009 -0200
+++ b/linux/drivers/media/video/em28xx/em28xx.h Wed Feb 11 15:18:36 2009 -0200
@@ -100,7 +100,8 @@
#define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_850 60
#define EM2820_BOARD_PROLINK_PLAYTV_BOX4_USB2 61
#define EM2820_BOARD_GADMEI_TVR200 62
-#define EM2860_BOARD_KAIOMY_TVNPC_U2 61
+#define EM2860_BOARD_KAIOMY_TVNPC_U2 63
+#define EM2860_BOARD_EASYCAP 64
/* Limits minimum and default number of buffers */
#define EM28XX_MIN_BUF 4
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/b07848302e6c4edd282e1b6d2d4ea52687a764bf
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
