You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ry...@apache.org on 2018/11/09 12:31:12 UTC
[mynewt-nimble] branch master updated (ef58876 -> 3fc309c)
This is an automated email from the ASF dual-hosted git repository.
rymek pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git.
from ef58876 [linux] resolve merge conflict. Default to providing access to psm for l2cap coc connections.
new ff7a82c nimble/ll: Minor parameter name change
new 78da20d nimble/ll: Minor comment fix
new 3fc309c mesh: Minor fix trailing whitespaces
The 3 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/src/ble_ll_scan.c | 18 +++++++++---------
nimble/controller/src/ble_ll_sched.c | 2 +-
nimble/host/mesh/src/prov.c | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
[mynewt-nimble] 01/03: nimble/ll: Minor parameter name change
Posted by ry...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rymek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit ff7a82c065e57c905cd00c236eea915b30e1b928
Author: Łukasz Rymanowski <lu...@codecoup.pl>
AuthorDate: Thu Nov 8 16:23:22 2018 +0100
nimble/ll: Minor parameter name change
Let be consistent and use aux_data everywhere
---
nimble/controller/src/ble_ll_scan.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/nimble/controller/src/ble_ll_scan.c b/nimble/controller/src/ble_ll_scan.c
index 901fa18..7823478 100644
--- a/nimble/controller/src/ble_ll_scan.c
+++ b/nimble/controller/src/ble_ll_scan.c
@@ -1566,31 +1566,31 @@ ble_ll_ext_adv_phy_mode_to_local_phy(uint8_t adv_phy_mode)
static int
ble_ll_ext_scan_parse_aux_ptr(struct ble_ll_scan_sm *scansm,
- struct ble_ll_aux_data *aux_scan, uint8_t *buf)
+ struct ble_ll_aux_data *aux_data, uint8_t *buf)
{
uint32_t aux_ptr_field = get_le32(buf) & 0x00FFFFFF;
- aux_scan->chan = (aux_ptr_field) & 0x3F;
- if (aux_scan->chan >= BLE_PHY_NUM_DATA_CHANS) {
+ aux_data->chan = (aux_ptr_field) & 0x3F;
+ if (aux_data->chan >= BLE_PHY_NUM_DATA_CHANS) {
return -1;
}
/* TODO use CA aux_ptr_field >> 6 */
- aux_scan->offset = 30 * ((aux_ptr_field >> 8) & 0x1FFF);
+ aux_data->offset = 30 * ((aux_ptr_field >> 8) & 0x1FFF);
if ((aux_ptr_field >> 7) & 0x01) {
- aux_scan->offset *= 10;
- aux_scan->offset_units = 1;
+ aux_data->offset *= 10;
+ aux_data->offset_units = 1;
}
- if (aux_scan->offset < BLE_LL_MAFS) {
+ if (aux_data->offset < BLE_LL_MAFS) {
return -1;
}
- aux_scan->aux_phy =
+ aux_data->aux_phy =
ble_ll_ext_adv_phy_mode_to_local_phy((aux_ptr_field >> 21) & 0x07);
- if (aux_scan->aux_phy == 0) {
+ if (aux_data->aux_phy == 0) {
return -1;
}
[mynewt-nimble] 02/03: nimble/ll: Minor comment fix
Posted by ry...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rymek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit 78da20d5d4193171a5bfd04a78a4f48019f07b5a
Author: Łukasz Rymanowski <lu...@codecoup.pl>
AuthorDate: Fri Nov 9 11:43:41 2018 +0100
nimble/ll: Minor comment fix
---
nimble/controller/src/ble_ll_sched.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nimble/controller/src/ble_ll_sched.c b/nimble/controller/src/ble_ll_sched.c
index 3e341ff..cb00ea0 100644
--- a/nimble/controller/src/ble_ll_sched.c
+++ b/nimble/controller/src/ble_ll_sched.c
@@ -1319,7 +1319,7 @@ ble_ll_sched_rfclk_chk_restart(void)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
/**
- * Called to check if there is place for comming scan req.
+ * Called to check if there is place for a planned scan req.
*
* @param chan
* @param phy_mode
[mynewt-nimble] 03/03: mesh: Minor fix trailing whitespaces
Posted by ry...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rymek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit 3fc309ce5b280bee19da9e835cde29cf9064442a
Author: Łukasz Rymanowski <lu...@codecoup.pl>
AuthorDate: Fri Nov 9 11:58:34 2018 +0100
mesh: Minor fix trailing whitespaces
---
nimble/host/mesh/src/prov.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nimble/host/mesh/src/prov.c b/nimble/host/mesh/src/prov.c
index 436eb33..94eb6eb 100644
--- a/nimble/host/mesh/src/prov.c
+++ b/nimble/host/mesh/src/prov.c
@@ -1378,7 +1378,7 @@ static void gen_prov_ack(struct prov_rx *rx, struct os_mbuf *buf)
static void gen_prov_start(struct prov_rx *rx, struct os_mbuf *buf)
{
u16_t trailing_space = 0;
-
+
if (link.rx.seg) {
BT_WARN("Got Start while there are unreceived segments");
return;