From: Szymon Janc <szymon.janc@tieto.com>
To: linux-bluetooth@vger.kernel.org
Cc: Szymon Janc <szymon.janc@tieto.com>
Subject: [PATCH 08/10] android/hal-ipc: Move daemon starting to bluetooth HAL
Date: Wed, 11 Jun 2014 16:32:50 +0200 [thread overview]
Message-ID: <1402497172-12436-9-git-send-email-szymon.janc@tieto.com> (raw)
In-Reply-To: <1402497172-12436-1-git-send-email-szymon.janc@tieto.com>
---
android/hal-bluetooth.c | 8 ++++++++
android/hal-ipc.c | 6 ------
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/android/hal-bluetooth.c b/android/hal-bluetooth.c
index a220328..b8eae69 100644
--- a/android/hal-bluetooth.c
+++ b/android/hal-bluetooth.c
@@ -423,6 +423,14 @@ static int init(bt_callbacks_t *callbacks)
bt_hal_cbacks = callbacks;
+ /* Start Android Bluetooth daemon service */
+ if (property_set("bluetooth.start", "daemon") < 0) {
+ error("Failed to set bluetooth.start=daemon");
+ hal_ipc_cleanup();
+ bt_hal_cbacks = NULL;
+ return BT_STATUS_FAIL;
+ }
+
if (!hal_ipc_accept()) {
hal_ipc_cleanup();
bt_hal_cbacks = NULL;
diff --git a/android/hal-ipc.c b/android/hal-ipc.c
index b1b85b0..7dd6870 100644
--- a/android/hal-ipc.c
+++ b/android/hal-ipc.c
@@ -238,12 +238,6 @@ bool hal_ipc_accept(void)
{
int err;
- /* Start Android Bluetooth daemon service */
- if (property_set("bluetooth.start", "daemon") < 0) {
- error("Failed to set bluetooth.start=daemon");
- return false;
- }
-
cmd_sk = accept_connection(listen_sk);
if (cmd_sk < 0)
return false;
--
1.9.1
next prev parent reply other threads:[~2014-06-11 14:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-11 14:32 [PATCH 00/10] Some HAL IPC work Szymon Janc
2014-06-11 14:32 ` [PATCH 01/10] android/ipc: Make struct service_handler private Szymon Janc
2014-06-11 14:32 ` [PATCH 02/10] android/hal-ipc: Allow to pass custom path to IPC Szymon Janc
2014-06-11 14:32 ` [PATCH 03/10] android/hal-ipc: Fix missing mutex unlock Szymon Janc
2014-06-11 14:32 ` [PATCH 04/10] android/hal-ipc: Move exit calls outside of handle_msg Szymon Janc
2014-06-11 14:32 ` [PATCH 05/10] android/hal-ipc: Move exit calls under failed label in hal_ipc_cmd Szymon Janc
2014-06-11 14:32 ` [PATCH 06/10] android/hal-ipc: Move exit calls under label in notification_handler Szymon Janc
2014-06-11 14:32 ` [PATCH 07/10] android/hal-ipc: Split IPC init and accept to separate functions Szymon Janc
2014-06-11 14:32 ` Szymon Janc [this message]
2014-06-11 14:32 ` [PATCH 09/10] android/hal-ipc: Pass FD to notification handlers Szymon Janc
2014-06-11 14:32 ` [PATCH 10/10] android/ipc: Add support for sending FD in notifications Szymon Janc
2014-06-12 11:07 ` [PATCH 00/10] Some HAL IPC work Szymon Janc
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1402497172-12436-9-git-send-email-szymon.janc@tieto.com \
--to=szymon.janc@tieto.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox