From dc504cf7676cdca0a2816750d1d287dc2350fbd0 Mon Sep 17 00:00:00 2001 From: Matt Ranostay Date: Fri, 23 Nov 2018 14:24:18 -0800 Subject: binding: bluetooth: add default_adapter verb Allow setting of default adapter for use by other verbs within the binding. This allows to select an adapter on boards with more than one. Bug-AGL: SPEC-1630 Change-Id: Iec77b0abaa9f4c092dc5c827522efb1744953fce Signed-off-by: Matt Ranostay --- binding/bluetooth-util.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'binding/bluetooth-util.c') diff --git a/binding/bluetooth-util.c b/binding/bluetooth-util.c index e8a0781..f07e5ed 100644 --- a/binding/bluetooth-util.c +++ b/binding/bluetooth-util.c @@ -1040,10 +1040,13 @@ void json_process_path(json_object *jresp, const char *path) { } gchar *return_bluez_path(afb_req_t request) { + struct bluetooth_state *ns = bluetooth_get_userdata(request); const char *adapter = afb_req_value(request, "adapter"); const char *device, *tmp; - adapter = adapter ? adapter : BLUEZ_DEFAULT_ADAPTER; + call_work_lock(ns); + adapter = adapter ? adapter : ns->default_adapter; + call_work_unlock(ns); device = afb_req_value(request, "device"); if (!device) -- cgit 1.2.3-korg