From 3be45b32ef166456b6d1c2c4073388a2198957c8 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 10 Nov 2022 11:20:27 +0100 Subject: [PATCH] renaming --- linux/devices/ploc/PlocSupvUartMan.cpp | 12 ++++++------ linux/devices/ploc/PlocSupvUartMan.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/linux/devices/ploc/PlocSupvUartMan.cpp b/linux/devices/ploc/PlocSupvUartMan.cpp index 9630d674..a60618e1 100644 --- a/linux/devices/ploc/PlocSupvUartMan.cpp +++ b/linux/devices/ploc/PlocSupvUartMan.cpp @@ -109,7 +109,7 @@ ReturnValue_t PlocSupvHelper::performOperation(uint8_t operationCode) { putTaskToSleep = true; break; } - case InternalState::LONGER_REQUEST: { + case InternalState::DEDICATED_REQUEST: { if (handleRunningLongerRequest() == REQUEST_DONE) { MutexGuard mg(lock); state = InternalState::DEFAULT; @@ -219,7 +219,7 @@ ReturnValue_t PlocSupvHelper::performUpdate(const supv::UpdateParams& params) { update.packetNum = 1; update.deleteMemory = params.deleteMemory; update.sequenceCount = params.seqCount; - state = InternalState::LONGER_REQUEST; + state = InternalState::DEDICATED_REQUEST; request = Request::UPDATE; } return result; @@ -243,7 +243,7 @@ ReturnValue_t PlocSupvHelper::performMemCheck(std::string file, uint8_t memoryId MutexGuard mg(lock); update.file = file; update.fullFileSize = getFileSize(file); - state = InternalState::LONGER_REQUEST; + state = InternalState::DEDICATED_REQUEST; request = Request::CHECK_MEMORY; update.memoryId = memoryId; update.startAddress = startAddress; @@ -261,7 +261,7 @@ ReturnValue_t PlocSupvHelper::initiateUpdateContinuation() { return HasActionsIF::IS_BUSY; } MutexGuard mg(lock); - state = InternalState::LONGER_REQUEST; + state = InternalState::DEDICATED_REQUEST; request = Request::CONTINUE_UPDATE; return returnvalue::OK; } @@ -884,7 +884,7 @@ ReturnValue_t PlocSupvHelper::sendMessage(CookieIF* cookie, const uint8_t* sendD return FAILED; } lock->lockMutex(); - if (state == InternalState::SLEEPING or state == InternalState::LONGER_REQUEST) { + if (state == InternalState::SLEEPING or state == InternalState::DEDICATED_REQUEST) { lock->unlockMutex(); return FAILED; } @@ -979,7 +979,7 @@ ReturnValue_t PlocSupvHelper::tryHdlcParsing() { ReturnValue_t result = parseRecRingBufForHdlc(bytesRead); if (result == returnvalue::OK) { // Packet found, advance read pointer. - if (state == InternalState::LONGER_REQUEST) { + if (state == InternalState::DEDICATED_REQUEST) { decodedRingBuf.writeData(decodedBuf.data(), bytesRead); decodedQueue.insert(bytesRead); } else { diff --git a/linux/devices/ploc/PlocSupvUartMan.h b/linux/devices/ploc/PlocSupvUartMan.h index f8f175d5..30d5fe1f 100644 --- a/linux/devices/ploc/PlocSupvUartMan.h +++ b/linux/devices/ploc/PlocSupvUartMan.h @@ -214,7 +214,7 @@ class PlocSupvHelper : public DeviceCommunicationIF, EventBufferRequest eventBufferReq; - enum class InternalState { SLEEPING, DEFAULT, LONGER_REQUEST, GO_TO_SLEEP }; + enum class InternalState { SLEEPING, DEFAULT, DEDICATED_REQUEST, GO_TO_SLEEP }; enum class Request { DEFAULT,