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

Merge branch 'mueller/comp-branch' into mueller/master

Browse Source
This commit is contained in:
Robin Müller 2022-02-02 20:15:20 +01:00
commit 527dba9a9d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hal/src/fsfw_hal/linux/uio/UioMapper.cpp
View File

@ -9,6 +9,10 @@
#include "fsfw/serviceinterface.h" #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(std::string uioFile, int mapNum) : uioFile(uioFile), mapNum(mapNum) {}
UioMapper::~UioMapper() {} UioMapper::~UioMapper() {}

6
hal/src/fsfw_hal/linux/uio/UioMapper.h
View File

@ -39,9 +39,9 @@ class UioMapper {
ReturnValue_t getMappedAdress(uint32_t** address, Permissions permissions); ReturnValue_t getMappedAdress(uint32_t** address, Permissions permissions);
private: private:
static constexpr char UIO_PATH_PREFIX[] = "/sys/class/uio/"; static const char UIO_PATH_PREFIX[];
static constexpr char MAP_SUBSTR[] = "/maps/map"; static const char MAP_SUBSTR[];
static constexpr char SIZE_FILE_PATH[] = "/size"; static const char SIZE_FILE_PATH[];
static constexpr int SIZE_HEX_STRING = 10; static constexpr int SIZE_HEX_STRING = 10;
std::string uioFile; std::string uioFile;