V4L/DVB (13754): [Mantis] CAM_CONTROL: Implement TS control

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/mantis/mantis_ca.c b/drivers/media/dvb/mantis/mantis_ca.c
index a30eb844ffdb231678891d7b88d9c33f97216cd5..b9d808bf7109481235309e535350631a7aadbd15 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_ca.c
+++ b/drivers/media/dvb/mantis/mantis_ca.c
@@ -105,6 +105,7 @@ static int mantis_ts_control(struct dvb_ca_en50221 *en50221, int slot)
        struct mantis_pci *mantis = ca->ca_priv;
 
        dprintk(verbose, MANTIS_DEBUG, 1, "Slot(%d): TS control", slot);
+       mantis_set_direction(mantis, 1); /* Enable TS through CAM */
 
        return 0;
 }

diff --git a/drivers/media/dvb/mantis/mantis_common.h b/drivers/media/dvb/mantis/mantis_common.h
index 49f2f118b4983b9d257a9a0a7ee9e5189baa781f..ac3eefec0a7b47c1875478512de535075d92b710 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_common.h
+++ b/drivers/media/dvb/mantis/mantis_common.h
@@ -153,6 +153,8 @@ extern int mantis_dvb_exit(struct mantis_pci *mantis);
 extern void mantis_dma_xfer(unsigned long data);
 extern void gpio_set_bits(struct mantis_pci *mantis, u32 bitpos, u8 value);
 
+extern void mantis_set_direction(struct mantis_pci *mantis, int direction);
+
 extern int mantis_ca_init(struct mantis_pci *mantis);
 extern void mantis_ca_exit(struct mantis_pci *mantis);
 

diff --git a/drivers/media/dvb/mantis/mantis_core.h b/drivers/media/dvb/mantis/mantis_core.h
index 31b2a756d99ece21f87f75c24a02e7b8cc0fdf04..a80939409935ea72fbc04059aa72fb79ca3896c5 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_core.h
+++ b/drivers/media/dvb/mantis/mantis_core.h
@@ -53,9 +53,5 @@ extern int mantis_i2c_init(struct mantis_pci *mantis);
 extern int mantis_i2c_exit(struct mantis_pci *mantis);
 extern int mantis_core_init(struct mantis_pci *mantis);
 extern int mantis_core_exit(struct mantis_pci *mantis);
-//extern void mantis_fe_powerup(struct mantis_pci *mantis);
-//extern void mantis_fe_powerdown(struct mantis_pci *mantis);
-//extern void mantis_fe_reset(struct dvb_frontend *fe);
-extern void mantis_set_direction(struct mantis_pci *mantis, int direction);
 
 #endif //__MANTIS_CORE_H