You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by we...@apache.org on 2017/04/04 22:30:26 UTC
[1/2] incubator-mynewt-core git commit: No jira ticket: get native
ble building.
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop 75d9c304e -> 79e45a56b
No jira ticket: get native ble building.
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/8b595e29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/8b595e29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/8b595e29
Branch: refs/heads/develop
Commit: 8b595e29cf734b14320a39eb691dbfc9a0139725
Parents: 75d9c30
Author: William San Filippo <wi...@runtime.io>
Authored: Tue Apr 4 15:11:28 2017 -0700
Committer: William San Filippo <wi...@runtime.io>
Committed: Tue Apr 4 15:11:28 2017 -0700
----------------------------------------------------------------------
hw/drivers/nimble/native/src/ble_hw.c | 14 ++++++++++++++
hw/drivers/nimble/native/src/ble_phy.c | 5 +++++
net/nimble/controller/src/ble_ll_xcvr.c | 1 +
3 files changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/8b595e29/hw/drivers/nimble/native/src/ble_hw.c
----------------------------------------------------------------------
diff --git a/hw/drivers/nimble/native/src/ble_hw.c b/hw/drivers/nimble/native/src/ble_hw.c
index 12a6ea1..aa50466 100644
--- a/hw/drivers/nimble/native/src/ble_hw.c
+++ b/hw/drivers/nimble/native/src/ble_hw.c
@@ -32,6 +32,20 @@
/* We use this to keep track of which entries are set to valid addresses */
static uint8_t g_ble_hw_whitelist_mask;
+/* Returns public device address or -1 if not present */
+int
+ble_hw_get_public_addr(ble_addr_t *addr)
+{
+ return -1;
+}
+
+/* Returns random static address or -1 if not present */
+int
+ble_hw_get_static_addr(ble_addr_t *addr)
+{
+ return -1;
+}
+
/**
* Clear the whitelist
*
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/8b595e29/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 0ad0f71..3fb5cf7 100644
--- a/hw/drivers/nimble/native/src/ble_phy.c
+++ b/hw/drivers/nimble/native/src/ble_phy.c
@@ -332,6 +332,11 @@ ble_phy_rx(void)
return 0;
}
+void
+ble_phy_restart_rx(void)
+{
+}
+
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
/**
* Called to enable encryption at the PHY. Note that this state will persist
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/8b595e29/net/nimble/controller/src/ble_ll_xcvr.c
----------------------------------------------------------------------
diff --git a/net/nimble/controller/src/ble_ll_xcvr.c b/net/nimble/controller/src/ble_ll_xcvr.c
index 50ab32e..5718730 100644
--- a/net/nimble/controller/src/ble_ll_xcvr.c
+++ b/net/nimble/controller/src/ble_ll_xcvr.c
@@ -18,6 +18,7 @@
*/
#include <stdint.h>
+#include <stddef.h>
#include <assert.h>
#include "syscfg/syscfg.h"
#include "os/os_cputime.h"
[2/2] incubator-mynewt-core git commit: No jira ticket: fix
uninitialized local variable.
Posted by we...@apache.org.
No jira ticket: fix uninitialized local variable.
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/79e45a56
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/79e45a56
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/79e45a56
Branch: refs/heads/develop
Commit: 79e45a56bb9f9f32604324760d275bc7cf75bdc2
Parents: 8b595e2
Author: William San Filippo <wi...@runtime.io>
Authored: Tue Apr 4 15:30:20 2017 -0700
Committer: William San Filippo <wi...@runtime.io>
Committed: Tue Apr 4 15:30:20 2017 -0700
----------------------------------------------------------------------
net/nimble/controller/src/ble_ll_ctrl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/79e45a56/net/nimble/controller/src/ble_ll_ctrl.c
----------------------------------------------------------------------
diff --git a/net/nimble/controller/src/ble_ll_ctrl.c b/net/nimble/controller/src/ble_ll_ctrl.c
index 55f58e8..a933753 100644
--- a/net/nimble/controller/src/ble_ll_ctrl.c
+++ b/net/nimble/controller/src/ble_ll_ctrl.c
@@ -992,12 +992,12 @@ ble_ll_ctrl_rx_conn_update(struct ble_ll_conn_sm *connsm, uint8_t *dptr,
/* XXX: validate them at some point. If they dont check out, we
return the unknown response */
+ rsp_opcode = BLE_ERR_MAX;
/* If instant is in the past, we have to end the connection */
conn_events = (reqdata->instant - connsm->event_cntr) & 0xFFFF;
if (conn_events >= 32767) {
ble_ll_conn_timeout(connsm, BLE_ERR_INSTANT_PASSED);
- rsp_opcode = BLE_ERR_MAX;
} else {
connsm->csmflags.cfbit.conn_update_sched = 1;
}