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

Renamed nvmBaseAddress to nvmModuleBaseAddress

Browse Source
This commit is contained in:
Nav
2022-06-02 23:00:27 +01:00
parent 5eabf145c2
commit 4ab836f158
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build/scripts/TargetDescriptionFiles/AVR8/Avr8TargetDescriptionFile.php
View File

@@ -61,7 +61,7 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
public ?int $lockRegistersPdiOffset = null;
public ?int $userSignaturesPdiOffset = null;
public ?int $productSignaturesPdiOffset = null;
public ?int $nvmBaseAddress = null;
public ?int $nvmModuleBaseAddress = null;
// UPDI specific target params
public ?int $ocdBaseAddress = null;
@@ -472,7 +472,7 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
$nvmInstance = $nvmModule->instancesMappedByName['nvm'];
if (isset($nvmInstance->registerGroupsMappedByName['nvm'])) {
$this->nvmBaseAddress = $nvmInstance->registerGroupsMappedByName['nvm']->offset;
$this->nvmModuleBaseAddress = $nvmInstance->registerGroupsMappedByName['nvm']->offset;
}
}
}
@@ -486,7 +486,7 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
$nvmInstance = $nvmModule->instancesMappedByName['nvmctrl'];
if (isset($nvmInstance->registerGroupsMappedByName['nvmctrl'])) {
$this->nvmBaseAddress = $nvmInstance->registerGroupsMappedByName['nvmctrl']->offset;
$this->nvmModuleBaseAddress = $nvmInstance->registerGroupsMappedByName['nvmctrl']->offset;
}
}
}
@@ -718,13 +718,13 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
$failures[] = 'Missing lock registers PDI offset.';
}
if (is_null($this->nvmBaseAddress)) {
if (is_null($this->nvmModuleBaseAddress)) {
$failures[] = 'Missing NVM start address.';
}
}
if (in_array(Avr8TargetDescriptionFile::AVR8_PHYSICAL_INTERFACE_UPDI, $this->debugPhysicalInterface)) {
if (is_null($this->nvmBaseAddress)) {
if (is_null($this->nvmModuleBaseAddress)) {
$failures[] = 'Missing NVM base address.';
}

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

@@ -1023,7 +1023,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
throw DeviceInitializationFailure("Missing required parameter: EEPROM_PAGE_SIZE");
}
if (!this->targetParameters.nvmBaseAddress.has_value()) {
if (!this->targetParameters.nvmModuleBaseAddress.has_value()) {
throw DeviceInitializationFailure("Missing required parameter: NVM_BASE");
}
@@ -1108,7 +1108,8 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
Logger::debug("Setting NVM_BASE AVR8 parameter");
this->setParameter(
Avr8EdbgParameters::DEVICE_XMEGA_NVM_BASE,
this->targetParameters.nvmBaseAddress.value()
this->targetParameters.nvmModuleBaseAddress.value()
);
);
}
@@ -1172,11 +1173,11 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
);
}
if (this->targetParameters.nvmBaseAddress.has_value()) {
if (this->targetParameters.nvmModuleBaseAddress.has_value()) {
Logger::debug("Setting DEVICE_UPDI_NVMCTRL_ADDR AVR8 parameter");
this->setParameter(
Avr8EdbgParameters::DEVICE_UPDI_NVMCTRL_ADDR,
this->targetParameters.nvmBaseAddress.value()
this->targetParameters.nvmModuleBaseAddress.value()
);
}

4
src/Targets/Microchip/AVR/AVR8/TargetDescription/TargetDescriptionFile.cpp
View File

@@ -1226,7 +1226,7 @@ namespace Bloom::Targets::Microchip::Avr::Avr8Bit::TargetDescription
const auto& nvmInstance = nvmModule.instancesMappedByName.at("nvm");
if (nvmInstance.registerGroupsMappedByName.contains("nvm")) {
targetParameters.nvmBaseAddress = nvmInstance.registerGroupsMappedByName.at("nvm").offset;
targetParameters.nvmModuleBaseAddress = nvmInstance.registerGroupsMappedByName.at("nvm").offset;
}
}
}
@@ -1245,7 +1245,7 @@ namespace Bloom::Targets::Microchip::Avr::Avr8Bit::TargetDescription
const auto& nvmCtrlInstance = nvmCtrlModule.instancesMappedByName.at("nvmctrl");
if (nvmCtrlInstance.registerGroupsMappedByName.contains("nvmctrl")) {
targetParameters.nvmBaseAddress = nvmCtrlInstance.registerGroupsMappedByName.at(
targetParameters.nvmModuleBaseAddress = nvmCtrlInstance.registerGroupsMappedByName.at(
"nvmctrl"
).offset;
}

2
src/Targets/Microchip/AVR/AVR8/TargetParameters.hpp
View File

@@ -52,7 +52,7 @@ namespace Bloom::Targets::Microchip::Avr::Avr8Bit
std::optional<std::uint32_t> lockRegistersPdiOffset;
std::optional<std::uint32_t> userSignaturesPdiOffset;
std::optional<std::uint32_t> productSignaturesPdiOffset;
std::optional<std::uint16_t> nvmBaseAddress;
std::optional<std::uint16_t> nvmModuleBaseAddress;
// UPDI specific target params
std::optional<std::uint16_t> ocdModuleAddress;