git://git.onelab.eu / linux-2.6.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git] / drivers / media / video / em28xx / em28xx-cards.c
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index ed882eb..58f7b41 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -3,7 +3,7 @@
 
    Copyright (C) 2005 Ludovico Cavedon <cavedon@sssup.it>
                      Markus Rechberger <mrechberger@gmail.com>
-                     Mauro Carvalho Chehab <mchehab@infradead.org>
+                     Mauro Carvalho Chehab <mchehab@brturbo.com.br>
                      Sascha Sommer <saschasommer@freenet.de>
 
    This program is free software; you can redistribute it and/or modify
@@ -28,12 +28,10 @@
 #include <linux/i2c.h>
 #include <linux/usb.h>
 #include <media/tuner.h>
-#include <media/msp3400.h>
-#include <media/saa7115.h>
-#include <media/tvp5150.h>
-#include <media/tveeprom.h>
 #include <media/audiochip.h>
+#include <media/tveeprom.h>
 #include <media/v4l2-common.h>
+#include "msp3400.h"
 
 #include "em28xx.h"
 
@@ -48,11 +46,11 @@ struct em28xx_board em28xx_boards[] = {
                .decoder      = EM28XX_SAA7113,
                .input           = {{
                        .type     = EM28XX_VMUX_COMPOSITE1,
-                       .vmux     = SAA7115_COMPOSITE0,
+                       .vmux     = 0,
                        .amux     = 1,
                },{
                        .type     = EM28XX_VMUX_SVIDEO,
-                       .vmux     = SAA7115_SVIDEO3,
+                       .vmux     = 9,
                        .amux     = 1,
                }},
        },
@@ -66,29 +64,11 @@ struct em28xx_board em28xx_boards[] = {
                .decoder      = EM28XX_SAA7113,
                .input           = {{
                        .type     = EM28XX_VMUX_COMPOSITE1,
-                       .vmux     = SAA7115_COMPOSITE0,
-                       .amux     = 1,
-               },{
-                       .type     = EM28XX_VMUX_SVIDEO,
-                       .vmux     = SAA7115_SVIDEO3,
-                       .amux     = 1,
-               }},
-       },
-       [EM2820_BOARD_KWORLD_PVRTV2800RF] = {
-               .name         = "Kworld PVR TV 2800 RF",
-               .is_em2800    = 0,
-               .vchannels    = 2,
-               .norm         = VIDEO_MODE_PAL,
-               .tda9887_conf = TDA9887_PRESENT,
-               .has_tuner    = 1,
-               .decoder      = EM28XX_SAA7113,
-               .input           = {{
-                       .type     = EM28XX_VMUX_COMPOSITE1,
-                       .vmux     = SAA7115_COMPOSITE0,
+                       .vmux     = 0,
                        .amux     = 1,
                },{
                        .type     = EM28XX_VMUX_SVIDEO,
-                       .vmux     = SAA7115_SVIDEO3,
+                       .vmux     = 9,
                        .amux     = 1,
                }},
        },
@@ -102,15 +82,15 @@ struct em28xx_board em28xx_boards[] = {
                .decoder      = EM28XX_SAA7113,
                .input          = {{
                        .type     = EM28XX_VMUX_TELEVISION,
-                       .vmux     = SAA7115_COMPOSITE2,
-                       .amux     = 1,
+                       .vmux     = 2,
+                       .amux     = 0,
                },{
                        .type     = EM28XX_VMUX_COMPOSITE1,
-                       .vmux     = SAA7115_COMPOSITE0,
+                       .vmux     = 0,
                        .amux     = 1,
                },{
                        .type     = EM28XX_VMUX_SVIDEO,
-                       .vmux     = SAA7115_SVIDEO3,
+                       .vmux     = 9,
                        .amux     = 1,
                }},
        },
