[GitHub] rymanluk closed pull request #240: nimble: Minor cleaning patches.

[GitBox <gi...@apache.org>]

rymanluk closed pull request #240: nimble: Minor cleaning patches.
URL: https://github.com/apache/mynewt-nimble/pull/240
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/nimble/controller/src/ble_ll_scan.c b/nimble/controller/src/ble_ll_scan.c
index 901fa184..78234784 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;
     }
 
diff --git a/nimble/controller/src/ble_ll_sched.c b/nimble/controller/src/ble_ll_sched.c
index 3e341ff1..cb00ea0c 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
diff --git a/nimble/host/mesh/src/prov.c b/nimble/host/mesh/src/prov.c
index 436eb33f..94eb6eba 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;


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services