aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dvb-usb/digitv.h
diff options
context:
space:
mode:
authorTrent Piepho <xyzzy@speakeasy.org>2007-06-02 15:30:46 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-07-18 13:24:15 -0400
commit4ce15678926cef4886df46964142fc2520c216cd (patch)
tree6f3b02ff93f688646a2b53f4d9af7157306b7c16 /drivers/media/dvb/dvb-usb/digitv.h
parentb784e526a8333db57d1b9f385a12553066bdba64 (diff)
V4L/DVB (5777): Dvb-pll digitv dvb-usb: Eliminate last user of dvb_pll_configure
The last user of dvb_pll_configure was the dvb-usb function dvb_usb_tuner_calc_regs(), which was nothing more than a wrapper around dvb_pll_configure(). It's just a copy of the functionality provided by the tuner_ops calc_regs method, and can be deleted. There were two users of dvb_usb_tuner_calc_regs(). One was dvb_usb_tuner_set_params_i2c(), which is converted to use fe->ops.tuner_ops.calc_regs(). The other was the digitv driver. This driver can use one of two demods, mt352 or nxt6000. For the mt352, the driver would set tuner_ops.calc_regs to dvb_usb_tuner_calc_regs(). We can just attach dvb_pll and use the tuner_ops.calc_regs() provided by that module. For the nxt600, the driver would set tuner_ops.set_params to digitv_nxt6000_tuner_set_params. That function would in turn use dvb_usb_tuner_calc_regs(). We convert it to use tuner_ops.calc_regs() instead, and use dvb_pll_attach. The digitv_tuner_attach() needs to know which frontend was attached by digitv_frontend_attach(), since the nxt6000 needs tuner_ops.set_params() to be overridden with digitv_nxt6000_tuner_set_params(). So, to do this a digitv_state that says which frontend was used is added to the dvb_usb_device private state field. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/digitv.h')
-rw-r--r--drivers/media/dvb/dvb-usb/digitv.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/dvb/dvb-usb/digitv.h b/drivers/media/dvb/dvb-usb/digitv.h
index 477ee428a70e..8b43e3db8691 100644
--- a/drivers/media/dvb/dvb-usb/digitv.h
+++ b/drivers/media/dvb/dvb-usb/digitv.h
@@ -4,6 +4,10 @@
4#define DVB_USB_LOG_PREFIX "digitv" 4#define DVB_USB_LOG_PREFIX "digitv"
5#include "dvb-usb.h" 5#include "dvb-usb.h"
6 6
7struct digitv_state {
8 int is_nxt6000;
9};
10
7extern int dvb_usb_digitv_debug; 11extern int dvb_usb_digitv_debug;
8#define deb_rc(args...) dprintk(dvb_usb_digitv_debug,0x01,args) 12#define deb_rc(args...) dprintk(dvb_usb_digitv_debug,0x01,args)
9 13