| Message ID | 20100423104804.784fb730@glory.loctelecom.ru (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers |
Return-path: <linux-media-owner@vger.kernel.org> Envelope-to: mchehab@infradead.org Delivery-date: Fri, 23 Apr 2010 00:45:43 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra with IMAP (fetchmail-6.3.6) for <mchehab@localhost> (single-drop); Thu, 22 Apr 2010 21:46:08 -0300 (BRT) Received: from vger.kernel.org ([209.132.180.67]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1O571a-0000gL-SZ; Fri, 23 Apr 2010 00:45:43 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754440Ab0DWApl (ORCPT <rfc822; kmpark@infradead.org> + 1 other); Thu, 22 Apr 2010 20:45:41 -0400 Received: from mail-bw0-f225.google.com ([209.85.218.225]:57982 "EHLO mail-bw0-f225.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754493Ab0DWApk (ORCPT <rfc822;linux-media@vger.kernel.org>); Thu, 22 Apr 2010 20:45:40 -0400 Received: by bwz25 with SMTP id 25so10399315bwz.28 for <linux-media@vger.kernel.org>; Thu, 22 Apr 2010 17:45:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:subject :message-id:x-mailer:mime-version:content-type; bh=cv9a7h0WM+ibEPlFpP9ueoeby+szuUt1mpNeIj/c3VM=; b=Fqa3qQT2nCN6gnqkPefJIlnTdKaSrEpZ5fwpysKXroKy4rkkPNxntxCA2EFI6Rr1fI K22SdbKfX8vftdHphk7dkxaec1e9CSaOq9RyPKE/dQQZIU7j5PHXCqrvngdSVXEUWWA5 XLRqBNIpxN3FkHJJ150nDthEjRxU/oKg41yg8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:subject:message-id:x-mailer:mime-version:content-type; b=fo3UU/ucPhp5HfoQg30e7f0QYobtoOFW1XxNMVHCepibQe3sPo20HOUl3unwtbAEAS FGyAvXUFmZjqsCFHFovzvU1T3H6/mJMOs+MkV9nu3LabgunSM1vvkGwhjQq5ZOotBUqb eSn9ipxbgz0AiT90f+glaoYguw7f69tXLOSZ0= Received: by 10.87.45.15 with SMTP id x15mr6123465fgj.42.1271983538362; Thu, 22 Apr 2010 17:45:38 -0700 (PDT) Received: from glory.loctelecom.ru (ns2.openhardware.ru [84.19.183.172]) by mx.google.com with ESMTPS id 21sm971444fks.53.2010.04.22.17.45.36 (version=SSLv3 cipher=RC4-MD5); Thu, 22 Apr 2010 17:45:37 -0700 (PDT) Date: Fri, 23 Apr 2010 10:48:04 +1000 From: Dmitri Belimov <d.belimov@gmail.com> To: linux-media@vger.kernel.org, Mauro Carvalho Chehab <mchehab@infradead.org> Subject: [PATCH] tm6000 fix i2c Message-ID: <20100423104804.784fb730@glory.loctelecom.ru> X-Mailer: Claws Mail 3.5.0 (GTK+ 2.16.1; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/yA60E_8cjKu.PfTOb9GlW=W" Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org |
Commit Message
Dmitri Belimov
April 23, 2010, 12:48 a.m. UTC
Hi
Rework I2C for read word from connected devices, now it works well.
Add new functions for read/write blocks.
Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com>
With my best regards, Dmitry.
Comments
I am still able to watch tv after applying the patch but the return code is bad and is causing unnecessary reloading of the same firmwares. [ 2482.599040] usb 1-1: firmware: requesting tm6000-xc3028.fw [ 2482.607229] xc2028 2-0061: Loading 77 firmware images from tm6000-xc3028.fw, type: xc2028 firmware, ver 2.4 [ 2482.788089] xc2028 2-0061: Loading firmware for type=BASE F8MHZ (3), id 0000000000000000. [ 2503.620069] (0), id 00000000000000ff: [ 2503.620078] xc2028 2-0061: Loading firmware for type=(0), id 0000000100000007. [ 2504.380061] xc2028 2-0061: Loading SCODE for type=MONO SCODE HAS_IF_5320 (60008000), id 0000000f00000007. [ 2504.520063] xc2028 2-0061: i2c input error: rc = -32 (should be 2) [ 2504.536064] xc2028 2-0061: Unable to read tuner registers. [ 2504.776079] xc2028 2-0061: Loading firmware for type=BASE F8MHZ (3), id 0000000000000000. [ 2525.556048] (0), id 00000000000000ff: [ 2525.556057] xc2028 2-0061: Loading firmware for type=(0), id 0000000100000007. [ 2526.312058] xc2028 2-0061: Loading SCODE for type=MONO SCODE HAS_IF_5320 (60008000), id 0000000f00000007. [ 2526.452061] xc2028 2-0061: i2c input error: rc = -32 (should be 2) [ 2526.468050] xc2028 2-0061: Unable to read tuner registers. [ 2527.648076] xc2028 2-0061: Loading firmware for type=BASE F8MHZ (3), id 0000000000000000. [ 2548.460067] (0), id 00000000000000ff: [ 2548.460076] xc2028 2-0061: Loading firmware for type=(0), id 0000000100000007. [ 2549.216070] xc2028 2-0061: Loading SCODE for type=MONO SCODE HAS_IF_5320 (60008000), id 0000000f00000007. [ 2549.356064] xc2028 2-0061: i2c input error: rc = -32 (should be 2) [ 2549.372065] xc2028 2-0061: Unable to read tuner registers. [ 2549.612052] xc2028 2-0061: Loading firmware for type=BASE F8MHZ (3), id 0000000000000000. [ 2570.609041] (0), id 00000000000000ff: [ 2570.609049] xc2028 2-0061: Loading firmware for type=(0), id 0000000100000007. [ 2571.397034] xc2028 2-0061: Loading SCODE for type=MONO SCODE HAS_IF_5320 (60008000), id 0000000f00000007. [ 2571.537025] xc2028 2-0061: i2c input error: rc = -32 (should be 2) [ 2571.553024] xc2028 2-0061: Unable to read tuner registers. [ 2572.553103] Trident TVMaster TM5600/TM6000/TM6010 USB2 board (Load status: 0) [ 2572.561090] tm6000: open called (dev=video0) [ 2573.081022] Original value=96 [ 2573.093037] tm6000: VIDIOC_QUERYCAP [ 2573.149565] tm6000: open called (dev=video0) On Fri, Apr 23, 2010 at 8:48 AM, Dmitri Belimov <d.belimov@gmail.com> wrote: > Hi > > Rework I2C for read word from connected devices, now it works well. > Add new functions for read/write blocks. > > diff -r 7c0b887911cf linux/drivers/staging/tm6000/tm6000-i2c.c > --- a/linux/drivers/staging/tm6000/tm6000-i2c.c Mon Apr 05 22:56:43 2010 -0400 > +++ b/linux/drivers/staging/tm6000/tm6000-i2c.c Fri Apr 23 04:23:03 2010 +1000 > @@ -24,6 +24,7 @@ > #include <linux/kernel.h> > #include <linux/usb.h> > #include <linux/i2c.h> > +#include <linux/delay.h> > > #include "compat.h" > #include "tm6000.h" > @@ -45,11 +46,39 @@ > printk(KERN_DEBUG "%s at %s: " fmt, \ > dev->name, __FUNCTION__ , ##args); } while (0) > > +static void tm6000_i2c_reset(struct tm6000_core *dev) > +{ > + tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, TM6000_GPIO_CLK, 0); > + msleep(15); > + tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, TM6000_GPIO_CLK, 1); > + msleep(15); > +} > + > static int tm6000_i2c_send_regs(struct tm6000_core *dev, unsigned char addr, > __u8 reg, char *buf, int len) > { > - return tm6000_read_write_usb(dev, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, > - REQ_16_SET_GET_I2C_WR1_RDN, addr | reg << 8, 0, buf, len); > + int rc; > + unsigned int tsleep; > + > + if (!buf || len < 1 || len > 64) > + return -1; > + > + /* capture mutex */ > + rc = tm6000_read_write_usb(dev, USB_DIR_OUT | USB_TYPE_VENDOR | > + USB_RECIP_DEVICE, REQ_16_SET_GET_I2C_WR1_RDN, > + addr | reg << 8, 0, buf, len); > + > + if (rc < 0) { > + /* release mutex */ > + return rc; > + } > + > + /* Calculate delay time, 14000us for 64 bytes */ > + tsleep = ((len * 200) + 200 + 1000) / 1000; > + msleep(tsleep); > + > + /* release mutex */ > + return rc; > } > > /* Generic read - doesn't work fine with 16bit registers */ > @@ -59,22 +88,30 @@ > int rc; > u8 b[2]; > > - if ((dev->caps.has_zl10353) && (dev->demod_addr << 1 == addr) && (reg % 2 == 0)) { > + if (!buf || len < 1 || len > 64) > + return -1; > + > + /* capture mutex */ > + if ((dev->caps.has_zl10353) && (dev->demod_addr << 1 == addr) > + && (reg % 2 == 0)) { > /* > * Workaround an I2C bug when reading from zl10353 > */ > reg -= 1; > len += 1; > > - rc = tm6000_read_write_usb(dev, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, > - REQ_16_SET_GET_I2C_WR1_RDN, addr | reg << 8, 0, b, len); > + rc = tm6000_read_write_usb(dev, USB_DIR_IN | USB_TYPE_VENDOR | > + USB_RECIP_DEVICE, REQ_16_SET_GET_I2C_WR1_RDN, > + addr | reg << 8, 0, b, len); > > *buf = b[1]; > } else { > - rc = tm6000_read_write_usb(dev, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, > - REQ_16_SET_GET_I2C_WR1_RDN, addr | reg << 8, 0, buf, len); > + rc = tm6000_read_write_usb(dev, USB_DIR_IN | USB_TYPE_VENDOR | > + USB_RECIP_DEVICE, REQ_16_SET_GET_I2C_WR1_RDN, > + addr | reg << 8, 0, buf, len); > } > > + /* release mutex */ > return rc; > } > > @@ -85,8 +122,106 @@ > static int tm6000_i2c_recv_regs16(struct tm6000_core *dev, unsigned char addr, > __u16 reg, char *buf, int len) > { > - return tm6000_read_write_usb(dev, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, > - REQ_14_SET_GET_I2C_WR2_RDN, addr, reg, buf, len); > + int rc; > + unsigned char ureg; > + > + if (!buf || len != 2) > + return -1; > + > + /* capture mutex */ > + ureg = reg & 0xFF; > + rc = tm6000_read_write_usb(dev, USB_DIR_OUT | USB_TYPE_VENDOR | > + USB_RECIP_DEVICE, REQ_16_SET_GET_I2C_WR1_RDN, > + addr | (reg & 0xFF00), 0, &ureg, 1); > + > + if (rc < 0) { > + /* release mutex */ > + return rc; > + } > + > + msleep(1400 / 1000); > + rc = tm6000_read_write_usb(dev, USB_DIR_IN | USB_TYPE_VENDOR | > + USB_RECIP_DEVICE, REQ_35_AFTEK_TUNER_READ, > + reg, 0, buf, len); > + > + if (rc < 0) { > + /* release mutex */ > + return rc; > + } > + > + /* release mutex */ > + return rc; > +} > + > +static int tm6000_i2c_read_sequence(struct tm6000_core *dev, unsigned char addr, > + __u16 reg, char *buf, int len) > +{ > + int rc; > + > + if (!buf || len < 1 || len > 64) > + return -1; > + > + /* capture mutex */ > + rc = tm6000_read_write_usb(dev, USB_DIR_IN | USB_TYPE_VENDOR | > + USB_RECIP_DEVICE, REQ_35_AFTEK_TUNER_READ, > + reg, 0, buf, len); > + /* release mutex */ > + return rc; > +} > + > +static int tm6000_i2c_write_sequence(struct tm6000_core *dev, > + unsigned char addr, __u16 reg, char *buf, > + int len) > +{ > + int rc; > + unsigned int tsleep; > + > + if (!buf || len < 1 || len > 64) > + return -1; > + > + /* capture mutex */ > + rc = tm6000_read_write_usb(dev, USB_DIR_OUT | USB_TYPE_VENDOR | > + USB_RECIP_DEVICE, REQ_16_SET_GET_I2C_WR1_RDN, > + addr | reg << 8, 0, buf+1, len-1); > + > + if (rc < 0) { > + /* release mutex */ > + return rc; > + } > + > + /* Calculate delay time, 13800us for 64 bytes */ > + tsleep = ((len * 200) + 1000) / 1000; > + msleep(tsleep); > + > + /* release mutex */ > + return rc; > +} > + > +static int tm6000_i2c_write_uni(struct tm6000_core *dev, unsigned char addr, > + __u16 reg, char *buf, int len) > +{ > + int rc; > + unsigned int tsleep; > + > + if (!buf || len < 1 || len > 64) > + return -1; > + > + /* capture mutex */ > + rc = tm6000_read_write_usb(dev, USB_DIR_OUT | USB_TYPE_VENDOR | > + USB_RECIP_DEVICE, REQ_30_I2C_WRITE, > + addr | reg << 8, 0, buf+1, len-1); > + > + if (rc < 0) { > + /* release mutex */ > + return rc; > + } > + > + /* Calculate delay time, 14800us for 64 bytes */ > + tsleep = ((len * 200) + 1000 + 1000) / 1000; > + msleep(tsleep); > + > + /* release mutex */ > + return rc; > } > > static int tm6000_i2c_xfer(struct i2c_adapter *i2c_adap, > > Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> > > > With my best regards, Dmitry. -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Am 23.04.2010 02:48, schrieb Dmitri Belimov: > Hi > > Rework I2C for read word from connected devices, now it works well. > Add new functions for read/write blocks. > > diff -r 7c0b887911cf linux/drivers/staging/tm6000/tm6000-i2c.c > --- a/linux/drivers/staging/tm6000/tm6000-i2c.c Mon Apr 05 22:56:43 2010 -0400 > +++ b/linux/drivers/staging/tm6000/tm6000-i2c.c Fri Apr 23 04:23:03 2010 +1000 > @@ -24,6 +24,7 @@ > #include <linux/kernel.h> > #include <linux/usb.h> > #include <linux/i2c.h> > +#include <linux/delay.h> > > #include "compat.h" > #include "tm6000.h" > @@ -45,11 +46,39 @@ > printk(KERN_DEBUG "%s at %s: " fmt, \ > dev->name, __FUNCTION__ , ##args); } while (0) > > +static void tm6000_i2c_reset(struct tm6000_core *dev) > +{ > + tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, TM6000_GPIO_CLK, 0); > + msleep(15); > + tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, TM6000_GPIO_CLK, 1); > + msleep(15); > +} > + > static int tm6000_i2c_send_regs(struct tm6000_core *dev, unsigned char addr, > __u8 reg, char *buf, int len) > { > - return tm6000_read_write_usb(dev, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, > - REQ_16_SET_GET_I2C_WR1_RDN, addr | reg << 8, 0, buf, len); > + int rc; > + unsigned int tsleep; > + > + if (!buf || len < 1 || len > 64) > + return -1; > + > + /* capture mutex */ > + rc = tm6000_read_write_usb(dev, USB_DIR_OUT | USB_TYPE_VENDOR | > + USB_RECIP_DEVICE, REQ_16_SET_GET_I2C_WR1_RDN, > + addr | reg << 8, 0, buf, len); > + > + if (rc < 0) { > + /* release mutex */ > + return rc; > + } > + > + /* Calculate delay time, 14000us for 64 bytes */ > + tsleep = ((len * 200) + 200 + 1000) / 1000; > + msleep(tsleep); > + > + /* release mutex */ > + return rc; > } > > /* Generic read - doesn't work fine with 16bit registers */ > @@ -59,22 +88,30 @@ > int rc; > u8 b[2]; > > - if ((dev->caps.has_zl10353) && (dev->demod_addr << 1 == addr) && (reg % 2 == 0)) { > + if (!buf || len < 1 || len > 64) > + return -1; > + > + /* capture mutex */ > + if ((dev->caps.has_zl10353) && (dev->demod_addr << 1 == addr) > + && (reg % 2 == 0)) { > /* > * Workaround an I2C bug when reading from zl10353 > */ > reg -= 1; > len += 1; > > - rc = tm6000_read_write_usb(dev, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, > - REQ_16_SET_GET_I2C_WR1_RDN, addr | reg << 8, 0, b, len); > + rc = tm6000_read_write_usb(dev, USB_DIR_IN | USB_TYPE_VENDOR | > + USB_RECIP_DEVICE, REQ_16_SET_GET_I2C_WR1_RDN, > + addr | reg << 8, 0, b, len); > > *buf = b[1]; > } else { > - rc = tm6000_read_write_usb(dev, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, > - REQ_16_SET_GET_I2C_WR1_RDN, addr | reg << 8, 0, buf, len); > + rc = tm6000_read_write_usb(dev, USB_DIR_IN | USB_TYPE_VENDOR | > + USB_RECIP_DEVICE, REQ_16_SET_GET_I2C_WR1_RDN, > + addr | reg << 8, 0, buf, len); > } > > + /* release mutex */ > return rc; > } > > @@ -85,8 +122,106 @@ > static int tm6000_i2c_recv_regs16(struct tm6000_core *dev, unsigned char addr, > __u16 reg, char *buf, int len) > { > - return tm6000_read_write_usb(dev, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, > - REQ_14_SET_GET_I2C_WR2_RDN, addr, reg, buf, len); > + int rc; > + unsigned char ureg; > + > + if (!buf || len != 2) > + return -1; > + > + /* capture mutex */ > + ureg = reg & 0xFF; > + rc = tm6000_read_write_usb(dev, USB_DIR_OUT | USB_TYPE_VENDOR | > + USB_RECIP_DEVICE, REQ_16_SET_GET_I2C_WR1_RDN, > + addr | (reg & 0xFF00), 0, &ureg, 1); > + > + if (rc < 0) { > + /* release mutex */ > + return rc; > + } > + > + msleep(1400 / 1000); > + rc = tm6000_read_write_usb(dev, USB_DIR_IN | USB_TYPE_VENDOR | > + USB_RECIP_DEVICE, REQ_35_AFTEK_TUNER_READ, > + reg, 0, buf, len); > + > not all can this request (chip revision 0xf3 and 0xf4 can it) > + if (rc < 0) { > + /* release mutex */ > + return rc; > + } > + > + /* release mutex */ > + return rc; > +} > + > +static int tm6000_i2c_read_sequence(struct tm6000_core *dev, unsigned char addr, > + __u16 reg, char *buf, int len) > +{ > + int rc; > + > + if (!buf || len < 1 || len > 64) > + return -1; > + > + /* capture mutex */ > + rc = tm6000_read_write_usb(dev, USB_DIR_IN | USB_TYPE_VENDOR | > + USB_RECIP_DEVICE, REQ_35_AFTEK_TUNER_READ, > + reg, 0, buf, len); > ditto > + /* release mutex */ > + return rc; > +} > + > +static int tm6000_i2c_write_sequence(struct tm6000_core *dev, > + unsigned char addr, __u16 reg, char *buf, > + int len) > +{ > + int rc; > + unsigned int tsleep; > + > + if (!buf || len < 1 || len > 64) > + return -1; > + > + /* capture mutex */ > + rc = tm6000_read_write_usb(dev, USB_DIR_OUT | USB_TYPE_VENDOR | > + USB_RECIP_DEVICE, REQ_16_SET_GET_I2C_WR1_RDN, > + addr | reg << 8, 0, buf+1, len-1); > + > + if (rc < 0) { > + /* release mutex */ > + return rc; > + } > + > + /* Calculate delay time, 13800us for 64 bytes */ > + tsleep = ((len * 200) + 1000) / 1000; > + msleep(tsleep); > + > + /* release mutex */ > + return rc; > +} > + > +static int tm6000_i2c_write_uni(struct tm6000_core *dev, unsigned char addr, > + __u16 reg, char *buf, int len) > +{ > + int rc; > + unsigned int tsleep; > + > + if (!buf || len < 1 || len > 64) > + return -1; > + > + /* capture mutex */ > + rc = tm6000_read_write_usb(dev, USB_DIR_OUT | USB_TYPE_VENDOR | > + USB_RECIP_DEVICE, REQ_30_I2C_WRITE, > + addr | reg << 8, 0, buf+1, len-1); > + > + if (rc < 0) { > + /* release mutex */ > + return rc; > + } > + > + /* Calculate delay time, 14800us for 64 bytes */ > + tsleep = ((len * 200) + 1000 + 1000) / 1000; > + msleep(tsleep); > + > + /* release mutex */ > + return rc; > } > > static int tm6000_i2c_xfer(struct i2c_adapter *i2c_adap, > > Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> > > > With my best regards, Dmitry.
Hi It's my error. This code good only for tm6010. Now I rework my patch. With my best regards, Dmitry. > I am still able to watch tv after applying the patch but the return > code is bad and is causing unnecessary reloading of the same > firmwares. > > [ 2482.599040] usb 1-1: firmware: requesting tm6000-xc3028.fw > [ 2482.607229] xc2028 2-0061: Loading 77 firmware images from > tm6000-xc3028.fw, type: xc2028 firmware, ver 2.4 > [ 2482.788089] xc2028 2-0061: Loading firmware for type=BASE F8MHZ > (3), id 0000000000000000. > [ 2503.620069] (0), id 00000000000000ff: > [ 2503.620078] xc2028 2-0061: Loading firmware for type=(0), id > 0000000100000007. > [ 2504.380061] xc2028 2-0061: Loading SCODE for type=MONO SCODE > HAS_IF_5320 (60008000), id 0000000f00000007. > [ 2504.520063] xc2028 2-0061: i2c input error: rc = -32 (should be 2) > [ 2504.536064] xc2028 2-0061: Unable to read tuner registers. > [ 2504.776079] xc2028 2-0061: Loading firmware for type=BASE F8MHZ > (3), id 0000000000000000. > [ 2525.556048] (0), id 00000000000000ff: > [ 2525.556057] xc2028 2-0061: Loading firmware for type=(0), id > 0000000100000007. > [ 2526.312058] xc2028 2-0061: Loading SCODE for type=MONO SCODE > HAS_IF_5320 (60008000), id 0000000f00000007. > [ 2526.452061] xc2028 2-0061: i2c input error: rc = -32 (should be 2) > [ 2526.468050] xc2028 2-0061: Unable to read tuner registers. > [ 2527.648076] xc2028 2-0061: Loading firmware for type=BASE F8MHZ > (3), id 0000000000000000. > [ 2548.460067] (0), id 00000000000000ff: > [ 2548.460076] xc2028 2-0061: Loading firmware for type=(0), id > 0000000100000007. > [ 2549.216070] xc2028 2-0061: Loading SCODE for type=MONO SCODE > HAS_IF_5320 (60008000), id 0000000f00000007. > [ 2549.356064] xc2028 2-0061: i2c input error: rc = -32 (should be 2) > [ 2549.372065] xc2028 2-0061: Unable to read tuner registers. > [ 2549.612052] xc2028 2-0061: Loading firmware for type=BASE F8MHZ > (3), id 0000000000000000. > [ 2570.609041] (0), id 00000000000000ff: > [ 2570.609049] xc2028 2-0061: Loading firmware for type=(0), id > 0000000100000007. > [ 2571.397034] xc2028 2-0061: Loading SCODE for type=MONO SCODE > HAS_IF_5320 (60008000), id 0000000f00000007. > [ 2571.537025] xc2028 2-0061: i2c input error: rc = -32 (should be 2) > [ 2571.553024] xc2028 2-0061: Unable to read tuner registers. > [ 2572.553103] Trident TVMaster TM5600/TM6000/TM6010 USB2 board (Load > status: 0) [ 2572.561090] tm6000: open called (dev=video0) > [ 2573.081022] Original value=96 > [ 2573.093037] tm6000: VIDIOC_QUERYCAP > [ 2573.149565] tm6000: open called (dev=video0) > > > > On Fri, Apr 23, 2010 at 8:48 AM, Dmitri Belimov <d.belimov@gmail.com> > wrote: > > Hi > > > > Rework I2C for read word from connected devices, now it works well. > > Add new functions for read/write blocks. > > > > diff -r 7c0b887911cf linux/drivers/staging/tm6000/tm6000-i2c.c > > --- a/linux/drivers/staging/tm6000/tm6000-i2c.c Mon Apr 05 22:56:43 > > 2010 -0400 +++ b/linux/drivers/staging/tm6000/tm6000-i2c.c Fri Apr > > 23 04:23:03 2010 +1000 @@ -24,6 +24,7 @@ > > #include <linux/kernel.h> > > #include <linux/usb.h> > > #include <linux/i2c.h> > > +#include <linux/delay.h> > > > > #include "compat.h" > > #include "tm6000.h" > > @@ -45,11 +46,39 @@ > > printk(KERN_DEBUG "%s at %s: " fmt, \ > > dev->name, __FUNCTION__ , ##args); } while > > (0) > > > > +static void tm6000_i2c_reset(struct tm6000_core *dev) > > +{ > > + tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, > > TM6000_GPIO_CLK, 0); > > + msleep(15); > > + tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, > > TM6000_GPIO_CLK, 1); > > + msleep(15); > > +} > > + > > static int tm6000_i2c_send_regs(struct tm6000_core *dev, unsigned > > char addr, __u8 reg, char *buf, int len) > > { > > - return tm6000_read_write_usb(dev, USB_DIR_OUT | > > USB_TYPE_VENDOR | USB_RECIP_DEVICE, > > - REQ_16_SET_GET_I2C_WR1_RDN, addr | reg << 8, 0, > > buf, len); > > + int rc; > > + unsigned int tsleep; > > + > > + if (!buf || len < 1 || len > 64) > > + return -1; > > + > > + /* capture mutex */ > > + rc = tm6000_read_write_usb(dev, USB_DIR_OUT | > > USB_TYPE_VENDOR | > > + USB_RECIP_DEVICE, REQ_16_SET_GET_I2C_WR1_RDN, > > + addr | reg << 8, 0, buf, len); > > + > > + if (rc < 0) { > > + /* release mutex */ > > + return rc; > > + } > > + > > + /* Calculate delay time, 14000us for 64 bytes */ > > + tsleep = ((len * 200) + 200 + 1000) / 1000; > > + msleep(tsleep); > > + > > + /* release mutex */ > > + return rc; > > } > > > > /* Generic read - doesn't work fine with 16bit registers */ > > @@ -59,22 +88,30 @@ > > int rc; > > u8 b[2]; > > > > - if ((dev->caps.has_zl10353) && (dev->demod_addr << 1 == > > addr) && (reg % 2 == 0)) { > > + if (!buf || len < 1 || len > 64) > > + return -1; > > + > > + /* capture mutex */ > > + if ((dev->caps.has_zl10353) && (dev->demod_addr << 1 == > > addr) > > + && (reg % 2 == 0)) { > > /* > > * Workaround an I2C bug when reading from zl10353 > > */ > > reg -= 1; > > len += 1; > > > > - rc = tm6000_read_write_usb(dev, USB_DIR_IN | > > USB_TYPE_VENDOR | USB_RECIP_DEVICE, > > - REQ_16_SET_GET_I2C_WR1_RDN, addr | reg << > > 8, 0, b, len); > > + rc = tm6000_read_write_usb(dev, USB_DIR_IN | > > USB_TYPE_VENDOR | > > + USB_RECIP_DEVICE, REQ_16_SET_GET_I2C_WR1_RDN, > > + addr | reg << 8, 0, b, len); > > > > *buf = b[1]; > > } else { > > - rc = tm6000_read_write_usb(dev, USB_DIR_IN | > > USB_TYPE_VENDOR | USB_RECIP_DEVICE, > > - REQ_16_SET_GET_I2C_WR1_RDN, addr | reg << > > 8, 0, buf, len); > > + rc = tm6000_read_write_usb(dev, USB_DIR_IN | > > USB_TYPE_VENDOR | > > + USB_RECIP_DEVICE, REQ_16_SET_GET_I2C_WR1_RDN, > > + addr | reg << 8, 0, buf, len); > > } > > > > + /* release mutex */ > > return rc; > > } > > > > @@ -85,8 +122,106 @@ > > static int tm6000_i2c_recv_regs16(struct tm6000_core *dev, > > unsigned char addr, __u16 reg, char *buf, int len) > > { > > - return tm6000_read_write_usb(dev, USB_DIR_IN | > > USB_TYPE_VENDOR | USB_RECIP_DEVICE, > > - REQ_14_SET_GET_I2C_WR2_RDN, addr, reg, buf, len); > > + int rc; > > + unsigned char ureg; > > + > > + if (!buf || len != 2) > > + return -1; > > + > > + /* capture mutex */ > > + ureg = reg & 0xFF; > > + rc = tm6000_read_write_usb(dev, USB_DIR_OUT | > > USB_TYPE_VENDOR | > > + USB_RECIP_DEVICE, REQ_16_SET_GET_I2C_WR1_RDN, > > + addr | (reg & 0xFF00), 0, &ureg, 1); > > + > > + if (rc < 0) { > > + /* release mutex */ > > + return rc; > > + } > > + > > + msleep(1400 / 1000); > > + rc = tm6000_read_write_usb(dev, USB_DIR_IN | > > USB_TYPE_VENDOR | > > + USB_RECIP_DEVICE, REQ_35_AFTEK_TUNER_READ, > > + reg, 0, buf, len); > > + > > + if (rc < 0) { > > + /* release mutex */ > > + return rc; > > + } > > + > > + /* release mutex */ > > + return rc; > > +} > > + > > +static int tm6000_i2c_read_sequence(struct tm6000_core *dev, > > unsigned char addr, > > + __u16 reg, char *buf, int len) > > +{ > > + int rc; > > + > > + if (!buf || len < 1 || len > 64) > > + return -1; > > + > > + /* capture mutex */ > > + rc = tm6000_read_write_usb(dev, USB_DIR_IN | > > USB_TYPE_VENDOR | > > + USB_RECIP_DEVICE, REQ_35_AFTEK_TUNER_READ, > > + reg, 0, buf, len); > > + /* release mutex */ > > + return rc; > > +} > > + > > +static int tm6000_i2c_write_sequence(struct tm6000_core *dev, > > + unsigned char addr, __u16 reg, char > > *buf, > > + int len) > > +{ > > + int rc; > > + unsigned int tsleep; > > + > > + if (!buf || len < 1 || len > 64) > > + return -1; > > + > > + /* capture mutex */ > > + rc = tm6000_read_write_usb(dev, USB_DIR_OUT | > > USB_TYPE_VENDOR | > > + USB_RECIP_DEVICE, REQ_16_SET_GET_I2C_WR1_RDN, > > + addr | reg << 8, 0, buf+1, len-1); > > + > > + if (rc < 0) { > > + /* release mutex */ > > + return rc; > > + } > > + > > + /* Calculate delay time, 13800us for 64 bytes */ > > + tsleep = ((len * 200) + 1000) / 1000; > > + msleep(tsleep); > > + > > + /* release mutex */ > > + return rc; > > +} > > + > > +static int tm6000_i2c_write_uni(struct tm6000_core *dev, unsigned > > char addr, > > + __u16 reg, char *buf, int len) > > +{ > > + int rc; > > + unsigned int tsleep; > > + > > + if (!buf || len < 1 || len > 64) > > + return -1; > > + > > + /* capture mutex */ > > + rc = tm6000_read_write_usb(dev, USB_DIR_OUT | > > USB_TYPE_VENDOR | > > + USB_RECIP_DEVICE, REQ_30_I2C_WRITE, > > + addr | reg << 8, 0, buf+1, len-1); > > + > > + if (rc < 0) { > > + /* release mutex */ > > + return rc; > > + } > > + > > + /* Calculate delay time, 14800us for 64 bytes */ > > + tsleep = ((len * 200) + 1000 + 1000) / 1000; > > + msleep(tsleep); > > + > > + /* release mutex */ > > + return rc; > > } > > > > static int tm6000_i2c_xfer(struct i2c_adapter *i2c_adap, > > > > Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov > > <d.belimov@gmail.com> > > > > > > With my best regards, Dmitry. -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi It's my error. This code good only for tm6010. Now I rework my patch. With my best regards, Dmitry. > Am 23.04.2010 02:48, schrieb Dmitri Belimov: > > Hi > > > > Rework I2C for read word from connected devices, now it works well. > > Add new functions for read/write blocks. > > > > diff -r 7c0b887911cf linux/drivers/staging/tm6000/tm6000-i2c.c > > --- a/linux/drivers/staging/tm6000/tm6000-i2c.c Mon Apr 05 > > 22:56:43 2010 -0400 +++ > > b/linux/drivers/staging/tm6000/tm6000-i2c.c Fri Apr 23 > > 04:23:03 2010 +1000 @@ -24,6 +24,7 @@ #include <linux/kernel.h> > > #include <linux/usb.h> > > #include <linux/i2c.h> > > +#include <linux/delay.h> > > > > #include "compat.h" > > #include "tm6000.h" > > @@ -45,11 +46,39 @@ > > printk(KERN_DEBUG "%s at %s: " fmt, \ > > dev->name, __FUNCTION__ , ##args); } while > > (0) > > +static void tm6000_i2c_reset(struct tm6000_core *dev) > > +{ > > + tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, > > TM6000_GPIO_CLK, 0); > > + msleep(15); > > + tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, > > TM6000_GPIO_CLK, 1); > > + msleep(15); > > +} > > + > > static int tm6000_i2c_send_regs(struct tm6000_core *dev, unsigned > > char addr, __u8 reg, char *buf, int len) > > { > > - return tm6000_read_write_usb(dev, USB_DIR_OUT | > > USB_TYPE_VENDOR | USB_RECIP_DEVICE, > > - REQ_16_SET_GET_I2C_WR1_RDN, addr | reg << 8, 0, > > buf, len); > > + int rc; > > + unsigned int tsleep; > > + > > + if (!buf || len < 1 || len > 64) > > + return -1; > > + > > + /* capture mutex */ > > + rc = tm6000_read_write_usb(dev, USB_DIR_OUT | > > USB_TYPE_VENDOR | > > + USB_RECIP_DEVICE, REQ_16_SET_GET_I2C_WR1_RDN, > > + addr | reg << 8, 0, buf, len); > > + > > + if (rc < 0) { > > + /* release mutex */ > > + return rc; > > + } > > + > > + /* Calculate delay time, 14000us for 64 bytes */ > > + tsleep = ((len * 200) + 200 + 1000) / 1000; > > + msleep(tsleep); > > + > > + /* release mutex */ > > + return rc; > > } > > > > /* Generic read - doesn't work fine with 16bit registers */ > > @@ -59,22 +88,30 @@ > > int rc; > > u8 b[2]; > > > > - if ((dev->caps.has_zl10353) && (dev->demod_addr << 1 == > > addr) && (reg % 2 == 0)) { > > + if (!buf || len < 1 || len > 64) > > + return -1; > > + > > + /* capture mutex */ > > + if ((dev->caps.has_zl10353) && (dev->demod_addr << 1 == > > addr) > > + && (reg % 2 == 0)) { > > /* > > * Workaround an I2C bug when reading from zl10353 > > */ > > reg -= 1; > > len += 1; > > > > - rc = tm6000_read_write_usb(dev, USB_DIR_IN | > > USB_TYPE_VENDOR | USB_RECIP_DEVICE, > > - REQ_16_SET_GET_I2C_WR1_RDN, addr | reg << > > 8, 0, b, len); > > + rc = tm6000_read_write_usb(dev, USB_DIR_IN | > > USB_TYPE_VENDOR | > > + USB_RECIP_DEVICE, REQ_16_SET_GET_I2C_WR1_RDN, > > + addr | reg << 8, 0, b, len); > > > > *buf = b[1]; > > } else { > > - rc = tm6000_read_write_usb(dev, USB_DIR_IN | > > USB_TYPE_VENDOR | USB_RECIP_DEVICE, > > - REQ_16_SET_GET_I2C_WR1_RDN, addr | reg << > > 8, 0, buf, len); > > + rc = tm6000_read_write_usb(dev, USB_DIR_IN | > > USB_TYPE_VENDOR | > > + USB_RECIP_DEVICE, REQ_16_SET_GET_I2C_WR1_RDN, > > + addr | reg << 8, 0, buf, len); > > } > > > > + /* release mutex */ > > return rc; > > } > > > > @@ -85,8 +122,106 @@ > > static int tm6000_i2c_recv_regs16(struct tm6000_core *dev, > > unsigned char addr, __u16 reg, char *buf, int len) > > { > > - return tm6000_read_write_usb(dev, USB_DIR_IN | > > USB_TYPE_VENDOR | USB_RECIP_DEVICE, > > - REQ_14_SET_GET_I2C_WR2_RDN, addr, reg, buf, len); > > + int rc; > > + unsigned char ureg; > > + > > + if (!buf || len != 2) > > + return -1; > > + > > + /* capture mutex */ > > + ureg = reg & 0xFF; > > + rc = tm6000_read_write_usb(dev, USB_DIR_OUT | > > USB_TYPE_VENDOR | > > + USB_RECIP_DEVICE, REQ_16_SET_GET_I2C_WR1_RDN, > > + addr | (reg & 0xFF00), 0, &ureg, 1); > > + > > + if (rc < 0) { > > + /* release mutex */ > > + return rc; > > + } > > + > > + msleep(1400 / 1000); > > + rc = tm6000_read_write_usb(dev, USB_DIR_IN | > > USB_TYPE_VENDOR | > > + USB_RECIP_DEVICE, REQ_35_AFTEK_TUNER_READ, > > + reg, 0, buf, len); > > + > > > not all can this request (chip revision 0xf3 and 0xf4 can it) > > + if (rc < 0) { > > + /* release mutex */ > > + return rc; > > + } > > + > > + /* release mutex */ > > + return rc; > > +} > > + > > +static int tm6000_i2c_read_sequence(struct tm6000_core *dev, > > unsigned char addr, > > + __u16 reg, char *buf, int len) > > +{ > > + int rc; > > + > > + if (!buf || len < 1 || len > 64) > > + return -1; > > + > > + /* capture mutex */ > > + rc = tm6000_read_write_usb(dev, USB_DIR_IN | > > USB_TYPE_VENDOR | > > + USB_RECIP_DEVICE, REQ_35_AFTEK_TUNER_READ, > > + reg, 0, buf, len); > > > ditto > > + /* release mutex */ > > + return rc; > > +} > > + > > +static int tm6000_i2c_write_sequence(struct tm6000_core *dev, > > + unsigned char addr, __u16 reg, > > char *buf, > > + int len) > > +{ > > + int rc; > > + unsigned int tsleep; > > + > > + if (!buf || len < 1 || len > 64) > > + return -1; > > + > > + /* capture mutex */ > > + rc = tm6000_read_write_usb(dev, USB_DIR_OUT | > > USB_TYPE_VENDOR | > > + USB_RECIP_DEVICE, REQ_16_SET_GET_I2C_WR1_RDN, > > + addr | reg << 8, 0, buf+1, len-1); > > + > > + if (rc < 0) { > > + /* release mutex */ > > + return rc; > > + } > > + > > + /* Calculate delay time, 13800us for 64 bytes */ > > + tsleep = ((len * 200) + 1000) / 1000; > > + msleep(tsleep); > > + > > + /* release mutex */ > > + return rc; > > +} > > + > > +static int tm6000_i2c_write_uni(struct tm6000_core *dev, unsigned > > char addr, > > + __u16 reg, char *buf, int len) > > +{ > > + int rc; > > + unsigned int tsleep; > > + > > + if (!buf || len < 1 || len > 64) > > + return -1; > > + > > + /* capture mutex */ > > + rc = tm6000_read_write_usb(dev, USB_DIR_OUT | > > USB_TYPE_VENDOR | > > + USB_RECIP_DEVICE, REQ_30_I2C_WRITE, > > + addr | reg << 8, 0, buf+1, len-1); > > + > > + if (rc < 0) { > > + /* release mutex */ > > + return rc; > > + } > > + > > + /* Calculate delay time, 14800us for 64 bytes */ > > + tsleep = ((len * 200) + 1000 + 1000) / 1000; > > + msleep(tsleep); > > + > > + /* release mutex */ > > + return rc; > > } > > > > static int tm6000_i2c_xfer(struct i2c_adapter *i2c_adap, > > > > Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov > > <d.belimov@gmail.com> > > > > > > With my best regards, Dmitry. > > > -- > Stefan Ringel <stefan.ringel@arcor.de> > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff -r 7c0b887911cf linux/drivers/staging/tm6000/tm6000-i2c.c --- a/linux/drivers/staging/tm6000/tm6000-i2c.c Mon Apr 05 22:56:43 2010 -0400 +++ b/linux/drivers/staging/tm6000/tm6000-i2c.c Fri Apr 23 04:23:03 2010 +1000 @@ -24,6 +24,7 @@ #include <linux/kernel.h> #include <linux/usb.h> #include <linux/i2c.h> +#include <linux/delay.h> #include "compat.h" #include "tm6000.h" @@ -45,11 +46,39 @@ printk(KERN_DEBUG "%s at %s: " fmt, \ dev->name, __FUNCTION__ , ##args); } while (0) +static void tm6000_i2c_reset(struct tm6000_core *dev) +{ + tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, TM6000_GPIO_CLK, 0); + msleep(15); + tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, TM6000_GPIO_CLK, 1); + msleep(15); +} + static int tm6000_i2c_send_regs(struct tm6000_core *dev, unsigned char addr, __u8 reg, char *buf, int len) { - return tm6000_read_write_usb(dev, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - REQ_16_SET_GET_I2C_WR1_RDN, addr | reg << 8, 0, buf, len); + int rc; + unsigned int tsleep; + + if (!buf || len < 1 || len > 64) + return -1; + + /* capture mutex */ + rc = tm6000_read_write_usb(dev, USB_DIR_OUT | USB_TYPE_VENDOR | + USB_RECIP_DEVICE, REQ_16_SET_GET_I2C_WR1_RDN, + addr | reg << 8, 0, buf, len); + + if (rc < 0) { + /* release mutex */ + return rc; + } + + /* Calculate delay time, 14000us for 64 bytes */ + tsleep = ((len * 200) + 200 + 1000) / 1000; + msleep(tsleep); + + /* release mutex */ + return rc; } /* Generic read - doesn't work fine with 16bit registers */ @@ -59,22 +88,30 @@ int rc; u8 b[2]; - if ((dev->caps.has_zl10353) && (dev->demod_addr << 1 == addr) && (reg % 2 == 0)) { + if (!buf || len < 1 || len > 64) + return -1; + + /* capture mutex */ + if ((dev->caps.has_zl10353) && (dev->demod_addr << 1 == addr) + && (reg % 2 == 0)) { /* * Workaround an I2C bug when reading from zl10353 */ reg -= 1; len += 1; - rc = tm6000_read_write_usb(dev, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - REQ_16_SET_GET_I2C_WR1_RDN, addr | reg << 8, 0, b, len); + rc = tm6000_read_write_usb(dev, USB_DIR_IN | USB_TYPE_VENDOR | + USB_RECIP_DEVICE, REQ_16_SET_GET_I2C_WR1_RDN, + addr | reg << 8, 0, b, len); *buf = b[1]; } else { - rc = tm6000_read_write_usb(dev, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - REQ_16_SET_GET_I2C_WR1_RDN, addr | reg << 8, 0, buf, len); + rc = tm6000_read_write_usb(dev, USB_DIR_IN | USB_TYPE_VENDOR | + USB_RECIP_DEVICE, REQ_16_SET_GET_I2C_WR1_RDN, + addr | reg << 8, 0, buf, len); } + /* release mutex */ return rc; } @@ -85,8 +122,106 @@ static int tm6000_i2c_recv_regs16(struct tm6000_core *dev, unsigned char addr, __u16 reg, char *buf, int len) { - return tm6000_read_write_usb(dev, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, - REQ_14_SET_GET_I2C_WR2_RDN, addr, reg, buf, len); + int rc; + unsigned char ureg; + + if (!buf || len != 2) + return -1; + + /* capture mutex */ + ureg = reg & 0xFF; + rc = tm6000_read_write_usb(dev, USB_DIR_OUT | USB_TYPE_VENDOR | + USB_RECIP_DEVICE, REQ_16_SET_GET_I2C_WR1_RDN, + addr | (reg & 0xFF00), 0, &ureg, 1); + + if (rc < 0) { + /* release mutex */ + return rc; + } + + msleep(1400 / 1000); + rc = tm6000_read_write_usb(dev, USB_DIR_IN | USB_TYPE_VENDOR | + USB_RECIP_DEVICE, REQ_35_AFTEK_TUNER_READ, + reg, 0, buf, len); + + if (rc < 0) { + /* release mutex */ + return rc; + } + + /* release mutex */ + return rc; +} + +static int tm6000_i2c_read_sequence(struct tm6000_core *dev, unsigned char addr, + __u16 reg, char *buf, int len) +{ + int rc; + + if (!buf || len < 1 || len > 64) + return -1; + + /* capture mutex */ + rc = tm6000_read_write_usb(dev, USB_DIR_IN | USB_TYPE_VENDOR | + USB_RECIP_DEVICE, REQ_35_AFTEK_TUNER_READ, + reg, 0, buf, len); + /* release mutex */ + return rc; +} + +static int tm6000_i2c_write_sequence(struct tm6000_core *dev, + unsigned char addr, __u16 reg, char *buf, + int len) +{ + int rc; + unsigned int tsleep; + + if (!buf || len < 1 || len > 64) + return -1; + + /* capture mutex */ + rc = tm6000_read_write_usb(dev, USB_DIR_OUT | USB_TYPE_VENDOR | + USB_RECIP_DEVICE, REQ_16_SET_GET_I2C_WR1_RDN, + addr | reg << 8, 0, buf+1, len-1); + + if (rc < 0) { + /* release mutex */ + return rc; + } + + /* Calculate delay time, 13800us for 64 bytes */ + tsleep = ((len * 200) + 1000) / 1000; + msleep(tsleep); + + /* release mutex */ + return rc; +} + +static int tm6000_i2c_write_uni(struct tm6000_core *dev, unsigned char addr, + __u16 reg, char *buf, int len) +{ + int rc; + unsigned int tsleep; + + if (!buf || len < 1 || len > 64) + return -1; + + /* capture mutex */ + rc = tm6000_read_write_usb(dev, USB_DIR_OUT | USB_TYPE_VENDOR | + USB_RECIP_DEVICE, REQ_30_I2C_WRITE, + addr | reg << 8, 0, buf+1, len-1); + + if (rc < 0) { + /* release mutex */ + return rc; + } + + /* Calculate delay time, 14800us for 64 bytes */ + tsleep = ((len * 200) + 1000 + 1000) / 1000; + msleep(tsleep); + + /* release mutex */ + return rc; } static int tm6000_i2c_xfer(struct i2c_adapter *i2c_adap, Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com>