diff options
Diffstat (limited to 'tools/rootcanal')
| -rw-r--r-- | tools/rootcanal/model/controller/controller_properties.cc | 4 | ||||
| -rw-r--r-- | tools/rootcanal/model/devices/beacon.cc | 8 | ||||
| -rw-r--r-- | tools/rootcanal/model/devices/scripted_beacon.cc | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tools/rootcanal/model/controller/controller_properties.cc b/tools/rootcanal/model/controller/controller_properties.cc index b9afe2cf40..b1ad2e8082 100644 --- a/tools/rootcanal/model/controller/controller_properties.cc +++ b/tools/rootcanal/model/controller/controller_properties.cc @@ -1574,7 +1574,7 @@ bool ControllerProperties::CheckSupportedCommands() const { } ControllerProperties::ControllerProperties() - : supported_commands(std::move(SupportedCommands())), + : supported_commands(SupportedCommands()), lmp_features({Page0LmpFeatures(), 0, Page2LmpFeatures()}), le_features(LlFeatures()) { if (!CheckSupportedFeatures()) { @@ -1670,7 +1670,7 @@ static void SetSupportedCommandBits(std::array<uint8_t, 64>& supported_commands, ControllerProperties::ControllerProperties(rootcanal::configuration::Controller const& config) : strict(!config.has_strict() || config.strict()), - supported_commands(std::move(SupportedCommands())), + supported_commands(SupportedCommands()), lmp_features({Page0LmpFeatures(), 0, Page2LmpFeatures()}), le_features(LlFeatures()) { using namespace rootcanal::configuration; diff --git a/tools/rootcanal/model/devices/beacon.cc b/tools/rootcanal/model/devices/beacon.cc index 1c7c14b054..37feff6738 100644 --- a/tools/rootcanal/model/devices/beacon.cc +++ b/tools/rootcanal/model/devices/beacon.cc @@ -57,10 +57,10 @@ void Beacon::Tick() { std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now(); if ((now - advertising_last_) >= advertising_interval_) { advertising_last_ = now; - SendLinkLayerPacket(std::move(LeLegacyAdvertisingPduBuilder::Create( + SendLinkLayerPacket(LeLegacyAdvertisingPduBuilder::Create( address_, Address::kEmpty, AddressType::PUBLIC, AddressType::PUBLIC, advertising_type_, - std::vector(advertising_data_.begin(), advertising_data_.end()))), + std::vector(advertising_data_.begin(), advertising_data_.end())), Phy::Type::LOW_ENERGY); } } @@ -71,9 +71,9 @@ void Beacon::ReceiveLinkLayerPacket(LinkLayerPacketView packet, Phy::Type /*type (advertising_type_ == LegacyAdvertisingType::ADV_IND || advertising_type_ == LegacyAdvertisingType::ADV_SCAN_IND)) { SendLinkLayerPacket( - std::move(LeScanResponseBuilder::Create( + LeScanResponseBuilder::Create( address_, packet.GetSourceAddress(), AddressType::PUBLIC, - std::vector(scan_response_data_.begin(), scan_response_data_.end()))), + std::vector(scan_response_data_.begin(), scan_response_data_.end())), Phy::Type::LOW_ENERGY); } } diff --git a/tools/rootcanal/model/devices/scripted_beacon.cc b/tools/rootcanal/model/devices/scripted_beacon.cc index 20e0906411..1e9bb66349 100644 --- a/tools/rootcanal/model/devices/scripted_beacon.cc +++ b/tools/rootcanal/model/devices/scripted_beacon.cc @@ -192,9 +192,9 @@ void ScriptedBeacon::ReceiveLinkLayerPacket(model::packets::LinkLayerPacketView if (packet.GetDestinationAddress() == address_ && packet.GetType() == PacketType::LE_SCAN) { set_state(PlaybackEvent::SCANNED_ONCE); SendLinkLayerPacket( - std::move(model::packets::LeScanResponseBuilder::Create( + model::packets::LeScanResponseBuilder::Create( address_, packet.GetSourceAddress(), AddressType::PUBLIC, - std::vector(scan_response_data_.begin(), scan_response_data_.end()))), + std::vector(scan_response_data_.begin(), scan_response_data_.end())), Phy::Type::LOW_ENERGY); } } |