* [PATCHv2 01/16] android/tester: Expose gatt-tester's pdu definition to other testers
2014-09-26 6:31 [PATCHv2 00/16] android/tester: Unifying the way PDU is handled Jakub Tyszkowski
@ 2014-09-26 6:31 ` Jakub Tyszkowski
2014-09-30 10:08 ` Luiz Augusto von Dentz
2014-09-26 6:31 ` [PATCHv2 02/16] android/tester: Make AVRCP tests use generic pdu struct Jakub Tyszkowski
` (15 subsequent siblings)
16 siblings, 1 reply; 28+ messages in thread
From: Jakub Tyszkowski @ 2014-09-26 6:31 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Jakub Tyszkowski
This is not to reinvent this mechanism again for every tester that needs
to send raw pdu data.
'end_pdu' was renamed to 'null_pdu' to better fit also as request pdu in
'pdu_set' structure while setting the response not null.
This mechanism can be used later to send response regardles of data that
came with request on this specific CID. This will siplify responding to
sdp request without defining request pdus.
---
android/tester-a2dp.c | 2 +-
android/tester-avrcp.c | 2 +-
android/tester-gatt.c | 49 +++++++++++++++++--------------------------------
android/tester-main.h | 15 +++++++++++++++
4 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/android/tester-a2dp.c b/android/tester-a2dp.c
index 1b2a8ce..ab3936e 100644
--- a/android/tester-a2dp.c
+++ b/android/tester-a2dp.c
@@ -50,7 +50,7 @@ static const uint8_t rsp_start[] = { 0x42, 0x07 };
static const uint8_t req_suspend[] = { 0x50, 0x09, 0x04 };
static const uint8_t rsp_suspend[] = { 0x52, 0x09 };
-const struct pdu {
+const struct pdu_set {
const uint8_t *req;
size_t req_len;
const uint8_t *rsp;
diff --git a/android/tester-avrcp.c b/android/tester-avrcp.c
index 07b95f5..b539e0e 100644
--- a/android/tester-avrcp.c
+++ b/android/tester-avrcp.c
@@ -71,7 +71,7 @@ static const uint8_t rsp_start[] = { 0x42, 0x07 };
static const uint8_t req_suspend[] = { 0x50, 0x09, 0x04 };
static const uint8_t rsp_suspend[] = { 0x52, 0x09 };
-static const struct pdu {
+static const struct pdu_set {
const uint8_t *req;
size_t req_len;
const uint8_t *rsp;
diff --git a/android/tester-gatt.c b/android/tester-gatt.c
index 5d18bf0..ccc8e24 100644
--- a/android/tester-gatt.c
+++ b/android/tester-gatt.c
@@ -34,23 +34,8 @@
#define CONN1_ID 1
#define CONN2_ID 2
-#define data(args...) ((const unsigned char[]) { args })
-
-#define raw_pdu(args...) \
- { \
- .data = data(args), \
- .size = sizeof(data(args)), \
- }
-
-#define end_pdu { .data = NULL }
-
static struct queue *list; /* List of gatt test cases */
-struct pdu {
- const uint8_t *data;
- uint16_t size;
-};
-
static bt_uuid_t client_app_uuid = {
.uu = { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 },
@@ -397,7 +382,7 @@ static struct pdu search_service[] = {
raw_pdu(0x11, 0x06, 0x01, 0x00, 0x10, 0x00, 0x00, 0x18),
raw_pdu(0x10, 0x11, 0x00, 0xff, 0xff, 0x00, 0x28),
raw_pdu(0x01, 0x10, 0x11, 0x00, 0x0a),
- end_pdu
+ null_pdu
};
static struct pdu search_service_2[] = {
@@ -407,13 +392,13 @@ static struct pdu search_service_2[] = {
raw_pdu(0x11, 0x06, 0x11, 0x00, 0x20, 0x00, 0x01, 0x18),
raw_pdu(0x10, 0x21, 0x00, 0xff, 0xff, 0x00, 0x28),
raw_pdu(0x01, 0x10, 0x21, 0x00, 0x0a),
- end_pdu
+ null_pdu
};
static struct pdu search_service_3[] = {
raw_pdu(0x10, 0x01, 0x00, 0xff, 0xff, 0x00, 0x28),
raw_pdu(0x01, 0x08, 0x01, 0x00, 0x0a),
- end_pdu
+ null_pdu
};
static struct pdu get_characteristic_1[] = {
@@ -425,7 +410,7 @@ static struct pdu get_characteristic_1[] = {
raw_pdu(0x09, 0x07, 0x02, 0x00, 0x04, 0x00, 0x00, 0x19, 0x00),
raw_pdu(0x08, 0x03, 0x00, 0x10, 0x00, 0x03, 0x28),
raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
- end_pdu
+ null_pdu
};
static struct pdu get_descriptor_1[] = {
@@ -441,7 +426,7 @@ static struct pdu get_descriptor_1[] = {
raw_pdu(0x05, 0x01, 0x04, 0x00, 0x00, 0x29),
raw_pdu(0x04, 0x05, 0x00, 0x10, 0x00),
raw_pdu(0x01, 0x04, 0x05, 0x00, 0x0a),
- end_pdu
+ null_pdu
};
static struct pdu get_descriptor_2[] = {
@@ -457,7 +442,7 @@ static struct pdu get_descriptor_2[] = {
raw_pdu(0x05, 0x01, 0x04, 0x00, 0x00, 0x29, 0x05, 0x00, 0x01, 0x29),
raw_pdu(0x04, 0x06, 0x00, 0x10, 0x00),
raw_pdu(0x01, 0x04, 0x06, 0x00, 0x0a),
- end_pdu
+ null_pdu
};
static struct pdu get_descriptor_3[] = {
@@ -471,7 +456,7 @@ static struct pdu get_descriptor_3[] = {
raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
raw_pdu(0x04, 0x01, 0x00, 0x10, 0x00),
raw_pdu(0x01, 0x04, 0x01, 0x00, 0x0a),
- end_pdu
+ null_pdu
};
static struct pdu get_included_1[] = {
@@ -483,7 +468,7 @@ static struct pdu get_included_1[] = {
raw_pdu(0x09, 0x08, 0x02, 0x00, 0x15, 0x00, 0x19, 0x00, 0xff, 0xfe),
raw_pdu(0x08, 0x03, 0x00, 0x10, 0x00, 0x02, 0x28),
raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
- end_pdu
+ null_pdu
};
static struct pdu get_included_2[] = {
@@ -498,7 +483,7 @@ static struct pdu get_included_2[] = {
0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10),
raw_pdu(0x08, 0x03, 0x00, 0x10, 0x00, 0x02, 0x28),
raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
- end_pdu
+ null_pdu
};
static struct pdu get_included_3[] = {
@@ -508,7 +493,7 @@ static struct pdu get_included_3[] = {
raw_pdu(0x01, 0x11, 0x11, 0x00, 0x0a),
raw_pdu(0x08, 0x01, 0x00, 0x10, 0x00, 0x02, 0x28),
raw_pdu(0x01, 0x08, 0x01, 0x00, 0x0a),
- end_pdu
+ null_pdu
};
static struct pdu read_characteristic_1[] = {
@@ -522,7 +507,7 @@ static struct pdu read_characteristic_1[] = {
raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
raw_pdu(0x0a, 0x03, 0x00),
raw_pdu(0x0b, 0x01),
- end_pdu
+ null_pdu
};
static struct pdu read_characteristic_2[] = {
@@ -536,7 +521,7 @@ static struct pdu read_characteristic_2[] = {
raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
raw_pdu(0x0a, 0x03, 0x00),
raw_pdu(0x01, 0x0a, 0x03, 0x00, 0x08),
- end_pdu
+ null_pdu
};
static struct pdu read_descriptor_1[] = {
@@ -554,7 +539,7 @@ static struct pdu read_descriptor_1[] = {
raw_pdu(0x01, 0x04, 0x05, 0x00, 0x0a),
raw_pdu(0x0a, 0x04, 0x00),
raw_pdu(0x0b, 0x01),
- end_pdu
+ null_pdu
};
static struct pdu read_descriptor_2[] = {
@@ -572,7 +557,7 @@ static struct pdu read_descriptor_2[] = {
raw_pdu(0x01, 0x04, 0x05, 0x00, 0x0a),
raw_pdu(0x0a, 0x04, 0x00),
raw_pdu(0x01, 0x0a, 0x04, 0x00, 0x08),
- end_pdu
+ null_pdu
};
static struct pdu write_characteristic_1[] = {
@@ -585,7 +570,7 @@ static struct pdu write_characteristic_1[] = {
raw_pdu(0x08, 0x03, 0x00, 0x10, 0x00, 0x03, 0x28),
raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
raw_pdu(0x52, 0x03, 0x00, 0x00, 0x01, 0x02, 0x03),
- end_pdu
+ null_pdu
};
static struct pdu write_characteristic_2[] = {
@@ -599,7 +584,7 @@ static struct pdu write_characteristic_2[] = {
raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
raw_pdu(0x12, 0x03, 0x00, 0x00, 0x01, 0x02, 0x03),
raw_pdu(0x13),
- end_pdu
+ null_pdu
};
static struct pdu write_characteristic_3[] = {
@@ -613,7 +598,7 @@ static struct pdu write_characteristic_3[] = {
raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
raw_pdu(0x12, 0x03, 0x00, 0x00, 0x01, 0x02, 0x03),
raw_pdu(0x01, 0x12, 0x03, 0x00, 0x08),
- end_pdu
+ null_pdu
};
static void gatt_client_register_action(void)
diff --git a/android/tester-main.h b/android/tester-main.h
index 6afc553..4cbc83f 100644
--- a/android/tester-main.h
+++ b/android/tester-main.h
@@ -55,6 +55,21 @@
#include <hardware/bt_gatt_client.h>
#include <hardware/bt_gatt_server.h>
+struct pdu {
+ uint8_t *data;
+ uint16_t size;
+};
+
+#define raw_data(args...) ((unsigned char[]) { args })
+
+#define raw_pdu(args...) \
+ { \
+ .data = raw_data(args), \
+ .size = sizeof(raw_data(args)), \
+ }
+
+#define null_pdu { .data = NULL }
+
#define TEST_CASE_BREDR(text, ...) { \
HCIEMU_TYPE_BREDR, \
text, \
--
1.9.1
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCHv2 01/16] android/tester: Expose gatt-tester's pdu definition to other testers
2014-09-26 6:31 ` [PATCHv2 01/16] android/tester: Expose gatt-tester's pdu definition to other testers Jakub Tyszkowski
@ 2014-09-30 10:08 ` Luiz Augusto von Dentz
2014-09-30 11:41 ` Tyszkowski Jakub
0 siblings, 1 reply; 28+ messages in thread
From: Luiz Augusto von Dentz @ 2014-09-30 10:08 UTC (permalink / raw)
To: Jakub Tyszkowski; +Cc: linux-bluetooth@vger.kernel.org
Hi Jakub,
On Fri, Sep 26, 2014 at 9:31 AM, Jakub Tyszkowski
<jakub.tyszkowski@tieto.com> wrote:
> This is not to reinvent this mechanism again for every tester that needs
> to send raw pdu data.
>
> 'end_pdu' was renamed to 'null_pdu' to better fit also as request pdu in
> 'pdu_set' structure while setting the response not null.
>
> This mechanism can be used later to send response regardles of data that
> came with request on this specific CID. This will siplify responding to
> sdp request without defining request pdus.
> ---
> android/tester-a2dp.c | 2 +-
> android/tester-avrcp.c | 2 +-
> android/tester-gatt.c | 49 +++++++++++++++++--------------------------------
> android/tester-main.h | 15 +++++++++++++++
> 4 files changed, 34 insertions(+), 34 deletions(-)
>
> diff --git a/android/tester-a2dp.c b/android/tester-a2dp.c
> index 1b2a8ce..ab3936e 100644
> --- a/android/tester-a2dp.c
> +++ b/android/tester-a2dp.c
> @@ -50,7 +50,7 @@ static const uint8_t rsp_start[] = { 0x42, 0x07 };
> static const uint8_t req_suspend[] = { 0x50, 0x09, 0x04 };
> static const uint8_t rsp_suspend[] = { 0x52, 0x09 };
>
> -const struct pdu {
> +const struct pdu_set {
> const uint8_t *req;
> size_t req_len;
> const uint8_t *rsp;
> diff --git a/android/tester-avrcp.c b/android/tester-avrcp.c
> index 07b95f5..b539e0e 100644
> --- a/android/tester-avrcp.c
> +++ b/android/tester-avrcp.c
> @@ -71,7 +71,7 @@ static const uint8_t rsp_start[] = { 0x42, 0x07 };
> static const uint8_t req_suspend[] = { 0x50, 0x09, 0x04 };
> static const uint8_t rsp_suspend[] = { 0x52, 0x09 };
>
> -static const struct pdu {
> +static const struct pdu_set {
> const uint8_t *req;
> size_t req_len;
> const uint8_t *rsp;
> diff --git a/android/tester-gatt.c b/android/tester-gatt.c
> index 5d18bf0..ccc8e24 100644
> --- a/android/tester-gatt.c
> +++ b/android/tester-gatt.c
> @@ -34,23 +34,8 @@
> #define CONN1_ID 1
> #define CONN2_ID 2
>
> -#define data(args...) ((const unsigned char[]) { args })
> -
> -#define raw_pdu(args...) \
> - { \
> - .data = data(args), \
> - .size = sizeof(data(args)), \
> - }
> -
> -#define end_pdu { .data = NULL }
> -
> static struct queue *list; /* List of gatt test cases */
>
> -struct pdu {
> - const uint8_t *data;
> - uint16_t size;
> -};
> -
> static bt_uuid_t client_app_uuid = {
> .uu = { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
> 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 },
> @@ -397,7 +382,7 @@ static struct pdu search_service[] = {
> raw_pdu(0x11, 0x06, 0x01, 0x00, 0x10, 0x00, 0x00, 0x18),
> raw_pdu(0x10, 0x11, 0x00, 0xff, 0xff, 0x00, 0x28),
> raw_pdu(0x01, 0x10, 0x11, 0x00, 0x0a),
> - end_pdu
> + null_pdu
> };
>
> static struct pdu search_service_2[] = {
> @@ -407,13 +392,13 @@ static struct pdu search_service_2[] = {
> raw_pdu(0x11, 0x06, 0x11, 0x00, 0x20, 0x00, 0x01, 0x18),
> raw_pdu(0x10, 0x21, 0x00, 0xff, 0xff, 0x00, 0x28),
> raw_pdu(0x01, 0x10, 0x21, 0x00, 0x0a),
> - end_pdu
> + null_pdu
> };
>
> static struct pdu search_service_3[] = {
> raw_pdu(0x10, 0x01, 0x00, 0xff, 0xff, 0x00, 0x28),
> raw_pdu(0x01, 0x08, 0x01, 0x00, 0x0a),
> - end_pdu
> + null_pdu
> };
>
> static struct pdu get_characteristic_1[] = {
> @@ -425,7 +410,7 @@ static struct pdu get_characteristic_1[] = {
> raw_pdu(0x09, 0x07, 0x02, 0x00, 0x04, 0x00, 0x00, 0x19, 0x00),
> raw_pdu(0x08, 0x03, 0x00, 0x10, 0x00, 0x03, 0x28),
> raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
> - end_pdu
> + null_pdu
> };
>
> static struct pdu get_descriptor_1[] = {
> @@ -441,7 +426,7 @@ static struct pdu get_descriptor_1[] = {
> raw_pdu(0x05, 0x01, 0x04, 0x00, 0x00, 0x29),
> raw_pdu(0x04, 0x05, 0x00, 0x10, 0x00),
> raw_pdu(0x01, 0x04, 0x05, 0x00, 0x0a),
> - end_pdu
> + null_pdu
> };
>
> static struct pdu get_descriptor_2[] = {
> @@ -457,7 +442,7 @@ static struct pdu get_descriptor_2[] = {
> raw_pdu(0x05, 0x01, 0x04, 0x00, 0x00, 0x29, 0x05, 0x00, 0x01, 0x29),
> raw_pdu(0x04, 0x06, 0x00, 0x10, 0x00),
> raw_pdu(0x01, 0x04, 0x06, 0x00, 0x0a),
> - end_pdu
> + null_pdu
> };
>
> static struct pdu get_descriptor_3[] = {
> @@ -471,7 +456,7 @@ static struct pdu get_descriptor_3[] = {
> raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
> raw_pdu(0x04, 0x01, 0x00, 0x10, 0x00),
> raw_pdu(0x01, 0x04, 0x01, 0x00, 0x0a),
> - end_pdu
> + null_pdu
> };
>
> static struct pdu get_included_1[] = {
> @@ -483,7 +468,7 @@ static struct pdu get_included_1[] = {
> raw_pdu(0x09, 0x08, 0x02, 0x00, 0x15, 0x00, 0x19, 0x00, 0xff, 0xfe),
> raw_pdu(0x08, 0x03, 0x00, 0x10, 0x00, 0x02, 0x28),
> raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
> - end_pdu
> + null_pdu
> };
>
> static struct pdu get_included_2[] = {
> @@ -498,7 +483,7 @@ static struct pdu get_included_2[] = {
> 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10),
> raw_pdu(0x08, 0x03, 0x00, 0x10, 0x00, 0x02, 0x28),
> raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
> - end_pdu
> + null_pdu
> };
>
> static struct pdu get_included_3[] = {
> @@ -508,7 +493,7 @@ static struct pdu get_included_3[] = {
> raw_pdu(0x01, 0x11, 0x11, 0x00, 0x0a),
> raw_pdu(0x08, 0x01, 0x00, 0x10, 0x00, 0x02, 0x28),
> raw_pdu(0x01, 0x08, 0x01, 0x00, 0x0a),
> - end_pdu
> + null_pdu
> };
>
> static struct pdu read_characteristic_1[] = {
> @@ -522,7 +507,7 @@ static struct pdu read_characteristic_1[] = {
> raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
> raw_pdu(0x0a, 0x03, 0x00),
> raw_pdu(0x0b, 0x01),
> - end_pdu
> + null_pdu
> };
>
> static struct pdu read_characteristic_2[] = {
> @@ -536,7 +521,7 @@ static struct pdu read_characteristic_2[] = {
> raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
> raw_pdu(0x0a, 0x03, 0x00),
> raw_pdu(0x01, 0x0a, 0x03, 0x00, 0x08),
> - end_pdu
> + null_pdu
> };
>
> static struct pdu read_descriptor_1[] = {
> @@ -554,7 +539,7 @@ static struct pdu read_descriptor_1[] = {
> raw_pdu(0x01, 0x04, 0x05, 0x00, 0x0a),
> raw_pdu(0x0a, 0x04, 0x00),
> raw_pdu(0x0b, 0x01),
> - end_pdu
> + null_pdu
> };
>
> static struct pdu read_descriptor_2[] = {
> @@ -572,7 +557,7 @@ static struct pdu read_descriptor_2[] = {
> raw_pdu(0x01, 0x04, 0x05, 0x00, 0x0a),
> raw_pdu(0x0a, 0x04, 0x00),
> raw_pdu(0x01, 0x0a, 0x04, 0x00, 0x08),
> - end_pdu
> + null_pdu
> };
>
> static struct pdu write_characteristic_1[] = {
> @@ -585,7 +570,7 @@ static struct pdu write_characteristic_1[] = {
> raw_pdu(0x08, 0x03, 0x00, 0x10, 0x00, 0x03, 0x28),
> raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
> raw_pdu(0x52, 0x03, 0x00, 0x00, 0x01, 0x02, 0x03),
> - end_pdu
> + null_pdu
> };
>
> static struct pdu write_characteristic_2[] = {
> @@ -599,7 +584,7 @@ static struct pdu write_characteristic_2[] = {
> raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
> raw_pdu(0x12, 0x03, 0x00, 0x00, 0x01, 0x02, 0x03),
> raw_pdu(0x13),
> - end_pdu
> + null_pdu
> };
>
> static struct pdu write_characteristic_3[] = {
> @@ -613,7 +598,7 @@ static struct pdu write_characteristic_3[] = {
> raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
> raw_pdu(0x12, 0x03, 0x00, 0x00, 0x01, 0x02, 0x03),
> raw_pdu(0x01, 0x12, 0x03, 0x00, 0x08),
> - end_pdu
> + null_pdu
> };
>
> static void gatt_client_register_action(void)
> diff --git a/android/tester-main.h b/android/tester-main.h
> index 6afc553..4cbc83f 100644
> --- a/android/tester-main.h
> +++ b/android/tester-main.h
> @@ -55,6 +55,21 @@
> #include <hardware/bt_gatt_client.h>
> #include <hardware/bt_gatt_server.h>
>
> +struct pdu {
> + uint8_t *data;
> + uint16_t size;
The size should probably be size_t, or even better use struct iovec
directly here since it is about the same.
> +};
> +
> +#define raw_data(args...) ((unsigned char[]) { args })
> +
> +#define raw_pdu(args...) \
> + { \
> + .data = raw_data(args), \
> + .size = sizeof(raw_data(args)), \
> + }
> +
> +#define null_pdu { .data = NULL }
> +
> #define TEST_CASE_BREDR(text, ...) { \
> HCIEMU_TYPE_BREDR, \
> text, \
> --
> 1.9.1
--
Luiz Augusto von Dentz
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCHv2 01/16] android/tester: Expose gatt-tester's pdu definition to other testers
2014-09-30 10:08 ` Luiz Augusto von Dentz
@ 2014-09-30 11:41 ` Tyszkowski Jakub
2014-09-30 12:10 ` Luiz Augusto von Dentz
0 siblings, 1 reply; 28+ messages in thread
From: Tyszkowski Jakub @ 2014-09-30 11:41 UTC (permalink / raw)
To: Luiz Augusto von Dentz; +Cc: linux-bluetooth@vger.kernel.org
Hi Luiz,
On 09/30/2014 12:08 PM, Luiz Augusto von Dentz wrote:
> Hi Jakub,
>
> On Fri, Sep 26, 2014 at 9:31 AM, Jakub Tyszkowski
> <jakub.tyszkowski@tieto.com> wrote:
>> This is not to reinvent this mechanism again for every tester that needs
>> to send raw pdu data.
>>
>> 'end_pdu' was renamed to 'null_pdu' to better fit also as request pdu in
>> 'pdu_set' structure while setting the response not null.
>>
>> This mechanism can be used later to send response regardles of data that
>> came with request on this specific CID. This will siplify responding to
>> sdp request without defining request pdus.
>> ---
>> android/tester-a2dp.c | 2 +-
>> android/tester-avrcp.c | 2 +-
>> android/tester-gatt.c | 49 +++++++++++++++++--------------------------------
>> android/tester-main.h | 15 +++++++++++++++
>> 4 files changed, 34 insertions(+), 34 deletions(-)
>>
>> diff --git a/android/tester-a2dp.c b/android/tester-a2dp.c
>> index 1b2a8ce..ab3936e 100644
>> --- a/android/tester-a2dp.c
>> +++ b/android/tester-a2dp.c
>> @@ -50,7 +50,7 @@ static const uint8_t rsp_start[] = { 0x42, 0x07 };
>> static const uint8_t req_suspend[] = { 0x50, 0x09, 0x04 };
>> static const uint8_t rsp_suspend[] = { 0x52, 0x09 };
>>
>> -const struct pdu {
>> +const struct pdu_set {
>> const uint8_t *req;
>> size_t req_len;
>> const uint8_t *rsp;
>> diff --git a/android/tester-avrcp.c b/android/tester-avrcp.c
>> index 07b95f5..b539e0e 100644
>> --- a/android/tester-avrcp.c
>> +++ b/android/tester-avrcp.c
>> @@ -71,7 +71,7 @@ static const uint8_t rsp_start[] = { 0x42, 0x07 };
>> static const uint8_t req_suspend[] = { 0x50, 0x09, 0x04 };
>> static const uint8_t rsp_suspend[] = { 0x52, 0x09 };
>>
>> -static const struct pdu {
>> +static const struct pdu_set {
>> const uint8_t *req;
>> size_t req_len;
>> const uint8_t *rsp;
>> diff --git a/android/tester-gatt.c b/android/tester-gatt.c
>> index 5d18bf0..ccc8e24 100644
>> --- a/android/tester-gatt.c
>> +++ b/android/tester-gatt.c
>> @@ -34,23 +34,8 @@
>> #define CONN1_ID 1
>> #define CONN2_ID 2
>>
>> -#define data(args...) ((const unsigned char[]) { args })
>> -
>> -#define raw_pdu(args...) \
>> - { \
>> - .data = data(args), \
>> - .size = sizeof(data(args)), \
>> - }
>> -
>> -#define end_pdu { .data = NULL }
>> -
>> static struct queue *list; /* List of gatt test cases */
>>
>> -struct pdu {
>> - const uint8_t *data;
>> - uint16_t size;
>> -};
>> -
>> static bt_uuid_t client_app_uuid = {
>> .uu = { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
>> 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 },
>> @@ -397,7 +382,7 @@ static struct pdu search_service[] = {
>> raw_pdu(0x11, 0x06, 0x01, 0x00, 0x10, 0x00, 0x00, 0x18),
>> raw_pdu(0x10, 0x11, 0x00, 0xff, 0xff, 0x00, 0x28),
>> raw_pdu(0x01, 0x10, 0x11, 0x00, 0x0a),
>> - end_pdu
>> + null_pdu
>> };
>>
>> static struct pdu search_service_2[] = {
>> @@ -407,13 +392,13 @@ static struct pdu search_service_2[] = {
>> raw_pdu(0x11, 0x06, 0x11, 0x00, 0x20, 0x00, 0x01, 0x18),
>> raw_pdu(0x10, 0x21, 0x00, 0xff, 0xff, 0x00, 0x28),
>> raw_pdu(0x01, 0x10, 0x21, 0x00, 0x0a),
>> - end_pdu
>> + null_pdu
>> };
>>
>> static struct pdu search_service_3[] = {
>> raw_pdu(0x10, 0x01, 0x00, 0xff, 0xff, 0x00, 0x28),
>> raw_pdu(0x01, 0x08, 0x01, 0x00, 0x0a),
>> - end_pdu
>> + null_pdu
>> };
>>
>> static struct pdu get_characteristic_1[] = {
>> @@ -425,7 +410,7 @@ static struct pdu get_characteristic_1[] = {
>> raw_pdu(0x09, 0x07, 0x02, 0x00, 0x04, 0x00, 0x00, 0x19, 0x00),
>> raw_pdu(0x08, 0x03, 0x00, 0x10, 0x00, 0x03, 0x28),
>> raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
>> - end_pdu
>> + null_pdu
>> };
>>
>> static struct pdu get_descriptor_1[] = {
>> @@ -441,7 +426,7 @@ static struct pdu get_descriptor_1[] = {
>> raw_pdu(0x05, 0x01, 0x04, 0x00, 0x00, 0x29),
>> raw_pdu(0x04, 0x05, 0x00, 0x10, 0x00),
>> raw_pdu(0x01, 0x04, 0x05, 0x00, 0x0a),
>> - end_pdu
>> + null_pdu
>> };
>>
>> static struct pdu get_descriptor_2[] = {
>> @@ -457,7 +442,7 @@ static struct pdu get_descriptor_2[] = {
>> raw_pdu(0x05, 0x01, 0x04, 0x00, 0x00, 0x29, 0x05, 0x00, 0x01, 0x29),
>> raw_pdu(0x04, 0x06, 0x00, 0x10, 0x00),
>> raw_pdu(0x01, 0x04, 0x06, 0x00, 0x0a),
>> - end_pdu
>> + null_pdu
>> };
>>
>> static struct pdu get_descriptor_3[] = {
>> @@ -471,7 +456,7 @@ static struct pdu get_descriptor_3[] = {
>> raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
>> raw_pdu(0x04, 0x01, 0x00, 0x10, 0x00),
>> raw_pdu(0x01, 0x04, 0x01, 0x00, 0x0a),
>> - end_pdu
>> + null_pdu
>> };
>>
>> static struct pdu get_included_1[] = {
>> @@ -483,7 +468,7 @@ static struct pdu get_included_1[] = {
>> raw_pdu(0x09, 0x08, 0x02, 0x00, 0x15, 0x00, 0x19, 0x00, 0xff, 0xfe),
>> raw_pdu(0x08, 0x03, 0x00, 0x10, 0x00, 0x02, 0x28),
>> raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
>> - end_pdu
>> + null_pdu
>> };
>>
>> static struct pdu get_included_2[] = {
>> @@ -498,7 +483,7 @@ static struct pdu get_included_2[] = {
>> 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10),
>> raw_pdu(0x08, 0x03, 0x00, 0x10, 0x00, 0x02, 0x28),
>> raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
>> - end_pdu
>> + null_pdu
>> };
>>
>> static struct pdu get_included_3[] = {
>> @@ -508,7 +493,7 @@ static struct pdu get_included_3[] = {
>> raw_pdu(0x01, 0x11, 0x11, 0x00, 0x0a),
>> raw_pdu(0x08, 0x01, 0x00, 0x10, 0x00, 0x02, 0x28),
>> raw_pdu(0x01, 0x08, 0x01, 0x00, 0x0a),
>> - end_pdu
>> + null_pdu
>> };
>>
>> static struct pdu read_characteristic_1[] = {
>> @@ -522,7 +507,7 @@ static struct pdu read_characteristic_1[] = {
>> raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
>> raw_pdu(0x0a, 0x03, 0x00),
>> raw_pdu(0x0b, 0x01),
>> - end_pdu
>> + null_pdu
>> };
>>
>> static struct pdu read_characteristic_2[] = {
>> @@ -536,7 +521,7 @@ static struct pdu read_characteristic_2[] = {
>> raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
>> raw_pdu(0x0a, 0x03, 0x00),
>> raw_pdu(0x01, 0x0a, 0x03, 0x00, 0x08),
>> - end_pdu
>> + null_pdu
>> };
>>
>> static struct pdu read_descriptor_1[] = {
>> @@ -554,7 +539,7 @@ static struct pdu read_descriptor_1[] = {
>> raw_pdu(0x01, 0x04, 0x05, 0x00, 0x0a),
>> raw_pdu(0x0a, 0x04, 0x00),
>> raw_pdu(0x0b, 0x01),
>> - end_pdu
>> + null_pdu
>> };
>>
>> static struct pdu read_descriptor_2[] = {
>> @@ -572,7 +557,7 @@ static struct pdu read_descriptor_2[] = {
>> raw_pdu(0x01, 0x04, 0x05, 0x00, 0x0a),
>> raw_pdu(0x0a, 0x04, 0x00),
>> raw_pdu(0x01, 0x0a, 0x04, 0x00, 0x08),
>> - end_pdu
>> + null_pdu
>> };
>>
>> static struct pdu write_characteristic_1[] = {
>> @@ -585,7 +570,7 @@ static struct pdu write_characteristic_1[] = {
>> raw_pdu(0x08, 0x03, 0x00, 0x10, 0x00, 0x03, 0x28),
>> raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
>> raw_pdu(0x52, 0x03, 0x00, 0x00, 0x01, 0x02, 0x03),
>> - end_pdu
>> + null_pdu
>> };
>>
>> static struct pdu write_characteristic_2[] = {
>> @@ -599,7 +584,7 @@ static struct pdu write_characteristic_2[] = {
>> raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
>> raw_pdu(0x12, 0x03, 0x00, 0x00, 0x01, 0x02, 0x03),
>> raw_pdu(0x13),
>> - end_pdu
>> + null_pdu
>> };
>>
>> static struct pdu write_characteristic_3[] = {
>> @@ -613,7 +598,7 @@ static struct pdu write_characteristic_3[] = {
>> raw_pdu(0x01, 0x08, 0x03, 0x00, 0x0a),
>> raw_pdu(0x12, 0x03, 0x00, 0x00, 0x01, 0x02, 0x03),
>> raw_pdu(0x01, 0x12, 0x03, 0x00, 0x08),
>> - end_pdu
>> + null_pdu
>> };
>>
>> static void gatt_client_register_action(void)
>> diff --git a/android/tester-main.h b/android/tester-main.h
>> index 6afc553..4cbc83f 100644
>> --- a/android/tester-main.h
>> +++ b/android/tester-main.h
>> @@ -55,6 +55,21 @@
>> #include <hardware/bt_gatt_client.h>
>> #include <hardware/bt_gatt_server.h>
>>
>> +struct pdu {
>> + uint8_t *data;
>> + uint16_t size;
>
> The size should probably be size_t, or even better use struct iovec
> directly here since it is about the same.
I wouldn't go that far and use iovec's here.
I actually had one patch on top of this set which replaces this struct
with iovec but in the end the only benefit was one struct definition
less as bthost API does not take iovecs:
void bthost_send_cid(struct bthost *bthost, uint16_t handle,
uint16_t cid, const void *data, uint16_t len)
And this function is also a reason for 'size' being uint16_t.
BTW I think 'pdu.data' looks better than 'pdu.iov_base' and we shouldn't
make it look more complicated than it is without the real benefit.
>
>> +};
>> +
>> +#define raw_data(args...) ((unsigned char[]) { args })
>> +
>> +#define raw_pdu(args...) \
>> + { \
>> + .data = raw_data(args), \
>> + .size = sizeof(raw_data(args)), \
>> + }
>> +
>> +#define null_pdu { .data = NULL }
>> +
>> #define TEST_CASE_BREDR(text, ...) { \
>> HCIEMU_TYPE_BREDR, \
>> text, \
>> --
>> 1.9.1
>
>
>
Regards,
Jakub
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCHv2 01/16] android/tester: Expose gatt-tester's pdu definition to other testers
2014-09-30 11:41 ` Tyszkowski Jakub
@ 2014-09-30 12:10 ` Luiz Augusto von Dentz
2014-10-01 8:20 ` Tyszkowski Jakub
0 siblings, 1 reply; 28+ messages in thread
From: Luiz Augusto von Dentz @ 2014-09-30 12:10 UTC (permalink / raw)
To: Tyszkowski Jakub; +Cc: linux-bluetooth@vger.kernel.org
Hi Jakub,
On Tue, Sep 30, 2014 at 2:41 PM, Tyszkowski Jakub
<jakub.tyszkowski@tieto.com> wrote:
>>> +struct pdu {
>>> + uint8_t *data;
>>> + uint16_t size;
>>
>>
>> The size should probably be size_t, or even better use struct iovec
>> directly here since it is about the same.
>
>
> I wouldn't go that far and use iovec's here.
>
> I actually had one patch on top of this set which replaces this struct with
> iovec but in the end the only benefit was one struct definition less as
> bthost API does not take iovecs:
Im working on it already, internally bthost already uses iovec so it
makes sense to expose it if we can benefit from it.
> void bthost_send_cid(struct bthost *bthost, uint16_t handle,
> uint16_t cid, const void *data, uint16_t len)
>
> And this function is also a reason for 'size' being uint16_t.
>
> BTW I think 'pdu.data' looks better than 'pdu.iov_base' and we shouldn't
> make it look more complicated than it is without the real benefit.
Well this is not exactly the point, it might look better but struct
iovec is a standard interface so it only make sense to introduce
another design if the standard does not attend our needs which does
not seems to be the case here.
>>
>>> +};
>>> +
>>> +#define raw_data(args...) ((unsigned char[]) { args })
>>> +
>>> +#define raw_pdu(args...) \
>>> + { \
>>> + .data = raw_data(args), \
>>> + .size = sizeof(raw_data(args)), \
>>> + }
>>> +
>>> +#define null_pdu { .data = NULL }
>>> +
>>> #define TEST_CASE_BREDR(text, ...) { \
>>> HCIEMU_TYPE_BREDR, \
>>> text, \
>>> --
>>> 1.9.1
>>
>>
>>
>>
>
> Regards,
> Jakub
--
Luiz Augusto von Dentz
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCHv2 01/16] android/tester: Expose gatt-tester's pdu definition to other testers
2014-09-30 12:10 ` Luiz Augusto von Dentz
@ 2014-10-01 8:20 ` Tyszkowski Jakub
0 siblings, 0 replies; 28+ messages in thread
From: Tyszkowski Jakub @ 2014-10-01 8:20 UTC (permalink / raw)
To: Luiz Augusto von Dentz; +Cc: linux-bluetooth@vger.kernel.org
Hi Luiz,
On 09/30/2014 02:10 PM, Luiz Augusto von Dentz wrote:
> Hi Jakub,
>
> On Tue, Sep 30, 2014 at 2:41 PM, Tyszkowski Jakub
> <jakub.tyszkowski@tieto.com> wrote:
>>>> +struct pdu {
>>>> + uint8_t *data;
>>>> + uint16_t size;
>>>
>>>
>>> The size should probably be size_t, or even better use struct iovec
>>> directly here since it is about the same.
>>
>>
>> I wouldn't go that far and use iovec's here.
>>
>> I actually had one patch on top of this set which replaces this struct with
>> iovec but in the end the only benefit was one struct definition less as
>> bthost API does not take iovecs:
>
> Im working on it already, internally bthost already uses iovec so it
> makes sense to expose it if we can benefit from it.
>
>> void bthost_send_cid(struct bthost *bthost, uint16_t handle,
>> uint16_t cid, const void *data, uint16_t len)
>>
>> And this function is also a reason for 'size' being uint16_t.
>>
>> BTW I think 'pdu.data' looks better than 'pdu.iov_base' and we shouldn't
>> make it look more complicated than it is without the real benefit.
>
> Well this is not exactly the point, it might look better but struct
> iovec is a standard interface so it only make sense to introduce
> another design if the standard does not attend our needs which does
> not seems to be the case here.
I'll resend this set with one more patch on top, which replaces pdu
struct with iovec and bthost_send_cid() with bthost_send_cid_v().
Regards,
Jakub
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCHv2 02/16] android/tester: Make AVRCP tests use generic pdu struct
2014-09-26 6:31 [PATCHv2 00/16] android/tester: Unifying the way PDU is handled Jakub Tyszkowski
2014-09-26 6:31 ` [PATCHv2 01/16] android/tester: Expose gatt-tester's pdu definition to other testers Jakub Tyszkowski
@ 2014-09-26 6:31 ` Jakub Tyszkowski
2014-09-30 9:37 ` Szymon Janc
2014-09-26 6:31 ` [PATCHv2 03/16] android/tester: Make A2DP " Jakub Tyszkowski
` (14 subsequent siblings)
16 siblings, 1 reply; 28+ messages in thread
From: Jakub Tyszkowski @ 2014-09-26 6:31 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Jakub Tyszkowski
---
android/tester-avrcp.c | 76 +++++++++++++++++++++++++-------------------------
1 file changed, 38 insertions(+), 38 deletions(-)
diff --git a/android/tester-avrcp.c b/android/tester-avrcp.c
index b539e0e..fab6dfc 100644
--- a/android/tester-avrcp.c
+++ b/android/tester-avrcp.c
@@ -34,7 +34,8 @@ static struct emu_cid_data sdp_data;
static struct emu_cid_data a2dp_data;
static struct emu_cid_data avrcp_data;
-static const uint8_t sdp_rsp_pdu[] = { 0x07, /* PDU id */
+static struct pdu sdp_rsp_pdu = raw_pdu(
+ 0x07, /* PDU id */
0x00, 0x00, /* Transaction id */
0x00, 0x7f, /* Response length */
0x00, 0x7c, /* Attributes length */
@@ -52,39 +53,38 @@ static const uint8_t sdp_rsp_pdu[] = { 0x07, /* PDU id */
0x19, 0x00, 0x17, 0x09, 0x01, 0x03, 0x09, 0x00, 0x09,
0x35, 0x08, 0x35, 0x06, 0x19, 0x11, 0x0e, 0x09, 0x01,
0x04, 0x09, 0x03, 0x11, 0x09, 0x00, 0x02,
- 0x00}; /* no continuation */
-static const uint8_t req_dsc[] = { 0x00, 0x01 };
-static const uint8_t rsp_dsc[] = { 0x02, 0x01, 0x04, 0x08 };
-static const uint8_t req_get[] = { 0x10, 0x02, 0x04 };
-static const uint8_t rsp_get[] = { 0x12, 0x02, 0x01, 0x00, 0x07, 0x06, 0x00,
- 0x00, 0xff, 0xff, 0x02, 0x40 };
-static const uint8_t req_cfg[] = { 0x20, 0x03, 0x04, 0x04, 0x01, 0x00, 0x07,
- 0x06, 0x00, 0x00, 0x21, 0x15, 0x02,
- 0x40 };
-static const uint8_t rsp_cfg[] = { 0x22, 0x03 };
-static const uint8_t req_open[] = { 0x30, 0x06, 0x04 };
-static const uint8_t rsp_open[] = { 0x32, 0x06 };
-static const uint8_t req_close[] = { 0x40, 0x08, 0x04 };
-static const uint8_t rsp_close[] = { 0x42, 0x08 };
-static const uint8_t req_start[] = { 0x40, 0x07, 0x04 };
-static const uint8_t rsp_start[] = { 0x42, 0x07 };
-static const uint8_t req_suspend[] = { 0x50, 0x09, 0x04 };
-static const uint8_t rsp_suspend[] = { 0x52, 0x09 };
+ 0x00); /* no continuation */
+
+#define req_dsc 0x00, 0x01
+#define rsp_dsc 0x02, 0x01, 0x04, 0x08
+#define req_get 0x10, 0x02, 0x04
+#define rsp_get 0x12, 0x02, 0x01, 0x00, 0x07, 0x06, 0x00, \
+ 0x00, 0xff, 0xff, 0x02, 0x40
+#define req_cfg 0x20, 0x03, 0x04, 0x04, 0x01, 0x00, 0x07, \
+ 0x06, 0x00, 0x00, 0x21, 0x15, 0x02, \
+ 0x40
+#define rsp_cfg 0x22, 0x03
+#define req_open 0x30, 0x06, 0x04
+#define rsp_open 0x32, 0x06
+#define req_close 0x40, 0x08, 0x04
+#define rsp_close 0x42, 0x08
+#define req_start 0x40, 0x07, 0x04
+#define rsp_start 0x42, 0x07
+#define req_suspend 0x50, 0x09, 0x04
+#define rsp_suspend 0x52, 0x09
static const struct pdu_set {
- const uint8_t *req;
- size_t req_len;
- const uint8_t *rsp;
- size_t rsp_len;
+ const struct pdu req;
+ const struct pdu rsp;
} pdus[] = {
- { req_dsc, sizeof(req_dsc), rsp_dsc, sizeof(rsp_dsc) },
- { req_get, sizeof(req_get), rsp_get, sizeof(rsp_get) },
- { req_cfg, sizeof(req_cfg), rsp_cfg, sizeof(rsp_cfg) },
- { req_open, sizeof(req_open), rsp_open, sizeof(rsp_open) },
- { req_close, sizeof(req_close), rsp_close, sizeof(rsp_close) },
- { req_start, sizeof(req_start), rsp_start, sizeof(rsp_start) },
- { req_suspend, sizeof(req_suspend), rsp_suspend, sizeof(rsp_start) },
- { },
+ { raw_pdu(req_dsc), raw_pdu(rsp_dsc) },
+ { raw_pdu(req_get), raw_pdu(rsp_get) },
+ { raw_pdu(req_cfg), raw_pdu(rsp_cfg) },
+ { raw_pdu(req_open), raw_pdu(rsp_open) },
+ { raw_pdu(req_close), raw_pdu(rsp_close) },
+ { raw_pdu(req_start), raw_pdu(rsp_start) },
+ { raw_pdu(req_suspend), raw_pdu(rsp_suspend) },
+ { null_pdu, null_pdu },
};
static void print_avrcp(const char *str, void *user_data)
@@ -130,18 +130,18 @@ static void a2dp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
util_hexdump('>', data, len, print_a2dp, NULL);
- for (i = 0; pdus[i].req; i++) {
- if (pdus[i].req_len != len)
+ for (i = 0; pdus[i].req.data; i++) {
+ if (pdus[i].req.size != len)
continue;
- if (memcmp(pdus[i].req, data, len))
+ if (memcmp(pdus[i].req.data, data, len))
continue;
- util_hexdump('<', pdus[i].rsp, pdus[i].rsp_len, print_a2dp,
- NULL);
+ util_hexdump('<', pdus[i].rsp.data, pdus[i].rsp.size,
+ print_a2dp, NULL);
bthost_send_cid(bthost, cid_data->handle, cid_data->cid,
- pdus[i].rsp, pdus[i].rsp_len);
+ pdus[i].rsp.data, pdus[i].rsp.size);
}
}
@@ -174,7 +174,7 @@ static void sdp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
struct emu_cid_data *cid_data = user_data;
bthost_send_cid(bthost, cid_data->handle, cid_data->cid,
- sdp_rsp_pdu, sizeof(sdp_rsp_pdu));
+ sdp_rsp_pdu.data, sdp_rsp_pdu.size);
}
static void sdp_connect_request_cb(uint16_t handle, uint16_t cid,
void *user_data)
--
1.9.1
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCHv2 02/16] android/tester: Make AVRCP tests use generic pdu struct
2014-09-26 6:31 ` [PATCHv2 02/16] android/tester: Make AVRCP tests use generic pdu struct Jakub Tyszkowski
@ 2014-09-30 9:37 ` Szymon Janc
0 siblings, 0 replies; 28+ messages in thread
From: Szymon Janc @ 2014-09-30 9:37 UTC (permalink / raw)
To: Jakub Tyszkowski; +Cc: linux-bluetooth
Hi Jakub,
On Friday 26 of September 2014 08:31:03 Jakub Tyszkowski wrote:
> ---
> android/tester-avrcp.c | 76 +++++++++++++++++++++++++-------------------------
> 1 file changed, 38 insertions(+), 38 deletions(-)
>
> diff --git a/android/tester-avrcp.c b/android/tester-avrcp.c
> index b539e0e..fab6dfc 100644
> --- a/android/tester-avrcp.c
> +++ b/android/tester-avrcp.c
> @@ -34,7 +34,8 @@ static struct emu_cid_data sdp_data;
> static struct emu_cid_data a2dp_data;
> static struct emu_cid_data avrcp_data;
>
> -static const uint8_t sdp_rsp_pdu[] = { 0x07, /* PDU id */
> +static struct pdu sdp_rsp_pdu = raw_pdu(
Add a comment why this cannot be const.
> + 0x07, /* PDU id */
> 0x00, 0x00, /* Transaction id */
> 0x00, 0x7f, /* Response length */
> 0x00, 0x7c, /* Attributes length */
> @@ -52,39 +53,38 @@ static const uint8_t sdp_rsp_pdu[] = { 0x07, /* PDU id */
> 0x19, 0x00, 0x17, 0x09, 0x01, 0x03, 0x09, 0x00, 0x09,
> 0x35, 0x08, 0x35, 0x06, 0x19, 0x11, 0x0e, 0x09, 0x01,
> 0x04, 0x09, 0x03, 0x11, 0x09, 0x00, 0x02,
> - 0x00}; /* no continuation */
> -static const uint8_t req_dsc[] = { 0x00, 0x01 };
> -static const uint8_t rsp_dsc[] = { 0x02, 0x01, 0x04, 0x08 };
> -static const uint8_t req_get[] = { 0x10, 0x02, 0x04 };
> -static const uint8_t rsp_get[] = { 0x12, 0x02, 0x01, 0x00, 0x07, 0x06, 0x00,
> - 0x00, 0xff, 0xff, 0x02, 0x40 };
> -static const uint8_t req_cfg[] = { 0x20, 0x03, 0x04, 0x04, 0x01, 0x00, 0x07,
> - 0x06, 0x00, 0x00, 0x21, 0x15, 0x02,
> - 0x40 };
> -static const uint8_t rsp_cfg[] = { 0x22, 0x03 };
> -static const uint8_t req_open[] = { 0x30, 0x06, 0x04 };
> -static const uint8_t rsp_open[] = { 0x32, 0x06 };
> -static const uint8_t req_close[] = { 0x40, 0x08, 0x04 };
> -static const uint8_t rsp_close[] = { 0x42, 0x08 };
> -static const uint8_t req_start[] = { 0x40, 0x07, 0x04 };
> -static const uint8_t rsp_start[] = { 0x42, 0x07 };
> -static const uint8_t req_suspend[] = { 0x50, 0x09, 0x04 };
> -static const uint8_t rsp_suspend[] = { 0x52, 0x09 };
> + 0x00); /* no continuation */
> +
> +#define req_dsc 0x00, 0x01
> +#define rsp_dsc 0x02, 0x01, 0x04, 0x08
> +#define req_get 0x10, 0x02, 0x04
> +#define rsp_get 0x12, 0x02, 0x01, 0x00, 0x07, 0x06, 0x00, \
> + 0x00, 0xff, 0xff, 0x02, 0x40
> +#define req_cfg 0x20, 0x03, 0x04, 0x04, 0x01, 0x00, 0x07, \
> + 0x06, 0x00, 0x00, 0x21, 0x15, 0x02, \
> + 0x40
> +#define rsp_cfg 0x22, 0x03
> +#define req_open 0x30, 0x06, 0x04
> +#define rsp_open 0x32, 0x06
> +#define req_close 0x40, 0x08, 0x04
> +#define rsp_close 0x42, 0x08
> +#define req_start 0x40, 0x07, 0x04
> +#define rsp_start 0x42, 0x07
> +#define req_suspend 0x50, 0x09, 0x04
> +#define rsp_suspend 0x52, 0x09
>
> static const struct pdu_set {
> - const uint8_t *req;
> - size_t req_len;
> - const uint8_t *rsp;
> - size_t rsp_len;
> + const struct pdu req;
> + const struct pdu rsp;
> } pdus[] = {
> - { req_dsc, sizeof(req_dsc), rsp_dsc, sizeof(rsp_dsc) },
> - { req_get, sizeof(req_get), rsp_get, sizeof(rsp_get) },
> - { req_cfg, sizeof(req_cfg), rsp_cfg, sizeof(rsp_cfg) },
> - { req_open, sizeof(req_open), rsp_open, sizeof(rsp_open) },
> - { req_close, sizeof(req_close), rsp_close, sizeof(rsp_close) },
> - { req_start, sizeof(req_start), rsp_start, sizeof(rsp_start) },
> - { req_suspend, sizeof(req_suspend), rsp_suspend, sizeof(rsp_start) },
> - { },
> + { raw_pdu(req_dsc), raw_pdu(rsp_dsc) },
> + { raw_pdu(req_get), raw_pdu(rsp_get) },
> + { raw_pdu(req_cfg), raw_pdu(rsp_cfg) },
> + { raw_pdu(req_open), raw_pdu(rsp_open) },
> + { raw_pdu(req_close), raw_pdu(rsp_close) },
> + { raw_pdu(req_start), raw_pdu(rsp_start) },
> + { raw_pdu(req_suspend), raw_pdu(rsp_suspend) },
> + { null_pdu, null_pdu },
> };
>
> static void print_avrcp(const char *str, void *user_data)
> @@ -130,18 +130,18 @@ static void a2dp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
>
> util_hexdump('>', data, len, print_a2dp, NULL);
>
> - for (i = 0; pdus[i].req; i++) {
> - if (pdus[i].req_len != len)
> + for (i = 0; pdus[i].req.data; i++) {
> + if (pdus[i].req.size != len)
> continue;
>
> - if (memcmp(pdus[i].req, data, len))
> + if (memcmp(pdus[i].req.data, data, len))
> continue;
>
> - util_hexdump('<', pdus[i].rsp, pdus[i].rsp_len, print_a2dp,
> - NULL);
> + util_hexdump('<', pdus[i].rsp.data, pdus[i].rsp.size,
> + print_a2dp, NULL);
>
> bthost_send_cid(bthost, cid_data->handle, cid_data->cid,
> - pdus[i].rsp, pdus[i].rsp_len);
> + pdus[i].rsp.data, pdus[i].rsp.size);
> }
> }
>
> @@ -174,7 +174,7 @@ static void sdp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
> struct emu_cid_data *cid_data = user_data;
>
> bthost_send_cid(bthost, cid_data->handle, cid_data->cid,
> - sdp_rsp_pdu, sizeof(sdp_rsp_pdu));
> + sdp_rsp_pdu.data, sdp_rsp_pdu.size);
> }
> static void sdp_connect_request_cb(uint16_t handle, uint16_t cid,
> void *user_data)
>
--
Best regards,
Szymon Janc
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCHv2 03/16] android/tester: Make A2DP tests use generic pdu struct
2014-09-26 6:31 [PATCHv2 00/16] android/tester: Unifying the way PDU is handled Jakub Tyszkowski
2014-09-26 6:31 ` [PATCHv2 01/16] android/tester: Expose gatt-tester's pdu definition to other testers Jakub Tyszkowski
2014-09-26 6:31 ` [PATCHv2 02/16] android/tester: Make AVRCP tests use generic pdu struct Jakub Tyszkowski
@ 2014-09-26 6:31 ` Jakub Tyszkowski
2014-09-26 6:31 ` [PATCHv2 04/16] android/tester: Make GATT " Jakub Tyszkowski
` (13 subsequent siblings)
16 siblings, 0 replies; 28+ messages in thread
From: Jakub Tyszkowski @ 2014-09-26 6:31 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Jakub Tyszkowski
---
android/tester-a2dp.c | 68 +++++++++++++++++++++++++--------------------------
1 file changed, 33 insertions(+), 35 deletions(-)
diff --git a/android/tester-a2dp.c b/android/tester-a2dp.c
index ab3936e..047822e 100644
--- a/android/tester-a2dp.c
+++ b/android/tester-a2dp.c
@@ -32,38 +32,36 @@ struct emu_cid_data {
static struct emu_cid_data cid_data;
-static const uint8_t req_dsc[] = { 0x00, 0x01 };
-static const uint8_t rsp_dsc[] = { 0x02, 0x01, 0x04, 0x08 };
-static const uint8_t req_get[] = { 0x10, 0x02, 0x04 };
-static const uint8_t rsp_get[] = { 0x12, 0x02, 0x01, 0x00, 0x07, 0x06, 0x00,
- 0x00, 0xff, 0xff, 0x02, 0x40 };
-static const uint8_t req_cfg[] = { 0x20, 0x03, 0x04, 0x04, 0x01, 0x00, 0x07,
- 0x06, 0x00, 0x00, 0x21, 0x15, 0x02,
- 0x40 };
-static const uint8_t rsp_cfg[] = { 0x22, 0x03 };
-static const uint8_t req_open[] = { 0x30, 0x06, 0x04 };
-static const uint8_t rsp_open[] = { 0x32, 0x06 };
-static const uint8_t req_close[] = { 0x40, 0x08, 0x04 };
-static const uint8_t rsp_close[] = { 0x42, 0x08 };
-static const uint8_t req_start[] = { 0x40, 0x07, 0x04 };
-static const uint8_t rsp_start[] = { 0x42, 0x07 };
-static const uint8_t req_suspend[] = { 0x50, 0x09, 0x04 };
-static const uint8_t rsp_suspend[] = { 0x52, 0x09 };
+#define req_dsc 0x00, 0x01
+#define rsp_dsc 0x02, 0x01, 0x04, 0x08
+#define req_get 0x10, 0x02, 0x04
+#define rsp_get 0x12, 0x02, 0x01, 0x00, 0x07, 0x06, 0x00, \
+ 0x00, 0xff, 0xff, 0x02, 0x40
+#define req_cfg 0x20, 0x03, 0x04, 0x04, 0x01, 0x00, 0x07, \
+ 0x06, 0x00, 0x00, 0x21, 0x15, 0x02, \
+ 0x40
+#define rsp_cfg 0x22, 0x03
+#define req_open 0x30, 0x06, 0x04
+#define rsp_open 0x32, 0x06
+#define req_close 0x40, 0x08, 0x04
+#define rsp_close 0x42, 0x08
+#define req_start 0x40, 0x07, 0x04
+#define rsp_start 0x42, 0x07
+#define req_suspend 0x50, 0x09, 0x04
+#define rsp_suspend 0x52, 0x09
const struct pdu_set {
- const uint8_t *req;
- size_t req_len;
- const uint8_t *rsp;
- size_t rsp_len;
+ struct pdu req;
+ struct pdu rsp;
} pdus[] = {
- { req_dsc, sizeof(req_dsc), rsp_dsc, sizeof(rsp_dsc) },
- { req_get, sizeof(req_get), rsp_get, sizeof(rsp_get) },
- { req_cfg, sizeof(req_cfg), rsp_cfg, sizeof(rsp_cfg) },
- { req_open, sizeof(req_open), rsp_open, sizeof(rsp_open) },
- { req_close, sizeof(req_close), rsp_close, sizeof(rsp_close) },
- { req_start, sizeof(req_start), rsp_start, sizeof(rsp_start) },
- { req_suspend, sizeof(req_suspend), rsp_suspend, sizeof(rsp_start) },
- { },
+ { raw_pdu(req_dsc), raw_pdu(rsp_dsc) },
+ { raw_pdu(req_get), raw_pdu(rsp_get) },
+ { raw_pdu(req_cfg), raw_pdu(rsp_cfg) },
+ { raw_pdu(req_open), raw_pdu(rsp_open) },
+ { raw_pdu(req_close), raw_pdu(rsp_close) },
+ { raw_pdu(req_start), raw_pdu(rsp_start) },
+ { raw_pdu(req_suspend), raw_pdu(rsp_suspend) },
+ { null_pdu, null_pdu },
};
static void print_data(const char *str, void *user_data)
@@ -80,18 +78,18 @@ static void a2dp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
util_hexdump('>', data, len, print_data, NULL);
- for (i = 0; pdus[i].req; i++) {
- if (pdus[i].req_len != len)
+ for (i = 0; pdus[i].req.data; i++) {
+ if (pdus[i].req.size != len)
continue;
- if (memcmp(pdus[i].req, data, len))
+ if (memcmp(pdus[i].req.data, data, len))
continue;
- util_hexdump('<', pdus[i].rsp, pdus[i].rsp_len, print_data,
- NULL);
+ util_hexdump('<', pdus[i].rsp.data, pdus[i].rsp.size,
+ print_data, NULL);
bthost_send_cid(bthost, cid_data->handle, cid_data->cid,
- pdus[i].rsp, pdus[i].rsp_len);
+ pdus[i].rsp.data, pdus[i].rsp.size);
}
}
--
1.9.1
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCHv2 04/16] android/tester: Make GATT tests use generic pdu struct
2014-09-26 6:31 [PATCHv2 00/16] android/tester: Unifying the way PDU is handled Jakub Tyszkowski
` (2 preceding siblings ...)
2014-09-26 6:31 ` [PATCHv2 03/16] android/tester: Make A2DP " Jakub Tyszkowski
@ 2014-09-26 6:31 ` Jakub Tyszkowski
2014-09-26 6:31 ` [PATCHv2 05/16] android/tester: Make HidHost " Jakub Tyszkowski
` (12 subsequent siblings)
16 siblings, 0 replies; 28+ messages in thread
From: Jakub Tyszkowski @ 2014-09-26 6:31 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Jakub Tyszkowski
---
android/tester-gatt.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/android/tester-gatt.c b/android/tester-gatt.c
index ccc8e24..73ef168 100644
--- a/android/tester-gatt.c
+++ b/android/tester-gatt.c
@@ -146,8 +146,8 @@ static struct gatt_search_service_data search_services_1 = {
.filter_uuid = NULL,
};
-static const uint8_t exchange_mtu_req_pdu[] = { 0x02, 0xa0, 0x02 };
-static const uint8_t exchange_mtu_resp_pdu[] = { 0x03, 0xa0, 0x02 };
+static const struct pdu exchange_mtu_req_pdu = raw_pdu(0x02, 0xa0, 0x02);
+static const struct pdu exchange_mtu_resp_pdu = raw_pdu(0x03, 0xa0, 0x02);
static struct bt_action_data bearer_type = {
.bearer_type = BDADDR_LE_PUBLIC,
@@ -833,10 +833,10 @@ static void gatt_cid_hook_cb(const void *data, uint16_t len, void *user_data)
case L2CAP_ATT_EXCHANGE_MTU_REQ:
tester_print("Exchange MTU request received.");
- if (!memcmp(exchange_mtu_req_pdu, pdu, len))
+ if (!memcmp(exchange_mtu_req_pdu.data, pdu, len))
bthost_send_cid(bthost, cid_data->handle, cid_data->cid,
- exchange_mtu_resp_pdu,
- sizeof(exchange_mtu_resp_pdu));
+ exchange_mtu_resp_pdu.data,
+ exchange_mtu_resp_pdu.size);
break;
case L2CAP_ATT_EXCHANGE_MTU_RSP:
--
1.9.1
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCHv2 05/16] android/tester: Make HidHost tests use generic pdu struct
2014-09-26 6:31 [PATCHv2 00/16] android/tester: Unifying the way PDU is handled Jakub Tyszkowski
` (3 preceding siblings ...)
2014-09-26 6:31 ` [PATCHv2 04/16] android/tester: Make GATT " Jakub Tyszkowski
@ 2014-09-26 6:31 ` Jakub Tyszkowski
2014-09-30 9:40 ` Szymon Janc
2014-09-26 6:31 ` [PATCHv2 06/16] android/tester: Make PAN " Jakub Tyszkowski
` (11 subsequent siblings)
16 siblings, 1 reply; 28+ messages in thread
From: Jakub Tyszkowski @ 2014-09-26 6:31 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Jakub Tyszkowski
---
android/tester-hidhost.c | 41 +++++++++++++++++------------------------
1 file changed, 17 insertions(+), 24 deletions(-)
diff --git a/android/tester-hidhost.c b/android/tester-hidhost.c
index c7e3a67..0fe9c0a 100644
--- a/android/tester-hidhost.c
+++ b/android/tester-hidhost.c
@@ -21,6 +21,7 @@
#include "tester-main.h"
#include "android/utils.h"
+#include "src/shared/util.h"
#define HID_GET_REPORT_PROTOCOL 0x60
#define HID_GET_BOOT_PROTOCOL 0x61
@@ -59,14 +60,16 @@ struct emu_cid_data {
static struct emu_cid_data cid_data;
-static const uint8_t did_req_pdu[] = { 0x06, /* PDU id */
+static struct pdu did_req_pdu = raw_pdu(
+ 0x06, /* PDU id */
0x00, 0x00, /* Transaction id */
0x00, 0x0f, /* Req length */
0x35, 0x03, /* Attributes length */
0x19, 0x12, 0x00, 0xff, 0xff, 0x35, 0x05, 0x0a, 0x00,
- 0x00, 0xff, 0xff, 0x00 }; /* no continuation */
+ 0x00, 0xff, 0xff, 0x00); /* no continuation */
-static const uint8_t did_rsp_pdu[] = { 0x07, /* PDU id */
+static struct pdu did_rsp_pdu = raw_pdu(
+ 0x07, /* PDU id */
0x00, 0x00, /* Transaction id */
0x00, 0x4f, /* Response length */
0x00, 0x4c, /* Attributes length */
@@ -79,9 +82,10 @@ static const uint8_t did_rsp_pdu[] = { 0x07, /* PDU id */
0x02, 0x02, 0x09, 0x02, 0x46, 0x09, 0x02, 0x03, 0x09,
0x05, 0x0e, 0x09, 0x02, 0x04, 0x28, 0x01, 0x09, 0x02,
0x05, 0x09, 0x00, 0x02,
- 0x00 }; /* no continuation */
+ 0x00); /* no continuation */
-static const uint8_t hid_rsp_pdu[] = { 0x07, /* PDU id */
+static struct pdu hid_rsp_pdu = raw_pdu(
+ 0x07, /* PDU id */
0x00, 0x01, /* Transaction id */
0x01, 0x71, /* Response length */
0x01, 0x6E, /* Attributes length */
@@ -126,7 +130,7 @@ static const uint8_t hid_rsp_pdu[] = { 0x07, /* PDU id */
0x28, 0x01, 0x09, 0x02, 0x0b, 0x09, 0x01, 0x00, 0x09,
0x02, 0x0c, 0x09, 0x0c, 0x80, 0x09, 0x02, 0x0d, 0x28,
0x00, 0x09, 0x02, 0x0e, 0x28, 0x01,
- 0x00 }; /* no continuation */
+ 0x00); /* no continuation */
static void hid_sdp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
{
@@ -134,14 +138,14 @@ static void hid_sdp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
struct emu_cid_data *cid_data = user_data;
- if (!memcmp(did_req_pdu, data, len)) {
+ if (!memcmp(did_req_pdu.data, data, len)) {
bthost_send_cid(bthost, cid_data->sdp_handle, cid_data->sdp_cid,
- did_rsp_pdu, sizeof(did_rsp_pdu));
+ did_rsp_pdu.data, did_rsp_pdu.size);
return;
}
bthost_send_cid(bthost, cid_data->sdp_handle, cid_data->sdp_cid,
- hid_rsp_pdu, sizeof(hid_rsp_pdu));
+ hid_rsp_pdu.data, hid_rsp_pdu.size);
}
static void hid_sdp_search_cb(uint16_t handle, uint16_t cid, void *user_data)
{
@@ -159,31 +163,20 @@ static void hid_prepare_reply_protocol_mode(struct emu_cid_data *cid_data)
{
struct test_data *t_data = tester_get_data();
struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
- uint8_t pdu[2] = { 0, 0 };
- uint16_t pdu_len = 0;
-
- pdu_len = 2;
- pdu[0] = 0xa0;
- pdu[1] = 0x00;
+ const struct pdu pdu = raw_pdu(0xa0, 0x00);
bthost_send_cid(bthost, cid_data->ctrl_handle, cid_data->ctrl_cid,
- (void *)pdu, pdu_len);
+ pdu.data, pdu.size);
}
static void hid_prepare_reply_report(struct emu_cid_data *cid_data)
{
struct test_data *t_data = tester_get_data();
struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
- uint8_t pdu[3] = { 0, 0, 0 };
- uint16_t pdu_len = 0;
-
- pdu_len = 3;
- pdu[0] = 0xa2;
- pdu[1] = 0x01;
- pdu[2] = 0x00;
+ const struct pdu pdu = raw_pdu(0xa2, 0x01, 0x00);
bthost_send_cid(bthost, cid_data->ctrl_handle, cid_data->ctrl_cid,
- (void *)pdu, pdu_len);
+ pdu.data, pdu.size);
}
static void hid_ctrl_cid_hook_cb(const void *data, uint16_t len,
--
1.9.1
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCHv2 05/16] android/tester: Make HidHost tests use generic pdu struct
2014-09-26 6:31 ` [PATCHv2 05/16] android/tester: Make HidHost " Jakub Tyszkowski
@ 2014-09-30 9:40 ` Szymon Janc
2014-09-30 9:54 ` Luiz Augusto von Dentz
2014-09-30 12:01 ` Tyszkowski Jakub
0 siblings, 2 replies; 28+ messages in thread
From: Szymon Janc @ 2014-09-30 9:40 UTC (permalink / raw)
To: Jakub Tyszkowski; +Cc: linux-bluetooth
Hi Jakub,
On Friday 26 of September 2014 08:31:06 Jakub Tyszkowski wrote:
> ---
> android/tester-hidhost.c | 41 +++++++++++++++++------------------------
> 1 file changed, 17 insertions(+), 24 deletions(-)
>
> diff --git a/android/tester-hidhost.c b/android/tester-hidhost.c
> index c7e3a67..0fe9c0a 100644
> --- a/android/tester-hidhost.c
> +++ b/android/tester-hidhost.c
> @@ -21,6 +21,7 @@
> #include "tester-main.h"
>
> #include "android/utils.h"
> +#include "src/shared/util.h"
Is this needed?
> #define HID_GET_REPORT_PROTOCOL 0x60
> #define HID_GET_BOOT_PROTOCOL 0x61
> @@ -59,14 +60,16 @@ struct emu_cid_data {
>
> static struct emu_cid_data cid_data;
>
> -static const uint8_t did_req_pdu[] = { 0x06, /* PDU id */
> +static struct pdu did_req_pdu = raw_pdu(
> + 0x06, /* PDU id */
> 0x00, 0x00, /* Transaction id */
> 0x00, 0x0f, /* Req length */
> 0x35, 0x03, /* Attributes length */
> 0x19, 0x12, 0x00, 0xff, 0xff, 0x35, 0x05, 0x0a, 0x00,
> - 0x00, 0xff, 0xff, 0x00 }; /* no continuation */
> + 0x00, 0xff, 0xff, 0x00); /* no continuation */
>
> -static const uint8_t did_rsp_pdu[] = { 0x07, /* PDU id */
> +static struct pdu did_rsp_pdu = raw_pdu(
> + 0x07, /* PDU id */
> 0x00, 0x00, /* Transaction id */
> 0x00, 0x4f, /* Response length */
> 0x00, 0x4c, /* Attributes length */
> @@ -79,9 +82,10 @@ static const uint8_t did_rsp_pdu[] = { 0x07, /* PDU id */
> 0x02, 0x02, 0x09, 0x02, 0x46, 0x09, 0x02, 0x03, 0x09,
> 0x05, 0x0e, 0x09, 0x02, 0x04, 0x28, 0x01, 0x09, 0x02,
> 0x05, 0x09, 0x00, 0x02,
> - 0x00 }; /* no continuation */
> + 0x00); /* no continuation */
>
> -static const uint8_t hid_rsp_pdu[] = { 0x07, /* PDU id */
> +static struct pdu hid_rsp_pdu = raw_pdu(
> + 0x07, /* PDU id */
> 0x00, 0x01, /* Transaction id */
> 0x01, 0x71, /* Response length */
> 0x01, 0x6E, /* Attributes length */
> @@ -126,7 +130,7 @@ static const uint8_t hid_rsp_pdu[] = { 0x07, /* PDU id */
> 0x28, 0x01, 0x09, 0x02, 0x0b, 0x09, 0x01, 0x00, 0x09,
> 0x02, 0x0c, 0x09, 0x0c, 0x80, 0x09, 0x02, 0x0d, 0x28,
> 0x00, 0x09, 0x02, 0x0e, 0x28, 0x01,
> - 0x00 }; /* no continuation */
> + 0x00); /* no continuation */
>
> static void hid_sdp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
> {
> @@ -134,14 +138,14 @@ static void hid_sdp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
> struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
> struct emu_cid_data *cid_data = user_data;
>
> - if (!memcmp(did_req_pdu, data, len)) {
> + if (!memcmp(did_req_pdu.data, data, len)) {
> bthost_send_cid(bthost, cid_data->sdp_handle, cid_data->sdp_cid,
> - did_rsp_pdu, sizeof(did_rsp_pdu));
> + did_rsp_pdu.data, did_rsp_pdu.size);
> return;
> }
>
> bthost_send_cid(bthost, cid_data->sdp_handle, cid_data->sdp_cid,
> - hid_rsp_pdu, sizeof(hid_rsp_pdu));
> + hid_rsp_pdu.data, hid_rsp_pdu.size);
> }
> static void hid_sdp_search_cb(uint16_t handle, uint16_t cid, void *user_data)
> {
> @@ -159,31 +163,20 @@ static void hid_prepare_reply_protocol_mode(struct emu_cid_data *cid_data)
> {
> struct test_data *t_data = tester_get_data();
> struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
> - uint8_t pdu[2] = { 0, 0 };
> - uint16_t pdu_len = 0;
> -
> - pdu_len = 2;
> - pdu[0] = 0xa0;
> - pdu[1] = 0x00;
> + const struct pdu pdu = raw_pdu(0xa0, 0x00);
>
> bthost_send_cid(bthost, cid_data->ctrl_handle, cid_data->ctrl_cid,
> - (void *)pdu, pdu_len);
> + pdu.data, pdu.size);
> }
>
> static void hid_prepare_reply_report(struct emu_cid_data *cid_data)
> {
> struct test_data *t_data = tester_get_data();
> struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
> - uint8_t pdu[3] = { 0, 0, 0 };
> - uint16_t pdu_len = 0;
> -
> - pdu_len = 3;
> - pdu[0] = 0xa2;
> - pdu[1] = 0x01;
> - pdu[2] = 0x00;
> + const struct pdu pdu = raw_pdu(0xa2, 0x01, 0x00);
>
> bthost_send_cid(bthost, cid_data->ctrl_handle, cid_data->ctrl_cid,
> - (void *)pdu, pdu_len);
> + pdu.data, pdu.size);
> }
>
> static void hid_ctrl_cid_hook_cb(const void *data, uint16_t len,
>
--
Best regards,
Szymon Janc
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCHv2 05/16] android/tester: Make HidHost tests use generic pdu struct
2014-09-30 9:40 ` Szymon Janc
@ 2014-09-30 9:54 ` Luiz Augusto von Dentz
2014-09-30 10:00 ` Szymon Janc
2014-09-30 12:01 ` Tyszkowski Jakub
1 sibling, 1 reply; 28+ messages in thread
From: Luiz Augusto von Dentz @ 2014-09-30 9:54 UTC (permalink / raw)
To: Szymon Janc; +Cc: Jakub Tyszkowski, linux-bluetooth@vger.kernel.org
Hi,
On Tue, Sep 30, 2014 at 12:40 PM, Szymon Janc <szymon.janc@tieto.com> wrote:
> Hi Jakub,
>
> On Friday 26 of September 2014 08:31:06 Jakub Tyszkowski wrote:
>> ---
>> android/tester-hidhost.c | 41 +++++++++++++++++------------------------
>> 1 file changed, 17 insertions(+), 24 deletions(-)
>>
>> diff --git a/android/tester-hidhost.c b/android/tester-hidhost.c
>> index c7e3a67..0fe9c0a 100644
>> --- a/android/tester-hidhost.c
>> +++ b/android/tester-hidhost.c
>> @@ -21,6 +21,7 @@
>> #include "tester-main.h"
>>
>> #include "android/utils.h"
>> +#include "src/shared/util.h"
>
> Is this needed?
>
>> #define HID_GET_REPORT_PROTOCOL 0x60
>> #define HID_GET_BOOT_PROTOCOL 0x61
>> @@ -59,14 +60,16 @@ struct emu_cid_data {
>>
>> static struct emu_cid_data cid_data;
>>
>> -static const uint8_t did_req_pdu[] = { 0x06, /* PDU id */
>> +static struct pdu did_req_pdu = raw_pdu(
>> + 0x06, /* PDU id */
>> 0x00, 0x00, /* Transaction id */
>> 0x00, 0x0f, /* Req length */
>> 0x35, 0x03, /* Attributes length */
>> 0x19, 0x12, 0x00, 0xff, 0xff, 0x35, 0x05, 0x0a, 0x00,
>> - 0x00, 0xff, 0xff, 0x00 }; /* no continuation */
>> + 0x00, 0xff, 0xff, 0x00); /* no continuation */
>>
>> -static const uint8_t did_rsp_pdu[] = { 0x07, /* PDU id */
>> +static struct pdu did_rsp_pdu = raw_pdu(
>> + 0x07, /* PDU id */
>> 0x00, 0x00, /* Transaction id */
>> 0x00, 0x4f, /* Response length */
>> 0x00, 0x4c, /* Attributes length */
>> @@ -79,9 +82,10 @@ static const uint8_t did_rsp_pdu[] = { 0x07, /* PDU id */
>> 0x02, 0x02, 0x09, 0x02, 0x46, 0x09, 0x02, 0x03, 0x09,
>> 0x05, 0x0e, 0x09, 0x02, 0x04, 0x28, 0x01, 0x09, 0x02,
>> 0x05, 0x09, 0x00, 0x02,
>> - 0x00 }; /* no continuation */
>> + 0x00); /* no continuation */
>>
>> -static const uint8_t hid_rsp_pdu[] = { 0x07, /* PDU id */
>> +static struct pdu hid_rsp_pdu = raw_pdu(
>> + 0x07, /* PDU id */
>> 0x00, 0x01, /* Transaction id */
>> 0x01, 0x71, /* Response length */
>> 0x01, 0x6E, /* Attributes length */
>> @@ -126,7 +130,7 @@ static const uint8_t hid_rsp_pdu[] = { 0x07, /* PDU id */
>> 0x28, 0x01, 0x09, 0x02, 0x0b, 0x09, 0x01, 0x00, 0x09,
>> 0x02, 0x0c, 0x09, 0x0c, 0x80, 0x09, 0x02, 0x0d, 0x28,
>> 0x00, 0x09, 0x02, 0x0e, 0x28, 0x01,
>> - 0x00 }; /* no continuation */
>> + 0x00); /* no continuation */
>>
>> static void hid_sdp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
>> {
>> @@ -134,14 +138,14 @@ static void hid_sdp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
>> struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
>> struct emu_cid_data *cid_data = user_data;
>>
>> - if (!memcmp(did_req_pdu, data, len)) {
>> + if (!memcmp(did_req_pdu.data, data, len)) {
>> bthost_send_cid(bthost, cid_data->sdp_handle, cid_data->sdp_cid,
>> - did_rsp_pdu, sizeof(did_rsp_pdu));
>> + did_rsp_pdu.data, did_rsp_pdu.size);
>> return;
>> }
>>
>> bthost_send_cid(bthost, cid_data->sdp_handle, cid_data->sdp_cid,
>> - hid_rsp_pdu, sizeof(hid_rsp_pdu));
>> + hid_rsp_pdu.data, hid_rsp_pdu.size);
>> }
>> static void hid_sdp_search_cb(uint16_t handle, uint16_t cid, void *user_data)
>> {
>> @@ -159,31 +163,20 @@ static void hid_prepare_reply_protocol_mode(struct emu_cid_data *cid_data)
>> {
>> struct test_data *t_data = tester_get_data();
>> struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
>> - uint8_t pdu[2] = { 0, 0 };
>> - uint16_t pdu_len = 0;
>> -
>> - pdu_len = 2;
>> - pdu[0] = 0xa0;
>> - pdu[1] = 0x00;
>> + const struct pdu pdu = raw_pdu(0xa0, 0x00);
>>
>> bthost_send_cid(bthost, cid_data->ctrl_handle, cid_data->ctrl_cid,
>> - (void *)pdu, pdu_len);
>> + pdu.data, pdu.size);
Something is not quite right if you have to cast to void *, it looks
like we should pass a reference e.g. &pdu not the value itself.
>> }
>>
>> static void hid_prepare_reply_report(struct emu_cid_data *cid_data)
>> {
>> struct test_data *t_data = tester_get_data();
>> struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
>> - uint8_t pdu[3] = { 0, 0, 0 };
>> - uint16_t pdu_len = 0;
>> -
>> - pdu_len = 3;
>> - pdu[0] = 0xa2;
>> - pdu[1] = 0x01;
>> - pdu[2] = 0x00;
>> + const struct pdu pdu = raw_pdu(0xa2, 0x01, 0x00);
>>
>> bthost_send_cid(bthost, cid_data->ctrl_handle, cid_data->ctrl_cid,
>> - (void *)pdu, pdu_len);
>> + pdu.data, pdu.size);
>> }
>>
>> static void hid_ctrl_cid_hook_cb(const void *data, uint16_t len,
>>
>
> --
> Best regards,
> Szymon Janc
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Luiz Augusto von Dentz
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCHv2 05/16] android/tester: Make HidHost tests use generic pdu struct
2014-09-30 9:54 ` Luiz Augusto von Dentz
@ 2014-09-30 10:00 ` Szymon Janc
2014-09-30 10:10 ` Luiz Augusto von Dentz
0 siblings, 1 reply; 28+ messages in thread
From: Szymon Janc @ 2014-09-30 10:00 UTC (permalink / raw)
To: Luiz Augusto von Dentz; +Cc: Jakub Tyszkowski, linux-bluetooth@vger.kernel.org
Hi Luiz,
On Tuesday 30 of September 2014 12:54:54 Luiz Augusto von Dentz wrote:
> Hi,
>
> On Tue, Sep 30, 2014 at 12:40 PM, Szymon Janc <szymon.janc@tieto.com> wrote:
> > Hi Jakub,
> >
> > On Friday 26 of September 2014 08:31:06 Jakub Tyszkowski wrote:
> >> ---
> >> android/tester-hidhost.c | 41 +++++++++++++++++------------------------
> >> 1 file changed, 17 insertions(+), 24 deletions(-)
> >>
> >> diff --git a/android/tester-hidhost.c b/android/tester-hidhost.c
> >> index c7e3a67..0fe9c0a 100644
> >> --- a/android/tester-hidhost.c
> >> +++ b/android/tester-hidhost.c
> >> @@ -21,6 +21,7 @@
> >> #include "tester-main.h"
> >>
> >> #include "android/utils.h"
> >> +#include "src/shared/util.h"
> >
> > Is this needed?
> >
> >> #define HID_GET_REPORT_PROTOCOL 0x60
> >> #define HID_GET_BOOT_PROTOCOL 0x61
> >> @@ -59,14 +60,16 @@ struct emu_cid_data {
> >>
> >> static struct emu_cid_data cid_data;
> >>
> >> -static const uint8_t did_req_pdu[] = { 0x06, /* PDU id */
> >> +static struct pdu did_req_pdu = raw_pdu(
> >> + 0x06, /* PDU id */
> >> 0x00, 0x00, /* Transaction id */
> >> 0x00, 0x0f, /* Req length */
> >> 0x35, 0x03, /* Attributes length */
> >> 0x19, 0x12, 0x00, 0xff, 0xff, 0x35, 0x05, 0x0a, 0x00,
> >> - 0x00, 0xff, 0xff, 0x00 }; /* no continuation */
> >> + 0x00, 0xff, 0xff, 0x00); /* no continuation */
> >>
> >> -static const uint8_t did_rsp_pdu[] = { 0x07, /* PDU id */
> >> +static struct pdu did_rsp_pdu = raw_pdu(
> >> + 0x07, /* PDU id */
> >> 0x00, 0x00, /* Transaction id */
> >> 0x00, 0x4f, /* Response length */
> >> 0x00, 0x4c, /* Attributes length */
> >> @@ -79,9 +82,10 @@ static const uint8_t did_rsp_pdu[] = { 0x07, /* PDU id */
> >> 0x02, 0x02, 0x09, 0x02, 0x46, 0x09, 0x02, 0x03, 0x09,
> >> 0x05, 0x0e, 0x09, 0x02, 0x04, 0x28, 0x01, 0x09, 0x02,
> >> 0x05, 0x09, 0x00, 0x02,
> >> - 0x00 }; /* no continuation */
> >> + 0x00); /* no continuation */
> >>
> >> -static const uint8_t hid_rsp_pdu[] = { 0x07, /* PDU id */
> >> +static struct pdu hid_rsp_pdu = raw_pdu(
> >> + 0x07, /* PDU id */
> >> 0x00, 0x01, /* Transaction id */
> >> 0x01, 0x71, /* Response length */
> >> 0x01, 0x6E, /* Attributes length */
> >> @@ -126,7 +130,7 @@ static const uint8_t hid_rsp_pdu[] = { 0x07, /* PDU id */
> >> 0x28, 0x01, 0x09, 0x02, 0x0b, 0x09, 0x01, 0x00, 0x09,
> >> 0x02, 0x0c, 0x09, 0x0c, 0x80, 0x09, 0x02, 0x0d, 0x28,
> >> 0x00, 0x09, 0x02, 0x0e, 0x28, 0x01,
> >> - 0x00 }; /* no continuation */
> >> + 0x00); /* no continuation */
> >>
> >> static void hid_sdp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
> >> {
> >> @@ -134,14 +138,14 @@ static void hid_sdp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
> >> struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
> >> struct emu_cid_data *cid_data = user_data;
> >>
> >> - if (!memcmp(did_req_pdu, data, len)) {
> >> + if (!memcmp(did_req_pdu.data, data, len)) {
> >> bthost_send_cid(bthost, cid_data->sdp_handle, cid_data->sdp_cid,
> >> - did_rsp_pdu, sizeof(did_rsp_pdu));
> >> + did_rsp_pdu.data, did_rsp_pdu.size);
> >> return;
> >> }
> >>
> >> bthost_send_cid(bthost, cid_data->sdp_handle, cid_data->sdp_cid,
> >> - hid_rsp_pdu, sizeof(hid_rsp_pdu));
> >> + hid_rsp_pdu.data, hid_rsp_pdu.size);
> >> }
> >> static void hid_sdp_search_cb(uint16_t handle, uint16_t cid, void *user_data)
> >> {
> >> @@ -159,31 +163,20 @@ static void hid_prepare_reply_protocol_mode(struct emu_cid_data *cid_data)
> >> {
> >> struct test_data *t_data = tester_get_data();
> >> struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
> >> - uint8_t pdu[2] = { 0, 0 };
> >> - uint16_t pdu_len = 0;
> >> -
> >> - pdu_len = 2;
> >> - pdu[0] = 0xa0;
> >> - pdu[1] = 0x00;
> >> + const struct pdu pdu = raw_pdu(0xa0, 0x00);
> >>
> >> bthost_send_cid(bthost, cid_data->ctrl_handle, cid_data->ctrl_cid,
> >> - (void *)pdu, pdu_len);
> >> + pdu.data, pdu.size);
>
> Something is not quite right if you have to cast to void *, it looks
> like we should pass a reference e.g. &pdu not the value itself.
That line with (void *) is removed in this patch :)
>
> >> }
> >>
> >> static void hid_prepare_reply_report(struct emu_cid_data *cid_data)
> >> {
> >> struct test_data *t_data = tester_get_data();
> >> struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
> >> - uint8_t pdu[3] = { 0, 0, 0 };
> >> - uint16_t pdu_len = 0;
> >> -
> >> - pdu_len = 3;
> >> - pdu[0] = 0xa2;
> >> - pdu[1] = 0x01;
> >> - pdu[2] = 0x00;
> >> + const struct pdu pdu = raw_pdu(0xa2, 0x01, 0x00);
> >>
> >> bthost_send_cid(bthost, cid_data->ctrl_handle, cid_data->ctrl_cid,
> >> - (void *)pdu, pdu_len);
> >> + pdu.data, pdu.size);
> >> }
> >>
> >> static void hid_ctrl_cid_hook_cb(const void *data, uint16_t len,
> >>
> >
> > --
> > Best regards,
> > Szymon Janc
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
>
>
--
Best regards,
Szymon Janc
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [PATCHv2 05/16] android/tester: Make HidHost tests use generic pdu struct
2014-09-30 10:00 ` Szymon Janc
@ 2014-09-30 10:10 ` Luiz Augusto von Dentz
0 siblings, 0 replies; 28+ messages in thread
From: Luiz Augusto von Dentz @ 2014-09-30 10:10 UTC (permalink / raw)
To: Szymon Janc; +Cc: Jakub Tyszkowski, linux-bluetooth@vger.kernel.org
Hi Szymon,
On Tue, Sep 30, 2014 at 1:00 PM, Szymon Janc <szymon.janc@tieto.com> wrote:
> Hi Luiz,
>
> On Tuesday 30 of September 2014 12:54:54 Luiz Augusto von Dentz wrote:
>> Hi,
>>
>> On Tue, Sep 30, 2014 at 12:40 PM, Szymon Janc <szymon.janc@tieto.com> wrote:
>> > Hi Jakub,
>> >
>> > On Friday 26 of September 2014 08:31:06 Jakub Tyszkowski wrote:
>> >> ---
>> >> android/tester-hidhost.c | 41 +++++++++++++++++------------------------
>> >> 1 file changed, 17 insertions(+), 24 deletions(-)
>> >>
>> >> diff --git a/android/tester-hidhost.c b/android/tester-hidhost.c
>> >> index c7e3a67..0fe9c0a 100644
>> >> --- a/android/tester-hidhost.c
>> >> +++ b/android/tester-hidhost.c
>> >> @@ -21,6 +21,7 @@
>> >> #include "tester-main.h"
>> >>
>> >> #include "android/utils.h"
>> >> +#include "src/shared/util.h"
>> >
>> > Is this needed?
>> >
>> >> #define HID_GET_REPORT_PROTOCOL 0x60
>> >> #define HID_GET_BOOT_PROTOCOL 0x61
>> >> @@ -59,14 +60,16 @@ struct emu_cid_data {
>> >>
>> >> static struct emu_cid_data cid_data;
>> >>
>> >> -static const uint8_t did_req_pdu[] = { 0x06, /* PDU id */
>> >> +static struct pdu did_req_pdu = raw_pdu(
>> >> + 0x06, /* PDU id */
>> >> 0x00, 0x00, /* Transaction id */
>> >> 0x00, 0x0f, /* Req length */
>> >> 0x35, 0x03, /* Attributes length */
>> >> 0x19, 0x12, 0x00, 0xff, 0xff, 0x35, 0x05, 0x0a, 0x00,
>> >> - 0x00, 0xff, 0xff, 0x00 }; /* no continuation */
>> >> + 0x00, 0xff, 0xff, 0x00); /* no continuation */
>> >>
>> >> -static const uint8_t did_rsp_pdu[] = { 0x07, /* PDU id */
>> >> +static struct pdu did_rsp_pdu = raw_pdu(
>> >> + 0x07, /* PDU id */
>> >> 0x00, 0x00, /* Transaction id */
>> >> 0x00, 0x4f, /* Response length */
>> >> 0x00, 0x4c, /* Attributes length */
>> >> @@ -79,9 +82,10 @@ static const uint8_t did_rsp_pdu[] = { 0x07, /* PDU id */
>> >> 0x02, 0x02, 0x09, 0x02, 0x46, 0x09, 0x02, 0x03, 0x09,
>> >> 0x05, 0x0e, 0x09, 0x02, 0x04, 0x28, 0x01, 0x09, 0x02,
>> >> 0x05, 0x09, 0x00, 0x02,
>> >> - 0x00 }; /* no continuation */
>> >> + 0x00); /* no continuation */
>> >>
>> >> -static const uint8_t hid_rsp_pdu[] = { 0x07, /* PDU id */
>> >> +static struct pdu hid_rsp_pdu = raw_pdu(
>> >> + 0x07, /* PDU id */
>> >> 0x00, 0x01, /* Transaction id */
>> >> 0x01, 0x71, /* Response length */
>> >> 0x01, 0x6E, /* Attributes length */
>> >> @@ -126,7 +130,7 @@ static const uint8_t hid_rsp_pdu[] = { 0x07, /* PDU id */
>> >> 0x28, 0x01, 0x09, 0x02, 0x0b, 0x09, 0x01, 0x00, 0x09,
>> >> 0x02, 0x0c, 0x09, 0x0c, 0x80, 0x09, 0x02, 0x0d, 0x28,
>> >> 0x00, 0x09, 0x02, 0x0e, 0x28, 0x01,
>> >> - 0x00 }; /* no continuation */
>> >> + 0x00); /* no continuation */
>> >>
>> >> static void hid_sdp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
>> >> {
>> >> @@ -134,14 +138,14 @@ static void hid_sdp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
>> >> struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
>> >> struct emu_cid_data *cid_data = user_data;
>> >>
>> >> - if (!memcmp(did_req_pdu, data, len)) {
>> >> + if (!memcmp(did_req_pdu.data, data, len)) {
>> >> bthost_send_cid(bthost, cid_data->sdp_handle, cid_data->sdp_cid,
>> >> - did_rsp_pdu, sizeof(did_rsp_pdu));
>> >> + did_rsp_pdu.data, did_rsp_pdu.size);
>> >> return;
>> >> }
>> >>
>> >> bthost_send_cid(bthost, cid_data->sdp_handle, cid_data->sdp_cid,
>> >> - hid_rsp_pdu, sizeof(hid_rsp_pdu));
>> >> + hid_rsp_pdu.data, hid_rsp_pdu.size);
>> >> }
>> >> static void hid_sdp_search_cb(uint16_t handle, uint16_t cid, void *user_data)
>> >> {
>> >> @@ -159,31 +163,20 @@ static void hid_prepare_reply_protocol_mode(struct emu_cid_data *cid_data)
>> >> {
>> >> struct test_data *t_data = tester_get_data();
>> >> struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
>> >> - uint8_t pdu[2] = { 0, 0 };
>> >> - uint16_t pdu_len = 0;
>> >> -
>> >> - pdu_len = 2;
>> >> - pdu[0] = 0xa0;
>> >> - pdu[1] = 0x00;
>> >> + const struct pdu pdu = raw_pdu(0xa0, 0x00);
>> >>
>> >> bthost_send_cid(bthost, cid_data->ctrl_handle, cid_data->ctrl_cid,
>> >> - (void *)pdu, pdu_len);
>> >> + pdu.data, pdu.size);
>>
>> Something is not quite right if you have to cast to void *, it looks
>> like we should pass a reference e.g. &pdu not the value itself.
>
> That line with (void *) is removed in this patch :)
Nevermind then, I must be seeing the opposite today.
>>
>> >> }
>> >>
>> >> static void hid_prepare_reply_report(struct emu_cid_data *cid_data)
>> >> {
>> >> struct test_data *t_data = tester_get_data();
>> >> struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
>> >> - uint8_t pdu[3] = { 0, 0, 0 };
>> >> - uint16_t pdu_len = 0;
>> >> -
>> >> - pdu_len = 3;
>> >> - pdu[0] = 0xa2;
>> >> - pdu[1] = 0x01;
>> >> - pdu[2] = 0x00;
>> >> + const struct pdu pdu = raw_pdu(0xa2, 0x01, 0x00);
>> >>
>> >> bthost_send_cid(bthost, cid_data->ctrl_handle, cid_data->ctrl_cid,
>> >> - (void *)pdu, pdu_len);
>> >> + pdu.data, pdu.size);
>> >> }
>> >>
>> >> static void hid_ctrl_cid_hook_cb(const void *data, uint16_t len,
>> >>
>> >
>> > --
>> > Best regards,
>> > Szymon Janc
>> > --
>> > To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
>> > the body of a message to majordomo@vger.kernel.org
>> > More majordomo info at http://vger.kernel.org/majordomo-info.html
>>
>>
>>
>>
>
> --
> Best regards,
> Szymon Janc
--
Luiz Augusto von Dentz
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCHv2 05/16] android/tester: Make HidHost tests use generic pdu struct
2014-09-30 9:40 ` Szymon Janc
2014-09-30 9:54 ` Luiz Augusto von Dentz
@ 2014-09-30 12:01 ` Tyszkowski Jakub
1 sibling, 0 replies; 28+ messages in thread
From: Tyszkowski Jakub @ 2014-09-30 12:01 UTC (permalink / raw)
To: Szymon Janc; +Cc: linux-bluetooth
Hi Szymon,
On 09/30/2014 11:40 AM, Szymon Janc wrote:
> Hi Jakub,
>
> On Friday 26 of September 2014 08:31:06 Jakub Tyszkowski wrote:
>> ---
>> android/tester-hidhost.c | 41 +++++++++++++++++------------------------
>> 1 file changed, 17 insertions(+), 24 deletions(-)
>>
>> diff --git a/android/tester-hidhost.c b/android/tester-hidhost.c
>> index c7e3a67..0fe9c0a 100644
>> --- a/android/tester-hidhost.c
>> +++ b/android/tester-hidhost.c
>> @@ -21,6 +21,7 @@
>> #include "tester-main.h"
>>
>> #include "android/utils.h"
>> +#include "src/shared/util.h"
>
> Is this needed?
>
Not really. Ill fix that.
>> #define HID_GET_REPORT_PROTOCOL 0x60
>> #define HID_GET_BOOT_PROTOCOL 0x61
>> @@ -59,14 +60,16 @@ struct emu_cid_data {
>>
>> static struct emu_cid_data cid_data;
>>
>> -static const uint8_t did_req_pdu[] = { 0x06, /* PDU id */
>> +static struct pdu did_req_pdu = raw_pdu(
>> + 0x06, /* PDU id */
>> 0x00, 0x00, /* Transaction id */
>> 0x00, 0x0f, /* Req length */
>> 0x35, 0x03, /* Attributes length */
>> 0x19, 0x12, 0x00, 0xff, 0xff, 0x35, 0x05, 0x0a, 0x00,
>> - 0x00, 0xff, 0xff, 0x00 }; /* no continuation */
>> + 0x00, 0xff, 0xff, 0x00); /* no continuation */
>>
>> -static const uint8_t did_rsp_pdu[] = { 0x07, /* PDU id */
>> +static struct pdu did_rsp_pdu = raw_pdu(
>> + 0x07, /* PDU id */
>> 0x00, 0x00, /* Transaction id */
>> 0x00, 0x4f, /* Response length */
>> 0x00, 0x4c, /* Attributes length */
>> @@ -79,9 +82,10 @@ static const uint8_t did_rsp_pdu[] = { 0x07, /* PDU id */
>> 0x02, 0x02, 0x09, 0x02, 0x46, 0x09, 0x02, 0x03, 0x09,
>> 0x05, 0x0e, 0x09, 0x02, 0x04, 0x28, 0x01, 0x09, 0x02,
>> 0x05, 0x09, 0x00, 0x02,
>> - 0x00 }; /* no continuation */
>> + 0x00); /* no continuation */
>>
>> -static const uint8_t hid_rsp_pdu[] = { 0x07, /* PDU id */
>> +static struct pdu hid_rsp_pdu = raw_pdu(
>> + 0x07, /* PDU id */
>> 0x00, 0x01, /* Transaction id */
>> 0x01, 0x71, /* Response length */
>> 0x01, 0x6E, /* Attributes length */
>> @@ -126,7 +130,7 @@ static const uint8_t hid_rsp_pdu[] = { 0x07, /* PDU id */
>> 0x28, 0x01, 0x09, 0x02, 0x0b, 0x09, 0x01, 0x00, 0x09,
>> 0x02, 0x0c, 0x09, 0x0c, 0x80, 0x09, 0x02, 0x0d, 0x28,
>> 0x00, 0x09, 0x02, 0x0e, 0x28, 0x01,
>> - 0x00 }; /* no continuation */
>> + 0x00); /* no continuation */
>>
>> static void hid_sdp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
>> {
>> @@ -134,14 +138,14 @@ static void hid_sdp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
>> struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
>> struct emu_cid_data *cid_data = user_data;
>>
>> - if (!memcmp(did_req_pdu, data, len)) {
>> + if (!memcmp(did_req_pdu.data, data, len)) {
>> bthost_send_cid(bthost, cid_data->sdp_handle, cid_data->sdp_cid,
>> - did_rsp_pdu, sizeof(did_rsp_pdu));
>> + did_rsp_pdu.data, did_rsp_pdu.size);
>> return;
>> }
>>
>> bthost_send_cid(bthost, cid_data->sdp_handle, cid_data->sdp_cid,
>> - hid_rsp_pdu, sizeof(hid_rsp_pdu));
>> + hid_rsp_pdu.data, hid_rsp_pdu.size);
>> }
>> static void hid_sdp_search_cb(uint16_t handle, uint16_t cid, void *user_data)
>> {
>> @@ -159,31 +163,20 @@ static void hid_prepare_reply_protocol_mode(struct emu_cid_data *cid_data)
>> {
>> struct test_data *t_data = tester_get_data();
>> struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
>> - uint8_t pdu[2] = { 0, 0 };
>> - uint16_t pdu_len = 0;
>> -
>> - pdu_len = 2;
>> - pdu[0] = 0xa0;
>> - pdu[1] = 0x00;
>> + const struct pdu pdu = raw_pdu(0xa0, 0x00);
>>
>> bthost_send_cid(bthost, cid_data->ctrl_handle, cid_data->ctrl_cid,
>> - (void *)pdu, pdu_len);
>> + pdu.data, pdu.size);
>> }
>>
>> static void hid_prepare_reply_report(struct emu_cid_data *cid_data)
>> {
>> struct test_data *t_data = tester_get_data();
>> struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
>> - uint8_t pdu[3] = { 0, 0, 0 };
>> - uint16_t pdu_len = 0;
>> -
>> - pdu_len = 3;
>> - pdu[0] = 0xa2;
>> - pdu[1] = 0x01;
>> - pdu[2] = 0x00;
>> + const struct pdu pdu = raw_pdu(0xa2, 0x01, 0x00);
>>
>> bthost_send_cid(bthost, cid_data->ctrl_handle, cid_data->ctrl_cid,
>> - (void *)pdu, pdu_len);
>> + pdu.data, pdu.size);
>> }
>>
>> static void hid_ctrl_cid_hook_cb(const void *data, uint16_t len,
>>
>
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCHv2 06/16] android/tester: Make PAN tests use generic pdu struct
2014-09-26 6:31 [PATCHv2 00/16] android/tester: Unifying the way PDU is handled Jakub Tyszkowski
` (4 preceding siblings ...)
2014-09-26 6:31 ` [PATCHv2 05/16] android/tester: Make HidHost " Jakub Tyszkowski
@ 2014-09-26 6:31 ` Jakub Tyszkowski
2014-09-26 6:31 ` [PATCHv2 07/16] android/tester: Make HDP " Jakub Tyszkowski
` (10 subsequent siblings)
16 siblings, 0 replies; 28+ messages in thread
From: Jakub Tyszkowski @ 2014-09-26 6:31 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Jakub Tyszkowski
---
android/tester-pan.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/android/tester-pan.c b/android/tester-pan.c
index 8d41d34..1a15d7f 100644
--- a/android/tester-pan.c
+++ b/android/tester-pan.c
@@ -29,9 +29,9 @@ struct emu_cid_data {
};
static struct emu_cid_data cid_data;
-static uint8_t pan_conn_req_pdu[] = { 0x01, 0x01, 0x02, 0x11, 0x16,
- 0x11, 0x15 };
-static uint8_t pan_conn_rsp_pdu[] = { 0x01, 0x02, 0x00, 0x00 };
+static struct pdu pan_conn_req_pdu = raw_pdu(0x01, 0x01, 0x02, 0x11, 0x16,
+ 0x11, 0x15);
+static struct pdu pan_conn_rsp_pdu = raw_pdu(0x01, 0x02, 0x00, 0x00);
static void pan_nap_cid_hook_cb(const void *data, uint16_t len, void *user_data)
{
@@ -39,10 +39,10 @@ static void pan_nap_cid_hook_cb(const void *data, uint16_t len, void *user_data)
struct emu_cid_data *cid_data = user_data;
struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
- if (!memcmp((uint8_t *) data, pan_conn_req_pdu,
- sizeof(pan_conn_req_pdu)))
+ if (!memcmp((uint8_t *) data, pan_conn_req_pdu.data,
+ pan_conn_req_pdu.size))
bthost_send_cid(bthost, cid_data->nap_handle, cid_data->nap_cid,
- pan_conn_rsp_pdu, sizeof(pan_conn_rsp_pdu));
+ pan_conn_rsp_pdu.data, pan_conn_rsp_pdu.size);
}
static void pan_connect_request_cb(uint16_t handle, uint16_t cid,
--
1.9.1
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCHv2 07/16] android/tester: Make HDP tests use generic pdu struct
2014-09-26 6:31 [PATCHv2 00/16] android/tester: Unifying the way PDU is handled Jakub Tyszkowski
` (5 preceding siblings ...)
2014-09-26 6:31 ` [PATCHv2 06/16] android/tester: Make PAN " Jakub Tyszkowski
@ 2014-09-26 6:31 ` Jakub Tyszkowski
2014-09-26 6:31 ` [PATCHv2 08/16] android/tester: Expose pdu_set structure so it can be reused Jakub Tyszkowski
` (9 subsequent siblings)
16 siblings, 0 replies; 28+ messages in thread
From: Jakub Tyszkowski @ 2014-09-26 6:31 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Jakub Tyszkowski
---
android/tester-hdp.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/android/tester-hdp.c b/android/tester-hdp.c
index 9ecef21..73ce774 100644
--- a/android/tester-hdp.c
+++ b/android/tester-hdp.c
@@ -184,7 +184,8 @@ static void hdp_unregister_app_action(void)
schedule_action_verification(step);
}
-static uint8_t hdp_rsp_pdu[] = { 0x07, /* PDU id */
+static struct pdu hdp_rsp_pdu = raw_pdu(
+ 0x07, /* PDU id */
0x00, 0x00, /* Transaction id */
0x01, 0xc8, /* Response length */
0x01, 0xc5, /* Attributes length */
@@ -239,7 +240,7 @@ static uint8_t hdp_rsp_pdu[] = { 0x07, /* PDU id */
0x63, 0x6f, 0x73, 0x65, 0x20, 0x4d, 0x65, 0x74, 0x65,
0x72, 0x0d, 0x09, 0x03, 0x01, 0x08, 0x01, 0x09, 0x03,
0x02, 0x08, 0x00,
- 0x00 };
+ 0x00);
static void hdp_sdp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
{
@@ -247,11 +248,11 @@ static void hdp_sdp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
struct emu_cid_data *cid_data = user_data;
- hdp_rsp_pdu[1] = ((uint8_t *) data)[1];
- hdp_rsp_pdu[2] = ((uint8_t *) data)[2];
+ hdp_rsp_pdu.data[1] = ((uint8_t *) data)[1];
+ hdp_rsp_pdu.data[2] = ((uint8_t *) data)[2];
bthost_send_cid(bthost, cid_data->sdp_handle, cid_data->sdp_cid,
- hdp_rsp_pdu, sizeof(hdp_rsp_pdu));
+ hdp_rsp_pdu.data, hdp_rsp_pdu.size);
}
static void hdp_sdp_search_cb(uint16_t handle, uint16_t cid, void *user_data)
--
1.9.1
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCHv2 08/16] android/tester: Expose pdu_set structure so it can be reused
2014-09-26 6:31 [PATCHv2 00/16] android/tester: Unifying the way PDU is handled Jakub Tyszkowski
` (6 preceding siblings ...)
2014-09-26 6:31 ` [PATCHv2 07/16] android/tester: Make HDP " Jakub Tyszkowski
@ 2014-09-26 6:31 ` Jakub Tyszkowski
2014-09-26 6:31 ` [PATCHv2 09/16] android/tester: Add generic hook to handle pdu exchange Jakub Tyszkowski
` (8 subsequent siblings)
16 siblings, 0 replies; 28+ messages in thread
From: Jakub Tyszkowski @ 2014-09-26 6:31 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Jakub Tyszkowski
More tester will reuse this structure when we move to generic pdu
exchange mechanism.
---
android/tester-a2dp.c | 5 +----
android/tester-avrcp.c | 5 +----
android/tester-main.h | 5 +++++
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/android/tester-a2dp.c b/android/tester-a2dp.c
index 047822e..e12844e 100644
--- a/android/tester-a2dp.c
+++ b/android/tester-a2dp.c
@@ -50,10 +50,7 @@ static struct emu_cid_data cid_data;
#define req_suspend 0x50, 0x09, 0x04
#define rsp_suspend 0x52, 0x09
-const struct pdu_set {
- struct pdu req;
- struct pdu rsp;
-} pdus[] = {
+static struct pdu_set pdus[] = {
{ raw_pdu(req_dsc), raw_pdu(rsp_dsc) },
{ raw_pdu(req_get), raw_pdu(rsp_get) },
{ raw_pdu(req_cfg), raw_pdu(rsp_cfg) },
diff --git a/android/tester-avrcp.c b/android/tester-avrcp.c
index fab6dfc..13ffd74 100644
--- a/android/tester-avrcp.c
+++ b/android/tester-avrcp.c
@@ -73,10 +73,7 @@ static struct pdu sdp_rsp_pdu = raw_pdu(
#define req_suspend 0x50, 0x09, 0x04
#define rsp_suspend 0x52, 0x09
-static const struct pdu_set {
- const struct pdu req;
- const struct pdu rsp;
-} pdus[] = {
+static struct pdu_set pdus[] = {
{ raw_pdu(req_dsc), raw_pdu(rsp_dsc) },
{ raw_pdu(req_get), raw_pdu(rsp_get) },
{ raw_pdu(req_cfg), raw_pdu(rsp_cfg) },
diff --git a/android/tester-main.h b/android/tester-main.h
index 4cbc83f..034290a 100644
--- a/android/tester-main.h
+++ b/android/tester-main.h
@@ -60,6 +60,11 @@ struct pdu {
uint16_t size;
};
+struct pdu_set {
+ struct pdu req;
+ struct pdu rsp;
+};
+
#define raw_data(args...) ((unsigned char[]) { args })
#define raw_pdu(args...) \
--
1.9.1
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCHv2 09/16] android/tester: Add generic hook to handle pdu exchange
2014-09-26 6:31 [PATCHv2 00/16] android/tester: Unifying the way PDU is handled Jakub Tyszkowski
` (7 preceding siblings ...)
2014-09-26 6:31 ` [PATCHv2 08/16] android/tester: Expose pdu_set structure so it can be reused Jakub Tyszkowski
@ 2014-09-26 6:31 ` Jakub Tyszkowski
2014-09-26 6:31 ` [PATCHv2 10/16] android/tester: Make A2DP use pdu exchange mechanism Jakub Tyszkowski
` (7 subsequent siblings)
16 siblings, 0 replies; 28+ messages in thread
From: Jakub Tyszkowski @ 2014-09-26 6:31 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Jakub Tyszkowski
This allows tester-main to register hooks for certain CID to
automatically perform pdu exchange by registering array of pdu pairs
(request_pdu, response_pdu). When null_pdu is used instead of
request_pdu, response is sent immediately without incoming pdu
verification.
This callback can also handle sdp request<->response with automaticaly
overwriting the transaction ID inside the response pdu to match the one
from request.
'emu_l2cap_cid_data' is used to pass tha appropriate data to the hook
mechanism. It is similar to 'emu_cid_data" used in other testers and
eventually will replace those.
---
android/tester-a2dp.c | 1 -
android/tester-avrcp.c | 1 -
android/tester-gatt.c | 1 -
android/tester-hidhost.c | 1 -
android/tester-main.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
android/tester-main.h | 11 +++++++++++
6 files changed, 59 insertions(+), 4 deletions(-)
diff --git a/android/tester-a2dp.c b/android/tester-a2dp.c
index e12844e..59384f9 100644
--- a/android/tester-a2dp.c
+++ b/android/tester-a2dp.c
@@ -18,7 +18,6 @@
#include <stdbool.h>
#include "emulator/bthost.h"
-#include "src/shared/util.h"
#include "tester-main.h"
#include "android/utils.h"
diff --git a/android/tester-avrcp.c b/android/tester-avrcp.c
index 13ffd74..647c0fd 100644
--- a/android/tester-avrcp.c
+++ b/android/tester-avrcp.c
@@ -18,7 +18,6 @@
#include <stdbool.h>
#include "emulator/bthost.h"
-#include "src/shared/util.h"
#include "tester-main.h"
#include "android/utils.h"
diff --git a/android/tester-gatt.c b/android/tester-gatt.c
index 73ef168..4f95ebe 100644
--- a/android/tester-gatt.c
+++ b/android/tester-gatt.c
@@ -19,7 +19,6 @@
#include "emulator/bthost.h"
#include "tester-main.h"
-#include "src/shared/util.h"
#define L2CAP_ATT_EXCHANGE_MTU_REQ 0x02
#define L2CAP_ATT_EXCHANGE_MTU_RSP 0x03
diff --git a/android/tester-hidhost.c b/android/tester-hidhost.c
index 0fe9c0a..6f524f2 100644
--- a/android/tester-hidhost.c
+++ b/android/tester-hidhost.c
@@ -21,7 +21,6 @@
#include "tester-main.h"
#include "android/utils.h"
-#include "src/shared/util.h"
#define HID_GET_REPORT_PROTOCOL 0x60
#define HID_GET_BOOT_PROTOCOL 0x61
diff --git a/android/tester-main.c b/android/tester-main.c
index b65029a..d2bf3d8 100644
--- a/android/tester-main.c
+++ b/android/tester-main.c
@@ -2011,6 +2011,54 @@ void emu_add_l2cap_server_action(void)
schedule_action_verification(step);
}
+static void print_data(const char *str, void *user_data)
+{
+ tester_debug("tester: %s", str);
+}
+
+static void emu_generic_cid_hook_cb(const void *data, uint16_t len,
+ void *user_data)
+{
+ struct test_data *t_data = tester_get_data();
+ struct emu_l2cap_cid_data *cid_data = user_data;
+ struct pdu_set *pdus = cid_data->pdu;
+ struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
+ int i;
+
+ for (i = 0; pdus[i].rsp.data; i++) {
+ if (pdus[i].req.data) {
+ if (pdus[i].req.size != len)
+ continue;
+
+ if (memcmp(pdus[i].req.data, data, len))
+ continue;
+ }
+
+ if (pdus[i].rsp.data) {
+ /* overwrite transaction id if its sdp pdu */
+ if (cid_data->is_sdp) {
+ pdus[i].rsp.data[1] = ((uint8_t *) data)[1];
+ pdus[i].rsp.data[2] = ((uint8_t *) data)[2];
+ }
+
+ util_hexdump('>', pdus[i].rsp.data, pdus[i].rsp.size,
+ print_data, NULL);
+
+ bthost_send_cid(bthost, cid_data->handle, cid_data->cid,
+ pdus[i].rsp.data, pdus[i].rsp.size);
+ }
+ }
+}
+
+void tester_handle_l2cap_data_exchange(struct emu_l2cap_cid_data *cid_data)
+{
+ struct test_data *t_data = tester_get_data();
+ struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
+
+ bthost_add_cid_hook(bthost, cid_data->handle, cid_data->cid,
+ emu_generic_cid_hook_cb, cid_data);
+}
+
static void rfcomm_connect_cb(uint16_t handle, uint16_t cid, void *user_data,
bool status)
{
diff --git a/android/tester-main.h b/android/tester-main.h
index 034290a..167d5d1 100644
--- a/android/tester-main.h
+++ b/android/tester-main.h
@@ -40,6 +40,7 @@
#include "src/shared/tester.h"
#include "src/shared/mgmt.h"
#include "src/shared/queue.h"
+#include "src/shared/util.h"
#include "emulator/hciemu.h"
#include <hardware/hardware.h>
@@ -442,6 +443,14 @@ struct emu_set_l2cap_data {
void *user_data;
};
+struct emu_l2cap_cid_data {
+ struct pdu_set *pdu;
+
+ uint16_t handle;
+ uint16_t cid;
+ bool is_sdp;
+};
+
/*
* Callback data structure should be enhanced with data
* returned by callbacks. It's used for test case step
@@ -504,6 +513,8 @@ struct test_case {
const struct step *step;
};
+void tester_handle_l2cap_data_exchange(struct emu_l2cap_cid_data *cid_data);
+
/* Get, remove test cases API */
struct queue *get_bluetooth_tests(void);
void remove_bluetooth_tests(void);
--
1.9.1
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCHv2 10/16] android/tester: Make A2DP use pdu exchange mechanism
2014-09-26 6:31 [PATCHv2 00/16] android/tester: Unifying the way PDU is handled Jakub Tyszkowski
` (8 preceding siblings ...)
2014-09-26 6:31 ` [PATCHv2 09/16] android/tester: Add generic hook to handle pdu exchange Jakub Tyszkowski
@ 2014-09-26 6:31 ` Jakub Tyszkowski
2014-09-26 6:31 ` [PATCHv2 11/16] android/tester: Make AVRCP tests use generic " Jakub Tyszkowski
` (6 subsequent siblings)
16 siblings, 0 replies; 28+ messages in thread
From: Jakub Tyszkowski @ 2014-09-26 6:31 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Jakub Tyszkowski
---
android/tester-a2dp.c | 51 +++++++++------------------------------------------
1 file changed, 9 insertions(+), 42 deletions(-)
diff --git a/android/tester-a2dp.c b/android/tester-a2dp.c
index 59384f9..a82aa71 100644
--- a/android/tester-a2dp.c
+++ b/android/tester-a2dp.c
@@ -24,13 +24,6 @@
static struct queue *list;
-struct emu_cid_data {
- uint16_t handle;
- uint16_t cid;
-};
-
-static struct emu_cid_data cid_data;
-
#define req_dsc 0x00, 0x01
#define rsp_dsc 0x02, 0x01, 0x04, 0x08
#define req_get 0x10, 0x02, 0x04
@@ -60,54 +53,28 @@ static struct pdu_set pdus[] = {
{ null_pdu, null_pdu },
};
-static void print_data(const char *str, void *user_data)
-{
- tester_debug("a2dp: %s", str);
-}
-
-static void a2dp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
-{
- struct emu_cid_data *cid_data = user_data;
- struct test_data *t_data = tester_get_data();
- struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
- int i;
-
- util_hexdump('>', data, len, print_data, NULL);
-
- for (i = 0; pdus[i].req.data; i++) {
- if (pdus[i].req.size != len)
- continue;
-
- if (memcmp(pdus[i].req.data, data, len))
- continue;
-
- util_hexdump('<', pdus[i].rsp.data, pdus[i].rsp.size,
- print_data, NULL);
-
- bthost_send_cid(bthost, cid_data->handle, cid_data->cid,
- pdus[i].rsp.data, pdus[i].rsp.size);
- }
-}
+static struct emu_l2cap_cid_data cid_data = {
+ .pdu = pdus,
+};
static void a2dp_connect_request_cb(uint16_t handle, uint16_t cid,
void *user_data)
{
- struct test_data *data = tester_get_data();
- struct bthost *bthost = hciemu_client_get_host(data->hciemu);
+ struct emu_l2cap_cid_data *cid_data = user_data;
- if (cid_data.handle)
+ if (cid_data->handle)
return;
- cid_data.handle = handle;
- cid_data.cid = cid;
+ cid_data->handle = handle;
+ cid_data->cid = cid;
- bthost_add_cid_hook(bthost, handle, cid, a2dp_cid_hook_cb, &cid_data);
+ tester_handle_l2cap_data_exchange(cid_data);
}
static struct emu_set_l2cap_data l2cap_setup_data = {
.psm = 25,
.func = a2dp_connect_request_cb,
- .user_data = NULL,
+ .user_data = &cid_data,
};
static void a2dp_connect_action(void)
--
1.9.1
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCHv2 11/16] android/tester: Make AVRCP tests use generic pdu exchange mechanism
2014-09-26 6:31 [PATCHv2 00/16] android/tester: Unifying the way PDU is handled Jakub Tyszkowski
` (9 preceding siblings ...)
2014-09-26 6:31 ` [PATCHv2 10/16] android/tester: Make A2DP use pdu exchange mechanism Jakub Tyszkowski
@ 2014-09-26 6:31 ` Jakub Tyszkowski
2014-09-26 6:31 ` [PATCHv2 12/16] android/tester: Make GATT use generic cid_data Jakub Tyszkowski
` (5 subsequent siblings)
16 siblings, 0 replies; 28+ messages in thread
From: Jakub Tyszkowski @ 2014-09-26 6:31 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Jakub Tyszkowski
---
android/tester-avrcp.c | 112 +++++++++++++++++--------------------------------
1 file changed, 38 insertions(+), 74 deletions(-)
diff --git a/android/tester-avrcp.c b/android/tester-avrcp.c
index 647c0fd..4a49bb0 100644
--- a/android/tester-avrcp.c
+++ b/android/tester-avrcp.c
@@ -24,35 +24,35 @@
static struct queue *list;
-struct emu_cid_data {
- uint16_t handle;
- uint16_t cid;
+#define sdp_rsp_pdu 0x07, \
+ 0x00, 0x00, \
+ 0x00, 0x7f, \
+ 0x00, 0x7c, \
+ 0x36, 0x00, 0x79, 0x36, 0x00, 0x3b, 0x09, 0x00, 0x00, \
+ 0x0a, 0x00, 0x01, 0x00, 0x04, 0x09, 0x00, 0x01, 0x35, \
+ 0x06, 0x19, 0x11, 0x0e, 0x19, 0x11, 0x0f, 0x09, 0x00, \
+ 0x04, 0x35, 0x10, 0x35, 0x06, 0x19, 0x01, 0x00, 0x09, \
+ 0x00, 0x17, 0x35, 0x06, 0x19, 0x00, 0x17, 0x09, 0x01, \
+ 0x03, 0x09, 0x00, 0x09, 0x35, 0x08, 0x35, 0x06, 0x19, \
+ 0x11, 0x0e, 0x09, 0x01, 0x00, 0x09, 0x03, 0x11, 0x09, \
+ 0x00, 0x01, 0x36, 0x00, 0x38, 0x09, 0x00, 0x00, 0x0a, \
+ 0x00, 0x01, 0x00, 0x05, 0x09, 0x00, 0x01, 0x35, 0x03, \
+ 0x19, 0x11, 0x0c, 0x09, 0x00, 0x04, 0x35, 0x10, 0x35, \
+ 0x06, 0x19, 0x01, 0x00, 0x09, 0x00, 0x17, 0x35, 0x06, \
+ 0x19, 0x00, 0x17, 0x09, 0x01, 0x03, 0x09, 0x00, 0x09, \
+ 0x35, 0x08, 0x35, 0x06, 0x19, 0x11, 0x0e, 0x09, 0x01, \
+ 0x04, 0x09, 0x03, 0x11, 0x09, 0x00, 0x02, \
+ 0x00
+
+static struct pdu_set sdp_pdus[] = {
+ { null_pdu, raw_pdu(sdp_rsp_pdu) },
+ { null_pdu, null_pdu },
};
-static struct emu_cid_data sdp_data;
-static struct emu_cid_data a2dp_data;
-static struct emu_cid_data avrcp_data;
-
-static struct pdu sdp_rsp_pdu = raw_pdu(
- 0x07, /* PDU id */
- 0x00, 0x00, /* Transaction id */
- 0x00, 0x7f, /* Response length */
- 0x00, 0x7c, /* Attributes length */
- 0x36, 0x00, 0x79, 0x36, 0x00, 0x3b, 0x09, 0x00, 0x00,
- 0x0a, 0x00, 0x01, 0x00, 0x04, 0x09, 0x00, 0x01, 0x35,
- 0x06, 0x19, 0x11, 0x0e, 0x19, 0x11, 0x0f, 0x09, 0x00,
- 0x04, 0x35, 0x10, 0x35, 0x06, 0x19, 0x01, 0x00, 0x09,
- 0x00, 0x17, 0x35, 0x06, 0x19, 0x00, 0x17, 0x09, 0x01,
- 0x03, 0x09, 0x00, 0x09, 0x35, 0x08, 0x35, 0x06, 0x19,
- 0x11, 0x0e, 0x09, 0x01, 0x00, 0x09, 0x03, 0x11, 0x09,
- 0x00, 0x01, 0x36, 0x00, 0x38, 0x09, 0x00, 0x00, 0x0a,
- 0x00, 0x01, 0x00, 0x05, 0x09, 0x00, 0x01, 0x35, 0x03,
- 0x19, 0x11, 0x0c, 0x09, 0x00, 0x04, 0x35, 0x10, 0x35,
- 0x06, 0x19, 0x01, 0x00, 0x09, 0x00, 0x17, 0x35, 0x06,
- 0x19, 0x00, 0x17, 0x09, 0x01, 0x03, 0x09, 0x00, 0x09,
- 0x35, 0x08, 0x35, 0x06, 0x19, 0x11, 0x0e, 0x09, 0x01,
- 0x04, 0x09, 0x03, 0x11, 0x09, 0x00, 0x02,
- 0x00); /* no continuation */
+static struct emu_l2cap_cid_data sdp_data = {
+ .pdu = sdp_pdus,
+ .is_sdp = TRUE,
+};
#define req_dsc 0x00, 0x01
#define rsp_dsc 0x02, 0x01, 0x04, 0x08
@@ -83,6 +83,12 @@ static struct pdu_set pdus[] = {
{ null_pdu, null_pdu },
};
+static struct emu_l2cap_cid_data a2dp_data = {
+ .pdu = pdus,
+};
+
+static struct emu_l2cap_cid_data avrcp_data;
+
static void print_avrcp(const char *str, void *user_data)
{
tester_debug("avrcp: %s", str);
@@ -98,7 +104,7 @@ static void avrcp_connect_request_cb(uint16_t handle, uint16_t cid,
{
struct test_data *data = tester_get_data();
struct bthost *bthost = hciemu_client_get_host(data->hciemu);
- struct emu_cid_data *cid_data = user_data;
+ struct emu_l2cap_cid_data *cid_data = user_data;
cid_data->handle = handle;
cid_data->cid = cid;
@@ -112,41 +118,10 @@ static struct emu_set_l2cap_data avrcp_setup_data = {
.user_data = &avrcp_data,
};
-static void print_a2dp(const char *str, void *user_data)
-{
- tester_debug("a2dp: %s", str);
-}
-
-static void a2dp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
-{
- struct emu_cid_data *cid_data = user_data;
- struct test_data *t_data = tester_get_data();
- struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
- int i;
-
- util_hexdump('>', data, len, print_a2dp, NULL);
-
- for (i = 0; pdus[i].req.data; i++) {
- if (pdus[i].req.size != len)
- continue;
-
- if (memcmp(pdus[i].req.data, data, len))
- continue;
-
- util_hexdump('<', pdus[i].rsp.data, pdus[i].rsp.size,
- print_a2dp, NULL);
-
- bthost_send_cid(bthost, cid_data->handle, cid_data->cid,
- pdus[i].rsp.data, pdus[i].rsp.size);
- }
-}
-
static void a2dp_connect_request_cb(uint16_t handle, uint16_t cid,
void *user_data)
{
- struct test_data *data = tester_get_data();
- struct bthost *bthost = hciemu_client_get_host(data->hciemu);
- struct emu_cid_data *cid_data = user_data;
+ struct emu_l2cap_cid_data *cid_data = user_data;
if (cid_data->handle)
return;
@@ -154,7 +129,7 @@ static void a2dp_connect_request_cb(uint16_t handle, uint16_t cid,
cid_data->handle = handle;
cid_data->cid = cid;
- bthost_add_cid_hook(bthost, handle, cid, a2dp_cid_hook_cb, cid_data);
+ tester_handle_l2cap_data_exchange(cid_data);
}
static struct emu_set_l2cap_data a2dp_setup_data = {
@@ -163,26 +138,15 @@ static struct emu_set_l2cap_data a2dp_setup_data = {
.user_data = &a2dp_data,
};
-static void sdp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
-{
- struct test_data *t_data = tester_get_data();
- struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
- struct emu_cid_data *cid_data = user_data;
-
- bthost_send_cid(bthost, cid_data->handle, cid_data->cid,
- sdp_rsp_pdu.data, sdp_rsp_pdu.size);
-}
static void sdp_connect_request_cb(uint16_t handle, uint16_t cid,
void *user_data)
{
- struct test_data *data = tester_get_data();
- struct bthost *bthost = hciemu_client_get_host(data->hciemu);
- struct emu_cid_data *cid_data = user_data;
+ struct emu_l2cap_cid_data *cid_data = user_data;
cid_data->handle = handle;
cid_data->cid = cid;
- bthost_add_cid_hook(bthost, handle, cid, sdp_cid_hook_cb, cid_data);
+ tester_handle_l2cap_data_exchange(cid_data);
}
static struct emu_set_l2cap_data sdp_setup_data = {
--
1.9.1
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCHv2 12/16] android/tester: Make GATT use generic cid_data
2014-09-26 6:31 [PATCHv2 00/16] android/tester: Unifying the way PDU is handled Jakub Tyszkowski
` (10 preceding siblings ...)
2014-09-26 6:31 ` [PATCHv2 11/16] android/tester: Make AVRCP tests use generic " Jakub Tyszkowski
@ 2014-09-26 6:31 ` Jakub Tyszkowski
2014-09-26 6:31 ` [PATCHv2 13/16] android/tester: Make HDP tests use generic PDU exchange mechanism Jakub Tyszkowski
` (4 subsequent siblings)
16 siblings, 0 replies; 28+ messages in thread
From: Jakub Tyszkowski @ 2014-09-26 6:31 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Jakub Tyszkowski
---
android/tester-gatt.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/android/tester-gatt.c b/android/tester-gatt.c
index 4f95ebe..86d7470 100644
--- a/android/tester-gatt.c
+++ b/android/tester-gatt.c
@@ -40,14 +40,6 @@ static bt_uuid_t client_app_uuid = {
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 },
};
-struct emu_cid_data {
- const int pdu_len;
- const void *pdu;
-
- uint16_t handle;
- uint16_t cid;
-};
-
struct gatt_connect_data {
const int client_id;
const int conn_id;
@@ -123,7 +115,7 @@ static bt_property_t prop_test_scan_mode_conn = {
.len = sizeof(setprop_scan_mode_conn_val),
};
-static struct emu_cid_data cid_data;
+static struct emu_l2cap_cid_data cid_data;
static struct gatt_connect_data client1_conn_req = {
.client_id = CLIENT1_ID,
@@ -824,7 +816,7 @@ static void gatt_cid_hook_cb(const void *data, uint16_t len, void *user_data)
{
struct test_data *t_data = tester_get_data();
struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
- struct emu_cid_data *cid_data = user_data;
+ struct emu_l2cap_cid_data *cid_data = user_data;
const uint8_t *pdu = data;
struct pdu *gatt_pdu = queue_peek_head(t_data->pdus);
--
1.9.1
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCHv2 13/16] android/tester: Make HDP tests use generic PDU exchange mechanism
2014-09-26 6:31 [PATCHv2 00/16] android/tester: Unifying the way PDU is handled Jakub Tyszkowski
` (11 preceding siblings ...)
2014-09-26 6:31 ` [PATCHv2 12/16] android/tester: Make GATT use generic cid_data Jakub Tyszkowski
@ 2014-09-26 6:31 ` Jakub Tyszkowski
2014-09-26 6:31 ` [PATCHv2 14/16] android/tester: Make HIDHost " Jakub Tyszkowski
` (3 subsequent siblings)
16 siblings, 0 replies; 28+ messages in thread
From: Jakub Tyszkowski @ 2014-09-26 6:31 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Jakub Tyszkowski
---
android/tester-hdp.c | 185 ++++++++++++++++++++++++---------------------------
1 file changed, 87 insertions(+), 98 deletions(-)
diff --git a/android/tester-hdp.c b/android/tester-hdp.c
index 73ce774..f021943 100644
--- a/android/tester-hdp.c
+++ b/android/tester-hdp.c
@@ -28,16 +28,75 @@ typedef enum {
HDP_APP_SOURCE_STREAM,
} hdp_app_reg_type;
-struct emu_cid_data {
- uint16_t sdp_handle;
- uint16_t sdp_cid;
- uint16_t ctrl_handle;
- uint16_t ctrl_cid;
- uint16_t data_handle;
- uint16_t data_cid;
+#define hdp_rsp_pdu 0x07, \
+ 0x00, 0x00, \
+ 0x01, 0xc8, \
+ 0x01, 0xc5, \
+ 0x36, 0x01, 0xc2, 0x36, 0x01, 0xbf, 0x09, 0x00, 0x00, \
+ 0x0a, 0x00, 0x01, 0x00, 0x00, 0x09, 0x00, 0x01, 0x35, \
+ 0x03, 0x19, 0x14, 0x01, 0x09, 0x00, 0x04, 0x35, 0x10, \
+ 0x35, 0x06, 0x19, 0x01, 0x00, 0x09, 0x10, 0x01, 0x35, \
+ 0x06, 0x19, 0x00, 0x1e, 0x09, 0x01, 0x00, 0x09, 0x00, \
+ 0x09, 0x35, 0x08, 0x35, 0x06, 0x19, 0x14, 0x00, 0x09, \
+ 0x01, 0x01, 0x09, 0x00, 0x0d, 0x35, 0x0f, 0x35, 0x0d, \
+ 0x35, 0x06, 0x19, 0x01, 0x00, 0x09, 0x10, 0x03, 0x35, \
+ 0x03, 0x19, 0x00, 0x1f, 0x09, 0x01, 0x00, 0x25, 0x03, \
+ 0x48, 0x44, 0x50, 0x09, 0x01, 0x01, 0x25, 0x28, 0x43, \
+ 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x2c, 0x20, 0x64, \
+ 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x2c, 0x20, 0x61, \
+ 0x6e, 0x64, 0x20, 0x72, 0x65, 0x8b, 0x6c, 0x61, 0x79, \
+ 0x20, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x20, 0x64, \
+ 0x61, 0x74, 0x61, 0x09, 0x01, 0x02, 0x25, 0x0d, 0x42, \
+ 0x4c, 0x55, 0x45, 0x54, 0x4f, 0x4f, 0x54, 0x48, 0x20, \
+ 0x53, 0x49, 0x47, 0x09, 0x02, 0x00, 0x36, 0x01, 0x22, \
+ 0x35, 0x18, 0x08, 0x01, 0x09, 0x10, 0x04, 0x08, 0x00, \
+ 0x25, 0x0f, 0x50, 0x75, 0x6c, 0x73, 0x65, 0x20, 0x4f, \
+ 0x78, 0x69, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x0d, 0x35, \
+ 0x20, 0x08, 0x02, 0x09, 0x10, 0x07, 0x08, 0x00, 0x25, \
+ 0x17, 0x42, 0x6c, 0x6f, 0x6f, 0x64, 0x20, 0x50, 0x72, \
+ 0x65, 0x73, 0x73, 0x75, 0x72, 0x65, 0x20, 0x4d, 0x6f, \
+ 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x0d, 0x35, 0x1a, 0x08, \
+ 0x03, 0x09, 0x10, 0x08, 0x08, 0x00, 0x25, 0x11, 0x42, \
+ 0x6f, 0x64, 0x79, 0x20, 0x54, 0x68, 0x65, 0x72, 0x6d, \
+ 0x6f, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x0d, 0x35, 0x1e, \
+ 0x08, 0x04, 0x09, 0x10, 0x0f, 0x08, 0x00, 0x25, 0x15, \
+ 0x42, 0x6f, 0x64, 0x79, 0x20, 0x57, 0x65, 0x69, 0x67, \
+ 0x68, 0x74, 0x20, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x09, \
+ 0x09, 0x09, 0x0d, 0x35, 0x17, 0x08, 0x05, 0x09, 0x10, \
+ 0x11, 0x08, 0x00, 0x25, 0x0e, 0x47, 0x6c, 0x75, 0x63, \
+ 0x6f, 0x73, 0x65, 0x20, 0x4d, 0x65, 0x74, 0x65, 0x72, \
+ 0x0d, 0x35, 0x18, 0x08, 0x06, 0x09, 0x10, 0x04, 0x08, \
+ 0x01, 0x25, 0x0f, 0x50, 0x75, 0x6c, 0x73, 0x65, 0x20, \
+ 0x4f, 0x78, 0x69, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x0d, \
+ 0x35, 0x20, 0x08, 0x07, 0x09, 0x10, 0x07, 0x08, 0x01, \
+ 0x25, 0x17, 0x42, 0x6c, 0x6f, 0x6f, 0x64, 0x20, 0x50, \
+ 0x72, 0x65, 0x73, 0x73, 0x75, 0x72, 0x65, 0x20, 0x4d, \
+ 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x0d, 0x35, 0x1a, \
+ 0x08, 0x08, 0x09, 0x10, 0x08, 0x08, 0x01, 0x25, 0x11, \
+ 0x42, 0x6f, 0x64, 0x79, 0x20, 0x54, 0x68, 0x65, 0x72, \
+ 0x6d, 0x6f, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x0d, 0x35, \
+ 0x1e, 0x08, 0x09, 0x09, 0x10, 0x0f, 0x08, 0x01, 0x25, \
+ 0x15, 0x42, 0x6f, 0x64, 0x79, 0x20, 0x57, 0x65, 0x69, \
+ 0x67, 0x68, 0x74, 0x20, 0x53, 0x63, 0x61, 0x6c, 0x65, \
+ 0x09, 0x09, 0x09, 0x0d, 0x35, 0x17, 0x08, 0x0a, 0x09, \
+ 0x10, 0x11, 0x08, 0x01, 0x25, 0x0e, 0x47, 0x6c, 0x75, \
+ 0x63, 0x6f, 0x73, 0x65, 0x20, 0x4d, 0x65, 0x74, 0x65, \
+ 0x72, 0x0d, 0x09, 0x03, 0x01, 0x08, 0x01, 0x09, 0x03, \
+ 0x02, 0x08, 0x00, \
+ 0x00
+
+static struct pdu_set sdp_pdus[] = {
+ { null_pdu, raw_pdu(hdp_rsp_pdu) },
+ { null_pdu, null_pdu },
};
-struct emu_cid_data cid_data;
+static struct emu_l2cap_cid_data sdp_cid_data = {
+ .pdu = sdp_pdus,
+ .is_sdp = TRUE,
+};
+
+static struct emu_l2cap_cid_data ctrl_cid_data;
+static struct emu_l2cap_cid_data data_cid_data;
static struct queue *list; /* List of hdp test cases */
@@ -184,87 +243,14 @@ static void hdp_unregister_app_action(void)
schedule_action_verification(step);
}
-static struct pdu hdp_rsp_pdu = raw_pdu(
- 0x07, /* PDU id */
- 0x00, 0x00, /* Transaction id */
- 0x01, 0xc8, /* Response length */
- 0x01, 0xc5, /* Attributes length */
- 0x36, 0x01, 0xc2, 0x36, 0x01, 0xbf, 0x09, 0x00, 0x00,
- 0x0a, 0x00, 0x01, 0x00, 0x00, 0x09, 0x00, 0x01, 0x35,
- 0x03, 0x19, 0x14, 0x01, 0x09, 0x00, 0x04, 0x35, 0x10,
- 0x35, 0x06, 0x19, 0x01, 0x00, 0x09, 0x10, 0x01, 0x35,
- 0x06, 0x19, 0x00, 0x1e, 0x09, 0x01, 0x00, 0x09, 0x00,
- 0x09, 0x35, 0x08, 0x35, 0x06, 0x19, 0x14, 0x00, 0x09,
- 0x01, 0x01, 0x09, 0x00, 0x0d, 0x35, 0x0f, 0x35, 0x0d,
- 0x35, 0x06, 0x19, 0x01, 0x00, 0x09, 0x10, 0x03, 0x35,
- 0x03, 0x19, 0x00, 0x1f, 0x09, 0x01, 0x00, 0x25, 0x03,
- 0x48, 0x44, 0x50, 0x09, 0x01, 0x01, 0x25, 0x28, 0x43,
- 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x2c, 0x20, 0x64,
- 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x2c, 0x20, 0x61,
- 0x6e, 0x64, 0x20, 0x72, 0x65, 0x8b, 0x6c, 0x61, 0x79,
- 0x20, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x20, 0x64,
- 0x61, 0x74, 0x61, 0x09, 0x01, 0x02, 0x25, 0x0d, 0x42,
- 0x4c, 0x55, 0x45, 0x54, 0x4f, 0x4f, 0x54, 0x48, 0x20,
- 0x53, 0x49, 0x47, 0x09, 0x02, 0x00, 0x36, 0x01, 0x22,
- 0x35, 0x18, 0x08, 0x01, 0x09, 0x10, 0x04, 0x08, 0x00,
- 0x25, 0x0f, 0x50, 0x75, 0x6c, 0x73, 0x65, 0x20, 0x4f,
- 0x78, 0x69, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x0d, 0x35,
- 0x20, 0x08, 0x02, 0x09, 0x10, 0x07, 0x08, 0x00, 0x25,
- 0x17, 0x42, 0x6c, 0x6f, 0x6f, 0x64, 0x20, 0x50, 0x72,
- 0x65, 0x73, 0x73, 0x75, 0x72, 0x65, 0x20, 0x4d, 0x6f,
- 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x0d, 0x35, 0x1a, 0x08,
- 0x03, 0x09, 0x10, 0x08, 0x08, 0x00, 0x25, 0x11, 0x42,
- 0x6f, 0x64, 0x79, 0x20, 0x54, 0x68, 0x65, 0x72, 0x6d,
- 0x6f, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x0d, 0x35, 0x1e,
- 0x08, 0x04, 0x09, 0x10, 0x0f, 0x08, 0x00, 0x25, 0x15,
- 0x42, 0x6f, 0x64, 0x79, 0x20, 0x57, 0x65, 0x69, 0x67,
- 0x68, 0x74, 0x20, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x09,
- 0x09, 0x09, 0x0d, 0x35, 0x17, 0x08, 0x05, 0x09, 0x10,
- 0x11, 0x08, 0x00, 0x25, 0x0e, 0x47, 0x6c, 0x75, 0x63,
- 0x6f, 0x73, 0x65, 0x20, 0x4d, 0x65, 0x74, 0x65, 0x72,
- 0x0d, 0x35, 0x18, 0x08, 0x06, 0x09, 0x10, 0x04, 0x08,
- 0x01, 0x25, 0x0f, 0x50, 0x75, 0x6c, 0x73, 0x65, 0x20,
- 0x4f, 0x78, 0x69, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x0d,
- 0x35, 0x20, 0x08, 0x07, 0x09, 0x10, 0x07, 0x08, 0x01,
- 0x25, 0x17, 0x42, 0x6c, 0x6f, 0x6f, 0x64, 0x20, 0x50,
- 0x72, 0x65, 0x73, 0x73, 0x75, 0x72, 0x65, 0x20, 0x4d,
- 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x0d, 0x35, 0x1a,
- 0x08, 0x08, 0x09, 0x10, 0x08, 0x08, 0x01, 0x25, 0x11,
- 0x42, 0x6f, 0x64, 0x79, 0x20, 0x54, 0x68, 0x65, 0x72,
- 0x6d, 0x6f, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x0d, 0x35,
- 0x1e, 0x08, 0x09, 0x09, 0x10, 0x0f, 0x08, 0x01, 0x25,
- 0x15, 0x42, 0x6f, 0x64, 0x79, 0x20, 0x57, 0x65, 0x69,
- 0x67, 0x68, 0x74, 0x20, 0x53, 0x63, 0x61, 0x6c, 0x65,
- 0x09, 0x09, 0x09, 0x0d, 0x35, 0x17, 0x08, 0x0a, 0x09,
- 0x10, 0x11, 0x08, 0x01, 0x25, 0x0e, 0x47, 0x6c, 0x75,
- 0x63, 0x6f, 0x73, 0x65, 0x20, 0x4d, 0x65, 0x74, 0x65,
- 0x72, 0x0d, 0x09, 0x03, 0x01, 0x08, 0x01, 0x09, 0x03,
- 0x02, 0x08, 0x00,
- 0x00);
-
-static void hdp_sdp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
-{
- struct test_data *t_data = tester_get_data();
- struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
- struct emu_cid_data *cid_data = user_data;
-
- hdp_rsp_pdu.data[1] = ((uint8_t *) data)[1];
- hdp_rsp_pdu.data[2] = ((uint8_t *) data)[2];
-
- bthost_send_cid(bthost, cid_data->sdp_handle, cid_data->sdp_cid,
- hdp_rsp_pdu.data, hdp_rsp_pdu.size);
-}
-
static void hdp_sdp_search_cb(uint16_t handle, uint16_t cid, void *user_data)
{
- struct test_data *data = tester_get_data();
- struct bthost *bthost = hciemu_client_get_host(data->hciemu);
+ struct emu_l2cap_cid_data *cid_data = user_data;
- cid_data.sdp_handle = handle;
- cid_data.sdp_cid = cid;
+ cid_data->handle = handle;
+ cid_data->cid = cid;
- bthost_add_cid_hook(bthost, handle, cid, hdp_sdp_cid_hook_cb,
- &cid_data);
+ tester_handle_l2cap_data_exchange(cid_data);
}
static void mcap_ctrl_cid_hook_cb(const void *data, uint16_t len,
@@ -272,6 +258,7 @@ static void mcap_ctrl_cid_hook_cb(const void *data, uint16_t len,
{
struct test_data *t_data = tester_get_data();
struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
+ struct emu_l2cap_cid_data *cid_data = user_data;
uint8_t crt_rsp[5], del_rsp[4], config;
uint8_t opcode = ((uint8_t *) data)[0];
static bool reliable = false;
@@ -296,8 +283,8 @@ static void mcap_ctrl_cid_hook_cb(const void *data, uint16_t len,
crt_rsp[4] = config;
}
- bthost_send_cid(bthost, cid_data.ctrl_handle,
- cid_data.ctrl_cid,
+ bthost_send_cid(bthost, cid_data->handle,
+ cid_data->cid,
crt_rsp, sizeof(crt_rsp));
break;
case 0x03: /* MD_RECONNECT_MDL_REQ */
@@ -308,8 +295,8 @@ static void mcap_ctrl_cid_hook_cb(const void *data, uint16_t len,
del_rsp[1] = 0x00; /* Response code - Success */
del_rsp[2] = ((uint8_t *) data)[1]; /* mdlid */
del_rsp[3] = ((uint8_t *) data)[2];
- bthost_send_cid(bthost, cid_data.ctrl_handle,
- cid_data.ctrl_cid,
+ bthost_send_cid(bthost, cid_data->handle,
+ cid_data->cid,
del_rsp, sizeof(del_rsp));
break;
}
@@ -319,12 +306,13 @@ static void mcap_ctrl_connect_cb(uint16_t handle, uint16_t cid, void *user_data)
{
struct test_data *data = tester_get_data();
struct bthost *bthost = hciemu_client_get_host(data->hciemu);
+ struct emu_l2cap_cid_data *cid_data = user_data;
- cid_data.ctrl_handle = handle;
- cid_data.ctrl_cid = cid;
+ cid_data->handle = handle;
+ cid_data->cid = cid;
bthost_add_cid_hook(bthost, handle, cid, mcap_ctrl_cid_hook_cb,
- &cid_data);
+ cid_data);
}
static void mcap_data_cid_hook_cb(const void *data, uint16_t len,
@@ -336,33 +324,34 @@ static void mcap_data_connect_cb(uint16_t handle, uint16_t cid, void *user_data)
{
struct test_data *data = tester_get_data();
struct bthost *bthost = hciemu_client_get_host(data->hciemu);
+ struct emu_l2cap_cid_data *cid_data = user_data;
- cid_data.data_handle = handle;
- cid_data.data_cid = cid;
+ cid_data->handle = handle;
+ cid_data->cid = cid;
bthost_add_cid_hook(bthost, handle, cid, mcap_data_cid_hook_cb,
- &cid_data);
+ cid_data);
}
/* Emulate SDP (PSM = 1) */
static struct emu_set_l2cap_data l2cap_setup_sdp_data = {
.psm = 1,
.func = hdp_sdp_search_cb,
- .user_data = NULL,
+ .user_data = &sdp_cid_data,
};
/* Emulate Control Channel (PSM = 0x1001) */
static struct emu_set_l2cap_data l2cap_setup_cc_data = {
.psm = 0x1001,
.func = mcap_ctrl_connect_cb,
- .user_data = NULL,
+ .user_data = &ctrl_cid_data,
};
/* Emulate Data Channel (PSM = 0x1003) */
static struct emu_set_l2cap_data l2cap_setup_dc_data = {
.psm = 0x1003,
.func = mcap_data_connect_cb,
- .user_data = NULL,
+ .user_data = &data_cid_data,
};
static void hdp_connect_source_reliable_action(void)
--
1.9.1
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCHv2 14/16] android/tester: Make HIDHost tests use generic PDU exchange mechanism
2014-09-26 6:31 [PATCHv2 00/16] android/tester: Unifying the way PDU is handled Jakub Tyszkowski
` (12 preceding siblings ...)
2014-09-26 6:31 ` [PATCHv2 13/16] android/tester: Make HDP tests use generic PDU exchange mechanism Jakub Tyszkowski
@ 2014-09-26 6:31 ` Jakub Tyszkowski
2014-09-26 6:31 ` [PATCHv2 15/16] android/tester: Make PAN " Jakub Tyszkowski
` (2 subsequent siblings)
16 siblings, 0 replies; 28+ messages in thread
From: Jakub Tyszkowski @ 2014-09-26 6:31 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Jakub Tyszkowski
---
android/tester-hidhost.c | 227 ++++++++++++++++++++++-------------------------
1 file changed, 108 insertions(+), 119 deletions(-)
diff --git a/android/tester-hidhost.c b/android/tester-hidhost.c
index 6f524f2..9ee026a 100644
--- a/android/tester-hidhost.c
+++ b/android/tester-hidhost.c
@@ -45,143 +45,130 @@
static struct queue *list; /* List of hidhost test cases */
-struct emu_cid_data {
- const int pdu_len;
- const void *pdu;
-
- uint16_t sdp_handle;
- uint16_t sdp_cid;
- uint16_t ctrl_handle;
- uint16_t ctrl_cid;
- uint16_t intr_handle;
- uint16_t intr_cid;
+#define did_req_pdu 0x06, \
+ 0x00, 0x00, \
+ 0x00, 0x0f, \
+ 0x35, 0x03, \
+ 0x19, 0x12, 0x00, 0xff, 0xff, 0x35, 0x05, 0x0a, 0x00, \
+ 0x00, 0xff, 0xff, 0x00
+
+#define did_rsp_pdu 0x07, \
+ 0x00, 0x00, \
+ 0x00, 0x4f, \
+ 0x00, 0x4c, \
+ 0x35, 0x4a, 0x35, 0x48, 0x09, 0x00, 0x00, 0x0a, 0x00, \
+ 0x01, 0x00, 0x00, 0x09, 0x00, 0x01, 0x35, 0x03, 0x19, \
+ 0x12, 0x00, 0x09, 0x00, 0x05, 0x35, 0x03, 0x19, 0x10, \
+ 0x02, 0x09, 0x00, 0x09, 0x35, 0x08, 0x35, 0x06, 0x19, \
+ 0x12, 0x00, 0x09, 0x01, 0x03, 0x09, 0x02, 0x00, 0x09, \
+ 0x01, 0x03, 0x09, 0x02, 0x01, 0x09, 0x1d, 0x6b, 0x09, \
+ 0x02, 0x02, 0x09, 0x02, 0x46, 0x09, 0x02, 0x03, 0x09, \
+ 0x05, 0x0e, 0x09, 0x02, 0x04, 0x28, 0x01, 0x09, 0x02, \
+ 0x05, 0x09, 0x00, 0x02, \
+ 0x00
+
+#define hid_req_pdu 0x06, \
+ 0x00, 0x01, \
+ 0x00, 0x0f, \
+ 0x35, 0x03, \
+ 0x19, 0x11, 0x24, 0xff, 0xff, 0x35, 0x05, 0x0a, 0x00, \
+ 0x00, 0xff, 0xff, 0x00
+
+#define hid_rsp_pdu 0x07, \
+ 0x00, 0x01, \
+ 0x01, 0x71, \
+ 0x01, 0x6E, \
+ 0x36, 0x01, 0x6b, 0x36, 0x01, 0x68, 0x09, 0x00, 0x00, \
+ 0x0a, 0x00, 0x01, 0x00, 0x00, 0x09, 0x00, 0x01, 0x35, \
+ 0x03, 0x19, 0x11, 0x24, 0x09, 0x00, 0x04, 0x35, 0x0d, \
+ 0x35, 0x06, 0x19, 0x01, 0x00, 0x09, 0x00, 0x11, 0x35, \
+ 0x03, 0x19, 0x00, 0x11, 0x09, 0x00, 0x05, 0x35, 0x03, \
+ 0x19, 0x10, 0x02, 0x09, 0x00, 0x06, 0x35, 0x09, 0x09, \
+ 0x65, 0x6e, 0x09, 0x00, 0x6a, 0x09, 0x01, 0x00, 0x09, \
+ 0x00, 0x09, 0x35, 0x08, 0x35, 0x06, 0x19, 0x11, 0x24, \
+ 0x09, 0x01, 0x00, 0x09, 0x00, 0x0d, 0x35, 0x0f, 0x35, \
+ 0x0d, 0x35, 0x06, 0x19, 0x01, 0x00, 0x09, 0x00, 0x13, \
+ 0x35, 0x03, 0x19, 0x00, 0x11, 0x09, 0x01, 0x00, 0x25, \
+ 0x1e, 0x4c, 0x6f, 0x67, 0x69, 0x74, 0x65, 0x63, 0x68, \
+ 0x20, 0x42, 0x6c, 0x75, 0x65, 0x74, 0x6f, 0x6f, 0x74, \
+ 0x68, 0x20, 0x4d, 0x6f, 0x75, 0x73, 0x65, 0x20, 0x4d, \
+ 0x35, 0x35, 0x35, 0x62, 0x09, 0x01, 0x01, 0x25, 0x0f, \
+ 0x42, 0x6c, 0x75, 0x65, 0x74, 0x6f, 0x6f, 0x74, 0x68, \
+ 0x20, 0x4d, 0x6f, 0x75, 0x73, 0x65, 0x09, 0x01, 0x02, \
+ 0x25, 0x08, 0x4c, 0x6f, 0x67, 0x69, 0x74, 0x65, 0x63, \
+ 0x68, 0x09, 0x02, 0x00, 0x09, 0x01, 0x00, 0x09, 0x02, \
+ 0x01, 0x09, 0x01, 0x11, 0x09, 0x02, 0x02, 0x08, 0x80, \
+ 0x09, 0x02, 0x03, 0x08, 0x21, 0x09, 0x02, 0x04, 0x28, \
+ 0x01, 0x09, 0x02, 0x05, 0x28, 0x01, 0x09, 0x02, 0x06, \
+ 0x35, 0x74, 0x35, 0x72, 0x08, 0x22, 0x25, 0x6e, 0x05, \
+ 0x01, 0x09, 0x02, 0xa1, 0x01, 0x85, 0x02, 0x09, 0x01, \
+ 0xa1, 0x00, 0x05, 0x09, 0x19, 0x01, 0x29, 0x08, 0x15, \
+ 0x00, 0x25, 0x01, 0x75, 0x01, 0x95, 0x08, 0x81, 0x02, \
+ 0x05, 0x01, 0x09, 0x30, 0x09, 0x31, 0x16, 0x01, 0xf8, \
+ 0x26, 0xff, 0x07, 0x75, 0x0c, 0x95, 0x02, 0x81, 0x06, \
+ 0x09, 0x38, 0x15, 0x81, 0x25, 0x7f, 0x75, 0x08, 0x95, \
+ 0x01, 0x81, 0x06, 0x05, 0x0c, 0x0a, 0x38, 0x02, 0x81, \
+ 0x06, 0x05, 0x09, 0x19, 0x09, 0x29, 0x10, 0x15, 0x00, \
+ 0x25, 0x01, 0x95, 0x08, 0x75, 0x01, 0x81, 0x02, 0xc0, \
+ 0xc0, 0x06, 0x00, 0xff, 0x09, 0x01, 0xa1, 0x01, 0x85, \
+ 0x10, 0x75, 0x08, 0x95, 0x06, 0x15, 0x00, 0x26, 0xff, \
+ 0x00, 0x09, 0x01, 0x81, 0x00, 0x09, 0x01, 0x91, 0x00, \
+ 0xc0, 0x09, 0x02, 0x07, 0x35, 0x08, 0x35, 0x06, 0x09, \
+ 0x04, 0x09, 0x09, 0x01, 0x00, 0x09, 0x02, 0x08, 0x28, \
+ 0x00, 0x09, 0x02, 0x09, 0x28, 0x01, 0x09, 0x02, 0x0a, \
+ 0x28, 0x01, 0x09, 0x02, 0x0b, 0x09, 0x01, 0x00, 0x09, \
+ 0x02, 0x0c, 0x09, 0x0c, 0x80, 0x09, 0x02, 0x0d, 0x28, \
+ 0x00, 0x09, 0x02, 0x0e, 0x28, 0x01, \
+ 0x00
+
+static struct pdu_set sdp_pdus[] = {
+ { raw_pdu(did_req_pdu), raw_pdu(did_rsp_pdu) },
+ { raw_pdu(hid_req_pdu), raw_pdu(hid_rsp_pdu) },
+ { null_pdu, null_pdu },
};
-static struct emu_cid_data cid_data;
-
-static struct pdu did_req_pdu = raw_pdu(
- 0x06, /* PDU id */
- 0x00, 0x00, /* Transaction id */
- 0x00, 0x0f, /* Req length */
- 0x35, 0x03, /* Attributes length */
- 0x19, 0x12, 0x00, 0xff, 0xff, 0x35, 0x05, 0x0a, 0x00,
- 0x00, 0xff, 0xff, 0x00); /* no continuation */
-
-static struct pdu did_rsp_pdu = raw_pdu(
- 0x07, /* PDU id */
- 0x00, 0x00, /* Transaction id */
- 0x00, 0x4f, /* Response length */
- 0x00, 0x4c, /* Attributes length */
- 0x35, 0x4a, 0x35, 0x48, 0x09, 0x00, 0x00, 0x0a, 0x00,
- 0x01, 0x00, 0x00, 0x09, 0x00, 0x01, 0x35, 0x03, 0x19,
- 0x12, 0x00, 0x09, 0x00, 0x05, 0x35, 0x03, 0x19, 0x10,
- 0x02, 0x09, 0x00, 0x09, 0x35, 0x08, 0x35, 0x06, 0x19,
- 0x12, 0x00, 0x09, 0x01, 0x03, 0x09, 0x02, 0x00, 0x09,
- 0x01, 0x03, 0x09, 0x02, 0x01, 0x09, 0x1d, 0x6b, 0x09,
- 0x02, 0x02, 0x09, 0x02, 0x46, 0x09, 0x02, 0x03, 0x09,
- 0x05, 0x0e, 0x09, 0x02, 0x04, 0x28, 0x01, 0x09, 0x02,
- 0x05, 0x09, 0x00, 0x02,
- 0x00); /* no continuation */
-
-static struct pdu hid_rsp_pdu = raw_pdu(
- 0x07, /* PDU id */
- 0x00, 0x01, /* Transaction id */
- 0x01, 0x71, /* Response length */
- 0x01, 0x6E, /* Attributes length */
- 0x36, 0x01, 0x6b, 0x36, 0x01, 0x68, 0x09, 0x00, 0x00,
- 0x0a, 0x00, 0x01, 0x00, 0x00, 0x09, 0x00, 0x01, 0x35,
- 0x03, 0x19, 0x11, 0x24, 0x09, 0x00, 0x04, 0x35, 0x0d,
- 0x35, 0x06, 0x19, 0x01, 0x00, 0x09, 0x00, 0x11, 0x35,
- 0x03, 0x19, 0x00, 0x11, 0x09, 0x00, 0x05, 0x35, 0x03,
- 0x19, 0x10, 0x02, 0x09, 0x00, 0x06, 0x35, 0x09, 0x09,
- 0x65, 0x6e, 0x09, 0x00, 0x6a, 0x09, 0x01, 0x00, 0x09,
- 0x00, 0x09, 0x35, 0x08, 0x35, 0x06, 0x19, 0x11, 0x24,
- 0x09, 0x01, 0x00, 0x09, 0x00, 0x0d, 0x35, 0x0f, 0x35,
- 0x0d, 0x35, 0x06, 0x19, 0x01, 0x00, 0x09, 0x00, 0x13,
- 0x35, 0x03, 0x19, 0x00, 0x11, 0x09, 0x01, 0x00, 0x25,
- 0x1e, 0x4c, 0x6f, 0x67, 0x69, 0x74, 0x65, 0x63, 0x68,
- 0x20, 0x42, 0x6c, 0x75, 0x65, 0x74, 0x6f, 0x6f, 0x74,
- 0x68, 0x20, 0x4d, 0x6f, 0x75, 0x73, 0x65, 0x20, 0x4d,
- 0x35, 0x35, 0x35, 0x62, 0x09, 0x01, 0x01, 0x25, 0x0f,
- 0x42, 0x6c, 0x75, 0x65, 0x74, 0x6f, 0x6f, 0x74, 0x68,
- 0x20, 0x4d, 0x6f, 0x75, 0x73, 0x65, 0x09, 0x01, 0x02,
- 0x25, 0x08, 0x4c, 0x6f, 0x67, 0x69, 0x74, 0x65, 0x63,
- 0x68, 0x09, 0x02, 0x00, 0x09, 0x01, 0x00, 0x09, 0x02,
- 0x01, 0x09, 0x01, 0x11, 0x09, 0x02, 0x02, 0x08, 0x80,
- 0x09, 0x02, 0x03, 0x08, 0x21, 0x09, 0x02, 0x04, 0x28,
- 0x01, 0x09, 0x02, 0x05, 0x28, 0x01, 0x09, 0x02, 0x06,
- 0x35, 0x74, 0x35, 0x72, 0x08, 0x22, 0x25, 0x6e, 0x05,
- 0x01, 0x09, 0x02, 0xa1, 0x01, 0x85, 0x02, 0x09, 0x01,
- 0xa1, 0x00, 0x05, 0x09, 0x19, 0x01, 0x29, 0x08, 0x15,
- 0x00, 0x25, 0x01, 0x75, 0x01, 0x95, 0x08, 0x81, 0x02,
- 0x05, 0x01, 0x09, 0x30, 0x09, 0x31, 0x16, 0x01, 0xf8,
- 0x26, 0xff, 0x07, 0x75, 0x0c, 0x95, 0x02, 0x81, 0x06,
- 0x09, 0x38, 0x15, 0x81, 0x25, 0x7f, 0x75, 0x08, 0x95,
- 0x01, 0x81, 0x06, 0x05, 0x0c, 0x0a, 0x38, 0x02, 0x81,
- 0x06, 0x05, 0x09, 0x19, 0x09, 0x29, 0x10, 0x15, 0x00,
- 0x25, 0x01, 0x95, 0x08, 0x75, 0x01, 0x81, 0x02, 0xc0,
- 0xc0, 0x06, 0x00, 0xff, 0x09, 0x01, 0xa1, 0x01, 0x85,
- 0x10, 0x75, 0x08, 0x95, 0x06, 0x15, 0x00, 0x26, 0xff,
- 0x00, 0x09, 0x01, 0x81, 0x00, 0x09, 0x01, 0x91, 0x00,
- 0xc0, 0x09, 0x02, 0x07, 0x35, 0x08, 0x35, 0x06, 0x09,
- 0x04, 0x09, 0x09, 0x01, 0x00, 0x09, 0x02, 0x08, 0x28,
- 0x00, 0x09, 0x02, 0x09, 0x28, 0x01, 0x09, 0x02, 0x0a,
- 0x28, 0x01, 0x09, 0x02, 0x0b, 0x09, 0x01, 0x00, 0x09,
- 0x02, 0x0c, 0x09, 0x0c, 0x80, 0x09, 0x02, 0x0d, 0x28,
- 0x00, 0x09, 0x02, 0x0e, 0x28, 0x01,
- 0x00); /* no continuation */
-
-static void hid_sdp_cid_hook_cb(const void *data, uint16_t len, void *user_data)
-{
- struct test_data *t_data = tester_get_data();
- struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
- struct emu_cid_data *cid_data = user_data;
+static struct emu_l2cap_cid_data sdp_cid_data = {
+ .pdu = sdp_pdus,
+ .is_sdp = TRUE,
+};
- if (!memcmp(did_req_pdu.data, data, len)) {
- bthost_send_cid(bthost, cid_data->sdp_handle, cid_data->sdp_cid,
- did_rsp_pdu.data, did_rsp_pdu.size);
- return;
- }
+static struct emu_l2cap_cid_data ctrl_cid_data;
+static struct emu_l2cap_cid_data intr_cid_data;
- bthost_send_cid(bthost, cid_data->sdp_handle, cid_data->sdp_cid,
- hid_rsp_pdu.data, hid_rsp_pdu.size);
-}
static void hid_sdp_search_cb(uint16_t handle, uint16_t cid, void *user_data)
{
- struct test_data *data = tester_get_data();
- struct bthost *bthost = hciemu_client_get_host(data->hciemu);
+ struct emu_l2cap_cid_data *cid_data = user_data;
- cid_data.sdp_handle = handle;
- cid_data.sdp_cid = cid;
+ cid_data->handle = handle;
+ cid_data->cid = cid;
- bthost_add_cid_hook(bthost, handle, cid, hid_sdp_cid_hook_cb,
- &cid_data);
+ tester_handle_l2cap_data_exchange(cid_data);
}
-static void hid_prepare_reply_protocol_mode(struct emu_cid_data *cid_data)
+static void hid_prepare_reply_protocol_mode(struct emu_l2cap_cid_data *cid_data)
{
struct test_data *t_data = tester_get_data();
struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
const struct pdu pdu = raw_pdu(0xa0, 0x00);
- bthost_send_cid(bthost, cid_data->ctrl_handle, cid_data->ctrl_cid,
- pdu.data, pdu.size);
+ bthost_send_cid(bthost, cid_data->handle, cid_data->cid, pdu.data,
+ pdu.size);
}
-static void hid_prepare_reply_report(struct emu_cid_data *cid_data)
+static void hid_prepare_reply_report(struct emu_l2cap_cid_data *cid_data)
{
struct test_data *t_data = tester_get_data();
struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
const struct pdu pdu = raw_pdu(0xa2, 0x01, 0x00);
- bthost_send_cid(bthost, cid_data->ctrl_handle, cid_data->ctrl_cid,
- pdu.data, pdu.size);
+ bthost_send_cid(bthost, cid_data->handle, cid_data->cid, pdu.data,
+ pdu.size);
}
static void hid_ctrl_cid_hook_cb(const void *data, uint16_t len,
void *user_data)
{
- struct emu_cid_data *cid_data = user_data;
+ struct emu_l2cap_cid_data *cid_data = user_data;
uint8_t header = ((uint8_t *) data)[0];
struct step *step;
@@ -218,12 +205,13 @@ static void hid_ctrl_connect_cb(uint16_t handle, uint16_t cid, void *user_data)
{
struct test_data *data = tester_get_data();
struct bthost *bthost = hciemu_client_get_host(data->hciemu);
+ struct emu_l2cap_cid_data *cid_data = user_data;
- cid_data.ctrl_handle = handle;
- cid_data.ctrl_cid = cid;
+ cid_data->handle = handle;
+ cid_data->cid = cid;
bthost_add_cid_hook(bthost, handle, cid, hid_ctrl_cid_hook_cb,
- &cid_data);
+ cid_data);
}
static void hid_intr_cid_hook_cb(const void *data, uint16_t len,
@@ -247,33 +235,34 @@ static void hid_intr_connect_cb(uint16_t handle, uint16_t cid, void *user_data)
{
struct test_data *data = tester_get_data();
struct bthost *bthost = hciemu_client_get_host(data->hciemu);
+ struct emu_l2cap_cid_data *cid_data = user_data;
- cid_data.intr_handle = handle;
- cid_data.intr_cid = cid;
+ cid_data->handle = handle;
+ cid_data->cid = cid;
bthost_add_cid_hook(bthost, handle, cid, hid_intr_cid_hook_cb,
- &cid_data);
+ cid_data);
}
/* Emulate SDP (PSM = 1) */
static struct emu_set_l2cap_data l2cap_setup_sdp_data = {
.psm = 1,
.func = hid_sdp_search_cb,
- .user_data = NULL,
+ .user_data = &sdp_cid_data,
};
/* Emulate Control Channel (PSM = 17) */
static struct emu_set_l2cap_data l2cap_setup_cc_data = {
.psm = 17,
.func = hid_ctrl_connect_cb,
- .user_data = NULL,
+ .user_data = &ctrl_cid_data,
};
/* Emulate Interrupt Channel (PSM = 19) */
static struct emu_set_l2cap_data l2cap_setup_ic_data = {
.psm = 19,
.func = hid_intr_connect_cb,
- .user_data = NULL,
+ .user_data = &intr_cid_data,
};
static void hidhost_connect_action(void)
--
1.9.1
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCHv2 15/16] android/tester: Make PAN use generic PDU exchange mechanism
2014-09-26 6:31 [PATCHv2 00/16] android/tester: Unifying the way PDU is handled Jakub Tyszkowski
` (13 preceding siblings ...)
2014-09-26 6:31 ` [PATCHv2 14/16] android/tester: Make HIDHost " Jakub Tyszkowski
@ 2014-09-26 6:31 ` Jakub Tyszkowski
2014-09-26 6:31 ` [PATCHv2 16/16] android-tester: Use generic connect callback for simple cases Jakub Tyszkowski
2014-09-30 9:44 ` [PATCHv2 00/16] android/tester: Unifying the way PDU is handled Szymon Janc
16 siblings, 0 replies; 28+ messages in thread
From: Jakub Tyszkowski @ 2014-09-26 6:31 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Jakub Tyszkowski
---
android/tester-pan.c | 40 ++++++++++++++--------------------------
1 file changed, 14 insertions(+), 26 deletions(-)
diff --git a/android/tester-pan.c b/android/tester-pan.c
index 1a15d7f..503b9ed 100644
--- a/android/tester-pan.c
+++ b/android/tester-pan.c
@@ -23,45 +23,33 @@
static struct queue *list; /* List of pan test cases */
-struct emu_cid_data {
- uint16_t nap_handle;
- uint16_t nap_cid;
-};
+#define pan_conn_req_pdu 0x01, 0x01, 0x02, 0x11, 0x16, 0x11, 0x15
+#define pan_conn_rsp_pdu 0x01, 0x02, 0x00, 0x00
-static struct emu_cid_data cid_data;
-static struct pdu pan_conn_req_pdu = raw_pdu(0x01, 0x01, 0x02, 0x11, 0x16,
- 0x11, 0x15);
-static struct pdu pan_conn_rsp_pdu = raw_pdu(0x01, 0x02, 0x00, 0x00);
+static struct pdu_set pdus[] = {
+ { raw_pdu(pan_conn_req_pdu), raw_pdu(pan_conn_rsp_pdu) },
+ { null_pdu, null_pdu },
+};
-static void pan_nap_cid_hook_cb(const void *data, uint16_t len, void *user_data)
-{
- struct test_data *t_data = tester_get_data();
- struct emu_cid_data *cid_data = user_data;
- struct bthost *bthost = hciemu_client_get_host(t_data->hciemu);
-
- if (!memcmp((uint8_t *) data, pan_conn_req_pdu.data,
- pan_conn_req_pdu.size))
- bthost_send_cid(bthost, cid_data->nap_handle, cid_data->nap_cid,
- pan_conn_rsp_pdu.data, pan_conn_rsp_pdu.size);
-}
+static struct emu_l2cap_cid_data cid_data = {
+ .pdu = pdus,
+};
static void pan_connect_request_cb(uint16_t handle, uint16_t cid,
void *user_data)
{
- struct test_data *data = tester_get_data();
- struct bthost *bthost = hciemu_client_get_host(data->hciemu);
+ struct emu_l2cap_cid_data *cid_data = user_data;
- cid_data.nap_handle = handle;
- cid_data.nap_cid = cid;
+ cid_data->handle = handle;
+ cid_data->cid = cid;
- bthost_add_cid_hook(bthost, handle, cid, pan_nap_cid_hook_cb,
- &cid_data);
+ tester_handle_l2cap_data_exchange(cid_data);
}
static struct emu_set_l2cap_data l2cap_setup_data = {
.psm = 15,
.func = pan_connect_request_cb,
- .user_data = NULL,
+ .user_data = &cid_data,
};
static void pan_connect_action(void)
--
1.9.1
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCHv2 16/16] android-tester: Use generic connect callback for simple cases
2014-09-26 6:31 [PATCHv2 00/16] android/tester: Unifying the way PDU is handled Jakub Tyszkowski
` (14 preceding siblings ...)
2014-09-26 6:31 ` [PATCHv2 15/16] android/tester: Make PAN " Jakub Tyszkowski
@ 2014-09-26 6:31 ` Jakub Tyszkowski
2014-09-30 9:44 ` [PATCHv2 00/16] android/tester: Unifying the way PDU is handled Szymon Janc
16 siblings, 0 replies; 28+ messages in thread
From: Jakub Tyszkowski @ 2014-09-26 6:31 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Jakub Tyszkowski
This is usefull when no custom behavior and just simple pdu exchange
is needed.
---
android/tester-avrcp.c | 13 +------------
android/tester-hdp.c | 32 ++------------------------------
android/tester-hidhost.c | 12 +-----------
android/tester-main.c | 10 ++++++++++
android/tester-main.h | 1 +
android/tester-pan.c | 13 +------------
6 files changed, 16 insertions(+), 65 deletions(-)
diff --git a/android/tester-avrcp.c b/android/tester-avrcp.c
index 4a49bb0..a2ceff6 100644
--- a/android/tester-avrcp.c
+++ b/android/tester-avrcp.c
@@ -138,20 +138,9 @@ static struct emu_set_l2cap_data a2dp_setup_data = {
.user_data = &a2dp_data,
};
-static void sdp_connect_request_cb(uint16_t handle, uint16_t cid,
- void *user_data)
-{
- struct emu_l2cap_cid_data *cid_data = user_data;
-
- cid_data->handle = handle;
- cid_data->cid = cid;
-
- tester_handle_l2cap_data_exchange(cid_data);
-}
-
static struct emu_set_l2cap_data sdp_setup_data = {
.psm = 1,
- .func = sdp_connect_request_cb,
+ .func = tester_generic_connect_cb,
.user_data = &sdp_data,
};
diff --git a/android/tester-hdp.c b/android/tester-hdp.c
index f021943..c9c5a78 100644
--- a/android/tester-hdp.c
+++ b/android/tester-hdp.c
@@ -243,16 +243,6 @@ static void hdp_unregister_app_action(void)
schedule_action_verification(step);
}
-static void hdp_sdp_search_cb(uint16_t handle, uint16_t cid, void *user_data)
-{
- struct emu_l2cap_cid_data *cid_data = user_data;
-
- cid_data->handle = handle;
- cid_data->cid = cid;
-
- tester_handle_l2cap_data_exchange(cid_data);
-}
-
static void mcap_ctrl_cid_hook_cb(const void *data, uint16_t len,
void *user_data)
{
@@ -315,28 +305,10 @@ static void mcap_ctrl_connect_cb(uint16_t handle, uint16_t cid, void *user_data)
cid_data);
}
-static void mcap_data_cid_hook_cb(const void *data, uint16_t len,
- void *user_data)
-{
-}
-
-static void mcap_data_connect_cb(uint16_t handle, uint16_t cid, void *user_data)
-{
- struct test_data *data = tester_get_data();
- struct bthost *bthost = hciemu_client_get_host(data->hciemu);
- struct emu_l2cap_cid_data *cid_data = user_data;
-
- cid_data->handle = handle;
- cid_data->cid = cid;
-
- bthost_add_cid_hook(bthost, handle, cid, mcap_data_cid_hook_cb,
- cid_data);
-}
-
/* Emulate SDP (PSM = 1) */
static struct emu_set_l2cap_data l2cap_setup_sdp_data = {
.psm = 1,
- .func = hdp_sdp_search_cb,
+ .func = tester_generic_connect_cb,
.user_data = &sdp_cid_data,
};
@@ -350,7 +322,7 @@ static struct emu_set_l2cap_data l2cap_setup_cc_data = {
/* Emulate Data Channel (PSM = 0x1003) */
static struct emu_set_l2cap_data l2cap_setup_dc_data = {
.psm = 0x1003,
- .func = mcap_data_connect_cb,
+ .func = tester_generic_connect_cb,
.user_data = &data_cid_data,
};
diff --git a/android/tester-hidhost.c b/android/tester-hidhost.c
index 9ee026a..4c8b4c6 100644
--- a/android/tester-hidhost.c
+++ b/android/tester-hidhost.c
@@ -135,16 +135,6 @@ static struct emu_l2cap_cid_data sdp_cid_data = {
static struct emu_l2cap_cid_data ctrl_cid_data;
static struct emu_l2cap_cid_data intr_cid_data;
-static void hid_sdp_search_cb(uint16_t handle, uint16_t cid, void *user_data)
-{
- struct emu_l2cap_cid_data *cid_data = user_data;
-
- cid_data->handle = handle;
- cid_data->cid = cid;
-
- tester_handle_l2cap_data_exchange(cid_data);
-}
-
static void hid_prepare_reply_protocol_mode(struct emu_l2cap_cid_data *cid_data)
{
struct test_data *t_data = tester_get_data();
@@ -247,7 +237,7 @@ static void hid_intr_connect_cb(uint16_t handle, uint16_t cid, void *user_data)
/* Emulate SDP (PSM = 1) */
static struct emu_set_l2cap_data l2cap_setup_sdp_data = {
.psm = 1,
- .func = hid_sdp_search_cb,
+ .func = tester_generic_connect_cb,
.user_data = &sdp_cid_data,
};
diff --git a/android/tester-main.c b/android/tester-main.c
index d2bf3d8..c9b8a10 100644
--- a/android/tester-main.c
+++ b/android/tester-main.c
@@ -2059,6 +2059,16 @@ void tester_handle_l2cap_data_exchange(struct emu_l2cap_cid_data *cid_data)
emu_generic_cid_hook_cb, cid_data);
}
+void tester_generic_connect_cb(uint16_t handle, uint16_t cid, void *user_data)
+{
+ struct emu_l2cap_cid_data *cid_data = user_data;
+
+ cid_data->handle = handle;
+ cid_data->cid = cid;
+
+ tester_handle_l2cap_data_exchange(cid_data);
+}
+
static void rfcomm_connect_cb(uint16_t handle, uint16_t cid, void *user_data,
bool status)
{
diff --git a/android/tester-main.h b/android/tester-main.h
index 167d5d1..a27fa38 100644
--- a/android/tester-main.h
+++ b/android/tester-main.h
@@ -514,6 +514,7 @@ struct test_case {
};
void tester_handle_l2cap_data_exchange(struct emu_l2cap_cid_data *cid_data);
+void tester_generic_connect_cb(uint16_t handle, uint16_t cid, void *user_data);
/* Get, remove test cases API */
struct queue *get_bluetooth_tests(void);
diff --git a/android/tester-pan.c b/android/tester-pan.c
index 503b9ed..4c9354a 100644
--- a/android/tester-pan.c
+++ b/android/tester-pan.c
@@ -35,20 +35,9 @@ static struct emu_l2cap_cid_data cid_data = {
.pdu = pdus,
};
-static void pan_connect_request_cb(uint16_t handle, uint16_t cid,
- void *user_data)
-{
- struct emu_l2cap_cid_data *cid_data = user_data;
-
- cid_data->handle = handle;
- cid_data->cid = cid;
-
- tester_handle_l2cap_data_exchange(cid_data);
-}
-
static struct emu_set_l2cap_data l2cap_setup_data = {
.psm = 15,
- .func = pan_connect_request_cb,
+ .func = tester_generic_connect_cb,
.user_data = &cid_data,
};
--
1.9.1
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCHv2 00/16] android/tester: Unifying the way PDU is handled
2014-09-26 6:31 [PATCHv2 00/16] android/tester: Unifying the way PDU is handled Jakub Tyszkowski
` (15 preceding siblings ...)
2014-09-26 6:31 ` [PATCHv2 16/16] android-tester: Use generic connect callback for simple cases Jakub Tyszkowski
@ 2014-09-30 9:44 ` Szymon Janc
16 siblings, 0 replies; 28+ messages in thread
From: Szymon Janc @ 2014-09-30 9:44 UTC (permalink / raw)
To: Jakub Tyszkowski; +Cc: linux-bluetooth
Hi Jakub,
On Friday 26 of September 2014 08:31:01 Jakub Tyszkowski wrote:
> This patchset makes all testers use common struct for using raw data (PDUs).
> Also some helpers were added for pdu matching and sending.
>
> v2 changes:
> * added generic hook and connect callback in tester-main for handling simple
> cases when only pdu exchange is needed on given channel
>
> Jakub Tyszkowski (16):
> android/tester: Expose gatt-tester's pdu definition to other testers
> android/tester: Make AVRCP tests use generic pdu struct
> android/tester: Make A2DP tests use generic pdu struct
> android/tester: Make GATT tests use generic pdu struct
> android/tester: Make HidHost tests use generic pdu struct
> android/tester: Make PAN tests use generic pdu struct
> android/tester: Make HDP tests use generic pdu struct
> android/tester: Expose pdu_set structure so it can be reused
> android/tester: Add generic hook to handle pdu exchange
> android/tester: Make A2DP use pdu exchange mechanism
> android/tester: Make AVRCP tests use generic pdu exchange mechanism
> android/tester: Make GATT use generic cid_data
> android/tester: Make HDP tests use generic PDU exchange mechanism
> android/tester: Make HIDHost tests use generic PDU exchange mechanism
> android/tester: Make PAN use generic PDU exchange mechanism
> android-tester: Use generic connect callback for simple cases
>
> android/tester-a2dp.c | 109 +++++++--------------
> android/tester-avrcp.c | 181 +++++++++++++----------------------
> android/tester-gatt.c | 72 +++++---------
> android/tester-hdp.c | 200 ++++++++++++++++----------------------
> android/tester-hidhost.c | 243 +++++++++++++++++++++--------------------------
> android/tester-main.c | 58 +++++++++++
> android/tester-main.h | 32 +++++++
> android/tester-pan.c | 45 +++------
> 8 files changed, 413 insertions(+), 527 deletions(-)
>
This looks quite good to me but needs to be rebased.
--
Best regards,
Szymon Janc
^ permalink raw reply [flat|nested] 28+ messages in thread