summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-07-25 10:34:54 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2017-07-25 10:34:54 +0000
commit3587e397424285df38d28b1572ce9118724d5122 (patch)
treece9d943fa02de5274803f1723c7ade5dbb410114
parent2dd4f451d0ca434c662844415bc3a3f3c37a6aa2 (diff)
parent76d2404f4500a68e07c0778c3c9bb0d5f0e7c89f (diff)
Merge "binding: bluetooth: remove race condition workaround" into dabdab_4.0.0dab/4.0.04.0.0
-rw-r--r--binding-bluetooth/bluetooth-api.c6
-rw-r--r--binding-bluetooth/bluetooth-manager.c1
-rw-r--r--binding-bluetooth/export.map2
3 files changed, 2 insertions, 7 deletions
diff --git a/binding-bluetooth/bluetooth-api.c b/binding-bluetooth/bluetooth-api.c
index b454277..39acb9a 100644
--- a/binding-bluetooth/bluetooth-api.c
+++ b/binding-bluetooth/bluetooth-api.c
@@ -948,17 +948,13 @@ const struct afb_binding *afbBindingV1Register (const struct afb_binding_interfa
API_Callback.binding_request_confirmation = bt_request_confirmation;
BindingAPIRegister(&API_Callback);
- BluetoothManagerInit();
-
return &binding_description;
}
-#if 0
int afbBindingV1ServiceInit(struct afb_service service)
{
- return BluetoothManageInit();
+ return BluetoothManagerInit();
}
-#endif
/***************************** The End Of File ******************************/
diff --git a/binding-bluetooth/bluetooth-manager.c b/binding-bluetooth/bluetooth-manager.c
index e234d9b..24312c2 100644
--- a/binding-bluetooth/bluetooth-manager.c
+++ b/binding-bluetooth/bluetooth-manager.c
@@ -1747,7 +1747,6 @@ int BluetoothManagerInit() {
pthread_create(&thread_id, NULL, bt_event_loop_thread, NULL);
//pthread_setname_np(thread_id, "BT_Manager");
- sleep(1);
return 0;
}
diff --git a/binding-bluetooth/export.map b/binding-bluetooth/export.map
index 0ef1ac7..52c1b4a 100644
--- a/binding-bluetooth/export.map
+++ b/binding-bluetooth/export.map
@@ -1 +1 @@
-{ global: afbBindingV1Register; local: *; };
+{ global: afbBindingV1*; local: *; };