[PATCH 01/13] android/hal-gatt-api: Add Server Register Notification

[PATCH 01/13] android/hal-gatt-api: Add Server Register Notification

[Grzegorz Kolodziejczyk]

---
 android/hal-ipc-api.txt | 5 +++++
 android/hal-msg.h       | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/android/hal-ipc-api.txt b/android/hal-ipc-api.txt
index 04c0b7c..bed8caf 100644
--- a/android/hal-ipc-api.txt
+++ b/android/hal-ipc-api.txt
@@ -1950,6 +1950,11 @@ Android HAL name: "gatt" (BT_PROFILE_GATT_ID)
 		                         Server Interface (4 octets)
 
 	Opcode 0x93 - Register Server notification
+
+		Notification parameters: Status (4 octets)
+		                         Server (4 octets)
+		                         UUID (16 octets)
+
 	Opcode 0x94 - Connection notification
 	Opcode 0x95 - Service Added notification
 	Opcode 0x96 - Included Service Added notification
diff --git a/android/hal-msg.h b/android/hal-msg.h
index 95ce551..340f7ee 100644
--- a/android/hal-msg.h
+++ b/android/hal-msg.h
@@ -1398,3 +1398,10 @@ struct hal_ev_gatt_client_listen {
 	int32_t status;
 	int32_t server_if;
 } __attribute__((packed));
+
+#define HAL_EV_GATT_SERVER_REGISTER		0x93
+struct hal_ev_gatt_server_register {
+	int32_t status;
+	int32_t server_if;
+	uint8_t uuid[16];
+} __attribute__((packed));
-- 
1.8.5.2

[PATCH 02/13] android/hal-gatt-api: Add Server Connection Notification

[Grzegorz Kolodziejczyk]

---
 android/hal-ipc-api.txt | 6 ++++++
 android/hal-msg.h       | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/android/hal-ipc-api.txt b/android/hal-ipc-api.txt
index bed8caf..70dfb90 100644
--- a/android/hal-ipc-api.txt
+++ b/android/hal-ipc-api.txt
@@ -1956,6 +1956,12 @@ Android HAL name: "gatt" (BT_PROFILE_GATT_ID)
 		                         UUID (16 octets)
 
 	Opcode 0x94 - Connection notification
+
+		Notification parameters: Connection ID (4 octets)
+		                         Server (4 octets)
+		                         Connected (4 octets)
+		                         Address (6 octets)
+
 	Opcode 0x95 - Service Added notification
 	Opcode 0x96 - Included Service Added notification
 	Opcode 0x97 - Characteristic Added notification
diff --git a/android/hal-msg.h b/android/hal-msg.h
index 340f7ee..bfc6fce 100644
--- a/android/hal-msg.h
+++ b/android/hal-msg.h
@@ -1405,3 +1405,11 @@ struct hal_ev_gatt_server_register {
 	int32_t server_if;
 	uint8_t uuid[16];
 } __attribute__((packed));
+
+#define HAL_EV_GATT_SERVER_CONNECTION		0x94
+struct hal_ev_gatt_server_connection {
+	int32_t conn_id;
+	int32_t server_if;
+	int32_t connected;
+	uint8_t bdaddr[6];
+} __attribute__((packed));
-- 
1.8.5.2

[PATCH 03/13] android/hal-gatt-api: Add Server Service Added Notification

[Grzegorz Kolodziejczyk]

---
 android/hal-ipc-api.txt | 12 ++++++++++++
 android/hal-msg.h       |  8 ++++++++
 2 files changed, 20 insertions(+)

diff --git a/android/hal-ipc-api.txt b/android/hal-ipc-api.txt
index 70dfb90..eb879ce 100644
--- a/android/hal-ipc-api.txt
+++ b/android/hal-ipc-api.txt
@@ -1963,6 +1963,18 @@ Android HAL name: "gatt" (BT_PROFILE_GATT_ID)
 		                         Address (6 octets)
 
 	Opcode 0x95 - Service Added notification
+
+		Notification parameters: Status (4 octets)
+		                         Server (4 octets)
+		                         Service ID (18 octets)
+		                         Service Handle (4 octets)
+
+		Valid Service ID: ID (17 octets)
+		                  Is Primary (1 octet)
+
+		Valid ID: UUID (16 octets)
+		          Instance ID (1 octet)
+
 	Opcode 0x96 - Included Service Added notification
 	Opcode 0x97 - Characteristic Added notification
 	Opcode 0x98 - Descriptor Added notification
diff --git a/android/hal-msg.h b/android/hal-msg.h
index bfc6fce..03267f7 100644
--- a/android/hal-msg.h
+++ b/android/hal-msg.h
@@ -1413,3 +1413,11 @@ struct hal_ev_gatt_server_connection {
 	int32_t connected;
 	uint8_t bdaddr[6];
 } __attribute__((packed));
+
+#define HAL_EV_GATT_SERVER_SERVICE_ADDED	0x95
+struct hal_ev_gatt_server_service_added {
+	int32_t status;
+	int32_t server_if;
+	struct hal_gatt_srvc_id srvc_id;
+	int32_t srvc_handle;
+} __attribute__((packed));
-- 
1.8.5.2

[PATCH 04/13] android/hal-gatt-api: Add Server Included Service Added Notification

[Grzegorz Kolodziejczyk]

---
 android/hal-ipc-api.txt | 6 ++++++
 android/hal-msg.h       | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/android/hal-ipc-api.txt b/android/hal-ipc-api.txt
index eb879ce..454694d 100644
--- a/android/hal-ipc-api.txt
+++ b/android/hal-ipc-api.txt
@@ -1976,6 +1976,12 @@ Android HAL name: "gatt" (BT_PROFILE_GATT_ID)
 		          Instance ID (1 octet)
 
 	Opcode 0x96 - Included Service Added notification
+
+		Notification patemeters: Status (4 octets)
+		                         Server (4 octets)
+		                         Service Handle (4 octets)
+		                         Included Service Handle (4 octets)
+
 	Opcode 0x97 - Characteristic Added notification
 	Opcode 0x98 - Descriptor Added notification
 	Opcode 0x99 - Service Started notification
diff --git a/android/hal-msg.h b/android/hal-msg.h
index 03267f7..0452856 100644
--- a/android/hal-msg.h
+++ b/android/hal-msg.h
@@ -1421,3 +1421,11 @@ struct hal_ev_gatt_server_service_added {
 	struct hal_gatt_srvc_id srvc_id;
 	int32_t srvc_handle;
 } __attribute__((packed));
+
+#define HAL_EV_GATT_SERVER_INC_SRVC_ADDED	0x96
+struct hal_ev_gatt_server_inc_srvc_added {
+	int32_t status;
+	int32_t server_if;
+	int32_t srvc_handle;
+	int32_t incl_srvc_handle;
+} __attribute__((packed));
-- 
1.8.5.2

[PATCH 05/13] android/hal-gatt-api: Add Server Characteristic Added Notification

[Grzegorz Kolodziejczyk]

---
 android/hal-ipc-api.txt | 7 +++++++
 android/hal-msg.h       | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/android/hal-ipc-api.txt b/android/hal-ipc-api.txt
index 454694d..88bcc12 100644
--- a/android/hal-ipc-api.txt
+++ b/android/hal-ipc-api.txt
@@ -1983,6 +1983,13 @@ Android HAL name: "gatt" (BT_PROFILE_GATT_ID)
 		                         Included Service Handle (4 octets)
 
 	Opcode 0x97 - Characteristic Added notification
+
+		Notification parameters: Status (4 octets)
+		                         Server (4 octets)
+		                         UUID (16 octets)
+		                         Service Handle (4 octets)
+		                         Characteristic Handle (4 octets)
+
 	Opcode 0x98 - Descriptor Added notification
 	Opcode 0x99 - Service Started notification
 	Opcode 0x9a - Service Stopped notification
diff --git a/android/hal-msg.h b/android/hal-msg.h
index 0452856..37d1252 100644
--- a/android/hal-msg.h
+++ b/android/hal-msg.h
@@ -1429,3 +1429,12 @@ struct hal_ev_gatt_server_inc_srvc_added {
 	int32_t srvc_handle;
 	int32_t incl_srvc_handle;
 } __attribute__((packed));
+
+#define HAL_EV_GATT_SERVER_CHAR_ADDED		0x97
+struct hal_ev_gatt_server_characteristic_added {
+	int32_t status;
+	int32_t server_if;
+	uint8_t uuid[16];
+	int32_t srvc_handle;
+	int32_t char_handle;
+} __attribute__((packed));
-- 
1.8.5.2

[PATCH 06/13] android/hal-gatt-api: Add Server Descriptor Added Notification

[Grzegorz Kolodziejczyk]

---
 android/hal-ipc-api.txt | 7 +++++++
 android/hal-msg.h       | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/android/hal-ipc-api.txt b/android/hal-ipc-api.txt
index 88bcc12..f7c9f7d 100644
--- a/android/hal-ipc-api.txt
+++ b/android/hal-ipc-api.txt
@@ -1991,6 +1991,13 @@ Android HAL name: "gatt" (BT_PROFILE_GATT_ID)
 		                         Characteristic Handle (4 octets)
 
 	Opcode 0x98 - Descriptor Added notification
+
+		Notification parameters: Status (4 octets)
+		                         Server (4 octets)
+		                         UUID (6 octets)
+		                         Service Handle (4 octets)
+		                         Descriptor Handle (4 octets)
+
 	Opcode 0x99 - Service Started notification
 	Opcode 0x9a - Service Stopped notification
 	Opcode 0x9b - Service Deleted notification
diff --git a/android/hal-msg.h b/android/hal-msg.h
index 37d1252..e411728 100644
--- a/android/hal-msg.h
+++ b/android/hal-msg.h
@@ -1438,3 +1438,12 @@ struct hal_ev_gatt_server_characteristic_added {
 	int32_t srvc_handle;
 	int32_t char_handle;
 } __attribute__((packed));
+
+#define HAL_EV_GATT_SERVER_DESCRIPTOR_ADDED	0x98
+struct hal_ev_gatt_server_descriptor_added {
+	int32_t status;
+	int32_t server_if;
+	uint8_t uuid[16];
+	int32_t srvc_handle;
+	int32_t descr_handle;
+} __attribute__((packed));
-- 
1.8.5.2

[PATCH 07/13] android/hal-gatt-api: Add Server Service Started Notification

[Grzegorz Kolodziejczyk]

---
 android/hal-ipc-api.txt | 5 +++++
 android/hal-msg.h       | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/android/hal-ipc-api.txt b/android/hal-ipc-api.txt
index f7c9f7d..8bf8af6 100644
--- a/android/hal-ipc-api.txt
+++ b/android/hal-ipc-api.txt
@@ -1999,6 +1999,11 @@ Android HAL name: "gatt" (BT_PROFILE_GATT_ID)
 		                         Descriptor Handle (4 octets)
 
 	Opcode 0x99 - Service Started notification
+
+		Notification parameters: Status (4 octets)
+		                         Server (4 octets)
+		                         Service Handle (4 octets)
+
 	Opcode 0x9a - Service Stopped notification
 	Opcode 0x9b - Service Deleted notification
 	Opcode 0x9c - Request Read notification
diff --git a/android/hal-msg.h b/android/hal-msg.h
index e411728..7bba250 100644
--- a/android/hal-msg.h
+++ b/android/hal-msg.h
@@ -1447,3 +1447,10 @@ struct hal_ev_gatt_server_descriptor_added {
 	int32_t srvc_handle;
 	int32_t descr_handle;
 } __attribute__((packed));
+
+#define HAL_EV_GATT_SERVER_SERVICE_STARTED	0x99
+struct hal_ev_gatt_server_service_started {
+	int32_t status;
+	int32_t server_if;
+	int32_t srvc_handle;
+} __attribute__((packed));
-- 
1.8.5.2

[PATCH 08/13] android/hal-gatt-api: Add Server Service Stopped Notification

[Grzegorz Kolodziejczyk]

---
 android/hal-ipc-api.txt | 5 +++++
 android/hal-msg.h       | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/android/hal-ipc-api.txt b/android/hal-ipc-api.txt
index 8bf8af6..116dfba 100644
--- a/android/hal-ipc-api.txt
+++ b/android/hal-ipc-api.txt
@@ -2005,6 +2005,11 @@ Android HAL name: "gatt" (BT_PROFILE_GATT_ID)
 		                         Service Handle (4 octets)
 
 	Opcode 0x9a - Service Stopped notification
+
+		Notification parameters: Status (4 octets)
+		                         Server (4 octets)
+		                         Service Handle (4 octets)
+
 	Opcode 0x9b - Service Deleted notification
 	Opcode 0x9c - Request Read notification
 	Opcode 0x9d - Request Write notification
diff --git a/android/hal-msg.h b/android/hal-msg.h
index 7bba250..4219312 100644
--- a/android/hal-msg.h
+++ b/android/hal-msg.h
@@ -1454,3 +1454,10 @@ struct hal_ev_gatt_server_service_started {
 	int32_t server_if;
 	int32_t srvc_handle;
 } __attribute__((packed));
+
+#define HAL_EV_GATT_SERVER_SERVICE_STOPPED	0x9a
+struct hal_ev_gatt_server_service_stopped {
+	int32_t status;
+	int32_t server_if;
+	int32_t srvc_handle;
+} __attribute__((packed));
-- 
1.8.5.2

[PATCH 09/13] android/hal-gatt-api: Add Server Service Deleted Notification

[Grzegorz Kolodziejczyk]

---
 android/hal-ipc-api.txt | 5 +++++
 android/hal-msg.h       | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/android/hal-ipc-api.txt b/android/hal-ipc-api.txt
index 116dfba..5cf22a8 100644
--- a/android/hal-ipc-api.txt
+++ b/android/hal-ipc-api.txt
@@ -2011,6 +2011,11 @@ Android HAL name: "gatt" (BT_PROFILE_GATT_ID)
 		                         Service Handle (4 octets)
 
 	Opcode 0x9b - Service Deleted notification
+
+		Notification parameters: Status (4 octets)
+		                         Server (4 octets)
+		                         Service Handle (4 octets)
+
 	Opcode 0x9c - Request Read notification
 	Opcode 0x9d - Request Write notification
 	Opcode 0x9e - Request Execute Write notification
diff --git a/android/hal-msg.h b/android/hal-msg.h
index 4219312..ee4ac18 100644
--- a/android/hal-msg.h
+++ b/android/hal-msg.h
@@ -1461,3 +1461,10 @@ struct hal_ev_gatt_server_service_stopped {
 	int32_t server_if;
 	int32_t srvc_handle;
 } __attribute__((packed));
+
+#define HAL_EV_GATT_SERVER_SERVICE_DELETED	0x9b
+struct hal_ev_gatt_server_service_deleted {
+	int32_t status;
+	int32_t server_if;
+	int32_t srvc_handle;
+} __attribute__((packed));
-- 
1.8.5.2

[PATCH 10/13] android/hal-gatt-api: Add Server Request Read Notification

[Grzegorz Kolodziejczyk]

---
 android/hal-ipc-api.txt |  8 ++++++++
 android/hal-msg.h       | 10 ++++++++++
 2 files changed, 18 insertions(+)

diff --git a/android/hal-ipc-api.txt b/android/hal-ipc-api.txt
index 5cf22a8..08dbed6 100644
--- a/android/hal-ipc-api.txt
+++ b/android/hal-ipc-api.txt
@@ -2017,6 +2017,14 @@ Android HAL name: "gatt" (BT_PROFILE_GATT_ID)
 		                         Service Handle (4 octets)
 
 	Opcode 0x9c - Request Read notification
