Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=fdef464a7fdcc0f5905d380b2065fec7715bc95d
Commit:     fdef464a7fdcc0f5905d380b2065fec7715bc95d
Parent:     e2a1774d9c8b866db65853fd1a17e5f472dd5cf2
Author:     Hans Verkuil <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 30 05:55:58 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Fri Jan 25 19:01:50 2008 -0200

    V4L/DVB (6489): ivtv: add support for AVerMedia PVR-150 Plus
    
    Signed-off-by: Hans Verkuil <[EMAIL PROTECTED]>
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 drivers/media/video/ivtv/ivtv-cards.c  |   39 ++++++++++++++++++++++++++++++++
 drivers/media/video/ivtv/ivtv-cards.h  |    3 +-
 drivers/media/video/ivtv/ivtv-driver.c |    1 +
 3 files changed, 42 insertions(+), 1 deletions(-)

diff --git a/drivers/media/video/ivtv/ivtv-cards.c 
b/drivers/media/video/ivtv/ivtv-cards.c
index 3211809..4bb2fe8 100644
--- a/drivers/media/video/ivtv/ivtv-cards.c
+++ b/drivers/media/video/ivtv/ivtv-cards.c
@@ -918,6 +918,44 @@ static const struct ivtv_card ivtv_card_avertv_mce116 = {
 
 /* ------------------------------------------------------------------------- */
 
+/* AVerMedia PVR-150 Plus (M113) card */
+
+static const struct ivtv_card_pci_info ivtv_pci_aver_pvr150[] = {
+       { PCI_DEVICE_ID_IVTV16, IVTV_PCI_ID_AVERMEDIA, 0xc035 },
+       { 0, 0, 0 }
+};
+
+static const struct ivtv_card ivtv_card_aver_pvr150 = {
+       .type = IVTV_CARD_AVER_PVR150PLUS,
+       .name = "AVerMedia PVR-150 Plus",
+       .v4l2_capabilities = IVTV_CAP_ENCODER,
+       .hw_video = IVTV_HW_CX25840,
+       .hw_audio = IVTV_HW_CX25840,
+       .hw_audio_ctrl = IVTV_HW_CX25840,
+       .hw_muxer = IVTV_HW_GPIO,
+       .hw_all = IVTV_HW_CX25840 | IVTV_HW_TUNER,
+       .video_inputs = {
+               { IVTV_CARD_INPUT_VID_TUNER,  0, CX25840_COMPOSITE2 },
+               { IVTV_CARD_INPUT_SVIDEO1,    1,
+                 CX25840_SVIDEO_LUMA3 | CX25840_SVIDEO_CHROMA4 },
+               { IVTV_CARD_INPUT_COMPOSITE1, 1, CX25840_COMPOSITE1 },
+       },
+       .audio_inputs = {
+               { IVTV_CARD_INPUT_AUD_TUNER,  CX25840_AUDIO5,       0 },
+               { IVTV_CARD_INPUT_LINE_IN1,   CX25840_AUDIO_SERIAL, 1 },
+       },
+       .radio_input = { IVTV_CARD_INPUT_AUD_TUNER, CX25840_AUDIO_SERIAL, 2 },
+       .gpio_init = { .direction = 0x0800, .initial_value = 0 },
+       .gpio_audio_input  = { .mask = 0x0800, .tuner = 0, .linein = 0, .radio 
= 0x0800 },
+       .tuners = {
+               /* This card has a Partsnic PTI-5NF05 tuner */
+               { .std = V4L2_STD_525_60, .tuner = TUNER_TCL_2002N },
+       },
+       .pci_list = ivtv_pci_aver_pvr150,
+};
+
+/* ------------------------------------------------------------------------- */
+
 /* ASUS Falcon2 */
 
 static const struct ivtv_card_pci_info ivtv_pci_asus_falcon2[] = {
@@ -977,6 +1015,7 @@ static const struct ivtv_card *ivtv_card_list[] = {
        &ivtv_card_club3d,
        &ivtv_card_avertv_mce116,
        &ivtv_card_asus_falcon2,
+       &ivtv_card_aver_pvr150,
 
        /* Variations of standard cards but with the same PCI IDs.
           These cards must come last in this list. */
diff --git a/drivers/media/video/ivtv/ivtv-cards.h 
b/drivers/media/video/ivtv/ivtv-cards.h
index 81707bb..881b044 100644
--- a/drivers/media/video/ivtv/ivtv-cards.h
+++ b/drivers/media/video/ivtv/ivtv-cards.h
@@ -46,7 +46,8 @@
 #define IVTV_CARD_CLUB3D            19 /* Club3D ZAP-TV1x01 */
 #define IVTV_CARD_AVERTV_MCE116             20 /* AVerTV MCE 116 Plus */
 #define IVTV_CARD_ASUS_FALCON2      21 /* ASUS Falcon2 */
-#define IVTV_CARD_LAST                      21
+#define IVTV_CARD_AVER_PVR150PLUS    22 /* AVerMedia PVR-150 Plus */
+#define IVTV_CARD_LAST                      22
 
 /* Variants of existing cards but with the same PCI IDs. The driver
    detects these based on other device information.
diff --git a/drivers/media/video/ivtv/ivtv-driver.c 
b/drivers/media/video/ivtv/ivtv-driver.c
index a8aca14..04179b7 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -186,6 +186,7 @@ MODULE_PARM_DESC(cardtype,
                 "\t\t\t20 = Club3D ZAP-TV1x01\n"
                 "\t\t\t21 = AverTV MCE 116 Plus\n"
                 "\t\t\t22 = ASUS Falcon2\n"
+                "\t\t\t23 = AverMedia PVR-150 Plus\n"
                 "\t\t\t 0 = Autodetect (default)\n"
                 "\t\t\t-1 = Ignore this card\n\t\t");
 MODULE_PARM_DESC(pal, "Set PAL standard: B, G, H, D, K, I, M, N, Nc, 60");
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to