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

Commit 95602912 authored by Marie Janssen's avatar Marie Janssen Committed by android-build-merger
Browse files

btif: remove logspam at higher debug levels am: ee80cc8b 

am: 439aeb75

Change-Id: I1bb302465f641efe1a9caacbaac0de12f2cbbd79
parents 309f2f15 439aeb75

system/btif/src/btif_av.cc

+0 −3
Original line number Diff line number Diff line
@@ -108,8 +108,6 @@ static alarm_t* av_open_on_rc_timer = NULL; 
        (btif_av_cb.sm_handle == NULL)) {                                    \

      BTIF_TRACE_WARNING("%s: BTAV not initialized", __func__);              \

      return BT_STATUS_NOT_READY;                                            \

    } else {                                                                 \

      BTIF_TRACE_EVENT("%s", __func__);                                      \

    }                                                                        \

  } while (0)
@@ -1372,7 +1370,6 @@ static bt_status_t sink_connect_src(bt_bdaddr_t* bd_addr) { 
 ******************************************************************************/

static bt_status_t disconnect(bt_bdaddr_t* bd_addr) {

  BTIF_TRACE_EVENT("%s", __func__);



  CHECK_BTAV_INIT();



  /* Switch to BTIF context */

system/btif/src/btif_hf.cc

+0 −14
Original line number Diff line number Diff line
@@ -129,20 +129,6 @@ static int hf_idx = BTIF_HF_INVALID_IDX; 
    }                                                                 \

  } while (0)



#define CHECK_BTHF_SLC_CONNECTED()                                        \

  do {                                                                    \

    if (bt_hf_callbacks == NULL) {                                        \

      BTIF_TRACE_WARNING("BTHF: %s: BTHF not initialized", __func__);     \

      return BT_STATUS_NOT_READY;                                         \

    } else if (btif_hf_cb.state != BTHF_CONNECTION_STATE_SLC_CONNECTED) { \

      BTIF_TRACE_WARNING("BTHF: %s: SLC connection not up. state=%s",     \

                         __func__, dump_hf_conn_state(btif_hf_cb.state)); \

      return BT_STATUS_NOT_READY;                                         \

    } else {                                                              \

      BTIF_TRACE_EVENT("BTHF: %s", __func__);                             \

    }                                                                     \

  } while (0)



/* BTIF-HF control block to map bdaddr to BTA handle */

