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

Commit 325146ae authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge "Use GD Names for controller features" into main

parents 28bb19ef acd73669

system/bta/dm/bta_dm_act.cc

+2 −2
Original line number Diff line number Diff line
@@ -652,7 +652,7 @@ void handle_remote_features_complete(const RawAddress& bd_addr) { 
    return;

  }



  if (controller_get_interface()->supports_sniff_subrating() &&

  if (controller_get_interface()->SupportsSniffSubrating() &&

      acl_peer_supports_sniff_subrating(bd_addr)) {

    LOG_DEBUG("Device supports sniff subrating peer:%s",

              ADDRESS_TO_LOGGABLE_CSTR(bd_addr));
@@ -705,7 +705,7 @@ void bta_dm_acl_up(const RawAddress& bd_addr, tBT_TRANSPORT transport, 
  device->reset_device_info();

  device->transport = transport;



  if (controller_get_interface()->supports_sniff_subrating() &&

  if (controller_get_interface()->SupportsSniffSubrating() &&

      acl_peer_supports_sniff_subrating(bd_addr)) {

    // NOTE: This callback assumes upon ACL connection that

    // the read remote features has completed and is valid.

system/bta/dm/bta_dm_pm.cc

+2 −2
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ static void bta_dm_pm_cback(tBTA_SYS_CONN_STATUS status, const tBTA_SYS_ID id, 
  } else {

    const controller_t* controller = controller_get_interface();

    uint8_t* p = NULL;

    if (controller->supports_sniff_subrating() &&

    if (controller->SupportsSniffSubrating() &&

        ((NULL != (p = get_btm_client_interface().peer.BTM_ReadRemoteFeatures(

                       peer_addr))) &&

         HCI_SNIFF_SUB_RATE_SUPPORTED(p)) &&
@@ -793,7 +793,7 @@ void bta_dm_pm_sniff(tBTA_DM_PEER_DEVICE* p_peer_dev, uint8_t index) { 


  const controller_t* controller = controller_get_interface();

  if (mode != BTM_PM_MD_SNIFF ||

      (controller->supports_sniff_subrating() && p_rem_feat &&

      (controller->SupportsSniffSubrating() && p_rem_feat &&

       HCI_SNIFF_SUB_RATE_SUPPORTED(p_rem_feat) &&

       !(p_peer_dev->is_ssr_active()))) {

    /* Dont initiate Sniff if controller has alreay accepted

system/bta/gatt/bta_gattc_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ void bta_gattc_register(const Uuid& app_uuid, tBTA_GATTC_CBACK* p_cback, 
/** De-Register a GATT client application with BTA */

void bta_gattc_deregister(tBTA_GATTC_RCB* p_clreg) {

  uint8_t accept_list_size = 0;

  if (controller_get_interface()->supports_ble()) {

  if (controller_get_interface()->SupportsBle()) {

    accept_list_size = controller_get_interface()->get_ble_acceptlist_size();

  }

system/bta/gatt/bta_gattc_utils.cc

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 


static uint8_t ble_acceptlist_size() {

  const controller_t* controller = controller_get_interface();

  if (!controller->supports_ble()) {

  if (!controller->SupportsBle()) {

    return 0;

  }

  return controller->get_ble_acceptlist_size();

system/bta/hearing_aid/hearing_aid.cc

+2 −2
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ class HearingAidImpl : public HearingAid { 
    hearingDevice->connection_update_status = STARTED;

    hearingDevice->requested_connection_interval = UpdateBleConnParams(address);



    if (controller_get_interface()->supports_ble_2m_phy()) {

    if (controller_get_interface()->SupportsBle2mPhy()) {

      LOG_INFO("%s set preferred 2M PHY", ADDRESS_TO_LOGGABLE_CSTR(address));

      BTM_BleSetPhy(address, PHY_LE_2M, PHY_LE_2M, 0);

    }
@@ -994,7 +994,7 @@ class HearingAidImpl : public HearingAid { 
    }



    if ((codecs & (1 << CODEC_G722_24KHZ)) &&

        controller_get_interface()->supports_ble_2m_phy() &&

        controller_get_interface()->SupportsBle2mPhy() &&

        default_data_interval_ms == HA_INTERVAL_10_MS) {

      codec_in_use = CODEC_G722_24KHZ;

    } else if (codecs & (1 << CODEC_G722_16KHZ)) {