Diff between 1610f70cd601ae9a9d5aded98ba746d88fdb151f and d52939fde909bae869bad70894dd4407e1337e5f

Changed Files

File Additions Deletions Status
android/adapter.c +1 -1 modified
android/hid.c +1 -1 modified
android/ipc.c +1 -1 modified
android/ipc.h +1 -1 modified
android/main.c +4 -4 modified

Full Patch

diff --git a/android/adapter.c b/android/adapter.c
index a76dc04..ec90cca 100644
--- a/android/adapter.c
+++ b/android/adapter.c
@@ -407,7 +407,7 @@ void bt_adapter_handle_cmd(GIOChannel *io, uint8_t opcode, void *buf,
 		break;
 	}
 
-	ipc_send_error(io, HAL_SERVICE_ID_BLUETOOTH, status);
+	ipc_send_rsp(io, HAL_SERVICE_ID_BLUETOOTH, status);
 }
 
 const bdaddr_t *bt_adapter_get_address(void)
diff --git a/android/hid.c b/android/hid.c
index 6eb5a77..f2da0d3 100644
--- a/android/hid.c
+++ b/android/hid.c
@@ -48,7 +48,7 @@ void bt_hid_handle_cmd(GIOChannel *io, uint8_t opcode, void *buf, uint16_t len)
 		break;
 	}
 
-	ipc_send_error(io, HAL_SERVICE_ID_HIDHOST, status);
+	ipc_send_rsp(io, HAL_SERVICE_ID_HIDHOST, status);
 }
 
 bool bt_hid_register(GIOChannel *io, const bdaddr_t *addr)
diff --git a/android/ipc.c b/android/ipc.c
index bd92c51..1f52753 100644
--- a/android/ipc.c
+++ b/android/ipc.c
@@ -78,7 +78,7 @@ void ipc_send(GIOChannel *io, uint8_t service_id, uint8_t opcode, uint16_t len,
 	}
 }
 
-void ipc_send_error(GIOChannel *io, uint8_t service_id, uint8_t status)
+void ipc_send_rsp(GIOChannel *io, uint8_t service_id, uint8_t status)
 {
 	struct hal_status s;
 
diff --git a/android/ipc.h b/android/ipc.h
index 4b0ee2a..093c84c 100644
--- a/android/ipc.h
+++ b/android/ipc.h
@@ -23,4 +23,4 @@
 
 void ipc_send(GIOChannel *io, uint8_t service_id, uint8_t opcode, uint16_t len,
 							void *param, int fd);
-void ipc_send_error(GIOChannel *io, uint8_t service_id, uint8_t status);
+void ipc_send_rsp(GIOChannel *io, uint8_t service_id, uint8_t status);
diff --git a/android/main.c b/android/main.c
index 7204d08..6ff30a9 100644
--- a/android/main.c
+++ b/android/main.c
@@ -112,7 +112,7 @@ static void service_register(void *buf, uint16_t len)
 	info("Service ID=%u registered", m->service_id);
 	return;
 error:
-	ipc_send_error(hal_cmd_io, HAL_SERVICE_ID_CORE, HAL_STATUS_FAILED);
+	ipc_send_rsp(hal_cmd_io, HAL_SERVICE_ID_CORE, HAL_STATUS_FAILED);
 }
 
 static void service_unregister(void *buf, uint16_t len)
@@ -147,7 +147,7 @@ static void service_unregister(void *buf, uint16_t len)
 	info("Service ID=%u unregistered", m->service_id);
 	return;
 error:
-	ipc_send_error(hal_cmd_io, HAL_SERVICE_ID_CORE, HAL_STATUS_FAILED);
+	ipc_send_rsp(hal_cmd_io, HAL_SERVICE_ID_CORE, HAL_STATUS_FAILED);
 }
 
 static void handle_service_core(uint8_t opcode, void *buf, uint16_t len)
@@ -160,7 +160,7 @@ 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,
+		ipc_send_rsp(hal_cmd_io, HAL_SERVICE_ID_CORE,
 							HAL_STATUS_FAILED);
 		break;
 	}
@@ -214,7 +214,7 @@ static gboolean cmd_watch_cb(GIOChannel *io, GIOCondition cond,
 								msg->len);
 		break;
 	default:
-		ipc_send_error(hal_cmd_io, msg->service_id, HAL_STATUS_FAILED);
+		ipc_send_rsp(hal_cmd_io, msg->service_id, HAL_STATUS_FAILED);
 		break;
 	}