From aa887bf05a6cd39afea3fadcd391d65c11c146c2 Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Mon, 24 Feb 2014 13:44:12 +0100 Subject: [PATCH] android: Update socket service id name to match service name --- android/hal-bluetooth.c | 2 +- android/hal-msg.h | 2 +- android/hal-socket.c | 4 ++-- android/ipc-tester.c | 20 ++++++++++---------- android/main.c | 6 +++--- android/socket.c | 14 +++++++------- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/android/hal-bluetooth.c b/android/hal-bluetooth.c index a01229a25..3160d7be9 100644 --- a/android/hal-bluetooth.c +++ b/android/hal-bluetooth.c @@ -440,7 +440,7 @@ static int init(bt_callbacks_t *callbacks) goto fail; } - cmd.service_id = HAL_SERVICE_ID_SOCK; + cmd.service_id = HAL_SERVICE_ID_SOCKET; status = hal_ipc_cmd(HAL_SERVICE_ID_CORE, HAL_OP_REGISTER_MODULE, sizeof(cmd), &cmd, NULL, NULL, NULL); diff --git a/android/hal-msg.h b/android/hal-msg.h index 5606a56e9..836dbbf04 100644 --- a/android/hal-msg.h +++ b/android/hal-msg.h @@ -36,7 +36,7 @@ struct hal_hdr { #define HAL_SERVICE_ID_CORE 0 #define HAL_SERVICE_ID_BLUETOOTH 1 -#define HAL_SERVICE_ID_SOCK 2 +#define HAL_SERVICE_ID_SOCKET 2 #define HAL_SERVICE_ID_HIDHOST 3 #define HAL_SERVICE_ID_PAN 4 #define HAL_SERVICE_ID_HANDSFREE 5 diff --git a/android/hal-socket.c b/android/hal-socket.c index 3688c5f1f..cfd50d154 100644 --- a/android/hal-socket.c +++ b/android/hal-socket.c @@ -51,7 +51,7 @@ static bt_status_t socket_listen(btsock_type_t type, const char *service_name, if (service_name) memcpy(cmd.name, service_name, strlen(service_name)); - return hal_ipc_cmd(HAL_SERVICE_ID_SOCK, HAL_OP_SOCKET_LISTEN, + return hal_ipc_cmd(HAL_SERVICE_ID_SOCKET, HAL_OP_SOCKET_LISTEN, sizeof(cmd), &cmd, NULL, NULL, sock); } @@ -80,7 +80,7 @@ static bt_status_t socket_connect(const bt_bdaddr_t *bdaddr, btsock_type_t type, if (bdaddr) memcpy(cmd.bdaddr, bdaddr, sizeof(cmd.bdaddr)); - return hal_ipc_cmd(HAL_SERVICE_ID_SOCK, HAL_OP_SOCKET_CONNECT, + return hal_ipc_cmd(HAL_SERVICE_ID_SOCKET, HAL_OP_SOCKET_CONNECT, sizeof(cmd), &cmd, NULL, NULL, sock); } diff --git a/android/ipc-tester.c b/android/ipc-tester.c index 246638ab7..eab8ea538 100644 --- a/android/ipc-tester.c +++ b/android/ipc-tester.c @@ -877,8 +877,8 @@ int main(int argc, char *argv[]) test_opcode_valid("BLUETOOTH", HAL_SERVICE_ID_BLUETOOTH, 0x15, 0, HAL_SERVICE_ID_BLUETOOTH); - test_opcode_valid("SOCK", HAL_SERVICE_ID_SOCK, 0x03, 0, - HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_SOCK); + test_opcode_valid("SOCK", HAL_SERVICE_ID_SOCKET, 0x03, 0, + HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_SOCKET); test_opcode_valid("HIDHOST", HAL_SERVICE_ID_HIDHOST, 0x10, 0, HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_HIDHOST); @@ -1074,22 +1074,22 @@ int main(int argc, char *argv[]) HAL_SERVICE_ID_BLUETOOTH); /* check for valid data size for SOCK */ - test_datasize_valid("SOCKET Listen+", HAL_SERVICE_ID_SOCK, + test_datasize_valid("SOCKET Listen+", HAL_SERVICE_ID_SOCKET, HAL_OP_SOCKET_LISTEN, sizeof(struct hal_cmd_socket_listen), 1, - HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_SOCK); - test_datasize_valid("SOCKET Listen-", HAL_SERVICE_ID_SOCK, + HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_SOCKET); + test_datasize_valid("SOCKET Listen-", HAL_SERVICE_ID_SOCKET, HAL_OP_SOCKET_LISTEN, sizeof(struct hal_cmd_socket_listen), -1, - HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_SOCK); - test_datasize_valid("SOCKET Connect+", HAL_SERVICE_ID_SOCK, + HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_SOCKET); + test_datasize_valid("SOCKET Connect+", HAL_SERVICE_ID_SOCKET, HAL_OP_SOCKET_CONNECT, sizeof(struct hal_cmd_socket_connect), 1, - HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_SOCK); - test_datasize_valid("SOCKET Connect-", HAL_SERVICE_ID_SOCK, + HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_SOCKET); + test_datasize_valid("SOCKET Connect-", HAL_SERVICE_ID_SOCKET, HAL_OP_SOCKET_CONNECT, sizeof(struct hal_cmd_socket_connect), -1, - HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_SOCK); + HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_SOCKET); /* check for valid data size for HID Host */ test_datasize_valid("HIDHOST Connect+", HAL_SERVICE_ID_HIDHOST, diff --git a/android/main.c b/android/main.c index bf1dcfd86..aca63512b 100644 --- a/android/main.c +++ b/android/main.c @@ -84,7 +84,7 @@ static void service_register(const void *buf, uint16_t len) bt_bluetooth_register(); break; - case HAL_SERVICE_ID_SOCK: + case HAL_SERVICE_ID_SOCKET: bt_socket_register(&adapter_bdaddr); break; @@ -153,7 +153,7 @@ static void service_unregister(const void *buf, uint16_t len) case HAL_SERVICE_ID_BLUETOOTH: bt_bluetooth_unregister(); break; - case HAL_SERVICE_ID_SOCK: + case HAL_SERVICE_ID_SOCKET: bt_socket_unregister(); break; case HAL_SERVICE_ID_HIDHOST: @@ -337,7 +337,7 @@ static void cleanup_services(void) case HAL_SERVICE_ID_BLUETOOTH: bt_bluetooth_unregister(); break; - case HAL_SERVICE_ID_SOCK: + case HAL_SERVICE_ID_SOCKET: bt_socket_unregister(); break; case HAL_SERVICE_ID_HIDHOST: diff --git a/android/socket.c b/android/socket.c index e2da689f0..655ee40bd 100644 --- a/android/socket.c +++ b/android/socket.c @@ -862,13 +862,13 @@ static void handle_listen(const void *buf, uint16_t len) if (status != HAL_STATUS_SUCCESS) goto failed; - ipc_send_rsp_full(HAL_SERVICE_ID_SOCK, HAL_OP_SOCKET_LISTEN, 0, NULL, + ipc_send_rsp_full(HAL_SERVICE_ID_SOCKET, HAL_OP_SOCKET_LISTEN, 0, NULL, hal_sock); close(hal_sock); return ; failed: - ipc_send_rsp(HAL_SERVICE_ID_SOCK, HAL_OP_SOCKET_LISTEN, status); + ipc_send_rsp(HAL_SERVICE_ID_SOCKET, HAL_OP_SOCKET_LISTEN, status); } static bool sock_send_connect(struct rfcomm_sock *rfsock, bdaddr_t *bdaddr) @@ -1106,13 +1106,13 @@ static void handle_connect(const void *buf, uint16_t len) if (status != HAL_STATUS_SUCCESS) goto failed; - ipc_send_rsp_full(HAL_SERVICE_ID_SOCK, HAL_OP_SOCKET_CONNECT, 0, NULL, - hal_sock); + ipc_send_rsp_full(HAL_SERVICE_ID_SOCKET, HAL_OP_SOCKET_CONNECT, 0, + NULL, hal_sock); close(hal_sock); return; failed: - ipc_send_rsp(HAL_SERVICE_ID_SOCK, HAL_OP_SOCKET_CONNECT, status); + ipc_send_rsp(HAL_SERVICE_ID_SOCKET, HAL_OP_SOCKET_CONNECT, status); } @@ -1137,7 +1137,7 @@ void bt_socket_register(const bdaddr_t *addr) servers[profiles[i].channel].reserved = true; bacpy(&adapter_addr, addr); - ipc_register(HAL_SERVICE_ID_SOCK, cmd_handlers, + ipc_register(HAL_SERVICE_ID_SOCKET, cmd_handlers, G_N_ELEMENTS(cmd_handlers)); } @@ -1155,5 +1155,5 @@ void bt_socket_unregister(void) memset(servers, 0, sizeof(servers)); - ipc_unregister(HAL_SERVICE_ID_SOCK); + ipc_unregister(HAL_SERVICE_ID_SOCKET); } -- 2.47.3