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/05/08 13:45:50 UTC
[1/3] incubator-mynewt-core git commit: nimble/controller: Fix
controller unit test
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/bluetooth5 1a344896d -> 4cab05214
nimble/controller: Fix controller unit test
This fix following build error due to uint32_t being defined as 'unsigned int'
instead of 'unsigned long int'
Error: repos/apache-mynewt-core/net/nimble/controller/src/ble_ll.c: In function 'ble_ll_log_dump_index':
repos/apache-mynewt-core/net/nimble/controller/src/ble_ll.c:1391:30: error: format '%u' expects argument
of type 'unsigned int', but argument 2 has type 'uint32_t {aka long unsigned int}' [-Werror=format=]
console_printf("cputime=%u id=%u a8=%u a16=%u a32=%u\n",
^
repos/apache-mynewt-core/net/nimble/controller/src/ble_ll.c:1391:56: error: format '%u' expects argument
of type 'unsigned int', but argument 6 has type 'uint32_t {aka long unsigned int}' [-Werror=format=]
console_printf("cputime=%u id=%u a8=%u a16=%u a32=%u\n",
cc1: all warnings being treated as errors
This is just a quick workaround for now.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/34670d72
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/34670d72
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/34670d72
Branch: refs/heads/bluetooth5
Commit: 34670d729cec2d99b1408a74cb69d60364d8a867
Parents: 1a34489
Author: Szymon Janc <sz...@codecoup.pl>
Authored: Mon May 8 14:09:38 2017 +0200
Committer: Szymon Janc <sz...@codecoup.pl>
Committed: Mon May 8 14:10:54 2017 +0200
----------------------------------------------------------------------
net/nimble/controller/src/ble_ll.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/34670d72/net/nimble/controller/src/ble_ll.c
----------------------------------------------------------------------
diff --git a/net/nimble/controller/src/ble_ll.c b/net/nimble/controller/src/ble_ll.c
index eb1534b..930b44e 100644
--- a/net/nimble/controller/src/ble_ll.c
+++ b/net/nimble/controller/src/ble_ll.c
@@ -1388,9 +1388,10 @@ ble_ll_log_dump_index(int i)
log = &g_ble_ll_log[i];
+ /* TODO cast is a workaround until this is fixed properly */
console_printf("cputime=%lu id=%u a8=%u a16=%u a32=%lu\n",
- log->cputime, log->log_id, log->log_a8,
- log->log_a16, log->log_a32);
+ (unsigned long)log->cputime, log->log_id, log->log_a8,
+ log->log_a16, (unsigned long)log->log_a32);
}
void
[3/3] incubator-mynewt-core git commit: This closes #262
Posted by ja...@apache.org.
This closes #262
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/4cab0521
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/4cab0521
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/4cab0521
Branch: refs/heads/bluetooth5
Commit: 4cab05214a1c1b459aa8e981e785bac7be670d70
Parents: 1a34489 9b31d74
Author: Szymon Janc <sz...@codecoup.pl>
Authored: Mon May 8 15:44:50 2017 +0200
Committer: Szymon Janc <sz...@codecoup.pl>
Committed: Mon May 8 15:44:50 2017 +0200
----------------------------------------------------------------------
hw/drivers/nimble/native/src/ble_phy.c | 12 ++++++++++++
net/nimble/controller/src/ble_ll.c | 5 +++--
2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-mynewt-core git commit: Fix native controller build
Posted by ja...@apache.org.
Fix native controller build
Fix following link error when build unit tests forcontroller:
unittest/net_nimble_controller_test/app/net/nimble/controller/
net_nimble_controller.a(ble_ll.o): In function `ble_ll_wfr_timer_exp':
net/nimble/controller/src/ble_ll.c:505: undefined reference to
`ble_phy_xcvr_state_get'
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/9b31d745
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/9b31d745
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/9b31d745
Branch: refs/heads/bluetooth5
Commit: 9b31d7452610f3cdab5ccce10f49ae9806535fd3
Parents: 34670d7
Author: Szymon Janc <sz...@codecoup.pl>
Authored: Mon May 8 14:19:10 2017 +0200
Committer: Szymon Janc <sz...@codecoup.pl>
Committed: Mon May 8 14:19:10 2017 +0200
----------------------------------------------------------------------
hw/drivers/nimble/native/src/ble_phy.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/9b31d745/hw/drivers/nimble/native/src/ble_phy.c
----------------------------------------------------------------------
diff --git a/hw/drivers/nimble/native/src/ble_phy.c b/hw/drivers/nimble/native/src/ble_phy.c
index 3fb5cf7..57c6799 100644
--- a/hw/drivers/nimble/native/src/ble_phy.c
+++ b/hw/drivers/nimble/native/src/ble_phy.c
@@ -605,4 +605,16 @@ ble_phy_resolv_list_disable(void)
{
g_ble_phy_data.phy_privacy = 0;
}
+
+/**
+ * Return the transceiver state
+ *
+ * @return int transceiver state.
+ */
+uint8_t
+ble_phy_xcvr_state_get(void)
+{
+ return g_ble_phy_data.phy_state;
+}
+
#endif