From 55d3fe76e00770f81fff363f746e3962e66b74d8 Mon Sep 17 00:00:00 2001 From: Nav Date: Fri, 17 Nov 2023 22:20:39 +0000 Subject: [PATCH] Moved EDBG protocol code to more appropriate directory. Updated necessary namespaces. Other bits of tidying. --- src/DebugToolDrivers/CMakeLists.txt | 38 ++++++------- src/DebugToolDrivers/Microchip/EdbgDevice.cpp | 12 ++-- src/DebugToolDrivers/Microchip/EdbgDevice.hpp | 16 +++--- .../Protocols}/EDBG/AVR/Avr8Generic.hpp | 2 +- .../Protocols}/EDBG/AVR/AvrCommand.cpp | 2 +- .../Protocols}/EDBG/AVR/AvrCommand.hpp | 6 +- .../Protocols}/EDBG/AVR/AvrEvent.cpp | 2 +- .../Protocols}/EDBG/AVR/AvrEvent.hpp | 4 +- .../Protocols}/EDBG/AVR/AvrEventCommand.hpp | 4 +- .../Protocols}/EDBG/AVR/AvrResponse.cpp | 2 +- .../Protocols}/EDBG/AVR/AvrResponse.hpp | 4 +- .../EDBG/AVR/AvrResponseCommand.hpp | 4 +- .../AVR8Generic/ActivatePhysical.hpp | 2 +- .../AVR/CommandFrames/AVR8Generic/Attach.hpp | 2 +- .../AVR8Generic/Avr8GenericCommandFrame.hpp | 8 +-- .../ClearAllSoftwareBreakpoints.hpp | 2 +- .../AVR8Generic/ClearHardwareBreakpoint.hpp | 2 +- .../AVR8Generic/ClearSoftwareBreakpoints.hpp | 2 +- .../AVR8Generic/DeactivatePhysical.hpp | 2 +- .../AVR/CommandFrames/AVR8Generic/Detach.hpp | 2 +- .../AVR8Generic/DisableDebugWire.hpp | 2 +- .../AVR8Generic/EnterProgrammingMode.hpp | 2 +- .../CommandFrames/AVR8Generic/EraseMemory.hpp | 2 +- .../CommandFrames/AVR8Generic/GetDeviceId.hpp | 2 +- .../AVR8Generic/GetParameter.hpp | 2 +- .../AVR8Generic/GetProgramCounter.hpp | 2 +- .../AVR8Generic/LeaveProgrammingMode.hpp | 2 +- .../CommandFrames/AVR8Generic/ReadMemory.cpp | 2 +- .../CommandFrames/AVR8Generic/ReadMemory.hpp | 2 +- .../AVR/CommandFrames/AVR8Generic/Reset.hpp | 2 +- .../AVR/CommandFrames/AVR8Generic/Run.hpp | 2 +- .../AVR/CommandFrames/AVR8Generic/RunTo.hpp | 2 +- .../AVR8Generic/SetHardwareBreakpoint.hpp | 2 +- .../AVR8Generic/SetParameter.hpp | 2 +- .../AVR8Generic/SetProgramCounter.hpp | 2 +- .../AVR8Generic/SetSoftwareBreakpoints.hpp | 2 +- .../SetXmegaSoftwareBreakpoint.hpp | 2 +- .../AVR/CommandFrames/AVR8Generic/Step.hpp | 2 +- .../AVR/CommandFrames/AVR8Generic/Stop.hpp | 2 +- .../CommandFrames/AVR8Generic/WriteMemory.hpp | 2 +- .../AVRISP/AvrIspCommandFrame.hpp | 8 +-- .../AVRISP/EnterProgrammingMode.hpp | 2 +- .../AVRISP/LeaveProgrammingMode.hpp | 2 +- .../AVR/CommandFrames/AVRISP/ProgramFuse.hpp | 2 +- .../AVR/CommandFrames/AVRISP/ReadFuse.hpp | 2 +- .../AVR/CommandFrames/AVRISP/ReadLock.hpp | 2 +- .../CommandFrames/AVRISP/ReadSignature.hpp | 2 +- .../AVR/CommandFrames/AvrCommandFrame.hpp | 8 +-- .../AVR/CommandFrames/AvrCommandFrames.hpp | 0 .../Discovery/DiscoveryCommandFrame.hpp | 6 +- .../AVR/CommandFrames/Discovery/Query.hpp | 2 +- .../EDBGControl/EdbgControlCommandFrame.hpp | 6 +- .../EDBGControl/GetParameter.hpp | 2 +- .../EDBGControl/SetParameter.hpp | 2 +- .../CommandFrames/HouseKeeping/EndSession.hpp | 2 +- .../HouseKeeping/GetParameter.hpp | 2 +- .../HouseKeeping/HouseKeepingCommandFrame.hpp | 6 +- .../CommandFrames/HouseKeeping/Parameters.hpp | 2 +- .../HouseKeeping/StartSession.hpp | 2 +- .../Protocols}/EDBG/AVR/EdbgAvr8Interface.cpp | 57 +++++++++---------- .../Protocols}/EDBG/AVR/EdbgAvr8Interface.hpp | 10 ++-- .../EDBG/AVR/EdbgAvrIspInterface.cpp | 14 ++--- .../EDBG/AVR/EdbgAvrIspInterface.hpp | 4 +- .../AVR/Events/AVR8Generic/BreakEvent.cpp | 2 +- .../AVR/Events/AVR8Generic/BreakEvent.hpp | 4 +- .../AVR/Exceptions/Avr8CommandFailure.hpp | 4 +- .../AVR8Generic/Avr8GenericResponseFrame.cpp | 2 +- .../AVR8Generic/Avr8GenericResponseFrame.hpp | 6 +- .../AVR8Generic/GetDeviceId.cpp | 2 +- .../AVR8Generic/GetDeviceId.hpp | 2 +- .../AVR8Generic/GetProgramCounter.hpp | 2 +- .../ResponseFrames/AVR8Generic/ReadMemory.hpp | 2 +- .../AVRISP/AvrIspResponseFrame.cpp | 2 +- .../AVRISP/AvrIspResponseFrame.hpp | 4 +- .../AVR/ResponseFrames/AvrResponseFrame.cpp | 2 +- .../AVR/ResponseFrames/AvrResponseFrame.hpp | 7 +-- .../Discovery/DiscoveryResponseFrame.cpp | 2 +- .../Discovery/DiscoveryResponseFrame.hpp | 4 +- .../EDBGControl/EdbgControlResponseFrame.cpp | 2 +- .../EDBGControl/EdbgControlResponseFrame.hpp | 4 +- .../HouseKeepingResponseFrame.cpp | 2 +- .../HouseKeepingResponseFrame.hpp | 4 +- .../Protocols}/EDBG/Edbg.hpp | 2 +- .../Protocols}/EDBG/EdbgInterface.cpp | 12 ++-- .../Protocols}/EDBG/EdbgInterface.hpp | 34 +++++------ .../EdbgTargetPowerManagementInterface.cpp | 12 ++-- .../EdbgTargetPowerManagementInterface.hpp | 4 +- .../Protocols/CMSIS-DAP/CmsisDapInterface.cpp | 8 +-- .../Protocols/CMSIS-DAP/CmsisDapInterface.hpp | 12 ++-- 89 files changed, 223 insertions(+), 223 deletions(-) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/Avr8Generic.hpp (99%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/AvrCommand.cpp (93%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/AvrCommand.hpp (82%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/AvrEvent.cpp (95%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/AvrEvent.hpp (75%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/AvrEventCommand.hpp (63%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/AvrResponse.cpp (95%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/AvrResponse.hpp (71%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/AvrResponseCommand.hpp (88%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/ActivatePhysical.hpp (87%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/Attach.hpp (87%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/Avr8GenericCommandFrame.hpp (50%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/ClearAllSoftwareBreakpoints.hpp (86%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/ClearHardwareBreakpoint.hpp (88%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/ClearSoftwareBreakpoints.hpp (92%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/DeactivatePhysical.hpp (85%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/Detach.hpp (84%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/DisableDebugWire.hpp (85%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/EnterProgrammingMode.hpp (85%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/EraseMemory.hpp (90%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/GetDeviceId.hpp (87%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/GetParameter.hpp (90%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/GetProgramCounter.hpp (88%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/LeaveProgrammingMode.hpp (85%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.cpp (96%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.hpp (86%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/Reset.hpp (88%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/Run.hpp (84%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/RunTo.hpp (91%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/SetHardwareBreakpoint.hpp (93%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/SetParameter.hpp (93%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/SetProgramCounter.hpp (90%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/SetSoftwareBreakpoints.hpp (92%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/SetXmegaSoftwareBreakpoint.hpp (90%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/Step.hpp (88%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/Stop.hpp (88%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVR8Generic/WriteMemory.hpp (95%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVRISP/AvrIspCommandFrame.hpp (50%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVRISP/EnterProgrammingMode.hpp (95%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVRISP/LeaveProgrammingMode.hpp (90%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVRISP/ProgramFuse.hpp (95%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVRISP/ReadFuse.hpp (95%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVRISP/ReadLock.hpp (89%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AVRISP/ReadSignature.hpp (92%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AvrCommandFrame.hpp (96%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/AvrCommandFrames.hpp (100%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/Discovery/DiscoveryCommandFrame.hpp (54%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/Discovery/Query.hpp (92%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/EDBGControl/EdbgControlCommandFrame.hpp (54%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/EDBGControl/GetParameter.hpp (89%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/EDBGControl/SetParameter.hpp (91%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/HouseKeeping/EndSession.hpp (88%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/HouseKeeping/GetParameter.hpp (91%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/HouseKeeping/HouseKeepingCommandFrame.hpp (54%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/HouseKeeping/Parameters.hpp (88%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/CommandFrames/HouseKeeping/StartSession.hpp (87%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/EdbgAvr8Interface.cpp (95%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/EdbgAvr8Interface.hpp (98%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/EdbgAvrIspInterface.cpp (87%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/EdbgAvrIspInterface.hpp (95%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/Events/AVR8Generic/BreakEvent.cpp (94%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/Events/AVR8Generic/BreakEvent.hpp (65%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/Exceptions/Avr8CommandFailure.hpp (97%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/ResponseFrames/AVR8Generic/Avr8GenericResponseFrame.cpp (91%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/ResponseFrames/AVR8Generic/Avr8GenericResponseFrame.hpp (50%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/ResponseFrames/AVR8Generic/GetDeviceId.cpp (97%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/ResponseFrames/AVR8Generic/GetDeviceId.hpp (84%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/ResponseFrames/AVR8Generic/GetProgramCounter.hpp (92%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/ResponseFrames/AVR8Generic/ReadMemory.hpp (89%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/ResponseFrames/AVRISP/AvrIspResponseFrame.cpp (84%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/ResponseFrames/AVRISP/AvrIspResponseFrame.hpp (63%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/ResponseFrames/AvrResponseFrame.cpp (96%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/ResponseFrames/AvrResponseFrame.hpp (81%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.cpp (90%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.hpp (77%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/ResponseFrames/EDBGControl/EdbgControlResponseFrame.cpp (91%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/ResponseFrames/EDBGControl/EdbgControlResponseFrame.hpp (68%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/ResponseFrames/HouseKeeping/HouseKeepingResponseFrame.cpp (84%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/AVR/ResponseFrames/HouseKeeping/HouseKeepingResponseFrame.hpp (66%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/Edbg.hpp (93%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/EdbgInterface.cpp (82%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/EdbgInterface.hpp (63%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/EdbgTargetPowerManagementInterface.cpp (66%) rename src/DebugToolDrivers/{Protocols/CMSIS-DAP/VendorSpecific => Microchip/Protocols}/EDBG/EdbgTargetPowerManagementInterface.hpp (82%) diff --git a/src/DebugToolDrivers/CMakeLists.txt b/src/DebugToolDrivers/CMakeLists.txt index 4d4a6a37..0ea33ee1 100755 --- a/src/DebugToolDrivers/CMakeLists.txt +++ b/src/DebugToolDrivers/CMakeLists.txt @@ -3,6 +3,25 @@ target_sources( PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/USB/UsbDevice.cpp ${CMAKE_CURRENT_SOURCE_DIR}/USB/HID/HidInterface.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Protocols/CMSIS-DAP/CmsisDapInterface.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Protocols/CMSIS-DAP/Command.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Protocols/CMSIS-DAP/Response.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Microchip/Protocols/EDBG/AVR/AvrCommand.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Microchip/Protocols/EDBG/AVR/AvrResponse.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Microchip/Protocols/EDBG/AVR/ResponseFrames/AvrResponseFrame.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVR8Generic/Avr8GenericResponseFrame.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVR8Generic/GetDeviceId.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Microchip/Protocols/EDBG/AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Microchip/Protocols/EDBG/AVR/ResponseFrames/HouseKeeping/HouseKeepingResponseFrame.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVRISP/AvrIspResponseFrame.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Microchip/Protocols/EDBG/AVR/ResponseFrames/EDBGControl/EdbgControlResponseFrame.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Microchip/Protocols/EDBG/AVR/AvrEvent.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Microchip/Protocols/EDBG/AVR/Events/AVR8Generic/BreakEvent.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Microchip/Protocols/EDBG/EdbgInterface.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Microchip/Protocols/EDBG/EdbgTargetPowerManagementInterface.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Microchip/Protocols/EDBG/AVR/EdbgAvr8Interface.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Microchip/Protocols/EDBG/AVR/EdbgAvrIspInterface.cpp ${CMAKE_CURRENT_SOURCE_DIR}/Microchip/EdbgDevice.cpp ${CMAKE_CURRENT_SOURCE_DIR}/Microchip/AtmelICE/AtmelIce.cpp ${CMAKE_CURRENT_SOURCE_DIR}/Microchip/PowerDebugger/PowerDebugger.cpp @@ -13,23 +32,4 @@ target_sources( ${CMAKE_CURRENT_SOURCE_DIR}/Microchip/XplainedNano/XplainedNano.cpp ${CMAKE_CURRENT_SOURCE_DIR}/Microchip/CuriosityNano/CuriosityNano.cpp ${CMAKE_CURRENT_SOURCE_DIR}/Microchip/JtagIce3/JtagIce3.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Protocols/CMSIS-DAP/CmsisDapInterface.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Protocols/CMSIS-DAP/Command.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Protocols/CMSIS-DAP/Response.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrCommand.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrResponse.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AvrResponseFrame.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/Avr8GenericResponseFrame.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/GetDeviceId.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/HouseKeeping/HouseKeepingResponseFrame.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVRISP/AvrIspResponseFrame.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/EDBGControl/EdbgControlResponseFrame.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrEvent.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/Events/AVR8Generic/BreakEvent.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgInterface.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgTargetPowerManagementInterface.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvrIspInterface.cpp ) diff --git a/src/DebugToolDrivers/Microchip/EdbgDevice.cpp b/src/DebugToolDrivers/Microchip/EdbgDevice.cpp index f9eb54cb..3a0fa735 100644 --- a/src/DebugToolDrivers/Microchip/EdbgDevice.cpp +++ b/src/DebugToolDrivers/Microchip/EdbgDevice.cpp @@ -1,18 +1,17 @@ #include "EdbgDevice.hpp" #include "src/DebugToolDrivers/USB/HID/HidInterface.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AvrCommandFrames.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AvrCommandFrames.hpp" #include "src/TargetController/Exceptions/DeviceFailure.hpp" #include "src/TargetController/Exceptions/DeviceInitializationFailure.hpp" namespace DebugToolDrivers { - using namespace Protocols::CmsisDap::Edbg::Avr; - using namespace Exceptions; + using namespace Microchip::Protocols::Edbg::Avr; - using Protocols::CmsisDap::Edbg::EdbgInterface; - using Protocols::CmsisDap::Edbg::EdbgTargetPowerManagementInterface; + using Exceptions::DeviceFailure; + using Exceptions::DeviceInitializationFailure; EdbgDevice::EdbgDevice( std::uint16_t vendorId, @@ -28,6 +27,9 @@ namespace DebugToolDrivers {} void EdbgDevice::init() { + using Microchip::Protocols::Edbg::EdbgInterface; + using Microchip::Protocols::Edbg::EdbgTargetPowerManagementInterface; + UsbDevice::init(); this->detachKernelDriverFromInterface(this->cmsisHidInterfaceNumber); diff --git a/src/DebugToolDrivers/Microchip/EdbgDevice.hpp b/src/DebugToolDrivers/Microchip/EdbgDevice.hpp index f6f17f7c..62f4cc30 100644 --- a/src/DebugToolDrivers/Microchip/EdbgDevice.hpp +++ b/src/DebugToolDrivers/Microchip/EdbgDevice.hpp @@ -7,10 +7,10 @@ #include "src/DebugToolDrivers/DebugTool.hpp" #include "src/DebugToolDrivers/USB/UsbDevice.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgInterface.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvrIspInterface.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgTargetPowerManagementInterface.hpp" +#include "Protocols/EDBG/EdbgInterface.hpp" +#include "Protocols/EDBG/AVR/EdbgAvr8Interface.hpp" +#include "Protocols/EDBG/AVR/EdbgAvrIspInterface.hpp" +#include "Protocols/EDBG/EdbgTargetPowerManagementInterface.hpp" namespace DebugToolDrivers { @@ -112,7 +112,7 @@ namespace DebugToolDrivers * The EdbgInterface class provides the ability to communicate with the EDBG device, using any of the EDBG * sub-protocols. */ - std::unique_ptr edbgInterface = nullptr; + std::unique_ptr edbgInterface = nullptr; /** * The EdbgAvr8Interface class implements the AVR8 Generic EDBG sub-protocol. This protocol is used to perform @@ -120,7 +120,7 @@ namespace DebugToolDrivers * * The class implements the Avr8DebugInterface. */ - std::unique_ptr edbgAvr8Interface = nullptr; + std::unique_ptr edbgAvr8Interface = nullptr; /** * The EdbgAvrIspInterface class implements the AVRISP EDBG sub-protocol, for interfacing with AVR targets via @@ -133,7 +133,7 @@ namespace DebugToolDrivers * targets. We use the interface to inspect and update the "debugWire enable" (DWEN) fuse-bit, before making a * second connection attempt via the debugWire interface. */ - std::unique_ptr edbgAvrIspInterface = nullptr; + std::unique_ptr edbgAvrIspInterface = nullptr; /** * The EdbgTargetPowerManagementInterface class implements the "EDBG Control" (EDBG_CTRL) sub-protocol, to @@ -143,7 +143,7 @@ namespace DebugToolDrivers * EdbgDevice::getTargetPowerManagementInterface() member function. */ std::unique_ptr< - Protocols::CmsisDap::Edbg::EdbgTargetPowerManagementInterface + Microchip::Protocols::Edbg::EdbgTargetPowerManagementInterface > targetPowerManagementInterface = nullptr; bool sessionStarted = false; diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/Avr8Generic.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/Avr8Generic.hpp similarity index 99% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/Avr8Generic.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/Avr8Generic.hpp index fe2cbc5d..b8c54250 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/Avr8Generic.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/Avr8Generic.hpp @@ -4,7 +4,7 @@ #include "src/Targets/Microchip/AVR/AVR8/PhysicalInterface.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr { struct Avr8EdbgParameter { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrCommand.cpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrCommand.cpp similarity index 93% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrCommand.cpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrCommand.cpp index 2ec8a0d2..2e4b3b88 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrCommand.cpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrCommand.cpp @@ -1,6 +1,6 @@ #include "AvrCommand.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr { AvrCommand::AvrCommand( std::size_t fragmentCount, diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrCommand.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrCommand.hpp similarity index 82% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrCommand.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrCommand.hpp index d2bfb60b..44901d03 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrCommand.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrCommand.hpp @@ -7,12 +7,12 @@ #include "AvrResponse.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr { /** * AVR CMSIS-DAP vendor command. */ - class AvrCommand: public Command +class AvrCommand: public ::DebugToolDrivers::Protocols::CmsisDap::Command { public: /* @@ -26,7 +26,7 @@ namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr * * For more on the purpose of this alias, see the Command class. */ - using ExpectedResponseType = Response; + using ExpectedResponseType = ::DebugToolDrivers::Protocols::CmsisDap::Response; AvrCommand( std::size_t fragmentCount, diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrEvent.cpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrEvent.cpp similarity index 95% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrEvent.cpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrEvent.cpp index c428f99e..62972f1e 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrEvent.cpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrEvent.cpp @@ -4,7 +4,7 @@ #include "src/Exceptions/Exception.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr { using namespace Exceptions; diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrEvent.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrEvent.hpp similarity index 75% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrEvent.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrEvent.hpp index e3bac5b2..b99c6e1d 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrEvent.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrEvent.hpp @@ -5,14 +5,14 @@ #include "src/DebugToolDrivers/Protocols/CMSIS-DAP/Response.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr { enum class AvrEventId: unsigned char { AVR8_BREAK_EVENT = 0x40, }; - class AvrEvent: public Response + class AvrEvent: public ::DebugToolDrivers::Protocols::CmsisDap::Response { public: std::optional eventId = std::nullopt; diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrEventCommand.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrEventCommand.hpp similarity index 63% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrEventCommand.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrEventCommand.hpp index 72893576..96940e2b 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrEventCommand.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrEventCommand.hpp @@ -3,9 +3,9 @@ #include "src/DebugToolDrivers/Protocols/CMSIS-DAP/Command.hpp" #include "AvrEvent.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr { - class AvrEventCommand: public Command + class AvrEventCommand: public ::DebugToolDrivers::Protocols::CmsisDap::Command { public: using ExpectedResponseType = AvrEvent; diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrResponse.cpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrResponse.cpp similarity index 95% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrResponse.cpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrResponse.cpp index ae58b99b..7026b8d8 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrResponse.cpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrResponse.cpp @@ -2,7 +2,7 @@ #include "src/Exceptions/Exception.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr { using namespace Exceptions; diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrResponse.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrResponse.hpp similarity index 71% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrResponse.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrResponse.hpp index cd3fd58d..2ea3059a 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrResponse.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrResponse.hpp @@ -5,9 +5,9 @@ #include "src/DebugToolDrivers/Protocols/CMSIS-DAP/Response.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr { - class AvrResponse: public Response + class AvrResponse: public ::DebugToolDrivers::Protocols::CmsisDap::Response { public: std::uint8_t fragmentNumber = 0; diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrResponseCommand.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrResponseCommand.hpp similarity index 88% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrResponseCommand.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrResponseCommand.hpp index 6b809f8a..cd5bf2a4 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrResponseCommand.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrResponseCommand.hpp @@ -6,7 +6,7 @@ #include "AvrResponse.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr { /** * All AVR commands result in an automatic response, but that is just a response to confirm @@ -23,7 +23,7 @@ namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr * * An AvrResponseCommand is very simple - it consists of a command ID and nothing more. */ - class AvrResponseCommand: public Command + class AvrResponseCommand: public ::DebugToolDrivers::Protocols::CmsisDap::Command { public: using ExpectedResponseType = AvrResponse; diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ActivatePhysical.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/ActivatePhysical.hpp similarity index 87% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ActivatePhysical.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/ActivatePhysical.hpp index 43b564f0..40a24954 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ActivatePhysical.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/ActivatePhysical.hpp @@ -2,7 +2,7 @@ #include "Avr8GenericCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { class ActivatePhysical: public Avr8GenericCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Attach.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/Attach.hpp similarity index 87% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Attach.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/Attach.hpp index 4ecd9224..3e8ecf0d 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Attach.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/Attach.hpp @@ -2,7 +2,7 @@ #include "Avr8GenericCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { class Attach: public Avr8GenericCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Avr8GenericCommandFrame.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/Avr8GenericCommandFrame.hpp similarity index 50% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Avr8GenericCommandFrame.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/Avr8GenericCommandFrame.hpp index 38a72a01..8f5a0c01 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Avr8GenericCommandFrame.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/Avr8GenericCommandFrame.hpp @@ -1,11 +1,11 @@ #pragma once #include "src/Exceptions/Exception.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/Avr8Generic.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AvrCommandFrame.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/Avr8GenericResponseFrame.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/Avr8Generic.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AvrCommandFrame.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVR8Generic/Avr8GenericResponseFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { template class Avr8GenericCommandFrame: public AvrCommandFrame diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ClearAllSoftwareBreakpoints.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/ClearAllSoftwareBreakpoints.hpp similarity index 86% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ClearAllSoftwareBreakpoints.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/ClearAllSoftwareBreakpoints.hpp index 823ededb..f789efbc 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ClearAllSoftwareBreakpoints.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/ClearAllSoftwareBreakpoints.hpp @@ -2,7 +2,7 @@ #include "Avr8GenericCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { class ClearAllSoftwareBreakpoints: public Avr8GenericCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ClearHardwareBreakpoint.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/ClearHardwareBreakpoint.hpp similarity index 88% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ClearHardwareBreakpoint.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/ClearHardwareBreakpoint.hpp index df1ca1f4..119fb3f5 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ClearHardwareBreakpoint.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/ClearHardwareBreakpoint.hpp @@ -5,7 +5,7 @@ #include "Avr8GenericCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { class ClearHardwareBreakpoint: public Avr8GenericCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ClearSoftwareBreakpoints.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/ClearSoftwareBreakpoints.hpp similarity index 92% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ClearSoftwareBreakpoints.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/ClearSoftwareBreakpoints.hpp index 56d560a0..078c330f 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ClearSoftwareBreakpoints.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/ClearSoftwareBreakpoints.hpp @@ -5,7 +5,7 @@ #include "Avr8GenericCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { class ClearSoftwareBreakpoints: public Avr8GenericCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/DeactivatePhysical.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/DeactivatePhysical.hpp similarity index 85% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/DeactivatePhysical.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/DeactivatePhysical.hpp index a55b15b3..4600881d 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/DeactivatePhysical.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/DeactivatePhysical.hpp @@ -2,7 +2,7 @@ #include "Avr8GenericCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { class DeactivatePhysical: public Avr8GenericCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Detach.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/Detach.hpp similarity index 84% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Detach.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/Detach.hpp index d8d8dc72..834eaae3 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Detach.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/Detach.hpp @@ -2,7 +2,7 @@ #include "Avr8GenericCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { class Detach: public Avr8GenericCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/DisableDebugWire.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/DisableDebugWire.hpp similarity index 85% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/DisableDebugWire.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/DisableDebugWire.hpp index 01183339..267a327c 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/DisableDebugWire.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/DisableDebugWire.hpp @@ -2,7 +2,7 @@ #include "Avr8GenericCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { class DisableDebugWire: public Avr8GenericCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/EnterProgrammingMode.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/EnterProgrammingMode.hpp similarity index 85% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/EnterProgrammingMode.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/EnterProgrammingMode.hpp index 835ed83f..1e616e43 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/EnterProgrammingMode.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/EnterProgrammingMode.hpp @@ -2,7 +2,7 @@ #include "Avr8GenericCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { class EnterProgrammingMode: public Avr8GenericCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/EraseMemory.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/EraseMemory.hpp similarity index 90% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/EraseMemory.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/EraseMemory.hpp index 6fcf0599..a21b2c4b 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/EraseMemory.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/EraseMemory.hpp @@ -4,7 +4,7 @@ #include "Avr8GenericCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { class EraseMemory: public Avr8GenericCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/GetDeviceId.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/GetDeviceId.hpp similarity index 87% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/GetDeviceId.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/GetDeviceId.hpp index 4f97e240..fd8ab341 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/GetDeviceId.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/GetDeviceId.hpp @@ -3,7 +3,7 @@ #include "Avr8GenericCommandFrame.hpp" #include "../../ResponseFrames/AVR8Generic/GetDeviceId.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { class GetDeviceId: public Avr8GenericCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/GetParameter.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/GetParameter.hpp similarity index 90% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/GetParameter.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/GetParameter.hpp index e71a2b33..f2f7101b 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/GetParameter.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/GetParameter.hpp @@ -4,7 +4,7 @@ #include "Avr8GenericCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { class GetParameter: public Avr8GenericCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/GetProgramCounter.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/GetProgramCounter.hpp similarity index 88% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/GetProgramCounter.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/GetProgramCounter.hpp index e30ec680..efcb0aee 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/GetProgramCounter.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/GetProgramCounter.hpp @@ -3,7 +3,7 @@ #include "Avr8GenericCommandFrame.hpp" #include "../../ResponseFrames/AVR8Generic/GetProgramCounter.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { class GetProgramCounter: public Avr8GenericCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/LeaveProgrammingMode.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/LeaveProgrammingMode.hpp similarity index 85% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/LeaveProgrammingMode.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/LeaveProgrammingMode.hpp index 8fa665f0..0ecba90c 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/LeaveProgrammingMode.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/LeaveProgrammingMode.hpp @@ -2,7 +2,7 @@ #include "Avr8GenericCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { class LeaveProgrammingMode: public Avr8GenericCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.cpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.cpp similarity index 96% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.cpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.cpp index 428eda44..1addb3c7 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.cpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.cpp @@ -3,7 +3,7 @@ #include #include -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { ReadMemory::ReadMemory( const Avr8MemoryType& type, diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.hpp similarity index 86% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.hpp index a4cee1d3..b2b806aa 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.hpp @@ -6,7 +6,7 @@ #include "Avr8GenericCommandFrame.hpp" #include "../../ResponseFrames/AVR8Generic/ReadMemory.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { class ReadMemory: public Avr8GenericCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Reset.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/Reset.hpp similarity index 88% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Reset.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/Reset.hpp index 5782573a..459e6398 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Reset.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/Reset.hpp @@ -2,7 +2,7 @@ #include "Avr8GenericCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { class Reset: public Avr8GenericCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Run.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/Run.hpp similarity index 84% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Run.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/Run.hpp index 095f5a98..d5effe0c 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Run.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/Run.hpp @@ -2,7 +2,7 @@ #include "Avr8GenericCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { class Run: public Avr8GenericCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/RunTo.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/RunTo.hpp similarity index 91% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/RunTo.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/RunTo.hpp index 1d1e5622..3bf4f865 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/RunTo.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/RunTo.hpp @@ -4,7 +4,7 @@ #include "Avr8GenericCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { class RunTo: public Avr8GenericCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetHardwareBreakpoint.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/SetHardwareBreakpoint.hpp similarity index 93% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetHardwareBreakpoint.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/SetHardwareBreakpoint.hpp index d2020960..ed433edb 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetHardwareBreakpoint.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/SetHardwareBreakpoint.hpp @@ -5,7 +5,7 @@ #include "Avr8GenericCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { class SetHardwareBreakpoint: public Avr8GenericCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetParameter.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/SetParameter.hpp similarity index 93% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetParameter.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/SetParameter.hpp index ac642559..550d2140 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetParameter.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/SetParameter.hpp @@ -2,7 +2,7 @@ #include "Avr8GenericCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { class SetParameter: public Avr8GenericCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetProgramCounter.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/SetProgramCounter.hpp similarity index 90% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetProgramCounter.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/SetProgramCounter.hpp index c3afe023..d2cffd79 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetProgramCounter.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/SetProgramCounter.hpp @@ -4,7 +4,7 @@ #include "Avr8GenericCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { class SetProgramCounter: public Avr8GenericCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetSoftwareBreakpoints.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/SetSoftwareBreakpoints.hpp similarity index 92% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetSoftwareBreakpoints.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/SetSoftwareBreakpoints.hpp index f8d97163..18896274 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetSoftwareBreakpoints.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/SetSoftwareBreakpoints.hpp @@ -5,7 +5,7 @@ #include "Avr8GenericCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { class SetSoftwareBreakpoints: public Avr8GenericCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetXmegaSoftwareBreakpoint.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/SetXmegaSoftwareBreakpoint.hpp similarity index 90% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetXmegaSoftwareBreakpoint.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/SetXmegaSoftwareBreakpoint.hpp index 6ffc3804..79207e91 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetXmegaSoftwareBreakpoint.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/SetXmegaSoftwareBreakpoint.hpp @@ -4,7 +4,7 @@ #include "Avr8GenericCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { class SetXmegaSoftwareBreakpoint: public Avr8GenericCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Step.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/Step.hpp similarity index 88% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Step.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/Step.hpp index dc4736c2..746bc1c7 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Step.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/Step.hpp @@ -2,7 +2,7 @@ #include "Avr8GenericCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { class Step: public Avr8GenericCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Stop.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/Stop.hpp similarity index 88% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Stop.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/Stop.hpp index fbfdba3e..f4ee5715 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Stop.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/Stop.hpp @@ -2,7 +2,7 @@ #include "Avr8GenericCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { class Stop: public Avr8GenericCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/WriteMemory.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/WriteMemory.hpp similarity index 95% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/WriteMemory.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/WriteMemory.hpp index 9d61b48b..bd06460b 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/WriteMemory.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVR8Generic/WriteMemory.hpp @@ -5,7 +5,7 @@ #include "Avr8GenericCommandFrame.hpp" #include "src/Targets/TargetMemory.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Avr8Generic { class WriteMemory: public Avr8GenericCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/AvrIspCommandFrame.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVRISP/AvrIspCommandFrame.hpp similarity index 50% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/AvrIspCommandFrame.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVRISP/AvrIspCommandFrame.hpp index 6ceab476..c89a9a93 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/AvrIspCommandFrame.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVRISP/AvrIspCommandFrame.hpp @@ -1,11 +1,11 @@ #pragma once #include "src/Exceptions/Exception.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/Avr8Generic.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AvrCommandFrame.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVRISP/AvrIspResponseFrame.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/Avr8Generic.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AvrCommandFrame.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVRISP/AvrIspResponseFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::AvrIsp +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::AvrIsp { template class AvrIspCommandFrame: public AvrCommandFrame diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/EnterProgrammingMode.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVRISP/EnterProgrammingMode.hpp similarity index 95% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/EnterProgrammingMode.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVRISP/EnterProgrammingMode.hpp index 364b1647..13975a4f 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/EnterProgrammingMode.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVRISP/EnterProgrammingMode.hpp @@ -4,7 +4,7 @@ #include "AvrIspCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::AvrIsp +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::AvrIsp { class EnterProgrammingMode: public AvrIspCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/LeaveProgrammingMode.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVRISP/LeaveProgrammingMode.hpp similarity index 90% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/LeaveProgrammingMode.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVRISP/LeaveProgrammingMode.hpp index 0305cebb..ce6b7e63 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/LeaveProgrammingMode.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVRISP/LeaveProgrammingMode.hpp @@ -4,7 +4,7 @@ #include "AvrIspCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::AvrIsp +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::AvrIsp { class LeaveProgrammingMode: public AvrIspCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/ProgramFuse.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVRISP/ProgramFuse.hpp similarity index 95% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/ProgramFuse.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVRISP/ProgramFuse.hpp index 94a0d32b..6182f19f 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/ProgramFuse.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVRISP/ProgramFuse.hpp @@ -6,7 +6,7 @@ #include "src/Targets/Microchip/AVR/Fuse.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::AvrIsp +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::AvrIsp { class ProgramFuse: public AvrIspCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/ReadFuse.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVRISP/ReadFuse.hpp similarity index 95% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/ReadFuse.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVRISP/ReadFuse.hpp index b17e8e65..1471b992 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/ReadFuse.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVRISP/ReadFuse.hpp @@ -6,7 +6,7 @@ #include "src/Targets/Microchip/AVR/Fuse.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::AvrIsp +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::AvrIsp { class ReadFuse: public AvrIspCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/ReadLock.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVRISP/ReadLock.hpp similarity index 89% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/ReadLock.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVRISP/ReadLock.hpp index 7a4acd54..9b07bf9e 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/ReadLock.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVRISP/ReadLock.hpp @@ -4,7 +4,7 @@ #include "AvrIspCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::AvrIsp +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::AvrIsp { class ReadLock: public AvrIspCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/ReadSignature.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVRISP/ReadSignature.hpp similarity index 92% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/ReadSignature.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVRISP/ReadSignature.hpp index 435e14c0..f0d4b6e2 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/ReadSignature.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AVRISP/ReadSignature.hpp @@ -7,7 +7,7 @@ #include "src/Targets/Microchip/AVR/Fuse.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::AvrIsp +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::AvrIsp { class ReadSignature: public AvrIspCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AvrCommandFrame.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AvrCommandFrame.hpp similarity index 96% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AvrCommandFrame.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AvrCommandFrame.hpp index 83d0b57c..0fcf2f26 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AvrCommandFrame.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AvrCommandFrame.hpp @@ -9,11 +9,11 @@ #include #include "src/DebugToolDrivers/Protocols/CMSIS-DAP/Command.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/Edbg.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrCommand.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AvrResponseFrame.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/Edbg.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrCommand.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AvrResponseFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr { static inline std::atomic lastSequenceId = 0; diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AvrCommandFrames.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AvrCommandFrames.hpp similarity index 100% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AvrCommandFrames.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AvrCommandFrames.hpp diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/Discovery/DiscoveryCommandFrame.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/Discovery/DiscoveryCommandFrame.hpp similarity index 54% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/Discovery/DiscoveryCommandFrame.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/Discovery/DiscoveryCommandFrame.hpp index 0f0ea3ed..a31e740c 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/Discovery/DiscoveryCommandFrame.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/Discovery/DiscoveryCommandFrame.hpp @@ -1,9 +1,9 @@ #pragma once -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AvrCommandFrame.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AvrCommandFrame.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Discovery +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Discovery { template class DiscoveryCommandFrame: public AvrCommandFrame diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/Discovery/Query.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/Discovery/Query.hpp similarity index 92% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/Discovery/Query.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/Discovery/Query.hpp index a4e246ec..e68fb881 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/Discovery/Query.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/Discovery/Query.hpp @@ -2,7 +2,7 @@ #include "DiscoveryCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::Discovery +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::Discovery { /** * The query context is the type of query to execute. diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/EDBGControl/EdbgControlCommandFrame.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/EDBGControl/EdbgControlCommandFrame.hpp similarity index 54% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/EDBGControl/EdbgControlCommandFrame.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/EDBGControl/EdbgControlCommandFrame.hpp index d30fb9d4..c475f1a1 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/EDBGControl/EdbgControlCommandFrame.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/EDBGControl/EdbgControlCommandFrame.hpp @@ -1,9 +1,9 @@ #pragma once -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AvrCommandFrame.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/EDBGControl/EdbgControlResponseFrame.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AvrCommandFrame.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/EDBGControl/EdbgControlResponseFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::EdbgControl +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::EdbgControl { template class EdbgControlCommandFrame: public AvrCommandFrame diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/EDBGControl/GetParameter.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/EDBGControl/GetParameter.hpp similarity index 89% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/EDBGControl/GetParameter.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/EDBGControl/GetParameter.hpp index ad3c3446..67458812 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/EDBGControl/GetParameter.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/EDBGControl/GetParameter.hpp @@ -4,7 +4,7 @@ #include "EdbgControlCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::EdbgControl +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::EdbgControl { class GetParameter: public EdbgControlCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/EDBGControl/SetParameter.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/EDBGControl/SetParameter.hpp similarity index 91% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/EDBGControl/SetParameter.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/EDBGControl/SetParameter.hpp index 1ba36d6b..8510a3d0 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/EDBGControl/SetParameter.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/EDBGControl/SetParameter.hpp @@ -5,7 +5,7 @@ #include "EdbgControlCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::EdbgControl +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::EdbgControl { class SetParameter: public EdbgControlCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/HouseKeeping/EndSession.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/HouseKeeping/EndSession.hpp similarity index 88% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/HouseKeeping/EndSession.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/HouseKeeping/EndSession.hpp index e849d2c6..f4bd58f6 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/HouseKeeping/EndSession.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/HouseKeeping/EndSession.hpp @@ -2,7 +2,7 @@ #include "HouseKeepingCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::HouseKeeping +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::HouseKeeping { /** * The End Session command ends the active session with the tool. diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/HouseKeeping/GetParameter.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/HouseKeeping/GetParameter.hpp similarity index 91% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/HouseKeeping/GetParameter.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/HouseKeeping/GetParameter.hpp index 9b471789..4458c559 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/HouseKeeping/GetParameter.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/HouseKeeping/GetParameter.hpp @@ -5,7 +5,7 @@ #include "HouseKeepingCommandFrame.hpp" #include "Parameters.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::HouseKeeping +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::HouseKeeping { class GetParameter: public HouseKeepingCommandFrame> { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/HouseKeeping/HouseKeepingCommandFrame.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/HouseKeeping/HouseKeepingCommandFrame.hpp similarity index 54% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/HouseKeeping/HouseKeepingCommandFrame.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/HouseKeeping/HouseKeepingCommandFrame.hpp index 7ec38432..c4371f0f 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/HouseKeeping/HouseKeepingCommandFrame.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/HouseKeeping/HouseKeepingCommandFrame.hpp @@ -1,9 +1,9 @@ #pragma once -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AvrCommandFrame.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/HouseKeeping/HouseKeepingResponseFrame.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/AvrCommandFrame.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/HouseKeeping/HouseKeepingResponseFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::HouseKeeping +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::HouseKeeping { template class HouseKeepingCommandFrame: public AvrCommandFrame diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/HouseKeeping/Parameters.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/HouseKeeping/Parameters.hpp similarity index 88% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/HouseKeeping/Parameters.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/HouseKeeping/Parameters.hpp index 24ee65da..2516686a 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/HouseKeeping/Parameters.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/HouseKeeping/Parameters.hpp @@ -4,7 +4,7 @@ #include "HouseKeepingCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::HouseKeeping +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::HouseKeeping { enum class ParameterContext: unsigned char { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/HouseKeeping/StartSession.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/HouseKeeping/StartSession.hpp similarity index 87% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/HouseKeeping/StartSession.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/HouseKeeping/StartSession.hpp index 20b4cf81..6e99c42b 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/HouseKeeping/StartSession.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/HouseKeeping/StartSession.hpp @@ -4,7 +4,7 @@ #include "HouseKeepingCommandFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames::HouseKeeping +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::CommandFrames::HouseKeeping { /** * The Start Session command begins a session with the tool. diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/EdbgAvr8Interface.cpp similarity index 95% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/EdbgAvr8Interface.cpp index 7717e8f7..d8761f6b 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/EdbgAvr8Interface.cpp @@ -8,42 +8,41 @@ #include "src/Services/StringService.hpp" #include "src/Logger/Logger.hpp" -#include "src/Exceptions/InvalidConfig.hpp" +#include "Exceptions/Avr8CommandFailure.hpp" #include "src/TargetController/Exceptions/DeviceInitializationFailure.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/Exceptions/Avr8CommandFailure.hpp" #include "src/Targets/Microchip/AVR/AVR8/Exceptions/DebugWirePhysicalInterfaceError.hpp" // Command frames -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetParameter.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/GetParameter.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ActivatePhysical.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/DeactivatePhysical.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Attach.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Detach.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Stop.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Step.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Run.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/RunTo.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/GetDeviceId.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/Reset.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ReadMemory.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/WriteMemory.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/GetProgramCounter.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetProgramCounter.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/DisableDebugWire.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetSoftwareBreakpoints.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ClearAllSoftwareBreakpoints.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ClearSoftwareBreakpoints.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetHardwareBreakpoint.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/ClearHardwareBreakpoint.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/EnterProgrammingMode.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/LeaveProgrammingMode.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/EraseMemory.hpp" +#include "CommandFrames/AVR8Generic/SetParameter.hpp" +#include "CommandFrames/AVR8Generic/GetParameter.hpp" +#include "CommandFrames/AVR8Generic/ActivatePhysical.hpp" +#include "CommandFrames/AVR8Generic/DeactivatePhysical.hpp" +#include "CommandFrames/AVR8Generic/Attach.hpp" +#include "CommandFrames/AVR8Generic/Detach.hpp" +#include "CommandFrames/AVR8Generic/Stop.hpp" +#include "CommandFrames/AVR8Generic/Step.hpp" +#include "CommandFrames/AVR8Generic/Run.hpp" +#include "CommandFrames/AVR8Generic/RunTo.hpp" +#include "CommandFrames/AVR8Generic/GetDeviceId.hpp" +#include "CommandFrames/AVR8Generic/Reset.hpp" +#include "CommandFrames/AVR8Generic/ReadMemory.hpp" +#include "CommandFrames/AVR8Generic/WriteMemory.hpp" +#include "CommandFrames/AVR8Generic/GetProgramCounter.hpp" +#include "CommandFrames/AVR8Generic/SetProgramCounter.hpp" +#include "CommandFrames/AVR8Generic/DisableDebugWire.hpp" +#include "CommandFrames/AVR8Generic/SetSoftwareBreakpoints.hpp" +#include "CommandFrames/AVR8Generic/ClearAllSoftwareBreakpoints.hpp" +#include "CommandFrames/AVR8Generic/ClearSoftwareBreakpoints.hpp" +#include "CommandFrames/AVR8Generic/SetHardwareBreakpoint.hpp" +#include "CommandFrames/AVR8Generic/ClearHardwareBreakpoint.hpp" +#include "CommandFrames/AVR8Generic/EnterProgrammingMode.hpp" +#include "CommandFrames/AVR8Generic/LeaveProgrammingMode.hpp" +#include "CommandFrames/AVR8Generic/EraseMemory.hpp" // AVR events -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/Events/AVR8Generic/BreakEvent.hpp" +#include "Events/AVR8Generic/BreakEvent.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr { using namespace Targets::Microchip::Avr; using namespace Avr8Bit; diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/EdbgAvr8Interface.hpp similarity index 98% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/EdbgAvr8Interface.hpp index 56f0bf7c..3b26fcca 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/EdbgAvr8Interface.hpp @@ -7,15 +7,17 @@ #include #include "src/DebugToolDrivers/TargetInterfaces/Microchip/AVR/AVR8/Avr8DebugInterface.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/Avr8Generic.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgInterface.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/EdbgInterface.hpp" + +#include "Avr8Generic.hpp" + #include "src/Targets/TargetMemory.hpp" #include "src/Targets/TargetRegister.hpp" #include "src/Targets/Microchip/AVR/AVR8/Family.hpp" #include "src/Targets/Microchip/AVR/AVR8/PhysicalInterface.hpp" #include "src/Targets/Microchip/AVR/AVR8/TargetParameters.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr { /** * The EdbgAvr8Interface implements the AVR8 Generic EDBG/CMSIS-DAP protocol, as an Avr8DebugInterface. @@ -26,7 +28,7 @@ namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr * This implementation should work with any Microchip EDBG-based CMSIS-DAP debug tool (such as the Atmel-ICE, * Power Debugger, the MPLAB SNAP debugger (in "AVR mode"), etc). */ - class EdbgAvr8Interface: public TargetInterfaces::Microchip::Avr::Avr8::Avr8DebugInterface + class EdbgAvr8Interface: public ::DebugToolDrivers::TargetInterfaces::Microchip::Avr::Avr8::Avr8DebugInterface { public: explicit EdbgAvr8Interface( diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvrIspInterface.cpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/EdbgAvrIspInterface.cpp similarity index 87% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvrIspInterface.cpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/EdbgAvrIspInterface.cpp index e7e7f465..064a355b 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvrIspInterface.cpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/EdbgAvrIspInterface.cpp @@ -4,14 +4,14 @@ #include "src/Logger/Logger.hpp" // Command frames -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/EnterProgrammingMode.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/LeaveProgrammingMode.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/ReadSignature.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/ReadFuse.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/ReadLock.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVRISP/ProgramFuse.hpp" +#include "CommandFrames/AVRISP/EnterProgrammingMode.hpp" +#include "CommandFrames/AVRISP/LeaveProgrammingMode.hpp" +#include "CommandFrames/AVRISP/ReadSignature.hpp" +#include "CommandFrames/AVRISP/ReadFuse.hpp" +#include "CommandFrames/AVRISP/ReadLock.hpp" +#include "CommandFrames/AVRISP/ProgramFuse.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr { using namespace Targets::Microchip::Avr; diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvrIspInterface.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/EdbgAvrIspInterface.hpp similarity index 95% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvrIspInterface.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/EdbgAvrIspInterface.hpp index 9ad2caa5..da612820 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvrIspInterface.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/EdbgAvrIspInterface.hpp @@ -6,9 +6,9 @@ #include #include "src/DebugToolDrivers/TargetInterfaces/Microchip/AVR/AvrIspInterface.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgInterface.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/EdbgInterface.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr { /** * The EdbgAvrIspInterface implements the AVRISP EDBG/CMSIS-DAP protocol, as an AvrIspInterface. diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/Events/AVR8Generic/BreakEvent.cpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/Events/AVR8Generic/BreakEvent.cpp similarity index 94% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/Events/AVR8Generic/BreakEvent.cpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/Events/AVR8Generic/BreakEvent.cpp index e8abadc9..0f29eefa 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/Events/AVR8Generic/BreakEvent.cpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/Events/AVR8Generic/BreakEvent.cpp @@ -2,7 +2,7 @@ #include "src/Exceptions/Exception.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr { using namespace Exceptions; diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/Events/AVR8Generic/BreakEvent.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/Events/AVR8Generic/BreakEvent.hpp similarity index 65% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/Events/AVR8Generic/BreakEvent.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/Events/AVR8Generic/BreakEvent.hpp index 8e652201..36061b7b 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/Events/AVR8Generic/BreakEvent.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/Events/AVR8Generic/BreakEvent.hpp @@ -2,10 +2,10 @@ #include -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrEvent.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrEvent.hpp" #include "src/Targets/TargetBreakpoint.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr { class BreakEvent: public AvrEvent { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/Exceptions/Avr8CommandFailure.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/Exceptions/Avr8CommandFailure.hpp similarity index 97% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/Exceptions/Avr8CommandFailure.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/Exceptions/Avr8CommandFailure.hpp index c9be73ff..a126b68a 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/Exceptions/Avr8CommandFailure.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/Exceptions/Avr8CommandFailure.hpp @@ -3,9 +3,9 @@ #include #include "src/TargetController/Exceptions/TargetOperationFailure.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/Avr8GenericResponseFrame.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVR8Generic/Avr8GenericResponseFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr { enum class Avr8CommandFailureCode: std::uint8_t { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/Avr8GenericResponseFrame.cpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVR8Generic/Avr8GenericResponseFrame.cpp similarity index 91% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/Avr8GenericResponseFrame.cpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVR8Generic/Avr8GenericResponseFrame.cpp index c50e5952..9aae9dd8 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/Avr8GenericResponseFrame.cpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVR8Generic/Avr8GenericResponseFrame.cpp @@ -2,7 +2,7 @@ #include "src/Exceptions/Exception.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::ResponseFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::ResponseFrames::Avr8Generic { using namespace Exceptions; diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/Avr8GenericResponseFrame.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVR8Generic/Avr8GenericResponseFrame.hpp similarity index 50% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/Avr8GenericResponseFrame.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVR8Generic/Avr8GenericResponseFrame.hpp index 57fbc432..91a90530 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/Avr8GenericResponseFrame.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVR8Generic/Avr8GenericResponseFrame.hpp @@ -1,9 +1,9 @@ #pragma once -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AvrResponseFrame.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/Avr8Generic.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AvrResponseFrame.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/Avr8Generic.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::ResponseFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::ResponseFrames::Avr8Generic { class Avr8GenericResponseFrame: public AvrResponseFrame { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/GetDeviceId.cpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVR8Generic/GetDeviceId.cpp similarity index 97% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/GetDeviceId.cpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVR8Generic/GetDeviceId.cpp index d3fa4d6b..7425ba92 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/GetDeviceId.cpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVR8Generic/GetDeviceId.cpp @@ -1,6 +1,6 @@ #include "GetDeviceId.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::ResponseFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::ResponseFrames::Avr8Generic { GetDeviceId::GetDeviceId(const std::vector& AvrResponses) : Avr8GenericResponseFrame(AvrResponses) diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/GetDeviceId.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVR8Generic/GetDeviceId.hpp similarity index 84% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/GetDeviceId.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVR8Generic/GetDeviceId.hpp index 5591a564..03f77337 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/GetDeviceId.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVR8Generic/GetDeviceId.hpp @@ -5,7 +5,7 @@ #include "src/Targets/Microchip/AVR/TargetSignature.hpp" #include "src/Targets/Microchip/AVR/AVR8/PhysicalInterface.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::ResponseFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::ResponseFrames::Avr8Generic { class GetDeviceId: public Avr8GenericResponseFrame { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/GetProgramCounter.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVR8Generic/GetProgramCounter.hpp similarity index 92% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/GetProgramCounter.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVR8Generic/GetProgramCounter.hpp index 8c07989b..0fa48d1c 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/GetProgramCounter.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVR8Generic/GetProgramCounter.hpp @@ -8,7 +8,7 @@ #include "src/Exceptions/Exception.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::ResponseFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::ResponseFrames::Avr8Generic { class GetProgramCounter: public Avr8GenericResponseFrame { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/ReadMemory.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVR8Generic/ReadMemory.hpp similarity index 89% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/ReadMemory.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVR8Generic/ReadMemory.hpp index 8c2d2c82..ba79c213 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVR8Generic/ReadMemory.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVR8Generic/ReadMemory.hpp @@ -3,7 +3,7 @@ #include "Avr8GenericResponseFrame.hpp" #include "src/Targets/TargetMemory.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::ResponseFrames::Avr8Generic +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::ResponseFrames::Avr8Generic { class ReadMemory: public Avr8GenericResponseFrame { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVRISP/AvrIspResponseFrame.cpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVRISP/AvrIspResponseFrame.cpp similarity index 84% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVRISP/AvrIspResponseFrame.cpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVRISP/AvrIspResponseFrame.cpp index cb9f17ae..545b5f0c 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVRISP/AvrIspResponseFrame.cpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVRISP/AvrIspResponseFrame.cpp @@ -2,7 +2,7 @@ #include "src/Exceptions/Exception.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::ResponseFrames::AvrIsp +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::ResponseFrames::AvrIsp { using namespace Exceptions; diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVRISP/AvrIspResponseFrame.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVRISP/AvrIspResponseFrame.hpp similarity index 63% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVRISP/AvrIspResponseFrame.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVRISP/AvrIspResponseFrame.hpp index cf17e6b2..7e224a39 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AVRISP/AvrIspResponseFrame.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AVRISP/AvrIspResponseFrame.hpp @@ -1,8 +1,8 @@ #pragma once -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AvrResponseFrame.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AvrResponseFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::ResponseFrames::AvrIsp +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::ResponseFrames::AvrIsp { enum class StatusCode: unsigned char { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AvrResponseFrame.cpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AvrResponseFrame.cpp similarity index 96% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AvrResponseFrame.cpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AvrResponseFrame.cpp index 00b2085b..51c9c806 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AvrResponseFrame.cpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AvrResponseFrame.cpp @@ -2,7 +2,7 @@ #include "src/Exceptions/Exception.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr { using namespace Exceptions; diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AvrResponseFrame.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AvrResponseFrame.hpp similarity index 81% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AvrResponseFrame.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AvrResponseFrame.hpp index 265e4fc8..ac62fcca 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AvrResponseFrame.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AvrResponseFrame.hpp @@ -5,11 +5,10 @@ #include #include -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/Command.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/Edbg.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrResponse.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/Edbg.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/AvrResponse.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr { class AvrResponseFrame { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.cpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.cpp similarity index 90% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.cpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.cpp index e6bba7dc..1890a88c 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.cpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.cpp @@ -2,7 +2,7 @@ #include "src/Exceptions/Exception.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::ResponseFrames::Discovery +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::ResponseFrames::Discovery { using namespace Exceptions; diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.hpp similarity index 77% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.hpp index 2c665212..606f6b31 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.hpp @@ -1,8 +1,8 @@ #pragma once -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AvrResponseFrame.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AvrResponseFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::ResponseFrames::Discovery +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::ResponseFrames::Discovery { /** * Discovery commands can only return two responses; A LIST response and a failure. diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/EDBGControl/EdbgControlResponseFrame.cpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/EDBGControl/EdbgControlResponseFrame.cpp similarity index 91% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/EDBGControl/EdbgControlResponseFrame.cpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/EDBGControl/EdbgControlResponseFrame.cpp index 4013f59c..27f170c8 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/EDBGControl/EdbgControlResponseFrame.cpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/EDBGControl/EdbgControlResponseFrame.cpp @@ -2,7 +2,7 @@ #include "src/Exceptions/Exception.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::ResponseFrames::EdbgControl +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::ResponseFrames::EdbgControl { using namespace Exceptions; diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/EDBGControl/EdbgControlResponseFrame.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/EDBGControl/EdbgControlResponseFrame.hpp similarity index 68% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/EDBGControl/EdbgControlResponseFrame.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/EDBGControl/EdbgControlResponseFrame.hpp index f04a1ee0..7de057f9 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/EDBGControl/EdbgControlResponseFrame.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/EDBGControl/EdbgControlResponseFrame.hpp @@ -1,8 +1,8 @@ #pragma once -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AvrResponseFrame.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AvrResponseFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::ResponseFrames::EdbgControl +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::ResponseFrames::EdbgControl { enum class EdbgControlResponseId: unsigned char { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/HouseKeeping/HouseKeepingResponseFrame.cpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/HouseKeeping/HouseKeepingResponseFrame.cpp similarity index 84% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/HouseKeeping/HouseKeepingResponseFrame.cpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/HouseKeeping/HouseKeepingResponseFrame.cpp index 60acc7ad..7866ecb8 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/HouseKeeping/HouseKeepingResponseFrame.cpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/HouseKeeping/HouseKeepingResponseFrame.cpp @@ -2,7 +2,7 @@ #include "src/Exceptions/Exception.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::ResponseFrames::HouseKeeping +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::ResponseFrames::HouseKeeping { using namespace Exceptions; diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/HouseKeeping/HouseKeepingResponseFrame.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/HouseKeeping/HouseKeepingResponseFrame.hpp similarity index 66% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/HouseKeeping/HouseKeepingResponseFrame.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/HouseKeeping/HouseKeepingResponseFrame.hpp index c11e8e67..35fad3f1 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/HouseKeeping/HouseKeepingResponseFrame.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/HouseKeeping/HouseKeepingResponseFrame.hpp @@ -1,8 +1,8 @@ #pragma once -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AvrResponseFrame.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/ResponseFrames/AvrResponseFrame.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::ResponseFrames::HouseKeeping +namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr::ResponseFrames::HouseKeeping { enum class ResponseId: unsigned char { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/Edbg.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/Edbg.hpp similarity index 93% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/Edbg.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/Edbg.hpp index e99639ad..536f5255 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/Edbg.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/Edbg.hpp @@ -2,7 +2,7 @@ #include -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg +namespace DebugToolDrivers::Microchip::Protocols::Edbg { enum class ProtocolHandlerId: unsigned char { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgInterface.cpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/EdbgInterface.cpp similarity index 82% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgInterface.cpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/EdbgInterface.cpp index aab84fa1..ba869ba5 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgInterface.cpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/EdbgInterface.cpp @@ -4,7 +4,7 @@ #include "src/TargetController/Exceptions/DeviceCommunicationFailure.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg +namespace DebugToolDrivers::Microchip::Protocols::Edbg { using namespace Exceptions; @@ -12,7 +12,7 @@ namespace DebugToolDrivers::Protocols::CmsisDap::Edbg : CmsisDapInterface(std::move(cmsisHidInterface)) {} - Protocols::CmsisDap::Response EdbgInterface::sendAvrCommandsAndWaitForResponse( + ::DebugToolDrivers::Protocols::CmsisDap::Response EdbgInterface::sendAvrCommandsAndWaitForResponse( const std::vector& avrCommands ) { for (const auto& avrCommand : avrCommands) { @@ -30,7 +30,7 @@ namespace DebugToolDrivers::Protocols::CmsisDap::Edbg ); } - std::optional EdbgInterface::requestAvrEvent() { + std::optional EdbgInterface::requestAvrEvent() { auto avrEventResponse = this->sendCommandAndWaitForResponse(Avr::AvrEventCommand()); if (avrEventResponse.id != 0x82) { @@ -40,10 +40,10 @@ namespace DebugToolDrivers::Protocols::CmsisDap::Edbg return !avrEventResponse.eventData.empty() ? std::optional(avrEventResponse) : std::nullopt; } - std::vector EdbgInterface::requestAvrResponses() { - using Protocols::CmsisDap::Edbg::Avr::AvrResponseCommand; + std::vector EdbgInterface::requestAvrResponses() { + using Microchip::Protocols::Edbg::Avr::AvrResponseCommand; - std::vector responses; + std::vector responses; AvrResponseCommand responseCommand; auto avrResponse = this->sendCommandAndWaitForResponse(responseCommand); diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgInterface.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/EdbgInterface.hpp similarity index 63% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgInterface.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/EdbgInterface.hpp index a7ace03b..6bd49d9b 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgInterface.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/EdbgInterface.hpp @@ -5,23 +5,25 @@ #include #include "src/DebugToolDrivers/Protocols/CMSIS-DAP/CmsisDapInterface.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrCommand.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrResponse.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrEventCommand.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrEvent.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AvrCommandFrame.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrResponseCommand.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/AvrResponseFrame.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AvrCommandFrame.hpp" + +#include "AVR/AvrCommand.hpp" +#include "AVR/AvrResponse.hpp" +#include "AVR/AvrEventCommand.hpp" +#include "AVR/AvrEvent.hpp" +#include "AVR/CommandFrames/AvrCommandFrame.hpp" +#include "AVR/AvrResponseCommand.hpp" +#include "AVR/ResponseFrames/AvrResponseFrame.hpp" +#include "AVR/CommandFrames/AvrCommandFrame.hpp" + #include "src/TargetController/Exceptions/DeviceCommunicationFailure.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg +namespace DebugToolDrivers::Microchip::Protocols::Edbg { /** * The EdbgInterface class implements the EDBG sub-protocol, which takes the form of numerous CMSIS-DAP vendor * commands. */ - class EdbgInterface: public CmsisDapInterface +class EdbgInterface: public ::DebugToolDrivers::Protocols::CmsisDap::CmsisDapInterface { public: explicit EdbgInterface(Usb::HidInterface&& cmsisHidInterface); @@ -37,8 +39,8 @@ namespace DebugToolDrivers::Protocols::CmsisDap::Edbg * @return */ template - Protocols::CmsisDap::Response sendAvrCommandFrameAndWaitForResponse( - const Protocols::CmsisDap::Edbg::Avr::AvrCommandFrame& avrCommandFrame + ::DebugToolDrivers::Protocols::CmsisDap::Response sendAvrCommandFrameAndWaitForResponse( + const Avr::AvrCommandFrame& avrCommandFrame ) { /* * An AVR command frame can be split into multiple CMSIS-DAP commands. Each command containing a fragment @@ -49,7 +51,7 @@ namespace DebugToolDrivers::Protocols::CmsisDap::Edbg )); } - virtual Protocols::CmsisDap::Response sendAvrCommandsAndWaitForResponse( + virtual ::DebugToolDrivers::Protocols::CmsisDap::Response sendAvrCommandsAndWaitForResponse( const std::vector& avrCommands ); @@ -59,7 +61,7 @@ namespace DebugToolDrivers::Protocols::CmsisDap::Edbg ) { static_assert( std::is_base_of< - Protocols::CmsisDap::Edbg::Avr::AvrResponseFrame, + Avr::AvrResponseFrame, typename CommandFrameType::ExpectedResponseFrameType >::value, "AVR Command must specify a valid response frame type, derived from AvrResponseFrame." @@ -77,9 +79,9 @@ namespace DebugToolDrivers::Protocols::CmsisDap::Edbg return typename CommandFrameType::ExpectedResponseFrameType(this->requestAvrResponses()); } - virtual std::optional requestAvrEvent(); + virtual std::optional requestAvrEvent(); private: - virtual std::vector requestAvrResponses(); + virtual std::vector requestAvrResponses(); }; } diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgTargetPowerManagementInterface.cpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/EdbgTargetPowerManagementInterface.cpp similarity index 66% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgTargetPowerManagementInterface.cpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/EdbgTargetPowerManagementInterface.cpp index 4537133b..ce278f1d 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgTargetPowerManagementInterface.cpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/EdbgTargetPowerManagementInterface.cpp @@ -1,16 +1,16 @@ #include "EdbgTargetPowerManagementInterface.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/EDBGControl/GetParameter.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/EDBGControl/SetParameter.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/EDBGControl/GetParameter.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/CommandFrames/EDBGControl/SetParameter.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg +namespace DebugToolDrivers::Microchip::Protocols::Edbg { using namespace Exceptions; - using Protocols::CmsisDap::Edbg::Avr::ResponseFrames::EdbgControl::EdbgControlResponseId; + using Microchip::Protocols::Edbg::Avr::ResponseFrames::EdbgControl::EdbgControlResponseId; - using Protocols::CmsisDap::Edbg::Avr::CommandFrames::EdbgControl::GetParameter; - using Protocols::CmsisDap::Edbg::Avr::CommandFrames::EdbgControl::SetParameter; + using Microchip::Protocols::Edbg::Avr::CommandFrames::EdbgControl::GetParameter; + using Microchip::Protocols::Edbg::Avr::CommandFrames::EdbgControl::SetParameter; EdbgTargetPowerManagementInterface::EdbgTargetPowerManagementInterface(EdbgInterface* edbgInterface) : edbgInterface(edbgInterface) diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgTargetPowerManagementInterface.hpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/EdbgTargetPowerManagementInterface.hpp similarity index 82% rename from src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgTargetPowerManagementInterface.hpp rename to src/DebugToolDrivers/Microchip/Protocols/EDBG/EdbgTargetPowerManagementInterface.hpp index e74f67e1..b2c22eb8 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgTargetPowerManagementInterface.hpp +++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/EdbgTargetPowerManagementInterface.hpp @@ -3,9 +3,9 @@ #include #include "src/DebugToolDrivers/TargetInterfaces/TargetPowerManagementInterface.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgInterface.hpp" +#include "src/DebugToolDrivers/Microchip/Protocols/EDBG/EdbgInterface.hpp" -namespace DebugToolDrivers::Protocols::CmsisDap::Edbg +namespace DebugToolDrivers::Microchip::Protocols::Edbg { class EdbgTargetPowerManagementInterface: public TargetInterfaces::TargetPowerManagementInterface { diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/CmsisDapInterface.cpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/CmsisDapInterface.cpp index a50e5a6d..6bf5e5da 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/CmsisDapInterface.cpp +++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/CmsisDapInterface.cpp @@ -2,8 +2,6 @@ #include -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/Command.hpp" - namespace DebugToolDrivers::Protocols::CmsisDap { using namespace Exceptions; @@ -13,13 +11,13 @@ namespace DebugToolDrivers::Protocols::CmsisDap {} void CmsisDapInterface::sendCommand(const Command& cmsisDapCommand) { - if (this->msSendCommandDelay.count() > 0) { + if (this->commandDelay.count() > 0) { using namespace std::chrono; std::int64_t now = duration_cast(high_resolution_clock::now().time_since_epoch()).count(); std::int64_t difference = (now - this->lastCommandSentTimeStamp); - if (difference < this->msSendCommandDelay.count()) { - std::this_thread::sleep_for(milliseconds(this->msSendCommandDelay.count() - difference)); + if (difference < this->commandDelay.count()) { + std::this_thread::sleep_for(milliseconds(this->commandDelay.count() - difference)); } this->lastCommandSentTimeStamp = now; diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/CmsisDapInterface.hpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/CmsisDapInterface.hpp index 474975f9..f6b9d28f 100644 --- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/CmsisDapInterface.hpp +++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/CmsisDapInterface.hpp @@ -5,9 +5,9 @@ #include #include "src/DebugToolDrivers/USB/HID/HidInterface.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/Response.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/Command.hpp" -#include "src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrCommand.hpp" + +#include "Response.hpp" +#include "Command.hpp" #include "src/TargetController/Exceptions/DeviceCommunicationFailure.hpp" @@ -39,7 +39,7 @@ namespace DebugToolDrivers::Protocols::CmsisDap } void setMinimumCommandTimeGap(std::chrono::milliseconds commandTimeGap) { - this->msSendCommandDelay = commandTimeGap; + this->commandDelay = commandTimeGap; } /** @@ -120,10 +120,8 @@ namespace DebugToolDrivers::Protocols::CmsisDap * received a response from every previous command. * * Because of this, we may need to enforce a minimum time gap between sending CMSIS commands. - * Setting msSendCommandDelay to any value above 0 will enforce an x millisecond gap between each command - * being sent, where x is the value of msSendCommandDelay. */ - std::chrono::milliseconds msSendCommandDelay = std::chrono::milliseconds(0); + std::chrono::milliseconds commandDelay = std::chrono::milliseconds(0); std::int64_t lastCommandSentTimeStamp = 0; }; }