This commit is contained in:
Nav
2024-11-16 20:06:55 +00:00
parent 07283a2dc7
commit 26f4f8f90e
6 changed files with 10 additions and 8 deletions

View File

@@ -78,7 +78,7 @@ namespace DebugToolDrivers::Protocols::RiscVDebugSpec
const Targets::TargetMemorySegmentDescriptor& memorySegmentDescriptor, const Targets::TargetMemorySegmentDescriptor& memorySegmentDescriptor,
Targets::TargetMemoryAddress startAddress, Targets::TargetMemoryAddress startAddress,
Targets::TargetMemorySize bytes, Targets::TargetMemorySize bytes,
const std::set<Targets::TargetMemoryAddressRange>& excludedAddressRanges = {} const std::set<Targets::TargetMemoryAddressRange>& excludedAddressRanges
) override; ) override;
void writeMemory( void writeMemory(
const Targets::TargetAddressSpaceDescriptor& addressSpaceDescriptor, const Targets::TargetAddressSpaceDescriptor& addressSpaceDescriptor,

View File

@@ -53,7 +53,7 @@ namespace DebugToolDrivers::Wch::Protocols::WchLink
return DeviceInfo{ return DeviceInfo{
WchFirmwareVersion{response.payload[0], response.payload[1]}, WchFirmwareVersion{response.payload[0], response.payload[1]},
response.payload.size() >= 4 response.payload.size() >= 4
? std::optional{variantsById.valueAt(response.payload[2])} ? variantsById.valueAt(response.payload[2])
: std::nullopt : std::nullopt
}; };
} }

View File

@@ -11,4 +11,8 @@ namespace DebugToolDrivers::Wch
WchLinkE::WCH_LINK_INTERFACE_NUMBER WchLinkE::WCH_LINK_INTERFACE_NUMBER
) )
{} {}
std::string WchLinkE::getName() {
return "WCH-LinkE";
}
} }

View File

@@ -23,10 +23,8 @@ namespace DebugToolDrivers::Wch
static const inline std::uint16_t USB_PRODUCT_ID = 0x8010; static const inline std::uint16_t USB_PRODUCT_ID = 0x8010;
static const inline std::uint8_t WCH_LINK_INTERFACE_NUMBER = 0; static const inline std::uint8_t WCH_LINK_INTERFACE_NUMBER = 0;
WchLinkE(const DebugToolConfig& toolConfig); explicit WchLinkE(const DebugToolConfig& toolConfig);
std::string getName() override { std::string getName() override;
return "WCH-LinkE";
}
}; };
} }

View File

@@ -56,7 +56,7 @@ namespace Targets::RiscV
const TargetMemorySegmentDescriptor& memorySegmentDescriptor, const TargetMemorySegmentDescriptor& memorySegmentDescriptor,
TargetMemoryAddress startAddress, TargetMemoryAddress startAddress,
TargetMemorySize bytes, TargetMemorySize bytes,
const std::set<TargetMemoryAddressRange>& excludedAddressRanges = {} const std::set<TargetMemoryAddressRange>& excludedAddressRanges
) override; ) override;
void writeMemory( void writeMemory(
const TargetAddressSpaceDescriptor& addressSpaceDescriptor, const TargetAddressSpaceDescriptor& addressSpaceDescriptor,

View File

@@ -105,7 +105,7 @@ namespace Targets
* *
* @return * @return
*/ */
std::set<Targets::TargetMemoryAddress> addresses() const noexcept { [[nodiscard]] std::set<Targets::TargetMemoryAddress> addresses() const noexcept {
auto addresses = std::set<Targets::TargetMemoryAddress>{}; auto addresses = std::set<Targets::TargetMemoryAddress>{};
auto addressesIt = addresses.end(); auto addressesIt = addresses.end();