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

Commit ce09e055 authored by lungtsai_lin's avatar lungtsai_lin Committed by Dmitry Shmidt
Browse files

Bluetooth: Rename BTA_AVK_INCLUDED flag to BTA_AV_SINK_INCLUDED (bt_target.h) 



Now OEM could enable/disable A2DP SINK role

Change-Id: I62cf17b0397a86c5f886a2c1ca724ca77a7f9bd4
Signed-off-by: default avatarDmitry Shmidt <dimitrysh@google.com>
parent 7eafa083

Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ else 
endif



bdroid_CFLAGS += -Wall -Werror

bdroid_CFLAGS += -DBTA_AVK_INCLUDED



ifneq ($(BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED),)

  bdroid_CFLAGS += -DHCILP_INCLUDED=$(BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED)

system/bta/av/bta_av_act.c

+1 −1
Original line number Diff line number Diff line
@@ -1997,7 +1997,7 @@ void bta_av_dereg_comp(tBTA_AV_DATA *p_data) 
                bta_av_del_sdp_rec(&p_cb->sdp_a2d_handle);

                bta_sys_remove_uuid(UUID_SERVCLASS_AUDIO_SOURCE);



#ifdef BTA_AVK_INCLUDED

#if (BTA_AV_SINK_INCLUDED == TRUE)

                bta_av_del_sdp_rec(&p_cb->sdp_a2d_snk_handle);

                bta_sys_remove_uuid(UUID_SERVCLASS_AUDIO_SINK);

#endif

system/bta/av/bta_av_api.c

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ void BTA_AvEnable_Sink(int enable) 
{

    BT_HDR  *p_buf;



#ifdef BTA_AVK_INCLUDED

#if (BTA_AV_SINK_INCLUDED == TRUE)

    if ((p_buf = (BT_HDR *) GKI_getbuf(sizeof(BT_HDR))) != NULL)

    {

        p_buf->event = BTA_AV_API_SINK_ENABLE_EVT;

system/bta/av/bta_av_int.h

+2 −2
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ enum 
    BTA_AV_AVRC_CLOSE_EVT,

    BTA_AV_CONN_CHG_EVT,

    BTA_AV_DEREG_COMP_EVT,

#ifdef BTA_AVK_INCLUDED

#if (BTA_AV_SINK_INCLUDED == TRUE)

    BTA_AV_API_SINK_ENABLE_EVT,

#endif

#if (AVDT_REPORTING == TRUE)
@@ -563,7 +563,7 @@ typedef struct 
    TIMER_LIST_ENT      sig_tmr;        /* link timer */

    TIMER_LIST_ENT      acp_sig_tmr;    /* timer to monitor signalling when accepting */

    UINT32              sdp_a2d_handle; /* SDP record handle for audio src */

#ifdef BTA_AVK_INCLUDED

#if (BTA_AV_SINK_INCLUDED == TRUE)

    UINT32              sdp_a2d_snk_handle; /* SDP record handle for audio snk */

#endif

    UINT32              sdp_vdp_handle; /* SDP record handle for video src */

system/bta/av/bta_av_main.c

+8 −8
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static const tBTA_AV_ST_TBL bta_av_st_tbl[] = 
typedef void (*tBTA_AV_NSM_ACT)(tBTA_AV_DATA *p_data);

static void bta_av_api_enable(tBTA_AV_DATA *p_data);

static void bta_av_api_register(tBTA_AV_DATA *p_data);

#ifdef BTA_AVK_INCLUDED

#if (BTA_AV_SINK_INCLUDED == TRUE)

static void bta_av_api_sink_enable(tBTA_AV_DATA *p_data);

#endif

static void bta_av_ci_data(tBTA_AV_DATA *p_data);
@@ -180,7 +180,7 @@ const tBTA_AV_NSM_ACT bta_av_nsm_act[] = 
    bta_av_rc_closed,       /* BTA_AV_AVRC_CLOSE_EVT */

    bta_av_conn_chg,        /* BTA_AV_CONN_CHG_EVT */

    bta_av_dereg_comp,      /* BTA_AV_DEREG_COMP_EVT */

#ifdef BTA_AVK_INCLUDED

#if (BTA_AV_SINK_INCLUDED == TRUE)

    bta_av_api_sink_enable, /* BTA_AV_API_SINK_ENABLE_EVT */

#endif

#if (AVDT_REPORTING == TRUE)
@@ -467,7 +467,7 @@ static void bta_av_a2dp_report_cback(UINT8 handle, AVDT_REPORT_TYPE type, 
}

#endif



#ifdef BTA_AVK_INCLUDED

#if (BTA_AV_SINK_INCLUDED == TRUE)

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

**

** Function         bta_av_api_sink_enable
@@ -587,7 +587,7 @@ static void bta_av_api_register(tBTA_AV_DATA *p_data) 
            }



            /* Set the Capturing service class bit */

#ifdef BTA_AVK_INCLUDED

#if (BTA_AV_SINK_INCLUDED == TRUE)

            cod.service = BTM_COD_SERVICE_CAPTURING | BTM_COD_SERVICE_RENDERING;

#else

            cod.service = BTM_COD_SERVICE_CAPTURING;
@@ -652,7 +652,7 @@ static void bta_av_api_register(tBTA_AV_DATA *p_data) 
                &cs.cfg.num_protect, cs.cfg.protect_info, index) == TRUE)

            {



#ifdef BTA_AVK_INCLUDED

#if (BTA_AV_SINK_INCLUDED == TRUE)

            if(index == 1)

            {

                cs.tsep = AVDT_TSEP_SNK;
@@ -664,7 +664,7 @@ static void bta_av_api_register(tBTA_AV_DATA *p_data) 
                {

                    p_scb->seps[index].codec_type = codec_type;



#ifdef BTA_AVK_INCLUDED

#if (BTA_AV_SINK_INCLUDED == TRUE)

                    p_scb->seps[index].tsep = cs.tsep;

                    if(cs.tsep == AVDT_TSEP_SNK)

                        p_scb->seps[index].p_app_data_cback = p_data->api_reg.p_app_data_cback;
@@ -688,7 +688,7 @@ static void bta_av_api_register(tBTA_AV_DATA *p_data) 
                                  A2D_SUPF_PLAYER, bta_av_cb.sdp_a2d_handle);

                bta_sys_add_uuid(UUID_SERVCLASS_AUDIO_SOURCE);



#ifdef BTA_AVK_INCLUDED

#if (BTA_AV_SINK_INCLUDED == TRUE)

                bta_av_cb.sdp_a2d_snk_handle = SDP_CreateRecord();

                A2D_AddRecord(UUID_SERVCLASS_AUDIO_SINK, p_avk_service_name, NULL,

                                  A2D_SUPF_PLAYER, bta_av_cb.sdp_a2d_snk_handle);
@@ -1399,7 +1399,7 @@ char *bta_av_evt_code(UINT16 evt_code) 
    case BTA_AV_AVRC_CLOSE_EVT: return "AVRC_CLOSE";

    case BTA_AV_CONN_CHG_EVT: return "CONN_CHG";

    case BTA_AV_DEREG_COMP_EVT: return "DEREG_COMP";

#ifdef BTA_AVK_INCLUDED

#if (BTA_AV_SINK_INCLUDED == TRUE)

    case BTA_AV_API_SINK_ENABLE_EVT: return "SINK_ENABLE";

#endif

#if (AVDT_REPORTING == TRUE)