system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-21 17:25:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert changes accidentally committed as part of r209298.

Browse source
This commit is contained in:
Nathan Whitehorn 2010-06-18 14:20:54 +00:00
parent 7248ea35ca
commit 9f220e4d78
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=209301
1 changed files with 5 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
sys/dev/iicbus/iiconf.c
View file

@ -363,7 +363,7 @@ iicbus_transfer(device_t bus, struct iic_msg *msgs, uint32_t nmsgs)
int
iicbus_transfer_gen(device_t dev, struct iic_msg *msgs, uint32_t nmsgs)
{
int i, error, lenread, lenwrote, nkid, rpstart, addr;
int i, error, lenread, lenwrote, nkid;
device_t *children, bus;
if ((error = device_get_children(dev, &children, &nkid)) != 0)
@ -373,38 +373,14 @@ iicbus_transfer_gen(device_t dev, struct iic_msg *msgs, uint32_t nmsgs)
return (EIO);
}
bus = children[0];
rpstart = 0;
free(children, M_TEMP);
for (i = 0, error = 0; i < nmsgs && error == 0; i++) {
addr = msgs[i].slave;
if (msgs[i].flags & IIC_M_RD)
addr |= LSB;
error = iicbus_block_read(bus, msgs[i].slave,
msgs[i].buf, msgs[i].len, &lenread);
else
addr &= ~LSB;
if (!(msgs[i].flags & IIC_M_NOSTART)) {
if (rpstart)
error = iicbus_repeated_start(bus, addr, 0);
else
error = iicbus_start(bus, addr, 0);
}
if (error)
break;
if (msgs[i].flags & IIC_M_RD)
error = iicbus_read(bus, msgs[i].buf, msgs[i].len,
&lenread, IIC_LAST_READ, 0);
else
error = iicbus_write(bus, msgs[i].buf, msgs[i].len,
&lenwrote, 0);
if (!(msgs[i].flags & IIC_M_NOSTOP)) {
rpstart = 0;
iicbus_stop(bus);
} else {
rpstart = 1; /* Next message gets repeated start */
}
error = iicbus_block_write(bus, msgs[i].slave,
msgs[i].buf, msgs[i].len, &lenwrote);
}
return (error);
}