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

Commit 6b35cd82 authored by Chris Manton's avatar Chris Manton Committed by Gerrit Code Review
Browse files

Merge changes Ia55816f9,I19aec684 

* changes:
  Move bta::dm:: accessor functions to proper file
  Use proper accessor methods bta::dm::main::bta_dm_search_get_state
parents 82c72633 813269e0

system/bta/dm/bta_dm_act.cc

+3 −0
Original line number Diff line number Diff line
@@ -275,6 +275,9 @@ void bta_dm_enable(tBTA_DM_SEC_CBACK* p_sec_cback) { 
  btm_local_io_caps = btif_storage_get_local_io_caps();

}



void bta_dm_search_set_state(uint8_t state) { bta_dm_search_cb.state = state; }

uint8_t bta_dm_search_get_state() { return bta_dm_search_cb.state; }



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

 *

 * Function         bta_dm_init_cb

system/bta/dm/bta_dm_main.cc

+2 −5
Original line number Diff line number Diff line
@@ -47,9 +47,6 @@ tBTA_DM_DI_CB bta_dm_di_cb; 
 ******************************************************************************/

void bta_dm_search_sm_disable() { bta_sys_deregister(BTA_ID_DM_SEARCH); }



void bta_dm_search_set_state(uint8_t state) { bta_dm_search_cb.state = state; }

uint8_t bta_dm_search_get_state() { return bta_dm_search_cb.state; }



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

 *

 * Function         bta_dm_search_sm_execute
@@ -62,10 +59,10 @@ uint8_t bta_dm_search_get_state() { return bta_dm_search_cb.state; } 
 ******************************************************************************/

bool bta_dm_search_sm_execute(BT_HDR_RIGID* p_msg) {

  APPL_TRACE_EVENT("bta_dm_search_sm_execute state:%d, event:0x%x",

                   bta_dm_search_cb.state, p_msg->event);

                   bta_dm_search_get_state(), p_msg->event);



  tBTA_DM_MSG* message = (tBTA_DM_MSG*)p_msg;

  switch (bta_dm_search_cb.state) {

  switch (bta_dm_search_get_state()) {

    case BTA_DM_SEARCH_IDLE:

      switch (p_msg->event) {

        case BTA_DM_API_SEARCH_EVT: