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

Writeprotection handler in CoreController #87

Merged
meierj merged 13 commits from mueller/writeprotect-handler into develop 2021-08-20 11:08:25 +02:00
Conversation 0 Commits 13 Files Changed 9 +5 -5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ef75d92415 - Show all commits

10
bsp_q7s/core/CoreController.h
View File

@ -58,7 +58,7 @@ public:
void performControlOperation() override; void performControlOperation() override;
/** /**
* Generate a file containing the chip lock/unlock states inside /tmp/chip_status.txt * Generate a file containing the chip lock/unlock states inside /tmp/chip_prot_status.txt
* @return * @return
*/ */
static ReturnValue_t generateChipStateFile(); static ReturnValue_t generateChipStateFile();
@ -68,11 +68,11 @@ public:
ReturnValue_t updateProtInfo(bool regenerateChipStateFile = true); ReturnValue_t updateProtInfo(bool regenerateChipStateFile = true);
/** /**
* Checks whether the target chip and copy are writeprotected and protect them if they are * Checks whether the target chip and copy are write protected and protect set them to a target
* not * state where applicable.
* @param targetChip * @param targetChip
* @param targetCopy * @param targetCopy
* @param protect * @param protect Target state
* @param protOperationPerformed [out] Can be used to determine whether any operation * @param protOperationPerformed [out] Can be used to determine whether any operation
* was performed * was performed
* @param updateProtFile Specify whether the protection info file is updated * @param updateProtFile Specify whether the protection info file is updated
@ -145,6 +145,7 @@ private:
* Index 3: Chip 1 Copy 1 * Index 3: Chip 1 Copy 1
*/ */
std::array<bool, 4> protArray; std::array<bool, 4> protArray;
PeriodicOperationDivider opDivider;
ReturnValue_t initializeLocalDataPool(localpool::DataPool& localDataPoolMap, ReturnValue_t initializeLocalDataPool(localpool::DataPool& localDataPoolMap,
LocalDataPoolManager& poolManager) override; LocalDataPoolManager& poolManager) override;
@ -172,7 +173,6 @@ private:
const uint8_t *data, size_t size); const uint8_t *data, size_t size);
ReturnValue_t actionPerformReboot(const uint8_t *data, size_t size); ReturnValue_t actionPerformReboot(const uint8_t *data, size_t size);
PeriodicOperationDivider opDivider;
void performWatchdogControlOperation(); void performWatchdogControlOperation();
ReturnValue_t handleProtInfoUpdateLine(std::string nextLine); ReturnValue_t handleProtInfoUpdateLine(std::string nextLine);