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

Commit 0509fa18 authored by Myles Watson's avatar Myles Watson
Browse files

Use GD for inquiry support 

Bug: 301661850
Bug: 321273521
Test: mma -j32
Flag: EXEMPT, no logical change
Change-Id: I7872aaf56b162d02ffa371c723e522dddbdf94c8
parent e46c054a

system/device/include/controller.h

+0 −5
Original line number Diff line number Diff line
@@ -36,11 +36,6 @@ typedef struct controller_t { 


  const uint8_t* (*get_ble_supported_states)(void);



  bool (*SupportsSimultaneousLeBrEdr)(void);

  bool (*supports_reading_remote_extended_features)(void);

  bool (*SupportsInterlacedInquiryScan)(void);

  bool (*SupportsRssiWithInquiryResults)(void);

  bool (*SupportsExtendedInquiryResponse)(void);

  bool (*supports_enhanced_setup_synchronous_connection)(void);

  bool (*supports_enhanced_accept_synchronous_connection)(void);

  bool (*Supports3SlotPackets)(void);

system/main/shim/btm.cc

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ void Btm::SetInterlacedInquiryScan() { GetInquiry()->SetInterlacedScan(); } 
void Btm::SetStandardInquiryScan() { GetInquiry()->SetStandardScan(); }



bool Btm::IsInterlacedScanSupported() const {

  return controller_get_interface()->SupportsInterlacedInquiryScan();

  return bluetooth::shim::GetController()->SupportsInterlacedInquiryScan();

}



/**

system/main/shim/controller.cc

+0 −14
Original line number Diff line number Diff line
@@ -117,10 +117,6 @@ static const uint8_t* get_ble_supported_states(void) { 
#define MAP_TO_GD(legacy, gd) \

  static bool legacy(void) { return GetController()->gd(); }



MAP_TO_GD(supports_simultaneous_le_bredr, SupportsSimultaneousLeBrEdr)

MAP_TO_GD(supports_interlaced_inquiry_scan, SupportsInterlacedInquiryScan)

MAP_TO_GD(supports_rssi_with_inquiry_results, SupportsRssiWithInquiryResults)

MAP_TO_GD(supports_extended_inquiry_response, SupportsExtendedInquiryResponse)

MAP_TO_GD(supports_three_slot_packets, Supports3SlotPackets)

MAP_TO_GD(supports_five_slot_packets, Supports5SlotPackets)

MAP_TO_GD(supports_classic_2m_phy, SupportsClassic2mPhy)
@@ -185,10 +181,6 @@ FORWARD(supports_read_encryption_key_size, 
        GetController()->IsSupported(

            bluetooth::hci::OpCode::READ_ENCRYPTION_KEY_SIZE))



FORWARD(supports_reading_remote_extended_features,

        GetController()->IsSupported(

            bluetooth::hci::OpCode::READ_REMOTE_EXTENDED_FEATURES))



FORWARD(supports_enhanced_setup_synchronous_connection,

        GetController()->IsSupported(

            bluetooth::hci::OpCode::ENHANCED_SETUP_SYNCHRONOUS_CONNECTION))
@@ -325,12 +317,6 @@ static const controller_t interface = { 


    .get_ble_supported_states = get_ble_supported_states,



    .SupportsSimultaneousLeBrEdr = supports_simultaneous_le_bredr,

    .supports_reading_remote_extended_features =

        supports_reading_remote_extended_features,

    .SupportsInterlacedInquiryScan = supports_interlaced_inquiry_scan,

    .SupportsRssiWithInquiryResults = supports_rssi_with_inquiry_results,

    .SupportsExtendedInquiryResponse = supports_extended_inquiry_response,

    .supports_enhanced_setup_synchronous_connection =

        supports_enhanced_setup_synchronous_connection,

    .supports_enhanced_accept_synchronous_connection =

system/stack/acl/btm_acl.cc

+4 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
 *

 *****************************************************************************/



#include "main/shim/entry.h"

#define LOG_TAG "btm_acl"



#include <base/logging.h>
@@ -44,6 +45,7 @@ 
#include "device/include/controller.h"

#include "device/include/device_iot_config.h"

#include "device/include/interop.h"

#include "hci/controller_interface.h"

#include "include/check.h"

#include "include/l2cap_hci_link_interface.h"

#include "internal_include/bt_target.h"
@@ -2740,8 +2742,8 @@ void acl_process_supported_features(uint16_t handle, uint64_t features) { 
          .c_str());



  if ((HCI_LMP_EXTENDED_SUPPORTED(p_acl->peer_lmp_feature_pages[0])) &&

      (controller_get_interface()

           ->supports_reading_remote_extended_features())) {

      (bluetooth::shim::GetController()->IsSupported(

          bluetooth::hci::OpCode::READ_REMOTE_EXTENDED_FEATURES))) {

    LOG_DEBUG("Waiting for remote extended feature response to arrive");

  } else {

    LOG_DEBUG("No more remote features outstanding so notify upper layer");

system/stack/btm/btm_ble_gap.cc

+1 −1
Original line number Diff line number Diff line
@@ -1630,7 +1630,7 @@ void btm_ble_update_dmt_flag_bits(uint8_t* adv_flag_value, 


  /* if local controller support, mark both controller and host support in flag

   */

  if (controller_get_interface()->SupportsSimultaneousLeBrEdr())

  if (bluetooth::shim::GetController()->SupportsSimultaneousLeBrEdr())

    *adv_flag_value |= (BTM_BLE_DMT_CONTROLLER_SPT | BTM_BLE_DMT_HOST_SPT);

  else

    *adv_flag_value &= ~(BTM_BLE_DMT_CONTROLLER_SPT | BTM_BLE_DMT_HOST_SPT);