[PATCH 1/5] tools/mcaptest: Minor style fix

[PATCH 1/5] tools/mcaptest: Minor style fix

[Grzegorz Kolodziejczyk]

This patch add white lines between neighbouring bodys.
---
 tools/mcaptest.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/mcaptest.c b/tools/mcaptest.c
index 42734eb..980d21a 100644
--- a/tools/mcaptest.c
+++ b/tools/mcaptest.c
@@ -286,6 +286,7 @@ static void create_mcl_cb(struct mcap_mcl *mcap_mcl, GError *err, gpointer data)
 	mcl = mcap_mcl_ref(mcap_mcl);
 	trigger_mdl_action(data_mode);
 }
+
 static void usage(void)
 {
 	printf("mcaptest - MCAP testing ver %s\n", VERSION);
@@ -320,6 +321,7 @@ static struct option main_options[] = {
 	{ "data_ch",		1, 0, 'D' },
 	{ 0, 0, 0, 0 }
 };
+
 int main(int argc, char *argv[])
 {
 	GError *err = NULL;
-- 
1.9.3

[PATCH 2/5] tools/mcaptest: Refractor debug logs for functions

[Grzegorz Kolodziejczyk]

Add missing logs for callback functions and unify existing.
---
 tools/mcaptest.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/tools/mcaptest.c b/tools/mcaptest.c
index 980d21a..c44750f 100644
--- a/tools/mcaptest.c
+++ b/tools/mcaptest.c
@@ -152,7 +152,7 @@ static void mcl_reconnected(struct mcap_mcl *mcl, gpointer data)
 static void mcl_disconnected(struct mcap_mcl *mcl, gpointer data)
 {
 	/* TODO */
-	printf("MCL disconnected\n");
+	printf("%s\n", __func__);
 
 	if (no_close)
 		return;
@@ -163,14 +163,19 @@ static void mcl_disconnected(struct mcap_mcl *mcl, gpointer data)
 static void mcl_uncached(struct mcap_mcl *mcl, gpointer data)
 {
 	/* TODO */
-	printf("MCL uncached unsupported\n");
+	printf("%s\n", __func__);
 }
 
 static void connect_mdl_cb(struct mcap_mdl *mdl, GError *gerr, gpointer data)
 {
 	mdlid = mcap_mdl_get_mdlid(mdl);
 
-	printf("MDL %d connected\n", mdlid);
+	printf("%s\n", __func__);
+
+	if (mdlid == MCAP_MDLID_RESERVED)
+		printf("MCAP mdlid is reserved");
+	else
+		printf("MDL %d connected\n", mdlid);
 }
 
 static void create_mdl_cb(struct mcap_mdl *mcap_mdl, uint8_t type, GError *gerr,
@@ -178,6 +183,8 @@ static void create_mdl_cb(struct mcap_mdl *mcap_mdl, uint8_t type, GError *gerr,
 {
 	GError *err = NULL;
 
+	printf("%s\n", __func__);
+
 	if (gerr) {
 		printf("MDL error: %s\n", gerr->message);
 
@@ -234,6 +241,7 @@ static void trigger_mdl_action(int mode)
 	}
 
 	if (mode == MODE_CONNECT) {
+		printf("Creating MCAP Data End Point\n");
 		mcap_create_mdl(mcl, 1, 0, create_mdl_cb, NULL, NULL, &gerr);
 		if (gerr) {
 			printf("Could not connect MDL: %s\n", gerr->message);
-- 
1.9.3

[PATCH 3/5] tools/mcaptest: Seperate disconnect link timeout and call parameters

[Grzegorz Kolodziejczyk]

Data connection shouldn't be automatically closed if MDL disconnect
timeout parameter is given. Disconnect immediately if mdl connection is
established should be triggered with parameter giving and it should be
independent of MDL disconnect timeout parameter. MCL disconnect
possibility (after mdl disconnect) should be also controlled with
parameter independently of its disconnect timeout.

This set of parameters gives possibility to pass all PTS 6.0.1 MCAP test
cases.
---
 tools/mcaptest.c | 47 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/tools/mcaptest.c b/tools/mcaptest.c
index c44750f..6aba7a5 100644
--- a/tools/mcaptest.c
+++ b/tools/mcaptest.c
@@ -71,20 +71,27 @@ static gboolean no_close = FALSE;
 
 #define REQ_CLOCK_ACC 0x1400
 
-static void mdl_connected_cb(struct mcap_mdl *mdl, void *data)
+static void mdl_close(struct mcap_mdl *mdl)
 {
 	int fd = -1;
 
 	printf("%s\n", __func__);
 
-	if (mdl_disconnect && mdl_disconnect_timeout >= 0) {
+	if (mdl_disconnect_timeout >= 0)
 		sleep(mdl_disconnect_timeout);
 
-		fd = mcap_mdl_get_fd(mdl);
+	fd = mcap_mdl_get_fd(mdl);
 
-		if (fd > 0)
-			close(fd);
-	}
+	if (fd > 0)
+		close(fd);
+}
+
+static void mdl_connected_cb(struct mcap_mdl *mdl, void *data)
+{
+	printf("%s\n", __func__);
+
+	if (mdl_disconnect)
+		mdl_close(mdl);
 }
 
 static void mdl_closed_cb(struct mcap_mdl *mdl, void *data)
@@ -94,7 +101,13 @@ static void mdl_closed_cb(struct mcap_mdl *mdl, void *data)
 	if (mcl_disconnect && mcl_disconnect_timeout >= 0) {
 		sleep(mcl_disconnect_timeout);
 
+		printf("Closing MCAP communication link\n");
 		mcap_close_mcl(mcl, TRUE);
+
+		if (no_close)
+			return;
+
+		g_main_loop_quit(mloop);
 	}
 }
 
@@ -102,6 +115,10 @@ static void mdl_deleted_cb(struct mcap_mdl *mdl, void *data)
 {
 	/* TODO */
 	printf("%s\n", __func__);
+
+	/* Disconnecting MDL latency timeout */
+	if (mdl_disconnect_timeout >= 0)
+		sleep(mdl_disconnect_timeout);
 }
 
 static void mdl_aborted_cb(struct mcap_mdl *mdl, void *data)
@@ -302,10 +319,12 @@ static void usage(void)
 		"\tmcaptest <control_mode> <data_mode> [options]\n");
 	printf("Control Link Mode:\n"
 		"\t-c connect <dst_addr>\n"
+		"\t-b close control link after closing data link\n"
 		"\t-e <timeout> disconnect MCL and quit after MDL is closed\n"
 		"\t-g send clock sync capability request if MCL connected\n");
 	printf("Data Link Mode:\n"
 		"\t-d connect\n"
+		"\t-a close data link immediately after being connected"
 		"\t-f <timeout> disconnect MDL after it's connected\n"
 		"\t-u send \'Unavailable\' on first MDL connection request\n");
 	printf("Options:\n"
@@ -322,6 +341,8 @@ static struct option main_options[] = {
 	{ "disconnect_cl",	1, 0, 'e' },
 	{ "synccap_req",	0, 0, 'g' },
 	{ "connect_dl",		0, 0, 'd' },
+	{ "disconnect_da",	0, 0, 'a' },
+	{ "disconnect_ca",	0, 0, 'b' },
 	{ "disconnect_dl",	1, 0, 'f' },
 	{ "unavailable_dl",	0, 0, 'u' },
 	{ "no exit mcl dis/err",0, 0, 'n' },
@@ -347,7 +368,7 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
-	while ((opt = getopt_long(argc, argv, "+i:c:C:D:e:f:dghun",
+	while ((opt = getopt_long(argc, argv, "+i:c:C:D:e:f:dghunab",
 						main_options, NULL)) != EOF) {
 		switch (opt) {
 		case 'i':
@@ -369,14 +390,22 @@ int main(int argc, char *argv[])
 
 			break;
 
-		case 'e':
+		case 'a':
+			mdl_disconnect = TRUE;
+
+			break;
+
+		case 'b':
 			mcl_disconnect = TRUE;
+
+			break;
+
+		case 'e':
 			mcl_disconnect_timeout = atoi(optarg);
 
 			break;
 
 		case 'f':
-			mdl_disconnect = TRUE;
 			mdl_disconnect_timeout = atoi(optarg);
 
 			break;
-- 
1.9.3

[PATCH 4/5] android/pts: Update MCAP test pics, pixits for PTS 6.0

[Grzegorz Kolodziejczyk]

This patch updates test pixits, pics, for MCAP profile against android
5.0
---
 android/pics-mcap.txt  | 2 +-
 android/pixit-mcap.txt | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/pics-mcap.txt b/android/pics-mcap.txt
index dd71ab4..70e0b66 100644
--- a/android/pics-mcap.txt
+++ b/android/pics-mcap.txt
@@ -1,6 +1,6 @@
 MCAP PICS for the PTS tool.
 
-PTS version: 5.3
+PTS version: 6.0
 
 * - different than PTS defaults
 # - not yet implemented/supported
diff --git a/android/pixit-mcap.txt b/android/pixit-mcap.txt
index d05a953..f3d33a1 100644
--- a/android/pixit-mcap.txt
+++ b/android/pixit-mcap.txt
@@ -1,6 +1,6 @@
 MCAP PIXIT for the PTS tool.
 
-PTS version: 5.3
+PTS version: 6.0
 
 * - different than PTS defaults
 & - should be set to IUT Bluetooth address
@@ -11,7 +11,7 @@ Parameter Name						Value
 -------------------------------------------------------------------------------
 TSPX_bd_addr_iut					112233445566 (*&)
 TSPX_delete_link_key					FALSE
-TSPX_MCAP_DC_max					1
+TSPX_MCAP_DC_max					1 (*)
 TSPX_MCAP_l2cap_psm_control				1003
 TSPX_MCAP_l2cap_psm_control_B
 TSPX_MCAP_l2cap_psm_data				1005
-- 
1.9.3

[PATCH 5/5] android/pts: Update MCAP test results for PTS 6.0

[Grzegorz Kolodziejczyk]

This patch updates test results and instructions for MCAP profile
against android 5.0
---
 android/pts-mcap.txt | 119 +++++++++++++++++----------------------------------
 1 file changed, 40 insertions(+), 79 deletions(-)

diff --git a/android/pts-mcap.txt b/android/pts-mcap.txt
index 2aa1848..2ad2858 100644
--- a/android/pts-mcap.txt
+++ b/android/pts-mcap.txt
@@ -1,7 +1,7 @@
 PTS test results for MCAP
 
-PTS version: 5.3
-Tested: 27-November-2014
+PTS version: 6.0
+Tested: 10-February-2015
 Android version: 5.0
 
 Results:
@@ -16,42 +16,28 @@ Note: Test were done with ssp enabled and in most of the cases requires pairing
 -------------------------------------------------------------------------------
 Test Name		Result	Notes
 -------------------------------------------------------------------------------
-TC_MCAP_CE_BV_01_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101 -dc <PTS addr>
-TC_MCAP_CE_BV_02_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101
-TC_MCAP_CE_BV_03_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101 -c <PTS addr>
-TC_MCAP_CE_BV_04_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101 -d
+TC_MCAP_CE_BV_01_C	PASS	mcaptest -C 4099 -D 4101 -f 2 -dc <PTS addr>
+TC_MCAP_CE_BV_02_C	PASS	mcaptest -C 4099 -D 4101 -f 2
+TC_MCAP_CE_BV_03_C	PASS	mcaptest -C 4099 -D 4101 -f 2 -c <PTS addr>
+TC_MCAP_CE_BV_04_C	PASS	mcaptest -C 4099 -D 4101 -f 2 -d
 TC_MCAP_CM_ABT_BV_01_C	N/A
-TC_MCAP_CM_ABT_BV_02_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101
+TC_MCAP_CM_ABT_BV_02_C	PASS	mcaptest -C 4099 -D 4101 -f 2
 TC_MCAP_CM_ABT_BV_03_C	N/A
 TC_MCAP_CM_DEL_BV_01_C	N/A
-TC_MCAP_CM_DEL_BV_02_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101
+TC_MCAP_CM_DEL_BV_02_C	PASS	mcaptest -C 4099 -D 4101 -f 2
 TC_MCAP_CM_DEL_BV_03_C	N/A
-TC_MCAP_CM_DEL_BV_04_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101
-TC_MCAP_CM_DIS_BV_01_C	PASS	mcaptest -C 4099 -D 4101 -e 2 -f 2
+TC_MCAP_CM_DEL_BV_04_C	PASS	mcaptest -C 4099 -D 4101 -f 2
+TC_MCAP_CM_DIS_BV_01_C	PASS	mcaptest -C 4099 -D 4101 -ab -e 2 -f 2
 TC_MCAP_CM_DIS_BV_02_C	PASS	mcaptest -C 4099 -D 4101
-TC_MCAP_CM_DIS_BV_03_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101
-TC_MCAP_CM_DIS_BV_04_C	PASS	mcaptest -C 4099 -D 4101 -e 2 -f 2
+TC_MCAP_CM_DIS_BV_03_C	PASS	mcaptest -C 4099 -D 4101 -n -f 2
+TC_MCAP_CM_DIS_BV_04_C	PASS	mcaptest -C 4099 -D 4101 -ab -e 2 -f 2
 TC_MCAP_CM_DIS_BV_05_C	PASS	mcaptest -C 4099 -D 4101
 TC_MCAP_CM_REC_BV_01_C	N/A
-TC_MCAP_CM_REC_BV_02_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101
+TC_MCAP_CM_REC_BV_02_C	PASS	mcaptest -C 4099 -D 4101 -n -f 2
 TC_MCAP_CM_REC_BV_03_C	N/A
-TC_MCAP_CM_REC_BV_04_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101
-				Note: It may be necessary to confirm pairing
-					twice (second time when IUT is back in
-					range).
+TC_MCAP_CM_REC_BV_04_C	PASS	mcaptest -C 4099 -D 4101 -n -f 2
 TC_MCAP_CM_REC_BV_05_C	N/A
-TC_MCAP_CM_REC_BV_06_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101
+TC_MCAP_CM_REC_BV_06_C	PASS	mcaptest -C 4099 -D 4101 -f 2
 TC_MCAP_CS_ERR_BI_01_C	N/A
 TC_MCAP_CS_ERR_BI_02_C	N/A
 TC_MCAP_CS_ERR_BI_03_C	N/A
@@ -64,56 +50,31 @@ TC_MCAP_CS_R_BV_01_I	N/A
 TC_MCAP_CS_R_BV_02_I	N/A
 TC_MCAP_CS_R_BV_03_C	N/A
 TC_MCAP_CS_T_BV_04_C	N/A
-TC_MCAP_ERR_BI_01_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101
-TC_MCAP_ERR_BI_02_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101 -d
-TC_MCAP_ERR_BI_03_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101
-TC_MCAP_ERR_BI_04_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101 -d
-TC_MCAP_ERR_BI_05_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101
-TC_MCAP_ERR_BI_06_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101 -d
-TC_MCAP_ERR_BI_07_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101
-TC_MCAP_ERR_BI_08_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101 -d
-TC_MCAP_ERR_BI_09_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101
-TC_MCAP_ERR_BI_10_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101
-TC_MCAP_ERR_BI_11_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101 -d
-TC_MCAP_ERR_BI_12_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101 -d
-TC_MCAP_ERR_BI_13_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101
-TC_MCAP_ERR_BI_14_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101
-TC_MCAP_ERR_BI_15_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101 -d
-TC_MCAP_ERR_BI_16_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101 -u
-TC_MCAP_ERR_BI_17_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101 -d
-TC_MCAP_ERR_BI_18_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101 -d
+TC_MCAP_ERR_BI_01_C	PASS	mcaptest -C 4099 -D 4101 -f 2
+TC_MCAP_ERR_BI_02_C	PASS	mcaptest -C 4099 -D 4101 -dn -f 2
+TC_MCAP_ERR_BI_03_C	PASS	mcaptest -C 4099 -D 4101 -f 2
+TC_MCAP_ERR_BI_04_C	PASS	mcaptest -C 4099 -D 4101 -dn -f 2
+TC_MCAP_ERR_BI_05_C	PASS	mcaptest -C 4099 -D 4101 -f 2
+TC_MCAP_ERR_BI_06_C	PASS	mcaptest -C 4099 -D 4101 -dn -f 2
+TC_MCAP_ERR_BI_07_C	PASS	mcaptest -C 4099 -D 4101 -f 2
+TC_MCAP_ERR_BI_08_C	PASS	mcaptest -C 4099 -D 4101 -dn -f 2
+TC_MCAP_ERR_BI_09_C	PASS	mcaptest -C 4099 -D 4101 -f 2
+TC_MCAP_ERR_BI_10_C	PASS	mcaptest -C 4099 -D 4101 -f 2
+TC_MCAP_ERR_BI_11_C	PASS	mcaptest -C 4099 -D 4101 -dn -f 2
+TC_MCAP_ERR_BI_12_C	PASS	mcaptest -C 4099 -D 4101 -dn -f 2
+TC_MCAP_ERR_BI_13_C	PASS	mcaptest -C 4099 -D 4101 -f 2
+TC_MCAP_ERR_BI_14_C	PASS	mcaptest -C 4099 -D 4101 -f 2
+TC_MCAP_ERR_BI_15_C	PASS	mcaptest -C 4099 -D 4101 -dn -f 2
+TC_MCAP_ERR_BI_16_C	PASS	mcaptest -C 4099 -D 4101 -u -f 2
+TC_MCAP_ERR_BI_17_C	PASS	mcaptest -C 4099 -D 4101 -dn -f 2
+TC_MCAP_ERR_BI_18_C	PASS	mcaptest -C 4099 -D 4101 -dn -f 2
 TC_MCAP_ERR_BI_19_C	N/A
-TC_MCAP_ERR_BI_20_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101 -g
+TC_MCAP_ERR_BI_20_C	PASS	mcaptest -C 4099 -D 4101 -g -f 2
 TC_MCAP_INV_BI_01_C	PASS	mcaptest -C 4099 -D 4101 -dc <PTS addr>
-TC_MCAP_INV_BI_02_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101 -d
-TC_MCAP_INV_BI_03_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101 -dc <PTS addr>
-TC_MCAP_INV_BI_04_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101 -c <PTS addr>
-TC_MCAP_INV_BI_05_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101
-TC_MCAP_INV_BI_06_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101
-TC_MCAP_INV_BI_07_C	INC	PTS issue #12693
-				mcaptest -C 4099 -D 4101
+TC_MCAP_INV_BI_02_C	PASS	mcaptest -C 4099 -D 4101 -dn -f 2
+TC_MCAP_INV_BI_03_C	PASS	mcaptest -C 4099 -D 4101 -d -f 2 -c <PTS addr>
+TC_MCAP_INV_BI_04_C	PASS	mcaptest -C 4099 -D 4101 -f 2 -c <PTS addr>
+TC_MCAP_INV_BI_05_C	PASS	mcaptest -C 4099 -D 4101 -f 2
+TC_MCAP_INV_BI_06_C	PASS	mcaptest -C 4099 -D 4101 -f 2
+TC_MCAP_INV_BI_07_C	PASS	mcaptest -C 4099 -D 4101 -f 2
 -------------------------------------------------------------------------------
-- 
1.9.3

Re: [PATCH 1/5] tools/mcaptest: Minor style fix

[Szymon Janc]

Hi Grzegorz,

On Tuesday 10 of February 2015 18:17:26 Grzegorz Kolodziejczyk wrote:
> This patch add white lines between neighbouring bodys.
> ---
>  tools/mcaptest.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/tools/mcaptest.c b/tools/mcaptest.c
> index 42734eb..980d21a 100644
> --- a/tools/mcaptest.c
> +++ b/tools/mcaptest.c
> @@ -286,6 +286,7 @@ static void create_mcl_cb(struct mcap_mcl *mcap_mcl,
> GError *err, gpointer data) mcl = mcap_mcl_ref(mcap_mcl);
>  	trigger_mdl_action(data_mode);
>  }
> +
>  static void usage(void)
>  {
>  	printf("mcaptest - MCAP testing ver %s\n", VERSION);
> @@ -320,6 +321,7 @@ static struct option main_options[] = {
>  	{ "data_ch",		1, 0, 'D' },
>  	{ 0, 0, 0, 0 }
>  };
> +
>  int main(int argc, char *argv[])
>  {
>  	GError *err = NULL;

All patches applied, thanks.

-- 
BR
Szymon Janc