1 files changed, 293 insertions, 32 deletions

diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c
index c65f273ff313..75de49c0d943 100644
--- a/drivers/media/dvb/dvb-usb/dw2102.c
+++ b/drivers/media/dvb/dvb-usb/dw2102.c
@@ -1,7 +1,7 @@
 /* DVB USB framework compliant Linux driver for the
-*       DVBWorld DVB-S 2101, 2102, DVB-S2 2104 Card
-*
-* Copyright (C) 2008 Igor M. Liplianin (liplianin@me.by)
+*       DVBWorld DVB-S 2101, 2102, DVB-S2 2104, DVB-C 3101,
+*       TeVii S600, S650 Cards
+* Copyright (C) 2008,2009 Igor M. Liplianin (liplianin@me.by)
 *
 *       This program is free software; you can redistribute it and/or modify it
 *       under the terms of the GNU General Public License as published by the
@@ -17,6 +17,7 @@
 #include "stb6000.h"
 #include "eds1547.h"
 #include "cx24116.h"
+#include "tda1002x.h"
 
 #ifndef USB_PID_DW2102
 #define USB_PID_DW2102 0x2102
@@ -26,10 +27,18 @@
 #define USB_PID_DW2104 0x2104
 #endif
 
+#ifndef USB_PID_DW3101
+#define USB_PID_DW3101 0x3101
+#endif
+
 #ifndef USB_PID_CINERGY_S
 #define USB_PID_CINERGY_S 0x0064
 #endif
 
+#ifndef USB_PID_TEVII_S650
+#define USB_PID_TEVII_S650 0xd650
+#endif
+
 #define DW210X_READ_MSG 0
 #define DW210X_WRITE_MSG 1
 
@@ -40,18 +49,21 @@
 #define DW2102_VOLTAGE_CTRL (0x1800)
 #define DW2102_RC_QUERY (0x1a00)
 
-struct dw210x_state {
-        u32 last_key_pressed;
-};
-struct dw210x_rc_keys {
-        u32 keycode;
-        u32 event;
+struct dvb_usb_rc_keys_table {
+        struct dvb_usb_rc_key *rc_keys;
+        int rc_keys_size;
 };
 
 /* debug */
 static int dvb_usb_dw2102_debug;
 module_param_named(debug, dvb_usb_dw2102_debug, int, 0644);
-MODULE_PARM_DESC(debug, "set debugging level (1=info 2=xfer (or-able))." DVB_USB_DEBUG_STATUS);
+MODULE_PARM_DESC(debug, "set debugging level (1=info 2=xfer 4=rc(or-able))."
+                                                DVB_USB_DEBUG_STATUS);
+
+/* keymaps */
+static int ir_keymap;
+module_param_named(keymap, ir_keymap, int, 0644);
+MODULE_PARM_DESC(keymap, "set keymap 0=default 1=dvbworld 2=tevii 3=tbs  ...");
 
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
@@ -79,7 +91,7 @@ static int dw210x_op_rw(struct usb_device *dev, u8 request, u16 value,
 static int dw2102_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
                 int num)
 {
-struct dvb_usb_device *d = i2c_get_adapdata(adap);
+        struct dvb_usb_device *d = i2c_get_adapdata(adap);
         int i = 0, ret = 0;
         u8 buf6[] = {0x2c, 0x05, 0xc0, 0, 0, 0, 0};
         u16 value;
@@ -205,6 +217,7 @@ static int dw2102_serit_i2c_transfer(struct i2c_adapter *adap,
         mutex_unlock(&d->i2c_mutex);
         return num;
 }
+
 static int dw2102_earda_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], int num)
 {
         struct dvb_usb_device *d = i2c_get_adapdata(adap);
@@ -219,7 +232,7 @@ static int dw2102_earda_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg ms
         case 2: {
                 /* read */
                 /* first write first register number */
-                u8 ibuf [msg[1].len + 2], obuf[3];
+                u8 ibuf[msg[1].len + 2], obuf[3];
                 obuf[0] = 0xd0;
                 obuf[1] = msg[0].len;
                 obuf[2] = msg[0].buf[0];
@@ -293,7 +306,7 @@ static int dw2104_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], i
         case 2: {
                 /* read */
                 /* first write first register number */
-                u8 ibuf [msg[1].len + 2], obuf[3];
+                u8 ibuf[msg[1].len + 2], obuf[3];
                 obuf[0] = 0xaa;
                 obuf[1] = msg[0].len;
                 obuf[2] = msg[0].buf[0];
@@ -360,6 +373,69 @@ static int dw2104_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], i
         return num;
 }
 
