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

Commit cac84929 authored by Sharvil Nanavati's avatar Sharvil Nanavati
Browse files

Logging cleanup: AVRC, MCA, GATT, and SMP. 

Change-Id: I6d1e61ff023b5fd19f144955cff16831cc18c6e6
parent a7daee28

system/include/bt_trace.h

+40 −312

File changed.

Preview size limit exceeded, changes collapsed.

system/stack/avrc/avrc_api.c

+17 −17
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static void avrc_prep_end_frag(UINT8 handle) 
    UINT8   *p_data, *p_orig_data;

    UINT8   rsp_type;



    AVRC_TRACE_DEBUG0 ("avrc_prep_end_frag" );

    AVRC_TRACE_DEBUG ("avrc_prep_end_frag" );

    p_fcb = &avrc_cb.fcb[handle];



    /* The response type of the end fragment should be the same as the the PDU of "End Fragment
@@ -172,7 +172,7 @@ static void avrc_send_continue_frag(UINT8 handle, UINT8 label) 
    p_fcb = &avrc_cb.fcb[handle];

    p_pkt = p_fcb->p_fmsg;



    AVRC_TRACE_DEBUG1 ("avrc_send_continue_frag len(%d) / AVRC_MAX_CTRL_DATA_LEN", p_pkt->len );

    AVRC_TRACE_DEBUG ("avrc_send_continue_frag len(%d) / AVRC_MAX_CTRL_DATA_LEN", p_pkt->len );

    if (p_pkt->len > AVRC_MAX_CTRL_DATA_LEN)

    {

        p_pkt_old = p_fcb->p_fmsg;
@@ -202,7 +202,7 @@ static void avrc_send_continue_frag(UINT8 handle, UINT8 label) 
            p_pkt = p_fcb->p_fmsg;

            p_fcb->p_fmsg = NULL;

            p_fcb->frag_enabled = FALSE;

            AVRC_TRACE_ERROR0 ("AVRC_MsgReq no buffers for fragmentation - send internal error" );

            AVRC_TRACE_ERROR ("AVRC_MsgReq no buffers for fragmentation - send internal error" );

            p_data = (UINT8 *)(p_pkt+1) + p_pkt->offset;

            *p_data++ = AVRC_PDU_REQUEST_CONTINUATION_RSP;

            *p_data++ = 0;
@@ -250,7 +250,7 @@ static BT_HDR * avrc_proc_vendor_command(UINT8 handle, UINT8 label, 
    if (pkt_type != AVRC_PKT_SINGLE)

    {

        /* reject - commands can only be in single packets at AVRCP level */

        AVRC_TRACE_ERROR1 ("commands must be in single packet pdu:0x%x", *p_data );

        AVRC_TRACE_ERROR ("commands must be in single packet pdu:0x%x", *p_data );

        /* use the current GKI buffer to send the reject */

        status = AVRC_STS_BAD_CMD;

    }
