Return-Path: From: Lukasz Rymanowski To: linux-bluetooth@vger.kernel.org Cc: szymon.janc@tieto.com, johan.hedberg@gmail.com, Marcin Kraglak Subject: [PATCH v4 04/38] android/gatt: Add implementation of delete service Date: Wed, 30 Apr 2014 11:13:35 +0200 Message-Id: <1398849249-5868-5-git-send-email-lukasz.rymanowski@tieto.com> In-Reply-To: <1398849249-5868-1-git-send-email-lukasz.rymanowski@tieto.com> References: <1398849249-5868-1-git-send-email-lukasz.rymanowski@tieto.com> Sender: linux-bluetooth-owner@vger.kernel.org List-ID: From: Marcin Kraglak It will delete sarvice from local database --- android/gatt.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/android/gatt.c b/android/gatt.c index 6e578e1..e4ef1ea 100644 --- a/android/gatt.c +++ b/android/gatt.c @@ -3361,27 +3361,37 @@ failed: static void handle_server_delete_service(const void *buf, uint16_t len) { const struct hal_cmd_gatt_server_delete_service *cmd = buf; + struct hal_ev_gatt_server_service_deleted ev; struct gatt_app *server; uint8_t status; DBG(""); + memset(&ev, 0, sizeof(ev)); + server = find_app_by_id(cmd->server_if); if (!server) { - error("gatt: server_if=%d not found", cmd->server_if); status = HAL_STATUS_FAILED; goto failed; } - /* TODO: delete service from attribute database */ - DBG("Delete service: server: %d, srvc_hnd: %d", cmd->server_if, - cmd->service_handle); + if (!gatt_db_remove_service(gatt_db, cmd->service_handle)) { + status = HAL_STATUS_FAILED; + goto failed; + } status = HAL_STATUS_SUCCESS; failed: + ev.status = status == HAL_STATUS_SUCCESS ? GATT_SUCCESS : GATT_FAILURE; + ev.srvc_handle = cmd->service_handle; + ev.server_if = cmd->server_if; + + ipc_send_notif(hal_ipc, HAL_SERVICE_ID_GATT, + HAL_EV_GATT_SERVER_SERVICE_DELETED, sizeof(ev), &ev); + ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_GATT, - HAL_OP_GATT_SERVER_DELETE_SERVICE, status); + HAL_OP_GATT_SERVER_DELETE_SERVICE, status); } static void handle_server_send_indication(const void *buf, uint16_t len) -- 1.8.4