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

firmware_version_checker.hpp formatting

Browse Source
This commit is contained in:
Pavel Kirienko
2015-06-01 14:22:32 +03:00
parent 22787651e6
commit 52f809a620
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan_drivers/posix/include/uavcan_posix/firmware_version_checker.hpp
+3 -12
View File
@@ -18,6 +18,7 @@
#include <uavcan/protocol/firmware_update_trigger.hpp>
// TODO Get rid of the macro
#if !defined(DIRENT_ISFILE) && defined(DT_REG)
# define DIRENT_ISFILE(dtype) ((dtype) == DT_REG)
#endif
@@ -49,7 +50,6 @@ class FirmwareVersionChecker : public uavcan::IFirmwareVersionChecker
*/
typedef uavcan::MakeString<MaxPathLength>::Type PathString;
BasePathString base_path_;
BasePathString cache_path_;
@@ -121,13 +121,10 @@ class FirmwareVersionChecker : public uavcan::IFirmwareVersionChecker
{
if (size < 0)
{
rv = -errno;
}
else
{
if (size != write(dfd, buffer, size))
{
rv = -errno;
@@ -156,8 +153,7 @@ class FirmwareVersionChecker : public uavcan::IFirmwareVersionChecker
uint8_t reserved[6];
};
static int getFileInfo(const char* path, AppDescriptor & descriptor)
static int getFileInfo(const char* path, AppDescriptor& descriptor)
{
using namespace std;
@@ -166,7 +162,6 @@ class FirmwareVersionChecker : public uavcan::IFirmwareVersionChecker
uint64_t signature = 0;
std::memcpy(&signature, "APDesc00", 8);
int rv = -ENOENT;
uint64_t chunk[MaxChunk];
int fd = open(path, O_RDONLY);
@@ -196,7 +191,7 @@ class FirmwareVersionChecker : public uavcan::IFirmwareVersionChecker
{
if (*p == signature)
{
pdescriptor = (AppDescriptor*) p;
pdescriptor = reinterpret_cast<AppDescriptor*>(p); // FIXME TODO This breaks strict aliasing
descriptor = *pdescriptor;
rv = 0;
break;
@@ -212,7 +207,6 @@ class FirmwareVersionChecker : public uavcan::IFirmwareVersionChecker
}
public:
const BasePathString& getFirmwareBasePath() const { return base_path_; }
const BasePathString& getFirmwareCachePath() const { return cache_path_; }
@@ -281,8 +275,6 @@ public:
return rv;
}
protected:
/**
* This method will be invoked when the class obtains a response to GetNodeInfo request.
@@ -341,7 +333,6 @@ protected:
struct dirent* pfile = NULL;
while ((pfile = readdir(fwdir)) != NULL)
{
// TODO: This is not POSIX compliant
if (DIRENT_ISFILE(pfile->d_type))
{
// Open any bin file in there.