summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorMartin Fuzzey <mfuzzey@parkeon.com>2017-10-13 16:02:08 +0200
committerSzymon Janc <szymon.janc@codecoup.pl>2017-11-06 10:14:50 +0100
commita98f81146cefc7e5cfe4e98ccc39a267a1dacf2b (patch)
treefa2b5a84367e84f5f364901d299f1ec7e00a99dc /android
parentb51effb9bcd755c4114818ca490cf34d120b2639 (diff)
downloadbluez-a98f81146cefc7e5cfe4e98ccc39a267a1dacf2b.tar.gz
android: Get max advertising instances from kernel
Use the mgmnt "advinfo" operation to obtain the number of advertising instances supported by the kernel.
Diffstat (limited to 'android')
-rw-r--r--android/bluetooth.c44
1 files changed, 43 insertions, 1 deletions
diff --git a/android/bluetooth.c b/android/bluetooth.c
index c3ad5ce6e..b5a2eabf8 100644
--- a/android/bluetooth.c
+++ b/android/bluetooth.c
@@ -3336,6 +3336,37 @@ static void clear_auto_connect_list(void)
error("Could not clear auto connect list");
}
+static void read_adv_features_complete(uint8_t status, uint16_t length,
+ const void *param, void *user_data)
+{
+ const struct mgmt_rp_read_adv_features *rp = param;
+ bt_bluetooth_ready cb = user_data;
+ int err;
+
+ if (status) {
+ error("Failed to read advertising features for index %u: %s (0x%02x)",
+ adapter.index, mgmt_errstr(status), status);
+ err = -EIO;
+ goto failed;
+ }
+
+ if (length < sizeof(*rp)) {
+ error("Too small read advertising features response");
+ err = -EIO;
+ goto failed;
+ }
+
+ adapter.max_advert_instance = rp->max_instances;
+ info("Max LE advertising instances: %d", adapter.max_advert_instance);
+
+ load_devices_info(cb);
+
+ return;
+
+failed:
+ cb(err, NULL);
+}
+
static void read_info_complete(uint8_t status, uint16_t length,
const void *param, void *user_data)
{
@@ -3407,7 +3438,18 @@ static void read_info_complete(uint8_t status, uint16_t length,
if (missing_settings & MGMT_SETTING_BONDABLE)
set_mode(MGMT_OP_SET_BONDABLE, 0x01);
- load_devices_info(cb);
+ if (adapter.supported_settings & MGMT_SETTING_LE) {
+ if (mgmt_send(mgmt_if, MGMT_OP_READ_ADV_FEATURES, adapter.index,
+ 0, NULL,
+ read_adv_features_complete, cb, NULL) == 0) {
+ error("Cannot get LE adv features");
+ err = -EIO;
+ goto failed;
+ }
+ } else {
+ load_devices_info(cb);
+ }
+
load_devices_cache();
return;