You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by an...@apache.org on 2018/05/28 10:03:07 UTC
[mynewt-nimble] branch master updated (e026626 -> 23093db)
This is an automated email from the ASF dual-hosted git repository.
andk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git.
from e026626 Merge pull request #111 from andrzej-kaczmarek/npl-riot
add 773bd4c nimble/phy: Update ISR tracing
add ddfe8fe porting: Update NPL with latest tracing API
add d73572e nimble/ll: Use logging via sysview
new 23093db Merge pull request #104 from andrzej-kaczmarek/systemview
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/controller/include/controller/ble_ll.h | 31 ------
.../controller/include/controller/ble_ll_trace.h | 92 +++++++++++++++++
.../controller/include/controller/ble_phy_trace.h | 94 +++++++++++++++++
nimble/controller/src/ble_ll.c | 101 +++---------------
nimble/controller/src/ble_ll_adv.c | 13 ++-
nimble/controller/src/ble_ll_conn.c | 38 +++----
nimble/controller/src/ble_ll_ctrl.c | 3 +-
nimble/controller/src/ble_ll_scan.c | 1 -
nimble/controller/src/ble_ll_sched.c | 7 +-
nimble/controller/src/ble_ll_trace.c | 53 ++++++++++
nimble/controller/src/ble_ll_xcvr.c | 4 -
nimble/controller/syscfg.yml | 5 +
nimble/drivers/nrf51/src/ble_hw.c | 5 +
nimble/drivers/nrf51/src/ble_phy.c | 21 ++--
nimble/drivers/nrf52/src/ble_hw.c | 6 +-
nimble/drivers/nrf52/src/ble_phy.c | 22 ++--
.../nrf52/src/ble_phy_trace.c} | 30 +++---
nimble/drivers/nrf52/syscfg.yml | 5 +
porting/nimble/include/os/os_trace_api.h | 115 ++++++++++++++++-----
19 files changed, 433 insertions(+), 213 deletions(-)
create mode 100644 nimble/controller/include/controller/ble_ll_trace.h
create mode 100644 nimble/controller/include/controller/ble_phy_trace.h
create mode 100644 nimble/controller/src/ble_ll_trace.c
copy nimble/{controller/test/src/ble_ll_test.c => drivers/nrf52/src/ble_phy_trace.c} (57%)
--
To stop receiving notification emails like this one, please contact
andk@apache.org.
[mynewt-nimble] 01/01: Merge pull request #104 from
andrzej-kaczmarek/systemview
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
andk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit 23093dbe599d8816418f15442847e5ba23374e4f
Merge: e026626 d73572e
Author: Andrzej Kaczmarek <an...@codecoup.pl>
AuthorDate: Mon May 28 12:02:42 2018 +0200
Merge pull request #104 from andrzej-kaczmarek/systemview
Add tracing via SystemView
nimble/controller/include/controller/ble_ll.h | 31 ------
.../controller/include/controller/ble_ll_trace.h | 92 +++++++++++++++++
.../controller/include/controller/ble_phy_trace.h | 94 +++++++++++++++++
nimble/controller/src/ble_ll.c | 101 +++---------------
nimble/controller/src/ble_ll_adv.c | 13 ++-
nimble/controller/src/ble_ll_conn.c | 38 +++----
nimble/controller/src/ble_ll_ctrl.c | 3 +-
nimble/controller/src/ble_ll_scan.c | 1 -
nimble/controller/src/ble_ll_sched.c | 7 +-
nimble/controller/src/ble_ll_trace.c | 53 ++++++++++
nimble/controller/src/ble_ll_xcvr.c | 4 -
nimble/controller/syscfg.yml | 5 +
nimble/drivers/nrf51/src/ble_hw.c | 5 +
nimble/drivers/nrf51/src/ble_phy.c | 21 ++--
nimble/drivers/nrf52/src/ble_hw.c | 6 +-
nimble/drivers/nrf52/src/ble_phy.c | 22 ++--
nimble/drivers/nrf52/src/ble_phy_trace.c | 44 ++++++++
nimble/drivers/nrf52/syscfg.yml | 5 +
porting/nimble/include/os/os_trace_api.h | 115 ++++++++++++++++-----
19 files changed, 459 insertions(+), 201 deletions(-)
diff --cc nimble/controller/src/ble_ll_conn.c
index bb3ceaf,63c4d13..4306126
--- a/nimble/controller/src/ble_ll_conn.c
+++ b/nimble/controller/src/ble_ll_conn.c
@@@ -1431,8 -1430,11 +1430,11 @@@ ble_ll_conn_event_start_cb(struct ble_l
/* Set current connection state machine */
connsm = (struct ble_ll_conn_sm *)sch->cb_arg;
g_ble_ll_conn_cur_sm = connsm;
- assert(connsm);
+ BLE_LL_ASSERT(connsm);
+ /* Log connection event start */
+ ble_ll_trace_u32(BLE_LL_TRACE_ID_CONN_EV_START, connsm->conn_handle);
+
/* Disable whitelisting as connections do not use it */
ble_ll_whitelist_disable();
@@@ -2563,8 -2561,12 +2561,12 @@@ ble_ll_conn_event_end(struct ble_npl_ev
/* Better be a connection state machine! */
connsm = (struct ble_ll_conn_sm *)ble_npl_event_get_arg(ev);
- assert(connsm);
+ BLE_LL_ASSERT(connsm);
+ /* Log event end */
+ ble_ll_trace_u32x2(BLE_LL_TRACE_ID_CONN_EV_END, connsm->conn_handle,
+ connsm->event_cntr);
+
/* Check if we need to resume scanning */
ble_ll_scan_chk_resume();
--
To stop receiving notification emails like this one, please contact
andk@apache.org.