srv23 taken over

This commit is contained in:
Robin Müller 2020-09-19 19:50:02 +02:00
parent 44989ada64
commit 9e9bde0395
3 changed files with 13 additions and 25 deletions

View File

@ -1,12 +1,5 @@
/* #include "FileSystemMessage.h"
* FileSystemMessage.cpp #include "../objectmanager/ObjectManagerIF.h"
*
* Created on: 19.01.2020
* Author: Jakob Meier
*/
#include <framework/memory/FileSystemMessage.h>
#include <framework/objectmanager/ObjectManagerIF.h>
ReturnValue_t FileSystemMessage::setDeleteFileCommand( ReturnValue_t FileSystemMessage::setDeleteFileCommand(

View File

@ -1,17 +1,13 @@
/* #ifndef FSFW_MEMORY_FILESYSTEMMESSAGE_H_
* FileSystemMessage.h #define FSFW_MEMORY_FILESYSTEMMESSAGE_H_
*
* Created on: 19.01.2020 #include "../ipc/CommandMessage.h"
* Author: Jakob Meier #include "../storagemanager/StorageManagerIF.h"
#include "../objectmanager/SystemObject.h"
/**
* @author Jakob Meier
*/ */
#ifndef FRAMEWORK_MEMORY_FILESYSTEMMESSAGE_H_
#define FRAMEWORK_MEMORY_FILESYSTEMMESSAGE_H_
#include <framework/ipc/CommandMessage.h>
#include <framework/storagemanager/StorageManagerIF.h>
#include <framework/objectmanager/SystemObject.h>
class FileSystemMessage { class FileSystemMessage {
private: private:
FileSystemMessage(); //A private ctor inhibits instantiation FileSystemMessage(); //A private ctor inhibits instantiation
@ -37,4 +33,4 @@ public:
static void setCompletionReply(CommandMessage* message, Command_t completionStatus); static void setCompletionReply(CommandMessage* message, Command_t completionStatus);
}; };
#endif /* FRAMEWORK_MEMORY_FILESYSTEMMESSAGE_H_ */ #endif /* FSFW_MEMORY_FILESYSTEMMESSAGE_H_ */

View File

@ -39,8 +39,7 @@ ReturnValue_t Service2DeviceAccess::getMessageQueueAndObject(
SerializeAdapter::deSerialize(objectId, &tcData, SerializeAdapter::deSerialize(objectId, &tcData,
&tcDataLen, SerializeIF::Endianness::BIG); &tcDataLen, SerializeIF::Endianness::BIG);
ReturnValue_t result = checkInterfaceAndAcquireMessageQueue(id,objectId); return checkInterfaceAndAcquireMessageQueue(id,objectId);
return result;
} }
ReturnValue_t Service2DeviceAccess::checkInterfaceAndAcquireMessageQueue( ReturnValue_t Service2DeviceAccess::checkInterfaceAndAcquireMessageQueue(