leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] mxl111sf: convert to new DVB USB

Browse Source 
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Antti Palosaari 2012-06-26 00:17:04 -03:00 committed by Mauro Carvalho Chehab
parent de73beeed0
commit 8572211842
4 changed files with 577 additions and 945 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/dvb/dvb-usb/Kconfig
View File

@ -426,7 +426,7 @@ config DVB_USB_IT913X
config DVB_USB_MXL111SF config DVB_USB_MXL111SF
tristate "MxL111SF DTV USB2.0 support" tristate "MxL111SF DTV USB2.0 support"
depends on DVB_USB depends on DVB_USB_V2
select DVB_LGDT3305 if !DVB_FE_CUSTOMISE select DVB_LGDT3305 if !DVB_FE_CUSTOMISE
select DVB_LG2160 if !DVB_FE_CUSTOMISE select DVB_LG2160 if !DVB_FE_CUSTOMISE
select VIDEO_TVEEPROM select VIDEO_TVEEPROM

2
drivers/media/dvb/dvb-usb/mxl111sf-tuner.c
View File

@ -31,6 +31,8 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info (or-able)).");
if (mxl111sf_tuner_debug) \ if (mxl111sf_tuner_debug) \
mxl_printk(KERN_DEBUG, fmt, ##arg) mxl_printk(KERN_DEBUG, fmt, ##arg)
#define err pr_err
/* ------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------ */
struct mxl111sf_tuner_state { struct mxl111sf_tuner_state {

1496
drivers/media/dvb/dvb-usb/mxl111sf.c
View File

File diff suppressed because it is too large Load Diff

22
drivers/media/dvb/dvb-usb/mxl111sf.h
View File

@ -15,7 +15,7 @@
#undef DVB_USB_LOG_PREFIX #undef DVB_USB_LOG_PREFIX
#endif #endif
#define DVB_USB_LOG_PREFIX "mxl111sf" #define DVB_USB_LOG_PREFIX "mxl111sf"
#include "dvb-usb.h" #include "dvb_usb.h"
#include <media/tveeprom.h> #include <media/tveeprom.h>
#define MXL_EP1_REG_READ 1 #define MXL_EP1_REG_READ 1
@ -39,6 +39,15 @@ enum mxl111sf_gpio_port_expander {
mxl111sf_PCA9534, 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 mxl111sf_state {
struct dvb_usb_device *d; struct dvb_usb_device *d;
@ -74,15 +83,8 @@ struct mxl111sf_state {
struct tveeprom tv; struct tveeprom tv;
struct mutex fe_lock; struct mutex fe_lock;
}; u8 num_frontends;
struct mxl111sf_adap_state adap_state[3];
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 *);
}; };
int mxl111sf_read_reg(struct mxl111sf_state *state, u8 addr, u8 *data); int mxl111sf_read_reg(struct mxl111sf_state *state, u8 addr, u8 *data);