fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-22 03:43:35 +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/src/transport/can_io.cpp
+5 -5
View File
@@ -196,7 +196,7 @@ bool CanTxQueue::topPriorityHigherOrEqual(const CanFrame& rhs_frame) const
*/
int CanIOManager::sendToIface(int iface_index, const CanFrame& frame, MonotonicTime tx_deadline, CanIOFlags flags)
{
assert(iface_index >= 0 && iface_index < MaxIfaces);
assert(iface_index >= 0 && iface_index < MaxCanIfaces);
ICanIface* const iface = driver_.getIface(iface_index);
if (iface == NULL)
{
@@ -214,7 +214,7 @@ int CanIOManager::sendToIface(int iface_index, const CanFrame& frame, MonotonicT
int CanIOManager::sendFromTxQueue(int iface_index)
{
assert(iface_index >= 0 && iface_index < MaxIfaces);
assert(iface_index >= 0 && iface_index < MaxCanIfaces);
CanTxQueue::Entry* entry = tx_queues_[iface_index].peek();
if (entry == NULL)
return 0;
@@ -238,14 +238,14 @@ int CanIOManager::makePendingTxMask() const
int CanIOManager::getNumIfaces() const
{
const int num = driver_.getNumIfaces();
assert(num > 0 && num <= MaxIfaces);
return std::min(std::max(num, 0), (int)MaxIfaces);
assert(num > 0 && num <= MaxCanIfaces);
return std::min(std::max(num, 0), (int)MaxCanIfaces);
}
uint64_t CanIOManager::getNumErrors(int iface_index) const
{
ICanIface* const iface = driver_.getIface(iface_index);
if (iface == NULL || iface_index >= MaxIfaces || iface_index < 0)
if (iface == NULL || iface_index >= MaxCanIfaces || iface_index < 0)
{
assert(0);
return std::numeric_limits<uint64_t>::max();