diff options
| author | Antti Palosaari | 2012-06-26 05:17:04 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2012-08-04 12:56:39 +0200 |
| commit | 8572211842afc53c8450fb470f2b8d02ba7592e0 (patch) | |
| tree | 286c3f210d50cc28ee03fd3b438a78f209ff8c40 /drivers/media/dvb/dvb-usb/mxl111sf.h | |
| parent | [media] dvb_usb_v2: register device even no remote keymap defined (diff) | |
| download | kernel-qcow2-linux-8572211842afc53c8450fb470f2b8d02ba7592e0.tar.gz kernel-qcow2-linux-8572211842afc53c8450fb470f2b8d02ba7592e0.tar.xz kernel-qcow2-linux-8572211842afc53c8450fb470f2b8d02ba7592e0.zip | |
[media] mxl111sf: convert to new DVB USB
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/mxl111sf.h')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/mxl111sf.h | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/drivers/media/dvb/dvb-usb/mxl111sf.h b/drivers/media/dvb/dvb-usb/mxl111sf.h index 364d89f826bd..9816de86e48c 100644 --- a/drivers/media/dvb/dvb-usb/mxl111sf.h +++ b/drivers/media/dvb/dvb-usb/mxl111sf.h @@ -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); |