This enables MPMD field in MPS record.
---
src/sdpd-service.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 92 insertions(+), 1 deletion(-)
diff --git a/src/sdpd-service.c b/src/sdpd-service.c
index abd48e7..40aef62 100644
--- a/src/sdpd-service.c
+++ b/src/sdpd-service.c
@@ -83,6 +83,26 @@
#define MPSD_A2DP_SRC_PBAP_SRV_PB_DL_DURING_AUDIO_STREAM (1ULL << 36)
#define MPSD_A2DP_SNK_PBAP_CLI_PB_DL_DURING_AUDIO_STREAM (1ULL << 37)
+#define MPMD_HFP_HF_A2DP_SNK_AVRCP_CT_ANSWER_CALL_DURING_AUDIO (1ULL << 0)
+#define MPMD_A2DP_SRC_AVRCP_TG_ANSWER_CALL_DURING_AUDIO (1ULL << 1)
+#define MPMD_HFP_HF_A2DP_SNK_AVRCP_CT_OUTGOING_CALL_DURING_AUDIO (1ULL << 2)
+#define MPMD_A2DP_SRC_AVRCP_TG_OUTGOING_CALL_DURING_AUDIO (1ULL << 3)
+#define MPMD_HFP_HF_A2DP_SNK_AVRCP_CT_REJECT_CALL_DURING_AUDIO (1ULL << 4)
+#define MPMD_A2DP_SRC_AVRCP_TG_REJECT_CALL_DURING_AUDIO (1ULL << 5)
+#define MPMD_HFP_AG_CALL_TERMINATION_DURING_AVP (1ULL << 6)
+#define MPMD_HFP_HF_A2DP_SNK_AVRCP_CT_TERMINATION_DURING_AVP (1ULL << 7)
+#define MPMD_A2DP_SRC_AVRCP_TG_TERMINATION_DURING_AVP (1ULL << 8)
+#define MPMD_HFP_HF_A2DP_SNK_AVRCP_CT_PLAY_DURING_CALL (1ULL << 9)
+#define MPMD_A2DP_SRC_AVRCP_TG_PRESS_PLAY_DURING_CALL (1ULL << 10)
+#define MPMD_AVRCP_CT_NO_A2DP_SNK_START_AUDIO_AFTER_PLAY (1ULL << 11)
+#define MPMD_A2DP_SRC_AVRCP_TG_START_AUDIO_AFTER_PLAY (1ULL << 12)
+#define MPMD_AVRCP_CT_NO_A2DP_SNK_SUSPEND_AUDIO_AFTER_PAUSE (1ULL << 13)
+#define MPMD_A2DP_SRC_AVRCP_TG_SUSPEND_AUDIO_AFTER_PAUSE (1ULL << 14)
+#define MPMD_A2DP_SRC_AVRCP_TG_START_AUDIO_DURING_DATA_COMM (1ULL << 15)
+#define MPMD_A2DP_SNK_AVRCP_CT_DUN_DT_AUDIO_DURING_DATA_COMM (1ULL << 16)
+#define MPMD_A2DP_SRC_AVRCP_TG_START_DATA_DURING_AUDIO (1ULL << 17)
+#define MPMD_A2DP_SNK_AVRCP_CT_DUN_DT_START_DATA_DURING_AUDIO (1ULL << 18)
+
/* Note: in spec dependency bit position starts from 1 (bit 0 unused?) */
#define MPS_DEPS_SNIFF_MODE_DURRING_STREAMING (1ULL << 1)
#define MPS_DEPS_GAVDP_REQUIREMENTS (1ULL << 2)
@@ -196,6 +216,52 @@
MPS_MPSD_PAN_NAP | MPS_MPSD_PAN_PANU | \
MPS_MPSD_PBAP_SRC | MPS_MPSD_PBAP_CLI)
+#define MPS_MPMD_HFP_AG MPMD_HFP_AG_CALL_TERMINATION_DURING_AVP
+
+#define MPS_MPMD_HFP_HF ( \
+ MPMD_HFP_HF_A2DP_SNK_AVRCP_CT_ANSWER_CALL_DURING_AUDIO | \
+ MPMD_HFP_HF_A2DP_SNK_AVRCP_CT_OUTGOING_CALL_DURING_AUDIO | \
+ MPMD_HFP_HF_A2DP_SNK_AVRCP_CT_REJECT_CALL_DURING_AUDIO | \
+ MPMD_HFP_HF_A2DP_SNK_AVRCP_CT_TERMINATION_DURING_AVP | \
+ MPMD_HFP_HF_A2DP_SNK_AVRCP_CT_PLAY_DURING_CALL)
+
+#define MPS_MPMD_A2DP_SRC (MPMD_A2DP_SRC_AVRCP_TG_ANSWER_CALL_DURING_AUDIO | \
+ MPMD_A2DP_SRC_AVRCP_TG_OUTGOING_CALL_DURING_AUDIO | \
+ MPMD_A2DP_SRC_AVRCP_TG_REJECT_CALL_DURING_AUDIO | \
+ MPMD_A2DP_SRC_AVRCP_TG_TERMINATION_DURING_AVP | \
+ MPMD_A2DP_SRC_AVRCP_TG_PRESS_PLAY_DURING_CALL | \
+ MPMD_A2DP_SRC_AVRCP_TG_START_AUDIO_AFTER_PLAY | \
+ MPMD_A2DP_SRC_AVRCP_TG_SUSPEND_AUDIO_AFTER_PAUSE | \
+ MPMD_A2DP_SRC_AVRCP_TG_START_AUDIO_DURING_DATA_COMM | \
+ MPMD_A2DP_SRC_AVRCP_TG_START_DATA_DURING_AUDIO)
+
+#define MPS_MPMD_A2DP_SNK ( \
+ MPMD_HFP_HF_A2DP_SNK_AVRCP_CT_ANSWER_CALL_DURING_AUDIO | \
+ MPMD_HFP_HF_A2DP_SNK_AVRCP_CT_OUTGOING_CALL_DURING_AUDIO | \
+ MPMD_HFP_HF_A2DP_SNK_AVRCP_CT_REJECT_CALL_DURING_AUDIO | \
+ MPMD_HFP_HF_A2DP_SNK_AVRCP_CT_TERMINATION_DURING_AVP | \
+ MPMD_HFP_HF_A2DP_SNK_AVRCP_CT_PLAY_DURING_CALL | \
+ MPMD_A2DP_SNK_AVRCP_CT_DUN_DT_AUDIO_DURING_DATA_COMM | \
+ MPMD_A2DP_SNK_AVRCP_CT_DUN_DT_START_DATA_DURING_AUDIO)
+
+#define MPS_MPMD_AVRCP_CT MPS_MPMD_A2DP_SNK
+
+/* should be set only if CT is supported but SNK is not supported */
+#define MPS_MPMD_AVRCP_CT_ONLY ( \
+ MPMD_AVRCP_CT_NO_A2DP_SNK_START_AUDIO_AFTER_PLAY | \
+ MPMD_AVRCP_CT_NO_A2DP_SNK_SUSPEND_AUDIO_AFTER_PAUSE)
+
+#define MPS_MPMD_AVRCP_TG MPS_MPMD_A2DP_SRC
+
+#define MPS_MPMD_DUN_DT ( \
+ MPMD_A2DP_SNK_AVRCP_CT_DUN_DT_AUDIO_DURING_DATA_COMM | \
+ MPMD_A2DP_SNK_AVRCP_CT_DUN_DT_START_DATA_DURING_AUDIO)
+
+#define MPS_MPMD_ALL (MPS_MPMD_HFP_AG | MPS_MPMD_HFP_HF | MPS_MPMD_A2DP_SRC | \
+ MPS_MPMD_A2DP_SNK | MPS_MPMD_AVRCP_CT | \
+ MPS_MPMD_AVRCP_CT_ONLY | MPS_MPMD_AVRCP_TG | \
+ MPS_MPMD_DUN_DT)
+
/* Assume all dependencies are supported */
#define MPS_DEFAULT_DEPS (MPS_DEPS_SNIFF_MODE_DURRING_STREAMING | \
MPS_DEPS_GAVDP_REQUIREMENTS | \
@@ -458,9 +524,34 @@ static uint64_t mps_mpsd_features(void)
static uint64_t mps_mpmd_features(void)
{
+ uint64_t feat = MPS_MPMD_ALL;
+
+ if (!class_supported(HANDSFREE_AGW_SVCLASS_ID))
+ feat &= ~MPS_MPMD_HFP_AG;
+
+ if (!class_supported(HANDSFREE_SVCLASS_ID))
+ feat &= ~MPS_MPMD_HFP_HF;
+
+ if (!class_supported(AUDIO_SOURCE_SVCLASS_ID))
+ feat &= ~MPS_MPMD_A2DP_SRC;
+
+ if (!class_supported(AUDIO_SINK_SVCLASS_ID))
+ feat &= ~MPS_MPMD_A2DP_SNK;
+ else
+ feat &= ~MPS_MPMD_AVRCP_CT_ONLY;
+
+ if (!class_supported(AV_REMOTE_CONTROLLER_SVCLASS_ID)) {
+ feat &= ~MPS_MPMD_AVRCP_CT;
+ feat &= ~MPS_MPMD_AVRCP_CT_ONLY;
+ }
+
+ if (!class_supported(AV_REMOTE_TARGET_SVCLASS_ID))
+ feat &= ~MPS_MPMD_AVRCP_TG;
+
/* TODO */
+ feat &= ~MPS_MPMD_DUN_DT;
- return 0;
+ return feat;
}
static sdp_record_t *mps_record(int mpmd)
--
1.9.3
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
