Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pkg/nimble: optimize package initialization #11131

Merged
merged 5 commits into from
Mar 7, 2019
Merged

pkg/nimble: optimize package initialization #11131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fe56b73
pkg/nimble: wait for host/ctrl sync during init
haukepetersen Mar 7, 2019
f3257f0
pkg/nimble: extract own addr type during init
haukepetersen Mar 7, 2019
8a849be
pkg/nimble: auto initialize build-in services
haukepetersen Mar 7, 2019
0cca176
examples/nimble_gatt: unroll update_ad()
haukepetersen Mar 7, 2019
4e49fa5
examples/nimble_gatt: drop build-in init calls
haukepetersen Mar 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 10 additions & 30 deletions examples/nimble_gatt/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include <stdlib.h>
#include <string.h>

#include "nimble_riot.h"
#include "net/bluetil/ad.h"

#include "host/ble_hs.h"
Expand Down Expand Up @@ -65,7 +66,6 @@ static const ble_uuid128_t gatt_svr_chr_rw_demo_readonly_uuid
0x4d, 0xd5, 0x40, 0x3f, 0x11, 0xdd, 0xcc);

static const char *device_name = "NimBLE on RIOT";
static uint8_t own_addr_type;

static char rm_demo_write_data[64] = "This characteristic is read- and writeable!";

Expand Down Expand Up @@ -132,15 +132,6 @@ static const struct ble_gatt_svc_def gatt_svr_svcs[] = {
},
};

static void update_ad(void)
{
uint8_t buf[BLE_HS_ADV_MAX_SZ];
bluetil_ad_t ad;
bluetil_ad_init_with_flags(&ad, buf, sizeof(buf), BLUETIL_AD_FLAGS_DEFAULT);
bluetil_ad_add_name(&ad, device_name);
ble_gap_adv_set_data(ad.buf, ad.pos);
}

static int gap_event_cb(struct ble_gap_event *event, void *arg)
{
(void)arg;
Expand Down Expand Up @@ -168,7 +159,7 @@ static void start_advertise(void)
memset(&advp, 0, sizeof advp);
advp.conn_mode = BLE_GAP_CONN_MODE_UND;
advp.disc_mode = BLE_GAP_DISC_MODE_GEN;
rc = ble_gap_adv_start(own_addr_type, NULL, BLE_HS_FOREVER,
rc = ble_gap_adv_start(nimble_riot_own_addr_type, NULL, BLE_HS_FOREVER,
&advp, gap_event_cb, NULL);
assert(rc == 0);
(void)rc;
Expand Down Expand Up @@ -320,34 +311,23 @@ int main(void)

int rc = 0;

/* verify and add our custom services */
rc = ble_gatts_count_cfg(gatt_svr_svcs);
assert(rc == 0);

rc = ble_gatts_add_svcs(gatt_svr_svcs);
assert(rc == 0);

/* set the device name */
ble_svc_gap_device_name_set(device_name);

/* initialize the GAP and GATT services */
ble_svc_gap_init();
ble_svc_gatt_init();
/* XXX: seems to be needed to apply the added services */
/* reload the GATT server to link our added services */
ble_gatts_start();

/* make sure synchronization of host and controller is done, this should
* always be the case */
while (!ble_hs_synced()) {}

/* configure device address */
rc = ble_hs_util_ensure_addr(0);
assert(rc == 0);
rc = ble_hs_id_infer_auto(0, &own_addr_type);
assert(rc == 0);
(void)rc;

/* generate the advertising data */
update_ad();
/* configure and set the advertising data */
uint8_t buf[BLE_HS_ADV_MAX_SZ];
bluetil_ad_t ad;
bluetil_ad_init_with_flags(&ad, buf, sizeof(buf), BLUETIL_AD_FLAGS_DEFAULT);
bluetil_ad_add_name(&ad, device_name);
ble_gap_adv_set_data(ad.buf, ad.pos);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please add a comment to the commit why you unrolled this function.


/* start to advertise this node */
start_advertise();
Expand Down
5 changes: 5 additions & 0 deletions pkg/nimble/contrib/include/nimble_riot.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ extern "C" {
#define NIMBLE_HOST_STACKSIZE (THREAD_STACKSIZE_DEFAULT)
#endif

/**
* @brief Export our own address type for later usage
*/
extern uint8_t nimble_riot_own_addr_type;

/**
* @brief Setup and run NimBLE's controller and host threads
*/
Expand Down
24 changes: 24 additions & 0 deletions pkg/nimble/contrib/nimble_riot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#include "nimble_riot.h"

#include "nimble/nimble_port.h"
#include "host/ble_hs.h"
#include "host/util/util.h"

#include "services/gap/ble_svc_gap.h"
#include "services/gatt/ble_svc_gatt.h"
Expand All @@ -37,6 +39,8 @@ static char _stack_controller[NIMBLE_CONTROLLER_STACKSIZE];
#ifdef MODULE_NIMBLE_HOST
static char _stack_host[NIMBLE_HOST_STACKSIZE];

uint8_t nimble_riot_own_addr_type;

static void *_host_thread(void *arg)
{
(void)arg;
Expand Down Expand Up @@ -77,4 +81,24 @@ void nimble_riot_init(void)
_host_thread, NULL,
"nimble_host");
#endif

/* make sure synchronization of host and controller is done, this should
* always be the case at this point */
while (!ble_hs_synced()) {}

/* for reducing code duplication, we read our own address type once here
* so it can be re-used later on */
int res = ble_hs_util_ensure_addr(0);
assert(res == 0);
res = ble_hs_id_infer_auto(0, &nimble_riot_own_addr_type);
assert(res == 0);
(void)res;

/* initialize the configured, build-in services */
#ifdef MODULE_NIMBLE_SVC_GAP
ble_svc_gap_init();
#endif
#ifdef MODULE_NIMBLE_SVC_GATT
ble_svc_gatt_init();
#endif
}