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

TMTC Refactoring #276

Merged
muellerr merged 64 commits from mueller/tmtc-stack-refactoring into develop 2022-08-24 16:52:23 +02:00
Conversation 3 Commits 64 Files Changed 51 +13 -14
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8ea6df273d - Show all commits

27
linux/devices/devicedefinitions/PlocSupervisorDefinitions.h
View File

@ -1124,22 +1124,8 @@ class WriteMemory : public ploc::SpTcBase {
uint8_t* updateData) {
size_t serializedSize = 0;
uint8_t* data = payloadStart;
SerializeAdapter::serialize(&memoryId, &data, &serializedSize, sizeof(memoryId),
SerializeIF::Endianness::BIG);
serializedSize = 0;
SerializeAdapter::serialize(&n, &data, &serializedSize, sizeof(n),
SerializeIF::Endianness::BIG);
serializedSize = 0;
SerializeAdapter::serialize(&startAddr, &data, &serializedSize, sizeof(startAddr),
SerializeIF::Endianness::BIG);
serializedSize = 0;
SerializeAdapter::serialize(&updateDataLen, &data, &serializedSize, sizeof(updateDataLen),
SerializeIF::Endianness::BIG);
if (updateDataLen % 2 != 0) {
spParams.setPayloadLen(META_DATA_LENGTH + updateDataLen + 1);
// The data field must be two bytes aligned. Thus, in case the number of bytes to write is odd
// a value of zero is added here
*(data + updateDataLen + 1) = 0;
} else {
spParams.setPayloadLen(META_DATA_LENGTH + updateDataLen);
}
@ -1148,7 +1134,20 @@ class WriteMemory : public ploc::SpTcBase {
if (result != HasReturnvaluesIF::RETURN_OK) {
return result;
}
SerializeAdapter::serialize(&memoryId, &data, &serializedSize, sizeof(memoryId),
SerializeIF::Endianness::BIG);
SerializeAdapter::serialize(&n, &data, &serializedSize, sizeof(n),
SerializeIF::Endianness::BIG);
SerializeAdapter::serialize(&startAddr, &data, &serializedSize, sizeof(startAddr),
SerializeIF::Endianness::BIG);
SerializeAdapter::serialize(&updateDataLen, &data, &serializedSize, sizeof(updateDataLen),
SerializeIF::Endianness::BIG);
std::memcpy(data, updateData, updateDataLen);
if (updateDataLen % 2 != 0) {
// The data field must be two bytes aligned. Thus, in case the number of bytes to write is odd
// a value of zero is added here
data[updateDataLen + 1] = 0;
}
return HasReturnvaluesIF::RETURN_OK;
}
};