aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pvrusb2/pvrusb2-dvb.c
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2008-02-03 21:48:09 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 13:09:46 -0400
commit99443ae04f7002530f666ba0747f7b1ecafb3002 (patch)
treeab7b975d721d7c8d43cbc1ce61aacc29870ffb5c /drivers/media/video/pvrusb2/pvrusb2-dvb.c
parent04910bdc5c172af9bc937a8869e7f2907db4443f (diff)
V4L/DVB (7680): pvrusb2-dvb: add pvr2_dvb_bus_ctrl to allow frontends to negotiate bus access
This function is just a skeleton for now - a placeholder to remind us to fix it. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-dvb.c')
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-dvb.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-dvb.c b/drivers/media/video/pvrusb2/pvrusb2-dvb.c
index 18c18db2fe3c..250462265a41 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-dvb.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-dvb.c
@@ -39,6 +39,17 @@ static int pvr2_dvb_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
39 return 0; /* FIXME: pvr2_dvb_ctrl_feed(dvbdmxfeed, 0); */ 39 return 0; /* FIXME: pvr2_dvb_ctrl_feed(dvbdmxfeed, 0); */
40} 40}
41 41
42static int pvr2_dvb_bus_ctrl(struct dvb_frontend *fe, int acquire)
43{
44 /* TO DO: This function will call into the core and request for
45 * input to be set to 'dtv' if (acquire) and if it isn't set already.
46 *
47 * If (!acquire) then we should do nothing -- don't switch inputs
48 * again unless the analog side of the driver requests the bus.
49 */
50 return 0;
51}
52
42static int pvr2_dvb_adapter_init(struct pvr2_dvb_adapter *adap) 53static int pvr2_dvb_adapter_init(struct pvr2_dvb_adapter *adap)
43{ 54{
44 int ret; 55 int ret;
@@ -136,6 +147,9 @@ static int pvr2_dvb_frontend_init(struct pvr2_dvb_adapter *adap)
136 if (adap->fe->ops.analog_ops.standby) 147 if (adap->fe->ops.analog_ops.standby)
137 adap->fe->ops.analog_ops.standby(adap->fe); 148 adap->fe->ops.analog_ops.standby(adap->fe);
138 149
150 /* Ensure all frontends negotiate bus access */
151 adap->fe->ops.ts_bus_ctrl = pvr2_dvb_bus_ctrl;
152
139 } else { 153 } else {
140 err("no frontend was attached!"); 154 err("no frontend was attached!");
141 return -ENODEV; 155 return -ENODEV;