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-11-16 23:51:07 +00:00
parent 4a9e99f053
commit f2d09641a1
6 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/DebugToolDrivers/Microchip/EdbgDevice.cpp
View File

@@ -30,17 +30,17 @@ namespace Bloom::DebugToolDrivers
void EdbgDevice::init() {
UsbDevice::init();
auto usbHidInterface = Usb::HidInterface(this->cmsisHidInterfaceNumber, this->vendorId, this->productId);
auto cmsisHidInterface = Usb::HidInterface(this->cmsisHidInterfaceNumber, this->vendorId, this->productId);
this->detachKernelDriverFromInterface(usbHidInterface.interfaceNumber);
this->detachKernelDriverFromInterface(cmsisHidInterface.interfaceNumber);
if (this->configurationIndex.has_value()) {
this->setConfiguration(this->configurationIndex.value());
}
usbHidInterface.init();
cmsisHidInterface.init();
this->edbgInterface = std::make_unique<EdbgInterface>(std::move(usbHidInterface));
this->edbgInterface = std::make_unique<EdbgInterface>(std::move(cmsisHidInterface));
/*
* The EDBG/CMSIS-DAP interface doesn't operate properly when sending commands too quickly.

4
src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgInterface.cpp
View File

@@ -8,8 +8,8 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg
{
using namespace Bloom::Exceptions;
EdbgInterface::EdbgInterface(Usb::HidInterface&& usbHidInterface)
: CmsisDapInterface(std::move(usbHidInterface))
EdbgInterface::EdbgInterface(Usb::HidInterface&& cmsisHidInterface)
: CmsisDapInterface(std::move(cmsisHidInterface))
{}
Protocols::CmsisDap::Response EdbgInterface::sendAvrCommandsAndWaitForResponse(

2
src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/EdbgInterface.hpp
View File

@@ -24,7 +24,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg
class EdbgInterface: public CmsisDapInterface
{
public:
explicit EdbgInterface(Usb::HidInterface&& usbHidInterface);
explicit EdbgInterface(Usb::HidInterface&& cmsisHidInterface);
/**
* Send an AvrCommandFrame to the debug tool and wait for a response.

4
src/Targets/Microchip/AVR/AVR8/Avr8TargetConfig.cpp
View File

@@ -6,7 +6,9 @@
namespace Bloom::Targets::Microchip::Avr::Avr8Bit
{
Avr8TargetConfig::Avr8TargetConfig(const TargetConfig& targetConfig): TargetConfig(targetConfig) {
Avr8TargetConfig::Avr8TargetConfig(const TargetConfig& targetConfig)
: TargetConfig(targetConfig)
{
using Bloom::Exceptions::InvalidConfig;
const auto& targetNode = targetConfig.targetNode;