[PATCH] dvb: Add generalized dvb-usb driver

Add generalized dvb-usb driver which supports a wide variety of devices.

Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 8 insertions, 21 deletions

diff --git a/drivers/media/dvb/frontends/dib3000mc.c b/drivers/media/dvb/frontends/dib3000mc.c
index 888f10a5e96b..cd33705a4320 100644
--- a/drivers/media/dvb/frontends/dib3000mc.c
+++ b/drivers/media/dvb/frontends/dib3000mc.c
@@ -48,8 +48,6 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info,2=xfer,4=setfe,8=getfe,16=s
 #define deb_getf(args...) dprintk(0x08,args)
 #define deb_stat(args...) dprintk(0x10,args)
 
-static int dib3000mc_tuner_pass_ctrl(struct dvb_frontend *fe, int onoff, u8 pll_addr);
-
 static int dib3000mc_set_impulse_noise(struct dib3000_state * state, int mode,
         fe_transmit_mode_t transmission_mode, fe_bandwidth_t bandwidth)
 {
@@ -463,10 +461,8 @@ static int dib3000mc_set_frontend(struct dvb_frontend* fe,
         int search_state,auto_val;
         u16 val;
 
-        if (tuner && state->config.pll_addr && state->config.pll_set) { /* initial call from dvb */
-                dib3000mc_tuner_pass_ctrl(fe,1,state->config.pll_addr(fe));
-                state->config.pll_set(fe,fep,NULL);
-                dib3000mc_tuner_pass_ctrl(fe,0,state->config.pll_addr(fe));
+        if (tuner && state->config.pll_set) { /* initial call from dvb */
+                state->config.pll_set(fe,fep);
 
                 state->last_tuned_freq = fep->frequency;
         //      if (!scanboost) {
@@ -554,19 +550,15 @@ static int dib3000mc_set_frontend(struct dvb_frontend* fe,
                         dib3000mc_set_adp_cfg(state,ofdm->constellation);
                 wr_foreach(dib3000mc_reg_offset,
                                 dib3000mc_offset[(ofdm->transmission_mode == TRANSMISSION_MODE_8K)+1]);
-
-
         }
         return 0;
 }
 
 static int dib3000mc_fe_init(struct dvb_frontend* fe, int mobile_mode)
 {
-        struct dib3000_state *state;
-
+        struct dib3000_state *state = fe->demodulator_priv;
         deb_info("init start\n");
 
-        state = fe->demodulator_priv;
         state->timing_offset = 0;
         state->timing_offset_comp_done = 0;
 
@@ -649,11 +641,9 @@ static int dib3000mc_fe_init(struct dvb_frontend* fe, int mobile_mode)
 
         set_or(DIB3000MC_REG_CLK_CFG_7,DIB3000MC_CLK_CFG_7_DIV_IN_OFF);
 
-/*      if (state->config->pll_init) {
-                dib3000mc_tuner_pass_ctrl(fe,1,state->config.pll_addr(fe));
-                state->config->pll_init(fe,NULL);
-                dib3000mc_tuner_pass_ctrl(fe,0,state->config.pll_addr(fe));
-        }*/
+        if (state->config.pll_init)
+                state->config.pll_init(fe);
+
         deb_info("init end\n");
         return 0;
 }
@@ -688,7 +678,7 @@ static int dib3000mc_read_unc_blocks(struct dvb_frontend* fe, u32 *unc)
 {
         struct dib3000_state* state = fe->demodulator_priv;
 
-        *unc = rd(DIB3000MC_REG_PACKET_ERROR_COUNT);
+        *unc = rd(DIB3000MC_REG_PACKET_ERRORS);
         return 0;
 }
 
@@ -737,10 +727,7 @@ static int dib3000mc_sleep(struct dvb_frontend* fe)
 
 static int dib3000mc_fe_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings *tune)
 {
-        tune->min_delay_ms = 2000;
-        tune->step_size = 166667;
-        tune->max_drift = 166667 * 2;
-
+        tune->min_delay_ms = 1000;
         return 0;
 }