2013-11-19 21:24:18

by Ravi kumar Veeramally

[permalink] [raw]
Subject: [PATCH] android/hal-pan: Fix order of event handler registration

IPC message handler determines handler offset with
opcode = msg->opcode - HAL_MINIMUM_EVENT. But here order is misplaced.
---
android/hal-pan.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/android/hal-pan.c b/android/hal-pan.c
index e12eac8..e7b8a20 100644
--- a/android/hal-pan.c
+++ b/android/hal-pan.c
@@ -54,14 +54,14 @@ static void handle_ctrl_state(void *buf, uint16_t len)
* index in table equals to 'opcode - HAL_MINIMUM_EVENT' */
static const struct hal_ipc_handler ev_handlers[] = {
{ /* HAL_EV_PAN_CTRL_STATE */
- .handler = handle_conn_state,
+ .handler = handle_ctrl_state,
.var_len = false,
- .data_len = sizeof(struct hal_ev_pan_conn_state),
+ .data_len = sizeof(struct hal_ev_pan_ctrl_state),
},
{ /* HAL_EV_PAN_CONN_STATE */
- .handler = handle_ctrl_state,
+ .handler = handle_conn_state,
.var_len = false,
- .data_len = sizeof(struct hal_ev_pan_ctrl_state),
+ .data_len = sizeof(struct hal_ev_pan_conn_state),
},
};

--
1.8.3.2



2013-11-20 07:42:16

by Johan Hedberg

[permalink] [raw]
Subject: Re: [PATCH] android/hal-pan: Fix order of event handler registration

Hi Ravi,

On Tue, Nov 19, 2013, Ravi kumar Veeramally wrote:
> IPC message handler determines handler offset with
> opcode = msg->opcode - HAL_MINIMUM_EVENT. But here order is misplaced.
> ---
> android/hal-pan.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)

Applied. Thanks.

Johan