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

Commit d532086e authored by Zach Johnson's avatar Zach Johnson Committed by Gerrit Code Review
Browse files

Merge changes Ifc9488f9,I04a0f972,I282b37f4,I22a3944f,I4c3e8150 

* changes:
  Remove unused QoS reporting in l2cap
  Remove RFCOMM_QoSViolationInd, it does nothing
  Remove single line functions in btu_hcif
  Remove empty handlers from btu_hcif
  Remove L2CAP_NON_FLUSHABLE_PB_INCLUDED (it's always true)
parents b733365b 8ee0b0aa

system/internal_include/bt_target.h

+0 −5
Original line number Diff line number Diff line
@@ -532,11 +532,6 @@ 
#define L2CAP_DESIRED_LINK_ROLE HCI_ROLE_MASTER

#endif



/* Include Non-Flushable Packet Boundary Flag feature of Lisbon */

#ifndef L2CAP_NON_FLUSHABLE_PB_INCLUDED

#define L2CAP_NON_FLUSHABLE_PB_INCLUDED TRUE

#endif



/* Minimum number of ACL credit for high priority link */

#ifndef L2CAP_HIGH_PRI_MIN_XMIT_QUOTA

#define L2CAP_HIGH_PRI_MIN_XMIT_QUOTA 5

system/stack/avct/avct_l2c.cc

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ const tL2CAP_APPL_INFO avct_l2c_appl = {avct_l2c_connect_ind_cback, 
                                        avct_l2c_config_cfm_cback,

                                        avct_l2c_disconnect_ind_cback,

                                        avct_l2c_disconnect_cfm_cback,

                                        NULL,

                                        avct_l2c_data_ind_cback,

                                        avct_l2c_congestion_ind_cback,

                                        NULL, /* tL2CA_TX_COMPLETE_CB */

system/stack/avct/avct_l2c_br.cc

+0 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ const tL2CAP_APPL_INFO avct_l2c_br_appl = { 
    avct_l2c_br_config_cfm_cback,

    avct_l2c_br_disconnect_ind_cback,

    avct_l2c_br_disconnect_cfm_cback,

    NULL,

    avct_l2c_br_data_ind_cback,

    avct_l2c_br_congestion_ind_cback,

    NULL, /* tL2CA_TX_COMPLETE_CB */

system/stack/avdt/avdt_l2c.cc

+0 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ const tL2CAP_APPL_INFO avdt_l2c_appl = {avdt_l2c_connect_ind_cback, 
                                        avdt_l2c_config_cfm_cback,

                                        avdt_l2c_disconnect_ind_cback,

                                        avdt_l2c_disconnect_cfm_cback,

                                        NULL,

                                        avdt_l2c_data_ind_cback,

                                        avdt_l2c_congestion_ind_cback,

                                        NULL, /* tL2CA_TX_COMPLETE_CB */

system/stack/btm/btm_devctl.cc

+0 −2
Original line number Diff line number Diff line
@@ -387,12 +387,10 @@ static void decode_controller_support() { 
      BTM_SetInquiryMode(BTM_INQ_RESULT_WITH_RSSI);

  }



#if (L2CAP_NON_FLUSHABLE_PB_INCLUDED == TRUE)

  if (controller->supports_non_flushable_pb())

    l2cu_set_non_flushable_pbf(true);

  else

    l2cu_set_non_flushable_pbf(false);

#endif

  BTM_EnableInterlacedPageScan();

  BTM_EnableInterlacedInquiryScan();

}