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

uncrustify applied

Browse Source
This commit is contained in:
Ilia
2015-12-21 00:34:38 +00:00
parent 292b06c2d8
commit 73f0a9074d
3 changed files with 34 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan_drivers/linux/include/uavcan_linux/socketcan.hpp
+5 -6
View File
@@ -58,7 +58,7 @@ class SocketCanIface : public uavcan::ICanIface
{
static inline ::can_frame makeSocketCanFrame(const uavcan::CanFrame& uavcan_frame)
{
::can_frame sockcan_frame { uavcan_frame.id & uavcan::CanFrame::MaskExtID, uavcan_frame.dlc, { } };
::can_frame sockcan_frame { uavcan_frame.id& uavcan::CanFrame::MaskExtID, uavcan_frame.dlc, { } };
(void)std::copy(uavcan_frame.data, uavcan_frame.data + uavcan_frame.dlc, sockcan_frame.data);
if (uavcan_frame.isExtended())
{
@@ -310,7 +310,6 @@ class SocketCanIface : public uavcan::ICanIface
{
rx.ts_utc += clock_.getPrivateAdjustment();
rx_queue_.push(rx);
}
}
else if (res == 0)
@@ -327,9 +326,9 @@ class SocketCanIface : public uavcan::ICanIface
/**
* Returns true if a frame accepted by HW filters
*/
bool checkHWFilters (const ::can_frame frame) const
bool checkHWFilters(const ::can_frame frame) const
{
if (! hw_filters_container_.empty())
if (!hw_filters_container_.empty())
{
uint16_t container_size = hw_filters_container_.size();
for (uint16_t i = 0; i < container_size; i++)
@@ -486,7 +485,7 @@ public:
/**
* Returns number of errors of each kind in a map.
*/
const decltype(errors_)& getErrors() const { return errors_; }
const decltype(errors_) & getErrors() const { return errors_; }
int getFileDescriptor() const { return fd_; }
@@ -537,7 +536,7 @@ public:
goto fail;
}
// Non-blocking
if (::fcntl(s, F_SETFL , O_NONBLOCK) < 0)
if (::fcntl(s, F_SETFL, O_NONBLOCK) < 0)
{
goto fail;
}