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

Commit b104dfc3 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Remove #ifdef BTM_SSR_INCLUDED am: b9cfc8c8 am: d6d5459f 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id12d6f9064fd569768e2947b30eeb49cd017067f
parents 315c8285 d6d5459f

system/bta/sys/bta_sys.h

+0 −2
Original line number Diff line number Diff line
@@ -226,11 +226,9 @@ extern void bta_sys_idle(uint8_t id, uint8_t app_id, 
extern void bta_sys_busy(uint8_t id, uint8_t app_id,

                         const RawAddress& peer_addr);



#if (BTM_SSR_INCLUDED == TRUE)

extern void bta_sys_ssr_cfg_register(tBTA_SYS_SSR_CFG_CBACK* p_cback);

extern void bta_sys_chg_ssr_config(uint8_t id, uint8_t app_id,

                                   uint16_t max_latency, uint16_t min_tout);

#endif



extern void bta_sys_role_chg_register(tBTA_SYS_CONN_CBACK* p_cback);

extern void bta_sys_notify_role_chg(const RawAddress& peer_addr,

system/bta/sys/bta_sys_conn.cc

+1 −4
Original line number Diff line number Diff line
@@ -70,11 +70,10 @@ void bta_sys_role_chg_register(tBTA_SYS_CONN_CBACK* p_cback) { 
 * Returns          void

 *

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

#if (BTM_SSR_INCLUDED == TRUE)

void bta_sys_ssr_cfg_register(tBTA_SYS_SSR_CFG_CBACK* p_cback) {

  bta_sys_cb.p_ssr_cb = p_cback;

}

#endif



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

 *

 * Function         bta_sys_role_chg_register
@@ -338,14 +337,12 @@ void bta_sys_sco_unuse(uint8_t id, uint8_t app_id, 
 * Returns          void

 *

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

#if (BTM_SSR_INCLUDED == TRUE)

void bta_sys_chg_ssr_config(uint8_t id, uint8_t app_id, uint16_t max_latency,

                            uint16_t min_tout) {

  if (bta_sys_cb.p_ssr_cb) {

    bta_sys_cb.p_ssr_cb(id, app_id, max_latency, min_tout);

  }

}

#endif



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

 *

system/bta/sys/bta_sys_int.h

+0 −2
Original line number Diff line number Diff line
@@ -58,9 +58,7 @@ typedef struct { 
  tBTA_SYS_EIR_CBACK* eir_cb; /* add/remove UUID into EIR */

  tBTA_SYS_CUST_EIR_CBACK* cust_eir_cb; /* add/remove customer UUID into EIR */

#endif

#if (BTM_SSR_INCLUDED == TRUE)

  tBTA_SYS_SSR_CFG_CBACK* p_ssr_cb;

#endif

  /* VS event handler */

  tBTA_SYS_VS_EVT_HDLR* p_vs_evt_hdlr;

system/stack/btu/btu_hcif.cc

+0 −2
Original line number Diff line number Diff line
@@ -350,11 +350,9 @@ void btu_hcif_process_event(UNUSED_ATTR uint8_t controller_id, BT_HDR* p_msg) { 
    case HCI_ESCO_CONNECTION_CHANGED_EVT:

      btu_hcif_esco_connection_chg_evt(p);

      break;

#if (BTM_SSR_INCLUDED == TRUE)

    case HCI_SNIFF_SUB_RATE_EVT:

      btm_pm_proc_ssr_evt(p, hci_evt_len);

      break;

#endif /* BTM_SSR_INCLUDED == TRUE */

    case HCI_RMT_HOST_SUP_FEAT_NOTIFY_EVT:

      btm_sec_rmt_host_support_feat_evt(p);

      break;

system/stack/hcic/hcicmds.cc

+0 −3
Original line number Diff line number Diff line
@@ -946,8 +946,6 @@ void btsnd_hcic_write_cur_iac_lap(uint8_t num_cur_iac, LAP* const iac_lap) { 
/******************************************

 *    Lisbon Features

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

#if (BTM_SSR_INCLUDED == TRUE)



void btsnd_hcic_sniff_sub_rate(uint16_t handle, uint16_t max_lat,

                               uint16_t min_remote_lat,

                               uint16_t min_local_lat) {
@@ -967,7 +965,6 @@ void btsnd_hcic_sniff_sub_rate(uint16_t handle, uint16_t max_lat, 


  btu_hcif_send_cmd(LOCAL_BR_EDR_CONTROLLER_ID, p);

}

#endif /* BTM_SSR_INCLUDED */



/**** Extended Inquiry Response Commands ****/

void btsnd_hcic_write_ext_inquiry_response(void* buffer, uint8_t fec_req) {