Return-Path: From: Andrzej Kaczmarek To: CC: Andrzej Kaczmarek Subject: [PATCH 03/10] android/hal-audio: Add support to unregister audio endpoints Date: Wed, 15 Jan 2014 10:59:50 +0100 Message-ID: <1389779996-9749-4-git-send-email-andrzej.kaczmarek@tieto.com> In-Reply-To: <1389779996-9749-1-git-send-email-andrzej.kaczmarek@tieto.com> References: <1389779996-9749-1-git-send-email-andrzej.kaczmarek@tieto.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-bluetooth-owner@vger.kernel.org List-ID: --- android/hal-audio.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/android/hal-audio.c b/android/hal-audio.c index 84e7348..3b4648a 100644 --- a/android/hal-audio.c +++ b/android/hal-audio.c @@ -339,6 +339,21 @@ static int ipc_open_cmd(const struct audio_codec *codec) return rsp.id; } +static int ipc_close_cmd(uint8_t endpoint_id) +{ + struct audio_cmd_close cmd; + int result; + + DBG(""); + + cmd.id = endpoint_id; + + result = audio_ipc_cmd(AUDIO_SERVICE_ID, AUDIO_OP_CLOSE, + sizeof(cmd), &cmd, NULL, NULL, NULL); + + return result; +} + static int register_endpoints(void) { struct audio_endpoint *ep = &audio_endpoints[0]; @@ -360,6 +375,20 @@ static int register_endpoints(void) return AUDIO_STATUS_SUCCESS; } +static void unregister_endpoints(void) +{ + size_t i; + + for (i = 0; i < MAX_AUDIO_ENDPOINTS; i++) { + struct audio_endpoint *ep = &audio_endpoints[i]; + + if (ep->id) { + ipc_close_cmd(ep->id); + memset(ep, 0, sizeof(*ep)); + } + } +} + static ssize_t out_write(struct audio_stream_out *stream, const void *buffer, size_t bytes) { @@ -755,6 +784,8 @@ static void *ipc_handler(void *data) if (register_endpoints() != AUDIO_STATUS_SUCCESS) { error("audio: Failed to register endpoints"); + unregister_endpoints(); + shutdown(audio_sk, SHUT_RDWR); continue; } @@ -778,6 +809,8 @@ static void *ipc_handler(void *data) pthread_mutex_unlock(&close_mutex); } + unregister_endpoints(); + info("Closing Audio IPC thread"); return NULL; } -- 1.8.5.2