diff options
author | Vladimir Ermakov <vooon341@gmail.com> | 2014-09-10 11:22:03 +0400 |
---|---|---|
committer | Vladimir Ermakov <vooon341@gmail.com> | 2014-09-10 11:22:03 +0400 |
commit | 745707d19377e2c650258ea77570a5f84a71c1b7 (patch) | |
tree | 41eb851d11dd8157a268bb44bb6a85f6f559bcc2 /src/modules | |
parent | 0d2e250d119a5a14c8757982c96b2afef09c4d0d (diff) | |
download | px4-firmware-745707d19377e2c650258ea77570a5f84a71c1b7.tar.gz px4-firmware-745707d19377e2c650258ea77570a5f84a71c1b7.tar.bz2 px4-firmware-745707d19377e2c650258ea77570a5f84a71c1b7.zip |
FTP: remove reserved uint32 from header.
Diffstat (limited to 'src/modules')
-rw-r--r-- | src/modules/mavlink/mavlink_ftp.cpp | 5 | ||||
-rw-r--r-- | src/modules/mavlink/mavlink_ftp.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/modules/mavlink/mavlink_ftp.cpp b/src/modules/mavlink/mavlink_ftp.cpp index b847fc625..a5c96274b 100644 --- a/src/modules/mavlink/mavlink_ftp.cpp +++ b/src/modules/mavlink/mavlink_ftp.cpp @@ -247,9 +247,8 @@ MavlinkFTP::_reply(Request *req) PayloadHeader *payload = reinterpret_cast<PayloadHeader *>(&req->message.payload[0]); payload->seqNumber = payload->seqNumber + 1; - payload->reserved[0] = 0; - payload->reserved[1] = 0; - payload->reserved[2] = 0; + payload->padding[0] = 0; + payload->padding[1] = 0; mavlink_message_t msg; msg.checksum = 0; diff --git a/src/modules/mavlink/mavlink_ftp.h b/src/modules/mavlink/mavlink_ftp.h index ae7955ab7..4892e548c 100644 --- a/src/modules/mavlink/mavlink_ftp.h +++ b/src/modules/mavlink/mavlink_ftp.h @@ -77,7 +77,7 @@ public: uint8_t opcode; ///< Command opcode uint8_t size; ///< Size of data uint8_t req_opcode; ///< Request opcode returned in kRspAck, kRspNak message - uint16_t reserved[3]; ///< reserved area + uint8_t padding[2]; ///< 32 bit aligment padding uint32_t offset; ///< Offsets for List and Read commands uint8_t data[]; ///< command data, varies by Opcode }; |