1 files changed, 234 insertions, 199 deletions

diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index ea1ed3b4592a..100ebc37e99e 100644
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -31,6 +31,8 @@
 #include "tda18271.h"
 #include "mxl5005s.h"
 #include "mc44s803.h"
+#include "tda18218.h"
+#include "mxl5007t.h"
 
 static int dvb_usb_af9015_debug;
 module_param_named(debug, dvb_usb_af9015_debug, int, 0644);
@@ -205,12 +207,18 @@ static int af9015_write_reg(struct dvb_usb_device *d, u16 addr, u8 val)
         return af9015_write_regs(d, addr, &val, 1);
 }
 
-static int af9015_read_reg(struct dvb_usb_device *d, u16 addr, u8 *val)
+static int af9015_read_regs(struct dvb_usb_device *d, u16 addr, u8 *val, u8 len)
 {
-        struct req_t req = {READ_MEMORY, AF9015_I2C_DEMOD, addr, 0, 0, 1, val};
+        struct req_t req = {READ_MEMORY, AF9015_I2C_DEMOD, addr, 0, 0, len,
+                val};
         return af9015_ctrl_msg(d, &req);
 }
 
+static int af9015_read_reg(struct dvb_usb_device *d, u16 addr, u8 *val)
+{
+        return af9015_read_regs(d, addr, val, 1);
+}
+
 static int af9015_write_reg_i2c(struct dvb_usb_device *d, u8 addr, u16 reg,
         u8 val)
 {
@@ -241,7 +249,7 @@ static int af9015_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
         struct dvb_usb_device *d = i2c_get_adapdata(adap);
         int ret = 0, i = 0;
         u16 addr;
-        u8 mbox, addr_len;
+        u8 uninitialized_var(mbox), addr_len;
         struct req_t req;
 
 /* TODO: implement bus lock
@@ -280,7 +288,7 @@ Due to that the only way to select correct tuner is use demodulator I2C-gate.
                 } else {
                         addr = msg[i].buf[0];
                         addr_len = 1;
-                        mbox = 0;
+                        /* mbox is don't care in that case */
                 }
 
                 if (num > i + 1 && (msg[i+1].flags & I2C_M_RD)) {
@@ -471,6 +479,7 @@ static int af9015_init_endpoint(struct dvb_usb_device *d)
                 ret = af9015_set_reg_bit(d, 0xd50b, 0);
         else
                 ret = af9015_clear_reg_bit(d, 0xd50b, 0);
+
 error:
         if (ret)
                 err("endpoint init failed:%d", ret);
@@ -494,7 +503,8 @@ static int af9015_copy_firmware(struct dvb_usb_device *d)
         /* wait 2nd demodulator ready */
         msleep(100);
 
-        ret = af9015_read_reg_i2c(d, 0x3a, 0x98be, &val);
+        ret = af9015_read_reg_i2c(d,
+                af9015_af9013_config[1].demod_address, 0x98be, &val);
         if (ret)
                 goto error;
         else
@@ -597,47 +607,17 @@ free:
         return ret;
 }
 