typedef struct _btif_hf_cb {

  uint16_t handle;

system/btif/src/btif_hh.cc

+28 −25
Original line number Diff line number Diff line
@@ -125,8 +125,6 @@ static tHID_KB_LIST hid_kb_numlock_on_list[] = {{LOGITECH_KB_MX5500_PRODUCT_ID, 
    if (bt_hh_callbacks == NULL) {                                    \

      BTIF_TRACE_WARNING("BTHH: %s: BTHH not initialized", __func__); \

      return BT_STATUS_NOT_READY;                                     \

    } else {                                                          \

      BTIF_TRACE_EVENT("BTHH: %s", __func__);                         \

    }                                                                 \

  } while (0)
@@ -589,8 +587,8 @@ bt_status_t btif_hh_connect(bt_bdaddr_t* bd_addr) { 
  int i;

  BD_ADDR* bda = (BD_ADDR*)bd_addr;

  CHECK_BTHH_INIT();

  BTIF_TRACE_EVENT("BTHH: %s", __func__);

  dev = btif_hh_find_dev_by_bda(bd_addr);

  BTIF_TRACE_DEBUG("Connect _hh");

  snprintf(bda_str, sizeof(bda_str), "%02X:%02X:%02X:%02X:%02X:%02X", (*bda)[0],

           (*bda)[1], (*bda)[2], (*bda)[3], (*bda)[4], (*bda)[5]);

  if (dev == NULL && btif_hh_cb.device_num >= BTIF_HH_MAX_HID) {
@@ -1271,6 +1269,7 @@ static bt_status_t connect(bt_bdaddr_t* bd_addr) { 
 ******************************************************************************/

static bt_status_t disconnect(bt_bdaddr_t* bd_addr) {

  CHECK_BTHH_INIT();

  BTIF_TRACE_EVENT("BTHH: %s", __func__);

  btif_hh_device_t* p_dev;



  if (btif_hh_cb.status == BTIF_HH_DISABLED) {
@@ -1299,6 +1298,7 @@ static bt_status_t disconnect(bt_bdaddr_t* bd_addr) { 
 ******************************************************************************/

static bt_status_t virtual_unplug(bt_bdaddr_t* bd_addr) {

  CHECK_BTHH_INIT();

  BTIF_TRACE_EVENT("BTHH: %s", __func__);

  btif_hh_device_t* p_dev;

  char bd_str[18];

  snprintf(bd_str, sizeof(bd_str), "%02X:%02X:%02X:%02X:%02X:%02X",
@@ -1332,10 +1332,11 @@ static bt_status_t set_info(bt_bdaddr_t* bd_addr, bthh_hid_info_t hid_info) { 
  tBTA_HH_DEV_DSCP_INFO dscp_info;

  BD_ADDR* bda = (BD_ADDR*)bd_addr;



  BTIF_TRACE_DEBUG("addr = %02X:%02X:%02X:%02X:%02X:%02X", (*bda)[0], (*bda)[1],

                   (*bda)[2], (*bda)[3], (*bda)[4], (*bda)[5]);

  BTIF_TRACE_DEBUG("BTHH: %s: addr = %02X:%02X:%02X:%02X:%02X:%02X", __func__,

                   (*bda)[0], (*bda)[1], (*bda)[2], (*bda)[3], (*bda)[4],

                   (*bda)[5]);

  BTIF_TRACE_DEBUG(

      "%s: sub_class = 0x%02x, app_id = %d, vendor_id = 0x%04x, "

      "BTHH: %s: sub_class = 0x%02x, app_id = %d, vendor_id = 0x%04x, "

      "product_id = 0x%04x, version= 0x%04x",

      __func__, hid_info.sub_class, hid_info.app_id, hid_info.vendor_id,

      hid_info.product_id, hid_info.version);
@@ -1380,8 +1381,9 @@ static bt_status_t get_protocol(bt_bdaddr_t* bd_addr, 
  btif_hh_device_t* p_dev;

  BD_ADDR* bda = (BD_ADDR*)bd_addr;



  BTIF_TRACE_DEBUG(" addr = %02X:%02X:%02X:%02X:%02X:%02X", (*bda)[0],

                   (*bda)[1], (*bda)[2], (*bda)[3], (*bda)[4], (*bda)[5]);

  BTIF_TRACE_DEBUG("BTHH: %s: addr = %02X:%02X:%02X:%02X:%02X:%02X", __func__,

                   (*bda)[0], (*bda)[1], (*bda)[2], (*bda)[3], (*bda)[4],

                   (*bda)[5]);



  if (btif_hh_cb.status == BTIF_HH_DISABLED) {

    BTIF_TRACE_ERROR("%s: Error, HH status = %d", __func__, btif_hh_cb.status);
@@ -1413,10 +1415,11 @@ static bt_status_t set_protocol(bt_bdaddr_t* bd_addr, 
  uint8_t proto_mode = protocolMode;

  BD_ADDR* bda = (BD_ADDR*)bd_addr;



  BTIF_TRACE_DEBUG("%s:proto_mode = %d", __func__, protocolMode);



  BTIF_TRACE_DEBUG("addr = %02X:%02X:%02X:%02X:%02X:%02X", (*bda)[0], (*bda)[1],

                   (*bda)[2], (*bda)[3], (*bda)[4], (*bda)[5]);

  BTIF_TRACE_DEBUG(

      "BTHH: %s: proto_mode = %d"

      " addr = %02X:%02X:%02X:%02X:%02X:%02X",

      __func__, protocolMode, (*bda)[0], (*bda)[1], (*bda)[2], (*bda)[3],

      (*bda)[4], (*bda)[5]);



  if (btif_hh_cb.status == BTIF_HH_DISABLED) {

    BTIF_TRACE_ERROR("%s: Error, HH status = %d", __func__, btif_hh_cb.status);
@@ -1457,10 +1460,10 @@ static bt_status_t get_report(bt_bdaddr_t* bd_addr, 
  btif_hh_device_t* p_dev;

  BD_ADDR* bda = (BD_ADDR*)bd_addr;



  BTIF_TRACE_DEBUG("%s: r_type = %d, rpt_id = %d, buf_size = %d", __func__,

                   reportType, reportId, bufferSize);



  BTIF_TRACE_DEBUG("addr = %02X:%02X:%02X:%02X:%02X:%02X", (*bda)[0], (*bda)[1],

  BTIF_TRACE_DEBUG(

      "BTHH: %s: r_type = %d, rpt_id = %d, buf_size = %d"

      " addr = %02X:%02X:%02X:%02X:%02X:%02X",

      __func__, reportType, reportId, bufferSize, (*bda)[0], (*bda)[1],

      (*bda)[2], (*bda)[3], (*bda)[4], (*bda)[5]);



  if (btif_hh_cb.status == BTIF_HH_DISABLED) {
@@ -1502,10 +1505,11 @@ static bt_status_t set_report(bt_bdaddr_t* bd_addr, 
  btif_hh_device_t* p_dev;

  BD_ADDR* bda = (BD_ADDR*)bd_addr;



  BTIF_TRACE_DEBUG("%s:reportType = %d", __func__, reportType);



  BTIF_TRACE_DEBUG("addr = %02X:%02X:%02X:%02X:%02X:%02X", (*bda)[0], (*bda)[1],

                   (*bda)[2], (*bda)[3], (*bda)[4], (*bda)[5]);

  BTIF_TRACE_DEBUG(

      "BTHH %s: reportType = %d"

      " addr = %02X:%02X:%02X:%02X:%02X:%02X",

      __func__, reportType, (*bda)[0], (*bda)[1], (*bda)[2], (*bda)[3],

      (*bda)[4], (*bda)[5]);



  if (btif_hh_cb.status == BTIF_HH_DISABLED) {

    BTIF_TRACE_ERROR("%s: Error, HH status = %d", __func__, btif_hh_cb.status);
@@ -1564,10 +1568,9 @@ static bt_status_t send_data(bt_bdaddr_t* bd_addr, char* data) { 
  btif_hh_device_t* p_dev;

  BD_ADDR* bda = (BD_ADDR*)bd_addr;



  BTIF_TRACE_DEBUG("%s", __func__);



  BTIF_TRACE_DEBUG("addr = %02X:%02X:%02X:%02X:%02X:%02X", (*bda)[0], (*bda)[1],

                   (*bda)[2], (*bda)[3], (*bda)[4], (*bda)[5]);

  BTIF_TRACE_DEBUG("BTHH %s: addr = %02X:%02X:%02X:%02X:%02X:%02X", __func__,

                   (*bda)[0], (*bda)[1], (*bda)[2], (*bda)[3], (*bda)[4],

                   (*bda)[5]);



  if (btif_hh_cb.status == BTIF_HH_DISABLED) {

    BTIF_TRACE_ERROR("%s: Error, HH status = %d", __func__, btif_hh_cb.status);

system/btif/src/btif_hl.cc

+0 −2
Original line number Diff line number Diff line
@@ -140,8 +140,6 @@ static void btif_hl_proc_cb_evt(uint16_t event, char* p_param); 
    if (bt_hl_callbacks == NULL) {                                    \

      BTIF_TRACE_WARNING("BTHL: %s: BTHL not initialized", __func__); \

      return BT_STATUS_NOT_READY;                                     \

    } else {                                                          \

      BTIF_TRACE_EVENT("BTHL: %s", __func__);                         \

    }                                                                 \

  } while (0)

system/btif/src/btif_rc.cc

+20 −9
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ 


#define CHECK_RC_CONNECTED(p_dev)                                          \

  do {                                                                     \

    BTIF_TRACE_DEBUG("%s", __func__);                                      \

    if ((p_dev) == NULL || (p_dev)->rc_connected == false) {               \

      BTIF_TRACE_WARNING("%s: called when RC is not connected", __func__); \

      return BT_STATUS_NOT_READY;                                          \
@@ -1837,11 +1836,11 @@ static bt_status_t get_play_status_rsp(bt_bdaddr_t* bd_addr, 
  tAVRC_RESPONSE avrc_rsp;

  btif_rc_device_cb_t* p_dev = btif_rc_get_device_by_bda(bd_addr);



  BTIF_TRACE_DEBUG("%s: song len %d song pos %d", __func__, song_len, song_pos);

  CHECK_RC_CONNECTED(p_dev);



  memset(&(avrc_rsp.get_play_status), 0, sizeof(tAVRC_GET_PLAY_STATUS_RSP));



  BTIF_TRACE_DEBUG("%s song len %d song pos %d", __func__, song_len, song_pos);

  avrc_rsp.get_play_status.song_len = song_len;

  avrc_rsp.get_play_status.song_pos = song_pos;

  avrc_rsp.get_play_status.play_status = play_status;
@@ -1878,10 +1877,10 @@ static bt_status_t get_element_attr_rsp(bt_bdaddr_t* bd_addr, uint8_t num_attr, 
  tAVRC_ATTR_ENTRY element_attrs[BTRC_MAX_ELEM_ATTR_SIZE];

  btif_rc_device_cb_t* p_dev = btif_rc_get_device_by_bda(bd_addr);



  BTIF_TRACE_DEBUG("%s", __func__);

  CHECK_RC_CONNECTED(p_dev);



  memset(element_attrs, 0, sizeof(tAVRC_ATTR_ENTRY) * num_attr);

  BTIF_TRACE_ERROR("%s: calling btif_rc_get_device_by_bda", __func__);



  if (num_attr == 0) {

    avrc_rsp.get_play_status.status = AVRC_STS_BAD_PARAM;
@@ -2072,6 +2071,8 @@ static bt_status_t get_folder_items_list_rsp(bt_bdaddr_t* bd_addr, 
  btif_rc_device_cb_t* p_dev = btif_rc_get_device_by_bda(bd_addr);

  btrc_folder_items_t* cur_item = NULL;



  BTIF_TRACE_DEBUG("%s: uid_counter %d num_items %d", __func__, uid_counter,

                   num_items);

  CHECK_RC_CONNECTED(p_dev);



  /* check if rsp to previous cmd was completed */
@@ -2225,6 +2226,7 @@ static bt_status_t set_addressed_player_rsp(bt_bdaddr_t* bd_addr, 
  tAVRC_RESPONSE avrc_rsp;

  btif_rc_device_cb_t* p_dev = btif_rc_get_device_by_bda(bd_addr);



  BTIF_TRACE_DEBUG("%s", __func__);

  CHECK_RC_CONNECTED(p_dev);



  avrc_rsp.addr_player.pdu = AVRC_PDU_SET_ADDRESSED_PLAYER;
@@ -2381,6 +2383,7 @@ static bt_status_t change_path_rsp(bt_bdaddr_t* bd_addr, 
  tAVRC_RESPONSE avrc_rsp;

  btif_rc_device_cb_t* p_dev = btif_rc_get_device_by_bda(bd_addr);



  BTIF_TRACE_DEBUG("%s", __func__);

  CHECK_RC_CONNECTED(p_dev);



  avrc_rsp.chg_path.pdu = AVRC_PDU_CHANGE_PATH;
@@ -2412,6 +2415,7 @@ static bt_status_t search_rsp(bt_bdaddr_t* bd_addr, btrc_status_t rsp_status, 
  tAVRC_RESPONSE avrc_rsp;

  btif_rc_device_cb_t* p_dev = btif_rc_get_device_by_bda(bd_addr);



  BTIF_TRACE_DEBUG("%s", __func__);

  CHECK_RC_CONNECTED(p_dev);



  avrc_rsp.search.pdu = AVRC_PDU_SEARCH;
@@ -2446,6 +2450,7 @@ static bt_status_t get_item_attr_rsp(bt_bdaddr_t* bd_addr, 
  tAVRC_ATTR_ENTRY item_attrs[BTRC_MAX_ELEM_ATTR_SIZE];

  btif_rc_device_cb_t* p_dev = btif_rc_get_device_by_bda(bd_addr);



  BTIF_TRACE_DEBUG("%s", __func__);

  CHECK_RC_CONNECTED(p_dev);



  memset(item_attrs, 0, sizeof(tAVRC_ATTR_ENTRY) * num_attr);
@@ -2490,6 +2495,7 @@ static bt_status_t add_to_now_playing_rsp(bt_bdaddr_t* bd_addr, 
  tAVRC_RESPONSE avrc_rsp;

  btif_rc_device_cb_t* p_dev = btif_rc_get_device_by_bda(bd_addr);



  BTIF_TRACE_DEBUG("%s", __func__);

  CHECK_RC_CONNECTED(p_dev);



  avrc_rsp.add_to_play.pdu = AVRC_PDU_ADD_TO_NOW_PLAYING;
@@ -2521,6 +2527,7 @@ static bt_status_t play_item_rsp(bt_bdaddr_t* bd_addr, 
  tAVRC_RESPONSE avrc_rsp;

  btif_rc_device_cb_t* p_dev = btif_rc_get_device_by_bda(bd_addr);



  BTIF_TRACE_DEBUG("%s", __func__);

  CHECK_RC_CONNECTED(p_dev);



  avrc_rsp.play_item.pdu = AVRC_PDU_PLAY_ITEM;
@@ -2554,6 +2561,7 @@ static bt_status_t get_total_num_of_items_rsp(bt_bdaddr_t* bd_addr, 
  tAVRC_RESPONSE avrc_rsp;

  btif_rc_device_cb_t* p_dev = btif_rc_get_device_by_bda(bd_addr);



  BTIF_TRACE_DEBUG("%s", __func__);

  CHECK_RC_CONNECTED(p_dev);



  avrc_rsp.get_num_of_items.pdu = AVRC_PDU_GET_TOTAL_NUM_OF_ITEMS;
@@ -4502,6 +4510,7 @@ static bt_status_t getcapabilities_cmd(uint8_t cap_id, 
 **************************************************************************/

static bt_status_t list_player_app_setting_attrib_cmd(

    btif_rc_device_cb_t* p_dev) {

  BTIF_TRACE_DEBUG("%s", __func__);

  CHECK_RC_CONNECTED(p_dev);



  tAVRC_COMMAND avrc_cmd = {0};
@@ -4547,7 +4556,7 @@ static bt_status_t list_player_app_setting_value_cmd( 
static bt_status_t get_player_app_setting_cmd(uint8_t num_attrib,

                                              uint8_t* attrib_ids,

                                              btif_rc_device_cb_t* p_dev) {

  BTIF_TRACE_DEBUG("%s: num attrib_id: %d", __func__, num_attrib);

  BTIF_TRACE_DEBUG("%s: num_attrib: %d", __func__, num_attrib);

  CHECK_RC_CONNECTED(p_dev);



  tAVRC_COMMAND avrc_cmd = {0};
@@ -4657,7 +4666,7 @@ static bt_status_t get_player_list_cmd(bt_bdaddr_t* bd_addr, uint8_t start_item, 
 **************************************************************************/

static bt_status_t change_folder_path_cmd(bt_bdaddr_t* bd_addr,

                                          uint8_t direction, uint8_t* uid) {

  BTIF_TRACE_DEBUG("%s direction (%d)", __func__, direction);

  BTIF_TRACE_DEBUG("%s: direction %d", __func__, direction);

  btif_rc_device_cb_t* p_dev = btif_rc_get_device_by_bda(bd_addr);

  CHECK_RC_CONNECTED(p_dev);

  CHECK_BR_CONNECTED(p_dev);
@@ -4708,7 +4717,7 @@ static bt_status_t change_folder_path_cmd(bt_bdaddr_t* bd_addr, 
 *

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

static bt_status_t set_browsed_player_cmd(bt_bdaddr_t* bd_addr, uint16_t id) {

  BTIF_TRACE_DEBUG("%s id (%d)", __func__, id);

  BTIF_TRACE_DEBUG("%s: id %d", __func__, id);

  btif_rc_device_cb_t* p_dev = btif_rc_get_device_by_bda(bd_addr);

  CHECK_RC_CONNECTED(p_dev);

  CHECK_BR_CONNECTED(p_dev);
@@ -4755,7 +4764,7 @@ static bt_status_t set_browsed_player_cmd(bt_bdaddr_t* bd_addr, uint16_t id) { 
 **

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

static bt_status_t set_addressed_player_cmd(bt_bdaddr_t* bd_addr, uint16_t id) {

  BTIF_TRACE_DEBUG("%s id (%d)", __func__, id);

  BTIF_TRACE_DEBUG("%s: id %d", __func__, id);



  btif_rc_device_cb_t* p_dev = btif_rc_get_device_by_bda(bd_addr);

  CHECK_RC_CONNECTED(p_dev);
@@ -4811,6 +4820,7 @@ static bt_status_t get_folder_items_cmd(bt_bdaddr_t* bd_addr, uint8_t scope, 
                                        uint8_t start_item, uint8_t end_item) {

  /* Check that both avrcp and browse channel are connected. */

  btif_rc_device_cb_t* p_dev = btif_rc_get_device_by_bda(bd_addr);

  BTIF_TRACE_DEBUG("%s", __func__);

  CHECK_RC_CONNECTED(p_dev);

  CHECK_BR_CONNECTED(p_dev);
@@ -4861,7 +4871,7 @@ static bt_status_t change_player_app_setting(bt_bdaddr_t* bd_addr, 
                                             uint8_t num_attrib,

                                             uint8_t* attrib_ids,

                                             uint8_t* attrib_vals) {

  BTIF_TRACE_DEBUG("%s: num attrib_id: %d", __func__, num_attrib);

  BTIF_TRACE_DEBUG("%s: num_attrib: %d", __func__, num_attrib);

  btif_rc_device_cb_t* p_dev = btif_rc_get_device_by_bda(bd_addr);

  CHECK_RC_CONNECTED(p_dev);
@@ -4973,7 +4983,7 @@ static bt_status_t get_player_app_setting_value_text_cmd( 
static bt_status_t register_notification_cmd(uint8_t label, uint8_t event_id,

                                             uint32_t event_value,

                                             btif_rc_device_cb_t* p_dev) {

  BTIF_TRACE_DEBUG("%s: event_id: %d  event_value", __func__, event_id,

  BTIF_TRACE_DEBUG("%s: event_id: %d event_value %d", __func__, event_id,

                   event_value);

  CHECK_RC_CONNECTED(p_dev);
@@ -5041,6 +5051,7 @@ static bt_status_t get_element_attribute_cmd(uint8_t num_attribute, 
 *

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

static bt_status_t get_play_status_cmd(btif_rc_device_cb_t* p_dev) {

  BTIF_TRACE_DEBUG("%s", __func__);

  CHECK_RC_CONNECTED(p_dev);



  tAVRC_COMMAND avrc_cmd = {0};