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

Commit 8cf519f0 authored by Treehugger Robot's avatar Treehugger Robot
Browse files

Merge "HCI: Set default event mask" am: 210e0d25 

Change-Id: Ia7a90c55859f1adf226cdd2296dad96940fb0ab1
parents 27d19c32 210e0d25

system/gd/hci/controller.cc

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ struct Controller::impl { 
                               Bind(&Controller::impl::NumberOfCompletedPackets, common::Unretained(this)),

                               module_.GetHandler());



    set_event_mask(kDefaultEventMask);

    hci_->EnqueueCommand(ReadLocalNameBuilder::Create(),

                         BindOnce(&Controller::impl::read_local_name_complete_handler, common::Unretained(this)),

                         module_.GetHandler());

system/gd/hci/controller.h

+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ class Controller : public Module { 


  static const ModuleFactory Factory;



  static constexpr uint64_t kDefaultEventMask = 0x3dbfffffffffffff;



 protected:

  void ListDependencies(ModuleList* list) override;

system/gd/hci/controller_test.cc

+13 −7
Original line number Diff line number Diff line
@@ -173,7 +173,12 @@ class TestHciLayer : public HciLayer { 
        event_builder = LeGetVendorCapabilitiesCompleteBuilder::Create(num_packets, ErrorCode::SUCCESS,

                                                                       base_vendor_capabilities, std::move(payload));

      } break;

      case (OpCode::SET_EVENT_MASK):

      case (OpCode::SET_EVENT_MASK): {

        auto view = SetEventMaskView::Create(command);

        ASSERT(view.IsValid());

        event_mask = view.GetEventMask();

        event_builder = SetEventMaskCompleteBuilder::Create(num_packets, ErrorCode::SUCCESS);

      } break;

      case (OpCode::RESET):

      case (OpCode::SET_EVENT_FILTER):

      case (OpCode::HOST_BUFFER_SIZE):
@@ -247,6 +252,7 @@ class TestHciLayer : public HciLayer { 
  constexpr static uint8_t synchronous_data_packet_length = 60;

  constexpr static uint16_t total_num_acl_data_packets = 10;

  constexpr static uint16_t total_num_synchronous_data_packets = 12;

  uint64_t event_mask = 0;



 private:

  common::Callback<void(EventPacketView)> number_of_completed_packets_callback_;
@@ -280,7 +286,6 @@ class ControllerTest : public ::testing::Test { 
TEST_F(ControllerTest, startup_teardown) {}



TEST_F(ControllerTest, read_controller_info) {

  std::promise<void> callback_completed;

  ASSERT_EQ(controller_->GetControllerAclPacketLength(), test_hci_layer_->acl_data_packet_length);

  ASSERT_EQ(controller_->GetControllerNumAclPacketBuffers(), test_hci_layer_->total_num_acl_data_packets);

  ASSERT_EQ(controller_->GetControllerScoPacketLength(), test_hci_layer_->synchronous_data_packet_length);
@@ -323,11 +328,12 @@ TEST_F(ControllerTest, read_write_local_name) { 
}



TEST_F(ControllerTest, send_set_event_mask_command) {

  controller_->SetEventMask(0x00001FFFFFFFFFFF);

  auto packet = test_hci_layer_->GetCommand(OpCode::SET_EVENT_MASK);

  auto command = SetEventMaskView::Create(packet);

  ASSERT(command.IsValid());

  ASSERT_EQ(command.GetEventMask(), 0x00001FFFFFFFFFFF);

  uint64_t new_event_mask = test_hci_layer_->event_mask - 1;

  controller_->SetEventMask(new_event_mask);

  // Send another command to make sure it was applied

  controller_->Reset();

  auto packet = test_hci_layer_->GetCommand(OpCode::RESET);

  ASSERT_EQ(new_event_mask, test_hci_layer_->event_mask);

}



TEST_F(ControllerTest, send_reset_command) {

system/gd/shim/controller.cc

+0 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ namespace shim { 


namespace {

constexpr char kModuleName[] = "shim::Controller";

constexpr uint64_t kEventMask = 0x3dbfffffffffffff;

}  // namespace



struct Controller::impl {
@@ -109,7 +108,6 @@ void Controller::ListDependencies(ModuleList* list) { 
void Controller::Start() {

  LOG_INFO("%s Starting controller shim layer", __func__);

  pimpl_ = std::make_unique<impl>(GetDependency<hci::Controller>());

  pimpl_->hci_controller_->SetEventMask(kEventMask);

}



void Controller::Stop() {