From a95d867824d72744660dd3d0f790820f7c536ea9 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Mon, 21 Oct 2013 22:57:08 +0300 Subject: [PATCH] android: Add proper define for HAL IPC error --- android/hal-msg.h | 2 ++ android/main.c | 11 +++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/android/hal-msg.h b/android/hal-msg.h index f19d0d06c..1f77586de 100644 --- a/android/hal-msg.h +++ b/android/hal-msg.h @@ -46,6 +46,8 @@ struct hal_msg_hdr { /* Core Service */ +#define HAL_ERROR_FAILED 0x01 + #define HAL_MSG_OP_ERROR 0x00 struct hal_msg_rsp_error { uint8_t status; diff --git a/android/main.c b/android/main.c index fe4f9ded5..aba7f66e8 100644 --- a/android/main.c +++ b/android/main.c @@ -70,7 +70,8 @@ static void service_register(void *buf, uint16_t len) struct hal_msg_cmd_register_module *m = buf; if (m->service_id > HAL_SERVICE_ID_MAX || services[m->service_id]) { - ipc_send_error(hal_cmd_io, HAL_SERVICE_ID_CORE, 0x01); + ipc_send_error(hal_cmd_io, HAL_SERVICE_ID_CORE, + HAL_ERROR_FAILED); return; } @@ -87,7 +88,8 @@ static void service_unregister(void *buf, uint16_t len) struct hal_msg_cmd_unregister_module *m = buf; if (m->service_id > HAL_SERVICE_ID_MAX || !services[m->service_id]) { - ipc_send_error(hal_cmd_io, HAL_SERVICE_ID_CORE, 0x01); + ipc_send_error(hal_cmd_io, HAL_SERVICE_ID_CORE, + HAL_ERROR_FAILED); return; } @@ -109,7 +111,8 @@ static void handle_service_core(uint8_t opcode, void *buf, uint16_t len) service_unregister(buf, len); break; default: - ipc_send_error(hal_cmd_io, HAL_SERVICE_ID_CORE, 0x01); + ipc_send_error(hal_cmd_io, HAL_SERVICE_ID_CORE, + HAL_ERROR_FAILED); break; } } @@ -151,7 +154,7 @@ static gboolean cmd_watch_cb(GIOChannel *io, GIOCondition cond, handle_service_core(msg->opcode, buf + sizeof(*msg), msg->len); break; default: - ipc_send_error(hal_cmd_io, msg->service_id, 0x01); + ipc_send_error(hal_cmd_io, msg->service_id, HAL_ERROR_FAILED); break; } -- 2.47.3