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

Tidying

Browse Source
This commit is contained in:
Nav
2022-05-02 13:38:03 +01:00
parent 6e8abaeeb7
commit d0ca05f9e9
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/TargetController/TargetControllerComponent.hpp
View File

@@ -16,6 +16,8 @@
#include "src/Helpers/SyncSafe.hpp" #include "src/Helpers/SyncSafe.hpp"
#include "src/Helpers/ConditionVariableNotifier.hpp" #include "src/Helpers/ConditionVariableNotifier.hpp"
#include "TargetControllerState.hpp"
// Commands // Commands
#include "Commands/Command.hpp" #include "Commands/Command.hpp"
#include "Commands/GetTargetDescriptor.hpp" #include "Commands/GetTargetDescriptor.hpp"
@@ -46,8 +48,6 @@
#include "Responses/TargetStackPointer.hpp" #include "Responses/TargetStackPointer.hpp"
#include "Responses/TargetProgramCounter.hpp" #include "Responses/TargetProgramCounter.hpp"
#include "TargetControllerState.hpp"
#include "src/DebugToolDrivers/DebugTools.hpp" #include "src/DebugToolDrivers/DebugTools.hpp"
#include "src/Targets/Target.hpp" #include "src/Targets/Target.hpp"
#include "src/Targets/Targets.hpp" #include "src/Targets/Targets.hpp"
@@ -161,8 +161,8 @@ namespace Bloom::TargetController
template<class CommandType> template<class CommandType>
void registerCommandHandler(std::function<std::unique_ptr<Responses::Response>(CommandType&)> callback) { void registerCommandHandler(std::function<std::unique_ptr<Responses::Response>(CommandType&)> callback) {
auto parentCallback = [callback] (Commands::Command& command) { auto parentCallback = [callback] (Commands::Command& command) {
// Downcast the command to the expected type // Downcast the command to the expected type
return callback(dynamic_cast<CommandType&>(command)); return callback(dynamic_cast<CommandType&>(command));
}; };
this->commandHandlersByCommandType.insert(std::pair(CommandType::type, parentCallback)); this->commandHandlersByCommandType.insert(std::pair(CommandType::type, parentCallback));
@@ -320,6 +320,7 @@ namespace Bloom::TargetController
*/ */
void onDebugSessionFinishedEvent(const Events::DebugSessionFinished& event); void onDebugSessionFinishedEvent(const Events::DebugSessionFinished& event);
// Command handlers
std::unique_ptr<Responses::TargetDescriptor> handleGetTargetDescriptor(Commands::GetTargetDescriptor& command); std::unique_ptr<Responses::TargetDescriptor> handleGetTargetDescriptor(Commands::GetTargetDescriptor& command);
std::unique_ptr<Responses::TargetState> handleGetTargetState(Commands::GetTargetState& command); std::unique_ptr<Responses::TargetState> handleGetTargetState(Commands::GetTargetState& command);
std::unique_ptr<Responses::Response> handleStopTargetExecution(Commands::StopTargetExecution& command); std::unique_ptr<Responses::Response> handleStopTargetExecution(Commands::StopTargetExecution& command);