Loading system/bta/ag/bta_ag_sco.cc +13 −15 Original line number Original line Diff line number Diff line Loading @@ -31,8 +31,10 @@ #include "btm_api.h" #include "btm_api.h" #include "device/include/controller.h" #include "device/include/controller.h" #include "device/include/esco_parameters.h" #include "device/include/esco_parameters.h" #include "main/shim/dumpsys.h" #include "osi/include/log.h" #include "osi/include/log.h" #include "osi/include/osi.h" #include "osi/include/osi.h" #include "stack/btm/btm_sco.h" #include "stack/include/btu.h" #include "stack/include/btu.h" #include "utl.h" #include "utl.h" Loading Loading @@ -159,21 +161,17 @@ static void bta_ag_sco_conn_cback(uint16_t sco_idx) { static void bta_ag_sco_disc_cback(uint16_t sco_idx) { static void bta_ag_sco_disc_cback(uint16_t sco_idx) { uint16_t handle = 0; uint16_t handle = 0; APPL_TRACE_DEBUG( LOG_DEBUG( "bta_ag_sco_disc_cback(): sco_idx: 0x%x p_cur_scb: 0x%08x sco.state: " "sco_idx: 0x%x sco.state:%s", sco_idx, "%d", sco_state_text(static_cast<tSCO_STATE>(bta_ag_cb.sco.state)).c_str()); sco_idx, bta_ag_cb.sco.p_curr_scb, bta_ag_cb.sco.state); LOG_DEBUG( " scb[0] in_use:%s sco_idx: 0x%x sco state:%s", APPL_TRACE_DEBUG( logbool(bta_ag_cb.scb[0].in_use).c_str(), bta_ag_cb.scb[0].sco_idx, "bta_ag_sco_disc_cback(): scb[0] addr: 0x%08x in_use: %u sco_idx: 0x%x " sco_state_text(static_cast<tSCO_STATE>(bta_ag_cb.scb[0].state)).c_str()); " sco state: %u", LOG_DEBUG( &bta_ag_cb.scb[0], bta_ag_cb.scb[0].in_use, bta_ag_cb.scb[0].sco_idx, " scb[1] in_use:%s sco_idx:0x%x sco state:%s", bta_ag_cb.scb[0].state); logbool(bta_ag_cb.scb[1].in_use).c_str(), bta_ag_cb.scb[1].sco_idx, APPL_TRACE_DEBUG( sco_state_text(static_cast<tSCO_STATE>(bta_ag_cb.scb[1].state)).c_str()); "bta_ag_sco_disc_cback(): scb[1] addr: 0x%08x in_use: %u sco_idx: 0x%x " " sco state: %u", &bta_ag_cb.scb[1], bta_ag_cb.scb[1].in_use, bta_ag_cb.scb[1].sco_idx, bta_ag_cb.scb[1].state); /* match callback to scb */ /* match callback to scb */ if (bta_ag_cb.sco.p_curr_scb != nullptr && bta_ag_cb.sco.p_curr_scb->in_use) { if (bta_ag_cb.sco.p_curr_scb != nullptr && bta_ag_cb.sco.p_curr_scb->in_use) { Loading Loading
system/bta/ag/bta_ag_sco.cc +13 −15 Original line number Original line Diff line number Diff line Loading @@ -31,8 +31,10 @@ #include "btm_api.h" #include "btm_api.h" #include "device/include/controller.h" #include "device/include/controller.h" #include "device/include/esco_parameters.h" #include "device/include/esco_parameters.h" #include "main/shim/dumpsys.h" #include "osi/include/log.h" #include "osi/include/log.h" #include "osi/include/osi.h" #include "osi/include/osi.h" #include "stack/btm/btm_sco.h" #include "stack/include/btu.h" #include "stack/include/btu.h" #include "utl.h" #include "utl.h" Loading Loading @@ -159,21 +161,17 @@ static void bta_ag_sco_conn_cback(uint16_t sco_idx) { static void bta_ag_sco_disc_cback(uint16_t sco_idx) { static void bta_ag_sco_disc_cback(uint16_t sco_idx) { uint16_t handle = 0; uint16_t handle = 0; APPL_TRACE_DEBUG( LOG_DEBUG( "bta_ag_sco_disc_cback(): sco_idx: 0x%x p_cur_scb: 0x%08x sco.state: " "sco_idx: 0x%x sco.state:%s", sco_idx, "%d", sco_state_text(static_cast<tSCO_STATE>(bta_ag_cb.sco.state)).c_str()); sco_idx, bta_ag_cb.sco.p_curr_scb, bta_ag_cb.sco.state); LOG_DEBUG( " scb[0] in_use:%s sco_idx: 0x%x sco state:%s", APPL_TRACE_DEBUG( logbool(bta_ag_cb.scb[0].in_use).c_str(), bta_ag_cb.scb[0].sco_idx, "bta_ag_sco_disc_cback(): scb[0] addr: 0x%08x in_use: %u sco_idx: 0x%x " sco_state_text(static_cast<tSCO_STATE>(bta_ag_cb.scb[0].state)).c_str()); " sco state: %u", LOG_DEBUG( &bta_ag_cb.scb[0], bta_ag_cb.scb[0].in_use, bta_ag_cb.scb[0].sco_idx, " scb[1] in_use:%s sco_idx:0x%x sco state:%s", bta_ag_cb.scb[0].state); logbool(bta_ag_cb.scb[1].in_use).c_str(), bta_ag_cb.scb[1].sco_idx, APPL_TRACE_DEBUG( sco_state_text(static_cast<tSCO_STATE>(bta_ag_cb.scb[1].state)).c_str()); "bta_ag_sco_disc_cback(): scb[1] addr: 0x%08x in_use: %u sco_idx: 0x%x " " sco state: %u", &bta_ag_cb.scb[1], bta_ag_cb.scb[1].in_use, bta_ag_cb.scb[1].sco_idx, bta_ag_cb.scb[1].state); /* match callback to scb */ /* match callback to scb */ if (bta_ag_cb.sco.p_curr_scb != nullptr && bta_ag_cb.sco.p_curr_scb->in_use) { if (bta_ag_cb.sco.p_curr_scb != nullptr && bta_ag_cb.sco.p_curr_scb->in_use) { Loading