diff options
author | DoHyun Pyun <dh79.pyun@samsung.com> | 2016-10-11 13:53:57 +0900 |
---|---|---|
committer | DoHyun Pyun <dh79.pyun@samsung.com> | 2016-10-11 13:53:57 +0900 |
commit | fbe25f01fc08ac453d18345100c0e3393a7438bd (patch) | |
tree | 9b789bf7ab26b8088d1f0d5e516eb4fef9797982 | |
parent | 0a113730153324f4d5605007e71cc09bf2dd6307 (diff) | |
download | bluez-accepted/tizen/common/20161011.154224.tar.gz bluez-accepted/tizen/common/20161011.154224.tar.bz2 bluez-accepted/tizen/common/20161011.154224.zip |
Include the method call for naroow and wide band setting methodsubmit/tizen/20161011.051821submit/tizen/20161011.045858accepted/tizen/wearable/20161011.234116accepted/tizen/tv/20161011.234059accepted/tizen/mobile/20161011.234121accepted/tizen/ivi/20161011.234126accepted/tizen/common/20161011.154224
Change-Id: I5ed2a97d10b8bcc2e388287792f1f3aa957420a6
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
-rw-r--r-- | packaging/bluez.spec | 2 | ||||
-rw-r--r-- | src/adapter.c | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/packaging/bluez.spec b/packaging/bluez.spec index c6dff647..38807c18 100644 --- a/packaging/bluez.spec +++ b/packaging/bluez.spec @@ -4,7 +4,7 @@ Name: bluez Summary: Bluetooth Stack for Linux Version: 5.37 -Release: 0 +Release: 1 Group: Network & Connectivity/Bluetooth License: GPL-2.0+ and LGPL-2.1+ and Apache-2.0 URL: http://www.bluez.org/ diff --git a/src/adapter.c b/src/adapter.c index c18f6c2f..a1e0d75d 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -4031,7 +4031,7 @@ static void adapter_get_adv_tx_power(void *data) return; } #endif -#ifdef __BROADCOM_PATCH__ + static DBusMessage *set_wbs_parameters(DBusConnection *conn, DBusMessage *msg, void *data) { @@ -4116,7 +4116,6 @@ static DBusMessage *set_nb_parameters(DBusConnection *conn, return dbus_message_new_method_return(msg); } -#endif /* __BROADCOM_PATCH__ */ #ifdef __TIZEN_PATCH__ void btd_adapter_set_read_le_data_length_handler( @@ -5876,7 +5875,6 @@ static const GDBusMethodTable adapter_methods[] = { GDBUS_ARGS({ "address", "s" }), GDBUS_ARGS({ "device", "o" }), find_device) }, -#ifdef __BROADCOM_PATCH__ { GDBUS_METHOD("SetWbsParameters", GDBUS_ARGS({ "role", "s" }, { "bt_address", "s" }), NULL, @@ -5885,7 +5883,6 @@ static const GDBusMethodTable adapter_methods[] = { GDBUS_ARGS({ "role", "s" }, { "bt_address", "s" }), NULL, set_nb_parameters) }, -#endif { GDBUS_METHOD("SetManufacturerData", GDBUS_ARGS({ "value", "ay" }), NULL, adapter_set_manufacturer_data) }, |