diff options
Diffstat (limited to 'linux/drivers/media/dvb/dvb-usb/dibusb-common.c')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/dibusb-common.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/dibusb-common.c b/linux/drivers/media/dvb/dvb-usb/dibusb-common.c index a32ff63d1..9b4e33090 100644 --- a/linux/drivers/media/dvb/dvb-usb/dibusb-common.c +++ b/linux/drivers/media/dvb/dvb-usb/dibusb-common.c @@ -217,12 +217,17 @@ int dibusb_dib3000mc_frontend_attach(struct dvb_usb_device *d) struct dib3000_config demod_cfg; struct dibusb_state *st = d->priv; +<<<<<<< /home/users/pboettcher/devel/v4l-dvb.stk3000p/linux/drivers/media/dvb/dvb-usb/dibusb-common.c demod_cfg.agc = &dib3000p_agc_panasonic_env57h1xd5; demod_cfg.pll_set = dibusb_tuner_set; demod_cfg.pll_init = dibusb_tuner_init; +======= +>>>>>>> /tmp/dibusb-common.c~other.VjLUsN for (demod_cfg.demod_address = 0x8; demod_cfg.demod_address < 0xd; demod_cfg.demod_address++) if ((d->fe = dib3000mc_attach(&demod_cfg,&d->i2c_adap,&st->ops)) != NULL) { + d->fe->ops.tuner_ops.init = dvb_usb_tuner_init_i2c; + d->fe->ops.tuner_ops.set_params = dvb_usb_tuner_set_params_i2c; d->tuner_pass_ctrl = st->ops.tuner_pass_ctrl; return 0; } @@ -233,6 +238,7 @@ EXPORT_SYMBOL(dibusb_dib3000mc_frontend_attach); int dibusb_dib3000mc_tuner_attach (struct dvb_usb_device *d) { +<<<<<<< /home/users/pboettcher/devel/v4l-dvb.stk3000p/linux/drivers/media/dvb/dvb-usb/dibusb-common.c int ret; u8 a,b; u16 if1 = 1220; @@ -269,6 +275,14 @@ int dibusb_dib3000mc_tuner_attach (struct dvb_usb_device *d) } d->tuner_pass_ctrl(d->fe,0,0); } +======= + d->pll_addr = 0x60; + d->pll_desc = &dvb_pll_env57h1xd5; + + d->fe->ops.tuner_ops.init = dvb_usb_tuner_init_i2c; + d->fe->ops.tuner_ops.set_params = dvb_usb_tuner_set_params_i2c; + +>>>>>>> /tmp/dibusb-common.c~other.VjLUsN return 0; } EXPORT_SYMBOL(dibusb_dib3000mc_tuner_attach); |