You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2018/11/21 23:06:23 UTC

[mynewt-nimble] branch master updated (15b1e43 -> c9fa044)

This is an automated email from the ASF dual-hosted git repository.

ccollins pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git.


    from 15b1e43  rename ble_hs_enabled --> ble_hs_is_enabled
     new 55c5003  Use syscfg settings for sysinit stage numbers
     new c9fa044  BLE_MESH_SYSINIT_STAGE_2 --> BLE_MESH_SYSINIT_STAGE_SHELL

The 2 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/pkg.yml                              |  2 +-
 nimble/controller/syscfg.yml                           |  5 +++++
 nimble/host/mesh/pkg.yml                               |  4 ++--
 nimble/host/mesh/syscfg.yml                            | 10 ++++++++++
 nimble/host/pkg.yml                                    |  2 +-
 nimble/host/services/ans/pkg.yml                       |  2 +-
 nimble/host/services/ans/syscfg.yml                    |  5 +++++
 nimble/host/services/bas/pkg.yml                       |  2 +-
 nimble/host/services/bas/syscfg.yml                    |  4 ++++
 nimble/host/services/bleuart/pkg.yml                   |  2 +-
 nimble/host/services/bleuart/syscfg.yml                |  4 ++++
 nimble/host/services/dis/pkg.yml                       |  2 +-
 nimble/host/services/dis/syscfg.yml                    |  4 ++++
 nimble/host/services/gap/pkg.yml                       |  2 +-
 nimble/host/services/gap/syscfg.yml                    |  5 +++++
 nimble/host/services/gatt/pkg.yml                      |  2 +-
 nimble/host/{store/config => services/gatt}/syscfg.yml |  7 ++++---
 nimble/host/services/ias/pkg.yml                       |  2 +-
 nimble/host/{store/config => services/ias}/syscfg.yml  |  6 +++---
 nimble/host/services/lls/pkg.yml                       |  2 +-
 nimble/host/{store/config => services/lls}/syscfg.yml  |  7 +++----
 nimble/host/services/tps/pkg.yml                       |  2 +-
 nimble/host/{store/config => services/tps}/syscfg.yml  |  8 ++++----
 nimble/host/store/config/pkg.yml                       |  2 +-
 nimble/host/store/config/syscfg.yml                    |  4 ++++
 nimble/host/store/ram/pkg.yml                          |  2 +-
 nimble/host/store/{config => ram}/syscfg.yml           |  8 ++++----
 nimble/host/syscfg.yml                                 |  4 ++++
 nimble/transport/emspi/pkg.yml                         |  2 +-
 nimble/transport/emspi/syscfg.yml                      |  5 +++++
 nimble/transport/ram/pkg.yml                           |  2 +-
 nimble/transport/ram/syscfg.yml                        |  5 +++++
 nimble/transport/socket/pkg.yml                        |  2 +-
 nimble/transport/socket/syscfg.yml                     |  5 +++++
 nimble/transport/uart/pkg.yml                          |  2 +-
 nimble/transport/uart/syscfg.yml                       |  4 ++++
 36 files changed, 101 insertions(+), 37 deletions(-)
 copy nimble/host/{store/config => services/gatt}/syscfg.yml (87%)
 copy nimble/host/{store/config => services/ias}/syscfg.yml (87%)
 copy nimble/host/{store/config => services/lls}/syscfg.yml (87%)
 copy nimble/host/{store/config => services/tps}/syscfg.yml (87%)
 copy nimble/host/store/{config => ram}/syscfg.yml (87%)


[mynewt-nimble] 01/02: Use syscfg settings for sysinit stage numbers

Posted by cc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ccollins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git

