KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

srv23 taken over

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
memory/FileSystemMessage.cpp
View File

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

24
memory/FileSystemMessage.h
View File

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

3
pus/Service2DeviceAccess.cpp
View File

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