Skip to content

Commit

Permalink
V4L/DVB (5522): Usbvision: i2c function cleanups
Browse files Browse the repository at this point in the history 
usbvision-i2c function renamings, code cleanup

Signed-off-by: Thierry MERLE <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
  • Loading branch information
@tmerle @mchehab
tmerle authored and mchehab committed Apr 27, 2007
1 parent d3df9c4 commit 1ff16c2
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 90 deletions.
2 changes: 1 addition & 1 deletion drivers/media/video/usbvision/usbvision-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2238,7 +2238,7 @@ static void call_usbvision_power_off(struct work_struct *work)
PDEBUG(DBG_FUNC, "");
down_interruptible(&usbvision->lock);
if(usbvision->user == 0) {
usbvision_i2c_usb_del_bus(&usbvision->i2c_adap);
usbvision_i2c_unregister(usbvision);

usbvision_power_off(usbvision);
usbvision->initialized = 0;
Expand Down
136 changes: 57 additions & 79 deletions drivers/media/video/usbvision/usbvision-i2c.c
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* I2C_ALGO_USB.C
* usbvision_i2c.c
* i2c algorithm for USB-I2C Bridges
*
* Copyright (c) 1999-2005 Joerg Heckenbach <[email protected]>
* Copyright (c) 1999-2007 Joerg Heckenbach <[email protected]>
* Dwaine Garden <[email protected]>
*
* This module is part of usbvision driver project.
Expand Down Expand Up @@ -39,7 +39,6 @@
#include "usbvision.h"

#define DBG_I2C 1<<0
#define DBG_ALGO 1<<1

static int i2c_debug = 0;

Expand All @@ -49,22 +48,22 @@ MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
#define PDEBUG(level, fmt, args...) \
if (i2c_debug & (level)) info("[%s:%d] " fmt, __PRETTY_FUNCTION__, __LINE__ , ## args)

static int usbvision_i2c_write(void *data, unsigned char addr, char *buf,
static int usbvision_i2c_write(struct usb_usbvision *usbvision, unsigned char addr, char *buf,
short len);
static int usbvision_i2c_read(void *data, unsigned char addr, char *buf,
static int usbvision_i2c_read(struct usb_usbvision *usbvision, unsigned char addr, char *buf,
short len);

static inline int try_write_address(struct i2c_adapter *i2c_adap,
unsigned char addr, int retries)
{
void *data;
struct usb_usbvision *usbvision;
int i, ret = -1;
char buf[4];

data = i2c_get_adapdata(i2c_adap);
usbvision = i2c_get_adapdata(i2c_adap);
buf[0] = 0x00;
for (i = 0; i <= retries; i++) {
ret = (usbvision_i2c_write(data, addr, buf, 1));
ret = (usbvision_i2c_write(usbvision, addr, buf, 1));
if (ret == 1)
break; /* success! */
udelay(5);
Expand All @@ -73,22 +72,22 @@ static inline int try_write_address(struct i2c_adapter *i2c_adap,
udelay(10);
}
if (i) {
PDEBUG(DBG_ALGO,"Needed %d retries for address %#2x", i, addr);
PDEBUG(DBG_ALGO,"Maybe there's no device at this address");
PDEBUG(DBG_I2C,"Needed %d retries for address %#2x", i, addr);
PDEBUG(DBG_I2C,"Maybe there's no device at this address");
}
return ret;
}

static inline int try_read_address(struct i2c_adapter *i2c_adap,
unsigned char addr, int retries)
{
void *data;
struct usb_usbvision *usbvision;
int i, ret = -1;
char buf[4];

data = i2c_get_adapdata(i2c_adap);
usbvision = i2c_get_adapdata(i2c_adap);
for (i = 0; i <= retries; i++) {
ret = (usbvision_i2c_read(data, addr, buf, 1));
ret = (usbvision_i2c_read(usbvision, addr, buf, 1));
if (ret == 1)
break; /* success! */
udelay(5);
Expand All @@ -97,8 +96,8 @@ static inline int try_read_address(struct i2c_adapter *i2c_adap,
udelay(10);
}
if (i) {
PDEBUG(DBG_ALGO,"Needed %d retries for address %#2x", i, addr);
PDEBUG(DBG_ALGO,"Maybe there's no device at this address");
PDEBUG(DBG_I2C,"Needed %d retries for address %#2x", i, addr);
PDEBUG(DBG_I2C,"Maybe there's no device at this address");
}
return ret;
}
Expand Down Expand Up @@ -152,32 +151,31 @@ static inline int usb_find_address(struct i2c_adapter *i2c_adap,
}

static int
usb_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num)
usbvision_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num)
{
struct i2c_msg *pmsg;
void *data;
struct usb_usbvision *usbvision;
int i, ret;
unsigned char addr;

data = i2c_get_adapdata(i2c_adap);

usbvision = i2c_get_adapdata(i2c_adap);
for (i = 0; i < num; i++) {
pmsg = &msgs[i];
ret = usb_find_address(i2c_adap, pmsg, i2c_adap->retries, &addr);
if (ret != 0) {
PDEBUG(DBG_ALGO,"got NAK from device, message #%d", i);
PDEBUG(DBG_I2C,"got NAK from device, message #%d", i);
return (ret < 0) ? ret : -EREMOTEIO;
}

if (pmsg->flags & I2C_M_RD) {
/* read bytes into buffer */
ret = (usbvision_i2c_read(data, addr, pmsg->buf, pmsg->len));
ret = (usbvision_i2c_read(usbvision, addr, pmsg->buf, pmsg->len));
if (ret < pmsg->len) {
return (ret < 0) ? ret : -EREMOTEIO;
}
} else {
/* write bytes from buffer */
ret = (usbvision_i2c_write(data, addr, pmsg->buf, pmsg->len));
ret = (usbvision_i2c_write(usbvision, addr, pmsg->buf, pmsg->len));
if (ret < pmsg->len) {
return (ret < 0) ? ret : -EREMOTEIO;
}
Expand All @@ -191,81 +189,52 @@ static int algo_control(struct i2c_adapter *adapter, unsigned int cmd, unsigned
return 0;
}

static u32 usb_func(struct i2c_adapter *adap)
static u32 functionality(struct i2c_adapter *adap)
{
return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR | I2C_FUNC_PROTOCOL_MANGLING;
}


/* -----exported algorithm data: ------------------------------------- */

static struct i2c_algorithm i2c_usb_algo = {
.master_xfer = usb_xfer,
static struct i2c_algorithm usbvision_algo = {
.master_xfer = usbvision_i2c_xfer,
.smbus_xfer = NULL,
.algo_control = algo_control,
.functionality = usb_func,
.functionality = functionality,
};


/*
* registering functions to load algorithms at runtime
*/
static int usbvision_i2c_usb_add_bus(struct i2c_adapter *adap)
{
PDEBUG(DBG_I2C, "I2C debugging is enabled [i2c]");
PDEBUG(DBG_ALGO, "ALGO debugging is enabled [i2c]");

/* register new adapter to i2c module... */

adap->algo = &i2c_usb_algo;

adap->timeout = 100; /* default values, should */
adap->retries = 3; /* be replaced by defines */

i2c_add_adapter(adap);

PDEBUG(DBG_ALGO,"i2c bus for %s registered", adap->name);

return 0;
}


int usbvision_i2c_usb_del_bus(struct i2c_adapter *adap)
{

i2c_del_adapter(adap);

PDEBUG(DBG_ALGO,"i2c bus for %s unregistered", adap->name);

return 0;
}


/* ----------------------------------------------------------------------- */
/* usbvision specific I2C functions */
/* ----------------------------------------------------------------------- */
static struct i2c_adapter i2c_adap_template;
static struct i2c_client i2c_client_template;

int usbvision_init_i2c(struct usb_usbvision *usbvision)
int usbvision_i2c_register(struct usb_usbvision *usbvision)
{
memcpy(&usbvision->i2c_adap, &i2c_adap_template,
sizeof(struct i2c_adapter));
memcpy(&usbvision->i2c_client, &i2c_client_template,
sizeof(struct i2c_client));
int ret;

sprintf(usbvision->i2c_adap.name + strlen(usbvision->i2c_adap.name),
" #%d", usbvision->vdev->minor & 0x1f);
PDEBUG(DBG_I2C,"Adaptername: %s", usbvision->i2c_adap.name);
usbvision->i2c_adap = i2c_adap_template;
usbvision->i2c_adap.dev.parent = &usbvision->dev->dev;

i2c_set_adapdata(&usbvision->i2c_adap, usbvision);
i2c_set_clientdata(&usbvision->i2c_client, usbvision);
PDEBUG(DBG_I2C, "I2C debugging is enabled [i2c]");

sprintf(usbvision->i2c_adap.name + strlen(usbvision->i2c_adap.name),
" #%d", usbvision->vdev->minor & 0x1f);
PDEBUG(DBG_I2C,"I2C Registering adaptername: %s", usbvision->i2c_adap.name);
i2c_set_adapdata(&usbvision->i2c_adap,usbvision);
if ((ret = i2c_add_adapter(&usbvision->i2c_adap)) < 0) {
PDEBUG(DBG_I2C,"could not add I2C adapter %s", usbvision->i2c_adap.name);
return ret;
}

/* TODO: use i2c_client for eeprom detection as an example... */
usbvision->i2c_client = i2c_client_template;
usbvision->i2c_client.adapter = &usbvision->i2c_adap;

if (usbvision_write_reg(usbvision, USBVISION_SER_MODE, USBVISION_IIC_LRNACK) < 0) {
printk(KERN_ERR "usbvision_init_i2c: can't write reg\n");
printk(KERN_ERR "usbvision_i2c_register: can't write reg\n");
return -EBUSY;
}

Expand All @@ -284,7 +253,17 @@ int usbvision_init_i2c(struct usb_usbvision *usbvision)
}
#endif

return usbvision_i2c_usb_add_bus(&usbvision->i2c_adap);
return 0;
}

int usbvision_i2c_unregister(struct usb_usbvision *usbvision)
{

i2c_del_adapter(&(usbvision->i2c_adap));

PDEBUG(DBG_I2C,"i2c bus for %s unregistered", usbvision->i2c_adap.name);

return 0;
}

void call_i2c_clients(struct usb_usbvision *usbvision, unsigned int cmd,
Expand All @@ -297,8 +276,7 @@ static int attach_inform(struct i2c_client *client)
{
struct usb_usbvision *usbvision;

usbvision = (struct usb_usbvision *)i2c_get_adapdata(client->adapter);

usbvision = i2c_get_adapdata(client->adapter);
switch (client->addr << 1) {
case 0x43:
case 0x4b:
Expand Down Expand Up @@ -349,7 +327,7 @@ static int detach_inform(struct i2c_client *client)
{
struct usb_usbvision *usbvision;

usbvision = (struct usb_usbvision *)i2c_get_adapdata(client->adapter);
usbvision = i2c_get_adapdata(client->adapter);

PDEBUG(DBG_I2C,"usbvision[%d] detaches %s", usbvision->nr, client->name);
return 0;
Expand Down Expand Up @@ -480,15 +458,14 @@ static int usbvision_i2c_write_max4(struct usb_usbvision *usbvision,
return len;
}

static int usbvision_i2c_write(void *data, unsigned char addr, char *buf,
static int usbvision_i2c_write(struct usb_usbvision *usbvision, unsigned char addr, char *buf,
short len)
{
char *bufPtr = buf;
int retval;
int wrcount = 0;
int count;
int maxLen = 4;
struct usb_usbvision *usbvision = (struct usb_usbvision *) data;

while (len > 0) {
count = (len > maxLen) ? maxLen : len;
Expand All @@ -503,14 +480,13 @@ static int usbvision_i2c_write(void *data, unsigned char addr, char *buf,
return wrcount;
}

static int usbvision_i2c_read(void *data, unsigned char addr, char *buf,
static int usbvision_i2c_read(struct usb_usbvision *usbvision, unsigned char addr, char *buf,
short len)
{
char temp[4];
int retval, i;
int rdcount = 0;
int count;
struct usb_usbvision *usbvision = (struct usb_usbvision *) data;

while (len > 0) {
count = (len > 3) ? 4 : len;
Expand All @@ -530,6 +506,8 @@ static struct i2c_adapter i2c_adap_template = {
.owner = THIS_MODULE,
.name = "usbvision",
.id = I2C_HW_B_BT848, /* FIXME */
.algo = &usbvision_algo,
.algo_data = NULL,
.client_register = attach_inform,
.client_unregister = detach_inform,
#ifdef I2C_ADAP_CLASS_TV_ANALOG
Expand Down
12 changes: 6 additions & 6 deletions drivers/media/video/usbvision/usbvision-video.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file)
down(&usbvision->lock);
if (usbvision->power == 0) {
usbvision_power_on(usbvision);
usbvision_init_i2c(usbvision);
usbvision_i2c_register(usbvision);
}

/* Send init sequence only once, it's large! */
Expand All @@ -432,7 +432,7 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file)
}
else {
if (PowerOnAtOpen) {
usbvision_i2c_usb_del_bus(&usbvision->i2c_adap);
usbvision_i2c_unregister(usbvision);
usbvision_power_off(usbvision);
usbvision->initialized = 0;
}
Expand Down Expand Up @@ -1240,7 +1240,7 @@ static int usbvision_radio_open(struct inode *inode, struct file *file)
usbvision_reset_powerOffTimer(usbvision);
if (usbvision->power == 0) {
usbvision_power_on(usbvision);
usbvision_init_i2c(usbvision);
usbvision_i2c_register(usbvision);
}
}

Expand All @@ -1262,7 +1262,7 @@ static int usbvision_radio_open(struct inode *inode, struct file *file)

if (errCode) {
if (PowerOnAtOpen) {
usbvision_i2c_usb_del_bus(&usbvision->i2c_adap);
usbvision_i2c_unregister(usbvision);
usbvision_power_off(usbvision);
usbvision->initialized = 0;
}
Expand Down Expand Up @@ -1765,7 +1765,7 @@ static void usbvision_configure_video(struct usb_usbvision *usbvision)
usbvision_audio_off(usbvision); //first switch off audio
if (!PowerOnAtOpen) {
usbvision_power_on(usbvision); //and then power up the noisy tuner
usbvision_init_i2c(usbvision);
usbvision_i2c_register(usbvision);
}
}

Expand Down Expand Up @@ -1913,7 +1913,7 @@ static void __devexit usbvision_disconnect(struct usb_interface *intf)
usbvision_stop_isoc(usbvision);

if (usbvision->power) {
usbvision_i2c_usb_del_bus(&usbvision->i2c_adap);
usbvision_i2c_unregister(usbvision);
usbvision_power_off(usbvision);
}
usbvision->remove_pending = 1; // Now all ISO data will be ignored
Expand Down
6 changes: 2 additions & 4 deletions drivers/media/video/usbvision/usbvision.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -482,13 +482,11 @@ struct usb_usbvision {
/* i2c-algo-usb declaration */
/* --------------------------------------------------------------- */

int usbvision_i2c_usb_del_bus(struct i2c_adapter *);


/* ----------------------------------------------------------------------- */
/* usbvision specific I2C functions */
/* ----------------------------------------------------------------------- */
int usbvision_init_i2c(struct usb_usbvision *usbvision);
int usbvision_i2c_register(struct usb_usbvision *usbvision);
int usbvision_i2c_unregister(struct usb_usbvision *usbvision);
void call_i2c_clients(struct usb_usbvision *usbvision, unsigned int cmd,void *arg);

/* defined in usbvision-core.c */
Expand Down

0 comments on commit 1ff16c2

Please sign in to comment.