You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by na...@apache.org on 2018/05/15 14:14:06 UTC
[mynewt-nimble] branch master updated (d989c69 -> 9c3fe25)
This is an automated email from the ASF dual-hosted git repository.
naraj pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git.
from d989c69 Merge pull request #95 from turon/pr/hci_sock
add b8a8816 nimble/host: Fix HCI command processing when using host only
add c29971e porting: Add Mesh files to Makefile
add a1005bd porting: Add missing API functions used by Mesh
add b029b90 mesh: Initialize mesh adv thread only if building with Mynewt
add 0fd550b mesh: Use Nimble Porting Layer
new 9c3fe25 Merge pull request #98 from michal-narajowski/mesh-npl
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
nimble/host/mesh/include/mesh/glue.h | 31 ++++++-------
nimble/host/mesh/include/mesh/porting.h | 19 ++++++++
nimble/host/mesh/src/access.c | 4 +-
nimble/host/mesh/src/adv.c | 41 ++++++++--------
nimble/host/mesh/src/adv.h | 2 +-
nimble/host/mesh/src/beacon.c | 2 +-
nimble/host/mesh/src/cfg_srv.c | 4 +-
nimble/host/mesh/src/friend.c | 8 ++--
nimble/host/mesh/src/glue.c | 54 +++++++++++-----------
nimble/host/mesh/src/health_srv.c | 4 +-
nimble/host/mesh/src/lpn.c | 2 +-
nimble/host/mesh/src/net.c | 4 +-
nimble/host/mesh/src/net.h | 2 +-
nimble/host/mesh/src/prov.c | 2 +-
nimble/host/mesh/src/proxy.c | 9 ++--
nimble/host/mesh/src/transport.c | 8 ++--
nimble/host/src/ble_hs_hci_cmd.c | 5 +-
nimble/include/nimble/nimble_npl.h | 12 +++++
porting/nimble/Makefile.defs | 4 ++
porting/nimble/Makefile.mesh | 25 ++++++++++
.../npl/freertos/include/nimble/nimble_npl_os.h | 31 +++++++++++++
porting/npl/freertos/include/nimble/npl_freertos.h | 5 ++
porting/npl/freertos/src/npl_os_freertos.c | 38 +++++++++++++--
porting/npl/mynewt/include/nimble/nimble_npl_os.h | 32 +++++++++++++
24 files changed, 254 insertions(+), 94 deletions(-)
create mode 100644 nimble/host/mesh/include/mesh/porting.h
create mode 100644 porting/nimble/Makefile.mesh
--
To stop receiving notification emails like this one, please contact
naraj@apache.org.
[mynewt-nimble] 01/01: Merge pull request #98 from
michal-narajowski/mesh-npl
Posted by na...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
naraj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit 9c3fe25549f9d913a8bceb8638c57863ba08d7f8
Merge: d989c69 0fd550b
Author: Michał Narajowski <mi...@codecoup.pl>
AuthorDate: Tue May 15 16:14:03 2018 +0200
Merge pull request #98 from michal-narajowski/mesh-npl
Update Mesh to use NPL
nimble/host/mesh/include/mesh/glue.h | 31 ++++++-------
nimble/host/mesh/include/mesh/porting.h | 19 ++++++++
nimble/host/mesh/src/access.c | 4 +-
nimble/host/mesh/src/adv.c | 41 ++++++++--------
nimble/host/mesh/src/adv.h | 2 +-
nimble/host/mesh/src/beacon.c | 2 +-
nimble/host/mesh/src/cfg_srv.c | 4 +-
nimble/host/mesh/src/friend.c | 8 ++--
nimble/host/mesh/src/glue.c | 54 +++++++++++-----------
nimble/host/mesh/src/health_srv.c | 4 +-
nimble/host/mesh/src/lpn.c | 2 +-
nimble/host/mesh/src/net.c | 4 +-
nimble/host/mesh/src/net.h | 2 +-
nimble/host/mesh/src/prov.c | 2 +-
nimble/host/mesh/src/proxy.c | 9 ++--
nimble/host/mesh/src/transport.c | 8 ++--
nimble/host/src/ble_hs_hci_cmd.c | 5 +-
nimble/include/nimble/nimble_npl.h | 12 +++++
porting/nimble/Makefile.defs | 4 ++
porting/nimble/Makefile.mesh | 25 ++++++++++
.../npl/freertos/include/nimble/nimble_npl_os.h | 31 +++++++++++++
porting/npl/freertos/include/nimble/npl_freertos.h | 5 ++
porting/npl/freertos/src/npl_os_freertos.c | 38 +++++++++++++--
porting/npl/mynewt/include/nimble/nimble_npl_os.h | 32 +++++++++++++
24 files changed, 254 insertions(+), 94 deletions(-)
diff --cc nimble/host/mesh/include/mesh/glue.h
index 7e6b40f,d45cfbc..d9440ad
--- a/nimble/host/mesh/include/mesh/glue.h
+++ b/nimble/host/mesh/include/mesh/glue.h
@@@ -276,14 -276,13 +275,14 @@@ void bt_mesh_register_gatt(void)
int bt_le_adv_start(const struct ble_gap_adv_params *param,
const struct bt_data *ad, size_t ad_len,
const struct bt_data *sd, size_t sd_len);
+int bt_le_adv_stop(void);
struct k_delayed_work {
- struct os_callout work;
+ struct ble_npl_callout work;
};
- void k_work_init(struct os_callout *work, os_event_fn handler);
- void k_delayed_work_init(struct k_delayed_work *w, os_event_fn *f);
+ void k_work_init(struct ble_npl_callout *work, ble_npl_event_fn handler);
+ void k_delayed_work_init(struct k_delayed_work *w, ble_npl_event_fn *f);
void k_delayed_work_cancel(struct k_delayed_work *w);
void k_delayed_work_submit(struct k_delayed_work *w, uint32_t ms);
int64_t k_uptime_get(void);
--
To stop receiving notification emails like this one, please contact
naraj@apache.org.