-static int af9015_download_ir_table(struct dvb_usb_device *d)
-{
-        int i, packets = 0, ret;
-        u16 addr = 0x9a56; /* ir-table start address */
-        struct req_t req = {WRITE_MEMORY, 0, 0, 0, 0, 1, NULL};
-        u8 *data = NULL;
-        deb_info("%s:\n", __func__);
-
-        data = af9015_config.ir_table;
-        packets = af9015_config.ir_table_size;
-
-        /* no remote */
-        if (!packets)
-                goto exit;
-
-        /* load remote ir-table */
-        for (i = 0; i < packets; i++) {
-                req.addr = addr + i;
-                req.data = &data[i];
-                ret = af9015_ctrl_msg(d, &req);
-                if (ret) {
-                        err("ir-table download failed at packet %d with " \
-                                "code %d", i, ret);
-                        return ret;
-                }
-        }
-
-exit:
-        return 0;
-}
-
 static int af9015_init(struct dvb_usb_device *d)
 {
         int ret;
         deb_info("%s:\n", __func__);
 
-        ret = af9015_init_endpoint(d);
+        /* init RC canary */
+        ret = af9015_write_reg(d, 0x98e9, 0xff);
         if (ret)
                 goto error;
 
-        ret = af9015_download_ir_table(d);
+        ret = af9015_init_endpoint(d);
         if (ret)
                 goto error;
 
@@ -685,9 +665,8 @@ error:
 static int af9015_download_firmware(struct usb_device *udev,
         const struct firmware *fw)
 {
-        int i, len, packets, remainder, ret;
+        int i, len, remaining, ret;
         struct req_t req = {DOWNLOAD_FIRMWARE, 0, 0, 0, 0, 0, NULL};
-        u16 addr = 0x5100; /* firmware start address */
         u16 checksum = 0;
 
         deb_info("%s:\n", __func__);
@@ -699,24 +678,20 @@ static int af9015_download_firmware(struct usb_device *udev,
         af9015_config.firmware_size = fw->size;
         af9015_config.firmware_checksum = checksum;
 
-        #define FW_PACKET_MAX_DATA  55
-
-        packets = fw->size / FW_PACKET_MAX_DATA;
-        remainder = fw->size % FW_PACKET_MAX_DATA;
-        len = FW_PACKET_MAX_DATA;
-        for (i = 0; i <= packets; i++) {
-                if (i == packets)  /* set size of the last packet */
-                        len = remainder;
+        #define FW_ADDR 0x5100 /* firmware start address */
+        #define LEN_MAX 55 /* max packet size */
+        for (remaining = fw->size; remaining > 0; remaining -= LEN_MAX) {
+                len = remaining;
+                if (len > LEN_MAX)
+                        len = LEN_MAX;
 
                 req.data_len = len;
-                req.data = (u8 *)(fw->data + i * FW_PACKET_MAX_DATA);
-                req.addr = addr;
-                addr += FW_PACKET_MAX_DATA;
+                req.data = (u8 *) &fw->data[fw->size - remaining];
+                req.addr = FW_ADDR + fw->size - remaining;
 
                 ret = af9015_rw_udev(udev, &req);
                 if (ret) {
-                        err("firmware download failed at packet %d with " \
-                                "code %d", i, ret);
+                        err("firmware download failed:%d", ret);
                         goto error;
                 }
         }
@@ -733,125 +708,104 @@ error:
         return ret;
 }
 
-struct af9015_setup {
+struct af9015_rc_setup {
         unsigned int id;
-        struct ir_scancode *rc_key_map;
-        unsigned int rc_key_map_size;
-        u8 *ir_table;
-        unsigned int ir_table_size;
+        char *rc_codes;
 };
 
-static const struct af9015_setup *af9015_setup_match(unsigned int id,
-                const struct af9015_setup *table)
+static char *af9015_rc_setup_match(unsigned int id,
+        const struct af9015_rc_setup *table)
 {
-        for (; table->rc_key_map; table++)
+        for (; table->rc_codes; table++)
                 if (table->id == id)
-                        return table;
+                        return table->rc_codes;
         return NULL;
 }
 
-static const struct af9015_setup af9015_setup_modparam[] = {
-        { AF9015_REMOTE_A_LINK_DTU_M,
-                ir_codes_af9015_table_a_link, ARRAY_SIZE(ir_codes_af9015_table_a_link),
-                af9015_ir_table_a_link, ARRAY_SIZE(af9015_ir_table_a_link) },
-        { AF9015_REMOTE_MSI_DIGIVOX_MINI_II_V3,
-                ir_codes_af9015_table_msi, ARRAY_SIZE(ir_codes_af9015_table_msi),
-                af9015_ir_table_msi, ARRAY_SIZE(af9015_ir_table_msi) },
-        { AF9015_REMOTE_MYGICTV_U718,
-                ir_codes_af9015_table_mygictv, ARRAY_SIZE(ir_codes_af9015_table_mygictv),
-                af9015_ir_table_mygictv, ARRAY_SIZE(af9015_ir_table_mygictv) },
-        { AF9015_REMOTE_DIGITTRADE_DVB_T,
-                ir_codes_af9015_table_digittrade, ARRAY_SIZE(ir_codes_af9015_table_digittrade),
-                af9015_ir_table_digittrade, ARRAY_SIZE(af9015_ir_table_digittrade) },
-        { AF9015_REMOTE_AVERMEDIA_KS,
-                ir_codes_af9015_table_avermedia, ARRAY_SIZE(ir_codes_af9015_table_avermedia),
-                af9015_ir_table_avermedia_ks, ARRAY_SIZE(af9015_ir_table_avermedia_ks) },
+static const struct af9015_rc_setup af9015_rc_setup_modparam[] = {
+        { AF9015_REMOTE_A_LINK_DTU_M, RC_MAP_ALINK_DTU_M },
+        { AF9015_REMOTE_MSI_DIGIVOX_MINI_II_V3, RC_MAP_MSI_DIGIVOX_II },
+        { AF9015_REMOTE_MYGICTV_U718, RC_MAP_TOTAL_MEDIA_IN_HAND },
+        { AF9015_REMOTE_DIGITTRADE_DVB_T, RC_MAP_DIGITTRADE },
+        { AF9015_REMOTE_AVERMEDIA_KS, RC_MAP_AVERMEDIA_RM_KS },
         { }
 };
 
-/* don't add new entries here anymore, use hashes instead */
-static const struct af9015_setup af9015_setup_usbids[] = {
-        { USB_VID_LEADTEK,
-                ir_codes_af9015_table_leadtek, ARRAY_SIZE(ir_codes_af9015_table_leadtek),
-                af9015_ir_table_leadtek, ARRAY_SIZE(af9015_ir_table_leadtek) },
-        { USB_VID_VISIONPLUS,
-                ir_codes_af9015_table_twinhan, ARRAY_SIZE(ir_codes_af9015_table_twinhan),
-                af9015_ir_table_twinhan, ARRAY_SIZE(af9015_ir_table_twinhan) },
-        { USB_VID_KWORLD_2, /* TODO: use correct rc keys */
-                ir_codes_af9015_table_twinhan, ARRAY_SIZE(ir_codes_af9015_table_twinhan),
-                af9015_ir_table_kworld, ARRAY_SIZE(af9015_ir_table_kworld) },
-        { USB_VID_AVERMEDIA,
-                ir_codes_af9015_table_avermedia, ARRAY_SIZE(ir_codes_af9015_table_avermedia),
-                af9015_ir_table_avermedia, ARRAY_SIZE(af9015_ir_table_avermedia) },
-        { USB_VID_MSI_2,
-                ir_codes_af9015_table_msi_digivox_iii, ARRAY_SIZE(ir_codes_af9015_table_msi_digivox_iii),
-                af9015_ir_table_msi_digivox_iii, ARRAY_SIZE(af9015_ir_table_msi_digivox_iii) },
+static const struct af9015_rc_setup af9015_rc_setup_hashes[] = {
+        { 0xb8feb708, RC_MAP_MSI_DIGIVOX_II },
+        { 0xa3703d00, RC_MAP_ALINK_DTU_M },
+        { 0x9b7dc64e, RC_MAP_TOTAL_MEDIA_IN_HAND }, /* MYGICTV U718 */
         { }
 };
 
-static const struct af9015_setup af9015_setup_hashes[] = {
-        { 0xb8feb708,
-                ir_codes_af9015_table_msi, ARRAY_SIZE(ir_codes_af9015_table_msi),
-                af9015_ir_table_msi, ARRAY_SIZE(af9015_ir_table_msi) },
-        { 0xa3703d00,
-                ir_codes_af9015_table_a_link, ARRAY_SIZE(ir_codes_af9015_table_a_link),
-                af9015_ir_table_a_link, ARRAY_SIZE(af9015_ir_table_a_link) },
-        { 0x9b7dc64e,
-                ir_codes_af9015_table_mygictv, ARRAY_SIZE(ir_codes_af9015_table_mygictv),
-                af9015_ir_table_mygictv, ARRAY_SIZE(af9015_ir_table_mygictv) },
+static const struct af9015_rc_setup af9015_rc_setup_usbids[] = {
+        { (USB_VID_TERRATEC << 16) + USB_PID_TERRATEC_CINERGY_T_STICK_RC,
+                RC_MAP_TERRATEC_SLIM_2 },
+        { (USB_VID_TERRATEC << 16) + USB_PID_TERRATEC_CINERGY_T_STICK_DUAL_RC,
+                RC_MAP_TERRATEC_SLIM },
+        { (USB_VID_VISIONPLUS << 16) + USB_PID_AZUREWAVE_AD_TU700,
+                RC_MAP_AZUREWAVE_AD_TU700 },
+        { (USB_VID_VISIONPLUS << 16) + USB_PID_TINYTWIN,
+                RC_MAP_AZUREWAVE_AD_TU700 },
+        { (USB_VID_MSI_2 << 16) + USB_PID_MSI_DIGI_VOX_MINI_III,
+                RC_MAP_MSI_DIGIVOX_III },
+        { (USB_VID_LEADTEK << 16) + USB_PID_WINFAST_DTV_DONGLE_GOLD,
+                RC_MAP_LEADTEK_Y04G0051 },
+        { (USB_VID_AVERMEDIA << 16) + USB_PID_AVERMEDIA_VOLAR_X,
+                RC_MAP_AVERMEDIA_M135A },
+        { (USB_VID_AFATECH << 16) + USB_PID_TREKSTOR_DVBT,
+                RC_MAP_TREKSTOR },
+        { (USB_VID_KWORLD_2 << 16) + USB_PID_TINYTWIN_2,
+                RC_MAP_DIGITALNOW_TINYTWIN },
+        { (USB_VID_GTEK << 16) + USB_PID_TINYTWIN_3,
+                RC_MAP_DIGITALNOW_TINYTWIN },
         { }
 };
 
 static void af9015_set_remote_config(struct usb_device *udev,
                 struct dvb_usb_device_properties *props)
 {
-        const struct af9015_setup *table = NULL;
-
-        if (dvb_usb_af9015_remote) {
-                /* load remote defined as module param */
-                table = af9015_setup_match(dvb_usb_af9015_remote,
-                                af9015_setup_modparam);
-        } else {
-                u16 vendor = le16_to_cpu(udev->descriptor.idVendor);
-
-                table = af9015_setup_match(af9015_config.eeprom_sum,
-                                af9015_setup_hashes);
-
-                if (!table && vendor == USB_VID_AFATECH) {
-                        /* Check USB manufacturer and product strings and try
-                           to determine correct remote in case of chip vendor
-                           reference IDs are used.
-                           DO NOT ADD ANYTHING NEW HERE. Use hashes instead.
-                         */
-                        char manufacturer[10];
-                        memset(manufacturer, 0, sizeof(manufacturer));
-                        usb_string(udev, udev->descriptor.iManufacturer,
-                                manufacturer, sizeof(manufacturer));
-                        if (!strcmp("MSI", manufacturer)) {
-                                /* iManufacturer 1 MSI
-                                   iProduct      2 MSI K-VOX */
-                                table = af9015_setup_match(
-                                        AF9015_REMOTE_MSI_DIGIVOX_MINI_II_V3,
-                                        af9015_setup_modparam);
-                        } else if (udev->descriptor.idProduct ==
-                                cpu_to_le16(USB_PID_TREKSTOR_DVBT)) {
-                                table = &(const struct af9015_setup){ 0,
-                                        ir_codes_af9015_table_trekstor,
-                                        ARRAY_SIZE(ir_codes_af9015_table_trekstor),
-                                        af9015_ir_table_trekstor,
-                                        ARRAY_SIZE(af9015_ir_table_trekstor)
-                                };
-                        }
-                } else if (!table)
-                        table = af9015_setup_match(vendor, af9015_setup_usbids);
+        u16 vid = le16_to_cpu(udev->descriptor.idVendor);
+        u16 pid = le16_to_cpu(udev->descriptor.idProduct);
+
+        /* try to load remote based module param */
+        props->rc.core.rc_codes = af9015_rc_setup_match(
+                dvb_usb_af9015_remote, af9015_rc_setup_modparam);
+
+        /* try to load remote based eeprom hash */
+        if (!props->rc.core.rc_codes)
+                props->rc.core.rc_codes = af9015_rc_setup_match(
+                        af9015_config.eeprom_sum, af9015_rc_setup_hashes);
+
+        /* try to load remote based USB ID */
+        if (!props->rc.core.rc_codes)
+                props->rc.core.rc_codes = af9015_rc_setup_match(
+                        (vid << 16) + pid, af9015_rc_setup_usbids);
+
+        /* try to load remote based USB iManufacturer string */
+        if (!props->rc.core.rc_codes && vid == USB_VID_AFATECH) {
+                /* Check USB manufacturer and product strings and try
+                   to determine correct remote in case of chip vendor
+                   reference IDs are used.
+                   DO NOT ADD ANYTHING NEW HERE. Use hashes instead. */
+                char manufacturer[10];
+                memset(manufacturer, 0, sizeof(manufacturer));
+                usb_string(udev, udev->descriptor.iManufacturer,
+                        manufacturer, sizeof(manufacturer));
+                if (!strcmp("MSI", manufacturer)) {
+                        /* iManufacturer 1 MSI
+                           iProduct      2 MSI K-VOX */
+                        props->rc.core.rc_codes = af9015_rc_setup_match(
+                                AF9015_REMOTE_MSI_DIGIVOX_MINI_II_V3,
+                                af9015_rc_setup_modparam);
+                }
         }
 
-        if (table) {
-                props->rc.legacy.rc_key_map = table->rc_key_map;
-                props->rc.legacy.rc_key_map_size = table->rc_key_map_size;
-                af9015_config.ir_table = table->ir_table;
-                af9015_config.ir_table_size = table->ir_table_size;
-        }
+        /* finally load "empty" just for leaving IR receiver enabled */
+        if (!props->rc.core.rc_codes)
+                props->rc.core.rc_codes = RC_MAP_EMPTY;
+
+        return;
 }
 
 static int af9015_read_config(struct usb_device *udev)
@@ -877,10 +831,9 @@ static int af9015_read_config(struct usb_device *udev)
 
         deb_info("%s: IR mode:%d\n", __func__, val);
         for (i = 0; i < af9015_properties_count; i++) {
-                if (val == AF9015_IR_MODE_DISABLED) {
-                        af9015_properties[i].rc.legacy.rc_key_map = NULL;
-                        af9015_properties[i].rc.legacy.rc_key_map_size  = 0;
-                } else
+                if (val == AF9015_IR_MODE_DISABLED)
+                        af9015_properties[i].rc.core.rc_codes = NULL;
+                else
                         af9015_set_remote_config(udev, &af9015_properties[i]);
         }
 
@@ -992,20 +945,19 @@ static int af9015_read_config(struct usb_device *udev)
                 case AF9013_TUNER_MT2060_2:
                 case AF9013_TUNER_TDA18271:
                 case AF9013_TUNER_QT1010A:
+                case AF9013_TUNER_TDA18218:
                         af9015_af9013_config[i].rf_spec_inv = 1;
                         break;
                 case AF9013_TUNER_MXL5003D:
                 case AF9013_TUNER_MXL5005D:
                 case AF9013_TUNER_MXL5005R:
+                case AF9013_TUNER_MXL5007T:
                         af9015_af9013_config[i].rf_spec_inv = 0;
                         break;
                 case AF9013_TUNER_MC44S803:
                         af9015_af9013_config[i].gpio[1] = AF9013_GPIO_LO;
                         af9015_af9013_config[i].rf_spec_inv = 1;
                         break;
-                case AF9013_TUNER_TDA18218:
-                        warn("tuner NXP TDA18218 not supported yet");
-                        return -ENODEV;
                 default:
                         warn("tuner id:%d not supported, please report!", val);
                         return -ENODEV;
@@ -1020,9 +972,13 @@ error:
                 err("eeprom read failed:%d", ret);
 
         /* AverMedia AVerTV Volar Black HD (A850) device have bad EEPROM
-           content :-( Override some wrong values here. */
+           content :-( Override some wrong values here. Ditto for the
+           AVerTV Red HD+ (A850T) device. */
         if (le16_to_cpu(udev->descriptor.idVendor) == USB_VID_AVERMEDIA &&
-            le16_to_cpu(udev->descriptor.idProduct) == USB_PID_AVERMEDIA_A850) {
+                ((le16_to_cpu(udev->descriptor.idProduct) ==
+                        USB_PID_AVERMEDIA_A850) ||
+                (le16_to_cpu(udev->descriptor.idProduct) ==
+                        USB_PID_AVERMEDIA_A850T))) {
                 deb_info("%s: AverMedia A850: overriding config\n", __func__);
                 /* disable dual mode */
                 af9015_config.dual_mode = 0;
@@ -1059,36 +1015,71 @@ static int af9015_identify_state(struct usb_device *udev,
         return ret;
 }
 
-static int af9015_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+static int af9015_rc_query(struct dvb_usb_device *d)
 {
-        u8 buf[8];
-        struct req_t req = {GET_IR_CODE, 0, 0, 0, 0, sizeof(buf), buf};
-        struct ir_scancode *keymap = d->props.rc.legacy.rc_key_map;
-        int i, ret;
-
-        memset(buf, 0, sizeof(buf));
+        struct af9015_state *priv = d->priv;
+        int ret;
+        u8 buf[17];
 
-        ret = af9015_ctrl_msg(d, &req);
+        /* read registers needed to detect remote controller code */
+        ret = af9015_read_regs(d, 0x98d9, buf, sizeof(buf));
         if (ret)
+                goto error;
+
+        /* If any of these are non-zero, assume invalid data */
+        if (buf[1] || buf[2] || buf[3])
                 return ret;
 
-        *event = 0;
-        *state = REMOTE_NO_KEY_PRESSED;
+        /* Check for repeat of previous code */
+        if ((priv->rc_repeat != buf[6] || buf[0]) &&
+                                        !memcmp(&buf[12], priv->rc_last, 4)) {
+                deb_rc("%s: key repeated\n", __func__);
+                rc_keydown(d->rc_dev, priv->rc_keycode, 0);
+                priv->rc_repeat = buf[6];
+                return ret;
+        }
 
-        for (i = 0; i < d->props.rc.legacy.rc_key_map_size; i++) {
-                if (!buf[1] && rc5_custom(&keymap[i]) == buf[0] &&
-                    rc5_data(&keymap[i]) == buf[2]) {
-                        *event = keymap[i].keycode;
-                        *state = REMOTE_KEY_PRESSED;
-                        break;
+        /* Only process key if canary killed */
+        if (buf[16] != 0xff && buf[0] != 0x01) {
+                deb_rc("%s: key pressed %02x %02x %02x %02x\n", __func__,
+                        buf[12], buf[13], buf[14], buf[15]);
+
+                /* Reset the canary */
+                ret = af9015_write_reg(d, 0x98e9, 0xff);
+                if (ret)
+                        goto error;
+
+                /* Remember this key */
+                memcpy(priv->rc_last, &buf[12], 4);
+                if (buf[14] == (u8) ~buf[15]) {
+                        if (buf[12] == (u8) ~buf[13]) {
+                                /* NEC */
+                                priv->rc_keycode = buf[12] << 8 | buf[14];
+                        } else {
+                                /* NEC extended*/
+                                priv->rc_keycode = buf[12] << 16 |
+                                        buf[13] << 8 | buf[14];
+                        }
+                } else {
+                        /* 32 bit NEC */
+                        priv->rc_keycode = buf[12] << 24 | buf[13] << 16 |
+                                        buf[14] << 8 | buf[15];
                 }
+                rc_keydown(d->rc_dev, priv->rc_keycode, 0);
+        } else {
+                deb_rc("%s: no key press\n", __func__);
+                /* Invalidate last keypress */
+                /* Not really needed, but helps with debug */
+                priv->rc_last[2] = priv->rc_last[3];
         }
-        if (!buf[1])
-                deb_rc("%s: %02x %02x %02x %02x %02x %02x %02x %02x\n",
-                        __func__, buf[0], buf[1], buf[2], buf[3], buf[4],
-                        buf[5], buf[6], buf[7]);
 
-        return 0;
+        priv->rc_repeat = buf[6];
+
+error:
+        if (ret)
+                err("%s: failed:%d", __func__, ret);
+
+        return ret;
 }
 
 /* init 2nd I2C adapter */
@@ -1100,11 +1091,6 @@ static int af9015_i2c_init(struct dvb_usb_device *d)
 
         strncpy(state->i2c_adap.name, d->desc->name,
                 sizeof(state->i2c_adap.name));
-#ifdef I2C_ADAP_CLASS_TV_DIGITAL
-        state->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL,
-#else
-        state->i2c_adap.class = I2C_CLASS_TV_DIGITAL,
-#endif
         state->i2c_adap.algo      = d->props.i2c_algo;
         state->i2c_adap.algo_data = NULL;
         state->i2c_adap.dev.parent = &d->udev->dev;
@@ -1166,7 +1152,7 @@ static struct qt1010_config af9015_qt1010_config = {
 
 static struct tda18271_config af9015_tda18271_config = {
         .gate = TDA18271_GATE_DIGITAL,
-        .small_i2c = 1,
+        .small_i2c = TDA18271_16_BYTE_CHUNK_INIT,
 };
 
 static struct mxl5005s_config af9015_mxl5003_config = {
@@ -1208,12 +1194,22 @@ static struct mc44s803_config af9015_mc44s803_config = {
         .dig_out = 1,
 };
 
+static struct tda18218_config af9015_tda18218_config = {
+        .i2c_address = 0xc0,
+        .i2c_wr_max = 21, /* max wr bytes AF9015 I2C adap can handle at once */
+};
+
+static struct mxl5007t_config af9015_mxl5007t_config = {
+        .xtal_freq_hz = MxL_XTAL_24_MHZ,
+        .if_freq_hz = MxL_IF_4_57_MHZ,
+};
+
 static int af9015_tuner_attach(struct dvb_usb_adapter *adap)
 {
         struct af9015_state *state = adap->dev->priv;
         struct i2c_adapter *i2c_adap;
         int ret;
-        deb_info("%s: \n", __func__);
+        deb_info("%s:\n", __func__);
 
         /* select I2C adapter */
         if (adap->id == 0)
@@ -1238,6 +1234,10 @@ static int af9015_tuner_attach(struct dvb_usb_adapter *adap)
                 ret = dvb_attach(tda18271_attach, adap->fe, 0xc0, i2c_adap,
                         &af9015_tda18271_config) == NULL ? -ENODEV : 0;
                 break;
+        case AF9013_TUNER_TDA18218:
+                ret = dvb_attach(tda18218_attach, adap->fe, i2c_adap,
+                        &af9015_tda18218_config) == NULL ? -ENODEV : 0;
+                break;
         case AF9013_TUNER_MXL5003D:
                 ret = dvb_attach(mxl5005s_attach, adap->fe, i2c_adap,
                         &af9015_mxl5003_config) == NULL ? -ENODEV : 0;
@@ -1255,6 +1255,10 @@ static int af9015_tuner_attach(struct dvb_usb_adapter *adap)
                 ret = dvb_attach(mc44s803_attach, adap->fe, i2c_adap,
                         &af9015_mc44s803_config) == NULL ? -ENODEV : 0;
                 break;
+        case AF9013_TUNER_MXL5007T:
+                ret = dvb_attach(mxl5007t_attach, adap->fe, i2c_adap,
+                        0xc0, &af9015_mxl5007t_config) == NULL ? -ENODEV : 0;
+                break;
         case AF9013_TUNER_UNKNOWN:
         default:
                 ret = -ENODEV;
@@ -1300,10 +1304,16 @@ static struct usb_device_id af9015_usb_table[] = {
 /* 30 */{USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_KWORLD_UB383_T)},
         {USB_DEVICE(USB_VID_KWORLD_2,  USB_PID_KWORLD_395U_4)},
         {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A815M)},
+        {USB_DEVICE(USB_VID_TERRATEC,  USB_PID_TERRATEC_CINERGY_T_STICK_RC)},
+        {USB_DEVICE(USB_VID_TERRATEC,
+                USB_PID_TERRATEC_CINERGY_T_STICK_DUAL_RC)},
+/* 35 */{USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A850T)},
+        {USB_DEVICE(USB_VID_GTEK,      USB_PID_TINYTWIN_3)},
         {0},
 };
 MODULE_DEVICE_TABLE(usb, af9015_usb_table);
 
+#define AF9015_RC_INTERVAL 500
 static struct dvb_usb_device_properties af9015_properties[] = {
         {
                 .caps = DVB_USB_IS_AN_I2C_ADAPTER,
@@ -1354,14 +1364,17 @@ static struct dvb_usb_device_properties af9015_properties[] = {
 
                 .identify_state = af9015_identify_state,
 
-                .rc.legacy = {
+                .rc.core = {
+                        .protocol         = RC_TYPE_NEC,
+                        .module_name      = "af9015",
                         .rc_query         = af9015_rc_query,
-                        .rc_interval      = 150,
+                        .rc_interval      = AF9015_RC_INTERVAL,
+                        .allowed_protos   = RC_TYPE_NEC,
                 },
 
                 .i2c_algo = &af9015_i2c_algo,
 
-                .num_device_descs = 9, /* max 9 */
+                .num_device_descs = 12, /* check max from dvb-usb.h */
                 .devices = {
                         {
                                 .name = "Afatech AF9015 DVB-T USB2.0 stick",
@@ -1389,7 +1402,8 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                         {
                                 .name = "DigitalNow TinyTwin DVB-T Receiver",
                                 .cold_ids = {&af9015_usb_table[5],
-                                             &af9015_usb_table[28], NULL},
+                                             &af9015_usb_table[28],
+                                             &af9015_usb_table[36], NULL},
                                 .warm_ids = {NULL},
                         },
                         {
@@ -1413,6 +1427,21 @@ static struct dvb_usb_device_properties af9015_properties[] = {
                                 .cold_ids = {&af9015_usb_table[9], NULL},
                                 .warm_ids = {NULL},
                         },
+                        {
+                                .name = "TerraTec Cinergy T Stick RC",
+                                .cold_ids = {&af9015_usb_table[33], NULL},
+                                .warm_ids = {NULL},
+                        },
+                        {
+                                .name = "TerraTec Cinergy T Stick Dual RC",
+                                .cold_ids = {&af9015_usb_table[34], NULL},
+                                .warm_ids = {NULL},
+                        },
+                        {
+                                .name = "AverMedia AVerTV Red HD+ (A850T)",
+                                .cold_ids = {&af9015_usb_table[35], NULL},
+                                .warm_ids = {NULL},
+                        },
                 }
         }, {
                 .caps = DVB_USB_IS_AN_I2C_ADAPTER,
@@ -1463,14 +1492,17 @@ static struct dvb_usb_device_properties af9015_properties[] = {
 
                 .identify_state = af9015_identify_state,
 
-                .rc.legacy = {
+                .rc.core = {
+                        .protocol         = RC_TYPE_NEC,
+                        .module_name      = "af9015",
                         .rc_query         = af9015_rc_query,
-                        .rc_interval      = 150,
+                        .rc_interval      = AF9015_RC_INTERVAL,
+                        .allowed_protos   = RC_TYPE_NEC,
                 },
 
                 .i2c_algo = &af9015_i2c_algo,
 
-                .num_device_descs = 9, /* max 9 */
+                .num_device_descs = 9, /* check max from dvb-usb.h */
                 .devices = {
                         {
                                 .name = "Xtensions XD-380",
@@ -1572,14 +1604,17 @@ static struct dvb_usb_device_properties af9015_properties[] = {
 
                 .identify_state = af9015_identify_state,
 
-                .rc.legacy = {
+                .rc.core = {
+                        .protocol         = RC_TYPE_NEC,
+                        .module_name      = "af9015",
                         .rc_query         = af9015_rc_query,
-                        .rc_interval      = 150,
+                        .rc_interval      = AF9015_RC_INTERVAL,
+                        .allowed_protos   = RC_TYPE_NEC,
                 },
 
                 .i2c_algo = &af9015_i2c_algo,
 
-                .num_device_descs = 9, /* max 9 */
+                .num_device_descs = 9, /* check max from dvb-usb.h */
                 .devices = {
                         {
                                 .name = "AverMedia AVerTV Volar GPS 805 (A805)",
@@ -1672,7 +1707,7 @@ static int af9015_usb_probe(struct usb_interface *intf,
 static void af9015_i2c_exit(struct dvb_usb_device *d)
 {
         struct af9015_state *state = d->priv;
-        deb_info("%s: \n", __func__);
+        deb_info("%s:\n", __func__);
 
         /* remove 2nd I2C adapter */
         if (d->state & DVB_USB_STATE_I2C)
@@ -1682,7 +1717,7 @@ static void af9015_i2c_exit(struct dvb_usb_device *d)
 static void af9015_usb_device_exit(struct usb_interface *intf)
 {
         struct dvb_usb_device *d = usb_get_intfdata(intf);
-        deb_info("%s: \n", __func__);
+        deb_info("%s:\n", __func__);
 
         /* remove 2nd I2C adapter */
         if (d != NULL && d->desc != NULL)