You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ja...@apache.org on 2017/11/23 09:30:21 UTC
[mynewt-core] 01/01: Merge pull request #671 from sjanc/ext_adv_host
This is an automated email from the ASF dual-hosted git repository.
janc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit 50a0295e04f7e9a88ad4e5f5f4ae6c1e3d73dfbb
Merge: 8d65a27 18d4ed3
Author: Szymon Janc <sz...@codecoup.pl>
AuthorDate: Thu Nov 23 10:30:18 2017 +0100
Merge pull request #671 from sjanc/ext_adv_host
Extended Advertising API
apps/bletiny/src/cmd.c | 56 --
apps/btshell/src/btshell.h | 6 +-
apps/btshell/src/cmd.c | 622 +++++++++++--
apps/btshell/src/main.c | 26 +-
net/nimble/host/include/host/ble_gap.h | 44 +-
net/nimble/host/include/host/ble_hs_adv.h | 3 +
net/nimble/host/src/ble_gap.c | 1063 ++++++++++++++++-------
net/nimble/host/src/ble_gap_priv.h | 3 +-
net/nimble/host/src/ble_hs_adv.c | 232 +++--
net/nimble/host/src/ble_hs_hci_cmd.c | 33 +-
net/nimble/host/src/ble_hs_hci_evt.c | 46 +-
net/nimble/host/src/ble_hs_hci_priv.h | 16 +-
net/nimble/host/src/ble_hs_hci_util.c | 24 -
net/nimble/host/test/src/ble_gap_test.c | 12 +-
net/nimble/host/test/src/ble_hs_conn_test.c | 6 +-
net/nimble/host/test/src/ble_hs_test_util.c | 2 +-
net/nimble/host/test/src/ble_hs_test_util_hci.c | 2 +-
net/nimble/host/test/src/ble_os_test.c | 6 +-
net/nimble/include/nimble/hci_common.h | 16 +
19 files changed, 1649 insertions(+), 569 deletions(-)
diff --cc net/nimble/host/src/ble_gap.c
index ba58f79,20db133..be8f113
--- a/net/nimble/host/src/ble_gap.c
+++ b/net/nimble/host/src/ble_gap.c
@@@ -4417,13 -4897,17 +4898,15 @@@ ble_gap_init(void
memset(&ble_gap_master, 0, sizeof ble_gap_master);
memset(ble_gap_slave, 0, sizeof ble_gap_slave);
+ os_mutex_init(&preempt_done_mutex);
+
SLIST_INIT(&ble_gap_update_entries);
- rc = mem_malloc_mempool(&ble_gap_update_entry_pool,
- BLE_GAP_MAX_UPDATE_ENTRIES,
- sizeof (struct ble_gap_update_entry),
- "ble_gap_update",
- &ble_gap_update_entry_mem);
+ rc = os_mempool_init(&ble_gap_update_entry_pool,
+ BLE_GAP_MAX_UPDATE_ENTRIES,
+ sizeof (struct ble_gap_update_entry),
+ ble_gap_update_entry_mem,
+ "ble_gap_update");
switch (rc) {
case 0:
break;
--
To stop receiving notification emails like this one, please contact
"commits@mynewt.apache.org" <co...@mynewt.apache.org>.