+static int dw3101_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
+                                                                int num)
+{
+        struct dvb_usb_device *d = i2c_get_adapdata(adap);
+        int ret = 0, i;
+
+        if (!d)
+                return -ENODEV;
+        if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
+                return -EAGAIN;
+
+        switch (num) {
+        case 2: {
+                /* read */
+                /* first write first register number */
+                u8 ibuf[msg[1].len + 2], obuf[3];
+                obuf[0] = msg[0].addr << 1;
+                obuf[1] = msg[0].len;
+                obuf[2] = msg[0].buf[0];
+                ret = dw210x_op_rw(d->udev, 0xc2, 0, 0,
+                                obuf, msg[0].len + 2, DW210X_WRITE_MSG);
+                /* second read registers */
+                ret = dw210x_op_rw(d->udev, 0xc3, 0x19 , 0,
+                                ibuf, msg[1].len + 2, DW210X_READ_MSG);
+                memcpy(msg[1].buf, ibuf + 2, msg[1].len);
+
+                break;
+        }
+        case 1:
+                switch (msg[0].addr) {
+                case 0x60:
+                case 0x0c: {
+                        /* write to register */
+                        u8 obuf[msg[0].len + 2];
+                        obuf[0] = msg[0].addr << 1;
+                        obuf[1] = msg[0].len;
+                        memcpy(obuf + 2, msg[0].buf, msg[0].len);
+                        ret = dw210x_op_rw(d->udev, 0xc2, 0, 0,
+                                        obuf, msg[0].len + 2, DW210X_WRITE_MSG);
+                        break;
+                }
+                case(DW2102_RC_QUERY): {
+                        u8 ibuf[2];
+                        ret  = dw210x_op_rw(d->udev, 0xb8, 0, 0,
+                                        ibuf, 2, DW210X_READ_MSG);
+                        memcpy(msg[0].buf, ibuf , 2);
+                        break;
+                }
+                }
+
+                break;
+        }
+
+        for (i = 0; i < num; i++) {
+                deb_xfer("%02x:%02x: %s ", i, msg[i].addr,
+                                msg[i].flags == 0 ? ">>>" : "<<<");
+                debug_dump(msg[i].buf, msg[i].len, deb_xfer);
+        }
+
+        mutex_unlock(&d->i2c_mutex);
+        return num;
+}
+
 static u32 dw210x_i2c_func(struct i2c_adapter *adapter)
 {
         return I2C_FUNC_I2C;
@@ -385,6 +461,11 @@ static struct i2c_algorithm dw2104_i2c_algo = {
         .functionality = dw210x_i2c_func,
 };
 
+static struct i2c_algorithm dw3101_i2c_algo = {
+        .master_xfer = dw3101_i2c_transfer,
+        .functionality = dw210x_i2c_func,
+};
+
 static int dw210x_read_mac_address(struct dvb_usb_device *d, u8 mac[6])
 {
         int i;
@@ -404,6 +485,7 @@ static int dw210x_read_mac_address(struct dvb_usb_device *d, u8 mac[6])
                         debug_dump(eepromline, 16, deb_xfer);
                 }
         }
+
         memcpy(mac, eeprom + 8, 6);
         return 0;
 };
@@ -448,6 +530,11 @@ static struct si21xx_config serit_sp1511lhb_config = {
 
 };
 
