Add function to load at least one BLE addr from hw

This is just a helper function, so it is not going in the nimble stack
itself.  Instead, I have created a supplementary package:
net/nimble/host/util.

X-Original-Commit: b185ac0bd90c1f3ad3bc481fe1c4ec63a7e8238c
This commit is contained in:
Christopher Collins
2017-08-10 10:25:11 -07:00
parent 3d5bc69c85
commit ab75b3edcd
4 changed files with 192 additions and 0 deletions
+33
View File
@@ -0,0 +1,33 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
#ifndef H_HOST_UTIL_
#define H_HOST_UTIL_
#ifdef __cplusplus
extern "C" {
#endif
int ble_hs_util_ensure_addr(int prefer_random);
#ifdef __cplusplus
}
#endif
#endif
+29
View File
@@ -0,0 +1,29 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#
pkg.name: net/nimble/host/util
pkg.description: Supplementary utilities for the NimBLE host
pkg.author: "Apache Mynewt <[email protected]>"
pkg.homepage: "http://mynewt.apache.org/"
pkg.keywords:
- ble
- bluetooth
pkg.deps:
- net/nimble/host
+109
View File
@@ -0,0 +1,109 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
#include "hal/hal_bsp.h"
#include "host/ble_hs.h"
#include "host/util/util.h"
#if MYNEWT_VAL(BLE_DEVICE)
#include "controller/ble_hw.h"
#endif
static int
ble_hs_util_load_rand_addr(ble_addr_t *addr)
{
/* XXX: It is unfortunate that the function to retrieve the random address
* is in the controller package. A host-only device ought to be able to
* automically restore a random address.
*/
#if MYNEWT_VAL(BLE_DEVICE)
int rc;
rc = ble_hw_get_static_addr(addr);
if (rc == 0) {
return 0;
}
#endif
return BLE_HS_ENOADDR;
}
static int
ble_hs_util_ensure_rand_addr(void)
{
ble_addr_t addr;
int rc;
/* If we already have a random address, then we are done. */
rc = ble_hs_id_copy_addr(BLE_ADDR_RANDOM, NULL, NULL);
if (rc == 0) {
return 0;
}
/* Otherwise, try to load a random address. */
rc = ble_hs_util_load_rand_addr(&addr);
if (rc != 0) {
return rc;
}
/* Configure nimble to use the random address. */
rc = ble_hs_id_set_rnd(addr.val);
if (rc != 0) {
return rc;
}
return 0;
}
/**
* Tries to configure the device with at least one Bluetooth address.
* Addresses are restored in a hardware-specific fasion.
*
* @param prefer_random Whether to attempt to restore a random address
* before checking if a public address has
* already been configured.
*
* @return 0 on success;
* BLE_HS_ENOADDR if the device does not have any
* available addresses.
* Other BLE host core code on error.
*/
int
ble_hs_util_ensure_addr(int prefer_random)
{
int rc;
if (prefer_random) {
/* Try to load a random address. */
rc = ble_hs_util_ensure_rand_addr();
if (rc == BLE_HS_ENOADDR) {
/* No random address; try to load a public address. */
rc = ble_hs_id_copy_addr(BLE_ADDR_PUBLIC, NULL, NULL);
}
} else {
/* Try to load a public address. */
rc = ble_hs_id_copy_addr(BLE_ADDR_PUBLIC, NULL, NULL);
if (rc == BLE_HS_ENOADDR) {
/* No random address; try to load a random address. */
rc = ble_hs_util_ensure_rand_addr();
}
}
return rc;
}
+21
View File
@@ -0,0 +1,21 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#
# Package: net/nimble/host/util
syscfg.defs: