doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved programming mode requirement for fuse programming into EDBG driver, as it is specific to that driver

Browse Source
This commit is contained in:
Nav
2023-05-28 21:27:01 +01:00
parent a3fa436e52
commit 216a1357b7
2 changed files with 125 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp
View File

@@ -1670,6 +1670,11 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
}
}
const auto managingProgrammingMode = type == Avr8MemoryType::FUSES && !this->programmingModeEnabled;
if (managingProgrammingMode) {
this->enableProgrammingMode();
}
if (!excludedAddresses.empty() && (this->avoidMaskedMemoryRead || type != Avr8MemoryType::SRAM)) {
/*
* Driver-side masked memory read.
@@ -1770,6 +1775,10 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
)
);
if (managingProgrammingMode) {
this->disableProgrammingMode();
}
if (responseFrame.id == Avr8ResponseId::FAILED) {
throw Avr8CommandFailure("AVR8 Read memory command failed", responseFrame);
}
@@ -1794,6 +1803,11 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
}
}
const auto managingProgrammingMode = type == Avr8MemoryType::FUSES && !this->programmingModeEnabled;
if (managingProgrammingMode) {
this->enableProgrammingMode();
}
const auto bytes = static_cast<TargetMemorySize>(buffer.size());
if (this->alignmentRequired(type)) {
@@ -1852,6 +1866,16 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
)
);
// We must disable and re-enable programming mode, in order for the changes to the fuse bit to take effect.
if (type == Avr8MemoryType::FUSES) {
this->disableProgrammingMode();
if (!managingProgrammingMode) {
this->enableProgrammingMode();
}
}
if (responseFrame.id == Avr8ResponseId::FAILED) {
throw Avr8CommandFailure("AVR8 Write memory command failed", responseFrame);
}