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

Tidying

Browse Source
This commit is contained in:
Nav
2022-01-16 18:54:58 +00:00
parent b9d05e03eb
commit ae00ed8013
6 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrCommand.hpp
View File

@@ -1,6 +1,7 @@
#pragma once
#include <vector>
#include <cstdint>
#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/Command.hpp"
@@ -20,19 +21,19 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
*/
[[nodiscard]] std::vector<unsigned char> getData() const override;
[[nodiscard]] size_t getFragmentNumber() const {
[[nodiscard]] std::size_t getFragmentNumber() const {
return this->fragmentNumber;
}
void setFragmentNumber(size_t fragmentNumber) {
void setFragmentNumber(std::size_t fragmentNumber) {
this->fragmentNumber = fragmentNumber;
}
[[nodiscard]] size_t getFragmentCount() const {
[[nodiscard]] std::size_t getFragmentCount() const {
return this->fragmentCount;
}
void setFragmentCount(size_t fragmentCount) {
void setFragmentCount(std::size_t fragmentCount) {
this->fragmentCount = fragmentCount;
}
@@ -45,8 +46,8 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
}
private:
size_t fragmentNumber = 1;
size_t fragmentCount = 1;
std::size_t fragmentNumber = 1;
std::size_t fragmentCount = 1;
std::vector<unsigned char> commandPacket;
};

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

@@ -2,7 +2,7 @@
#include <cstdint>
#include <thread>
#include <math.h>
#include <cmath>
#include "src/Exceptions/InvalidConfig.hpp"
#include "src/TargetController/Exceptions/DeviceInitializationFailure.hpp"
@@ -58,7 +58,7 @@ void EdbgAvr8Interface::configure(const TargetConfig& targetConfig) {
if (physicalInterface.empty()
|| availablePhysicalInterfaces.find(physicalInterface) == availablePhysicalInterfaces.end()
) {
throw InvalidConfig("Invalid physical interface config parameter for AVR8 target.");
throw InvalidConfig("Invalid or missing physical interface config parameter for AVR8 target.");
}
auto selectedPhysicalInterface = availablePhysicalInterfaces.find(physicalInterface)->second;
@@ -535,8 +535,9 @@ void EdbgAvr8Interface::writeRegisters(const Targets::TargetRegisters& registers
if (registerValue.size() > registerDescriptor.size) {
throw Exception("Register value exceeds size specified by register descriptor.");
}
} else if (registerValue.size() < registerDescriptor.size) {
if (registerValue.size() < registerDescriptor.size) {
// Fill the missing most-significant bytes with 0x00
registerValue.insert(registerValue.begin(), registerDescriptor.size - registerValue.size(), 0x00);
}
@@ -1476,7 +1477,7 @@ void EdbgAvr8Interface::refreshTargetState() {
auto avrEvent = this->getAvrEvent();
if (avrEvent != nullptr && avrEvent->getEventId() == AvrEventId::AVR8_BREAK_EVENT) {
auto breakEvent = dynamic_cast<BreakEvent*>(avrEvent.get());
auto* breakEvent = dynamic_cast<BreakEvent*>(avrEvent.get());
if (breakEvent == nullptr) {
throw Exception("Failed to process AVR8 break event");