fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-22 17:53:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

ICanDriver::select() call accepts CanSelectMasks instead of raw integer masks

Browse Source
This commit is contained in:
Pavel Kirienko
2014-03-21 10:12:33 +04:00
parent 57d720119f
commit 670d844f08
5 changed files with 62 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/test/node/test_node.hpp
+4 -4
View File
@@ -63,13 +63,13 @@ struct PairableCanDriver : public uavcan::ICanDriver, public uavcan::ICanIface
int getNumIfaces() const { return 1; }
int select(int& inout_write_iface_mask, int& inout_read_iface_mask, uavcan::MonotonicTime blocking_deadline)
int select(uavcan::CanSelectMasks& inout_masks, uavcan::MonotonicTime blocking_deadline)
{
assert(other);
if (inout_read_iface_mask == 1)
inout_read_iface_mask = read_queue.size() ? 1 : 0;
if (inout_masks.read == 1)
inout_masks.read = read_queue.size() ? 1 : 0;
if (inout_read_iface_mask || inout_write_iface_mask)
if (inout_masks.read || inout_masks.write)
return 1;
while (clock.getMonotonic() < blocking_deadline)