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

Commit 136d320e authored by Marie Janssen's avatar Marie Janssen
Browse files

btif: Remove AVRC_CTRL_INCLUDED ifdefs 

AVRCP controller side support is always included now.

Test: croot system/bt && mma -j37

Change-Id: I22260b4f123b352f70cbab54a19b5f8f5f171825
parent f8fd704f

system/bta/av/bta_av_act.cc

+2 −6
Original line number Diff line number Diff line
@@ -867,15 +867,11 @@ void bta_av_rc_msg(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data) { 
              p_data->rc_msg.msg.pass.pass_len,

              p_data->rc_msg.msg.pass.p_pass_data, is_inquiry);

#endif

      }

#if (AVRC_CTRL_INCLUDED == TRUE)

      else if (((p_data->rc_msg.msg.pass.op_id == AVRC_ID_VOL_UP) ||

      } else if (((p_data->rc_msg.msg.pass.op_id == AVRC_ID_VOL_UP) ||

                (p_data->rc_msg.msg.pass.op_id == AVRC_ID_VOL_DOWN)) &&

               !strcmp(avrcp_ct_support, "true")) {

        p_data->rc_msg.msg.hdr.ctype = BTA_AV_RSP_ACCEPT;

      }

#endif

      else {

      } else {

        p_data->rc_msg.msg.hdr.ctype =

            bta_av_op_supported(p_data->rc_msg.msg.pass.op_id, is_inquiry);

      }

system/bta/av/bta_av_cfg.cc

+0 −2
Original line number Diff line number Diff line
@@ -41,11 +41,9 @@ 
const uint32_t bta_av_meta_caps_co_ids[] = {AVRC_CO_METADATA, AVRC_CO_BROADCOM};



/* AVRCP supported categories */

#if (AVRC_CTRL_INCLUDED == TRUE)

#define BTA_AV_RC_SUPF_CT (AVRC_SUPF_CT_CAT2)

#define BTA_AVK_RC_SUPF_CT (AVRC_SUPF_CT_CAT1 | AVRC_SUPF_CT_BROWSE)

#define BTA_AVK_RC_SUPF_TG (AVRC_SUPF_TG_CAT2)

#endif



/* AVRCP Controller and Targer default name */

#ifndef BTA_AV_RC_CT_NAME

system/btif/src/btif_rc.cc

+4 −128

File changed.

Preview size limit exceeded, changes collapsed.

system/include/bt_target.h

+0 −4
Original line number Diff line number Diff line
@@ -1377,10 +1377,6 @@ 
#define AVRC_ADV_CTRL_INCLUDED TRUE

#endif



#ifndef AVRC_CTRL_INCLUDED

#define AVRC_CTRL_INCLUDED TRUE

#endif



#ifndef DUMP_PCM_DATA

#define DUMP_PCM_DATA FALSE

#endif

system/stack/avrc/avrc_bld_ct.cc

+1 −4
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static tAVRC_STS avrc_bld_register_notifn(BT_HDR * p_pkt, uint8_t event_id, uint 
    return AVRC_STS_NO_ERROR;

}

#endif

#if (AVRC_CTRL_INCLUDED == TRUE)



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

**

** Function         avrc_bld_get_capability_cmd
@@ -491,7 +491,6 @@ static tAVRC_STS avrc_bld_set_addressed_player_cmd( 
    p_pkt->len = (p_data - p_start);

    return AVRC_STS_NO_ERROR;

}

#endif



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

**
@@ -610,7 +609,6 @@ tAVRC_STS AVRC_BldCommand( tAVRC_COMMAND *p_cmd, BT_HDR **pp_pkt) 
        status=avrc_bld_register_notifn(p_pkt,p_cmd->reg_notif.event_id,p_cmd->reg_notif.param);

#endif

        break;

#if (AVRC_CTRL_INCLUDED == TRUE)

    case AVRC_PDU_GET_CAPABILITIES:

        status = avrc_bld_get_capability_cmd(p_pkt, p_cmd->get_caps.capability_id);

        break;
@@ -657,7 +655,6 @@ tAVRC_STS AVRC_BldCommand( tAVRC_COMMAND *p_cmd, BT_HDR **pp_pkt) 
    case AVRC_PDU_SET_ADDRESSED_PLAYER:

        status = avrc_bld_set_addressed_player_cmd(p_pkt, &(p_cmd->addr_player));

        break;

#endif

    }



    if (alloc && (status != AVRC_STS_NO_ERROR) )