linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH_v2 1/2] android/tester: Add AVRCP RegNotifPlayPositionChanged test case
@ 2014-12-02  9:53 Ravi kumar Veeramally
  2014-12-02  9:53 ` [PATCH_v2 2/2] android/tester: Add AVRCP RegNotifPlayStatusChanged " Ravi kumar Veeramally
  2014-12-03 12:00 ` [PATCH_v2 1/2] android/tester: Add AVRCP RegNotifPlayPositionChanged " Luiz Augusto von Dentz
  0 siblings, 2 replies; 3+ messages in thread
From: Ravi kumar Veeramally @ 2014-12-02  9:53 UTC (permalink / raw)
  To: linux-bluetooth; +Cc: Ravi kumar Veeramally

---
 android/tester-avrcp.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++-
 android/tester-main.h  |  5 ++++
 2 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/android/tester-avrcp.c b/android/tester-avrcp.c
index 7c02ec2..10cf1b6 100644
--- a/android/tester-avrcp.c
+++ b/android/tester-avrcp.c
@@ -90,6 +90,15 @@ static struct emu_l2cap_cid_data sdp_data = {
 			0x31, 0x00, 0x00, 0x09, 0x02, 0xFF, 0xFF, 0xFF, 0xFF, \
 							0xFF, 0xFF, 0xFF, 0xFF
 
+#define req_position_notif 0x00, 0x11, 0x0e, 0x03, 0x48, 0x00, 0x00, 0x19, \
+				0x58, 0x31, 0x00, 0x00, 0x05, 0x05, 0x00, \
+							0x00, 0x00, 0x00
+
+#define rsp_position_notif 0x00, 0x11, 0x0e, 0x0F, 0x48, 0x00, 0x00, 0x19, \
+				0x58, 0x31, 0x00, 0x00, 0x04, 0x05, 0xFF, \
+							0xFF, 0xFF, 0xFF
+
+
 #define req_ele_attr 0x00, 0x11, 0x0e, 0x01, 0x48, 0x00, 0x00, 0x19, 0x58, \
 			0x20, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, \
 			0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x07
@@ -157,11 +166,21 @@ static void avrcp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
 		break;
 	case AVRCP_REGISTER_NOTIFICATION:
 		event = ((uint8_t *) data)[13];
-		if (event == 0x02) {
+		switch (event) {
+		case 0x02:
 			step = g_new0(struct step, 1);
 			step->callback = CB_AVRCP_REG_NOTIF_RSP;
 			step->callback_result.rc_index = get_be64(data + 14);
 			schedule_callback_verification(step);
+			break;
+
+		case 0x05:
+			step = g_new0(struct step, 1);
+			step->callback = CB_AVRCP_REG_NOTIF_RSP;
+			step->callback_result.song_position =
+							get_be32(data + 14);
+			schedule_callback_verification(step);
+			break;
 		}
 		break;
 	case AVRCP_GET_ELEMENT_ATTRIBUTES:
@@ -314,6 +333,32 @@ static void avrcp_reg_notif_track_changed_rsp(void)
 	schedule_action_verification(step);
 }
 
+static void avrcp_reg_notif_play_position_changed_req(void)
+{
+	struct test_data *data = tester_get_data();
+	struct bthost *bthost = hciemu_client_get_host(data->hciemu);
+	const struct iovec pdu = raw_pdu(req_position_notif);
+	struct step *step = g_new0(struct step, 1);
+
+	bthost_send_cid_v(bthost, avrcp_data.handle, avrcp_data.cid, &pdu, 1);
+	step->action_status = BT_STATUS_SUCCESS;
+	schedule_action_verification(step);
+}
+
+static void avrcp_reg_notif_play_position_changed_rsp(void)
+{
+	struct test_data *data = tester_get_data();
+	struct step *step = g_new0(struct step, 1);
+	btrc_register_notification_t reg;
+
+	reg.song_pos = 0xffffffff;
+	step->action_status = data->if_avrcp->register_notification_rsp(
+						BTRC_EVT_PLAY_POS_CHANGED,
+					BTRC_NOTIFICATION_TYPE_INTERIM, &reg);
+
+	schedule_action_verification(step);
+}
+
 static void avrcp_get_element_attributes_req(void)
 {
 	struct test_data *data = tester_get_data();
@@ -424,6 +469,28 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(bluetooth_disable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
 	),
+	TEST_CASE_BREDRLE("AVRCP RegNotifPlayPositionChanged - Success",
+		ACTION_SUCCESS(bluetooth_enable_action, NULL),
+		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
+		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
+		ACTION_SUCCESS(set_default_ssp_request_handler, NULL),
+		ACTION_SUCCESS(emu_add_l2cap_server_action, &sdp_setup_data),
+		ACTION_SUCCESS(emu_add_l2cap_server_action, &a2dp_setup_data),
+		ACTION_SUCCESS(emu_add_l2cap_server_action, &avrcp_setup_data),
+		ACTION_SUCCESS(avrcp_connect_action, NULL),
+		CALLBACK_AV_CONN_STATE(CB_A2DP_CONN_STATE,
+					BTAV_CONNECTION_STATE_CONNECTING),
+		CALLBACK_AV_CONN_STATE(CB_A2DP_CONN_STATE,
+					BTAV_CONNECTION_STATE_CONNECTED),
+		ACTION_SUCCESS(avrcp_reg_notif_play_position_changed_req, NULL),
+		CALLBACK(CB_AVRCP_REG_NOTIF_REQ),
+		ACTION_SUCCESS(avrcp_reg_notif_play_position_changed_rsp, NULL),
+		CALLBACK_RC_REG_NOTIF_POSITION_CHANGED(CB_AVRCP_REG_NOTIF_RSP,
+								0xffffffff),
+		ACTION_SUCCESS(bluetooth_disable_action, NULL),
+		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
+	),
 	TEST_CASE_BREDRLE("AVRCP GetElementAttributes - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
diff --git a/android/tester-main.h b/android/tester-main.h
index ac310a3..1a779a2 100644
--- a/android/tester-main.h
+++ b/android/tester-main.h
@@ -409,6 +409,11 @@ struct pdu_set {
 		.callback_result.rc_index = cb_index, \
 	}
 
+#define CALLBACK_RC_REG_NOTIF_POSITION_CHANGED(cb, cb_position) { \
+		.callback = cb, \
+		.callback_result.song_position = cb_position, \
+	}
+
 #define CALLBACK_RC_GET_ELEMENT_ATTRIBUTES(cb, cb_num_of_attrs, cb_attrs) { \
 		.callback = cb, \
 		.callback_result.num_of_attrs = cb_num_of_attrs, \
-- 
2.1.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH_v2 2/2] android/tester: Add AVRCP RegNotifPlayStatusChanged test case
  2014-12-02  9:53 [PATCH_v2 1/2] android/tester: Add AVRCP RegNotifPlayPositionChanged test case Ravi kumar Veeramally
@ 2014-12-02  9:53 ` Ravi kumar Veeramally
  2014-12-03 12:00 ` [PATCH_v2 1/2] android/tester: Add AVRCP RegNotifPlayPositionChanged " Luiz Augusto von Dentz
  1 sibling, 0 replies; 3+ messages in thread
From: Ravi kumar Veeramally @ 2014-12-02  9:53 UTC (permalink / raw)
  To: linux-bluetooth; +Cc: Ravi kumar Veeramally

---
 android/tester-avrcp.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++
 android/tester-main.h  |  5 ++++
 2 files changed, 67 insertions(+)

diff --git a/android/tester-avrcp.c b/android/tester-avrcp.c
index 10cf1b6..41a5fd3 100644
--- a/android/tester-avrcp.c
+++ b/android/tester-avrcp.c
@@ -98,6 +98,12 @@ static struct emu_l2cap_cid_data sdp_data = {
 				0x58, 0x31, 0x00, 0x00, 0x04, 0x05, 0xFF, \
 							0xFF, 0xFF, 0xFF
 
+#define req_status_notif 0x00, 0x11, 0x0e, 0x03, 0x48, 0x00, 0x00, 0x19, \
+				0x58, 0x31, 0x00, 0x00, 0x05, 0x01, 0x00, \
+							0x00, 0x00, 0x00
+
+#define rsp_status_notif 0x00, 0x11, 0x0e, 0x0D, 0x48, 0x00, 0x00, 0x19, \
+				0x58, 0x31, 0x00, 0x00, 0x01, 0x01, 0x00
 
 #define req_ele_attr 0x00, 0x11, 0x0e, 0x01, 0x48, 0x00, 0x00, 0x19, 0x58, \
 			0x20, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, \
@@ -167,6 +173,14 @@ static void avrcp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
 	case AVRCP_REGISTER_NOTIFICATION:
 		event = ((uint8_t *) data)[13];
 		switch (event) {
+		case 0x01:
+			step = g_new0(struct step, 1);
+			step->callback = CB_AVRCP_REG_NOTIF_RSP;
+			step->callback_result.play_status =
+							((uint8_t *) data)[14];
+			schedule_callback_verification(step);
+			break;
+
 		case 0x02:
 			step = g_new0(struct step, 1);
 			step->callback = CB_AVRCP_REG_NOTIF_RSP;
@@ -359,6 +373,32 @@ static void avrcp_reg_notif_play_position_changed_rsp(void)
 	schedule_action_verification(step);
 }
 
+static void avrcp_reg_notif_play_status_changed_req(void)
+{
+	struct test_data *data = tester_get_data();
+	struct bthost *bthost = hciemu_client_get_host(data->hciemu);
+	const struct iovec pdu = raw_pdu(req_status_notif);
+	struct step *step = g_new0(struct step, 1);
+
+	bthost_send_cid_v(bthost, avrcp_data.handle, avrcp_data.cid, &pdu, 1);
+	step->action_status = BT_STATUS_SUCCESS;
+	schedule_action_verification(step);
+}
+
+static void avrcp_reg_notif_play_status_changed_rsp(void)
+{
+	struct test_data *data = tester_get_data();
+	struct step *step = g_new0(struct step, 1);
+	btrc_register_notification_t reg;
+
+	reg.play_status = BTRC_PLAYSTATE_STOPPED;
+	step->action_status = data->if_avrcp->register_notification_rsp(
+						BTRC_EVT_PLAY_STATUS_CHANGED,
+					BTRC_NOTIFICATION_TYPE_CHANGED, &reg);
+
+	schedule_action_verification(step);
+}
+
 static void avrcp_get_element_attributes_req(void)
 {
 	struct test_data *data = tester_get_data();
@@ -491,6 +531,28 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(bluetooth_disable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
 	),
+	TEST_CASE_BREDRLE("AVRCP RegNotifPlayStatusChanged - Success",
+		ACTION_SUCCESS(bluetooth_enable_action, NULL),
+		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
+		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
+		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
+		ACTION_SUCCESS(set_default_ssp_request_handler, NULL),
+		ACTION_SUCCESS(emu_add_l2cap_server_action, &sdp_setup_data),
+		ACTION_SUCCESS(emu_add_l2cap_server_action, &a2dp_setup_data),
+		ACTION_SUCCESS(emu_add_l2cap_server_action, &avrcp_setup_data),
+		ACTION_SUCCESS(avrcp_connect_action, NULL),
+		CALLBACK_AV_CONN_STATE(CB_A2DP_CONN_STATE,
+					BTAV_CONNECTION_STATE_CONNECTING),
+		CALLBACK_AV_CONN_STATE(CB_A2DP_CONN_STATE,
+					BTAV_CONNECTION_STATE_CONNECTED),
+		ACTION_SUCCESS(avrcp_reg_notif_play_status_changed_req, NULL),
+		CALLBACK(CB_AVRCP_REG_NOTIF_REQ),
+		ACTION_SUCCESS(avrcp_reg_notif_play_status_changed_rsp, NULL),
+		CALLBACK_RC_REG_NOTIF_STATUS_CHANGED(CB_AVRCP_REG_NOTIF_RSP,
+									0x00),
+		ACTION_SUCCESS(bluetooth_disable_action, NULL),
+		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
+	),
 	TEST_CASE_BREDRLE("AVRCP GetElementAttributes - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
diff --git a/android/tester-main.h b/android/tester-main.h
index 1a779a2..4407514 100644
--- a/android/tester-main.h
+++ b/android/tester-main.h
@@ -414,6 +414,11 @@ struct pdu_set {
 		.callback_result.song_position = cb_position, \
 	}
 
+#define CALLBACK_RC_REG_NOTIF_STATUS_CHANGED(cb, cb_status) { \
+		.callback = cb, \
+		.callback_result.play_status = cb_status, \
+	}
+
 #define CALLBACK_RC_GET_ELEMENT_ATTRIBUTES(cb, cb_num_of_attrs, cb_attrs) { \
 		.callback = cb, \
 		.callback_result.num_of_attrs = cb_num_of_attrs, \
-- 
2.1.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH_v2 1/2] android/tester: Add AVRCP RegNotifPlayPositionChanged test case
  2014-12-02  9:53 [PATCH_v2 1/2] android/tester: Add AVRCP RegNotifPlayPositionChanged test case Ravi kumar Veeramally
  2014-12-02  9:53 ` [PATCH_v2 2/2] android/tester: Add AVRCP RegNotifPlayStatusChanged " Ravi kumar Veeramally
@ 2014-12-03 12:00 ` Luiz Augusto von Dentz
  1 sibling, 0 replies; 3+ messages in thread
From: Luiz Augusto von Dentz @ 2014-12-03 12:00 UTC (permalink / raw)
  To: Ravi kumar Veeramally; +Cc: linux-bluetooth@vger.kernel.org

Hi Ravi,

On Tue, Dec 2, 2014 at 11:53 AM, Ravi kumar Veeramally
<ravikumar.veeramally@linux.intel.com> wrote:
> ---
>  android/tester-avrcp.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++-
>  android/tester-main.h  |  5 ++++
>  2 files changed, 73 insertions(+), 1 deletion(-)
>
> diff --git a/android/tester-avrcp.c b/android/tester-avrcp.c
> index 7c02ec2..10cf1b6 100644
> --- a/android/tester-avrcp.c
> +++ b/android/tester-avrcp.c
> @@ -90,6 +90,15 @@ static struct emu_l2cap_cid_data sdp_data = {
>                         0x31, 0x00, 0x00, 0x09, 0x02, 0xFF, 0xFF, 0xFF, 0xFF, \
>                                                         0xFF, 0xFF, 0xFF, 0xFF
>
> +#define req_position_notif 0x00, 0x11, 0x0e, 0x03, 0x48, 0x00, 0x00, 0x19, \
> +                               0x58, 0x31, 0x00, 0x00, 0x05, 0x05, 0x00, \
> +                                                       0x00, 0x00, 0x00
> +
> +#define rsp_position_notif 0x00, 0x11, 0x0e, 0x0F, 0x48, 0x00, 0x00, 0x19, \
> +                               0x58, 0x31, 0x00, 0x00, 0x04, 0x05, 0xFF, \
> +                                                       0xFF, 0xFF, 0xFF
> +
> +
>  #define req_ele_attr 0x00, 0x11, 0x0e, 0x01, 0x48, 0x00, 0x00, 0x19, 0x58, \
>                         0x20, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, \
>                         0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x07
> @@ -157,11 +166,21 @@ static void avrcp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
>                 break;
>         case AVRCP_REGISTER_NOTIFICATION:
>                 event = ((uint8_t *) data)[13];
> -               if (event == 0x02) {
> +               switch (event) {
> +               case 0x02:
>                         step = g_new0(struct step, 1);
>                         step->callback = CB_AVRCP_REG_NOTIF_RSP;
>                         step->callback_result.rc_index = get_be64(data + 14);
>                         schedule_callback_verification(step);
> +                       break;
> +
> +               case 0x05:
> +                       step = g_new0(struct step, 1);
> +                       step->callback = CB_AVRCP_REG_NOTIF_RSP;
> +                       step->callback_result.song_position =
> +                                                       get_be32(data + 14);
> +                       schedule_callback_verification(step);
> +                       break;
>                 }
>                 break;
>         case AVRCP_GET_ELEMENT_ATTRIBUTES:
> @@ -314,6 +333,32 @@ static void avrcp_reg_notif_track_changed_rsp(void)
>         schedule_action_verification(step);
>  }
>
> +static void avrcp_reg_notif_play_position_changed_req(void)
> +{
> +       struct test_data *data = tester_get_data();
> +       struct bthost *bthost = hciemu_client_get_host(data->hciemu);
> +       const struct iovec pdu = raw_pdu(req_position_notif);
> +       struct step *step = g_new0(struct step, 1);
> +
> +       bthost_send_cid_v(bthost, avrcp_data.handle, avrcp_data.cid, &pdu, 1);
> +       step->action_status = BT_STATUS_SUCCESS;
> +       schedule_action_verification(step);
> +}
> +
> +static void avrcp_reg_notif_play_position_changed_rsp(void)
> +{
> +       struct test_data *data = tester_get_data();
> +       struct step *step = g_new0(struct step, 1);
> +       btrc_register_notification_t reg;
> +
> +       reg.song_pos = 0xffffffff;
> +       step->action_status = data->if_avrcp->register_notification_rsp(
> +                                               BTRC_EVT_PLAY_POS_CHANGED,
> +                                       BTRC_NOTIFICATION_TYPE_INTERIM, &reg);
> +
> +       schedule_action_verification(step);
> +}
> +
>  static void avrcp_get_element_attributes_req(void)
>  {
>         struct test_data *data = tester_get_data();
> @@ -424,6 +469,28 @@ static struct test_case test_cases[] = {
>                 ACTION_SUCCESS(bluetooth_disable_action, NULL),
>                 CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
>         ),
> +       TEST_CASE_BREDRLE("AVRCP RegNotifPlayPositionChanged - Success",
> +               ACTION_SUCCESS(bluetooth_enable_action, NULL),
> +               CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
> +               ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
> +               ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
> +               ACTION_SUCCESS(set_default_ssp_request_handler, NULL),
> +               ACTION_SUCCESS(emu_add_l2cap_server_action, &sdp_setup_data),
> +               ACTION_SUCCESS(emu_add_l2cap_server_action, &a2dp_setup_data),
> +               ACTION_SUCCESS(emu_add_l2cap_server_action, &avrcp_setup_data),
> +               ACTION_SUCCESS(avrcp_connect_action, NULL),
> +               CALLBACK_AV_CONN_STATE(CB_A2DP_CONN_STATE,
> +                                       BTAV_CONNECTION_STATE_CONNECTING),
> +               CALLBACK_AV_CONN_STATE(CB_A2DP_CONN_STATE,
> +                                       BTAV_CONNECTION_STATE_CONNECTED),
> +               ACTION_SUCCESS(avrcp_reg_notif_play_position_changed_req, NULL),
> +               CALLBACK(CB_AVRCP_REG_NOTIF_REQ),
> +               ACTION_SUCCESS(avrcp_reg_notif_play_position_changed_rsp, NULL),
> +               CALLBACK_RC_REG_NOTIF_POSITION_CHANGED(CB_AVRCP_REG_NOTIF_RSP,
> +                                                               0xffffffff),
> +               ACTION_SUCCESS(bluetooth_disable_action, NULL),
> +               CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
> +       ),
>         TEST_CASE_BREDRLE("AVRCP GetElementAttributes - Success",
>                 ACTION_SUCCESS(bluetooth_enable_action, NULL),
>                 CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
> diff --git a/android/tester-main.h b/android/tester-main.h
> index ac310a3..1a779a2 100644
> --- a/android/tester-main.h
> +++ b/android/tester-main.h
> @@ -409,6 +409,11 @@ struct pdu_set {
>                 .callback_result.rc_index = cb_index, \
>         }
>
> +#define CALLBACK_RC_REG_NOTIF_POSITION_CHANGED(cb, cb_position) { \
> +               .callback = cb, \
> +               .callback_result.song_position = cb_position, \
> +       }
> +
>  #define CALLBACK_RC_GET_ELEMENT_ATTRIBUTES(cb, cb_num_of_attrs, cb_attrs) { \
>                 .callback = cb, \
>                 .callback_result.num_of_attrs = cb_num_of_attrs, \
> --
> 2.1.0

Applied, thanks.


-- 
Luiz Augusto von Dentz

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-12-03 12:00 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-02  9:53 [PATCH_v2 1/2] android/tester: Add AVRCP RegNotifPlayPositionChanged test case Ravi kumar Veeramally
2014-12-02  9:53 ` [PATCH_v2 2/2] android/tester: Add AVRCP RegNotifPlayStatusChanged " Ravi kumar Veeramally
2014-12-03 12:00 ` [PATCH_v2 1/2] android/tester: Add AVRCP RegNotifPlayPositionChanged " Luiz Augusto von Dentz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).