[PATCH 1/2] android/hal-gatt: Fix wrong pointer usage

[PATCH 1/2] android/hal-gatt: Fix wrong pointer usage

[Jakub Tyszkowski]

---
 android/hal-gatt.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/hal-gatt.c b/android/hal-gatt.c
index 8f906fd..bd61576 100644
--- a/android/hal-gatt.c
+++ b/android/hal-gatt.c
@@ -683,7 +683,7 @@ static bt_status_t get_descriptor(int conn_id, btgatt_srvc_id_t *srvc_id,
 
 	return hal_ipc_cmd(HAL_SERVICE_ID_GATT,
 					HAL_OP_GATT_CLIENT_GET_DESCRIPTOR,
-					len, &cmd, 0 , NULL, NULL);
+					len, cmd, 0 , NULL, NULL);
 }
 
 static bt_status_t read_characteristic(int conn_id, btgatt_srvc_id_t *srvc_id,
@@ -1065,7 +1065,7 @@ static bt_status_t send_indication(int server_if, int attribute_handle,
 
 	return hal_ipc_cmd(HAL_SERVICE_ID_GATT,
 					HAL_OP_GATT_SERVER_SEND_INDICATION,
-					cmd_len, &cmd, 0, NULL, NULL);
+					cmd_len, cmd, 0, NULL, NULL);
 }
 
 static bt_status_t send_response(int conn_id, int trans_id, int status,
@@ -1084,7 +1084,7 @@ static bt_status_t send_response(int conn_id, int trans_id, int status,
 
 	return hal_ipc_cmd(HAL_SERVICE_ID_GATT,
 					HAL_OP_GATT_SERVER_SEND_RESPONSE,
-					cmd_len, &cmd, 0, NULL, NULL);
+					cmd_len, cmd, 0, NULL, NULL);
 }
 
 static bt_status_t init(const btgatt_callbacks_t *callbacks)
-- 
1.9.0

[PATCH 2/2] android/hal-ipc: Make opcode debug print more readable

[Jakub Tyszkowski]

---
 android/hal-ipc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/hal-ipc.c b/android/hal-ipc.c
index 8e817c9..5bef281 100644
--- a/android/hal-ipc.c
+++ b/android/hal-ipc.c
@@ -401,7 +401,7 @@ int hal_ipc_cmd(uint8_t service_id, uint8_t opcode, uint16_t len, void *param,
 	}
 
 	if (cmd.service_id != service_id) {
-		error("Invalid service id (%u vs %u), aborting",
+		error("Invalid service id (0x%x vs 0x%x), aborting",
 						cmd.service_id, service_id);
 		exit(EXIT_FAILURE);
 	}
@@ -412,7 +412,7 @@ int hal_ipc_cmd(uint8_t service_id, uint8_t opcode, uint16_t len, void *param,
 	}
 
 	if (cmd.opcode != opcode && cmd.opcode != HAL_OP_STATUS) {
-		error("Invalid opcode received (%u vs %u), aborting",
+		error("Invalid opcode received (0x%x vs 0x%x), aborting",
 						cmd.opcode, opcode);
 		exit(EXIT_FAILURE);
 	}
-- 
1.9.0

Re: [PATCH 1/2] android/hal-gatt: Fix wrong pointer usage

[Szymon Janc]

Hi Jakub,

On Monday 17 of March 2014 09:20:41 Jakub Tyszkowski wrote:
> ---
>  android/hal-gatt.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/android/hal-gatt.c b/android/hal-gatt.c
> index 8f906fd..bd61576 100644
> --- a/android/hal-gatt.c
> +++ b/android/hal-gatt.c
> @@ -683,7 +683,7 @@ static bt_status_t get_descriptor(int conn_id,
> btgatt_srvc_id_t *srvc_id,
> 
>  	return hal_ipc_cmd(HAL_SERVICE_ID_GATT,
>  					HAL_OP_GATT_CLIENT_GET_DESCRIPTOR,
> -					len, &cmd, 0 , NULL, NULL);
> +					len, cmd, 0 , NULL, NULL);
>  }
> 
>  static bt_status_t read_characteristic(int conn_id, btgatt_srvc_id_t
> *srvc_id, @@ -1065,7 +1065,7 @@ static bt_status_t send_indication(int
> server_if, int attribute_handle,
> 
>  	return hal_ipc_cmd(HAL_SERVICE_ID_GATT,
>  					HAL_OP_GATT_SERVER_SEND_INDICATION,
> -					cmd_len, &cmd, 0, NULL, NULL);
> +					cmd_len, cmd, 0, NULL, NULL);
>  }
> 
>  static bt_status_t send_response(int conn_id, int trans_id, int status,
> @@ -1084,7 +1084,7 @@ static bt_status_t send_response(int conn_id, int
> trans_id, int status,
> 
>  	return hal_ipc_cmd(HAL_SERVICE_ID_GATT,
>  					HAL_OP_GATT_SERVER_SEND_RESPONSE,
> -					cmd_len, &cmd, 0, NULL, NULL);
> +					cmd_len, cmd, 0, NULL, NULL);
>  }
> 
>  static bt_status_t init(const btgatt_callbacks_t *callbacks)

Both patches applied. Thanks.

-- 
BR
Szymon Janc