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

Convert XMEGA addresses to relative form, in EDBG driver

Browse Source
This commit is contained in:
Nav
2022-12-12 01:14:56 +00:00
parent 91f8cbc931
commit bf8d59644a
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -657,6 +657,11 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
startAddress -= bootSectionStartAddress; startAddress -= bootSectionStartAddress;
} else { } else {
/*
* When using the APPL_FLASH memory type, the address should be relative to the start of the
* application section.
*/
startAddress -= this->targetParameters.appSectionStartAddress.value();
avr8MemoryType = Avr8MemoryType::APPL_FLASH; avr8MemoryType = Avr8MemoryType::APPL_FLASH;
} }
} }
@@ -667,6 +672,11 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
avr8MemoryType = (this->configVariant == Avr8ConfigVariant::MEGAJTAG && this->programmingModeEnabled) avr8MemoryType = (this->configVariant == Avr8ConfigVariant::MEGAJTAG && this->programmingModeEnabled)
? Avr8MemoryType::EEPROM_PAGE ? Avr8MemoryType::EEPROM_PAGE
: Avr8MemoryType::EEPROM; : Avr8MemoryType::EEPROM;
if (this->configVariant == Avr8ConfigVariant::XMEGA) {
// EEPROM addresses should be in relative form, for XMEGA (PDI) targets
startAddress -= this->targetParameters.eepromStartAddress.value();
}
} }
default: { default: {
break; break;
@@ -728,6 +738,11 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
startAddress -= bootSectionStartAddress; startAddress -= bootSectionStartAddress;
} else { } else {
/*
* When using the APPL_FLASH memory type, the address should be relative to the start of the
* application section.
*/
startAddress -= this->targetParameters.appSectionStartAddress.value();
avr8MemoryType = Avr8MemoryType::APPL_FLASH; avr8MemoryType = Avr8MemoryType::APPL_FLASH;
} }
} }
@@ -738,6 +753,11 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
this->configVariant == Avr8ConfigVariant::XMEGA || this->configVariant == Avr8ConfigVariant::UPDI this->configVariant == Avr8ConfigVariant::XMEGA || this->configVariant == Avr8ConfigVariant::UPDI
? Avr8MemoryType::EEPROM_ATOMIC ? Avr8MemoryType::EEPROM_ATOMIC
: Avr8MemoryType::EEPROM; : Avr8MemoryType::EEPROM;
if (this->configVariant == Avr8ConfigVariant::XMEGA) {
// EEPROM addresses should be in relative form, for XMEGA (PDI) targets
startAddress -= this->targetParameters.eepromStartAddress.value();
}
} }
default: { default: {
break; break;