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 2017/04/27 21:46:24 UTC
[1/2] incubator-mynewt-core git commit: MYNEWT-723: Fix creating
LL_PHY_REQ
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/bluetooth5 230462f8f -> ad980ee8a
MYNEWT-723: Fix creating LL_PHY_REQ
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/ad980ee8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/ad980ee8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/ad980ee8
Branch: refs/heads/bluetooth5
Commit: ad980ee8a581b8adf22e6b94817b20dc751a0f9f
Parents: aebec25
Author: Andrzej Kaczmarek <an...@codecoup.pl>
Authored: Thu Apr 27 23:20:23 2017 +0200
Committer: Andrzej Kaczmarek <an...@codecoup.pl>
Committed: Thu Apr 27 23:46:03 2017 +0200
----------------------------------------------------------------------
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/ad980ee8/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 10ec1c0..7fa0768 100644
--- a/net/nimble/controller/src/ble_ll_ctrl.c
+++ b/net/nimble/controller/src/ble_ll_ctrl.c
@@ -1831,7 +1831,7 @@ ble_ll_ctrl_proc_init(struct ble_ll_conn_sm *connsm, int ctrl_proc)
#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
case BLE_LL_CTRL_PROC_PHY_UPDATE:
opcode = BLE_LL_CTRL_PHY_REQ;
- ble_ll_ctrl_phy_req_rsp_make(connsm, dptr);
+ ble_ll_ctrl_phy_req_rsp_make(connsm, ctrdata);
break;
#endif
default:
[2/2] incubator-mynewt-core git commit: MYNEWT-723: Fix setting
current PHY
Posted by an...@apache.org.
MYNEWT-723: Fix setting current PHY
If new PHY is set to 0 (no change), we should just leave current PHY
without change and not set it to 0.
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/aebec258
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/aebec258
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/aebec258
Branch: refs/heads/bluetooth5
Commit: aebec2580f3c4faef2c50111abae825b0448e681
Parents: 230462f
Author: Andrzej Kaczmarek <an...@codecoup.pl>
Authored: Thu Apr 27 23:19:09 2017 +0200
Committer: Andrzej Kaczmarek <an...@codecoup.pl>
Committed: Thu Apr 27 23:46:03 2017 +0200
----------------------------------------------------------------------
net/nimble/controller/src/ble_ll_conn.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/aebec258/net/nimble/controller/src/ble_ll_conn.c
----------------------------------------------------------------------
diff --git a/net/nimble/controller/src/ble_ll_conn.c b/net/nimble/controller/src/ble_ll_conn.c
index 9e662ea..f6ea441 100644
--- a/net/nimble/controller/src/ble_ll_conn.c
+++ b/net/nimble/controller/src/ble_ll_conn.c
@@ -2064,9 +2064,13 @@ ble_ll_conn_next_event(struct ble_ll_conn_sm *connsm)
(connsm->event_cntr == connsm->phy_instant)) {
/* Set cur phy to new phy */
- connsm->phy_data.cur_tx_phy = connsm->phy_data.new_tx_phy;
+ if (connsm->phy_data.new_tx_phy) {
+ connsm->phy_data.cur_tx_phy = connsm->phy_data.new_tx_phy;
+ }
connsm->phy_data.tx_phy_mode = connsm->phy_data.cur_tx_phy;
- connsm->phy_data.cur_rx_phy = connsm->phy_data.new_rx_phy;
+ if (connsm->phy_data.new_rx_phy) {
+ connsm->phy_data.cur_rx_phy = connsm->phy_data.new_rx_phy;
+ }
connsm->phy_data.rx_phy_mode = connsm->phy_data.cur_rx_phy;
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)