2014-04-11 12:40:25

by Jakub Tyszkowski

Subject: [PATCH 1/2] android/gatt: Set proper primary flag for sending characteristics

Fix sending included service's characteristics.
---
android/gatt.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/android/gatt.c b/android/gatt.c
index aa2a5fd..13ae340 100644
--- a/android/gatt.c
+++ b/android/gatt.c
@@ -1510,8 +1510,7 @@ static void send_client_char_notify(const struct characteristic *ch,
}

ev.conn_id = conn_id;
- /* TODO need to be handled for included services too */
- element_id_to_hal_srvc_id(&service->id, 1, &ev.srvc_id);
+ element_id_to_hal_srvc_id(&service->id, service->primary, &ev.srvc_id);

ipc_send_notif(hal_ipc, HAL_SERVICE_ID_GATT,
HAL_EV_GATT_CLIENT_GET_CHARACTERISTIC,
--
1.9.1

2014-04-11 14:17:30

by Szymon Janc

Subject: Re: [PATCH 1/2] android/gatt: Set proper primary flag for sending characteristics

Hi Jakub,

On Friday 11 of April 2014 14:40:25 Jakub Tyszkowski wrote:
> Fix sending included service's characteristics.
> ---
> android/gatt.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/android/gatt.c b/android/gatt.c
> index aa2a5fd..13ae340 100644
> --- a/android/gatt.c
> +++ b/android/gatt.c
> @@ -1510,8 +1510,7 @@ static void send_client_char_notify(const struct characteristic *ch,
> }
>
> ev.conn_id = conn_id;
> - /* TODO need to be handled for included services too */
> - element_id_to_hal_srvc_id(&service->id, 1, &ev.srvc_id);
> + element_id_to_hal_srvc_id(&service->id, service->primary, &ev.srvc_id);
>
> ipc_send_notif(hal_ipc, HAL_SERVICE_ID_GATT,
> HAL_EV_GATT_CLIENT_GET_CHARACTERISTIC,
>

Both patches applied, thanks.

--
Best regards,
Szymon Janc

2014-04-11 12:40:26

by Jakub Tyszkowski

Subject: [PATCH 2/2] android/client: Fix parameter completion for gatt

This fixes missing service handle in parameters completion for gatt
server add_descriptor method.
---
android/client/if-gatt.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/android/client/if-gatt.c b/android/client/if-gatt.c
index da2f299..250472a 100644
--- a/android/client/if-gatt.c
+++ b/android/client/if-gatt.c
@@ -1736,7 +1736,8 @@ static struct method server_methods[] = {
"<server_if> <service_handle> <included_handle>"),
GATTS_METHODCH(add_characteristic,
"<server_if> <service_handle> <uuid> <properites> <permissions>"),
- GATTS_METHODCH(add_descriptor, "<server_if> <uuid> <permissions>"),
+ GATTS_METHODCH(add_descriptor,
+ "<server_if> <service_handle> <uuid> <permissions>"),
GATTS_METHODCH(start_service,
"<server_if> <service_handle> <transport>"),
GATTS_METHODCH(stop_service, "<server_if> <service_handle>"),
--
1.9.1