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

Commit 807d8841 authored by Myles Watson's avatar Myles Watson
Browse files

Remove duplicated supports bits 

supports_central_peripheral_role_switch
(supports_role_switch)
supports_ble_connection_parameter_request
(supports_ble_connection_parameters_request)

Bug: 301661850
Test: atest bluetooth_test_gd_unit
Flag: EXEMPT, no-op change
Change-Id: I26cf85c06cb6f3e10db8d3d1b23879fead51f29a
parent 429c090b

system/device/include/controller.h

+0 −2
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ typedef struct controller_t { 
  bool (*supports_interlaced_inquiry_scan)(void);

  bool (*supports_rssi_with_inquiry_results)(void);

  bool (*supports_extended_inquiry_response)(void);

  bool (*supports_central_peripheral_role_switch)(void);

  bool (*supports_enhanced_setup_synchronous_connection)(void);

  bool (*supports_enhanced_accept_synchronous_connection)(void);

  bool (*supports_3_slot_packets)(void);
@@ -82,7 +81,6 @@ typedef struct controller_t { 
  bool (*supports_ble_extended_advertising)(void);

  bool (*supports_ble_periodic_advertising)(void);

  bool (*supports_ble_peripheral_initiated_feature_exchange)(void);

  bool (*supports_ble_connection_parameter_request)(void);

  bool (*supports_ble_periodic_advertising_sync_transfer_sender)(void);

  bool (*supports_ble_periodic_advertising_sync_transfer_recipient)(void);

  bool (*supports_ble_connected_isochronous_stream_central)(void);

system/main/shim/controller.cc

+0 −5
Original line number Diff line number Diff line
@@ -156,8 +156,6 @@ MAP_TO_GD(supports_extended_advertising, SupportsBleExtendedAdvertising) 
MAP_TO_GD(supports_periodic_advertising, SupportsBlePeriodicAdvertising)

MAP_TO_GD(supports_peripheral_initiated_feature_exchange,

          SupportsBlePeripheralInitiatedFeaturesExchange)

MAP_TO_GD(supports_connection_parameter_request,

          SupportsBleConnectionParametersRequest)



MAP_TO_GD(supports_periodic_advertising_sync_transfer_sender,

          SupportsBlePeriodicAdvertisingSyncTransferSender)
@@ -336,7 +334,6 @@ static const controller_t interface = { 
    .supports_interlaced_inquiry_scan = supports_interlaced_inquiry_scan,

    .supports_rssi_with_inquiry_results = supports_rssi_with_inquiry_results,

    .supports_extended_inquiry_response = supports_extended_inquiry_response,

    .supports_central_peripheral_role_switch = supports_role_switch,

    .supports_enhanced_setup_synchronous_connection =

        supports_enhanced_setup_synchronous_connection,

    .supports_enhanced_accept_synchronous_connection =
@@ -380,8 +377,6 @@ static const controller_t interface = { 
    .supports_ble_periodic_advertising = supports_periodic_advertising,

    .supports_ble_peripheral_initiated_feature_exchange =

        supports_peripheral_initiated_feature_exchange,

    .supports_ble_connection_parameter_request =

        supports_connection_parameter_request,

    .supports_ble_periodic_advertising_sync_transfer_sender =

        supports_periodic_advertising_sync_transfer_sender,

    .supports_ble_periodic_advertising_sync_transfer_recipient =

system/stack/acl/btm_acl.cc

+1 −1
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ tBTM_STATUS BTM_GetRole(const RawAddress& remote_bd_addr, tHCI_ROLE* p_role) { 
 *

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

tBTM_STATUS BTM_SwitchRoleToCentral(const RawAddress& remote_bd_addr) {

  if (!controller_get_interface()->supports_central_peripheral_role_switch()) {

  if (!controller_get_interface()->supports_role_switch()) {

    LOG_INFO("Local controller does not support role switching");

    return BTM_MODE_UNSUPPORTED;

  }

system/stack/btm/btm_dev.cc

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ bool btm_dev_support_role_switch(const RawAddress& bd_addr) { 
    return false;

  }



  if (!controller_get_interface()->supports_central_peripheral_role_switch()) {

  if (!controller_get_interface()->supports_role_switch()) {

    LOG_VERBOSE("%s Local controller does not support role switch", __func__);

    return false;

  }

system/stack/l2cap/l2c_ble.cc

+10 −12
Original line number Diff line number Diff line
@@ -341,12 +341,11 @@ static void l2cble_start_conn_update(tL2C_LCB* p_lcb) { 
      supervision_tout = BTM_BLE_CONN_TIMEOUT_DEF;



      /* if both side 4.1, or we are central device, send HCI command */

      if (p_lcb->IsLinkRoleCentral()

          || (controller_get_interface()

                  ->supports_ble_connection_parameter_request() &&

      if (p_lcb->IsLinkRoleCentral() ||

          (controller_get_interface()

               ->supports_ble_connection_parameters_request() &&

           acl_peer_supports_ble_connection_parameters_request(

                  p_lcb->remote_bd_addr))

      ) {

               p_lcb->remote_bd_addr))) {

        btsnd_hcic_ble_upd_ll_conn_params(p_lcb->Handle(), min_conn_int,

                                          max_conn_int, peripheral_latency,

                                          supervision_tout, 0, 0);
@@ -362,12 +361,11 @@ static void l2cble_start_conn_update(tL2C_LCB* p_lcb) { 
    /* application allows to do update, if we were delaying one do it now */

    if (p_lcb->conn_update_mask & L2C_BLE_NEW_CONN_PARAM) {

      /* if both side 4.1, or we are central device, send HCI command */

      if (p_lcb->IsLinkRoleCentral()

          || (controller_get_interface()

                  ->supports_ble_connection_parameter_request() &&

      if (p_lcb->IsLinkRoleCentral() ||

          (controller_get_interface()

               ->supports_ble_connection_parameters_request() &&

           acl_peer_supports_ble_connection_parameters_request(

                  p_lcb->remote_bd_addr))

      ) {

               p_lcb->remote_bd_addr))) {

        btsnd_hcic_ble_upd_ll_conn_params(p_lcb->Handle(), p_lcb->min_interval,

                                          p_lcb->max_interval, p_lcb->latency,

                                          p_lcb->timeout, p_lcb->min_ce_len,