From f9e8dc6e6016fee7b4514c10a1e4ef59d27ada8d Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Wed, 17 May 2023 16:33:52 +0200
Subject: [PATCH] D'OH

---
 linux/payload/PlocMpsocSpecialComHelper.cpp | 10 +++++-----
 linux/payload/plocMpsocHelpers.h            |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/linux/payload/PlocMpsocSpecialComHelper.cpp b/linux/payload/PlocMpsocSpecialComHelper.cpp
index 20e9acca..0d29db14 100644
--- a/linux/payload/PlocMpsocSpecialComHelper.cpp
+++ b/linux/payload/PlocMpsocSpecialComHelper.cpp
@@ -199,7 +199,7 @@ ReturnValue_t PlocMpsocSpecialComHelper::performFlashRead() {
     if (terminate) {
       std::filesystem::remove(flashReadAndWrite.obcFile, e);
       // TODO: Might not be needed
-      flashfclose();
+      // flashfclose();
       return returnvalue::OK;
     }
     nextReadSize = mpsoc::MAX_FLASH_READ_DATA_SIZE;
@@ -210,7 +210,7 @@ ReturnValue_t PlocMpsocSpecialComHelper::performFlashRead() {
     if (ofile.bad() or not ofile.is_open()) {
       std::filesystem::remove(flashReadAndWrite.obcFile, e);
       // TODO: Might not be needed
-      flashfclose();
+      // flashfclose();
       return FILE_READ_ERROR;
     }
     mpsoc::TcFlashRead flashReadRequest(spParams, *sequenceCount);
@@ -218,14 +218,14 @@ ReturnValue_t PlocMpsocSpecialComHelper::performFlashRead() {
     if (result != returnvalue::OK) {
       std::filesystem::remove(flashReadAndWrite.obcFile, e);
       // TODO: Might not be needed
-      flashfclose();
+      // flashfclose();
       return result;
     }
     result = flashReadRequest.finishPacket();
     if (result != returnvalue::OK) {
       std::filesystem::remove(flashReadAndWrite.obcFile, e);
       // TODO: Might not be needed
-      flashfclose();
+      // flashfclose();
       return result;
     }
     (*sequenceCount)++;
@@ -233,7 +233,7 @@ ReturnValue_t PlocMpsocSpecialComHelper::performFlashRead() {
     if (result != returnvalue::OK) {
       std::filesystem::remove(flashReadAndWrite.obcFile, e);
       // TODO: Might not be needed
-      flashfclose();
+      // flashfclose();
       return result;
     }
     readSoFar += nextReadSize;
diff --git a/linux/payload/plocMpsocHelpers.h b/linux/payload/plocMpsocHelpers.h
index 4a6e6b5c..9ed5b3f0 100644
--- a/linux/payload/plocMpsocHelpers.h
+++ b/linux/payload/plocMpsocHelpers.h
@@ -439,7 +439,7 @@ class TcFlashWrite : public TcBase {
 class TcFlashRead : public TcBase {
  public:
   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) {
     if (readLen > MAX_FLASH_READ_DATA_SIZE) {