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

Commit abd3de51 authored by Zach Johnson's avatar Zach Johnson
Browse files

btif_mce_execute_service is never called 

also remove orphaned static functions
the compiler complained about

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I15513e28422d66c06745781987054ce61d4f083f
parent 59582ba3

system/btif/src/btif_mce.cc

+0 −87
Original line number Diff line number Diff line
@@ -46,73 +46,6 @@ 


static btmce_callbacks_t* bt_mce_callbacks = NULL;



static void btif_mce_mas_discovery_comp_evt(uint16_t event, char* p_param) {

  tBTA_MCE_MAS_DISCOVERY_COMP* evt_data = (tBTA_MCE_MAS_DISCOVERY_COMP*)p_param;

  btmce_mas_instance_t insts[BTA_MCE_MAX_MAS_INSTANCES];

  int i;



  BTIF_TRACE_EVENT("%s:  event = %d", __func__, event);



  if (event != BTA_MCE_MAS_DISCOVERY_COMP_EVT) return;



  for (i = 0; i < evt_data->num_mas; i++) {

    insts[i].id = evt_data->mas[i].instance_id;

    insts[i].scn = evt_data->mas[i].scn;

    insts[i].msg_types = evt_data->mas[i].msg_type;

    insts[i].p_name = evt_data->mas[i].p_srv_name;

  }



  RawAddress addr = evt_data->remote_addr;

  HAL_CBACK(bt_mce_callbacks, remote_mas_instances_cb,

            (bt_status_t)evt_data->status, &addr, evt_data->num_mas, insts);

}



static void mas_discovery_comp_copy_cb(uint16_t event, char* p_dest,

                                       char* p_src) {

  tBTA_MCE_MAS_DISCOVERY_COMP* p_dest_data =

      (tBTA_MCE_MAS_DISCOVERY_COMP*)p_dest;

  tBTA_MCE_MAS_DISCOVERY_COMP* p_src_data = (tBTA_MCE_MAS_DISCOVERY_COMP*)p_src;

  char* p_dest_str;

  int i;



  if (!p_src) return;



  if (event != BTA_MCE_MAS_DISCOVERY_COMP_EVT) return;



  maybe_non_aligned_memcpy(p_dest_data, p_src_data, sizeof(*p_src_data));



  p_dest_str = p_dest + sizeof(tBTA_MCE_MAS_DISCOVERY_COMP);



  for (i = 0; i < p_src_data->num_mas; i++) {

    p_dest_data->mas[i].p_srv_name = p_dest_str;

    memcpy(p_dest_str, p_src_data->mas[i].p_srv_name,

           p_src_data->mas[i].srv_name_len);

    p_dest_str += p_src_data->mas[i].srv_name_len;

    *(p_dest_str++) = '\0';

  }

}



static void mce_dm_cback(tBTA_MCE_EVT event, tBTA_MCE* p_data,

                         void* user_data) {

  switch (event) {

    case BTA_MCE_MAS_DISCOVERY_COMP_EVT: {

      int i;

      uint16_t param_len = sizeof(tBTA_MCE);



      /* include space for all p_srv_name copies including null-termination */

      for (i = 0; i < p_data->mas_disc_comp.num_mas; i++)

        param_len += (p_data->mas_disc_comp.mas[i].srv_name_len + 1);



      /* need to deepy copy p_srv_name and null-terminate */

      btif_transfer_context(btif_mce_mas_discovery_comp_evt, event,

                            (char*)p_data, param_len,

                            mas_discovery_comp_copy_cb);



      break;

    }

  }

}



static bt_status_t init(btmce_callbacks_t* callbacks) {

  BTIF_TRACE_EVENT("%s", __func__);
@@ -139,23 +72,3 @@ const btmce_interface_t* btif_mce_get_interface(void) { 
  BTIF_TRACE_EVENT("%s", __func__);

  return &mce_if;

}
 


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

 *

 * Function         btif_mce_execute_service

 *

 * Description      Initializes/Shuts down the service

 *

 * Returns          BT_STATUS_SUCCESS on success, BT_STATUS_FAIL otherwise

 *

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

bt_status_t btif_mce_execute_service(bool b_enable) {

  BTIF_TRACE_EVENT("%s enable:%d", __func__, b_enable);



  if (b_enable) {

    BTA_MceEnable(mce_dm_cback);

  } else {

    /* This is called on BT disable so no need to extra cleanup */

  }

  return BT_STATUS_SUCCESS;

}