+static struct tda10023_config dw3101_tda10023_config = {
+        .demod_address = 0x0c,
+        .invert = 1,
+};
+
 static int dw2104_frontend_attach(struct dvb_usb_adapter *d)
 {
         if ((d->fe = dvb_attach(cx24116_attach, &dw2104_config,
@@ -460,6 +547,7 @@ static int dw2104_frontend_attach(struct dvb_usb_adapter *d)
 }
 
 static struct dvb_usb_device_properties dw2102_properties;
+static struct dvb_usb_device_properties dw2104_properties;
 
 static int dw2102_frontend_attach(struct dvb_usb_adapter *d)
 {
@@ -497,6 +585,17 @@ static int dw2102_frontend_attach(struct dvb_usb_adapter *d)
         return -EIO;
 }
 
+static int dw3101_frontend_attach(struct dvb_usb_adapter *d)
+{
+        d->fe = dvb_attach(tda10023_attach, &dw3101_tda10023_config,
+                                &d->dev->i2c_adap, 0x48);
+        if (d->fe != NULL) {
+                info("Attached tda10023!\n");
+                return 0;
+        }
+        return -EIO;
+}
+
 static int dw2102_tuner_attach(struct dvb_usb_adapter *adap)
 {
         dvb_attach(dvb_pll_attach, adap->fe, 0x60,
@@ -512,6 +611,14 @@ static int dw2102_earda_tuner_attach(struct dvb_usb_adapter *adap)
         return 0;
 }
 
+static int dw3101_tuner_attach(struct dvb_usb_adapter *adap)
+{
+        dvb_attach(dvb_pll_attach, adap->fe, 0x60,
+                &adap->dev->i2c_adap, DVB_PLL_TUA6034);
+
+        return 0;
+}
+
 static struct dvb_usb_rc_key dw210x_rc_keys[] = {
         { 0xf8, 0x0a, KEY_Q },          /*power*/
         { 0xf8, 0x0c, KEY_M },          /*mute*/
@@ -544,44 +651,147 @@ static struct dvb_usb_rc_key dw210x_rc_keys[] = {
         { 0xf8, 0x40, KEY_F },          /*full*/
         { 0xf8, 0x1e, KEY_W },          /*tvmode*/
         { 0xf8, 0x1b, KEY_B },          /*recall*/
+};
 
+static struct dvb_usb_rc_key tevii_rc_keys[] = {
+        { 0xf8, 0x0a, KEY_POWER },
+        { 0xf8, 0x0c, KEY_MUTE },
+        { 0xf8, 0x11, KEY_1 },
+        { 0xf8, 0x12, KEY_2 },
+        { 0xf8, 0x13, KEY_3 },
+        { 0xf8, 0x14, KEY_4 },
+        { 0xf8, 0x15, KEY_5 },
+        { 0xf8, 0x16, KEY_6 },
+        { 0xf8, 0x17, KEY_7 },
+        { 0xf8, 0x18, KEY_8 },
+        { 0xf8, 0x19, KEY_9 },
+        { 0xf8, 0x10, KEY_0 },
+        { 0xf8, 0x1c, KEY_MENU },
+        { 0xf8, 0x0f, KEY_VOLUMEDOWN },
+        { 0xf8, 0x1a, KEY_LAST },
+        { 0xf8, 0x0e, KEY_OPEN },
+        { 0xf8, 0x04, KEY_RECORD },
+        { 0xf8, 0x09, KEY_VOLUMEUP },
+        { 0xf8, 0x08, KEY_CHANNELUP },
+        { 0xf8, 0x07, KEY_PVR },
+        { 0xf8, 0x0b, KEY_TIME },
+        { 0xf8, 0x02, KEY_RIGHT },
+        { 0xf8, 0x03, KEY_LEFT },
+        { 0xf8, 0x00, KEY_UP },
+        { 0xf8, 0x1f, KEY_OK },
+        { 0xf8, 0x01, KEY_DOWN },
+        { 0xf8, 0x05, KEY_TUNER },
+        { 0xf8, 0x06, KEY_CHANNELDOWN },
+        { 0xf8, 0x40, KEY_PLAYPAUSE },
+        { 0xf8, 0x1e, KEY_REWIND },
+        { 0xf8, 0x1b, KEY_FAVORITES },
+        { 0xf8, 0x1d, KEY_BACK },
+        { 0xf8, 0x4d, KEY_FASTFORWARD },
+        { 0xf8, 0x44, KEY_EPG },
+        { 0xf8, 0x4c, KEY_INFO },
+        { 0xf8, 0x41, KEY_AB },
+        { 0xf8, 0x43, KEY_AUDIO },
+        { 0xf8, 0x45, KEY_SUBTITLE },
+        { 0xf8, 0x4a, KEY_LIST },
+        { 0xf8, 0x46, KEY_F1 },
+        { 0xf8, 0x47, KEY_F2 },
+        { 0xf8, 0x5e, KEY_F3 },
+        { 0xf8, 0x5c, KEY_F4 },
+        { 0xf8, 0x52, KEY_F5 },
+        { 0xf8, 0x5a, KEY_F6 },
+        { 0xf8, 0x56, KEY_MODE },
+        { 0xf8, 0x58, KEY_SWITCHVIDEOMODE },
 };
 
+static struct dvb_usb_rc_key tbs_rc_keys[] = {
+        { 0xf8, 0x84, KEY_POWER },
+        { 0xf8, 0x94, KEY_MUTE },
+        { 0xf8, 0x87, KEY_1 },
+        { 0xf8, 0x86, KEY_2 },
+        { 0xf8, 0x85, KEY_3 },
+        { 0xf8, 0x8b, KEY_4 },
+        { 0xf8, 0x8a, KEY_5 },
+        { 0xf8, 0x89, KEY_6 },
+        { 0xf8, 0x8f, KEY_7 },
+        { 0xf8, 0x8e, KEY_8 },
+        { 0xf8, 0x8d, KEY_9 },
+        { 0xf8, 0x92, KEY_0 },
+        { 0xf8, 0x96, KEY_CHANNELUP },
+        { 0xf8, 0x91, KEY_CHANNELDOWN },
+        { 0xf8, 0x93, KEY_VOLUMEUP },
+        { 0xf8, 0x8c, KEY_VOLUMEDOWN },
+        { 0xf8, 0x83, KEY_RECORD },
+        { 0xf8, 0x98, KEY_PAUSE  },
+        { 0xf8, 0x99, KEY_OK },
+        { 0xf8, 0x9a, KEY_SHUFFLE },
+        { 0xf8, 0x81, KEY_UP },
+        { 0xf8, 0x90, KEY_LEFT },
+        { 0xf8, 0x82, KEY_RIGHT },
+        { 0xf8, 0x88, KEY_DOWN },
+        { 0xf8, 0x95, KEY_FAVORITES },
+        { 0xf8, 0x97, KEY_SUBTITLE },
+        { 0xf8, 0x9d, KEY_ZOOM },
+        { 0xf8, 0x9f, KEY_EXIT },
+        { 0xf8, 0x9e, KEY_MENU },
+        { 0xf8, 0x9c, KEY_EPG },
+        { 0xf8, 0x80, KEY_PREVIOUS },
+        { 0xf8, 0x9b, KEY_MODE }
+};
 
+static struct dvb_usb_rc_keys_table keys_tables[] = {
+        { dw210x_rc_keys, ARRAY_SIZE(dw210x_rc_keys) },
+        { tevii_rc_keys, ARRAY_SIZE(tevii_rc_keys) },
+        { tbs_rc_keys, ARRAY_SIZE(tbs_rc_keys) },
+};
 
 static int dw2102_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 {
-        struct dw210x_state *st = d->priv;
+        struct dvb_usb_rc_key *keymap = d->props.rc_key_map;
+        int keymap_size = d->props.rc_key_map_size;
         u8 key[2];
-        struct i2c_msg msg[] = {
-                {.addr = DW2102_RC_QUERY, .flags = I2C_M_RD, .buf = key,
-                .len = 2},
+        struct i2c_msg msg = {
+                .addr = DW2102_RC_QUERY,
+                .flags = I2C_M_RD,
+                .buf = key,
+                .len = 2
         };
         int i;
+        /* override keymap */
+        if ((ir_keymap > 0) && (ir_keymap <= ARRAY_SIZE(keys_tables))) {
+                keymap = keys_tables[ir_keymap - 1].rc_keys ;
+                keymap_size = keys_tables[ir_keymap - 1].rc_keys_size;
+        }
 
         *state = REMOTE_NO_KEY_PRESSED;
-        if (dw2102_i2c_transfer(&d->i2c_adap, msg, 1) == 1) {
-                for (i = 0; i < ARRAY_SIZE(dw210x_rc_keys); i++) {
-                        if (dw210x_rc_keys[i].data == msg[0].buf[0]) {
+        if (dw2102_i2c_transfer(&d->i2c_adap, &msg, 1) == 1) {
+                for (i = 0; i < keymap_size ; i++) {
+                        if (keymap[i].data == msg.buf[0]) {
                                 *state = REMOTE_KEY_PRESSED;
-                                *event = dw210x_rc_keys[i].event;
-                                st->last_key_pressed =
-                                        dw210x_rc_keys[i].event;
+                                *event = keymap[i].event;
                                 break;
                         }
-                st->last_key_pressed = 0;
+
                 }
+
+                if ((*state) == REMOTE_KEY_PRESSED)
+                        deb_rc("%s: found rc key: %x, %x, event: %x\n",
+                                        __func__, key[0], key[1], (*event));
+                else if (key[0] != 0xff)
+                        deb_rc("%s: unknown rc key: %x, %x\n",
+                                        __func__, key[0], key[1]);
+
         }
-        /* info("key: %x %x\n",key[0],key[1]); */
+
         return 0;
 }
 
 static struct usb_device_id dw2102_table[] = {
         {USB_DEVICE(USB_VID_CYPRESS, USB_PID_DW2102)},
         {USB_DEVICE(USB_VID_CYPRESS, 0x2101)},
-        {USB_DEVICE(USB_VID_CYPRESS, 0x2104)},
-        {USB_DEVICE(0x9022, 0xd650)},
+        {USB_DEVICE(USB_VID_CYPRESS, USB_PID_DW2104)},
+        {USB_DEVICE(0x9022, USB_PID_TEVII_S650)},
         {USB_DEVICE(USB_VID_TERRATEC, USB_PID_CINERGY_S)},
+        {USB_DEVICE(USB_VID_CYPRESS, USB_PID_DW3101)},
         { }
 };
 
@@ -642,11 +852,16 @@ static int dw2102_load_firmware(struct usb_device *dev,
                 }
                 /* init registers */
                 switch (dev->descriptor.idProduct) {
+                case USB_PID_TEVII_S650:
+                        dw2104_properties.rc_key_map = tevii_rc_keys;
+                        dw2104_properties.rc_key_map_size =
+                                        ARRAY_SIZE(tevii_rc_keys);
                 case USB_PID_DW2104:
-                case 0xd650:
                         reset = 1;
                         dw210x_op_rw(dev, 0xc4, 0x0000, 0, &reset, 1,
                                         DW210X_WRITE_MSG);
+                        /* break omitted intentionally */
+                case USB_PID_DW3101:
                         reset = 0;
                         dw210x_op_rw(dev, 0xbf, 0x0040, 0, &reset, 0,
                                         DW210X_WRITE_MSG);
@@ -690,6 +905,7 @@ static int dw2102_load_firmware(struct usb_device *dev,
                                         DW210X_READ_MSG);
                         break;
                 }
+
                 msleep(100);
                 kfree(p);
         }
@@ -700,7 +916,6 @@ static struct dvb_usb_device_properties dw2102_properties = {
         .caps = DVB_USB_IS_AN_I2C_ADAPTER,
         .usb_ctrl = DEVICE_SPECIFIC,
         .firmware = "dvb-usb-dw2102.fw",
-        .size_of_priv = sizeof(struct dw210x_state),
         .no_reconnect = 1,
 
         .i2c_algo = &dw2102_serit_i2c_algo,
@@ -714,7 +929,7 @@ static struct dvb_usb_device_properties dw2102_properties = {
         .num_adapters = 1,
         .download_firmware = dw2102_load_firmware,
         .read_mac_address = dw210x_read_mac_address,
-                .adapter = {
+        .adapter = {
                 {
                         .frontend_attach = dw2102_frontend_attach,
                         .streaming_ctrl = NULL,
@@ -752,7 +967,6 @@ static struct dvb_usb_device_properties dw2104_properties = {
         .caps = DVB_USB_IS_AN_I2C_ADAPTER,
         .usb_ctrl = DEVICE_SPECIFIC,
         .firmware = "dvb-usb-dw2104.fw",
-        .size_of_priv = sizeof(struct dw210x_state),
         .no_reconnect = 1,
 
         .i2c_algo = &dw2104_i2c_algo,
@@ -796,12 +1010,57 @@ static struct dvb_usb_device_properties dw2104_properties = {
         }
 };
 
+static struct dvb_usb_device_properties dw3101_properties = {
+        .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+        .usb_ctrl = DEVICE_SPECIFIC,
+        .firmware = "dvb-usb-dw3101.fw",
+        .no_reconnect = 1,
+
+        .i2c_algo = &dw3101_i2c_algo,
+        .rc_key_map = dw210x_rc_keys,
+        .rc_key_map_size = ARRAY_SIZE(dw210x_rc_keys),
+        .rc_interval = 150,
+        .rc_query = dw2102_rc_query,
+
+        .generic_bulk_ctrl_endpoint = 0x81,
+        /* parameter for the MPEG2-data transfer */
+        .num_adapters = 1,
+        .download_firmware = dw2102_load_firmware,
+        .read_mac_address = dw210x_read_mac_address,
+        .adapter = {
+                {
+                        .frontend_attach = dw3101_frontend_attach,
+                        .streaming_ctrl = NULL,
+                        .tuner_attach = dw3101_tuner_attach,
+                        .stream = {
+                                .type = USB_BULK,
+                                .count = 8,
+                                .endpoint = 0x82,
+                                .u = {
+                                        .bulk = {
+                                                .buffersize = 4096,
+                                        }
+                                }
+                        },
+                }
+        },
+        .num_device_descs = 1,
+        .devices = {
+                { "DVBWorld DVB-C 3101 USB2.0",
+                        {&dw2102_table[5], NULL},
+                        {NULL},
+                },
+        }
+};
+
 static int dw2102_probe(struct usb_interface *intf,
                 const struct usb_device_id *id)
 {
         if (0 == dvb_usb_device_init(intf, &dw2102_properties,
                         THIS_MODULE, NULL, adapter_nr) ||
             0 == dvb_usb_device_init(intf, &dw2104_properties,
+                        THIS_MODULE, NULL, adapter_nr) ||
+            0 == dvb_usb_device_init(intf, &dw3101_properties,
                         THIS_MODULE, NULL, adapter_nr)) {
                 return 0;
         }
@@ -833,6 +1092,8 @@ module_init(dw2102_module_init);
 module_exit(dw2102_module_exit);
 
 MODULE_AUTHOR("Igor M. Liplianin (c) liplianin@me.by");
-MODULE_DESCRIPTION("Driver for DVBWorld DVB-S 2101, 2102, DVB-S2 2104 USB2.0 device");
+MODULE_DESCRIPTION("Driver for DVBWorld DVB-S 2101, 2102, DVB-S2 2104,"
+                                " DVB-C 3101 USB2.0,"
+                                " TeVii S600, S650 USB2.0 devices");
 MODULE_VERSION("0.1");
 MODULE_LICENSE("GPL");