From f05fd30507b218bd06d6ecdb5ddcd07de3927f82 Mon Sep 17 00:00:00 2001 From: Matt Ranostay Date: Mon, 29 Oct 2018 17:44:38 -0700 Subject: binding: bluetooth: add BLUEZ_DEFAULT_ADAPTER Bug-AGL: SPEC-1630 Change-Id: I8e55d273ab58992e6f6327523853c6d330505278 Signed-off-by: Matt Ranostay --- binding/bluetooth-api.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'binding/bluetooth-api.c') diff --git a/binding/bluetooth-api.c b/binding/bluetooth-api.c index e9c339f..58c326c 100644 --- a/binding/bluetooth-api.c +++ b/binding/bluetooth-api.c @@ -599,14 +599,9 @@ static void bluetooth_state(afb_req_t request) struct bluetooth_state *ns = bluetooth_get_userdata(request); GError *error = NULL; json_object *jresp; - const char *adapter; + const char *adapter = afb_req_value(request, "adapter"); - adapter = afb_req_value(request, "adapter"); - if (!adapter) { - afb_req_fail(request, "failed", "No adapter give to return state"); - return; - } - adapter = BLUEZ_ROOT_PATH(adapter); + adapter = BLUEZ_ROOT_PATH(adapter ? adapter : BLUEZ_DEFAULT_ADAPTER); jresp = adapter_properties(ns, &error, adapter); if (!jresp) { @@ -622,14 +617,10 @@ static void bluetooth_adapter(afb_req_t request) { struct bluetooth_state *ns = bluetooth_get_userdata(request); GError *error = NULL; - const char *adapter, *scan, *discoverable, *powered; + const char *adapter = afb_req_value(request, "adapter"); + const char *scan, *discoverable, *powered; - adapter = afb_req_value(request, "adapter"); - if (!adapter) { - afb_req_fail(request, "failed", "No adapter given to configure"); - return; - } - adapter = BLUEZ_ROOT_PATH(adapter); + adapter = BLUEZ_ROOT_PATH(adapter ? adapter : BLUEZ_DEFAULT_ADAPTER); scan = afb_req_value(request, "discovery"); if (scan) { -- cgit 1.2.3-korg