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

AVR8 EDBG memory types for programming mode

Browse Source
This commit is contained in:
Nav
2022-05-23 23:48:44 +01:00
parent 644724a529
commit 046eefb6e4
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -570,6 +570,13 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
std::uint32_t bytes, std::uint32_t bytes,
const std::set<Targets::TargetMemoryAddressRange>& excludedAddressRanges const std::set<Targets::TargetMemoryAddressRange>& excludedAddressRanges
) { ) {
if (
this->programmingModeEnabled
&& (memoryType == TargetMemoryType::RAM || memoryType == TargetMemoryType::EEPROM)
) {
throw Exception("Cannot access RAM or EEPROM when programming mode is enabled");
}
auto avr8MemoryType = Avr8MemoryType::SRAM; auto avr8MemoryType = Avr8MemoryType::SRAM;
switch (memoryType) { switch (memoryType) {
@@ -581,14 +588,14 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
if (this->configVariant == Avr8ConfigVariant::DEBUG_WIRE) { if (this->configVariant == Avr8ConfigVariant::DEBUG_WIRE) {
avr8MemoryType = Avr8MemoryType::FLASH_PAGE; avr8MemoryType = Avr8MemoryType::FLASH_PAGE;
} else if (this->configVariant == Avr8ConfigVariant::MEGAJTAG) {
avr8MemoryType = this->programmingModeEnabled ? Avr8MemoryType::FLASH_PAGE : Avr8MemoryType::SPM;
} else if ( } else if (
this->configVariant == Avr8ConfigVariant::XMEGA this->configVariant == Avr8ConfigVariant::XMEGA
|| this->configVariant == Avr8ConfigVariant::UPDI || this->configVariant == Avr8ConfigVariant::UPDI
) { ) {
avr8MemoryType = Avr8MemoryType::APPL_FLASH; avr8MemoryType = Avr8MemoryType::APPL_FLASH;
} else {
avr8MemoryType = Avr8MemoryType::SPM;
} }
break; break;
} }