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

Added eraseProgramMemorySection() function to Avr8 debug interface - to erase XMEGA program memory sections when necessary

Browse Source
This commit is contained in:
Nav
2022-06-03 15:49:12 +01:00
parent 012d987454
commit 1c92a02950
6 changed files with 101 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -720,6 +720,24 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
return this->writeMemory(avr8MemoryType, startAddress, buffer);
}
void EdbgAvr8Interface::eraseProgramMemorySection(ProgramMemorySection section) {
if (this->configVariant != Avr8ConfigVariant::XMEGA) {
throw Exception("AVR8 erase command not supported for non-XMEGA config variants.");
}
auto response = this->edbgInterface.sendAvrCommandFrameAndWaitForResponseFrame(
EraseMemory(
section == ProgramMemorySection::BOOT
? Avr8EraseMemoryMode::BOOT_SECTION
: Avr8EraseMemoryMode::APPLICATION_SECTION
)
);
if (response.getResponseId() == Avr8ResponseId::FAILED) {
throw Avr8CommandFailure("AVR8 erase memory command failed", response);
}
}
TargetState EdbgAvr8Interface::getTargetState() {
/*
* We are not informed when a target goes from a stopped state to a running state, so there is no need
@@ -745,13 +763,6 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
}
this->programmingModeEnabled = true;
if (this->configVariant == Avr8ConfigVariant::XMEGA) {
Logger::warning(
"The entire application section of program memory will be erased, in preparation for programming"
);
this->eraseMemory(Avr8EraseMemoryMode::APPLICATION_SECTION);
}
}
void EdbgAvr8Interface::disableProgrammingMode() {
@@ -1754,15 +1765,6 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
throw Avr8CommandFailure("AVR8 Write memory command failed", response);
}
}
void EdbgAvr8Interface::eraseMemory(Avr8EraseMemoryMode mode) {
auto response = this->edbgInterface.sendAvrCommandFrameAndWaitForResponseFrame(
EraseMemory(mode)
);
if (response.getResponseId() == Avr8ResponseId::FAILED) {
throw Avr8CommandFailure("AVR8 erase memory command failed", response);
}
}

14
src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.hpp
View File

@@ -242,6 +242,13 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
const Targets::TargetMemoryBuffer& buffer
) override;
/**
* Issues the "Erase" command to erase a particular section of program memory.
*
* @param section
*/
void eraseProgramMemorySection(Targets::Microchip::Avr::Avr8Bit::ProgramMemorySection section) override;
/**
* Returns the current state of the target.
*
@@ -536,13 +543,6 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
*/
void writeMemory(Avr8MemoryType type, std::uint32_t address, const Targets::TargetMemoryBuffer& buffer);
/**
* Erases a particular region of memory, depending on the value of mode.
*
* @param mode
*/
void eraseMemory(Avr8EraseMemoryMode mode);
/**
* Fetches the current target state.
*