Commit 8112248a authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

[media] Move CI cxd2099 driver to staging

This driver is abusing the kernel<=>userspace API, due to the lack of a
proper solution for it. A discussion were done at:
	http://www.mail-archive.com/linux-media@vger.kernel.org/msg22196.html
But there's not a solution for it yet. So, move the driver to staging, while
we don't have a final solution.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 4862d6b2
...@@ -2,10 +2,13 @@ ...@@ -2,10 +2,13 @@
# Makefile for the nGene device driver # Makefile for the nGene device driver
# #
ngene-objs := ngene-core.o ngene-i2c.o ngene-cards.o ngene-dvb.o cxd2099.o ngene-objs := ngene-core.o ngene-i2c.o ngene-cards.o ngene-dvb.o
obj-$(CONFIG_DVB_NGENE) += ngene.o obj-$(CONFIG_DVB_NGENE) += ngene.o
EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/
EXTRA_CFLAGS += -Idrivers/media/dvb/frontends/ EXTRA_CFLAGS += -Idrivers/media/dvb/frontends/
EXTRA_CFLAGS += -Idrivers/media/common/tuners/ EXTRA_CFLAGS += -Idrivers/media/common/tuners/
# For the staging CI driver cxd2099
EXTRA_CFLAGS += -Idrivers/staging/cxd2099/
...@@ -51,6 +51,8 @@ source "drivers/staging/cx25821/Kconfig" ...@@ -51,6 +51,8 @@ source "drivers/staging/cx25821/Kconfig"
source "drivers/staging/tm6000/Kconfig" source "drivers/staging/tm6000/Kconfig"
source "drivers/staging/cxd2099/Kconfig"
source "drivers/staging/dabusb/Kconfig" source "drivers/staging/dabusb/Kconfig"
source "drivers/staging/se401/Kconfig" source "drivers/staging/se401/Kconfig"
......
...@@ -8,6 +8,7 @@ obj-$(CONFIG_SLICOSS) += slicoss/ ...@@ -8,6 +8,7 @@ obj-$(CONFIG_SLICOSS) += slicoss/
obj-$(CONFIG_VIDEO_GO7007) += go7007/ obj-$(CONFIG_VIDEO_GO7007) += go7007/
obj-$(CONFIG_VIDEO_CX25821) += cx25821/ obj-$(CONFIG_VIDEO_CX25821) += cx25821/
obj-$(CONFIG_VIDEO_TM6000) += tm6000/ obj-$(CONFIG_VIDEO_TM6000) += tm6000/
obj-$(CONFIG_DVB_CXD2099) += cxd2099/
obj-$(CONFIG_USB_DABUSB) += dabusb/ obj-$(CONFIG_USB_DABUSB) += dabusb/
obj-$(CONFIG_USB_VICAM) += usbvideo/ obj-$(CONFIG_USB_VICAM) += usbvideo/
obj-$(CONFIG_USB_SE401) += se401/ obj-$(CONFIG_USB_SE401) += se401/
......
config DVB_CXD2099
tristate "CXD2099AR Common Interface driver"
depends on DVB_CORE && PCI && I2C && DVB_NGENE
---help---
Support for the CI module found on cineS2 DVB-S2, supported by
the Micronas PCIe device driver (ngene).
For now, data is passed through '/dev/dvb/adapterX/sec0':
- Encrypted data must be written to 'sec0'.
- Decrypted data can be read from 'sec0'.
- Setup the CAM using device 'ca0'.
obj-$(CONFIG_DVB_CXD2099) += cxd2099.o
EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/
EXTRA_CFLAGS += -Idrivers/media/dvb/frontends/
EXTRA_CFLAGS += -Idrivers/media/common/tuners/
For now, data is passed through '/dev/dvb/adapterX/sec0':
- Encrypted data must be written to 'sec0'.
- Decrypted data can be read from 'sec0'.
- Setup the CAM using device 'ca0'.
But this is wrong. There are some discussions about the proper way for
doing it, as seen at:
http://www.mail-archive.com/linux-media@vger.kernel.org/msg22196.html
While there's no proper fix for it, the driver should be kept in staging.
Patches should be submitted to: linux-media@vger.kernel.org.
...@@ -27,6 +27,15 @@ ...@@ -27,6 +27,15 @@
#include <dvb_ca_en50221.h> #include <dvb_ca_en50221.h>
#if defined(CONFIG_DVB_CXD2099) || \
(defined(CONFIG_DVB_CXD2099_MODULE) && defined(MODULE))
struct dvb_ca_en50221 *cxd2099_attach(u8 adr, void *priv, struct i2c_adapter *i2c); struct dvb_ca_en50221 *cxd2099_attach(u8 adr, void *priv, struct i2c_adapter *i2c);
#else
struct dvb_ca_en50221 *cxd2099_attach(u8 adr, void *priv, struct i2c_adapter *i2c)
{
printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
return NULL;
}
#endif
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment