MYNEWT-723: Add control procedure code and HCI command/event code.
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/bb2c04ed Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/bb2c04ed Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/bb2c04ed Branch: refs/heads/bluetooth5 Commit: bb2c04ed88cbfe8eb15fa1d68a7d8b8b2b1b69a6 Parents: 5741441 Author: William San Filippo <[email protected]> Authored: Sun Apr 23 15:02:14 2017 -0700 Committer: Åukasz Rymanowski <[email protected]> Committed: Thu Apr 27 23:39:36 2017 +0200 ---------------------------------------------------------------------- net/nimble/controller/src/ble_ll_conn_hci.c | 3 ++- net/nimble/include/nimble/hci_common.h | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/bb2c04ed/net/nimble/controller/src/ble_ll_conn_hci.c ---------------------------------------------------------------------- diff --git a/net/nimble/controller/src/ble_ll_conn_hci.c b/net/nimble/controller/src/ble_ll_conn_hci.c index 6ce5c6b..f15dc2d 100644 --- a/net/nimble/controller/src/ble_ll_conn_hci.c +++ b/net/nimble/controller/src/ble_ll_conn_hci.c @@ -1290,7 +1290,8 @@ ble_ll_conn_hci_le_set_phy(uint8_t *cmdbuf) CONN_F_HOST_PHY_UPDATE(connsm) = 1; } else { /* - * We could be doing a peer-initiated PHY update procedure. If + * We could be doing a peer-initiated PHY update procedure. If this + * is the case the requested phy preferences will not both be 0. If * we are not done with a peer-initiated procedure we just set the * pending bit but do not start the control procedure. */ http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/bb2c04ed/net/nimble/include/nimble/hci_common.h ---------------------------------------------------------------------- diff --git a/net/nimble/include/nimble/hci_common.h b/net/nimble/include/nimble/hci_common.h index f929d85..86bc862 100644 --- a/net/nimble/include/nimble/hci_common.h +++ b/net/nimble/include/nimble/hci_common.h @@ -427,14 +427,14 @@ extern "C" { #define BLE_HCI_LE_SET_DEFAULT_PHY_LEN (3) #define BLE_HCI_LE_PHY_NO_TX_PREF_MASK (0x01) #define BLE_HCI_LE_PHY_NO_RX_PREF_MASK (0x02) -#define BLE_HCI_LE_PHY_PREF_MASK_ALL \ - (BLE_HCI_LE_PHY_1M_PREF_MASK | BLE_HCI_LE_PHY_2M_PREF_MASK | \ - BLE_HCI_LE_PHY_CODED_PREF_MASK) - #define BLE_HCI_LE_PHY_1M_PREF_MASK (0x01) #define BLE_HCI_LE_PHY_2M_PREF_MASK (0x02) #define BLE_HCI_LE_PHY_CODED_PREF_MASK (0x04) +#define BLE_HCI_LE_PHY_PREF_MASK_ALL \ + (BLE_HCI_LE_PHY_1M_PREF_MASK | BLE_HCI_LE_PHY_2M_PREF_MASK | \ + BLE_HCI_LE_PHY_CODED_PREF_MASK) + /* --- LE set PHY (OCF 0x0032) */ #define BLE_HCI_LE_SET_PHY_LEN (7) #define BLE_HCI_LE_PHY_CODED_ANY (0x0000)
