From 08bc12a26b087e6da86979357bd66eecb4832e20 Mon Sep 17 00:00:00 2001 From: Nav Date: Sun, 11 Dec 2022 23:27:08 +0000 Subject: [PATCH] Deleted redundant AVR8 ProgrammingSession struct --- src/Targets/Microchip/AVR/AVR8/Avr8.cpp | 6 +++--- src/Targets/Microchip/AVR/AVR8/Avr8.hpp | 3 +-- src/Targets/Microchip/AVR/AVR8/ProgrammingSession.hpp | 11 ----------- 3 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 src/Targets/Microchip/AVR/AVR8/ProgrammingSession.hpp diff --git a/src/Targets/Microchip/AVR/AVR8/Avr8.cpp b/src/Targets/Microchip/AVR/AVR8/Avr8.cpp index bdea2c0c..47c467b7 100644 --- a/src/Targets/Microchip/AVR/AVR8/Avr8.cpp +++ b/src/Targets/Microchip/AVR/AVR8/Avr8.cpp @@ -592,16 +592,16 @@ namespace Bloom::Targets::Microchip::Avr::Avr8Bit void Avr8::enableProgrammingMode() { this->avr8DebugInterface->enableProgrammingMode(); - this->programmingSession = ProgrammingSession(); + this->progModeEnabled = true; } void Avr8::disableProgrammingMode() { this->avr8DebugInterface->disableProgrammingMode(); - this->programmingSession = std::nullopt; + this->progModeEnabled = false; } bool Avr8::programmingModeEnabled() { - return this->programmingSession.has_value(); + return this->progModeEnabled; } void Avr8::initFromTargetDescriptionFile() { diff --git a/src/Targets/Microchip/AVR/AVR8/Avr8.hpp b/src/Targets/Microchip/AVR/AVR8/Avr8.hpp index d4052a31..44bc819c 100644 --- a/src/Targets/Microchip/AVR/AVR8/Avr8.hpp +++ b/src/Targets/Microchip/AVR/AVR8/Avr8.hpp @@ -14,7 +14,6 @@ #include "Family.hpp" #include "TargetParameters.hpp" #include "PadDescriptor.hpp" -#include "ProgrammingSession.hpp" #include "ProgramMemorySection.hpp" #include "src/Targets/TargetRegister.hpp" @@ -152,7 +151,7 @@ namespace Bloom::Targets::Microchip::Avr::Avr8Bit std::map targetRegisterDescriptorsByType; std::map targetMemoryDescriptorsByType; - std::optional programmingSession; + bool progModeEnabled = false; /** * Initiates the AVR8 instance from data extracted from the TDF. diff --git a/src/Targets/Microchip/AVR/AVR8/ProgrammingSession.hpp b/src/Targets/Microchip/AVR/AVR8/ProgrammingSession.hpp deleted file mode 100644 index 3e76ee51..00000000 --- a/src/Targets/Microchip/AVR/AVR8/ProgrammingSession.hpp +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -namespace Bloom::Targets::Microchip::Avr::Avr8Bit -{ - struct ProgrammingSession - { - bool chipErased = false; - bool applicationSectionErased = false; - bool bootSectionErased = false; - }; -}