V4L/DVB (11829): Rewrote frontend-attach mechanism to gain noise-less deactivation...
authorPatrick Boettcher <pb@linuxtv.org>
Wed, 20 May 2009 08:08:26 +0000 (05:08 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 16 Jun 2009 21:21:09 +0000 (18:21 -0300)
This patch is reorganizing the frontend-attach mechanism in order to
gain noise-less (superflous prints) deactivation of submodules.

Credits go to Uwe Bugla for helping to clean and test the code.

Signed-off-by: Uwe Bugla <uwe.bugla@gmx.de>
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/dvb/b2c2/flexcop-common.h
drivers/media/dvb/b2c2/flexcop-fe-tuner.c

index 3e1c472092ab238af0e26e1ef89917b220477aa7..9e2148a199676e0c45fb1472ba69b79f61a0e5b8 100644 (file)
@@ -1,9 +1,7 @@
 /*
- * This file is part of linux driver the digital TV devices equipped with B2C2 FlexcopII(b)/III
- *
- * flexcop-common.h - common header file for device-specific source files also.
- *
- * see flexcop.c for copyright information.
+ * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III
+ * flexcop-common.h - common header file for device-specific source files
+ * see flexcop.c for copyright information
  */
 #ifndef __FLEXCOP_COMMON_H__
 #define __FLEXCOP_COMMON_H__
index f7afab5944cfc2395c8b30592dc9740da22325cc..3f485bf131212e755c806672d724b0e19f6acb44 100644 (file)
@@ -1,34 +1,27 @@
 /*
- * This file is part of linux driver the digital TV devices equipped with B2C2 FlexcopII(b)/III
- *
- * flexcop-fe-tuner.c - methods for attaching a frontend and controlling DiSEqC.
- *
- * see flexcop.c for copyright information.
+ * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III
+ * flexcop-fe-tuner.c - methods for frontend attachment and DiSEqC controlling
+ * see flexcop.c for copyright information
  */
 #include <media/tuner.h>
-
 #include "flexcop.h"
-
-#include "stv0299.h"
-#include "mt352.h"
-#include "nxt200x.h"
-#include "bcm3510.h"
-#include "stv0297.h"
 #include "mt312.h"
-#include "lgdt330x.h"
-#include "dvb-pll.h"
-#include "tuner-simple.h"
-
+#include "stv0299.h"
 #include "s5h1420.h"
 #include "itd1000.h"
-
-#include "cx24123.h"
 #include "cx24113.h"
-
+#include "cx24123.h"
 #include "isl6421.h"
+#include "mt352.h"
+#include "bcm3510.h"
+#include "nxt200x.h"
+#include "dvb-pll.h"
+#include "lgdt330x.h"
+#include "tuner-simple.h"
+#include "stv0297.h"
 
 /* lnb control */
-
+#if defined(CONFIG_DVB_MT312_MODULE) || defined(CONFIG_DVB_STV0299_MODULE)
 static int flexcop_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
 {
        struct flexcop_device *fc = fe->dvb->priv;
@@ -37,65 +30,62 @@ static int flexcop_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage
 
        v = fc->read_ibi_reg(fc, misc_204);
        switch (voltage) {
-               case SEC_VOLTAGE_OFF:
-                       v.misc_204.ACPI1_sig = 1;
-                       break;
-               case SEC_VOLTAGE_13:
-                       v.misc_204.ACPI1_sig = 0;
-                       v.misc_204.LNB_L_H_sig = 0;
-                       break;
-               case SEC_VOLTAGE_18:
-                       v.misc_204.ACPI1_sig = 0;
-                       v.misc_204.LNB_L_H_sig = 1;
-                       break;
-               default:
-                       err("unknown SEC_VOLTAGE value");
-                       return -EINVAL;
+       case SEC_VOLTAGE_OFF:
+               v.misc_204.ACPI1_sig = 1;
+               break;
+       case SEC_VOLTAGE_13:
+               v.misc_204.ACPI1_sig = 0;
+               v.misc_204.LNB_L_H_sig = 0;
+               break;
+       case SEC_VOLTAGE_18:
+               v.misc_204.ACPI1_sig = 0;
+               v.misc_204.LNB_L_H_sig = 1;
+               break;
+       default:
+               err("unknown SEC_VOLTAGE value");
+               return -EINVAL;
        }
        return fc->write_ibi_reg(fc, misc_204, v);
 }
+#endif
 
+#if defined(CONFIG_DVB_S5H1420_MODULE) || defined(CONFIG_DVB_STV0299_MODULE) \
+       || defined(CONFIG_DVB_MT312_MODULE)
 static int flexcop_sleep(struct dvb_frontend* fe)
 {
        struct flexcop_device *fc = fe->dvb->priv;
-/*     flexcop_ibi_value v = fc->read_ibi_reg(fc,misc_204); */
-
        if (fc->fe_sleep)
                return fc->fe_sleep(fe);
-
-/*     v.misc_204.ACPI3_sig = 1;
-       fc->write_ibi_reg(fc,misc_204,v);*/
-
        return 0;
 }
+#endif
 
+/* SkyStar2 DVB-S rev 2.3 */
+#if defined(CONFIG_DVB_MT312_MODULE)
 static int flexcop_set_tone(struct dvb_frontend *fe, fe_sec_tone_mode_t tone)
 {
-       /* u16 wz_half_period_for_45_mhz[] = { 0x01ff, 0x0154, 0x00ff, 0x00cc }; */
+/* u16 wz_half_period_for_45_mhz[] = { 0x01ff, 0x0154, 0x00ff, 0x00cc }; */
        struct flexcop_device *fc = fe->dvb->priv;
        flexcop_ibi_value v;
        u16 ax;
        v.raw = 0;
-
        deb_tuner("tone = %u\n",tone);
 
        switch (tone) {
-               case SEC_TONE_ON:
-                       ax = 0x01ff;
-                       break;
-               case SEC_TONE_OFF:
-                       ax = 0;
-                       break;
-               default:
-                       err("unknown SEC_TONE value");
-                       return -EINVAL;
+       case SEC_TONE_ON:
+               ax = 0x01ff;
+               break;
+       case SEC_TONE_OFF:
+               ax = 0;
+               break;
+       default:
+               err("unknown SEC_TONE value");
+               return -EINVAL;
        }
 
        v.lnb_switch_freq_200.LNB_CTLPrescaler_sig = 1; /* divide by 2 */
-
        v.lnb_switch_freq_200.LNB_CTLHighCount_sig = ax;
        v.lnb_switch_freq_200.LNB_CTLLowCount_sig  = ax == 0 ? 0x1ff : ax;
-
        return fc->write_ibi_reg(fc,lnb_switch_freq_200,v);
 }
 
@@ -110,17 +100,16 @@ static void flexcop_diseqc_send_bit(struct dvb_frontend* fe, int data)
 static void flexcop_diseqc_send_byte(struct dvb_frontend* fe, int data)
 {
        int i, par = 1, d;
-
        for (i = 7; i >= 0; i--) {
                d = (data >> i) & 1;
                par ^= d;
                flexcop_diseqc_send_bit(fe, d);
        }
-
        flexcop_diseqc_send_bit(fe, par);
 }
 
-static int flexcop_send_diseqc_msg(struct dvb_frontend* fe, int len, u8 *msg, unsigned long burst)
+static int flexcop_send_diseqc_msg(struct dvb_frontend *fe,
+       int len, u8 *msg, unsigned long burst)
 {
        int i;
 
@@ -129,7 +118,6 @@ static int flexcop_send_diseqc_msg(struct dvb_frontend* fe, int len, u8 *msg, un
 
        for (i = 0; i < len; i++)
                flexcop_diseqc_send_byte(fe,msg[i]);
-
        mdelay(16);
 
        if (burst != -1) {
@@ -146,50 +134,110 @@ static int flexcop_send_diseqc_msg(struct dvb_frontend* fe, int len, u8 *msg, un
        return 0;
 }
 
-static int flexcop_diseqc_send_master_cmd(struct dvb_frontend* fe, struct dvb_diseqc_master_cmd* cmd)
+static int flexcop_diseqc_send_master_cmd(struct dvb_frontend *fe,
+       struct dvb_diseqc_master_cmd *cmd)
 {
        return flexcop_send_diseqc_msg(fe, cmd->msg_len, cmd->msg, 0);
 }
 
-static int flexcop_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t minicmd)
+static int flexcop_diseqc_send_burst(struct dvb_frontend *fe,
+       fe_sec_mini_cmd_t minicmd)
 {
        return flexcop_send_diseqc_msg(fe, 0, NULL, minicmd);
 }
 
-/* dvb-s stv0299 */
-static int samsung_tbmu24112_set_symbol_rate(struct dvb_frontend* fe, u32 srate, u32 ratio)
+static struct mt312_config skystar23_samsung_tbdu18132_config = {
+       .demod_address = 0x0e,
+};
+
+static int skystar23_samsung_tbdu18132_tuner_set_params(struct dvb_frontend *fe,
+       struct dvb_frontend_parameters *params)
+{
+       u8 buf[4];
+       u32 div;
+       struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf,
+       .len = sizeof(buf) };
+       struct flexcop_device *fc = fe->dvb->priv;
+       div = (params->frequency + (125/2)) / 125;
+
+       buf[0] = (div >> 8) & 0x7f;
+       buf[1] = (div >> 0) & 0xff;
+       buf[2] = 0x84 | ((div >> 10) & 0x60);
+       buf[3] = 0x80;
+
+       if (params->frequency < 1550000)
+               buf[3] |= 0x02;
+
+       if (fe->ops.i2c_gate_ctrl)
+               fe->ops.i2c_gate_ctrl(fe, 1);
+       if (i2c_transfer(&fc->fc_i2c_adap[0].i2c_adap, &msg, 1) != 1)
+               return -EIO;
+       return 0;
+}
+
+static void skystar2_rev23_attach(struct flexcop_device *fc,
+       struct i2c_adapter *i2c)
+{
+       fc->fe = dvb_attach(mt312_attach,
+                       &skystar23_samsung_tbdu18132_config, i2c);
+       if (fc->fe != NULL) {
+               struct dvb_frontend_ops *ops = &fc->fe->ops;
+               ops->tuner_ops.set_params \
+                       = skystar23_samsung_tbdu18132_tuner_set_params;
+               ops->diseqc_send_master_cmd = flexcop_diseqc_send_master_cmd;
+               ops->diseqc_send_burst      = flexcop_diseqc_send_burst;
+               ops->set_tone               = flexcop_set_tone;
+               ops->set_voltage            = flexcop_set_voltage;
+               fc->fe_sleep                = ops->sleep;
+               ops->sleep                  = flexcop_sleep;
+               fc->dev_type                = FC_SKY_REV23;
+       }
+}
+#endif
+
+/* SkyStar2 DVB-S rev 2.6 */
+#if defined(CONFIG_DVB_STV0299_MODULE)
+static int samsung_tbmu24112_set_symbol_rate(struct dvb_frontend *fe,
+       u32 srate, u32 ratio)
 {
        u8 aclk = 0;
        u8 bclk = 0;
 
-       if (srate < 1500000) { aclk = 0xb7; bclk = 0x47; }
-       else if (srate < 3000000) { aclk = 0xb7; bclk = 0x4b; }
-       else if (srate < 7000000) { aclk = 0xb7; bclk = 0x4f; }
-       else if (srate < 14000000) { aclk = 0xb7; bclk = 0x53; }
-       else if (srate < 30000000) { aclk = 0xb6; bclk = 0x53; }
-       else if (srate < 45000000) { aclk = 0xb4; bclk = 0x51; }
-
-       stv0299_writereg (fe, 0x13, aclk);
-       stv0299_writereg (fe, 0x14, bclk);
-       stv0299_writereg (fe, 0x1f, (ratio >> 16) & 0xff);
-       stv0299_writereg (fe, 0x20, (ratio >>  8) & 0xff);
-       stv0299_writereg (fe, 0x21, (ratio      ) & 0xf0);
+       if (srate < 1500000) {
+               aclk = 0xb7; bclk = 0x47;
+       } else if (srate < 3000000) {
+               aclk = 0xb7; bclk = 0x4b;
+       } else if (srate < 7000000) {
+               aclk = 0xb7; bclk = 0x4f;
+       } else if (srate < 14000000) {
+               aclk = 0xb7; bclk = 0x53;
+       } else if (srate < 30000000) {
+               aclk = 0xb6; bclk = 0x53;
+       } else if (srate < 45000000) {
+               aclk = 0xb4; bclk = 0x51;
+       }
 
+       stv0299_writereg(fe, 0x13, aclk);
+       stv0299_writereg(fe, 0x14, bclk);
+       stv0299_writereg(fe, 0x1f, (ratio >> 16) & 0xff);
+       stv0299_writereg(fe, 0x20, (ratio >>  8) & 0xff);
+       stv0299_writereg(fe, 0x21,  ratio        & 0xf0);
        return 0;
 }
 
-static int samsung_tbmu24112_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)
+static int samsung_tbmu24112_tuner_set_params(struct dvb_frontend *fe,
+       struct dvb_frontend_parameters *params)
 {
        u8 buf[4];
        u32 div;
-       struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };
+       struct i2c_msg msg = {
+       .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };
        struct flexcop_device *fc = fe->dvb->priv;
-
        div = params->frequency / 125;
 
        buf[0] = (div >> 8) & 0x7f;
        buf[1] = div & 0xff;
-       buf[2] = 0x84;  /* 0xC4 */
+       buf[2] = 0x84; /* 0xC4 */
        buf[3] = 0x08;
 
        if (params->frequency < 1500000)
@@ -203,48 +251,48 @@ static int samsung_tbmu24112_tuner_set_params(struct dvb_frontend* fe, struct dv
 }
 
 static u8 samsung_tbmu24112_inittab[] = {
-            0x01, 0x15,
-            0x02, 0x30,
-            0x03, 0x00,
-            0x04, 0x7D,
-            0x05, 0x35,
-            0x06, 0x02,
-            0x07, 0x00,
-            0x08, 0xC3,
-            0x0C, 0x00,
-            0x0D, 0x81,
-            0x0E, 0x23,
-            0x0F, 0x12,
-            0x10, 0x7E,
-            0x11, 0x84,
-            0x12, 0xB9,
-            0x13, 0x88,
-            0x14, 0x89,
-            0x15, 0xC9,
-            0x16, 0x00,
-            0x17, 0x5C,
-            0x18, 0x00,
-            0x19, 0x00,
-            0x1A, 0x00,
-            0x1C, 0x00,
-            0x1D, 0x00,
-            0x1E, 0x00,
-            0x1F, 0x3A,
-            0x20, 0x2E,
-            0x21, 0x80,
-            0x22, 0xFF,
-            0x23, 0xC1,
-            0x28, 0x00,
-            0x29, 0x1E,
-            0x2A, 0x14,
-            0x2B, 0x0F,
-            0x2C, 0x09,
-            0x2D, 0x05,
-            0x31, 0x1F,
-            0x32, 0x19,
-            0x33, 0xFE,
-            0x34, 0x93,
-            0xff, 0xff,
+       0x01, 0x15,
+       0x02, 0x30,
+       0x03, 0x00,
+       0x04, 0x7D,
+       0x05, 0x35,
+       0x06, 0x02,
+       0x07, 0x00,
+       0x08, 0xC3,
+       0x0C, 0x00,
+       0x0D, 0x81,
+       0x0E, 0x23,
+       0x0F, 0x12,
+       0x10, 0x7E,
+       0x11, 0x84,
+       0x12, 0xB9,
+       0x13, 0x88,
+       0x14, 0x89,
+       0x15, 0xC9,
+       0x16, 0x00,
+       0x17, 0x5C,
+       0x18, 0x00,
+       0x19, 0x00,
+       0x1A, 0x00,
+       0x1C, 0x00,
+       0x1D, 0x00,
+       0x1E, 0x00,
+       0x1F, 0x3A,
+       0x20, 0x2E,
+       0x21, 0x80,
+       0x22, 0xFF,
+       0x23, 0xC1,
+       0x28, 0x00,
+       0x29, 0x1E,
+       0x2A, 0x14,
+       0x2B, 0x0F,
+       0x2C, 0x09,
+       0x2D, 0x05,
+       0x31, 0x1F,
+       0x32, 0x19,
+       0x33, 0xFE,
+       0x34, 0x93,
+       0xff, 0xff,
 };
 
 static struct stv0299_config samsung_tbmu24112_config = {
@@ -259,27 +307,136 @@ static struct stv0299_config samsung_tbmu24112_config = {
        .set_symbol_rate = samsung_tbmu24112_set_symbol_rate,
 };
 
-/* dvb-t mt352 */
-static int samsung_tdtc9251dh0_demod_init(struct dvb_frontend* fe)
+static void skystar2_rev26_attach(struct flexcop_device *fc,
+       struct i2c_adapter *i2c)
 {
-       static u8 mt352_clock_config [] = { 0x89, 0x18, 0x2d };
-       static u8 mt352_reset [] = { 0x50, 0x80 };
-       static u8 mt352_adc_ctl_1_cfg [] = { 0x8E, 0x40 };
-       static u8 mt352_agc_cfg [] = { 0x67, 0x28, 0xa1 };
+       fc->fe = dvb_attach(stv0299_attach, &samsung_tbmu24112_config, i2c);
+       if (fc->fe != NULL) {
+               struct dvb_frontend_ops *ops  = &fc->fe->ops;
+               ops->tuner_ops.set_params = samsung_tbmu24112_tuner_set_params;
+               ops->set_voltage = flexcop_set_voltage;
+               fc->fe_sleep = ops->sleep;
+               ops->sleep = flexcop_sleep;
+       }
+}
+#endif
+
+/* SkyStar2 DVB-S rev 2.7 */
+#if defined(CONFIG_DVB_S5H1420_MODULE)
+static struct s5h1420_config skystar2_rev2_7_s5h1420_config = {
+       .demod_address = 0x53,
+       .invert = 1,
+       .repeated_start_workaround = 1,
+       .serial_mpeg = 1,
+};
+
+static struct itd1000_config skystar2_rev2_7_itd1000_config = {
+       .i2c_address = 0x61,
+};
+
+static void skystar2_rev27_attach(struct flexcop_device *fc,
+       struct i2c_adapter *i2c)
+{
+       /* enable no_base_addr - no repeated start when reading */
+       fc->fc_i2c_adap[0].no_base_addr = 1;
+       fc->fe = dvb_attach(s5h1420_attach,
+               &skystar2_rev2_7_s5h1420_config, i2c);
+       if (fc->fe != NULL) {
+               flexcop_ibi_value r108;
+               struct i2c_adapter *i2c_tuner \
+               = s5h1420_get_tuner_i2c_adapter(fc->fe);
+               struct dvb_frontend_ops *ops = &fc->fe->ops;
+
+               fc->fe_sleep = ops->sleep;
+               ops->sleep   = flexcop_sleep;
+
+               /* enable no_base_addr - no repeated start when reading */
+               fc->fc_i2c_adap[2].no_base_addr = 1;
+               if (dvb_attach(isl6421_attach, fc->fe,
+                       &fc->fc_i2c_adap[2].i2c_adap, 0x08, 1, 1) == NULL)
+                       err("ISL6421 could NOT be attached");
+               else
+                       info("ISL6421 successfully attached");
+
+               /* the ITD1000 requires a lower i2c clock - is it a problem ? */
+               r108.raw = 0x00000506;
+               fc->write_ibi_reg(fc, tw_sm_c_108, r108);
+               if (i2c_tuner) {
+                       if (dvb_attach(itd1000_attach, fc->fe, i2c_tuner,
+                               &skystar2_rev2_7_itd1000_config) == NULL)
+                               err("ITD1000 could NOT be attached");
+                       else
+                               info("ITD1000 successfully attached");
+               }
+       } else
+               fc->fc_i2c_adap[0].no_base_addr = 0;
+               /* for the next devices we need it again */
+}
+#endif
+
+/* SkyStar2 rev 2.8 */
+#if defined(CONFIG_DVB_CX24123_MODULE)
+static struct cx24123_config skystar2_rev2_8_cx24123_config = {
+       .demod_address = 0x55,
+       .dont_use_pll = 1,
+       .agc_callback = cx24113_agc_callback,
+};
+
+static const struct cx24113_config skystar2_rev2_8_cx24113_config = {
+       .i2c_addr = 0x54,
+       .xtal_khz = 10111,
+};
+
+static void skystar2_rev28_attach(struct flexcop_device *fc,
+       struct i2c_adapter *i2c)
+{
+       fc->fe = dvb_attach(cx24123_attach,
+                       &skystar2_rev2_8_cx24123_config, i2c);
+       if (fc->fe != NULL) {
+               struct i2c_adapter *i2c_tuner \
+                       = cx24123_get_tuner_i2c_adapter(fc->fe);
+               if (i2c_tuner != NULL) {
+                       if (dvb_attach(cx24113_attach, fc->fe,
+                                               &skystar2_rev2_8_cx24113_config,
+                                               i2c_tuner) == NULL)
+                               err("CX24113 could NOT be attached");
+                       else
+                               info("CX24113 successfully attached");
+               }
+
+               fc->fc_i2c_adap[2].no_base_addr = 1;
+               if (dvb_attach(isl6421_attach, fc->fe,
+                       &fc->fc_i2c_adap[2].i2c_adap, 0x08, 0, 0) == NULL)
+                       err("ISL6421 could NOT be attached");
+               else
+                       info("ISL6421 successfully attached");
+       /* TODO on i2c_adap[1] addr 0x11 (EEPROM) there seems to be an
+        * IR-receiver (PIC16F818) - but the card has no input for that ??? */
+       }
+}
+#endif
+
+/* AirStar DVB-T */
+#if defined(CONFIG_DVB_MT352_MODULE)
+static int samsung_tdtc9251dh0_demod_init(struct dvb_frontend *fe)
+{
+       static u8 mt352_clock_config[] = { 0x89, 0x18, 0x2d };
+       static u8 mt352_reset[] = { 0x50, 0x80 };
+       static u8 mt352_adc_ctl_1_cfg[] = { 0x8E, 0x40 };
+       static u8 mt352_agc_cfg[] = { 0x67, 0x28, 0xa1 };
        static u8 mt352_capt_range_cfg[] = { 0x75, 0x32 };
 
        mt352_write(fe, mt352_clock_config, sizeof(mt352_clock_config));
        udelay(2000);
        mt352_write(fe, mt352_reset, sizeof(mt352_reset));
        mt352_write(fe, mt352_adc_ctl_1_cfg, sizeof(mt352_adc_ctl_1_cfg));
-
        mt352_write(fe, mt352_agc_cfg, sizeof(mt352_agc_cfg));
        mt352_write(fe, mt352_capt_range_cfg, sizeof(mt352_capt_range_cfg));
-
        return 0;
 }
 
-static int samsung_tdtc9251dh0_calc_regs(struct dvb_frontend* fe, struct dvb_frontend_parameters *params, u8* pllbuf, int buf_len)
+static int samsung_tdtc9251dh0_calc_regs(struct dvb_frontend *fe,
+       struct dvb_frontend_parameters *params, u8* pllbuf, int buf_len)
 {
        u32 div;
        unsigned char bs = 0;
@@ -287,19 +444,20 @@ static int samsung_tdtc9251dh0_calc_regs(struct dvb_frontend* fe, struct dvb_fro
        if (buf_len < 5)
                return -EINVAL;
 
-       #define IF_FREQUENCYx6 217    /* 6 * 36.16666666667MHz */
+#define IF_FREQUENCYx6 217    /* 6 * 36.16666666667MHz */
        div = (((params->frequency + 83333) * 3) / 500000) + IF_FREQUENCYx6;
-
-       if (params->frequency >= 48000000 && params->frequency <= 154000000) bs = 0x09;
-       if (params->frequency >= 161000000 && params->frequency <= 439000000) bs = 0x0a;
-       if (params->frequency >= 447000000 && params->frequency <= 863000000) bs = 0x08;
+       if (params->frequency >= 48000000 && params->frequency <= 154000000) \
+               bs = 0x09;
+       if (params->frequency >= 161000000 && params->frequency <= 439000000) \
+               bs = 0x0a;
+       if (params->frequency >= 447000000 && params->frequency <= 863000000) \
+               bs = 0x08;
 
        pllbuf[0] = 0x61;
        pllbuf[1] = div >> 8;
        pllbuf[2] = div & 0xff;
        pllbuf[3] = 0xcc;
        pllbuf[4] = bs;
-
        return 5;
 }
 
@@ -308,70 +466,88 @@ static struct mt352_config samsung_tdtc9251dh0_config = {
        .demod_init    = samsung_tdtc9251dh0_demod_init,
 };
 
-static int flexcop_fe_request_firmware(struct dvb_frontend* fe, const struct firmware **fw, char* name)
+static void airstar_dvbt_attach(struct flexcop_device *fc,
+       struct i2c_adapter *i2c)
+{
+       fc->fe = dvb_attach(mt352_attach, &samsung_tdtc9251dh0_config, i2c);
+       if (fc->fe != NULL)
+               fc->fe->ops.tuner_ops.calc_regs = samsung_tdtc9251dh0_calc_regs;
+}
+#endif
+
+/* AirStar ATSC 1st generation */
+#if defined(CONFIG_DVB_BCM3510_MODULE)
+static int flexcop_fe_request_firmware(struct dvb_frontend *fe,
+       const struct firmware **fw, char* name)
 {
        struct flexcop_device *fc = fe->dvb->priv;
        return request_firmware(fw, name, fc->dev);
 }
 
-static struct lgdt330x_config air2pc_atsc_hd5000_config = {
-       .demod_address       = 0x59,
-       .demod_chip          = LGDT3303,
-       .serial_mpeg         = 0x04,
-       .clock_polarity_flip = 1,
-};
-
-static struct nxt200x_config samsung_tbmv_config = {
-       .demod_address    = 0x0a,
-};
-
 static struct bcm3510_config air2pc_atsc_first_gen_config = {
        .demod_address    = 0x0f,
        .request_firmware = flexcop_fe_request_firmware,
 };
 
-static int skystar23_samsung_tbdu18132_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)
+static void airstar_atsc1_attach(struct flexcop_device *fc,
+       struct i2c_adapter *i2c)
 {
-       u8 buf[4];
-       u32 div;
-       struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };
-       struct flexcop_device *fc = fe->dvb->priv;
-
-       div = (params->frequency + (125/2)) / 125;
-
-       buf[0] = (div >> 8) & 0x7f;
-       buf[1] = (div >> 0) & 0xff;
-       buf[2] = 0x84 | ((div >> 10) & 0x60);
-       buf[3] = 0x80;
+       fc->fe = dvb_attach(bcm3510_attach, &air2pc_atsc_first_gen_config, i2c);
+}
+#endif
 
-       if (params->frequency < 1550000)
-               buf[3] |= 0x02;
+/* AirStar ATSC 2nd generation */
+#if defined(CONFIG_DVB_NXT200X_MODULE)
+static struct nxt200x_config samsung_tbmv_config = {
+       .demod_address = 0x0a,
+};
 
-       if (fe->ops.i2c_gate_ctrl)
-               fe->ops.i2c_gate_ctrl(fe, 1);
-       if (i2c_transfer(&fc->fc_i2c_adap[0].i2c_adap, &msg, 1) != 1)
-               return -EIO;
-       return 0;
+static void airstar_atsc2_attach(struct flexcop_device *fc,
+       struct i2c_adapter *i2c)
+{
+       fc->fe = dvb_attach(nxt200x_attach, &samsung_tbmv_config, i2c);
+       if (fc->fe != NULL)
+               dvb_attach(dvb_pll_attach, fc->fe, 0x61, NULL,
+                               DVB_PLL_SAMSUNG_TBMV);
 }
+#endif
 
-static struct mt312_config skystar23_samsung_tbdu18132_config = {
-
-       .demod_address = 0x0e,
+/* AirStar ATSC 3rd generation */
+#if defined(CONFIG_DVB_LGDT330X_MODULE)
+static struct lgdt330x_config air2pc_atsc_hd5000_config = {
+       .demod_address       = 0x59,
+       .demod_chip          = LGDT3303,
+       .serial_mpeg         = 0x04,
+       .clock_polarity_flip = 1,
 };
 
+static void airstar_atsc3_attach(struct flexcop_device *fc,
+       struct i2c_adapter *i2c)
+{
+       fc->fe = dvb_attach(lgdt330x_attach, &air2pc_atsc_hd5000_config, i2c);
+       if (fc->fe != NULL) {
+               dvb_attach(simple_tuner_attach, fc->fe, i2c, 0x61,
+                               TUNER_LG_TDVS_H06XF);
+       }
+}
+#endif
+
+/* CableStar2 DVB-C */
+#if defined(CONFIG_DVB_STV0297_MODULE)
 static int alps_tdee4_stv0297_tuner_set_params(struct dvb_frontend* fe,
-                                              struct dvb_frontend_parameters *fep)
+               struct dvb_frontend_parameters *fep)
 {
        struct flexcop_device *fc = fe->dvb->priv;
        u8 buf[4];
        u16 div;
        int ret;
 
-/*  62.5 kHz * 10 */
+/* 62.5 kHz * 10 */
 #define REF_FREQ    625
 #define FREQ_OFFSET 36125
 
-       div = ((fep->frequency/1000 + FREQ_OFFSET ) * 10)  / REF_FREQ; // 4 MHz = 4000 KHz
+       div = ((fep->frequency/1000 + FREQ_OFFSET) * 10) / REF_FREQ;
+/* 4 MHz = 4000 KHz */
 
        buf[0] = (u8)( div >> 8) & 0x7f;
        buf[1] = (u8)        div & 0xff;
@@ -384,11 +560,11 @@ static int alps_tdee4_stv0297_tuner_set_params(struct dvb_frontend* fe,
  * AGD = 1, R3 R2 R1 R0 = 0 1 0 1 => byte 4 = 1**10101 = 0x95 */
        buf[2] = 0x95;
 
-// Range(MHz)  C1 *  RE RTS BS4 BS3 BS2 BS1  Byte 5
-//  47 - 153   0  *  0   0   0   0   0   1   0x01
-// 153 - 430   0  *  0   0   0   0   1   0   0x02
-// 430 - 822   0  *  0   0   1   0   0   0   0x08
-// 822 - 862   1  *  0   0   1   0   0   0   0x88
+/* Range(MHz)  C1 *  RE RTS BS4 BS3 BS2 BS1  Byte 5
+ *  47 - 153   0  *  0   0   0   0   0   1   0x01
+ * 153 - 430   0  *  0   0   0   0   1   0   0x02
+ * 430 - 822   0  *  0   0   1   0   0   0   0x08
+ * 822 - 862   1  *  0   0   1   0   0   0   0x88 */
 
             if (fep->frequency <= 153000000) buf[3] = 0x01;
        else if (fep->frequency <= 430000000) buf[3] = 0x02;
@@ -397,11 +573,11 @@ static int alps_tdee4_stv0297_tuner_set_params(struct dvb_frontend* fe,
 
        if (fe->ops.i2c_gate_ctrl)
                fe->ops.i2c_gate_ctrl(fe, 0);
-       deb_tuner("tuner buffer for %d Hz: %x %x %x %x\n",fep->frequency, buf[0],buf[1],buf[2],buf[3]);
+       deb_tuner("tuner buffer for %d Hz: %x %x %x %x\n", fep->frequency,
+       buf[0], buf[1], buf[2], buf[3]);
        ret = fc->i2c_request(&fc->fc_i2c_adap[2],
-               FC_WRITE, 0x61, buf[0], &buf[1], 3);
+                       FC_WRITE, 0x61, buf[0], &buf[1], 3);
        deb_tuner("tuner write returned: %d\n",ret);
-
        return ret;
 }
 
@@ -481,190 +657,75 @@ static u8 alps_tdee4_stv0297_inittab[] = {
 static struct stv0297_config alps_tdee4_stv0297_config = {
        .demod_address = 0x1c,
        .inittab = alps_tdee4_stv0297_inittab,
-//     .invert = 1,
-//     .pll_set = alps_tdee4_stv0297_pll_set,
 };
 
-
-/* SkyStar2 rev2.7 (a/u) */
-static struct s5h1420_config skystar2_rev2_7_s5h1420_config = {
-       .demod_address = 0x53,
-       .invert = 1,
-       .repeated_start_workaround = 1,
-       .serial_mpeg = 1,
-};
-
-static struct itd1000_config skystar2_rev2_7_itd1000_config = {
-       .i2c_address = 0x61,
-};
-
-/* SkyStar2 rev2.8 */
-static struct cx24123_config skystar2_rev2_8_cx24123_config = {
-       .demod_address = 0x55,
-       .dont_use_pll = 1,
-       .agc_callback = cx24113_agc_callback,
-};
-
-static const struct cx24113_config skystar2_rev2_8_cx24113_config = {
-       .i2c_addr = 0x54,
-       .xtal_khz = 10111,
-};
-
-/* try to figure out the frontend, each card/box can have on of the following list */
-int flexcop_frontend_init(struct flexcop_device *fc)
+static void cablestar2_attach(struct flexcop_device *fc,
+       struct i2c_adapter *i2c)
 {
-       struct dvb_frontend_ops *ops;
-       struct i2c_adapter *i2c = &fc->fc_i2c_adap[0].i2c_adap;
-       struct i2c_adapter *i2c_tuner;
-
-       /* enable no_base_addr - no repeated start when reading */
-       fc->fc_i2c_adap[0].no_base_addr = 1;
-       fc->fe = dvb_attach(s5h1420_attach, &skystar2_rev2_7_s5h1420_config, i2c);
-       if (fc->fe != NULL) {
-               flexcop_ibi_value r108;
-               i2c_tuner = s5h1420_get_tuner_i2c_adapter(fc->fe);
-               ops = &fc->fe->ops;
-
-               fc->fe_sleep = ops->sleep;
-               ops->sleep   = flexcop_sleep;
-
-               fc->dev_type = FC_SKY_REV27;
-
-               /* enable no_base_addr - no repeated start when reading */
-               fc->fc_i2c_adap[2].no_base_addr = 1;
-               if (dvb_attach(isl6421_attach, fc->fe, &fc->fc_i2c_adap[2].i2c_adap, 0x08, 1, 1) == NULL)
-                       err("ISL6421 could NOT be attached");
-               else
-                       info("ISL6421 successfully attached");
-
-               /* the ITD1000 requires a lower i2c clock - it slows down the stuff for everyone - but is it a problem ? */
-               r108.raw = 0x00000506;
-               fc->write_ibi_reg(fc, tw_sm_c_108, r108);
-               if (i2c_tuner) {
-                       if (dvb_attach(itd1000_attach, fc->fe, i2c_tuner, &skystar2_rev2_7_itd1000_config) == NULL)
-                               err("ITD1000 could NOT be attached");
-                       else
-                               info("ITD1000 successfully attached");
-               }
-               goto fe_found;
-       }
-       fc->fc_i2c_adap[0].no_base_addr = 0; /* for the next devices we need it again */
-
-       /* try the sky v2.8 (cx24123, isl6421) */
-       fc->fe = dvb_attach(cx24123_attach,
-               &skystar2_rev2_8_cx24123_config, i2c);
-       if (fc->fe != NULL) {
-               i2c_tuner = cx24123_get_tuner_i2c_adapter(fc->fe);
-               if (i2c_tuner != NULL) {
-                       if (dvb_attach(cx24113_attach, fc->fe,
-                                       &skystar2_rev2_8_cx24113_config,
-                                       i2c_tuner) == NULL)
-                               err("CX24113 could NOT be attached");
-                       else
-                               info("CX24113 successfully attached");
-               }
-
-               fc->dev_type = FC_SKY_REV28;
-
-               fc->fc_i2c_adap[2].no_base_addr = 1;
-               if (dvb_attach(isl6421_attach, fc->fe,
-                      &fc->fc_i2c_adap[2].i2c_adap, 0x08, 0, 0) == NULL)
-                       err("ISL6421 could NOT be attached");
-               else
-                       info("ISL6421 successfully attached");
-
-               /* TODO on i2c_adap[1] addr 0x11 (EEPROM) there seems to be an
-                * IR-receiver (PIC16F818) - but the card has no input for
-                * that ??? */
-
-               goto fe_found;
-    }
-
-       /* try the sky v2.6 (stv0299/Samsung tbmu24112(sl1935)) */
-       fc->fe = dvb_attach(stv0299_attach, &samsung_tbmu24112_config, i2c);
-       if (fc->fe != NULL) {
-               ops = &fc->fe->ops;
-
-               ops->tuner_ops.set_params = samsung_tbmu24112_tuner_set_params;
-
-               ops->set_voltage = flexcop_set_voltage;
-
-               fc->fe_sleep = ops->sleep;
-               ops->sleep = flexcop_sleep;
-
-               fc->dev_type = FC_SKY_REV26;
-               goto fe_found;
-       }
-
-       /* try the air dvb-t (mt352/Samsung tdtc9251dh0(??)) */
-       fc->fe = dvb_attach(mt352_attach, &samsung_tdtc9251dh0_config, i2c);
-       if (fc->fe != NULL) {
-               fc->dev_type = FC_AIR_DVBT;
-               fc->fe->ops.tuner_ops.calc_regs = samsung_tdtc9251dh0_calc_regs;
-               goto fe_found;
-       }
-
-       /* try the air atsc 2nd generation (nxt2002) */
-       fc->fe = dvb_attach(nxt200x_attach, &samsung_tbmv_config, i2c);
-       if (fc->fe != NULL) {
-               fc->dev_type = FC_AIR_ATSC2;
-               dvb_attach(dvb_pll_attach, fc->fe, 0x61, NULL, DVB_PLL_SAMSUNG_TBMV);
-               goto fe_found;
-       }
-
-       fc->fe = dvb_attach(lgdt330x_attach, &air2pc_atsc_hd5000_config, i2c);
-       if (fc->fe != NULL) {
-               fc->dev_type = FC_AIR_ATSC3;
-               dvb_attach(simple_tuner_attach, fc->fe, i2c, 0x61,
-                               TUNER_LG_TDVS_H06XF);
-               goto fe_found;
-       }
-
-       /* try the air atsc 1nd generation (bcm3510)/panasonic ct10s */
-       fc->fe = dvb_attach(bcm3510_attach, &air2pc_atsc_first_gen_config, i2c);
-       if (fc->fe != NULL) {
-               fc->dev_type = FC_AIR_ATSC1;
-               goto fe_found;
-       }
-
-       /* try the cable dvb (stv0297) */
        fc->fc_i2c_adap[0].no_base_addr = 1;
        fc->fe = dvb_attach(stv0297_attach, &alps_tdee4_stv0297_config, i2c);
-       if (fc->fe != NULL) {
-               fc->dev_type = FC_CABLE;
-               fc->fe->ops.tuner_ops.set_params = alps_tdee4_stv0297_tuner_set_params;
-               goto fe_found;
-       }
-       fc->fc_i2c_adap[0].no_base_addr = 0;
-
-       /* try the sky v2.3 (vp310/Samsung tbdu18132(tsa5059)) */
-       fc->fe = dvb_attach(mt312_attach,
-               &skystar23_samsung_tbdu18132_config, i2c);
-       if (fc->fe != NULL) {
-               ops = &fc->fe->ops;
-
-               ops->tuner_ops.set_params = skystar23_samsung_tbdu18132_tuner_set_params;
-
-               ops->diseqc_send_master_cmd = flexcop_diseqc_send_master_cmd;
-               ops->diseqc_send_burst      = flexcop_diseqc_send_burst;
-               ops->set_tone               = flexcop_set_tone;
-               ops->set_voltage            = flexcop_set_voltage;
-
-               fc->fe_sleep                = ops->sleep;
-               ops->sleep                  = flexcop_sleep;
+       if (fc->fe != NULL)
+               fc->fe->ops.tuner_ops.set_params \
+               = alps_tdee4_stv0297_tuner_set_params;
+       else
+               fc->fc_i2c_adap[0].no_base_addr = 0;
+}
+#endif
+
+static struct {
+       flexcop_device_type_t type;
+       void (*attach)(struct flexcop_device *, struct i2c_adapter *);
+} flexcop_frontends[] = {
+#if defined(CONFIG_DVB_S5H1420_MODULE)
+       { FC_SKY_REV27, skystar2_rev27_attach },
+#endif
+#if defined(CONFIG_DVB_CX24123_MODULE)
+       { FC_SKY_REV28, skystar2_rev28_attach },
+#endif
+#if defined(CONFIG_DVB_STV0299_MODULE)
+       { FC_SKY_REV26, skystar2_rev26_attach },
+#endif
+#if defined(CONFIG_DVB_MT352_MODULE)
+       { FC_AIR_DVBT, airstar_dvbt_attach },
+#endif
+#if defined(CONFIG_DVB_NXT200X_MODULE)
+       { FC_AIR_ATSC2, airstar_atsc2_attach },
+#endif
+#if defined(CONFIG_DVB_LGDT330X_MODULE)
+       { FC_AIR_ATSC3, airstar_atsc3_attach },
+#endif
+#if defined(CONFIG_DVB_BCM3510_MODULE)
+       { FC_AIR_ATSC1, airstar_atsc1_attach },
+#endif
+#if defined(CONFIG_DVB_STV0297_MODULE)
+       { FC_CABLE, cablestar2_attach },
+#endif
+#if defined(CONFIG_DVB_MT312_MODULE)
+       { FC_SKY_REV23, skystar2_rev23_attach },
+#endif
+};
 
-               fc->dev_type                = FC_SKY_REV23;
-               goto fe_found;
+/* try to figure out the frontend */
+int flexcop_frontend_init(struct flexcop_device *fc)
+{
+       int i;
+       for (i = 0; i < ARRAY_SIZE(flexcop_frontends); i++) {
+               /* type needs to be set before, because of some workarounds
+                * done based on the probed card type */
+               fc->dev_type = flexcop_frontends[i].type;
+               flexcop_frontends[i].attach(fc, &fc->fc_i2c_adap[0].i2c_adap);
+               if (fc->fe != NULL)
+                       goto fe_found;
        }
-
+       fc->dev_type = FC_UNK;
        err("no frontend driver found for this B2C2/FlexCop adapter");
        return -ENODEV;
 
 fe_found:
        info("found '%s' .", fc->fe->ops.info.name);
        if (dvb_register_frontend(&fc->dvb_adapter, fc->fe)) {
+               struct dvb_frontend_ops *ops = &fc->fe->ops;
                err("frontend registration failed!");
-               ops = &fc->fe->ops;
                if (ops->release != NULL)
                        ops->release(fc->fe);
                fc->fe = NULL;
@@ -680,6 +741,5 @@ void flexcop_frontend_exit(struct flexcop_device *fc)
                dvb_unregister_frontend(fc->fe);
                dvb_frontend_detach(fc->fe);
        }
-
        fc->init_state &= ~FC_STATE_FE_INIT;
 }