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

Marshal buffer removed

Browse Source
This commit is contained in:
Pavel Kirienko
2015-05-31 07:18:56 +03:00
parent cf32ca0573
commit 05099181e5
6 changed files with 30 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/src/node/uc_generic_publisher.cpp
+4 -9
View File
@@ -38,22 +38,17 @@ MonotonicTime GenericPublisherBase::getTxDeadline() const
return node_.getMonotonicTime() + tx_timeout_;
}
IMarshalBuffer* GenericPublisherBase::getBuffer(unsigned byte_len)
{
return node_.getMarshalBufferProvider().getBuffer(byte_len);
}
int GenericPublisherBase::genericPublish(const IMarshalBuffer& buffer, TransferType transfer_type, NodeID dst_node_id,
TransferID* tid, MonotonicTime blocking_deadline)
int GenericPublisherBase::genericPublish(const StaticTransferBufferImpl& buffer, TransferType transfer_type,
NodeID dst_node_id, TransferID* tid, MonotonicTime blocking_deadline)
{
if (tid)
{
return sender_.send(buffer.getDataPtr(), buffer.getMaxWritePos(), getTxDeadline(),
return sender_.send(buffer.getRawPtr(), buffer.getMaxWritePos(), getTxDeadline(),
blocking_deadline, transfer_type, dst_node_id, *tid);
}
else
{
return sender_.send(buffer.getDataPtr(), buffer.getMaxWritePos(), getTxDeadline(),
return sender_.send(buffer.getRawPtr(), buffer.getMaxWritePos(), getTxDeadline(),
blocking_deadline, transfer_type, dst_node_id);
}
}