hi,
let's try again. Attached patch remains unchanged.
Signed-off-by: Antti Palosaari <crope@xxxxxx>
/antti
Antti Palosaari wrote:
Hi,
This patch adds driver for Sigmatek DVB-110 USB DVB-T stick. Stick has
based on hardware of Qtuantek QT1010 tuner, Zarlink ZL10353 (Intel CE
6353) demodulator and Alcor Micro AU6610 DVB-T USB controller. HW is
rather similar as used in MSI Megasky GL861.
Currently, the driver works only in USB 2.0. In my understanding USB 1.1
is also supported by hw but I cannot test it due to lack of USB 1.1
port. Device supports only isochronous mode transfers. There is also
eeprom in usb-controller (at least in address range 0x80 - 0xbf) for
storing data, eg. firmware. Anyway, firmware loading is not used /
required by the device.
There seems to be at least one unknown I2C device in address 0xa0,
probably remote control or GPIO. Windows drivers reads registers from
0x00 to 0x07 from this unknown address.
Driver is based on gl861 module in current megasky development tree.
Tuner has a lot of problems to lock with megasky qt1010 module with this
hardware at least broadcasting standards used in Finland. I will try to
fix this later...
Feedback, bug/success reports are highly welcome.
Best regards
Antti Palosaari
Antti,
Please provide a sign-off for your patch, as described in README.patches
and README.HG, in the top level directory of the mercurial repository.
Regards,
Michael Krufky
diff -urNp --exclude=.version --exclude=Module.symvers a/megasky/linux/drivers/media/dvb/dvb-usb/au6610.c b/megasky/linux/drivers/media/dvb/dvb-usb/au6610.c
--- a/megasky/linux/drivers/media/dvb/dvb-usb/au6610.c 1970-01-01 02:00:00.000000000 +0200
+++ b/megasky/linux/drivers/media/dvb/dvb-usb/au6610.c 2006-11-03 02:35:27.000000000 +0200
@@ -0,0 +1,245 @@
+/* DVB USB compliant linux driver for Sigmatek DVB-110 DVB-T USB2.0 receiver
+ *
+ * Copyright (C) 2006 Antti Palosaari (crope@xxxxxx)
+ *
+ * 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 Free
+ * Software Foundation, version 2.
+ *
+ * see Documentation/dvb/README.dvb-usb for more information
+ */
+
+#include "au6610.h"
+
+#include "zl10353.h"
+#include "qt1010.h"
+
+/* debug */
+static int dvb_usb_au6610_debug;
+module_param_named(debug, dvb_usb_au6610_debug, int, 0644);
+MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." DVB_USB_DEBUG_STATUS);
+
+
+static int au6610_usb_msg(struct dvb_usb_device *d, u8 operation, u8 addr,
+ u8 *wbuf, u16 wlen, u8 *rbuf, u16 rlen)
+{
+ int ret;
+ u16 index;
+ u8 usb_buf[6]; /* enough for all known requests, read returns 5 and write 6 bytes */
+
+ switch (wlen) {
+ case 1:
+ index = wbuf[0] << 8;
+ break;
+ case 2:
+ index = wbuf[0] << 8;
+ index += wbuf[1];
+ break;
+ default:
+ warn("wlen = %x, aborting.", wlen);
+ return -EINVAL;
+ }
+
+ ret = usb_control_msg(d->udev, usb_rcvctrlpipe(d->udev, 0), operation,
+ USB_TYPE_VENDOR | USB_DIR_IN, addr, index, usb_buf,
+ sizeof(usb_buf), AU6610_USB_TIMEOUT);
+
+ if (ret < 0)
+ return ret;
+
+ switch (operation) {
+ case AU6610_REQ_I2C_READ:
+ case AU6610_REQ_USB_READ:
+ /* requested value is always 5th byte in buffer */
+ rbuf[0] = usb_buf[4];
+ }
+
+ return ret;
+}
+
+static int au6610_i2c_msg(struct dvb_usb_device *d, u8 addr, u8 *wbuf, u16 wlen, u8 *rbuf, u16 rlen)
+{
+ u8 request;
+ u8 wo = (rbuf == NULL || rlen == 0); /* write-only */
+
+ if (wo) {
+ request = AU6610_REQ_I2C_WRITE;
+ } else { /* rw */
+ request = AU6610_REQ_I2C_READ;
+ }
+
+ return au6610_usb_msg(d, request, addr, wbuf, wlen, rbuf, rlen);
+}
+
+
+/* I2C */
+static int au6610_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)
+ return -EINVAL;
+
+ for (i = 0; i < num; i++) {
+ /* write/read request */
+ if (i+1 < num && (msg[i+1].flags & I2C_M_RD)) {
+ if (au6610_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 (au6610_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 au6610_i2c_func(struct i2c_adapter *adapter)
+{
+ return I2C_FUNC_I2C;
+}
+
+static struct i2c_algorithm au6610_i2c_algo = {
+ .master_xfer = au6610_i2c_xfer,
+ .functionality = au6610_i2c_func,
+};
+
+/* Callbacks for DVB USB */
+static int au6610_identify_state(struct usb_device *udev,
+ struct dvb_usb_device_properties *props,
+ struct dvb_usb_device_description **desc,
+ int *cold)
+{
+ *cold = 0;
+ return 0;
+}
+
+static struct zl10353_config au6610_zl10353_config = {
+ .demod_address = 0x1e,
+ .no_tuner = 1,
+ .parallel_ts = 1,
+};
+
+
+static int au6610_zl10353_frontend_attach(struct dvb_usb_adapter *adap)
+{
+ if ((adap->fe = dvb_attach(zl10353_attach, &au6610_zl10353_config,
+ &adap->dev->i2c_adap)) != NULL) {
+ return 0;
+ }
+
+ return -EIO;
+}
+
+/* DVB USB Driver stuff */
+static struct dvb_usb_device_properties au6610_properties;
+
+static int au6610_probe(struct usb_interface *intf, const struct usb_device_id *id)
+{
+ struct dvb_usb_device *d;
+ struct usb_host_interface *alt;
+ int ret;
+
+ if (intf->num_altsetting < AU6610_ALTSETTING_COUNT)
+ return -ENODEV;
+
+ if ((ret = dvb_usb_device_init(intf, &au6610_properties, THIS_MODULE, &d)) == 0) {
+ alt = usb_altnum_to_altsetting(intf, AU6610_ALTSETTING);
+
+ if (alt == NULL) {
+ deb_rc("no alt found!\n");
+ return -ENODEV;
+ }
+ ret = usb_set_interface(d->udev, alt->desc.bInterfaceNumber,
+ alt->desc.bAlternateSetting);
+ }
+
+ return ret;
+}
+
+
+static struct usb_device_id au6610_table [] = {
+ { USB_DEVICE(USB_VID_ALCOR_MICRO, USB_PID_SIGMATEK_DVB_110) },
+ { } /* Terminating entry */
+};
+MODULE_DEVICE_TABLE (usb, au6610_table);
+
+static struct dvb_usb_device_properties au6610_properties = {
+ .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+ .usb_ctrl = DEVICE_SPECIFIC,
+ .size_of_priv = 0,
+ .identify_state = au6610_identify_state,
+ .num_adapters = 1,
+ .adapter = {
+ {
+ .frontend_attach = au6610_zl10353_frontend_attach,
+ .tuner_attach = qt1010_tuner_attach,
+
+ .stream = {
+ .type = USB_ISOC,
+ .count = 5,
+ .endpoint = 0x82,
+ .u = {
+ .isoc = {
+ .framesperurb = 40,
+ .framesize = 942, /* maximum packet size */
+ .interval = 1.25, /* 125 us */
+ }
+ }
+ },
+ }
+ },
+ .i2c_algo = &au6610_i2c_algo,
+ .num_device_descs = 1,
+ .devices = {
+ {
+ "Sigmatek DVB-110 DVB-T USB2.0",
+ { &au6610_table[0], NULL },
+ { NULL },
+ },
+ }
+};
+
+static struct usb_driver au6610_driver = {
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
+ .owner = THIS_MODULE,
+#endif
+ .name = "dvb_usb_au6610",
+ .probe = au6610_probe,
+ .disconnect = dvb_usb_device_exit,
+ .id_table = au6610_table,
+};
+
+/* module stuff */
+static int __init au6610_module_init(void)
+{
+ int ret;
+
+ if ((ret = usb_register(&au6610_driver))) {
+ err("usb_register failed. Error number %d", ret);
+ return ret;
+ }
+
+ return 0;
+}
+
+static void __exit au6610_module_exit(void)
+{
+ /* deregister this driver from the USB subsystem */
+ usb_deregister(&au6610_driver);
+}
+
+module_init (au6610_module_init);
+module_exit (au6610_module_exit);
+
+MODULE_AUTHOR("Antti Palosaari <crope@xxxxxx>");
+MODULE_DESCRIPTION("Driver Sigmatek DVB-110 DVB-T USB2.0 / AU6610");
+MODULE_VERSION("0.1");
+MODULE_LICENSE("GPL");
diff -urNp --exclude=.version --exclude=Module.symvers a/megasky/linux/drivers/media/dvb/dvb-usb/au6610.h b/megasky/linux/drivers/media/dvb/dvb-usb/au6610.h
--- a/megasky/linux/drivers/media/dvb/dvb-usb/au6610.h 1970-01-01 02:00:00.000000000 +0200
+++ b/megasky/linux/drivers/media/dvb/dvb-usb/au6610.h 2006-11-03 03:37:14.000000000 +0200
@@ -0,0 +1,19 @@
+#ifndef _DVB_USB_AU6610_H_
+#define _DVB_USB_AU6610_H_
+
+#define DVB_USB_LOG_PREFIX "au6610"
+#include "dvb-usb.h"
+
+#define deb_rc(args...) dprintk(dvb_usb_au6610_debug,0x01,args)
+
+#define AU6610_REQ_I2C_WRITE 0x14
+#define AU6610_REQ_I2C_READ 0x13
+#define AU6610_REQ_USB_WRITE 0x16
+#define AU6610_REQ_USB_READ 0x15
+
+#define AU6610_USB_TIMEOUT 1000
+
+#define AU6610_ALTSETTING_COUNT 6
+#define AU6610_ALTSETTING 5
+
+#endif
diff -urNp --exclude=.version --exclude=Module.symvers a/megasky/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/megasky/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
--- a/megasky/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h 2006-11-02 20:49:40.000000000 +0200
+++ b/megasky/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h 2006-11-03 00:04:36.000000000 +0200
@@ -11,6 +11,7 @@
/* Vendor IDs */
#define USB_VID_ADSTECH 0x06e1
+#define USB_VID_ALCOR_MICRO 0x058f
#define USB_VID_ANCHOR 0x0547
#define USB_VID_AVERMEDIA 0x07ca
#define USB_VID_COMPRO 0x185b
@@ -128,5 +129,6 @@
#define USB_PID_WINFAST_DTV_DONGLE_WARM 0x6026
#define USB_PID_GENPIX_8PSK_COLD 0x0200
#define USB_PID_GENPIX_8PSK_WARM 0x0201
+#define USB_PID_SIGMATEK_DVB_110 0x6610
#endif
diff -urNp --exclude=.version --exclude=Module.symvers a/megasky/linux/drivers/media/dvb/dvb-usb/Kconfig b/megasky/linux/drivers/media/dvb/dvb-usb/Kconfig
--- a/megasky/linux/drivers/media/dvb/dvb-usb/Kconfig 2006-11-02 20:49:40.000000000 +0200
+++ b/megasky/linux/drivers/media/dvb/dvb-usb/Kconfig 2006-11-02 21:07:48.000000000 +0200
@@ -125,6 +125,13 @@ config DVB_USB_GL861
Say Y here to support the MSI Megasky 580 (55801) DVB-T USB2.0
receiver with USB ID 0db0:5581.
+config DVB_USB_AU6610
+ tristate "Alcor Micro AU6610 USB2.0 support"
+ depends on DVB_USB
+ select DVB_ZL10353 if !DVB_FE_CUSTOMISE
+ help
+ Say Y here to support the Sigmatek DVB-110 DVB-T USB2.0 receiver.
+
config DVB_USB_DIGITV
tristate "Nebula Electronics uDigiTV DVB-T USB2.0 support"
depends on DVB_USB
diff -urNp --exclude=.version --exclude=Module.symvers a/megasky/linux/drivers/media/dvb/dvb-usb/Makefile b/megasky/linux/drivers/media/dvb/dvb-usb/Makefile
--- a/megasky/linux/drivers/media/dvb/dvb-usb/Makefile 2006-11-02 20:49:40.000000000 +0200
+++ b/megasky/linux/drivers/media/dvb/dvb-usb/Makefile 2006-11-02 21:08:52.000000000 +0200
@@ -36,6 +36,9 @@ obj-$(CONFIG_DVB_USB_M920X) += dvb-usb-m
dvb-usb-gl861-objs = gl861.o
obj-$(CONFIG_DVB_USB_GL861) += dvb-usb-gl861.o
+dvb-usb-au6610-objs = au6610.o
+obj-$(CONFIG_DVB_USB_AU6610) += dvb-usb-au6610.o
+
dvb-usb-digitv-objs = digitv.o
obj-$(CONFIG_DVB_USB_DIGITV) += dvb-usb-digitv.o
diff -urNp --exclude=.version --exclude=Module.symvers a/megasky/v4l/versions.txt b/megasky/v4l/versions.txt
--- a/megasky/v4l/versions.txt 2006-11-02 20:49:41.000000000 +0200
+++ b/megasky/v4l/versions.txt 2006-11-02 21:03:04.000000000 +0200
@@ -111,6 +111,7 @@ DVB_USB_UMT_010
DVB_USB_CXUSB
DVB_USB_M920X
DVB_USB_GL861
+DVB_USB_AU6610
DVB_USB_DIGITV
DVB_USB_VP7045
DVB_USB_VP702X
_______________________________________________
linux-dvb mailing list
linux-dvb@xxxxxxxxxxx
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linux-dvb
