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

Commit dfead291 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "hci: Remove SimultaneousLeHost bit" am: ae4dac81 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1511153

Change-Id: Ib0d734b147dfc2858eef84b7f6c5313d0d6d571a
parents 8ab1d103 ae4dac81

system/gd/hci/controller.cc

+3 −4
Original line number Diff line number Diff line
@@ -43,8 +43,7 @@ struct Controller::impl { 
    le_set_event_mask(kDefaultLeEventMask);

    set_event_mask(kDefaultEventMask);

    write_simple_pairing_mode(Enable::ENABLED);

    // TODO(b/159927452): Legacy stack set SimultaneousLeHost = 1. Revisit if this causes problem.

    write_le_host_support(Enable::ENABLED, SimultaneousLeHost::DISABLED);

    write_le_host_support(Enable::ENABLED);

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

                         handler->BindOnceOn(this, &Controller::impl::read_local_name_complete_handler));

    hci_->EnqueueCommand(ReadLocalVersionInformationBuilder::Create(),
@@ -450,8 +449,8 @@ struct Controller::impl { 
        module_.GetHandler()->BindOnceOn(this, &Controller::impl::check_status<WriteSimplePairingModeCompleteView>));

  }



  void write_le_host_support(Enable enable, SimultaneousLeHost simultaneous_le_host) {

    std::unique_ptr<WriteLeHostSupportBuilder> packet = WriteLeHostSupportBuilder::Create(enable, simultaneous_le_host);

  void write_le_host_support(Enable enable) {

    std::unique_ptr<WriteLeHostSupportBuilder> packet = WriteLeHostSupportBuilder::Create(enable);

    hci_->EnqueueCommand(

        std::move(packet),

        module_.GetHandler()->BindOnceOn(this, &Controller::impl::check_status<WriteLeHostSupportCompleteView>));

system/gd/hci/hci_packets.pdl

+2 −6
Original line number Diff line number Diff line
@@ -2023,22 +2023,18 @@ packet SendKeypressNotificationComplete : CommandComplete (command_op_code = SEN 
  bd_addr : Address,

}



enum SimultaneousLeHost : 8 {

  DISABLED = 0x00,

}



packet ReadLeHostSupport : CommandPacket (op_code = READ_LE_HOST_SUPPORT) {

}



packet ReadLeHostSupportComplete : CommandComplete (command_op_code = READ_LE_HOST_SUPPORT) {

  status : ErrorCode,

  le_supported_host : Enable,

  simultaneous_le_host : SimultaneousLeHost,

  _reserved_ : 8, // simultaneous_le_host (ignored and always 0)

}



packet WriteLeHostSupport : CommandPacket (op_code = WRITE_LE_HOST_SUPPORT) {

  le_supported_host : Enable,

  simultaneous_le_host : SimultaneousLeHost,

  _reserved_ : 8, // simultaneous_le_host (ignored and always 0)

}



packet WriteLeHostSupportComplete : CommandComplete (command_op_code = WRITE_LE_HOST_SUPPORT) {

system/gd/hci/hci_packets_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ DEFINE_AND_INSTANTIATE_WriteSimplePairingModeReflectionTest(write_simple_paring_ 
std::vector<uint8_t> write_simple_paring_mode_complete = {0x0e, 0x04, 0x01, 0x56, 0x0c, 0x00};

DEFINE_AND_INSTANTIATE_WriteSimplePairingModeCompleteReflectionTest(write_simple_paring_mode_complete);



std::vector<uint8_t> write_le_host_supported = {0x6d, 0x0c, 0x02, 0x01, 0x01};

std::vector<uint8_t> write_le_host_supported = {0x6d, 0x0c, 0x02, 0x01, 0x00};

DEFINE_AND_INSTANTIATE_WriteLeHostSupportReflectionTest(write_le_host_supported);



std::vector<uint8_t> write_le_host_supported_complete = {0x0e, 0x04, 0x01, 0x6d, 0x0c, 0x00};