From 8b6ee9f100a50fae93056e7747c63aa13a51878e Mon Sep 17 00:00:00 2001 From: Nav Date: Sun, 27 Feb 2022 20:44:01 +0000 Subject: [PATCH] Tidying --- .../EDBG/AVR/CommandFrames/AVR8Generic/GetParameter.hpp | 2 +- .../EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.cpp | 4 ++-- .../EDBG/AVR/CommandFrames/AVR8Generic/SetParameter.hpp | 4 ++-- .../EDBG/AVR/CommandFrames/HouseKeeping/GetParameter.hpp | 2 +- src/Targets/Microchip/AVR/AVR8/Avr8.hpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/GetParameter.hpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/GetParameter.hpp index 47b7653b..25292f45 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/GetParameter.hpp +++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/GetParameter.hpp @@ -16,7 +16,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames * 2. Version (0x00) * 3. Param context (Avr8Parameter::context) * 4. Param ID (Avr8Parameter::id) - * 5. Param value length (this->size) + * 5. Param value length (size) */ this->payload = { 0x02, diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.cpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.cpp index f86540fd..b27081be 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.cpp +++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.cpp @@ -12,13 +12,13 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames const std::set& excludedAddresses ) { /* - * The read memory command consists of 11/11 + (this->bytes / 8) bytes: + * The read memory command consists of 11 + (bytes / 8) bytes: * 1. Command ID (0x21 for the general read memory command, 0x22 for reading with a mask) * 2. Version (0x00) * 3. Memory type (Avr8MemoryType) * 4. Start address (4 bytes) * 5. Number of bytes to read (4 bytes) - * 6. Mask to apply (this->bytes / 8) - only required if we're using the masked read command (command ID 0x22). + * 6. Mask to apply (bytes / 8) - only required if we're using the masked read command (command ID 0x22). */ this->payload = std::vector(11, 0x00); this->payload[0] = excludedAddresses.empty() ? 0x21 : 0x22; diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetParameter.hpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetParameter.hpp index 9b0cdaff..019cdd25 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetParameter.hpp +++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetParameter.hpp @@ -9,12 +9,12 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames public: SetParameter(const Avr8EdbgParameter& parameter, const std::vector& value) { /* - * The set param command consists of this->value.size() + 5 bytes. The first five bytes consist of: + * The set param command consists of value.size() + 5 bytes. The first five bytes consist of: * 1. Command ID (0x01) * 2. Version (0x00) * 3. Param context (Avr8Parameter::context) * 4. Param ID (Avr8Parameter::id) - * 5. Param value length (this->value.size()) - this is only one byte in size, so its value should + * 5. Param value length (value.size()) - this is only one byte in size, so its value should * never exceed 255. */ this->payload = std::vector(5, 0x00); diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/HouseKeeping/GetParameter.hpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/HouseKeeping/GetParameter.hpp index faa569ba..c32511b6 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/HouseKeeping/GetParameter.hpp +++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/HouseKeeping/GetParameter.hpp @@ -17,7 +17,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames * 2. Version (0x00) * 3. Param context (Parameter::context) * 4. Param ID (Parameter::id) - * 5. Param value length (this->size) + * 5. Param value length (size) */ this->payload = { 0x02, diff --git a/src/Targets/Microchip/AVR/AVR8/Avr8.hpp b/src/Targets/Microchip/AVR/AVR8/Avr8.hpp index d67b6355..b589f3f0 100644 --- a/src/Targets/Microchip/AVR/AVR8/Avr8.hpp +++ b/src/Targets/Microchip/AVR/AVR8/Avr8.hpp @@ -55,7 +55,7 @@ namespace Bloom::Targets::Microchip::Avr::Avr8Bit void setDebugTool(DebugTool* debugTool) override { this->avr8DebugInterface = debugTool->getAvr8DebugInterface(); - }; + } /** * Instances to this target class can be promoted. See Avr8::promote() method for more.