dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Correct the length calculation for register write transfers so that we send all of the requested registers.

This commit is contained in:
px4dev 2013-01-26 13:15:57 -08:00
parent 72fcc8aad3
commit 4ea8a64b39
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/drivers/px4io/px4io.cpp
View File

@ -820,17 +820,24 @@ PX4IO::io_reg_set(uint8_t page, uint8_t offset, const uint16_t *values, unsigned
{
uint8_t buf[_max_transfer + 2];
if (num_values > ((_max_transfer) / sizeof(*values)))
/* range check the transfer */
if (num_values > ((_max_transfer) / sizeof(*values))) {
debug("io_reg_set: too many registers (%u, max %u)", num_values, _max_transfer / 2);
return -EINVAL;
unsigned datalen = num_values * sizeof(*values);
}
/* set page/offset address */
buf[0] = page;
buf[1] = offset;
if (num_values > 0)
/* copy data into our local transfer buffer */
/* XXX we could use a msgv and two transactions, maybe? */
unsigned datalen = num_values * sizeof(*values);
if (datalen > 0)
memcpy(&buf[2], values, datalen);
int ret = transfer(buf, datalen, nullptr, 0);
/* perform the transfer */
int ret = transfer(buf, datalen + 2, nullptr, 0);
if (ret != OK)
debug("io_reg_set: error %d", ret);
return ret;