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

Commit 6dcb28d1 authored by Henri Chataing's avatar Henri Chataing Committed by Gerrit Code Review
Browse files

Merge "avdt_api: Improve logs in API methods" into main

parents 5ec6248c 15ecd3c0

system/stack/avdt/avdt_api.cc

+21 −18
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
 *

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



#define LOG_TAG "bluetooth-a2dp"



#include "avdt_api.h"



#include <bluetooth/log.h>
@@ -253,7 +255,7 @@ uint16_t AVDT_DiscoverReq(const RawAddress& bd_addr, uint8_t channel_index, 
  uint16_t result = AVDT_SUCCESS;

  tAVDT_CCB_EVT evt;



  log::verbose("");

  log::info("bd_addr={} channel_index={}", bd_addr, channel_index);



  /* find channel control block for this bd addr; if none, allocate one */

  p_ccb = avdt_ccb_by_bd(bd_addr);
@@ -300,8 +302,6 @@ static uint16_t avdt_get_cap_req(const RawAddress& bd_addr, 
  AvdtpCcb* p_ccb = NULL;

  uint16_t result = AVDT_SUCCESS;



  log::verbose("");



  /* verify SEID */

  if ((p_evt->single.seid < AVDT_SEID_MIN) ||

      (p_evt->single.seid > AVDT_SEID_MAX)) {
@@ -367,7 +367,8 @@ uint16_t AVDT_GetCapReq(const RawAddress& bd_addr, uint8_t channel_index, 
  tAVDT_CCB_API_GETCAP getcap;

  uint16_t result = AVDT_SUCCESS;



  log::verbose("");

  log::info("bd_addr={} channel_index={} seid=0x{:x} get_all_capabilities={}",

            bd_addr, channel_index, seid, get_all_cap);



  getcap.single.seid = seid;

  if (get_all_cap) {
@@ -401,7 +402,7 @@ uint16_t AVDT_DelayReport(uint8_t handle, uint8_t seid, uint16_t delay) { 
  uint16_t result = AVDT_SUCCESS;

  tAVDT_SCB_EVT evt;



  log::verbose("avdt_handle={} seid={} delay={}", handle, seid, delay);

  log::info("avdt_handle={} seid={} delay={}", handle, seid, delay);



  /* map handle to scb */

  p_scb = avdt_scb_by_hdl(handle);
@@ -443,7 +444,7 @@ uint16_t AVDT_OpenReq(uint8_t handle, const RawAddress& bd_addr, 
  uint16_t result = AVDT_SUCCESS;

  tAVDT_SCB_EVT evt;



  log::verbose("address={} avdt_handle={} seid={}", bd_addr, handle, seid);

  log::info("bd_addr={} avdt_handle={} seid=0x{:x}", bd_addr, handle, seid);



  /* verify SEID */

  if ((seid < AVDT_SEID_MIN) || (seid > AVDT_SEID_MAX)) {
@@ -503,7 +504,7 @@ uint16_t AVDT_ConfigRsp(uint8_t handle, uint8_t label, uint8_t error_code, 
  uint16_t result = AVDT_SUCCESS;

  uint8_t event_code;



  log::verbose("avdt_handle={} label={} error_code=0x{:x} category={}", handle,

  log::info("avdt_handle={} label={} error_code=0x{:x} category={}", handle,

            label, error_code, category);



  /* map handle to scb */
@@ -557,7 +558,7 @@ uint16_t AVDT_StartReq(uint8_t* p_handles, uint8_t num_handles) { 
  uint16_t result = AVDT_SUCCESS;

  int i;



  log::verbose("num_handles={}", num_handles);

  log::info("num_handles={}", num_handles);



  if ((num_handles == 0) || (num_handles > AVDT_NUM_SEPS)) {

    result = AVDT_BAD_PARAMS;
@@ -615,7 +616,7 @@ uint16_t AVDT_SuspendReq(uint8_t* p_handles, uint8_t num_handles) { 
  uint16_t result = AVDT_SUCCESS;

  int i;



  log::verbose("num_handles={}", num_handles);

  log::info("num_handles={}", num_handles);



  if ((num_handles == 0) || (num_handles > AVDT_NUM_SEPS)) {

    result = AVDT_BAD_PARAMS;
@@ -670,7 +671,7 @@ uint16_t AVDT_CloseReq(uint8_t handle) { 
  AvdtpScb* p_scb;

  uint16_t result = AVDT_SUCCESS;



  log::verbose("avdt_handle={}", handle);

  log::info("avdt_handle={}", handle);



  /* map handle to scb */

  p_scb = avdt_scb_by_hdl(handle);
@@ -710,7 +711,7 @@ uint16_t AVDT_ReconfigReq(uint8_t handle, AvdtpSepConfig* p_cfg) { 
  uint16_t result = AVDT_SUCCESS;

  tAVDT_SCB_EVT evt;



  log::verbose("avdt_handle={}", handle);

  log::info("avdt_handle={}", handle);



  /* map handle to scb */

  p_scb = avdt_scb_by_hdl(handle);
@@ -750,7 +751,7 @@ uint16_t AVDT_SecurityReq(uint8_t handle, uint8_t* p_data, uint16_t len) { 
  uint16_t result = AVDT_SUCCESS;

  tAVDT_SCB_EVT evt;



  log::verbose("avdt_handle={} len={}", handle, len);

  log::info("avdt_handle={} len={}", handle, len);



  /* map handle to scb */

  p_scb = avdt_scb_by_hdl(handle);
@@ -790,7 +791,7 @@ uint16_t AVDT_SecurityRsp(uint8_t handle, uint8_t label, uint8_t error_code, 
  uint16_t result = AVDT_SUCCESS;

  tAVDT_SCB_EVT evt;



  log::verbose("avdt_handle={} label={} error_code=0x{:x} len={}", handle,

  log::info("avdt_handle={} label={} error_code=0x{:x} len={}", handle,

            label, error_code, len);



  /* map handle to scb */
@@ -896,7 +897,7 @@ uint16_t AVDT_ConnectReq(const RawAddress& bd_addr, uint8_t channel_index, 
  uint16_t result = AVDT_SUCCESS;

  tAVDT_CCB_EVT evt;



  log::warn("address={} channel_index={}", bd_addr, channel_index);

  log::info("bd_addr={} channel_index={}", bd_addr, channel_index);



  /* find channel control block for this bd addr; if none, allocate one */

  p_ccb = avdt_ccb_by_bd(bd_addr);
@@ -907,7 +908,7 @@ uint16_t AVDT_ConnectReq(const RawAddress& bd_addr, uint8_t channel_index, 
      result = AVDT_NO_RESOURCES;

    }

  } else if (!p_ccb->ll_opened) {

    log::warn("AVDT_ConnectReq: CCB LL is in the middle of opening");

    log::warn("CCB LL is in the middle of opening");



    /* ccb was already allocated for the incoming signalling. */

    result = AVDT_BUSY;
@@ -919,7 +920,7 @@ uint16_t AVDT_ConnectReq(const RawAddress& bd_addr, uint8_t channel_index, 
    avdt_ccb_event(p_ccb, AVDT_CCB_API_CONNECT_REQ_EVT, &evt);

  }



  log::warn("address={} result={}", bd_addr, result);

  log::info("completed; bd_addr={} result={}", bd_addr, result);



  return result;

}
@@ -942,6 +943,8 @@ uint16_t AVDT_DisconnectReq(const RawAddress& bd_addr, 
  tAVDT_RESULT result = AVDT_SUCCESS;

  tAVDT_CCB_EVT evt;



  log::info("bd_addr={}", bd_addr);



  /* find channel control block for this bd addr; if none, error */

  p_ccb = avdt_ccb_by_bd(bd_addr);

  if (p_ccb == NULL) {