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

::uavcan::CanIOManeger::MaxIfaces --> ::uavcan::MaxCanIfaces

Browse Source
This commit is contained in:
Pavel Kirienko
2014-03-24 12:35:23 +04:00
parent 53027b1365
commit 9d797e5ac5
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/transport/can_io.hpp
+5 -7
View File
@@ -18,6 +18,8 @@
namespace uavcan
{
enum { MaxCanIfaces = 3 };
struct CanRxFrame : public CanFrame
{
MonotonicTime ts_mono;
@@ -116,14 +118,10 @@ public:
class CanIOManager : Noncopyable
{
public:
enum { MaxIfaces = 3 };
private:
ICanDriver& driver_;
ISystemClock& sysclock_;
CanTxQueue tx_queues_[MaxIfaces];
CanTxQueue tx_queues_[MaxCanIfaces];
// Noncopyable
CanIOManager(CanIOManager&);
@@ -138,9 +136,9 @@ public:
: driver_(driver)
, sysclock_(sysclock)
{
assert(driver.getNumIfaces() <= MaxIfaces);
assert(driver.getNumIfaces() <= MaxCanIfaces);
// We can't initialize member array with non-default constructors in C++03
for (int i = 0; i < MaxIfaces; i++)
for (int i = 0; i < MaxCanIfaces; i++)
{
tx_queues_[i].~CanTxQueue();
new (tx_queues_ + i) CanTxQueue(&allocator, &sysclock);