From dab356e3b0573303840e63cbafb1065d57a11e2c Mon Sep 17 00:00:00 2001 From: Anubhav Gupta Date: Tue, 28 Jul 2015 12:02:57 +0530 Subject: Promote AVCTP version to 1.4 Promoting AVCTP version to 1.4 from 1.2 as Bluedroid stack already has got support for the same. Below changes are incorporated as part of this: - AVCTP version in SDP entry is upgraded to 1.4 for both AVRCP Target and controller role. - Service class #1 is added in extra for AVRCP Controller SDP entry to be in sync with AVCTP version change. - Browsing support is not enabled as that needs corresponding profile level implementation, which is currently unavailable. Change-Id: I72f7f67eb0a789fd321e9468f2a51bb5e9385a89 --- stack/avrc/avrc_sdp.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'stack/avrc') diff --git a/stack/avrc/avrc_sdp.c b/stack/avrc/avrc_sdp.c index f08b7c907..ba10c1c5a 100644 --- a/stack/avrc/avrc_sdp.c +++ b/stack/avrc/avrc_sdp.c @@ -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); -- cgit v1.2.3