rendered paste bodydiff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconf
ig
index 75824b7..0cb77aa 100644
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -98,6 +98,14 @@ config DVB_USB_CXUSB
Medion MD95700 hybrid USB2.0 device.
DViCO FusionHDTV (Bluebird) USB2.0 devices
+config DVB_USB_GL861
+ tristate "Genesys Logic GL861 USB2.0 support"
+ depends on DVB_USB
+ select DVB_ZL10353
+ help
+ Say Y here to support the MSI Megasky 580 (55801) DVB-T USB2.0
+ receiver with USB ID 0db0:5581.
+
config DVB_USB_DIGITV
tristate "Nebula Electronics uDigiTV DVB-T USB2.0 support"
depends on DVB_USB
diff --git a/drivers/media/dvb/dvb-usb/Makefile b/drivers/media/dvb/dvb-usb/Make
file
index 9643f56..4edee66 100644
--- a/drivers/media/dvb/dvb-usb/Makefile
+++ b/drivers/media/dvb/dvb-usb/Makefile
@@ -30,6 +30,9 @@ obj-$(CONFIG_DVB_USB_NOVA_T_USB2) += dvb
dvb-usb-umt-010-objs = umt-010.o
obj-$(CONFIG_DVB_USB_UMT_010) += dvb-usb-dibusb-common.o dvb-usb-umt-010.o
+dvb-usb-gl861-objs = gl861.o
+obj-$(CONFIG_DVB_USB_GL861) += dvb-usb-gl861.o
+
dvb-usb-digitv-objs = digitv.o
obj-$(CONFIG_DVB_USB_DIGITV) += dvb-usb-digitv.o
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb
/dvb-usb-ids.h
index 9569891..8db8630 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -27,6 +27,7 @@ #define USB_VID_HYPER_PALTEK 0x1025
#define USB_VID_KWORLD 0xeb2a
#define USB_VID_KYE 0x0458
#define USB_VID_MEDION 0x1660
+#define USB_VID_MSI 0x0db0
#define USB_VID_PINNACLE 0x2304
#define USB_VID_VISIONPLUS 0x13d3
#define USB_VID_TWINHAN 0x1822
@@ -101,6 +102,7 @@ #define USB_PID_DVICO_BLUEBIRD_DEE1601_W
#define USB_PID_DIGITALNOW_BLUEBIRD_DEE1601_COLD 0xdb54
#define USB_PID_DIGITALNOW_BLUEBIRD_DEE1601_WARM 0xdb55
#define USB_PID_MEDION_MD95700 0x0932
+#define USB_PID_MEGASKY_55801 0x5581
#define USB_PID_KYE_DVB_T_COLD 0x701e
#define USB_PID_KYE_DVB_T_WARM 0x701f
#define USB_PID_PCTV_200E 0x020e
diff --git a/drivers/media/dvb/dvb-usb/gl861.c b/drivers/media/dvb/dvb-usb/gl861
.c
new file mode 100644
index 0000000..19c84dd
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/gl861.c
@@ -0,0 +1,452 @@
+/* DVB USB compliant linux driver for GL861 USB2.0 devices.
+ *
+ * Based on usbsnoop, BDACap.inf, copy-paste and guessing. ;)
+ *
+ * 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 Fr
ee
+ * Software Foundation, version 2.
+ *
+ * see Documentation/dvb/README.dvb-usb for more information
+ */
+#include "gl861.h"
+
+#include "zl10353.h"
+
+/* debug */
+int dvb_usb_gl861_debug;
+module_param_named(debug,dvb_usb_gl861_debug, int, 0644);
+MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." DVB_USB_DEBUG_S
TATUS);
+
+static int gl861_i2c_msg(struct dvb_usb_device *d, u8 addr,
+ u8 *wbuf, u16 wlen, u8 *rbuf, u16 rlen)
+{
+ u16 index;
+ u16 value = addr << 8;
+ int wo = (rbuf == NULL || rlen == 0); /* write-only */
+ u8 req, type;
+
+ if (wo) {
+ req = GL861_REQ_I2C_WRITE;
+ type = GL861_WRITE;
+ } else { /* rw */
+ req = GL861_REQ_I2C_READ;
+ type = GL861_READ;
+ }
+
+ if (wlen > 2) {
+ warn("wlen = %x, aborting.", wlen);
+ return -EINVAL;
+ }
+
+ switch (wlen) {
+ case 1:
+ index = wbuf[0];
+ break;
+ case 2:
+ index = wbuf[0];
+ value = value + wbuf[1];
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ return usb_control_msg(d->udev, usb_rcvctrlpipe(d->udev, 0),
+ req, /* request (I2C write: 0x01, I2C read: 0x02) */
+ type, /* requesttype (read: 0xc0, write: 0x40) */
+ value, /* value (0x1e00) */
+ index, /* index (0x007f) */
+ rbuf, /* readbuf */
+ rlen, /* readlen */
+ 2000); /* timeout */
+}
+
+/* I2C */
+static int gl861_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
+ int num)
+{
+ struct dvb_usb_device *d = i2c_get_adapdata(adap);
+ int i;
+
+ if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
+ return -EAGAIN;
+
+ if (num > 2)
+ warn("more than 2 i2c messages at a time is not handled yet. TOD
O.");
+
+ for (i = 0; i < num; i++) {
+ /* write/read request */
+ if (i+1 < num && (msg[i+1].flags & I2C_M_RD)) {
+ if (gl861_i2c_msg(d, msg[i].addr, msg[i].buf,
+ msg[i].len, msg[i+1].buf, msg[i+1].len) < 0)
+ break;
+ i++;
+ } else
+ if (gl861_i2c_msg(d, msg[i].addr, msg[i].buf,
+ msg[i].len, NULL, 0) < 0)
+ break;
+ }
+
+ mutex_unlock(&d->i2c_mutex);
+ return i;
+}
+
+static u32 gl861_i2c_func(struct i2c_adapter *adapter)
+{
+ return I2C_FUNC_I2C;
+}
+
+static struct i2c_algorithm gl861_i2c_algo = {
+ .master_xfer = gl861_i2c_xfer,
+ .functionality = gl861_i2c_func,
+};
+
+/* From http://www.linuxtv.org/pipermail/linux-dvb/2006-July/011538.html */
+
+#define W 0
+#define R 1
+/* Not actual hw limits. */
+#define QT1010_MIN_STEP 2000000
+#define QT1010_MIN_FREQ 48000000
+
+int qt1010_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *
params, u8 *buf, int buf_len)
+{
+ int i;
+ int div, mod;
+ struct {
+ u8 read, reg, value;
+#if 0
+ } rd[46] = { { W, 0x01, 0x80 },
+ { W, 0x02, 0x3f },
+ { W, 0x05, 0xff }, /* c */
+ { W, 0x06, 0x44 },
+ { W, 0x07, 0xff }, /* c */
+ { W, 0x08, 0x08 },
+ { W, 0x09, 0xff }, /* c */
+ { W, 0x0a, 0xff }, /* c */
+ { W, 0x0b, 0xff }, /* c */
+ { W, 0x0c, 0xe1 },
+ { W, 0x1a, 0xff }, /* 10 c */
+ { W, 0x1b, 0x00 },
+ { W, 0x1c, 0x89 },
+ { W, 0x11, 0xff }, /* c */
+ { W, 0x12, 0x91 },
+ { W, 0x22, 0xff }, /* c */
+ { W, 0x1e, 0x00 },
+ { W, 0x1e, 0xd0 },
+ { R, 0x22, 0xff }, /* c read */
+ { W, 0x1e, 0x00 },
+ { R, 0x05, 0xff }, /* 20 c read */
+ { R, 0x22, 0xff }, /* c read */
+ { W, 0x23, 0xd0 },
+ { W, 0x1e, 0x00 },
+ { W, 0x1e, 0xe0 },
+ { R, 0x23, 0xff }, /* c read */
+ { W, 0x1e, 0x00 },
+ { W, 0x24, 0xd0 },
+ { W, 0x1e, 0x00 },
+ { W, 0x1e, 0xf0 },
+ { R, 0x24, 0xff }, /* 30 c read */
+ { W, 0x1e, 0x00 },
+ { W, 0x14, 0x7f },
+ { W, 0x15, 0x7f },
+ { W, 0x05, 0xff }, /* c */
+ { W, 0x06, 0x00 },
+ { W, 0x15, 0x1f },
+ { W, 0x16, 0xff },
+ { W, 0x18, 0xff },
+ { W, 0x1f, 0xff }, /* c */
+ { W, 0x20, 0xff }, /* 40 c */
+ { W, 0x21, 0x53 },
+ { W, 0x25, 0xbd },
+ { W, 0x26, 0x15 },
+ { W, 0x02, 0x00 },
+ { W, 0x01, 0x00 },
+#endif
+ } rd[47] = { { W, 0x01, 0x80 },
+ { W, 0x02, 0x3f },
+ { W, 0x05, 0x34 }, /* c */
+ { W, 0x06, 0x44 },
+ { W, 0x07, 0x37 }, /* c */
+ { W, 0x08, 0x08 },
+ { W, 0x09, 0x1c }, /* c */
+ { W, 0x0a, 0x0d }, /* c */
+ { W, 0x0b, 0x44 }, /* c */
+ { W, 0x0c, 0xe1 },
+ { W, 0x1a, 0xb8 }, /* 10 c */
+ { W, 0x1b, 0x00 },
+ { W, 0x1c, 0x89 },
+ { W, 0x11, 0xfd }, /* c */
+ { W, 0x12, 0x95 },
+ { W, 0x22, 0xd6 }, /* c */
+ { W, 0x1e, 0x00 },
+ { W, 0x1e, 0xd0 },
+ { R, 0x22, 0x00 }, /* c read */
+ { W, 0x1e, 0x00 },
+ { R, 0x05, 0x00 }, /* 20 c read */
+ { R, 0x22, 0x00 }, /* c read */
+ { W, 0x23, 0xd0 },
+ { W, 0x1e, 0x00 },
+ { W, 0x1e, 0xe0 },
+ { R, 0x23, 0x00 }, /* c read */
+ { W, 0x1e, 0x00 },
+ { W, 0x24, 0xd0 },
+ { W, 0x1e, 0x00 },
+ { W, 0x1e, 0xf0 },
+ { R, 0x24, 0x00 }, /* 30 c read */
+ { W, 0x1e, 0x00 },
+ { W, 0x14, 0x7f },
+ { W, 0x15, 0x7f },
+ { W, 0x05, 0x30 }, /* c */
+ { W, 0x06, 0x00 },
+ { W, 0x15, 0x1f },
+ { W, 0x16, 0xff },
+ { W, 0x18, 0xff },
+ { W, 0x1f, 0x6a }, /* c */
+ { W, 0x20, 0x13 }, /* 40 c */
+ { W, 0x21, 0x53 },
+ { W, 0x25, 0xb8 },
+ { W, 0x26, 0x14 },
+ { W, 0x00, 0x81 },
+ { W, 0x02, 0x00 },
+ { W, 0x01, 0x00 },
+ };
+ struct i2c_msg msg;
+ struct dvb_usb_device *d = fe->dvb->priv;
+ unsigned long freq = params->frequency;
+
+ if (freq % QT1010_MIN_STEP)
+ deb_info("frequency not supported.\n");
+
+ (void) buf;
+ (void) buf_len;
+
+ div = (freq - QT1010_MIN_FREQ) / QT1010_MIN_STEP;
+ mod = (div + 16 - 9) % 16;
+
+#if 0
+ /* 0x5 */
+ if (div >= 377)
+ rd[2].value = 0x74;
+ else if (div >= 265)
+ rd[2].value = 0x54;
+ else if (div >= 121)
+ rd[2].value = 0x34;
+ else
+ rd[2].value = 0x14;
+
+ /* 0x7 */
+ rd[4].value = (((freq - QT1010_MIN_FREQ) / 1000000) * 9975 + 12960000) /
320000;
+
+ /* 09 */
+ if (mod < 4)
+ rd[6].value = 0x1d;
+ else
+ rd[6].value = 0x1c;
+
+ /* 0a */
+ if (mod < 2)
+ rd[7].value = 0x09;
+ else if (mod < 4)
+ rd[7].value = 0x08;
+ else if (mod < 6)
+ rd[7].value = 0x0f;
+ else if (mod < 8)
+ rd[7].value = 0x0e;
+ else if (mod < 10)
+ rd[7].value = 0x0d;
+ else if (mod < 12)
+ rd[7].value = 0x0c;
+ else if (mod < 14)
+ rd[7].value = 0x0b;
+ else
+ rd[7].value = 0x0a;
+
+ /* 0b */
+ if (div & 1)
+ rd[8].value = 0x45;
+ else
+ rd[8].value = 0x44;
+
+ /* 1a */
+ if (div & 1)
+ rd[10].value = 0x78;
+ else
+ rd[10].value = 0xf8;
+
+ /* 11 */
+ if (div >= 265)
+ rd[13].value = 0xf9;
+ else if (div >= 121)
+ rd[13].value = 0xfd;
+ else
+ rd[13].value = 0xf9;
+
+ /* 22 */
+ if (div < 201)
+ rd[15].value = 0xd0;
+ else if (div < 217)
+ rd[15].value = 0xd3;
+ else if (div < 233)
+ rd[15].value = 0xd6;
+ else if (div < 249)
+ rd[15].value = 0xd9;
+ else if (div < 265)
+ rd[15].value = 0xda;
+ else
+ rd[15].value = 0xd0;
+
+ /* 05 */
+ if (div >= 377)
+ rd[34].value = 0x70;
+ else if (div >= 265)
+ rd[34].value = 0x50;
+ else if (div >= 121)
+ rd[34].value = 0x30;
+ else
+ rd[34].value = 0x10;
+
+ /* 1f */
+ if (mod < 4)
+ rd[39].value = 0x64;
+ else if (mod < 6)
+ rd[39].value = 0x66;
+ else if (mod < 8)
+ rd[39].value = 0x67;
+ else if (mod < 12)
+ rd[39].value = 0x68;
+ else if (mod < 14)
+ rd[39].value = 0x69;
+ else
+ rd[39].value = 0x6a;
+
+ /* 20 */
+ if (mod < 4)
+ rd[40].value = 0x10;
+ else if (mod < 6)
+ rd[40].value = 0x11;
+ else if (mod < 10)
+ rd[40].value = 0x12;
+ else if (mod < 12)
+ rd[40].value = 0x13;
+ else if (mod < 14)
+ rd[40].value = 0x14;
+ else
+ rd[40].value = 0x15;
+
+ deb_info("Now tuning... ");
+ for (i = 0; i < sizeof(rd) / sizeof(*rd); i++) {
+ if (rd[i].read)
+ continue;
+
+ msg.flags = 0;
+ msg.len = 2;
+ msg.addr = 0xc4;
+ msg.buf = &rd[i].reg;
+
+ if (i2c_transfer(&d->i2c_adap, &msg, 1) != 1) {
+ deb_info("tuner write failed\n");
+ return -EIO;
+ }
+ }
+ deb_info("done\n");
+#endif
+
+ return 0;
+}
+#undef W
+#undef R
+
+static struct zl10353_config gl861_zl10353_config = {
+ .demod_address = 0x1e,
+};
+
+static int gl861_frontend_attach(struct dvb_usb_device *d)
+{
+ if ((d->fe = zl10353_attach(&gl861_zl10353_config,
+ &d->i2c_adap)) != NULL) {
+ d->fe->ops.tuner_ops.calc_regs = qt1010_set_params;
+ return 0;
+ }
+
+ return -EIO;
+}
+
+/* DVB USB Driver stuff */
+static struct dvb_usb_properties gl861_properties;
+
+static int gl861_probe(struct usb_interface *intf,
+ const struct usb_device_id *id)
+{
+ return dvb_usb_device_init(intf, &gl861_properties, THIS_MODULE, NULL);
+}
+
+static struct usb_device_id gl861_table [] = {
+ { USB_DEVICE(USB_VID_MSI, USB_PID_MEGASKY_55801) },
+ {} /* Terminating entry */
+};
+MODULE_DEVICE_TABLE (usb, gl861_table);
+
+static struct dvb_usb_properties gl861_properties = {
+ .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+
+ .usb_ctrl = DEVICE_SPECIFIC,
+
+ .size_of_priv = 0,
+
+ .frontend_attach = gl861_frontend_attach,
+
+ .i2c_algo = &gl861_i2c_algo,
+
+ .generic_bulk_ctrl_endpoint = 0x01,
+ /* parameter for the MPEG2-data transfer */
+ .urb = {
+ .type = DVB_USB_BULK,
+ .count = 7,
+ .endpoint = 0x81,
+ .u = {
+ .bulk = {
+ .buffersize = 512,
+ }
+ }
+ },
+
+ .num_device_descs = 1,
+ .devices = {
+ { "MSI Mega Sky 55801 DVB-T USB2.0",
+ { NULL },
+ { &gl861_table[0], NULL },
+ },
+ }
+};
+
+static struct usb_driver gl861_driver = {
+ .name = "gl861",
+ .probe = gl861_probe,
+ .disconnect = dvb_usb_device_exit,
+ .id_table = gl861_table,
+};
+
+/* module stuff */
+static int __init gl861_module_init(void)
+{
+ int result;
+ if ((result = usb_register(&gl861_driver))) {
+ err("usb_register failed. Error number %d",result);
+ return result;
+ }
+
+ return 0;
+}
+
+static void __exit gl861_module_exit(void)
+{
+ /* deregister this driver from the USB subsystem */
+ usb_deregister(&gl861_driver);
+}
+
+module_init (gl861_module_init);
+module_exit (gl861_module_exit);
+
+MODULE_DESCRIPTION("Driver for Genesys Logic GL861 DVB-T USB2.0 devices.");
+MODULE_VERSION("0.1");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/gl861.h b/drivers/media/dvb/dvb-usb/gl861
.h
new file mode 100644
index 0000000..5f28dab
--- /dev/null
+++ b/drivers/media/dvb/dvb-usb/gl861.h
@@ -0,0 +1,16 @@
+#ifndef _DVB_USB_GL861_H_
+#define _DVB_USB_GL861_H_
+
+#define DVB_USB_LOG_PREFIX "gl861"
+#include "dvb-usb.h"
+
+extern int dvb_usb_gl861_debug;
+#define deb_info(args...) dprintk(dvb_usb_gl861_debug,0x01,args)
+
+#define GL861_WRITE 0x40
+#define GL861_READ 0xc0
+
+#define GL861_REQ_I2C_WRITE 0x01
+#define GL861_REQ_I2C_READ 0x02
+
+#endif