Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85722118 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files

[media] mxl111sf: convert to new DVB USB 



Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent de73beee

drivers/media/dvb/dvb-usb/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ config DVB_USB_IT913X 


config DVB_USB_MXL111SF

	tristate "MxL111SF DTV USB2.0 support"

	depends on DVB_USB

	depends on DVB_USB_V2

	select DVB_LGDT3305 if !DVB_FE_CUSTOMISE

	select DVB_LG2160 if !DVB_FE_CUSTOMISE

	select VIDEO_TVEEPROM

drivers/media/dvb/dvb-usb/mxl111sf-tuner.c

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info (or-able))."); 
	if (mxl111sf_tuner_debug) \

		mxl_printk(KERN_DEBUG, fmt, ##arg)



#define err pr_err



/* ------------------------------------------------------------------------ */



struct mxl111sf_tuner_state {

drivers/media/dvb/dvb-usb/mxl111sf.c

+542 −914

File changed.

Preview size limit exceeded, changes collapsed.

drivers/media/dvb/dvb-usb/mxl111sf.h

+12 −10
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#undef DVB_USB_LOG_PREFIX

#endif

#define DVB_USB_LOG_PREFIX "mxl111sf"

#include "dvb-usb.h"

#include "dvb_usb.h"

#include <media/tveeprom.h>



#define MXL_EP1_REG_READ     1
@@ -39,6 +39,15 @@ enum mxl111sf_gpio_port_expander { 
	mxl111sf_PCA9534,

};



struct mxl111sf_adap_state {

	int alt_mode;

	int gpio_mode;

	int device_mode;

	int ep6_clockphase;

	int (*fe_init)(struct dvb_frontend *);

	int (*fe_sleep)(struct dvb_frontend *);

};



struct mxl111sf_state {

	struct dvb_usb_device *d;
@@ -74,15 +83,8 @@ struct mxl111sf_state { 
	struct tveeprom tv;



	struct mutex fe_lock;

};



struct mxl111sf_adap_state {

	int alt_mode;

	int gpio_mode;

	int device_mode;

	int ep6_clockphase;

	int (*fe_init)(struct dvb_frontend *);

	int (*fe_sleep)(struct dvb_frontend *);

	u8 num_frontends;

	struct mxl111sf_adap_state adap_state[3];

};



int mxl111sf_read_reg(struct mxl111sf_state *state, u8 addr, u8 *data);