From bb215d3c157d78c812145c292c36feacb666d035 Mon Sep 17 00:00:00 2001 From: Pavel Kirienko Date: Tue, 11 Feb 2014 19:50:15 +0400 Subject: [PATCH] Map<>, TransferBufferManager - isEmpty() calls for runtime checks --- libuavcan/include/uavcan/internal/map.hpp | 2 ++ libuavcan/src/transport/transfer_listener.cpp | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libuavcan/include/uavcan/internal/map.hpp b/libuavcan/include/uavcan/internal/map.hpp index 704166f76a..32c3a7728a 100644 --- a/libuavcan/include/uavcan/internal/map.hpp +++ b/libuavcan/include/uavcan/internal/map.hpp @@ -261,6 +261,8 @@ public: removeWhere(YesPredicate()); } + bool isEmpty() const { return (getNumStaticPairs() == 0) && (getNumDynamicPairs() == 0); } + /// For testing unsigned int getNumStaticPairs() const { diff --git a/libuavcan/src/transport/transfer_listener.cpp b/libuavcan/src/transport/transfer_listener.cpp index d14837ce1a..b48c99f367 100644 --- a/libuavcan/src/transport/transfer_listener.cpp +++ b/libuavcan/src/transport/transfer_listener.cpp @@ -2,6 +2,7 @@ * Copyright (C) 2014 Pavel Kirienko */ +#include #include namespace uavcan @@ -68,10 +69,11 @@ int MultiFrameIncomingTransfer::read(unsigned int offset, uint8_t* data, unsigne /* * TransferListenerBase */ -void TransferListenerBase::handleReception(TransferReceiver& receiver, const RxFrame& frame) +void TransferListenerBase::handleReception(TransferReceiver& receiver, const RxFrame& frame, + const TransferBufferManagerKey& bufmgr_key) { - (void)receiver; - (void)frame; + const TransferReceiver::ResultCode result = receiver.addFrame(frame, bufmgr_key); + (void)result; } }