@@ -124,15 +104,15 @@ struct em28xx_board em28xx_boards[] = {
                .decoder      = EM28XX_SAA7113,
                .input          = {{
                        .type     = EM28XX_VMUX_TELEVISION,
-                       .vmux     = SAA7115_COMPOSITE2,
+                       .vmux     = 2,
                        .amux     = 0,
                },{
                        .type     = EM28XX_VMUX_COMPOSITE1,
-                       .vmux     = SAA7115_COMPOSITE0,
+                       .vmux     = 0,
                        .amux     = 1,
                },{
                        .type     = EM28XX_VMUX_SVIDEO,
-                       .vmux     = SAA7115_SVIDEO3,
+                       .vmux     = 9,
                        .amux     = 1,
                }},
        },
@@ -148,13 +128,12 @@ struct em28xx_board em28xx_boards[] = {
                /*FIXME: S-Video not tested */
                .input          = {{
                        .type     = EM28XX_VMUX_TELEVISION,
-                       .vmux     = TVP5150_COMPOSITE0,
-                       .amux     = MSP_INPUT_DEFAULT,
+                       .vmux     = 0,
+                       .amux     = 6,
                },{
                        .type     = EM28XX_VMUX_SVIDEO,
-                       .vmux     = TVP5150_SVIDEO,
-                       .amux     = MSP_INPUT(MSP_IN_SCART1, MSP_IN_TUNER1,
-                                       MSP_DSP_IN_SCART, MSP_DSP_IN_SCART),
+                       .vmux     = 2,
+                       .amux     = 1,
                }},
        },
        [EM2820_BOARD_MSI_VOX_USB_2] = {
@@ -167,15 +146,15 @@ struct em28xx_board em28xx_boards[] = {
                .decoder        = EM28XX_SAA7114,
                .input          = {{
                        .type     = EM28XX_VMUX_TELEVISION,
-                       .vmux     = SAA7115_COMPOSITE4,
+                       .vmux     = 4,
                        .amux     = 0,
                },{
                        .type     = EM28XX_VMUX_COMPOSITE1,
-                       .vmux     = SAA7115_COMPOSITE0,
+                       .vmux     = 0,
                        .amux     = 1,
                },{
                        .type     = EM28XX_VMUX_SVIDEO,
-                       .vmux     = SAA7115_SVIDEO3,
+                       .vmux     = 9,
                        .amux     = 1,
                }},
        },
@@ -190,15 +169,15 @@ struct em28xx_board em28xx_boards[] = {
                .decoder      = EM28XX_SAA7113,
                .input          = {{
                        .type     = EM28XX_VMUX_TELEVISION,
-                       .vmux     = SAA7115_COMPOSITE2,
+                       .vmux     = 2,
                        .amux     = 0,
                },{
                        .type     = EM28XX_VMUX_COMPOSITE1,
-                       .vmux     = SAA7115_COMPOSITE0,
+                       .vmux     = 0,
                        .amux     = 1,
                },{
                        .type     = EM28XX_VMUX_SVIDEO,
-                       .vmux     = SAA7115_SVIDEO3,
+                       .vmux     = 9,
                        .amux     = 1,
                }},
        },
@@ -213,15 +192,15 @@ struct em28xx_board em28xx_boards[] = {
                .decoder      = EM28XX_SAA7113,
                .input          = {{
                        .type     = EM28XX_VMUX_TELEVISION,
-                       .vmux     = SAA7115_COMPOSITE2,
+                       .vmux     = 2,
                        .amux     = 0,
                },{
                        .type     = EM28XX_VMUX_COMPOSITE1,
-                       .vmux     = SAA7115_COMPOSITE0,
+                       .vmux     = 0,
                        .amux     = 1,
                },{
                        .type     = EM28XX_VMUX_SVIDEO,
-                       .vmux     = SAA7115_SVIDEO3,
+                       .vmux     = 9,
                        .amux     = 1,
                }},
        },
@@ -236,15 +215,15 @@ struct em28xx_board em28xx_boards[] = {
                .decoder      = EM28XX_SAA7113,
                .input          = {{
                        .type     = EM28XX_VMUX_TELEVISION,
-                       .vmux     = SAA7115_COMPOSITE2,
+                       .vmux     = 2,
                        .amux     = 0,
                },{
                        .type     = EM28XX_VMUX_COMPOSITE1,
-                       .vmux     = SAA7115_COMPOSITE0,
+                       .vmux     = 0,
                        .amux     = 1,
                },{
                        .type     = EM28XX_VMUX_SVIDEO,
-                       .vmux     = SAA7115_SVIDEO3,
+                       .vmux     = 9,
                        .amux     = 1,
                }},
        },
@@ -256,11 +235,11 @@ struct em28xx_board em28xx_boards[] = {
                .decoder      = EM28XX_SAA7113,
                .input          = {{
                        .type     = EM28XX_VMUX_COMPOSITE1,
-                       .vmux     = SAA7115_COMPOSITE0,
+                       .vmux     = 0,
                        .amux     = 1,
                },{
                        .type     = EM28XX_VMUX_SVIDEO,
-                       .vmux     = SAA7115_SVIDEO3,
+                       .vmux     = 9,
                        .amux     = 1,
                }},
        },
@@ -278,52 +257,32 @@ struct usb_device_id em28xx_id_table [] = {
        { },
 };
 
-void em28xx_pre_card_setup(struct em28xx *dev)
-{
-       /* request some modules */
-       switch(dev->model){
-               case EM2880_BOARD_TERRATEC_PRODIGY_XS:
-               case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900:
-               case EM2880_BOARD_TERRATEC_HYBRID_XS:
-                       {
-                               em28xx_write_regs_req(dev, 0x00, 0x08, "\x7d", 1); // reset through GPIO?
-                               break;
-                       }
-       }
-}
-
 void em28xx_card_setup(struct em28xx *dev)
 {
        /* request some modules */
-       switch(dev->model){
-               case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2:
-                       {
-                               struct tveeprom tv;
+       if (dev->model == EM2820_BOARD_HAUPPAUGE_WINTV_USB_2) {
+               struct tveeprom tv;
 #ifdef CONFIG_MODULES
-                               request_module("tveeprom");
-                               request_module("ir-kbd-i2c");
-                               request_module("msp3400");
+               request_module("tveeprom");
+               request_module("ir-kbd-i2c");
+               request_module("msp3400");
 #endif
-                               /* Call first TVeeprom */
-
-                               dev->i2c_client.addr = 0xa0 >> 1;
-                               tveeprom_hauppauge_analog(&dev->i2c_client, &tv, dev->eedata);
+               /* Call first TVeeprom */
 
-                               dev->tuner_type= tv.tuner_type;
-                               if (tv.audio_processor == AUDIO_CHIP_MSP34XX) {
-                                       dev->i2s_speed=2048000;
-                                       dev->has_msp34xx=1;
-                               } else
-                                       dev->has_msp34xx=0;
-                               break;
-                       }
-               case EM2820_BOARD_KWORLD_PVRTV2800RF:
-                       {
-                               em28xx_write_regs_req(dev,0x00,0x08, "\xf9", 1); // GPIO enables sound on KWORLD PVR TV 2800RF
-                               break;
-                       }
+               dev->i2c_client.addr = 0xa0 >> 1;
+               tveeprom_hauppauge_analog(&dev->i2c_client, &tv, dev->eedata);
 
+               dev->tuner_type= tv.tuner_type;
+               if (tv.audio_processor == AUDIO_CHIP_MSP34XX) {
+                       dev->i2s_speed=2048000;
+                       dev->has_msp34xx=1;
+               } else
+                       dev->has_msp34xx=0;
        }
 }
 
+EXPORT_SYMBOL(em28xx_boards);
+EXPORT_SYMBOL(em28xx_bcount);
+EXPORT_SYMBOL(em28xx_id_table);
+
 MODULE_DEVICE_TABLE (usb, em28xx_id_table);
linux-2.6