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

D'OH
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2023-05-17 16:33:52 +02:00
parent 0179c04472
commit f9e8dc6e60
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
linux/payload/PlocMpsocSpecialComHelper.cpp
View File

@ -199,7 +199,7 @@ ReturnValue_t PlocMpsocSpecialComHelper::performFlashRead() {
if (terminate) { if (terminate) {
std::filesystem::remove(flashReadAndWrite.obcFile, e); std::filesystem::remove(flashReadAndWrite.obcFile, e);
// TODO: Might not be needed // TODO: Might not be needed
flashfclose(); // flashfclose();
return returnvalue::OK; return returnvalue::OK;
} }
nextReadSize = mpsoc::MAX_FLASH_READ_DATA_SIZE; nextReadSize = mpsoc::MAX_FLASH_READ_DATA_SIZE;
@ -210,7 +210,7 @@ ReturnValue_t PlocMpsocSpecialComHelper::performFlashRead() {
if (ofile.bad() or not ofile.is_open()) { if (ofile.bad() or not ofile.is_open()) {
std::filesystem::remove(flashReadAndWrite.obcFile, e); std::filesystem::remove(flashReadAndWrite.obcFile, e);
// TODO: Might not be needed // TODO: Might not be needed
flashfclose(); // flashfclose();
return FILE_READ_ERROR; return FILE_READ_ERROR;
} }
mpsoc::TcFlashRead flashReadRequest(spParams, *sequenceCount); mpsoc::TcFlashRead flashReadRequest(spParams, *sequenceCount);
@ -218,14 +218,14 @@ ReturnValue_t PlocMpsocSpecialComHelper::performFlashRead() {
if (result != returnvalue::OK) { if (result != returnvalue::OK) {
std::filesystem::remove(flashReadAndWrite.obcFile, e); std::filesystem::remove(flashReadAndWrite.obcFile, e);
// TODO: Might not be needed // TODO: Might not be needed
flashfclose(); // flashfclose();
return result; return result;
} }
result = flashReadRequest.finishPacket(); result = flashReadRequest.finishPacket();
if (result != returnvalue::OK) { if (result != returnvalue::OK) {
std::filesystem::remove(flashReadAndWrite.obcFile, e); std::filesystem::remove(flashReadAndWrite.obcFile, e);
// TODO: Might not be needed // TODO: Might not be needed
flashfclose(); // flashfclose();
return result; return result;
} }
(*sequenceCount)++; (*sequenceCount)++;
@ -233,7 +233,7 @@ ReturnValue_t PlocMpsocSpecialComHelper::performFlashRead() {
if (result != returnvalue::OK) { if (result != returnvalue::OK) {
std::filesystem::remove(flashReadAndWrite.obcFile, e); std::filesystem::remove(flashReadAndWrite.obcFile, e);
// TODO: Might not be needed // TODO: Might not be needed
flashfclose(); // flashfclose();
return result; return result;
} }
readSoFar += nextReadSize; readSoFar += nextReadSize;

2
linux/payload/plocMpsocHelpers.h
View File

@ -439,7 +439,7 @@ class TcFlashWrite : public TcBase {
class TcFlashRead : public TcBase { class TcFlashRead : public TcBase {
public: public:
TcFlashRead(ploc::SpTcParams params, uint16_t sequenceCount) TcFlashRead(ploc::SpTcParams params, uint16_t sequenceCount)
: TcBase(params, apid::TC_FLASHWRITE, sequenceCount) {} : TcBase(params, apid::TC_FLASHREAD, sequenceCount) {}
ReturnValue_t setPayload(uint32_t readLen) { ReturnValue_t setPayload(uint32_t readLen) {
if (readLen > MAX_FLASH_READ_DATA_SIZE) { if (readLen > MAX_FLASH_READ_DATA_SIZE) {