V4L/DVB (9012): Add support for DvbWorld 2004 DVB-S2 PCI adapter

Add support for DvbWorld 2004 DVB-S2 PCI adapter.
The card contains dm1105 PCI chip and cx24116 demodulator

Signed-off-by: Igor M. Liplianin <liplianin@me.by>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Igor M. Liplianin 2008-09-13 20:56:59 -03:00 committed by Mauro Carvalho Chehab
parent 490c868408
commit 35d9c42779
3 changed files with 14 additions and 17 deletions

View File

@ -36,7 +36,7 @@ comment "Supported Pluto2 Adapters"
source "drivers/media/dvb/pluto2/Kconfig" source "drivers/media/dvb/pluto2/Kconfig"
comment "Supported SDMC DM1105 Adapters" comment "Supported SDMC DM1105 Adapters"
depends on DVB_CORE && PCI && I2C depends on DVB_CORE && PCI && I2C
source "drivers/media/dvb/dm1105/Kconfig" source "drivers/media/dvb/dm1105/Kconfig"
comment "Supported DVB Frontends" comment "Supported DVB Frontends"

View File

@ -1,14 +1,15 @@
config DVB_DM1105 config DVB_DM1105
tristate "SDMC DM1105 based PCI cards" tristate "SDMC DM1105 based PCI cards"
depends on DVB_CORE && PCI && I2C depends on DVB_CORE && PCI && I2C
select DVB_PLL if !DVB_FE_CUSTOMISE select DVB_PLL if !DVB_FE_CUSTOMISE
select DVB_STV0299 if !DVB_FE_CUSTOMISE select DVB_STV0299 if !DVB_FE_CUSTOMISE
help select DVB_CX24116 if !DVB_FE_CUSTOMISE
Support for cards based on the SDMC DM1105 PCI chip like help
DvbWorld 2002 Support for cards based on the SDMC DM1105 PCI chip like
DvbWorld 2002
Since these cards have no MPEG decoder onboard, they transmit Since these cards have no MPEG decoder onboard, they transmit
only compressed MPEG data over the PCI bus, so you need only compressed MPEG data over the PCI bus, so you need
an external software decoder to watch TV on your computer. an external software decoder to watch TV on your computer.
Say Y or M if you own such a device and want to use it. Say Y or M if you own such a device and want to use it.

View File

@ -41,8 +41,8 @@
#include "stv0299.h" #include "stv0299.h"
/*#include "stv0288.h" /*#include "stv0288.h"
*#include "si21xx.h" *#include "si21xx.h"
*#include "stb6000.h" *#include "stb6000.h"*/
*#include "cx24116.h"*/ #include "cx24116.h"
#include "z0194a.h" #include "z0194a.h"
/* ----------------------------------------------- */ /* ----------------------------------------------- */
@ -605,11 +605,11 @@ static struct si21xx_config serit_config = {
.min_delay_ms = 100, .min_delay_ms = 100,
}; };
#endif /* keep */
static struct cx24116_config serit_sp2633_config = { static struct cx24116_config serit_sp2633_config = {
.demod_address = 0x55, .demod_address = 0x55,
}; };
#endif /* keep */
static int __devinit frontend_init(struct dm1105dvb *dm1105dvb) static int __devinit frontend_init(struct dm1105dvb *dm1105dvb)
{ {
@ -651,15 +651,11 @@ static int __devinit frontend_init(struct dm1105dvb *dm1105dvb)
#endif /* keep */ #endif /* keep */
break; break;
case PCI_DEVICE_ID_DW2004: case PCI_DEVICE_ID_DW2004:
#if 0
dm1105dvb->fe = dvb_attach( dm1105dvb->fe = dvb_attach(
cx24116_attach, &serit_sp2633_config, cx24116_attach, &serit_sp2633_config,
&dm1105dvb->i2c_adap); &dm1105dvb->i2c_adap);
if (dm1105dvb->fe) if (dm1105dvb->fe)
dm1105dvb->fe->ops.set_voltage = dm1105dvb_set_voltage; dm1105dvb->fe->ops.set_voltage = dm1105dvb_set_voltage;
#else /* keep */
dev_err(&dm1105dvb->pdev->dev, "needs cx24116 module\n");
#endif /* keep */
break; break;
} }