alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-15 04:57:30 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

mcp2515: fix conversion error reported by Travis CI (clang)

Browse Source 
Signed-off-by: Jon Trulson <jtrulson@ics.com>
This commit is contained in:
Jon Trulson 2016-12-20 12:46:54 -07:00
parent fcb4d9d36d
commit fed0478dc9
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/mcp2515/mcp2515.c
View File

@ -832,11 +832,10 @@ MCP2515_RXMSG_T mcp2515_rx_status_msgs(const mcp2515_context dev)
{ {
assert(dev != NULL); assert(dev != NULL);
upm_result_t rv;
uint8_t rx_status_byte; uint8_t rx_status_byte;
if ((rv = mcp2515_bus_read(dev, MCP2515_CMD_RX_STATUS, NULL, 0, if (mcp2515_bus_read(dev, MCP2515_CMD_RX_STATUS, NULL, 0,
&rx_status_byte, 1))) &rx_status_byte, 1))
return rv; return MCP2515_RXMSG_NONE;
MCP2515_RXMSG_T buffers = MCP2515_RXMSG_T buffers =
(rx_status_byte & (rx_status_byte &
@ -850,11 +849,10 @@ MCP2515_MSGTYPE_T mcp2515_rx_status_msg_type(const mcp2515_context dev)
{ {
assert(dev != NULL); assert(dev != NULL);
upm_result_t rv;
uint8_t rx_status_byte; uint8_t rx_status_byte;
if ((rv = mcp2515_bus_read(dev, MCP2515_CMD_RX_STATUS, NULL, 0, if (mcp2515_bus_read(dev, MCP2515_CMD_RX_STATUS, NULL, 0,
&rx_status_byte, 1))) &rx_status_byte, 1))
return rv; return MCP2515_MSGTYPE_STD; // not really, but....
MCP2515_MSGTYPE_T msgtype = MCP2515_MSGTYPE_T msgtype =
(rx_status_byte & (rx_status_byte &
@ -868,11 +866,10 @@ MCP2515_FILTERMATCH_T mcp2515_rx_status_filtermatch(const mcp2515_context dev)
{ {
assert(dev != NULL); assert(dev != NULL);
upm_result_t rv;
uint8_t rx_status_byte; uint8_t rx_status_byte;
if ((rv = mcp2515_bus_read(dev, MCP2515_CMD_RX_STATUS, NULL, 0, if (mcp2515_bus_read(dev, MCP2515_CMD_RX_STATUS, NULL, 0,
&rx_status_byte, 1))) &rx_status_byte, 1))
return rv; return MCP2515_RX_FILTER0; // not really, but....
MCP2515_FILTERMATCH_T fm = MCP2515_FILTERMATCH_T fm =
(rx_status_byte & (rx_status_byte &