+
+		Notification parameters: Connection ID (4 octets)
+		                         Trans ID (4 octets)
+		                         Address (6 octets)
+		                         Attribute Handle (4 octets)
+		                         Offset (4 octets)
+		                         Is Long (1 octet)
+
 	Opcode 0x9d - Request Write notification
 	Opcode 0x9e - Request Execute Write notification
 	Opcode 0x9f - Response Confirmation notification
diff --git a/android/hal-msg.h b/android/hal-msg.h
index ee4ac18..7d54d29 100644
--- a/android/hal-msg.h
+++ b/android/hal-msg.h
@@ -1468,3 +1468,13 @@ struct hal_ev_gatt_server_service_deleted {
 	int32_t server_if;
 	int32_t srvc_handle;
 } __attribute__((packed));
+
+#define HAL_EV_GATT_SERVER_REQUEST_READ		0x9c
+struct hal_ev_gatt_server_request_read {
+	int32_t conn_id;
+	int32_t trans_id;
+	uint8_t bdaddr[6];
+	int32_t attr_handle;
+	int32_t offset;
+	uint8_t is_long;
+} __attribute__((packed));
-- 
1.8.5.2

[PATCH 11/13] android/hal-gatt-api: Add Server Request Write Notification

[Grzegorz Kolodziejczyk]

---
 android/hal-ipc-api.txt | 11 +++++++++++
 android/hal-msg.h       | 13 +++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/android/hal-ipc-api.txt b/android/hal-ipc-api.txt
index 08dbed6..9aee3ab 100644
--- a/android/hal-ipc-api.txt
+++ b/android/hal-ipc-api.txt
@@ -2026,5 +2026,16 @@ Android HAL name: "gatt" (BT_PROFILE_GATT_ID)
 		                         Is Long (1 octet)
 
 	Opcode 0x9d - Request Write notification
+
+		Notification parameters: Connection ID (4 octets)
+		                         Trans ID (4 octets)
+		                         Address (6 octets)
+		                         Attribute Handle (4 octets)
+		                         Offset (4 octets)
+		                         Length (4 octets)
+		                         Need Response (4 octets)
+		                         Is Prepare (1 octet)
+		                         Value (variable)
+
 	Opcode 0x9e - Request Execute Write notification
 	Opcode 0x9f - Response Confirmation notification
diff --git a/android/hal-msg.h b/android/hal-msg.h
index 7d54d29..ad57e23 100644
--- a/android/hal-msg.h
+++ b/android/hal-msg.h
@@ -1478,3 +1478,16 @@ struct hal_ev_gatt_server_request_read {
 	int32_t offset;
 	uint8_t is_long;
 } __attribute__((packed));
+
+#define HAL_EV_GATT_SERVER_REQUEST_WRITE	0x9d
+struct hal_ev_gatt_server_request_write {
+	int32_t conn_id;
+	int32_t trans_id;
+	uint8_t bdaddr[6];
+	int32_t attr_handle;
+	int32_t offset;
+	int32_t length;
+	uint8_t need_rsp;
+	uint8_t is_prep;
+	uint8_t value[0];
+} __attribute__((packed));
-- 
1.8.5.2

[PATCH 12/13] android/hal-gatt-api: Add Server Request Execute Write Notification

[Grzegorz Kolodziejczyk]

---
 android/hal-ipc-api.txt | 6 ++++++
 android/hal-msg.h       | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/android/hal-ipc-api.txt b/android/hal-ipc-api.txt
index 9aee3ab..f4d5c91 100644
--- a/android/hal-ipc-api.txt
+++ b/android/hal-ipc-api.txt
@@ -2038,4 +2038,10 @@ Android HAL name: "gatt" (BT_PROFILE_GATT_ID)
 		                         Value (variable)
 
 	Opcode 0x9e - Request Execute Write notification
+
+		Notification parameters: Connection ID (4 octets)
+		                         Trans ID (4 octets)
+		                         Address (6 octets)
+		                         Execute Write (4 octets)
+
 	Opcode 0x9f - Response Confirmation notification