@@ -291,7 +291,7 @@ static BT_HDR * avrc_proc_vendor_command(UINT8 handle, UINT8 label, 
                else

                {

                    /* the pdu id does not match - reject the command using the current GKI buffer */

                    AVRC_TRACE_ERROR2("avrc_proc_vendor_command continue pdu: 0x%x does not match \

                    AVRC_TRACE_ERROR("avrc_proc_vendor_command continue pdu: 0x%x does not match \

                    current re-assembly pdu: 0x%x",

                        *(p_data + 4), p_fcb->frag_pdu);

                    status = AVRC_STS_BAD_PARAM;
@@ -366,7 +366,7 @@ static UINT8 avrc_proc_far_msg(UINT8 handle, UINT8 label, UINT8 cr, BT_HDR **pp_ 
    p_data += AVRC_VENDOR_HDR_SIZE;



    pkt_type = *(p_data + 1) & AVRC_PKT_TYPE_MASK;

    AVRC_TRACE_DEBUG1 ("pkt_type %d", pkt_type );

    AVRC_TRACE_DEBUG ("pkt_type %d", pkt_type );

    p_rcb = &avrc_cb.rcb[handle];

    if (p_msg->company_id == AVRC_CO_METADATA)

    {
@@ -409,7 +409,7 @@ static UINT8 avrc_proc_far_msg(UINT8 handle, UINT8 label, UINT8 cr, BT_HDR **pp_ 
                {

                    /* Unable to allocate buffer for fragmented avrc message. Reuse START

                                      buffer for reassembly (re-assembled message may fit into ACL buf) */

                    AVRC_TRACE_DEBUG0 ("Unable to allocate buffer for fragmented avrc message, \

                    AVRC_TRACE_DEBUG ("Unable to allocate buffer for fragmented avrc message, \

                                       reusing START buffer for reassembly");

                    p_rcb->rasm_offset = p_pkt->offset;

                    p_rcb->p_rmsg = p_pkt;
@@ -423,7 +423,7 @@ static UINT8 avrc_proc_far_msg(UINT8 handle, UINT8 label, UINT8 cr, BT_HDR **pp_ 
            {

                /* Received a CONTINUE/END, but no corresponding START

                              (or previous fragmented response was dropped) */

                AVRC_TRACE_DEBUG0 ("Received a CONTINUE/END without no corresponding START \

                AVRC_TRACE_DEBUG ("Received a CONTINUE/END without no corresponding START \

                                   (or previous fragmented response was dropped)");

                drop = 5;

                GKI_freebuf(p_pkt);
@@ -439,7 +439,7 @@ static UINT8 avrc_proc_far_msg(UINT8 handle, UINT8 label, UINT8 cr, BT_HDR **pp_ 
                /* verify length */

                if ((p_rcb->p_rmsg->offset + p_pkt->len) > buf_len)

                {

                    AVRC_TRACE_WARNING0("Fragmented message too big! - report the partial message");

                    AVRC_TRACE_WARNING("Fragmented message too big! - report the partial message");

                    p_pkt->len = buf_len - p_rcb->p_rmsg->offset;

                    pkt_type = AVRC_PKT_END;

                }
@@ -463,7 +463,7 @@ static UINT8 avrc_proc_far_msg(UINT8 handle, UINT8 label, UINT8 cr, BT_HDR **pp_ 
                    p_data = p_msg->p_vendor_data + 1; /* skip pdu */

                    *p_data++ = AVRC_PKT_SINGLE;

                    UINT16_TO_BE_STREAM(p_data, (p_msg->vendor_len - AVRC_MIN_META_HDR_SIZE));

                    AVRC_TRACE_DEBUG3("end frag:%d, total len:%d, offset:%d", p_pkt->len,

                    AVRC_TRACE_DEBUG("end frag:%d, total len:%d, offset:%d", p_pkt->len,

                        p_pkt_new->len, p_pkt_new->offset);

                }

                else
@@ -563,7 +563,7 @@ static void avrc_msg_cback(UINT8 handle, UINT8 label, UINT8 cr, 
    memset(&msg, 0, sizeof(tAVRC_MSG) );

    {

        msg.hdr.ctype           = p_data[0] & AVRC_CTYPE_MASK;

        AVRC_TRACE_DEBUG4("avrc_msg_cback handle:%d, ctype:%d, offset:%d, len: %d",

        AVRC_TRACE_DEBUG("avrc_msg_cback handle:%d, ctype:%d, offset:%d, len: %d",

                handle, msg.hdr.ctype, p_pkt->offset, p_pkt->len);

        msg.hdr.subunit_type    = (p_data[1] & AVRC_SUBTYPE_MASK) >> AVRC_SUBTYPE_SHIFT;

        msg.hdr.subunit_id      = p_data[1] & AVRC_SUBID_MASK;
@@ -770,7 +770,7 @@ static void avrc_msg_cback(UINT8 handle, UINT8 label, UINT8 cr, 
#if (BT_USE_TRACES == TRUE)

    else

    {

        AVRC_TRACE_WARNING5("avrc_msg_cback %s msg handle:%d, control:%d, cr:%d, opcode:x%x",

        AVRC_TRACE_WARNING("avrc_msg_cback %s msg handle:%d, control:%d, cr:%d, opcode:x%x",

                p_drop_msg,

                handle, avrc_cb.ccb[handle].control, cr, opcode);

    }
@@ -905,7 +905,7 @@ UINT16 AVRC_Open(UINT8 *p_handle, tAVRC_CONN_CB *p_ccb, BD_ADDR_PTR peer_addr) 
        memset(&avrc_cb.rcb[*p_handle], 0, sizeof(tAVRC_RASM_CB));

#endif

    }

    AVRC_TRACE_DEBUG4("AVRC_Open role: %d, control:%d status:%d, handle:%d", cc.role, cc.control,

    AVRC_TRACE_DEBUG("AVRC_Open role: %d, control:%d status:%d, handle:%d", cc.role, cc.control,

        status, *p_handle);



    return status;
@@ -931,7 +931,7 @@ UINT16 AVRC_Open(UINT8 *p_handle, tAVRC_CONN_CB *p_ccb, BD_ADDR_PTR peer_addr) 
******************************************************************************/

UINT16 AVRC_Close(UINT8 handle)

{

    AVRC_TRACE_DEBUG1("AVRC_Close handle:%d", handle);

    AVRC_TRACE_DEBUG("AVRC_Close handle:%d", handle);

    return AVCT_RemoveConn(handle);

}
@@ -1013,7 +1013,7 @@ UINT16 AVRC_MsgReq (UINT8 handle, UINT8 label, UINT8 ctype, BT_HDR *p_pkt) 
    {

        if (p_pkt->len > AVRC_MAX_CTRL_DATA_LEN)

        {

            AVRC_TRACE_DEBUG1 ("p_pkt->len(%d) > AVRC_MAX_CTRL_DATA_LEN", p_pkt->len );

            AVRC_TRACE_DEBUG ("p_pkt->len(%d) > AVRC_MAX_CTRL_DATA_LEN", p_pkt->len );

            p_pkt_new = (BT_HDR *)GKI_getbuf((UINT16)(AVRC_PACKET_LEN + AVCT_MSG_OFFSET

                + BT_HDR_SIZE));

            if (p_pkt_new)
@@ -1040,11 +1040,11 @@ UINT16 AVRC_MsgReq (UINT8 handle, UINT8 label, UINT8 ctype, BT_HDR *p_pkt) 


                /* prepare the left over for as an end fragment */

                avrc_prep_end_frag (handle);

                AVRC_TRACE_DEBUG3 ("p_pkt len:%d/%d, next len:%d", p_pkt->len, len, p_fcb->p_fmsg->len );

                AVRC_TRACE_DEBUG ("p_pkt len:%d/%d, next len:%d", p_pkt->len, len, p_fcb->p_fmsg->len );

            }

            else

            {

                AVRC_TRACE_ERROR0 ("AVRC_MsgReq no buffers for fragmentation" );

                AVRC_TRACE_ERROR ("AVRC_MsgReq no buffers for fragmentation" );

                GKI_freebuf(p_pkt);

    return AVRC_NO_RESOURCES;

}

system/stack/avrc/avrc_bld_ct.c

+8 −8
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static tAVRC_STS avrc_bld_next_cmd (tAVRC_NEXT_CMD *p_cmd, BT_HDR *p_pkt) 
{

    UINT8   *p_data, *p_start;



    AVRC_TRACE_API0("avrc_bld_next_cmd");

    AVRC_TRACE_API("avrc_bld_next_cmd");



    /* get the existing length, if any, and also the num attributes */

    p_start = (UINT8 *)(p_pkt + 1) + p_pkt->offset;
@@ -75,7 +75,7 @@ static tAVRC_STS avrc_bld_set_abs_volume_cmd (tAVRC_SET_VOLUME_CMD *p_cmd, BT_HD 
{

    UINT8   *p_data, *p_start;



    AVRC_TRACE_API0("avrc_bld_set_abs_volume_cmd");

    AVRC_TRACE_API("avrc_bld_set_abs_volume_cmd");

    /* get the existing length, if any, and also the num attributes */

    p_start = (UINT8 *)(p_pkt + 1) + p_pkt->offset;

    p_data = p_start + 2; /* pdu + rsvd */
@@ -100,7 +100,7 @@ static tAVRC_STS avrc_bld_vol_change_notfn(BT_HDR * p_pkt) 
{

    UINT8   *p_data, *p_start;



    AVRC_TRACE_API0("avrc_bld_vol_change");

    AVRC_TRACE_API("avrc_bld_vol_change");

    /* get the existing length, if any, and also the num attributes */

    // Set the notify value

    p_start = (UINT8 *)(p_pkt + 1) + p_pkt->offset;
@@ -131,7 +131,7 @@ static BT_HDR *avrc_bld_init_cmd_buffer(tAVRC_COMMAND *p_cmd) 
    UINT8  opcode;



    opcode = avrc_opcode_from_pdu(p_cmd->pdu);

    AVRC_TRACE_API2("avrc_bld_init_cmd_buffer: pdu=%x, opcode=%x", p_cmd->pdu, opcode);

    AVRC_TRACE_API("avrc_bld_init_cmd_buffer: pdu=%x, opcode=%x", p_cmd->pdu, opcode);



    switch (opcode)

    {
@@ -194,10 +194,10 @@ tAVRC_STS AVRC_BldCommand( tAVRC_COMMAND *p_cmd, BT_HDR **pp_pkt) 
    BT_HDR  *p_pkt;

    BOOLEAN alloc = FALSE;



    AVRC_TRACE_API2("AVRC_BldCommand: pdu=%x status=%x", p_cmd->cmd.pdu, p_cmd->cmd.status);

    AVRC_TRACE_API("AVRC_BldCommand: pdu=%x status=%x", p_cmd->cmd.pdu, p_cmd->cmd.status);

    if (!p_cmd || !pp_pkt)

    {

        AVRC_TRACE_API2("AVRC_BldCommand. Invalid parameters passed. p_cmd=%p, pp_pkt=%p",

        AVRC_TRACE_API("AVRC_BldCommand. Invalid parameters passed. p_cmd=%p, pp_pkt=%p",

            p_cmd, pp_pkt);

        return AVRC_STS_BAD_PARAM;

    }
@@ -206,7 +206,7 @@ tAVRC_STS AVRC_BldCommand( tAVRC_COMMAND *p_cmd, BT_HDR **pp_pkt) 
    {

        if ((*pp_pkt = avrc_bld_init_cmd_buffer(p_cmd)) == NULL)

        {

            AVRC_TRACE_API0("AVRC_BldCommand: Failed to initialize command buffer");

            AVRC_TRACE_API("AVRC_BldCommand: Failed to initialize command buffer");

            return AVRC_STS_INTERNAL_ERR;

        }

        alloc = TRUE;
@@ -243,7 +243,7 @@ tAVRC_STS AVRC_BldCommand( tAVRC_COMMAND *p_cmd, BT_HDR **pp_pkt) 
        GKI_freebuf(p_pkt);

        *pp_pkt = NULL;

    }

    AVRC_TRACE_API1("AVRC_BldCommand: returning %d", status);

    AVRC_TRACE_API("AVRC_BldCommand: returning %d", status);

    return status;

}

#endif /* (AVRC_METADATA_INCLUDED == TRUE) */

system/stack/avrc/avrc_bld_tg.c

+35 −35
Original line number Diff line number Diff line
@@ -49,12 +49,12 @@ static tAVRC_STS avrc_bld_get_capability_rsp (tAVRC_GET_CAPS_RSP *p_rsp, BT_HDR 


    if (!(AVRC_IS_VALID_CAP_ID(p_rsp->capability_id)))

    {

        AVRC_TRACE_ERROR1("avrc_bld_get_capability_rsp bad parameter. p_rsp: %x", p_rsp);

        AVRC_TRACE_ERROR("avrc_bld_get_capability_rsp bad parameter. p_rsp: %x", p_rsp);

        status = AVRC_STS_BAD_PARAM;

        return status;

    }



    AVRC_TRACE_API0("avrc_bld_get_capability_rsp");

    AVRC_TRACE_API("avrc_bld_get_capability_rsp");

    /* get the existing length, if any, and also the num attributes */

    p_start = (UINT8 *)(p_pkt + 1) + p_pkt->offset;

    p_data = p_len = p_start + 2; /* pdu + rsvd */
@@ -122,7 +122,7 @@ static tAVRC_STS avrc_bld_list_app_settings_attr_rsp (tAVRC_LIST_APP_ATTR_RSP *p 
    UINT16  len = 0;

    UINT8   xx;



    AVRC_TRACE_API0("avrc_bld_list_app_settings_attr_rsp");

    AVRC_TRACE_API("avrc_bld_list_app_settings_attr_rsp");

    /* get the existing length, if any, and also the num attributes */

    p_start = (UINT8 *)(p_pkt + 1) + p_pkt->offset;

    p_data = p_len = p_start + 2; /* pdu + rsvd */
@@ -174,7 +174,7 @@ static tAVRC_STS avrc_bld_list_app_settings_values_rsp (tAVRC_LIST_APP_VALUES_RS 
    UINT8   xx;

    UINT16  len;



    AVRC_TRACE_API0("avrc_bld_list_app_settings_values_rsp");

    AVRC_TRACE_API("avrc_bld_list_app_settings_values_rsp");



    p_start = (UINT8 *)(p_pkt + 1) + p_pkt->offset;

    p_data = p_len = p_start + 2; /* pdu + rsvd */
@@ -226,11 +226,11 @@ static tAVRC_STS avrc_bld_get_cur_app_setting_value_rsp (tAVRC_GET_CUR_APP_VALUE 


    if (!p_rsp->p_vals)

    {

        AVRC_TRACE_ERROR0("avrc_bld_get_cur_app_setting_value_rsp NULL parameter");

        AVRC_TRACE_ERROR("avrc_bld_get_cur_app_setting_value_rsp NULL parameter");

        return AVRC_STS_BAD_PARAM;

    }



    AVRC_TRACE_API0("avrc_bld_get_cur_app_setting_value_rsp");

    AVRC_TRACE_API("avrc_bld_get_cur_app_setting_value_rsp");

    /* get the existing length, if any, and also the num attributes */

    p_start = (UINT8 *)(p_pkt + 1) + p_pkt->offset;

    p_data = p_len = p_start + 2; /* pdu + rsvd */
@@ -281,7 +281,7 @@ static tAVRC_STS avrc_bld_set_app_setting_value_rsp (tAVRC_RSP *p_rsp, BT_HDR *p 
    UNUSED(p_pkt);



    /* nothing to be added. */

    AVRC_TRACE_API0("avrc_bld_set_app_setting_value_rsp");

    AVRC_TRACE_API("avrc_bld_set_app_setting_value_rsp");

    return AVRC_STS_NO_ERROR;

}
@@ -306,7 +306,7 @@ static tAVRC_STS avrc_bld_app_setting_text_rsp (tAVRC_GET_APP_ATTR_TXT_RSP *p_rs 


    if (!p_rsp->p_attrs)

    {

        AVRC_TRACE_ERROR0("avrc_bld_app_setting_text_rsp NULL parameter");

        AVRC_TRACE_ERROR("avrc_bld_app_setting_text_rsp NULL parameter");

        return AVRC_STS_BAD_PARAM;

    }

    /* get the existing length, if any, and also the num attributes */
@@ -331,7 +331,7 @@ static tAVRC_STS avrc_bld_app_setting_text_rsp (tAVRC_GET_APP_ATTR_TXT_RSP *p_rs 
    {

        if  (len_left < (p_rsp->p_attrs[xx].str_len + 4))

        {

            AVRC_TRACE_ERROR3("avrc_bld_app_setting_text_rsp out of room (str_len:%d, left:%d)",

            AVRC_TRACE_ERROR("avrc_bld_app_setting_text_rsp out of room (str_len:%d, left:%d)",

                xx, p_rsp->p_attrs[xx].str_len, len_left);

            p_rsp->num_attr = num_added;

            sts = AVRC_STS_INTERNAL_ERR;
@@ -339,7 +339,7 @@ static tAVRC_STS avrc_bld_app_setting_text_rsp (tAVRC_GET_APP_ATTR_TXT_RSP *p_rs 
        }

        if ( !p_rsp->p_attrs[xx].str_len || !p_rsp->p_attrs[xx].p_str )

        {

            AVRC_TRACE_ERROR1("avrc_bld_app_setting_text_rsp NULL attr text[%d]", xx);

            AVRC_TRACE_ERROR("avrc_bld_app_setting_text_rsp NULL attr text[%d]", xx);

            continue;

        }

        UINT8_TO_BE_STREAM(p_data, p_rsp->p_attrs[xx].attr_id);
@@ -370,7 +370,7 @@ static tAVRC_STS avrc_bld_app_setting_text_rsp (tAVRC_GET_APP_ATTR_TXT_RSP *p_rs 
static tAVRC_STS avrc_bld_get_app_setting_attr_text_rsp (tAVRC_GET_APP_ATTR_TXT_RSP *p_rsp,

    BT_HDR *p_pkt)

{

    AVRC_TRACE_API0("avrc_bld_get_app_setting_attr_text_rsp");

    AVRC_TRACE_API("avrc_bld_get_app_setting_attr_text_rsp");

    return avrc_bld_app_setting_text_rsp(p_rsp, p_pkt);

}
@@ -388,7 +388,7 @@ static tAVRC_STS avrc_bld_get_app_setting_attr_text_rsp (tAVRC_GET_APP_ATTR_TXT_ 
static tAVRC_STS avrc_bld_get_app_setting_value_text_rsp (tAVRC_GET_APP_ATTR_TXT_RSP *p_rsp,

    BT_HDR *p_pkt)

{

    AVRC_TRACE_API0("avrc_bld_get_app_setting_value_text_rsp");

    AVRC_TRACE_API("avrc_bld_get_app_setting_value_text_rsp");

    return avrc_bld_app_setting_text_rsp(p_rsp, p_pkt);

}
@@ -409,7 +409,7 @@ static tAVRC_STS avrc_bld_inform_charset_rsp (tAVRC_RSP *p_rsp, BT_HDR *p_pkt) 
    UNUSED(p_pkt);



    /* nothing to be added. */

    AVRC_TRACE_API0("avrc_bld_inform_charset_rsp");

    AVRC_TRACE_API("avrc_bld_inform_charset_rsp");

    return AVRC_STS_NO_ERROR;

}
@@ -430,7 +430,7 @@ static tAVRC_STS avrc_bld_inform_battery_status_rsp (tAVRC_RSP *p_rsp, BT_HDR *p 
    UNUSED(p_pkt);



    /* nothing to be added. */

    AVRC_TRACE_API0("avrc_bld_inform_battery_status_rsp");

    AVRC_TRACE_API("avrc_bld_inform_battery_status_rsp");

    return AVRC_STS_NO_ERROR;

}
@@ -451,10 +451,10 @@ static tAVRC_STS avrc_bld_get_elem_attrs_rsp (tAVRC_GET_ELEM_ATTRS_RSP *p_rsp, B 
    UINT16  len;

    UINT8   xx;



    AVRC_TRACE_API0("avrc_bld_get_elem_attrs_rsp");

    AVRC_TRACE_API("avrc_bld_get_elem_attrs_rsp");

    if (!p_rsp->p_attrs)

    {

        AVRC_TRACE_ERROR0("avrc_bld_get_elem_attrs_rsp NULL parameter");

        AVRC_TRACE_ERROR("avrc_bld_get_elem_attrs_rsp NULL parameter");

        return AVRC_STS_BAD_PARAM;

    }
@@ -479,7 +479,7 @@ static tAVRC_STS avrc_bld_get_elem_attrs_rsp (tAVRC_GET_ELEM_ATTRS_RSP *p_rsp, B 
    {

        if (!AVRC_IS_VALID_MEDIA_ATTRIBUTE(p_rsp->p_attrs[xx].attr_id))

        {

            AVRC_TRACE_ERROR2("avrc_bld_get_elem_attrs_rsp invalid attr id[%d]: %d", xx, p_rsp->p_attrs[xx].attr_id);

            AVRC_TRACE_ERROR("avrc_bld_get_elem_attrs_rsp invalid attr id[%d]: %d", xx, p_rsp->p_attrs[xx].attr_id);

            continue;

        }

        if ( !p_rsp->p_attrs[xx].name.p_str )
@@ -513,7 +513,7 @@ static tAVRC_STS avrc_bld_get_play_status_rsp (tAVRC_GET_PLAY_STATUS_RSP *p_rsp, 
{

    UINT8   *p_data, *p_start;



    AVRC_TRACE_API0("avrc_bld_get_play_status_rsp");

    AVRC_TRACE_API("avrc_bld_get_play_status_rsp");

    p_start = (UINT8 *)(p_pkt + 1) + p_pkt->offset;

    p_data = p_start + 2;
@@ -545,7 +545,7 @@ static tAVRC_STS avrc_bld_notify_rsp (tAVRC_REG_NOTIF_RSP *p_rsp, BT_HDR *p_pkt) 
    UINT8   xx;

    tAVRC_STS status = AVRC_STS_NO_ERROR;



    AVRC_TRACE_API0("avrc_bld_notify_rsp");

    AVRC_TRACE_API("avrc_bld_notify_rsp");



    p_start = (UINT8 *)(p_pkt + 1) + p_pkt->offset;

    p_data = p_len = p_start + 2; /* pdu + rsvd */
@@ -564,7 +564,7 @@ static tAVRC_STS avrc_bld_notify_rsp (tAVRC_REG_NOTIF_RSP *p_rsp, BT_HDR *p_pkt) 
        }

        else

        {

            AVRC_TRACE_ERROR0("bad play state");

            AVRC_TRACE_ERROR("bad play state");

            status = AVRC_STS_BAD_PARAM;

        }

        break;
@@ -592,7 +592,7 @@ static tAVRC_STS avrc_bld_notify_rsp (tAVRC_REG_NOTIF_RSP *p_rsp, BT_HDR *p_pkt) 
        }

        else

        {

            AVRC_TRACE_ERROR0("bad battery status");

            AVRC_TRACE_ERROR("bad battery status");

            status = AVRC_STS_BAD_PARAM;

        }

        break;
@@ -605,7 +605,7 @@ static tAVRC_STS avrc_bld_notify_rsp (tAVRC_REG_NOTIF_RSP *p_rsp, BT_HDR *p_pkt) 
        }

        else

        {

            AVRC_TRACE_ERROR0("bad system status");

            AVRC_TRACE_ERROR("bad system status");

            status = AVRC_STS_BAD_PARAM;

        }

        break;
@@ -628,7 +628,7 @@ static tAVRC_STS avrc_bld_notify_rsp (tAVRC_REG_NOTIF_RSP *p_rsp, BT_HDR *p_pkt) 
                }

                else

                {

                    AVRC_TRACE_ERROR0("bad player app seeting attribute or value");

                    AVRC_TRACE_ERROR("bad player app seeting attribute or value");

                    status = AVRC_STS_BAD_PARAM;

                    break;

                }
@@ -641,7 +641,7 @@ static tAVRC_STS avrc_bld_notify_rsp (tAVRC_REG_NOTIF_RSP *p_rsp, BT_HDR *p_pkt) 


    default:

        status = AVRC_STS_BAD_PARAM;

        AVRC_TRACE_ERROR0("unknown event_id");

        AVRC_TRACE_ERROR("unknown event_id");

    }



    UINT16_TO_BE_STREAM(p_len, len);
@@ -667,7 +667,7 @@ static tAVRC_STS avrc_bld_next_rsp (tAVRC_RSP *p_rsp, BT_HDR *p_pkt) 
    UNUSED(p_pkt);



    /* nothing to be added. */

    AVRC_TRACE_API0("avrc_bld_next_rsp");

    AVRC_TRACE_API("avrc_bld_next_rsp");

    return AVRC_STS_NO_ERROR;

}
@@ -688,11 +688,11 @@ tAVRC_STS avrc_bld_group_navigation_rsp (UINT16 navi_id, BT_HDR *p_pkt) 


    if (!AVRC_IS_VALID_GROUP(navi_id))

    {

        AVRC_TRACE_ERROR1("avrc_bld_group_navigation_rsp bad navigation op id: %d", navi_id);

        AVRC_TRACE_ERROR("avrc_bld_group_navigation_rsp bad navigation op id: %d", navi_id);

        return AVRC_STS_BAD_PARAM;

    }



    AVRC_TRACE_API0("avrc_bld_group_navigation_rsp");

    AVRC_TRACE_API("avrc_bld_group_navigation_rsp");

    p_data = (UINT8 *)(p_pkt+1) + p_pkt->offset;

    UINT16_TO_BE_STREAM(p_data, navi_id);

    p_pkt->len = 2;
@@ -713,11 +713,11 @@ static tAVRC_STS avrc_bld_rejected_rsp( tAVRC_RSP *p_rsp, BT_HDR *p_pkt ) 
{

    UINT8 *p_data, *p_start;



    AVRC_TRACE_API2("avrc_bld_rejected_rsp: status=%d, pdu:x%x", p_rsp->status, p_rsp->pdu);

    AVRC_TRACE_API("avrc_bld_rejected_rsp: status=%d, pdu:x%x", p_rsp->status, p_rsp->pdu);



    p_start = (UINT8 *)(p_pkt + 1) + p_pkt->offset;

    p_data = p_start + 2;

    AVRC_TRACE_DEBUG1("pdu:x%x", *p_start);

    AVRC_TRACE_DEBUG("pdu:x%x", *p_start);



    UINT16_TO_BE_STREAM(p_data, 1);

    UINT8_TO_BE_STREAM(p_data, p_rsp->status);
@@ -742,13 +742,13 @@ static BT_HDR *avrc_bld_init_rsp_buffer(tAVRC_RESPONSE *p_rsp) 
    BT_HDR *p_pkt=NULL;

    UINT8  opcode = avrc_opcode_from_pdu(p_rsp->pdu);



    AVRC_TRACE_API3("avrc_bld_init_rsp_buffer: pdu=%x, opcode=%x/%x", p_rsp->pdu, opcode,

    AVRC_TRACE_API("avrc_bld_init_rsp_buffer: pdu=%x, opcode=%x/%x", p_rsp->pdu, opcode,

        p_rsp->rsp.opcode);

    if (opcode != p_rsp->rsp.opcode && p_rsp->rsp.status != AVRC_STS_NO_ERROR &&

        avrc_is_valid_opcode(p_rsp->rsp.opcode))

    {

        opcode = p_rsp->rsp.opcode;

        AVRC_TRACE_API1("opcode=%x", opcode);

        AVRC_TRACE_API("opcode=%x", opcode);

    }



    switch (opcode)
@@ -817,7 +817,7 @@ tAVRC_STS AVRC_BldResponse( UINT8 handle, tAVRC_RESPONSE *p_rsp, BT_HDR **pp_pkt 


    if (!p_rsp || !pp_pkt)

    {

        AVRC_TRACE_API2("AVRC_BldResponse. Invalid parameters passed. p_rsp=%p, pp_pkt=%p",

        AVRC_TRACE_API("AVRC_BldResponse. Invalid parameters passed. p_rsp=%p, pp_pkt=%p",

            p_rsp, pp_pkt);

        return AVRC_STS_BAD_PARAM;

    }
@@ -826,7 +826,7 @@ tAVRC_STS AVRC_BldResponse( UINT8 handle, tAVRC_RESPONSE *p_rsp, BT_HDR **pp_pkt 
    {

        if ((*pp_pkt = avrc_bld_init_rsp_buffer(p_rsp)) == NULL)

        {

            AVRC_TRACE_API0("AVRC_BldResponse: Failed to initialize response buffer");

            AVRC_TRACE_API("AVRC_BldResponse: Failed to initialize response buffer");

            return AVRC_STS_INTERNAL_ERR;

        }

        alloc = TRUE;
@@ -834,7 +834,7 @@ tAVRC_STS AVRC_BldResponse( UINT8 handle, tAVRC_RESPONSE *p_rsp, BT_HDR **pp_pkt 
    status = AVRC_STS_NO_ERROR;

    p_pkt = *pp_pkt;



    AVRC_TRACE_API2("AVRC_BldResponse: pdu=%x status=%x", p_rsp->rsp.pdu, p_rsp->rsp.status);

    AVRC_TRACE_API("AVRC_BldResponse: pdu=%x status=%x", p_rsp->rsp.pdu, p_rsp->rsp.status);

    if (p_rsp->rsp.status != AVRC_STS_NO_ERROR)

    {

        return( avrc_bld_rejected_rsp(&p_rsp->rsp, p_pkt) );
@@ -909,7 +909,7 @@ tAVRC_STS AVRC_BldResponse( UINT8 handle, tAVRC_RESPONSE *p_rsp, BT_HDR **pp_pkt 
        GKI_freebuf(p_pkt);

        *pp_pkt = NULL;

    }

    AVRC_TRACE_API1("AVRC_BldResponse: returning %d", status);

    AVRC_TRACE_API("AVRC_BldResponse: returning %d", status);

    return status;

}

system/stack/avrc/avrc_pars_ct.c

+3 −3
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static tAVRC_STS avrc_pars_vendor_rsp(tAVRC_MSG_VENDOR *p_msg, tAVRC_RESPONSE *p 
    BE_STREAM_TO_UINT8 (p_result->pdu, p);

    p++; /* skip the reserved/packe_type byte */

    BE_STREAM_TO_UINT16 (len, p);

    AVRC_TRACE_DEBUG4("avrc_pars_vendor_rsp() ctype:0x%x pdu:0x%x, len:%d/0x%x", p_msg->hdr.ctype, p_result->pdu, len, len);

    AVRC_TRACE_DEBUG("avrc_pars_vendor_rsp() ctype:0x%x pdu:0x%x, len:%d/0x%x", p_msg->hdr.ctype, p_result->pdu, len, len);

    if (p_msg->hdr.ctype == AVRC_RSP_REJ)

    {

        p_result->rsp.status = *p;
@@ -92,7 +92,7 @@ static tAVRC_STS avrc_pars_vendor_rsp(tAVRC_MSG_VENDOR *p_msg, tAVRC_RESPONSE *p 
            p_result->reg_notif.event_id=eventid;

            BE_STREAM_TO_UINT8 (p_result->reg_notif.param.volume, p);

        }

        AVRC_TRACE_DEBUG2("avrc_pars_vendor_rsp PDU reg notif response:event %x, volume %x",eventid,

        AVRC_TRACE_DEBUG("avrc_pars_vendor_rsp PDU reg notif response:event %x, volume %x",eventid,

            p_result->reg_notif.param.volume);

#endif /* (AVRC_ADV_CTRL_INCLUDED == TRUE) */

        break;
@@ -138,7 +138,7 @@ tAVRC_STS AVRC_ParsResponse (tAVRC_MSG *p_msg, tAVRC_RESPONSE *p_result, UINT8 * 
            break;



        default:

            AVRC_TRACE_ERROR1("AVRC_ParsResponse() unknown opcode:0x%x", p_msg->hdr.opcode);

            AVRC_TRACE_ERROR("AVRC_ParsResponse() unknown opcode:0x%x", p_msg->hdr.opcode);

            break;

        }

        p_result->rsp.opcode = p_msg->hdr.opcode;