Renaming: TransferBufferBase --> ITransferBuffer

This commit is contained in:
Pavel Kirienko
2014-02-19 17:11:05 +04:00
parent cd851312ff
commit 195dca3696
9 changed files with 24 additions and 26 deletions
@@ -18,10 +18,10 @@ namespace uavcan
/**
* API for transfer buffer users.
*/
class TransferBufferBase
class ITransferBuffer
{
public:
virtual ~TransferBufferBase() { }
virtual ~ITransferBuffer() { }
virtual int read(unsigned int offset, uint8_t* data, unsigned int len) const = 0;
virtual int write(unsigned int offset, const uint8_t* data, unsigned int len) = 0;
@@ -65,7 +65,7 @@ public:
/**
* Internal for TransferBufferManager
*/
class TransferBufferManagerEntry : public TransferBufferBase, Noncopyable
class TransferBufferManagerEntry : public ITransferBuffer, Noncopyable
{
TransferBufferManagerKey key_;
@@ -237,8 +237,8 @@ class ITransferBufferManager
{
public:
virtual ~ITransferBufferManager() { }
virtual TransferBufferBase* access(const TransferBufferManagerKey& key) = 0;
virtual TransferBufferBase* create(const TransferBufferManagerKey& key) = 0;
virtual ITransferBuffer* access(const TransferBufferManagerKey& key) = 0;
virtual ITransferBuffer* create(const TransferBufferManagerKey& key) = 0;
virtual void remove(const TransferBufferManagerKey& key) = 0;
};
@@ -258,8 +258,8 @@ public:
assert(bufmgr);
assert(!key.isEmpty());
}
TransferBufferBase* access() { return bufmgr_->access(key_); }
TransferBufferBase* create() { return bufmgr_->create(key_); }
ITransferBuffer* access() { return bufmgr_->access(key_); }
ITransferBuffer* create() { return bufmgr_->create(key_); }
void remove() { bufmgr_->remove(key_); }
};
@@ -351,7 +351,7 @@ public:
}
}
TransferBufferBase* access(const TransferBufferManagerKey& key)
ITransferBuffer* access(const TransferBufferManagerKey& key)
{
if (key.isEmpty())
{
@@ -364,7 +364,7 @@ public:
return findFirstDynamic(key);
}
TransferBufferBase* create(const TransferBufferManagerKey& key)
ITransferBuffer* create(const TransferBufferManagerKey& key)
{
if (key.isEmpty())
{
@@ -445,13 +445,13 @@ public:
(void)allocator;
}
TransferBufferBase* access(const TransferBufferManagerKey& key)
ITransferBuffer* access(const TransferBufferManagerKey& key)
{
(void)key;
return NULL;
}
TransferBufferBase* create(const TransferBufferManagerKey& key)
ITransferBuffer* create(const TransferBufferManagerKey& key)
{
(void)key;
return NULL;
@@ -90,7 +90,7 @@ class TransferListenerBase : public LinkedListNode<TransferListenerBase>
const DataTypeDescriptor* const data_type_;
const Crc16 crc_base_; ///< Pre-initialized with data type hash, thus constant
bool checkPayloadCrc(const uint16_t compare_with, const TransferBufferBase& tbb) const;
bool checkPayloadCrc(const uint16_t compare_with, const ITransferBuffer& tbb) const;
protected:
TransferListenerBase(const DataTypeDescriptor* data_type)
@@ -43,7 +43,7 @@ private:
void prepareForNextTransfer();
bool validate(const RxFrame& frame) const;
bool writePayload(const RxFrame& frame, TransferBufferBase& buf);
bool writePayload(const RxFrame& frame, ITransferBuffer& buf);
ResultCode receive(const RxFrame& frame, TransferBufferAccessor& tba);
public:
@@ -10,7 +10,6 @@
#include <uavcan/internal/transport/crc.hpp>
#include <uavcan/internal/transport/transfer.hpp>
#include <uavcan/internal/transport/dispatcher.hpp>
#include <uavcan/internal/transport/transfer_buffer.hpp>
namespace uavcan
{