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

Commit 63c50cbb authored by Anubhav Gupta's avatar Anubhav Gupta Committed by Android Git Automerger
Browse files

am ac2f0593: Promote AVCTP version to 1.4 

* commit 'ac2f0593':
  Promote AVCTP version to 1.4
parents 5419fd25 ac2f0593

system/stack/avrc/avrc_sdp.c

+16 −0
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ 
#define SDP_AVRCP_1_4      FALSE

#endif



#ifndef SDP_AVCTP_1_4

#define SDP_AVCTP_1_4      TRUE

#endif



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

**  Global data

*****************************************************************************/
@@ -42,6 +46,9 @@ tAVRC_CB avrc_cb; 
const tSDP_PROTOCOL_ELEM  avrc_proto_list [] =

{

    {UUID_PROTOCOL_L2CAP, 1, {AVCT_PSM, 0} },

#if SDP_AVCTP_1_4 == TRUE

    {UUID_PROTOCOL_AVCTP, 1, {AVCT_REV_1_4, 0}  }

#else

#if SDP_AVRCP_1_4 == TRUE

    {UUID_PROTOCOL_AVCTP, 1, {AVCT_REV_1_3, 0}  }

#else
@@ -51,6 +58,7 @@ const tSDP_PROTOCOL_ELEM avrc_proto_list [] = 
    {UUID_PROTOCOL_AVCTP, 1, {AVCT_REV_1_0, 0}  }

#endif

#endif

#endif

};



#if SDP_AVRCP_1_4 == TRUE
@@ -227,12 +235,20 @@ UINT16 AVRC_AddRecord(UINT16 service_uuid, char *p_service_name, 


    /* add service class id list */

    class_list[0] = service_uuid;

#if SDP_AVCTP_1_4 == TRUE

    if( service_uuid == UUID_SERVCLASS_AV_REMOTE_CONTROL )

    {

        class_list[1] = UUID_SERVCLASS_AV_REM_CTRL_CONTROL;

        count = 2;

    }

#else

#if SDP_AVRCP_1_4 == TRUE

    if( service_uuid == UUID_SERVCLASS_AV_REMOTE_CONTROL )

    {

        class_list[1] = UUID_SERVCLASS_AV_REM_CTRL_CONTROL;

        count = 2;

    }

#endif

#endif

    result &= SDP_AddServiceClassIdList(sdp_handle, count, class_list);

system/stack/include/avct_api.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#define AVCT_REV_1_0                0x0100

#define AVCT_REV_1_2                0x0102

#define AVCT_REV_1_3                0x0103

#define AVCT_REV_1_4                0x0104



/* the layer_specific settings */

#define AVCT_DATA_CTRL              0x0001    /* for the control channel */