eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

Updates for new firmware #721

Merged
muellerr merged 11 commits from complete-fw-tests into main-v6 2023-07-01 13:30:29 +02:00
Conversation 1 Commits 11 Files Changed 4 +1 -3
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c881b36630 - Show all commits

4
linux/ipcore/AxiPtmeConfig.cpp
View File

@ -26,8 +26,7 @@ ReturnValue_t AxiPtmeConfig::initialize() {
} }
ReturnValue_t AxiPtmeConfig::writeCaduRateReg(uint8_t rateVal) { ReturnValue_t AxiPtmeConfig::writeCaduRateReg(uint8_t rateVal) {
ReturnValue_t result = returnvalue::OK; ReturnValue_t result = mutex->lockMutex(timeoutType, mutexTimeout);
result = mutex->lockMutex(timeoutType, mutexTimeout);
if (result != returnvalue::OK) { if (result != returnvalue::OK) {
sif::warning << "AxiPtmeConfig::writeCaduRateReg: Failed to lock mutex" << std::endl; sif::warning << "AxiPtmeConfig::writeCaduRateReg: Failed to lock mutex" << std::endl;
return returnvalue::FAILED; return returnvalue::FAILED;
@ -42,7 +41,6 @@ ReturnValue_t AxiPtmeConfig::writeCaduRateReg(uint8_t rateVal) {
} }
uint8_t AxiPtmeConfig::readCaduRateReg() { uint8_t AxiPtmeConfig::readCaduRateReg() {
ReturnValue_t result = returnvalue::OK;
MutexGuard mg(mutex); MutexGuard mg(mutex);
return static_cast<uint8_t>(*(baseAddress + CADU_BITRATE_REG)); return static_cast<uint8_t>(*(baseAddress + CADU_BITRATE_REG));
} }