Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c0f7b24 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Ia31e8f49,I7ca35307,I7f84ace1,Id6e0eb51 

* changes:
  RootCanal: PhyLayer style fixes
  Add timer commands to TestChannel script
  RootCanal: Remove shadowed parameter listen_fd_
  RootCanal: Use vectors for phys and devices
parents 9863161a e1921f9f

system/vendor_libs/test_vendor_lib/model/devices/beacon.cc

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ void Beacon::TimerTick() { 
    std::shared_ptr<model::packets::LinkLayerPacketBuilder> to_send =

        std::move(ad);



    for (auto phy : phy_layers_[Phy::Type::LOW_ENERGY]) {

    for (const auto& phy : phy_layers_[Phy::Type::LOW_ENERGY]) {

      phy->Send(to_send);

    }

  }
@@ -87,7 +87,7 @@ void Beacon::IncomingPacket(model::packets::LinkLayerPacketView packet) { 
    std::shared_ptr<model::packets::LinkLayerPacketBuilder> to_send =

        std::move(scan_response);



    for (auto phy : phy_layers_[Phy::Type::LOW_ENERGY]) {

    for (const auto& phy : phy_layers_[Phy::Type::LOW_ENERGY]) {

      phy->Send(to_send);

    }

  }

system/vendor_libs/test_vendor_lib/model/devices/device.cc

+2 −2
Original line number Diff line number Diff line
@@ -58,14 +58,14 @@ bool Device::IsAdvertisementAvailable() const { 
void Device::SendLinkLayerPacket(

    std::shared_ptr<model::packets::LinkLayerPacketBuilder> to_send,

    Phy::Type phy_type) {

  for (auto phy : phy_layers_[phy_type]) {

  for (const auto& phy : phy_layers_[phy_type]) {

    phy->Send(to_send);

  }

}



void Device::SendLinkLayerPacket(model::packets::LinkLayerPacketView to_send,

                                 Phy::Type phy_type) {

  for (auto phy : phy_layers_[phy_type]) {

  for (const auto& phy : phy_layers_[phy_type]) {

    phy->Send(to_send);

  }

}

system/vendor_libs/test_vendor_lib/model/devices/loopback.cc

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ void Loopback::IncomingPacket(model::packets::LinkLayerPacketView packet) { 
    std::shared_ptr<model::packets::LinkLayerPacketBuilder> to_send =

        std::move(scan_response);



    for (auto phy : phy_layers_[Phy::Type::LOW_ENERGY]) {

    for (const auto& phy : phy_layers_[Phy::Type::LOW_ENERGY]) {

      LOG_INFO("Sending a Scan Response on a Phy");

      phy->Send(to_send);

    }

system/vendor_libs/test_vendor_lib/model/setup/phy_layer.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ class PhyLayer { 
        transmit_to_device_(device_receive) {}



  virtual void Send(

      const std::shared_ptr<model::packets::LinkLayerPacketBuilder> packet) = 0;

      std::shared_ptr<model::packets::LinkLayerPacketBuilder> packet) = 0;

  virtual void Send(model::packets::LinkLayerPacketView packet) = 0;



  virtual void Receive(model::packets::LinkLayerPacketView packet) = 0;

system/vendor_libs/test_vendor_lib/model/setup/phy_layer_factory.cc

+6 −0
Original line number Diff line number Diff line
@@ -51,6 +51,12 @@ void PhyLayerFactory::UnregisterPhyLayer(uint32_t id) { 
  }

}



void PhyLayerFactory::UnregisterAllPhyLayers() {

  for (const auto& phy : phy_layers_) {

    UnregisterPhyLayer(phy->GetId());

  }

}



void PhyLayerFactory::Send(

    const std::shared_ptr<model::packets::LinkLayerPacketBuilder> packet,

    uint32_t id) {