diff mbox

[1/3] tm6000: add send and recv function

Message ID 1266783036-6549-1-git-send-email-stefan.ringel@arcor.de (mailing list archive)
State Superseded, archived
Headers

Commit Message

Stefan Ringel Feb. 21, 2010, 8:10 p.m. UTC 
  From: Stefan Ringel <stefan.ringel@arcor.de>

Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de>
---
 drivers/staging/tm6000/tm6000-i2c.c |   48 +++++++++++++++++++++++++---------
 1 files changed, 35 insertions(+), 13 deletions(-)

Comments

Mauro Carvalho Chehab Feb. 22, 2010, 3:16 p.m. UTC | #1 
stefan.ringel@arcor.de wrote:
> From: Stefan Ringel <stefan.ringel@arcor.de>


drivers/staging/tm6000/tm6000-i2c.c: In function ‘tm6000_i2c_recv_regs’:
drivers/staging/tm6000/tm6000-i2c.c:58: error: ‘USB_VENDOR_TYPE’ undeclared (first use in this function)
drivers/staging/tm6000/tm6000-i2c.c:58: error: (Each undeclared identifier is reported only once
drivers/staging/tm6000/tm6000-i2c.c:58: error: for each function it appears in.)
drivers/staging/tm6000/tm6000-i2c.c: In function ‘tm6000_i2c_recv_regs16’:
drivers/staging/tm6000/tm6000-i2c.c:69: error: ‘USB_VENDOR_TYPE’ undeclared (first use in this function)
drivers/staging/tm6000/tm6000-i2c.c: In function ‘tm6000_i2c_xfer’:
drivers/staging/tm6000/tm6000-i2c.c:107: error: expected ‘)’ before ‘{’ token
drivers/staging/tm6000/tm6000-i2c.c: In function ‘tm6000_i2c_eeprom’:
drivers/staging/tm6000/tm6000-i2c.c:161: error: implicit declaration of function ‘tm6000_i2c_revc_regs’

Each patch shouldn't break compilation, or it would call git bisect troubles.


> 
> Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de>
> ---
>  drivers/staging/tm6000/tm6000-i2c.c |   48 +++++++++++++++++++++++++---------
>  1 files changed, 35 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/staging/tm6000/tm6000-i2c.c b/drivers/staging/tm6000/tm6000-i2c.c
> index 656cd19..b563129 100644
> --- a/drivers/staging/tm6000/tm6000-i2c.c
> +++ b/drivers/staging/tm6000/tm6000-i2c.c
> @@ -44,6 +44,32 @@ MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
>  			printk(KERN_DEBUG "%s at %s: " fmt, \
>  			dev->name, __FUNCTION__ , ##args); } while (0)
>  
> +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);
> +}
> +
> +/* read from a 8bit register */
> +int tm6000_i2c_recv_regs(struct tm6000_core *dev, unsigned char addr, __u8 reg, char *buf, int len)
> +{
> +	int rc;
> +
> +		rc = tm6000_read_write_usb(dev, USB_DIR_IN | USB_VENDOR_TYPE | USB_RECIP_DEVICE,
> +			REQ_16_SET_GET_I2C_WR1_RDN, addr | reg << 8, 0, buf, len);
> +
> +	return rc;
> +}
> +
> +/* read from a 16bit register
> + * for example xc2028, xc3028 or xc3028L 
> + */
> +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_VENDOR_TYPE | USB_RECIP_DEVICE,
> +		REQ_14_SET_GET_I2C_WR2_RDN, addr, reg, buf, len);
> +} 
> +
>  static int tm6000_i2c_xfer(struct i2c_adapter *i2c_adap,
>  			   struct i2c_msg msgs[], int num)
>  {
> @@ -78,13 +104,14 @@ static int tm6000_i2c_xfer(struct i2c_adapter *i2c_adap,
>  			i2c_dprintk(2, "; joined to read %s len=%d:",
>  				    i == num - 2 ? "stop" : "nonstop",
>  				    msgs[i + 1].len);
> -			rc = tm6000_read_write_usb (dev,
> -				USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
> -				msgs[i].len == 1 ? REQ_16_SET_GET_I2C_WR1_RDN
> -						 : REQ_14_SET_GET_I2C_WR2_RDN,
> -				addr | msgs[i].buf[0] << 8,
> -				msgs[i].len == 1 ? 0 : msgs[i].buf[1],
> +			if (msgs{i].len == 1) {
> +				rc = tm6000_i2c_recv_regs(dev, addr, msgs[i].buf[0],
>  				msgs[i + 1].buf, msgs[i + 1].len);
> +			} else {
> +				rc = tm6000_i2c_recv_regs(dev, addr, msgs[i].buf[0] << 8 | msgs[i].buf[1],
> +				msgs[i + 1].buf, msgs[i + 1].len);
> +			}
> +
>  			i++;
>  
>  			if (addr == dev->tuner_addr) {
> @@ -99,10 +126,7 @@ static int tm6000_i2c_xfer(struct i2c_adapter *i2c_adap,
>  			if (i2c_debug >= 2)
>  				for (byte = 0; byte < msgs[i].len; byte++)
>  					printk(" %02x", msgs[i].buf[byte]);
> -			rc = tm6000_read_write_usb(dev,
> -				USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
> -				REQ_16_SET_GET_I2C_WR1_RDN,
> -				addr | msgs[i].buf[0] << 8, 0,
> +			rc = tm6000_i2c_send_regs(dev, addr, msgs[i].buf[0],
>  				msgs[i].buf + 1, msgs[i].len - 1);
>  
>  			if (addr == dev->tuner_addr) {
> @@ -134,9 +158,7 @@ static int tm6000_i2c_eeprom(struct tm6000_core *dev,
>  	bytes[16] = '\0';
>  	for (i = 0; i < len; ) {
>  	*p = i;
> -	rc = tm6000_read_write_usb (dev,
> -		USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
> -		REQ_16_SET_GET_I2C_WR1_RDN, 0xa0 | i<<8, 0, p, 1);
> +	rc = tm6000_i2c_revc_regs(dev, 0xa0, i, p, 1);
>  		if (rc < 1) {
>  			if (p == eedata)
>  				goto noeeprom;
Stefan Ringel Feb. 22, 2010, 3:46 p.m. UTC | #2 
Am 22.02.2010 16:16, schrieb Mauro Carvalho Chehab:
> stefan.ringel@arcor.de wrote:
>   
>> From: Stefan Ringel <stefan.ringel@arcor.de>
>>     
>
> drivers/staging/tm6000/tm6000-i2c.c: In function ‘tm6000_i2c_recv_regs’:
> drivers/staging/tm6000/tm6000-i2c.c:58: error: ‘USB_VENDOR_TYPE’ undeclared (first use in this function)
> drivers/staging/tm6000/tm6000-i2c.c:58: error: (Each undeclared identifier is reported only once
> drivers/staging/tm6000/tm6000-i2c.c:58: error: for each function it appears in.)
> drivers/staging/tm6000/tm6000-i2c.c: In function ‘tm6000_i2c_recv_regs16’:
> drivers/staging/tm6000/tm6000-i2c.c:69: error: ‘USB_VENDOR_TYPE’ undeclared (first use in this function)
> drivers/staging/tm6000/tm6000-i2c.c: In function ‘tm6000_i2c_xfer’:
> drivers/staging/tm6000/tm6000-i2c.c:107: error: expected ‘)’ before ‘{’ token
> drivers/staging/tm6000/tm6000-i2c.c: In function ‘tm6000_i2c_eeprom’:
> drivers/staging/tm6000/tm6000-i2c.c:161: error: implicit declaration of function ‘tm6000_i2c_revc_regs’
>
> Each patch shouldn't break compilation, or it would call git bisect troubles.
>
>
>   
>> Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de>
>> ---
>>  drivers/staging/tm6000/tm6000-i2c.c |   48 +++++++++++++++++++++++++---------
>>  1 files changed, 35 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/staging/tm6000/tm6000-i2c.c b/drivers/staging/tm6000/tm6000-i2c.c
>> index 656cd19..b563129 100644
>> --- a/drivers/staging/tm6000/tm6000-i2c.c
>> +++ b/drivers/staging/tm6000/tm6000-i2c.c
>> @@ -44,6 +44,32 @@ MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
>>  			printk(KERN_DEBUG "%s at %s: " fmt, \
>>  			dev->name, __FUNCTION__ , ##args); } while (0)
>>  
>> +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);
>> +}
>> +
>> +/* read from a 8bit register */
>> +int tm6000_i2c_recv_regs(struct tm6000_core *dev, unsigned char addr, __u8 reg, char *buf, int len)
>> +{
>> +	int rc;
>> +
>> +		rc = tm6000_read_write_usb(dev, USB_DIR_IN | USB_VENDOR_TYPE | USB_RECIP_DEVICE,
>> +			REQ_16_SET_GET_I2C_WR1_RDN, addr | reg << 8, 0, buf, len);
>> +
>> +	return rc;
>> +}
>> +
>> +/* read from a 16bit register
>> + * for example xc2028, xc3028 or xc3028L 
>> + */
>> +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_VENDOR_TYPE | USB_RECIP_DEVICE,
>> +		REQ_14_SET_GET_I2C_WR2_RDN, addr, reg, buf, len);
>> +} 
>> +
>>  static int tm6000_i2c_xfer(struct i2c_adapter *i2c_adap,
>>  			   struct i2c_msg msgs[], int num)
>>  {
>> @@ -78,13 +104,14 @@ static int tm6000_i2c_xfer(struct i2c_adapter *i2c_adap,
>>  			i2c_dprintk(2, "; joined to read %s len=%d:",
>>  				    i == num - 2 ? "stop" : "nonstop",
>>  				    msgs[i + 1].len);
>> -			rc = tm6000_read_write_usb (dev,
>> -				USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
>> -				msgs[i].len == 1 ? REQ_16_SET_GET_I2C_WR1_RDN
>> -						 : REQ_14_SET_GET_I2C_WR2_RDN,
>> -				addr | msgs[i].buf[0] << 8,
>> -				msgs[i].len == 1 ? 0 : msgs[i].buf[1],
>> +			if (msgs{i].len == 1) {
>> +				rc = tm6000_i2c_recv_regs(dev, addr, msgs[i].buf[0],
>>  				msgs[i + 1].buf, msgs[i + 1].len);
>> +			} else {
>> +				rc = tm6000_i2c_recv_regs(dev, addr, msgs[i].buf[0] << 8 | msgs[i].buf[1],
>> +				msgs[i + 1].buf, msgs[i + 1].len);
>> +			}
>> +
>>  			i++;
>>  
>>  			if (addr == dev->tuner_addr) {
>> @@ -99,10 +126,7 @@ static int tm6000_i2c_xfer(struct i2c_adapter *i2c_adap,
>>  			if (i2c_debug >= 2)
>>  				for (byte = 0; byte < msgs[i].len; byte++)
>>  					printk(" %02x", msgs[i].buf[byte]);
>> -			rc = tm6000_read_write_usb(dev,
>> -				USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
>> -				REQ_16_SET_GET_I2C_WR1_RDN,
>> -				addr | msgs[i].buf[0] << 8, 0,
>> +			rc = tm6000_i2c_send_regs(dev, addr, msgs[i].buf[0],
>>  				msgs[i].buf + 1, msgs[i].len - 1);
>>  
>>  			if (addr == dev->tuner_addr) {
>> @@ -134,9 +158,7 @@ static int tm6000_i2c_eeprom(struct tm6000_core *dev,
>>  	bytes[16] = '\0';
>>  	for (i = 0; i < len; ) {
>>  	*p = i;
>> -	rc = tm6000_read_write_usb (dev,
>> -		USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
>> -		REQ_16_SET_GET_I2C_WR1_RDN, 0xa0 | i<<8, 0, p, 1);
>> +	rc = tm6000_i2c_revc_regs(dev, 0xa0, i, p, 1);
>>  		if (rc < 1) {
>>  			if (p == eedata)
>>  				goto noeeprom;
>>     
Sorry, I mistaken. I resend the correct once.
diff mbox

Patch

diff --git a/drivers/staging/tm6000/tm6000-i2c.c b/drivers/staging/tm6000/tm6000-i2c.c
index 656cd19..b563129 100644
--- a/drivers/staging/tm6000/tm6000-i2c.c
+++ b/drivers/staging/tm6000/tm6000-i2c.c
@@ -44,6 +44,32 @@  MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
 			printk(KERN_DEBUG "%s at %s: " fmt, \
 			dev->name, __FUNCTION__ , ##args); } while (0)
 
+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);
+}
+
+/* read from a 8bit register */
+int tm6000_i2c_recv_regs(struct tm6000_core *dev, unsigned char addr, __u8 reg, char *buf, int len)
+{
+	int rc;
+
+		rc = tm6000_read_write_usb(dev, USB_DIR_IN | USB_VENDOR_TYPE | USB_RECIP_DEVICE,
+			REQ_16_SET_GET_I2C_WR1_RDN, addr | reg << 8, 0, buf, len);
+
+	return rc;
+}
+
+/* read from a 16bit register
+ * for example xc2028, xc3028 or xc3028L 
+ */
+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_VENDOR_TYPE | USB_RECIP_DEVICE,
+		REQ_14_SET_GET_I2C_WR2_RDN, addr, reg, buf, len);
+} 
+
 static int tm6000_i2c_xfer(struct i2c_adapter *i2c_adap,
 			   struct i2c_msg msgs[], int num)
 {
@@ -78,13 +104,14 @@  static int tm6000_i2c_xfer(struct i2c_adapter *i2c_adap,
 			i2c_dprintk(2, "; joined to read %s len=%d:",
 				    i == num - 2 ? "stop" : "nonstop",
 				    msgs[i + 1].len);
-			rc = tm6000_read_write_usb (dev,
-				USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-				msgs[i].len == 1 ? REQ_16_SET_GET_I2C_WR1_RDN
-						 : REQ_14_SET_GET_I2C_WR2_RDN,
-				addr | msgs[i].buf[0] << 8,
-				msgs[i].len == 1 ? 0 : msgs[i].buf[1],
+			if (msgs{i].len == 1) {
+				rc = tm6000_i2c_recv_regs(dev, addr, msgs[i].buf[0],
 				msgs[i + 1].buf, msgs[i + 1].len);
+			} else {
+				rc = tm6000_i2c_recv_regs(dev, addr, msgs[i].buf[0] << 8 | msgs[i].buf[1],
+				msgs[i + 1].buf, msgs[i + 1].len);
+			}
+
 			i++;
 
 			if (addr == dev->tuner_addr) {
@@ -99,10 +126,7 @@  static int tm6000_i2c_xfer(struct i2c_adapter *i2c_adap,
 			if (i2c_debug >= 2)
 				for (byte = 0; byte < msgs[i].len; byte++)
 					printk(" %02x", msgs[i].buf[byte]);
-			rc = tm6000_read_write_usb(dev,
-				USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-				REQ_16_SET_GET_I2C_WR1_RDN,
-				addr | msgs[i].buf[0] << 8, 0,
+			rc = tm6000_i2c_send_regs(dev, addr, msgs[i].buf[0],
 				msgs[i].buf + 1, msgs[i].len - 1);
 
 			if (addr == dev->tuner_addr) {
@@ -134,9 +158,7 @@  static int tm6000_i2c_eeprom(struct tm6000_core *dev,
 	bytes[16] = '\0';
 	for (i = 0; i < len; ) {
 	*p = i;
-	rc = tm6000_read_write_usb (dev,
-		USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-		REQ_16_SET_GET_I2C_WR1_RDN, 0xa0 | i<<8, 0, p, 1);
+	rc = tm6000_i2c_revc_regs(dev, 0xa0, i, p, 1);
 		if (rc < 1) {
 			if (p == eedata)
 				goto noeeprom;