summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorManu Abraham2009-12-04 09:18:27 +0100
committerMauro Carvalho Chehab2010-01-17 14:55:36 +0100
commit990f8d1e161429ee1a0e9708f7989543e4648f73 (patch)
tree97a80b1bf4c3cb67b231ab6e0d1e0b6953c79463 /drivers
parentV4L/DVB (13753): [Mantis CA] SLOT_CONTROL: Implement Slot RESET (diff)
downloadkernel-qcow2-linux-990f8d1e161429ee1a0e9708f7989543e4648f73.tar.gz
kernel-qcow2-linux-990f8d1e161429ee1a0e9708f7989543e4648f73.tar.xz
kernel-qcow2-linux-990f8d1e161429ee1a0e9708f7989543e4648f73.zip
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/dvb/mantis/mantis_ca.c1
-rw-r--r--drivers/media/dvb/mantis/mantis_common.h2
-rw-r--r--drivers/media/dvb/mantis/mantis_core.h4
3 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/dvb/mantis/mantis_ca.c b/drivers/media/dvb/mantis/mantis_ca.c
index a30eb844ffdb..b9d808bf7109 100644
--- 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 49f2f118b498..ac3eefec0a7b 100644
--- 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 31b2a756d99e..a80939409935 100644
--- 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