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

UAVCAN virtual iface: removed a useless class field

Browse Source
This commit is contained in:
Pavel Kirienko
2015-10-26 10:19:56 +01:00
committed by Lorenz Meier
parent 53ed0425da
commit 72e651beda
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/uavcan/uavcan_virtual_can_driver.hpp
+4 -5
View File
@@ -404,9 +404,8 @@ class VirtualCanDriver : public uavcan::ICanDriver,
} }
}; };
Event event_; ///< Used to unblock the select() call when IO happens. Event event_; ///< Used to unblock the select() call when IO happens.
pthread_mutex_t driver_mutex_; ///< Shared across all ifaces pthread_mutex_t driver_mutex_; ///< Shared across all ifaces
uavcan::IPoolAllocator& allocator_; ///< Shared across all ifaces
uavcan::LazyConstructor<VirtualCanIface> ifaces_[uavcan::MaxCanIfaces]; uavcan::LazyConstructor<VirtualCanIface> ifaces_[uavcan::MaxCanIfaces];
const unsigned num_ifaces_; const unsigned num_ifaces_;
uavcan::ISystemClock &clock_; uavcan::ISystemClock &clock_;
@@ -484,7 +483,6 @@ public:
uavcan::ISystemClock &system_clock, uavcan::ISystemClock &system_clock,
uavcan::IPoolAllocator& allocator, uavcan::IPoolAllocator& allocator,
unsigned virtual_iface_block_allocation_quota) : unsigned virtual_iface_block_allocation_quota) :
allocator_(allocator),
num_ifaces_(arg_num_ifaces), num_ifaces_(arg_num_ifaces),
clock_(system_clock) clock_(system_clock)
{ {
@@ -496,8 +494,9 @@ public:
const unsigned quota_per_queue = virtual_iface_block_allocation_quota; // 2x overcommit const unsigned quota_per_queue = virtual_iface_block_allocation_quota; // 2x overcommit
for (unsigned i = 0; i < num_ifaces_; i++) { for (unsigned i = 0; i < num_ifaces_; i++) {
ifaces_[i].template construct<uavcan::IPoolAllocator &, uavcan::ISystemClock &, ifaces_[i].template
pthread_mutex_t &, unsigned>(allocator_, clock_, driver_mutex_, quota_per_queue); construct<uavcan::IPoolAllocator&, uavcan::ISystemClock&, pthread_mutex_t&, unsigned>
(allocator, clock_, driver_mutex_, quota_per_queue);
} }
} }