V4L/DVB: Cleanups for mt2060-integration

- some coding style fixes for newly added mt2060
- moved agc-config from fixed values in dib3000mc to configurable ones
- whitespace clean-ups for usb-id-file

Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

4 files changed, 91 insertions, 94 deletions

diff --git a/drivers/media/dvb/dvb-usb/dibusb-common.c b/drivers/media/dvb/dvb-usb/dibusb-common.c
index 4d3d0d3dab95..e079ba95d384 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-common.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-common.c
@@ -168,63 +168,61 @@ int dibusb_read_eeprom_byte(struct dvb_usb_device *d, u8 offs, u8 *val)
 }
 EXPORT_SYMBOL(dibusb_read_eeprom_byte);
 
-static struct mt2060_config default_mt2060_config = {
+static struct mt2060_config stk3000p_mt2060_config = {
         .i2c_address = 0x60,
 };
 
 static int dibusb_tuner_init(struct dvb_frontend *fe)
 {
-        int ret;
         struct dvb_usb_device *d = fe->dvb->priv;
         struct dibusb_state *st = d->priv;
 
-        if (d->tuner_pass_ctrl) {
-                if ((int)d->fe->misc_priv==DIBUSB_TUNER_MT2060) { // Microtune MT2060
-                        d->tuner_pass_ctrl(d->fe,1,default_mt2060_config.i2c_address);
-                        ret=mt2060_init(&st->mt2060);
-                }
-                else { // Panasonic whatever
-                        d->tuner_pass_ctrl(d->fe,1,d->pll_addr);
-                        ret=dvb_usb_pll_init_i2c(fe);
-                }
-                d->tuner_pass_ctrl(d->fe,0,0);
+        if (d->tuner_pass_ctrl && st->mt2060_present) {
+                int ret;
+                d->tuner_pass_ctrl(d->fe, 1, stk3000p_mt2060_config.i2c_address);
+                ret = mt2060_init(&st->mt2060);
+                d->tuner_pass_ctrl(d->fe, 0, 0);
                 return ret;
         }
-        return -ENODEV;
+        return dvb_usb_pll_init_i2c(fe);
 }
 
 static int dibusb_tuner_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)
 {
-        int ret;
         struct dvb_usb_device *d = fe->dvb->priv;
         struct dibusb_state *st = d->priv;
 
-        if (d->tuner_pass_ctrl) {
-                if ((int)d->fe->misc_priv==DIBUSB_TUNER_MT2060) {
-                        d->tuner_pass_ctrl(d->fe,1,default_mt2060_config.i2c_address);
-                        ret=mt2060_set(&st->mt2060,fep);
-                }
-                else {
-                        d->tuner_pass_ctrl(d->fe,1,d->pll_addr);
-                        ret=dvb_usb_pll_set_i2c(fe,fep);
-                }
+        if (d->tuner_pass_ctrl && st->mt2060_present) {
+                int ret;
+                d->tuner_pass_ctrl(d->fe, 1, stk3000p_mt2060_config.i2c_address);
+                ret = mt2060_set(&st->mt2060,fep);
                 d->tuner_pass_ctrl(d->fe,0,0);
                 return ret;
         }
-        return -ENODEV;
+        return dvb_usb_pll_set_i2c(fe,fep);
 }
 
+static const struct dib3000p_agc_config dib3000p_agc_panasonic_env57h1xd5 = {
+        { 0x51, 0x301d, 0x0, 0x1cc7, 0xdc29, 0x570a,
+        0xbae1, 0x8ccd, 0x3b6d, 0x551d, 0xa, 0x951e }
+};
+
+static const struct dib3000p_agc_config dib3000p_agc_microtune_mt2060 = {
+        { 0x196, 0x301d, 0x0, 0x1cc7, 0xffff, 0x5c29,
+        0xa8f6, 0x5eb8, 0x65ff, 0x40ff, 0x8a, 0x1114 }
+};
+
 int dibusb_dib3000mc_frontend_attach(struct dvb_usb_device *d)
 {
         struct dib3000_config demod_cfg;
         struct dibusb_state *st = d->priv;
 
-        demod_cfg.pll_set = dibusb_tuner_set;
+        demod_cfg.agc      = &dib3000p_agc_panasonic_env57h1xd5;
+        demod_cfg.pll_set  = dibusb_tuner_set;
         demod_cfg.pll_init = dibusb_tuner_init;
 
         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->misc_priv=(void *)DIBUSB_TUNER_DEFAULT;
                         d->tuner_pass_ctrl = st->ops.tuner_pass_ctrl;
                         return 0;
                 }
@@ -236,18 +234,23 @@ EXPORT_SYMBOL(dibusb_dib3000mc_frontend_attach);
 int dibusb_dib3000mc_tuner_attach (struct dvb_usb_device *d)
 {
         int ret;
-        d->pll_addr = 0x60;
-        d->pll_desc = &dvb_pll_env57h1xd5;
+
         if (d->tuner_pass_ctrl) {
                 struct dibusb_state *st = d->priv;
-                d->tuner_pass_ctrl(d->fe,1,default_mt2060_config.i2c_address);
-                if ((ret = mt2060_attach(&st->mt2060,&default_mt2060_config, &d->i2c_adap)) == 0) {
-                        d->fe->misc_priv=(void *)DIBUSB_TUNER_MT2060;
+                d->tuner_pass_ctrl(d->fe, 1, stk3000p_mt2060_config.i2c_address);
+                /* check for mt2060 */
+                if ((ret = mt2060_attach(&st->mt2060,&stk3000p_mt2060_config, &d->i2c_adap)) != 0) {
+                        /* not found - use panasonic pll parameters */
+                        d->pll_addr = 0x60;
+                        d->pll_desc = &dvb_pll_env57h1xd5;
+                } else {
+                        st->mt2060_present = 1;
+                        /* set the correct agc parameters for the dib3000p */
+                        dib3000mc_set_agc_config(d->fe, &dib3000p_agc_microtune_mt2060);
                 }
                 d->tuner_pass_ctrl(d->fe,0,0);
-                return 0;
         }
-        return -ENODEV;
+        return 0;
 }
 EXPORT_SYMBOL(dibusb_dib3000mc_tuner_attach);
 
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mc.c b/drivers/media/dvb/dvb-usb/dibusb-mc.c
index 2ef3d739abba..aba2de6ba56b 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-mc.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-mc.c
@@ -33,8 +33,8 @@ static struct usb_device_id dibusb_dib3000mc_table [] = {
 /* 05 */        { USB_DEVICE(USB_VID_LITEON,            USB_PID_LITEON_DVB_T_WARM) },
 /* 06 */        { USB_DEVICE(USB_VID_EMPIA,             USB_PID_DIGIVOX_MINI_SL_COLD) },
 /* 07 */        { USB_DEVICE(USB_VID_EMPIA,             USB_PID_DIGIVOX_MINI_SL_WARM) },
-/* 08 */        { USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_COLD) },
-/* 09 */        { USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_WARM) },
+/* 08 */        { USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_COLD) },
+/* 09 */        { USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_WARM) },
                         { }             /* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, dibusb_dib3000mc_table);
diff --git a/drivers/media/dvb/dvb-usb/dibusb.h b/drivers/media/dvb/dvb-usb/dibusb.h
index f3e3ea8c8dbb..7fd57d053b9f 100644
--- a/drivers/media/dvb/dvb-usb/dibusb.h
+++ b/drivers/media/dvb/dvb-usb/dibusb.h
@@ -95,16 +95,10 @@
 #define DIBUSB_IOCTL_CMD_ENABLE_STREAM  0x01
 #define DIBUSB_IOCTL_CMD_DISABLE_STREAM 0x02
 
-/* Tuner types.
-   These constants shall correspond to the proper AGC values in the array
-   dib3000mc_agc_tuner[][12] in dib3000mc_priv.h */
-#define DIBUSB_TUNER_DEFAULT 1 // a.k.a Panasonic
-#define DIBUSB_TUNER_MT2060  4
-
-
 struct dibusb_state {
         struct dib_fe_xfer_ops ops;
         struct mt2060_state mt2060;
+        int mt2060_present;
 
         /* for RC5 remote control */
         int old_toggle;
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 6039e67425ac..82374abd460e 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -10,51 +10,51 @@
 #define _DVB_USB_IDS_H_
 
 /* Vendor IDs */
-#define USB_VID_ADSTECH                                         0x06e1
-#define USB_VID_ANCHOR                                          0x0547
-#define USB_VID_WIDEVIEW                                        0x14aa
-#define USB_VID_AVERMEDIA                                       0x07ca
-#define USB_VID_COMPRO                                          0x185b
-#define USB_VID_COMPRO_UNK                                      0x145f
-#define USB_VID_CYPRESS                                         0x04b4
-#define USB_VID_DIBCOM                                          0x10b8
-#define USB_VID_DVICO                                           0x0fe9
-#define USB_VID_EMPIA                                           0xeb1a
-#define USB_VID_GRANDTEC                                        0x5032
-#define USB_VID_HANFTEK                                         0x15f4
-#define USB_VID_HAUPPAUGE                                       0x2040
-#define USB_VID_HYPER_PALTEK                            0x1025
-#define USB_VID_KWORLD                                          0xeb2a
-#define USB_VID_KYE                                                     0x0458
-#define USB_VID_MEDION                                          0x1660
-#define USB_VID_PINNACLE                                        0x2304
-#define USB_VID_VISIONPLUS                                      0x13d3
-#define USB_VID_TWINHAN                                         0x1822
-#define USB_VID_ULTIMA_ELECTRONIC                       0x05d8
-#define USB_VID_LITEON                                  0x04ca
+#define USB_VID_ADSTECH                 0x06e1
+#define USB_VID_ANCHOR                  0x0547
+#define USB_VID_WIDEVIEW                0x14aa
+#define USB_VID_AVERMEDIA               0x07ca
+#define USB_VID_COMPRO                  0x185b
+#define USB_VID_COMPRO_UNK              0x145f
+#define USB_VID_CYPRESS                 0x04b4
+#define USB_VID_DIBCOM                  0x10b8
+#define USB_VID_DVICO                   0x0fe9
+#define USB_VID_EMPIA                   0xeb1a
+#define USB_VID_GRANDTEC                0x5032
+#define USB_VID_HANFTEK                 0x15f4
+#define USB_VID_HAUPPAUGE               0x2040
+#define USB_VID_HYPER_PALTEK            0x1025
+#define USB_VID_KWORLD                  0xeb2a
+#define USB_VID_KYE                     0x0458
+#define USB_VID_MEDION                  0x1660
+#define USB_VID_PINNACLE                0x2304
+#define USB_VID_VISIONPLUS              0x13d3
+#define USB_VID_TWINHAN                 0x1822
+#define USB_VID_ULTIMA_ELECTRONIC       0x05d8
+#define USB_VID_LITEON                  0x04ca
 
 /* Product IDs */
 #define USB_PID_ADSTECH_USB2_COLD                       0xa333
 #define USB_PID_ADSTECH_USB2_WARM                       0xa334
-#define USB_PID_AVERMEDIA_DVBT_USB_COLD         0x0001
-#define USB_PID_AVERMEDIA_DVBT_USB_WARM         0x0002
-#define USB_PID_AVERMEDIA_DVBT_USB2_COLD        0xa800
-#define USB_PID_AVERMEDIA_DVBT_USB2_WARM        0xa801
-#define USB_PID_COMPRO_DVBU2000_COLD            0xd000
-#define USB_PID_COMPRO_DVBU2000_WARM            0xd001
-#define USB_PID_COMPRO_DVBU2000_UNK_COLD        0x010c
-#define USB_PID_COMPRO_DVBU2000_UNK_WARM        0x010d
+#define USB_PID_AVERMEDIA_DVBT_USB_COLD                 0x0001
+#define USB_PID_AVERMEDIA_DVBT_USB_WARM                 0x0002
+#define USB_PID_AVERMEDIA_DVBT_USB2_COLD                0xa800
+#define USB_PID_AVERMEDIA_DVBT_USB2_WARM                0xa801
+#define USB_PID_COMPRO_DVBU2000_COLD                    0xd000
+#define USB_PID_COMPRO_DVBU2000_WARM                    0xd001
+#define USB_PID_COMPRO_DVBU2000_UNK_COLD                0x010c
+#define USB_PID_COMPRO_DVBU2000_UNK_WARM                0x010d
 #define USB_PID_DIBCOM_HOOK_DEFAULT                     0x0064
-#define USB_PID_DIBCOM_HOOK_DEFAULT_REENUM      0x0065
+#define USB_PID_DIBCOM_HOOK_DEFAULT_REENUM              0x0065
 #define USB_PID_DIBCOM_MOD3000_COLD                     0x0bb8
 #define USB_PID_DIBCOM_MOD3000_WARM                     0x0bb9
 #define USB_PID_DIBCOM_MOD3001_COLD                     0x0bc6
 #define USB_PID_DIBCOM_MOD3001_WARM                     0x0bc7
 #define USB_PID_DIBCOM_STK7700                          0x1e14
-#define USB_PID_DIBCOM_STK7700_REENUM           0x1e15
-#define USB_PID_DIBCOM_ANCHOR_2135_COLD         0x2131
-#define USB_PID_GRANDTEC_DVBT_USB_COLD          0x0fa0
-#define USB_PID_GRANDTEC_DVBT_USB_WARM          0x0fa1
+#define USB_PID_DIBCOM_STK7700_REENUM                   0x1e15
+#define USB_PID_DIBCOM_ANCHOR_2135_COLD                 0x2131
+#define USB_PID_GRANDTEC_DVBT_USB_COLD                  0x0fa0
+#define USB_PID_GRANDTEC_DVBT_USB_WARM                  0x0fa1
 #define USB_PID_KWORLD_VSTREAM_COLD                     0x17de
 #define USB_PID_KWORLD_VSTREAM_WARM                     0x17df
 #define USB_PID_TWINHAN_VP7041_COLD                     0x3201
@@ -69,23 +69,23 @@
 #define USB_PID_DNTV_TINYUSB2_WARM                      0x3224
 #define USB_PID_ULTIMA_TVBOX_COLD                       0x8105
 #define USB_PID_ULTIMA_TVBOX_WARM                       0x8106
-#define USB_PID_ULTIMA_TVBOX_AN2235_COLD        0x8107
-#define USB_PID_ULTIMA_TVBOX_AN2235_WARM        0x8108
-#define USB_PID_ULTIMA_TVBOX_ANCHOR_COLD        0x2235
-#define USB_PID_ULTIMA_TVBOX_USB2_COLD          0x8109
-#define USB_PID_ULTIMA_TVBOX_USB2_WARM          0x810a
-#define USB_PID_ULTIMA_TVBOX_USB2_FX_COLD       0x8613
-#define USB_PID_ULTIMA_TVBOX_USB2_FX_WARM       0x1002
-#define USB_PID_UNK_HYPER_PALTEK_COLD           0x005e
-#define USB_PID_UNK_HYPER_PALTEK_WARM           0x005f
-#define USB_PID_HANFTEK_UMT_010_COLD            0x0001
-#define USB_PID_HANFTEK_UMT_010_WARM            0x0015
+#define USB_PID_ULTIMA_TVBOX_AN2235_COLD                0x8107
+#define USB_PID_ULTIMA_TVBOX_AN2235_WARM                0x8108
+#define USB_PID_ULTIMA_TVBOX_ANCHOR_COLD                0x2235
+#define USB_PID_ULTIMA_TVBOX_USB2_COLD                  0x8109
+#define USB_PID_ULTIMA_TVBOX_USB2_WARM                  0x810a
+#define USB_PID_ULTIMA_TVBOX_USB2_FX_COLD               0x8613
+#define USB_PID_ULTIMA_TVBOX_USB2_FX_WARM               0x1002
+#define USB_PID_UNK_HYPER_PALTEK_COLD                   0x005e
+#define USB_PID_UNK_HYPER_PALTEK_WARM                   0x005f
+#define USB_PID_HANFTEK_UMT_010_COLD                    0x0001
+#define USB_PID_HANFTEK_UMT_010_WARM                    0x0015
 #define USB_PID_DTT200U_COLD                            0x0201
 #define USB_PID_DTT200U_WARM                            0x0301
-#define USB_PID_WT220U_COLD                                     0x0222
-#define USB_PID_WT220U_WARM                                     0x0221
-#define USB_PID_WINTV_NOVA_T_USB2_COLD          0x9300
-#define USB_PID_WINTV_NOVA_T_USB2_WARM          0x9301
+#define USB_PID_WT220U_COLD                             0x0222
+#define USB_PID_WT220U_WARM                             0x0221
+#define USB_PID_WINTV_NOVA_T_USB2_COLD                  0x9300
+#define USB_PID_WINTV_NOVA_T_USB2_WARM                  0x9301
 #define USB_PID_NEBULA_DIGITV                           0x0201
 #define USB_PID_DVICO_BLUEBIRD_LGDT                     0xd820
 #define USB_PID_DVICO_BLUEBIRD_LG064F_COLD              0xd500
@@ -101,8 +101,8 @@
 #define USB_PID_MEDION_MD95700                          0x0932
 #define USB_PID_KYE_DVB_T_COLD                          0x701e
 #define USB_PID_KYE_DVB_T_WARM                          0x701f
-#define USB_PID_PCTV_200E                                       0x020e
-#define USB_PID_PCTV_400E                                       0x020f
+#define USB_PID_PCTV_200E                               0x020e
+#define USB_PID_PCTV_400E                               0x020f
 #define USB_PID_LITEON_DVB_T_COLD                       0xf000
 #define USB_PID_LITEON_DVB_T_WARM                       0xf001
 #define USB_PID_DIGIVOX_MINI_SL_COLD                    0xe360