commit 55c500325c3a35b7a7ed2aecd0731110b6e2376c
Author: Christopher Collins <cc...@apache.org>
AuthorDate: Thu Oct 25 13:21:09 2018 -0700

    Use syscfg settings for sysinit stage numbers
    
    This allows the app or target to rearrange package initialization order
    via syscfg overrides.
    
    Note: This requires an updated version of newt
    (https://github.com/apache/mynewt-newt/pull/230).  Older versions of
    newt fail to parse the updated `pkg.yml` files.
---
 nimble/controller/pkg.yml                              |  2 +-
 nimble/controller/syscfg.yml                           |  5 +++++
 nimble/host/mesh/pkg.yml                               |  4 ++--
 nimble/host/mesh/syscfg.yml                            | 10 ++++++++++
 nimble/host/pkg.yml                                    |  2 +-
 nimble/host/services/ans/pkg.yml                       |  2 +-
 nimble/host/services/ans/syscfg.yml                    |  5 +++++
 nimble/host/services/bas/pkg.yml                       |  2 +-
 nimble/host/services/bas/syscfg.yml                    |  4 ++++
 nimble/host/services/bleuart/pkg.yml                   |  2 +-
 nimble/host/services/bleuart/syscfg.yml                |  4 ++++
 nimble/host/services/dis/pkg.yml                       |  2 +-
 nimble/host/services/dis/syscfg.yml                    |  4 ++++
 nimble/host/services/gap/pkg.yml                       |  2 +-
 nimble/host/services/gap/syscfg.yml                    |  5 +++++
 nimble/host/services/gatt/pkg.yml                      |  2 +-
 nimble/host/{store/config => services/gatt}/syscfg.yml |  7 ++++---
 nimble/host/services/ias/pkg.yml                       |  2 +-
 nimble/host/{store/config => services/ias}/syscfg.yml  |  6 +++---
 nimble/host/services/lls/pkg.yml                       |  2 +-
 nimble/host/{store/config => services/lls}/syscfg.yml  |  7 +++----
 nimble/host/services/tps/pkg.yml                       |  2 +-
 nimble/host/{store/config => services/tps}/syscfg.yml  |  8 ++++----
 nimble/host/store/config/pkg.yml                       |  2 +-
 nimble/host/store/config/syscfg.yml                    |  4 ++++
 nimble/host/store/ram/pkg.yml                          |  2 +-
 nimble/host/store/{config => ram}/syscfg.yml           |  8 ++++----
 nimble/host/syscfg.yml                                 |  4 ++++
 nimble/transport/emspi/pkg.yml                         |  2 +-
 nimble/transport/emspi/syscfg.yml                      |  5 +++++
 nimble/transport/ram/pkg.yml                           |  2 +-
 nimble/transport/ram/syscfg.yml                        |  5 +++++
 nimble/transport/socket/pkg.yml                        |  2 +-
 nimble/transport/socket/syscfg.yml                     |  5 +++++
 nimble/transport/uart/pkg.yml                          |  2 +-
 nimble/transport/uart/syscfg.yml                       |  4 ++++
 36 files changed, 101 insertions(+), 37 deletions(-)

diff --git a/nimble/controller/pkg.yml b/nimble/controller/pkg.yml
index d4efe80..96c6367 100644
--- a/nimble/controller/pkg.yml
+++ b/nimble/controller/pkg.yml
@@ -35,4 +35,4 @@ pkg.deps:
     - nimble
 
 pkg.init:
-    ble_ll_init: 250
+    ble_ll_init: 'MYNEWT_VAL(BLE_LL_SYSINIT_STAGE)'
diff --git a/nimble/controller/syscfg.yml b/nimble/controller/syscfg.yml
index e04281a..e1c0aca 100644
--- a/nimble/controller/syscfg.yml
+++ b/nimble/controller/syscfg.yml
@@ -298,6 +298,11 @@ syscfg.defs:
             line number where assertion occured.
         value: 0
 
+    BLE_LL_SYSINIT_STAGE:
+        description: >
+            Sysinit stage for the NimBLE controller.
+        value: 250
+
 syscfg.vals.BLE_LL_CFG_FEAT_LL_EXT_ADV:
     BLE_LL_CFG_FEAT_LE_CSA2: 1
     BLE_HW_WHITELIST_ENABLE: 0
diff --git a/nimble/host/mesh/pkg.yml b/nimble/host/mesh/pkg.yml
index 4163fe8..93a788c 100644
--- a/nimble/host/mesh/pkg.yml
+++ b/nimble/host/mesh/pkg.yml
@@ -45,5 +45,5 @@ pkg.req_apis:
     - stats
 
 pkg.init:
-    bt_mesh_register_gatt: 500
-    ble_mesh_shell_init: 1000
+    bt_mesh_register_gatt: 'MYNEWT_VAL(BLE_MESH_SYSINIT_STAGE)'
+    ble_mesh_shell_init: 'MYNEWT_VAL(BLE_MESH_SYSINIT_STAGE_2)'
diff --git a/nimble/host/mesh/syscfg.yml b/nimble/host/mesh/syscfg.yml
index 1ce24c0..9390347 100644
--- a/nimble/host/mesh/syscfg.yml
+++ b/nimble/host/mesh/syscfg.yml
@@ -514,6 +514,16 @@ syscfg.defs:
             This value defines BLE Mesh device/node name.
         value: '"nimble-mesh-node"'
 
+    BLE_MESH_SYSINIT_STAGE:
+        description: >
+            Primary sysinit stage for BLE mesh functionality.
+        value: 500
+
+    BLE_MESH_SYSINIT_STAGE_2:
+        description: >
+            Secondary sysinit stage for BLE mesh functionality.
+        value: 1000
+
 syscfg.vals.BLE_MESH_SHELL:
     BLE_MESH_CFG_CLI: 1
     BLE_MESH_HEALTH_CLI: 1
diff --git a/nimble/host/pkg.yml b/nimble/host/pkg.yml
index 7c8c021..a063a0b 100644
--- a/nimble/host/pkg.yml
+++ b/nimble/host/pkg.yml
@@ -49,7 +49,7 @@ pkg.req_apis:
     - stats
 
 pkg.init:
-    ble_hs_init: 200
+    ble_hs_init: 'MYNEWT_VAL(BLE_HS_SYSINIT_STAGE)'
 
 pkg.down.BLE_HS_STOP_ON_SHUTDOWN:
     ble_hs_shutdown: 200
diff --git a/nimble/host/services/ans/pkg.yml b/nimble/host/services/ans/pkg.yml
index 0744b29..691e566 100644
--- a/nimble/host/services/ans/pkg.yml
+++ b/nimble/host/services/ans/pkg.yml
@@ -31,4 +31,4 @@ pkg.deps:
     - nimble/host
 
 pkg.init:
-    ble_svc_ans_init: 303
+    ble_svc_ans_init: 'MYNEWT_VAL(BLE_SVC_ANS_SYSINIT_STAGE)'
diff --git a/nimble/host/services/ans/syscfg.yml b/nimble/host/services/ans/syscfg.yml
index a77f23d..74de8d9 100644
--- a/nimble/host/services/ans/syscfg.yml
+++ b/nimble/host/services/ans/syscfg.yml
@@ -23,3 +23,8 @@ syscfg.defs:
     BLE_SVC_ANS_UNR_ALERT_CAT:
         description: "Initial supported unread alert category bitmask."
         value: 0
+
+    BLE_SVC_ANS_SYSINIT_STAGE:
+        description: >
+            Sysinit stage for the alert notification service.
+        value: 303
diff --git a/nimble/host/services/bas/pkg.yml b/nimble/host/services/bas/pkg.yml
index ab854e7..afdc694 100644
--- a/nimble/host/services/bas/pkg.yml
+++ b/nimble/host/services/bas/pkg.yml
@@ -31,4 +31,4 @@ pkg.deps:
     - nimble/host
 
 pkg.init:
-    ble_svc_bas_init: 303
+    ble_svc_bas_init: 'MYNEWT_VAL(BLE_SVC_BAS_SYSINIT_STAGE)'
diff --git a/nimble/host/services/bas/syscfg.yml b/nimble/host/services/bas/syscfg.yml
index c4ea7c2..279930f 100644
--- a/nimble/host/services/bas/syscfg.yml
+++ b/nimble/host/services/bas/syscfg.yml
@@ -28,3 +28,7 @@ syscfg.defs:
         description: >
             Set to 1 to support notification or 0 to disable it.
         value: 1
+    BLE_SVC_BAS_SYSINIT_STAGE:
+        description: >
+            Sysinit stage for the battery level service.
+        value: 303
diff --git a/nimble/host/services/bleuart/pkg.yml b/nimble/host/services/bleuart/pkg.yml
index 56fbffb..36fe2bc 100644
--- a/nimble/host/services/bleuart/pkg.yml
+++ b/nimble/host/services/bleuart/pkg.yml
@@ -34,4 +34,4 @@ pkg.req_apis:
     - console
 
 pkg.init:
-    bleuart_init: 500
+    bleuart_init: 'MYNEWT_VAL(BLEUART_SYSINIT_STAGE)'
diff --git a/nimble/host/services/bleuart/syscfg.yml b/nimble/host/services/bleuart/syscfg.yml
index 3b93f55..b0ed73e 100644
--- a/nimble/host/services/bleuart/syscfg.yml
+++ b/nimble/host/services/bleuart/syscfg.yml
@@ -22,3 +22,7 @@ syscfg.defs:
             The size of the largest line that can be received over the UART
             service.
         value: 120
+    BLEUART_SYSINIT_STAGE:
+        description: >
+            Sysinit stage for the BLE UART service.
+        value: 500
diff --git a/nimble/host/services/dis/pkg.yml b/nimble/host/services/dis/pkg.yml
index 3eaffda..b914ca9 100644
--- a/nimble/host/services/dis/pkg.yml
+++ b/nimble/host/services/dis/pkg.yml
@@ -31,4 +31,4 @@ pkg.deps:
     - nimble/host
 
 pkg.init:
-    ble_svc_dis_init: 303
+    ble_svc_dis_init: 'MYNEWT_VAL(BLE_SVC_DIS_SYSINIT_STAGE)'
diff --git a/nimble/host/services/dis/syscfg.yml b/nimble/host/services/dis/syscfg.yml
index 8de9e15..0f45b28 100644
--- a/nimble/host/services/dis/syscfg.yml
+++ b/nimble/host/services/dis/syscfg.yml
@@ -92,3 +92,7 @@ syscfg.defs:
             Defines a default value for "Manufacturer name" if not set with
             'ble_svc_dis_manufacturer_name_set'.
         value: NULL
+    BLE_SVC_DIS_SYSINIT_STAGE:
+        description: >
+            Sysinit stage for the device information BLE service.
+        value: 303
diff --git a/nimble/host/services/gap/pkg.yml b/nimble/host/services/gap/pkg.yml
index e828cd3..a2ef756 100644
--- a/nimble/host/services/gap/pkg.yml
+++ b/nimble/host/services/gap/pkg.yml
@@ -31,4 +31,4 @@ pkg.deps:
     - nimble/host
 
 pkg.init:
-    ble_svc_gap_init: 301
+    ble_svc_gap_init: 'MYNEWT_VAL(BLE_SVC_GAP_SYSINIT_STAGE)'
diff --git a/nimble/host/services/gap/syscfg.yml b/nimble/host/services/gap/syscfg.yml
index 52639d3..ad6aa7e 100644
--- a/nimble/host/services/gap/syscfg.yml
+++ b/nimble/host/services/gap/syscfg.yml
@@ -76,3 +76,8 @@ syscfg.defs:
             by Core specification 5.0, Vol 3, Part C, section 12.
             Set to '-1' to disable.
         value: -1
+
+    BLE_SVC_GAP_SYSINIT_STAGE:
+        description: >
+            Sysinit stage for the GAP BLE service.
+        value: 301
diff --git a/nimble/host/services/gatt/pkg.yml b/nimble/host/services/gatt/pkg.yml
index caf40ad..e3704bc 100644
--- a/nimble/host/services/gatt/pkg.yml
+++ b/nimble/host/services/gatt/pkg.yml
@@ -31,4 +31,4 @@ pkg.deps:
     - nimble/host
 
 pkg.init:
-    ble_svc_gatt_init: 302
+    ble_svc_gatt_init: 'MYNEWT_VAL(BLE_SVC_GATT_SYSINIT_STAGE)'
diff --git a/nimble/host/store/config/syscfg.yml b/nimble/host/services/gatt/syscfg.yml
similarity index 87%
copy from nimble/host/store/config/syscfg.yml
copy to nimble/host/services/gatt/syscfg.yml
index 797bfa7..6ba1b33 100644
--- a/nimble/host/store/config/syscfg.yml
+++ b/nimble/host/services/gatt/syscfg.yml
@@ -1,3 +1,4 @@
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -17,7 +18,7 @@
 #
 
 syscfg.defs:
-    BLE_STORE_CONFIG_PERSIST:
+    BLE_SVC_GATT_SYSINIT_STAGE:
         description: >
-            Whether to save data to sys/config, or just keep it in RAM.
-        value: 1
+            Sysinit stage for the GATT BLE service
+        value: 302
diff --git a/nimble/host/services/ias/pkg.yml b/nimble/host/services/ias/pkg.yml
index 3827d74..3b0ca07 100644
--- a/nimble/host/services/ias/pkg.yml
+++ b/nimble/host/services/ias/pkg.yml
@@ -31,4 +31,4 @@ pkg.deps:
     - nimble/host
 
 pkg.init:
-    ble_svc_ias_init: 303
+    ble_svc_ias_init: 'MYNEWT_VAL(BLE_SVC_IAS_SYSINIT_STAGE)'
diff --git a/nimble/host/store/config/syscfg.yml b/nimble/host/services/ias/syscfg.yml
similarity index 87%
copy from nimble/host/store/config/syscfg.yml
copy to nimble/host/services/ias/syscfg.yml
index 797bfa7..2cbed3a 100644
--- a/nimble/host/store/config/syscfg.yml
+++ b/nimble/host/services/ias/syscfg.yml
@@ -17,7 +17,7 @@
 #
 
 syscfg.defs:
-    BLE_STORE_CONFIG_PERSIST:
+    BLE_SVC_IAS_SYSINIT_STAGE:
         description: >
-            Whether to save data to sys/config, or just keep it in RAM.
-        value: 1
+            Sysinit stage for the immediate alert BLE service.
+        value: 303
diff --git a/nimble/host/services/lls/pkg.yml b/nimble/host/services/lls/pkg.yml
index 119c87a..6160f02 100644
--- a/nimble/host/services/lls/pkg.yml
+++ b/nimble/host/services/lls/pkg.yml
@@ -31,4 +31,4 @@ pkg.deps:
     - nimble/host
 
 pkg.init:
-    ble_svc_lls_init: 303
+    ble_svc_lls_init: 'MYNEWT_VAL(BLE_SVC_LLS_SYSINIT_STAGE)'
diff --git a/nimble/host/store/config/syscfg.yml b/nimble/host/services/lls/syscfg.yml
similarity index 87%
copy from nimble/host/store/config/syscfg.yml
copy to nimble/host/services/lls/syscfg.yml
index 797bfa7..312b08a 100644
--- a/nimble/host/store/config/syscfg.yml
+++ b/nimble/host/services/lls/syscfg.yml
@@ -14,10 +14,9 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-#
 
 syscfg.defs:
-    BLE_STORE_CONFIG_PERSIST:
+    BLE_SVC_LLS_SYSINIT_STAGE:
         description: >
-            Whether to save data to sys/config, or just keep it in RAM.
-        value: 1
+            Sysinit stage for the link loss BLE service.
+        value: 303
diff --git a/nimble/host/services/tps/pkg.yml b/nimble/host/services/tps/pkg.yml
index 6814664..3d4c5e9 100644
--- a/nimble/host/services/tps/pkg.yml
+++ b/nimble/host/services/tps/pkg.yml
@@ -31,4 +31,4 @@ pkg.deps:
     - nimble/host
 
 pkg.init:
-    ble_svc_tps_init: 303
+    ble_svc_tps_init: 'MYNEWT_VAL(BLE_SVC_TPS_SYSINIT_STAGE)'
diff --git a/nimble/host/store/config/syscfg.yml b/nimble/host/services/tps/syscfg.yml
similarity index 87%
copy from nimble/host/store/config/syscfg.yml
copy to nimble/host/services/tps/syscfg.yml
index 797bfa7..0391e8b 100644
--- a/nimble/host/store/config/syscfg.yml
+++ b/nimble/host/services/tps/syscfg.yml
@@ -14,10 +14,10 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-#
 
 syscfg.defs:
-    BLE_STORE_CONFIG_PERSIST:
+    BLE_SVC_TPS_SYSINIT_STAGE:
         description: >
-            Whether to save data to sys/config, or just keep it in RAM.
-        value: 1
+            Sysinit stage for the transmit power BLE service.
+        value: 303
+
diff --git a/nimble/host/store/config/pkg.yml b/nimble/host/store/config/pkg.yml
index b91c3dc..db80d1d 100644
--- a/nimble/host/store/config/pkg.yml
+++ b/nimble/host/store/config/pkg.yml
@@ -35,4 +35,4 @@ pkg.deps.BLE_STORE_CONFIG_PERSIST:
     - "@apache-mynewt-core/sys/config"
 
 pkg.init:
-    ble_store_config_init: 500
+    ble_store_config_init: 'MYNEWT_VAL(BLE_STORE_SYSINIT_STAGE)'
diff --git a/nimble/host/store/config/syscfg.yml b/nimble/host/store/config/syscfg.yml
index 797bfa7..ff0689c 100644
--- a/nimble/host/store/config/syscfg.yml
+++ b/nimble/host/store/config/syscfg.yml
@@ -21,3 +21,7 @@ syscfg.defs:
         description: >
             Whether to save data to sys/config, or just keep it in RAM.
         value: 1
+    BLE_STORE_SYSINIT_STAGE:
+        description: >
+            Sysinit stage for BLE host store.
+        value: 500
diff --git a/nimble/host/store/ram/pkg.yml b/nimble/host/store/ram/pkg.yml
index a060f69..68765fd 100644
--- a/nimble/host/store/ram/pkg.yml
+++ b/nimble/host/store/ram/pkg.yml
@@ -34,4 +34,4 @@ pkg.deps:
     - nimble/host
 
 pkg.init:
-    ble_store_ram_init: 500
+    ble_store_ram_init: 'MYNEWT_VAL(BLE_STORE_RAM_SYSINIT_STAGE)'
diff --git a/nimble/host/store/config/syscfg.yml b/nimble/host/store/ram/syscfg.yml
similarity index 87%
copy from nimble/host/store/config/syscfg.yml
copy to nimble/host/store/ram/syscfg.yml
index 797bfa7..442211d 100644
--- a/nimble/host/store/config/syscfg.yml
+++ b/nimble/host/store/ram/syscfg.yml
@@ -14,10 +14,10 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-#
 
 syscfg.defs:
-    BLE_STORE_CONFIG_PERSIST:
+    BLE_STORE_RAM_SYSINIT_STAGE:
         description: >
-            Whether to save data to sys/config, or just keep it in RAM.
-        value: 1
+            Sysinit stage for the RAM BLE store.
+        value: 500
+
diff --git a/nimble/host/syscfg.yml b/nimble/host/syscfg.yml
index d16d93f..a6f2576 100644
--- a/nimble/host/syscfg.yml
+++ b/nimble/host/syscfg.yml
@@ -428,6 +428,10 @@ syscfg.defs:
             entails aborting all GAP procedures and terminating open
             connections.
         value: 1
+    BLE_HS_SYSINIT_STAGE:
+        description: >
+            Sysinit stage for the NimBLE host.
+        value: 200
 
 syscfg.vals.BLE_MESH:
     BLE_SM_SC: 1
diff --git a/nimble/transport/emspi/pkg.yml b/nimble/transport/emspi/pkg.yml
index f554a8d..5df5a5b 100644
--- a/nimble/transport/emspi/pkg.yml
+++ b/nimble/transport/emspi/pkg.yml
@@ -33,4 +33,4 @@ pkg.apis:
     - ble_transport
 
 pkg.init:
-    ble_hci_emspi_init: 100
+    ble_hci_emspi_init: 'MYNEWT_VAL(BLE_HCI_EMSPI_SYSINIT_STAGE)'
diff --git a/nimble/transport/emspi/syscfg.yml b/nimble/transport/emspi/syscfg.yml
index 2ef0969..4751271 100644
--- a/nimble/transport/emspi/syscfg.yml
+++ b/nimble/transport/emspi/syscfg.yml
@@ -90,5 +90,10 @@ syscfg.defs:
         description: 'The size of the emspi task (units: 4-byte words).'
         value: 256
 
+    BLE_HCI_EMSPI_SYSINIT_STAGE:
+        description: >
+            Sysinit stage for the EMSPI BLE transport.
+        value: 100
+
 syscfg.vals.BLE_EXT_ADV:
     BLE_HCI_EVT_BUF_SIZE: 257
diff --git a/nimble/transport/ram/pkg.yml b/nimble/transport/ram/pkg.yml
index 78a5145..bb8397b 100644
--- a/nimble/transport/ram/pkg.yml
+++ b/nimble/transport/ram/pkg.yml
@@ -33,4 +33,4 @@ pkg.apis:
     - ble_transport
 
 pkg.init:
-    ble_hci_ram_init: 100
+    ble_hci_ram_init: 'MYNEWT_VAL(BLE_TRANS_RAM_SYSINIT_STAGE)'
diff --git a/nimble/transport/ram/syscfg.yml b/nimble/transport/ram/syscfg.yml
index 998abad..3b822fc 100644
--- a/nimble/transport/ram/syscfg.yml
+++ b/nimble/transport/ram/syscfg.yml
@@ -39,5 +39,10 @@ syscfg.defs:
             packets. It does not include the HCI data header (of 4 bytes).
         value: 255
 
+    BLE_TRANS_RAM_SYSINIT_STAGE:
+        description: >
+            Sysinit stage for the RAM BLE transport.
+        value: 100
+
 syscfg.vals.BLE_EXT_ADV:
     BLE_HCI_EVT_BUF_SIZE: 257
diff --git a/nimble/transport/socket/pkg.yml b/nimble/transport/socket/pkg.yml
index e4ddf6f..fb4144d 100644
--- a/nimble/transport/socket/pkg.yml
+++ b/nimble/transport/socket/pkg.yml
@@ -35,4 +35,4 @@ pkg.apis:
     - ble_transport
 
 pkg.init:
-    ble_hci_sock_init: 500
+    ble_hci_sock_init: 'MYNEWT_VAL(BLE_SOCK_CLI_SYSINIT_STAGE)'
diff --git a/nimble/transport/socket/syscfg.yml b/nimble/transport/socket/syscfg.yml
index 4c4b5a4..2050f64 100644
--- a/nimble/transport/socket/syscfg.yml
+++ b/nimble/transport/socket/syscfg.yml
@@ -70,5 +70,10 @@ syscfg.defs:
         description: 'Size of the HCI socket stack (units=words).'
         value: 80
 
+    BLE_SOCK_CLI_SYSINIT_STAGE:
+        description: >
+            Sysinit stage for the socket BLE transport.
+        value: 500
+
 syscfg.vals.BLE_EXT_ADV:
     BLE_HCI_EVT_BUF_SIZE: 257
diff --git a/nimble/transport/uart/pkg.yml b/nimble/transport/uart/pkg.yml
index c561eeb..9568137 100644
--- a/nimble/transport/uart/pkg.yml
+++ b/nimble/transport/uart/pkg.yml
@@ -35,4 +35,4 @@ pkg.apis:
     - ble_transport
 
 pkg.init:
-    ble_hci_uart_init: 500
+    ble_hci_uart_init: 'MYNEWT_VAL(BLE_TRANS_UART_SYSINIT_STAGE)'
diff --git a/nimble/transport/uart/syscfg.yml b/nimble/transport/uart/syscfg.yml
index 1498680..43486a8 100644
--- a/nimble/transport/uart/syscfg.yml
+++ b/nimble/transport/uart/syscfg.yml
@@ -63,6 +63,10 @@ syscfg.defs:
     BLE_HCI_UART_FLOW_CTRL:
         description: 'Flow control used for HCI uart interface'
         value:       HAL_UART_FLOW_CTL_RTS_CTS
+    BLE_TRANS_UART_SYSINIT_STAGE:
+        description: >
+            Sysinit stage for the UART BLE transport.
+        value: 500
 
 syscfg.vals.BLE_EXT_ADV:
     BLE_HCI_EVT_BUF_SIZE: 257


[mynewt-nimble] 02/02: BLE_MESH_SYSINIT_STAGE_2 --> BLE_MESH_SYSINIT_STAGE_SHELL

Posted by cc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ccollins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git

commit c9fa0444cfde53e6939d1d2f6676a94e09695afe
Author: Christopher Collins <cc...@apache.org>
AuthorDate: Mon Nov 19 10:26:20 2018 -0800

    BLE_MESH_SYSINIT_STAGE_2 --> BLE_MESH_SYSINIT_STAGE_SHELL
---
 nimble/host/mesh/pkg.yml    | 2 +-
 nimble/host/mesh/syscfg.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nimble/host/mesh/pkg.yml b/nimble/host/mesh/pkg.yml
index 93a788c..44cc0c7 100644
--- a/nimble/host/mesh/pkg.yml
+++ b/nimble/host/mesh/pkg.yml
@@ -46,4 +46,4 @@ pkg.req_apis:
 
 pkg.init:
     bt_mesh_register_gatt: 'MYNEWT_VAL(BLE_MESH_SYSINIT_STAGE)'
-    ble_mesh_shell_init: 'MYNEWT_VAL(BLE_MESH_SYSINIT_STAGE_2)'
+    ble_mesh_shell_init: 'MYNEWT_VAL(BLE_MESH_SYSINIT_STAGE_SHELL)'
diff --git a/nimble/host/mesh/syscfg.yml b/nimble/host/mesh/syscfg.yml
index 9390347..7d5a36a 100644
--- a/nimble/host/mesh/syscfg.yml
+++ b/nimble/host/mesh/syscfg.yml
@@ -519,7 +519,7 @@ syscfg.defs:
             Primary sysinit stage for BLE mesh functionality.
         value: 500
 
-    BLE_MESH_SYSINIT_STAGE_2:
+    BLE_MESH_SYSINIT_STAGE_SHELL:
         description: >
             Secondary sysinit stage for BLE mesh functionality.
         value: 1000