Merge branch 'mueller/comp-branch' into mueller/master
This commit is contained in:
commit
527dba9a9d
@ -9,6 +9,10 @@
|
||||
|
||||
#include "fsfw/serviceinterface.h"
|
||||
|
||||
const char UioMapper::UIO_PATH_PREFIX[] = "/sys/class/uio/";
|
||||
const char UioMapper::MAP_SUBSTR[] = "/maps/map";
|
||||
const char UioMapper::SIZE_FILE_PATH[] = "/size";
|
||||
|
||||
UioMapper::UioMapper(std::string uioFile, int mapNum) : uioFile(uioFile), mapNum(mapNum) {}
|
||||
|
||||
UioMapper::~UioMapper() {}
|
||||
|
@ -39,9 +39,9 @@ class UioMapper {
|
||||
ReturnValue_t getMappedAdress(uint32_t** address, Permissions permissions);
|
||||
|
||||
private:
|
||||
static constexpr char UIO_PATH_PREFIX[] = "/sys/class/uio/";
|
||||
static constexpr char MAP_SUBSTR[] = "/maps/map";
|
||||
static constexpr char SIZE_FILE_PATH[] = "/size";
|
||||
static const char UIO_PATH_PREFIX[];
|
||||
static const char MAP_SUBSTR[];
|
||||
static const char SIZE_FILE_PATH[];
|
||||
static constexpr int SIZE_HEX_STRING = 10;
|
||||
|
||||
std::string uioFile;
|
||||
|
Loading…
Reference in New Issue
Block a user