From 43d3ca7e379cf1dd20cd0372cf4883eb468d030a Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Sun, 10 May 2020 21:56:21 +0200 Subject: [PATCH] memory message: no retval CSB: retval --- memory/MemoryMessage.cpp | 3 +-- memory/MemoryMessage.h | 2 +- tmtcservices/CommandingServiceBase.h | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/memory/MemoryMessage.cpp b/memory/MemoryMessage.cpp index c1116e08..f978ed4e 100644 --- a/memory/MemoryMessage.cpp +++ b/memory/MemoryMessage.cpp @@ -31,12 +31,11 @@ ReturnValue_t MemoryMessage::setMemoryDumpReply(CommandMessage* message, store_a return HasReturnvaluesIF::RETURN_OK; } -ReturnValue_t MemoryMessage::setMemoryLoadCommand(CommandMessage* message, +void MemoryMessage::setMemoryLoadCommand(CommandMessage* message, uint32_t address, store_address_t storageID) { message->setCommand(CMD_MEMORY_LOAD); message->setParameter( address ); message->setParameter2( storageID.raw ); - return HasReturnvaluesIF::RETURN_OK; } ReturnValue_t MemoryMessage::getErrorCode(const CommandMessage* message) { diff --git a/memory/MemoryMessage.h b/memory/MemoryMessage.h index 124fad08..bcc262e9 100644 --- a/memory/MemoryMessage.h +++ b/memory/MemoryMessage.h @@ -24,7 +24,7 @@ public: static ReturnValue_t getErrorCode( const CommandMessage* message ); static ReturnValue_t setMemoryDumpCommand( CommandMessage* message, uint32_t address, uint32_t length ); static ReturnValue_t setMemoryDumpReply( CommandMessage* message, store_address_t storageID ); - static ReturnValue_t setMemoryLoadCommand( CommandMessage* message, uint32_t address, store_address_t storageID ); + static void setMemoryLoadCommand( CommandMessage* message, uint32_t address, store_address_t storageID ); static ReturnValue_t setMemoryCheckCommand( CommandMessage* message, uint32_t address, uint32_t length ); static ReturnValue_t setMemoryCheckReply( CommandMessage* message, uint16_t crc ); static ReturnValue_t setMemoryReplyFailed( CommandMessage* message, ReturnValue_t errorCode, Command_t initialCommand ); diff --git a/tmtcservices/CommandingServiceBase.h b/tmtcservices/CommandingServiceBase.h index 6b76bdab..259ed1a3 100644 --- a/tmtcservices/CommandingServiceBase.h +++ b/tmtcservices/CommandingServiceBase.h @@ -212,6 +212,8 @@ protected: */ PeriodicTaskIF* executingTask; + // todo: why do these functions not have returnvalues? the caller should be + // able to check whether the send operations actually work. /** * Send TM data from pointer to data. If a header is supplied it is added before data * @param subservice Number of subservice