diff --git a/android/hal-msg.h b/android/hal-msg.h
index ad57e23..12dc8dc 100644
--- a/android/hal-msg.h
+++ b/android/hal-msg.h
@@ -1491,3 +1491,11 @@ struct hal_ev_gatt_server_request_write {
 	uint8_t is_prep;
 	uint8_t value[0];
 } __attribute__((packed));
+
+#define HAL_EV_GATT_SERVER_REQUEST_EXEC_WRITE	0x9e
+struct hal_ev_gatt_server_request_exec_write {
+	int32_t conn_id;
+	int32_t trans_id;
+	uint8_t bdaddr[6];
+	int32_t exec_write;
+} __attribute__((packed));
-- 
1.8.5.2

[PATCH 13/13] android/hal-gatt-api: Add Server Response Confirmation Notification

[Grzegorz Kolodziejczyk]

---
 android/hal-ipc-api.txt | 3 +++
 android/hal-msg.h       | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/android/hal-ipc-api.txt b/android/hal-ipc-api.txt
index f4d5c91..0518c2f 100644
--- a/android/hal-ipc-api.txt
+++ b/android/hal-ipc-api.txt
@@ -2045,3 +2045,6 @@ Android HAL name: "gatt" (BT_PROFILE_GATT_ID)
 		                         Execute Write (4 octets)
 
 	Opcode 0x9f - Response Confirmation notification
+
+		Notification parameters: Status (4 octets)
+		                         Handle (4 octets)
diff --git a/android/hal-msg.h b/android/hal-msg.h
index 12dc8dc..d885eb1 100644
--- a/android/hal-msg.h
+++ b/android/hal-msg.h
@@ -1499,3 +1499,9 @@ struct hal_ev_gatt_server_request_exec_write {
 	uint8_t bdaddr[6];
 	int32_t exec_write;
 } __attribute__((packed));
+
+#define HAL_EV_GATT_SERVER_RSP_CONFIRMATION	0x9f
+struct hal_ev_gatt_server_rsp_confirmation {
+	int32_t status;
+	int32_t handle;
+} __attribute__((packed));
-- 
1.8.5.2

Re: [PATCH 01/13] android/hal-gatt-api: Add Server Register Notification

[Szymon Janc]

Hi Grzegorz,

On Friday 28 of February 2014 12:19:52 Grzegorz Kolodziejczyk wrote:
> ---
>  android/hal-ipc-api.txt | 5 +++++
>  android/hal-msg.h       | 7 +++++++
>  2 files changed, 12 insertions(+)
> 
> diff --git a/android/hal-ipc-api.txt b/android/hal-ipc-api.txt
> index 04c0b7c..bed8caf 100644
> --- a/android/hal-ipc-api.txt
> +++ b/android/hal-ipc-api.txt
> @@ -1950,6 +1950,11 @@ Android HAL name: "gatt" (BT_PROFILE_GATT_ID)
>  		                         Server Interface (4 octets)
> 
>  	Opcode 0x93 - Register Server notification
> +
> +		Notification parameters: Status (4 octets)
> +		                         Server (4 octets)
> +		                         UUID (16 octets)
> +
>  	Opcode 0x94 - Connection notification
>  	Opcode 0x95 - Service Added notification
>  	Opcode 0x96 - Included Service Added notification
> diff --git a/android/hal-msg.h b/android/hal-msg.h
> index 95ce551..340f7ee 100644
> --- a/android/hal-msg.h
> +++ b/android/hal-msg.h
> @@ -1398,3 +1398,10 @@ struct hal_ev_gatt_client_listen {
>  	int32_t status;
>  	int32_t server_if;
>  } __attribute__((packed));
> +
> +#define HAL_EV_GATT_SERVER_REGISTER		0x93
> +struct hal_ev_gatt_server_register {
> +	int32_t status;
> +	int32_t server_if;
> +	uint8_t uuid[16];
> +} __attribute__((packed));

All patches in this set are now applied, thanks.

-- 
BR
Szymon Janc