porting: Remove dependency on Mynewt logging system

Define NPL interface that can be used by ports to implement logging.
apache · Oct 6, 2023 · da4e2f0 · da4e2f0
1 parent e1f7546
commit da4e2f0
Show file tree

Hide file tree

Showing 56 changed files with 352 additions and 722 deletions.
diff --git a/apps/blemesh_shell/src/main.c b/apps/blemesh_shell/src/main.c
@@ -17,8 +17,6 @@
  * under the License.
  */
 
-#define MESH_LOG_MODULE BLE_MESH_LOG
-
 #include <assert.h>
 #include "os/mynewt.h"
 #include "mesh/mesh.h"

diff --git a/nimble/host/include/host/ble_hs_log.h b/nimble/host/include/host/ble_hs_log.h
@@ -20,6 +20,12 @@
 #ifndef H_BLE_HS_LOG_
 #define H_BLE_HS_LOG_
 
+#ifndef BLE_NPL_LOG_MODULE
+#define BLE_NPL_LOG_MODULE BLE_HS_LOG
+#endif
+
+#include <nimble/nimble_npl_log.h>
+
 /**
  * @file ble_hs_log.h
  *
@@ -33,14 +39,6 @@
  * @{
  */
 
-#include "modlog/modlog.h"
-#include "log/log.h"
-
-/* Only include the logcfg header if this version of newt can generate it. */
-#if MYNEWT_VAL(NEWT_FEATURE_LOGCFG)
-#include "logcfg/logcfg.h"
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -57,7 +55,7 @@ struct os_mbuf;
  * @param ...           The format string and additional arguments for the log message.
  */
 #define BLE_HS_LOG(lvl, ...) \
-    BLE_HS_LOG_ ## lvl(__VA_ARGS__)
+    BLE_NPL_LOG(lvl, __VA_ARGS__)
 
 /**
  * @brief Macro for logging a Bluetooth address at a specified log level.
@@ -69,9 +67,9 @@ struct os_mbuf;
  *  @param addr         The Bluetooth address to be logged.
  */
 #define BLE_HS_LOG_ADDR(lvl, addr)                      \
-    BLE_HS_LOG_ ## lvl("%02x:%02x:%02x:%02x:%02x:%02x", \
-                       (addr)[5], (addr)[4], (addr)[3], \
-                       (addr)[2], (addr)[1], (addr)[0])
+    BLE_NPL_LOG(lvl, "%02x:%02x:%02x:%02x:%02x:%02x", \
+                (addr)[5], (addr)[4], (addr)[3], \
+                (addr)[2], (addr)[1], (addr)[0])
 
 
 /**

diff --git a/nimble/host/mesh/include/mesh/glue.h b/nimble/host/mesh/include/mesh/glue.h
@@ -24,8 +24,6 @@
 #include <errno.h>
 
 #include "syscfg/syscfg.h"
-#include "logcfg/logcfg.h"
-#include "modlog/modlog.h"
 #include "nimble/nimble_npl.h"
 
 #include "os/os_mbuf.h"
@@ -182,19 +180,10 @@ extern "C" {
 #define BT_GAP_ADV_SLOW_INT_MIN                 0x0640  /* 1 s      */
 #define BT_GAP_ADV_SLOW_INT_MAX                 0x0780  /* 1.2 s    */
 
-#ifndef MESH_LOG_MODULE
-#define MESH_LOG_MODULE BLE_MESH_LOG
-#endif
-
-#define CAT(a, ...) PRIMITIVE_CAT(a, __VA_ARGS__)
-#define PRIMITIVE_CAT(a, ...) a ## __VA_ARGS__
-
-#define BLE_MESH_LOG(lvl, ...) CAT(MESH_LOG_MODULE, CAT(_, lvl))(__VA_ARGS__)
-
-#define BT_DBG(fmt, ...)    BLE_MESH_LOG(DEBUG, "%s: " fmt "\n", __func__, ## __VA_ARGS__);
-#define BT_INFO(fmt, ...)   BLE_MESH_LOG(INFO, "%s: " fmt "\n", __func__, ## __VA_ARGS__);
-#define BT_WARN(fmt, ...)   BLE_MESH_LOG(WARN, "%s: " fmt "\n", __func__, ## __VA_ARGS__);
-#define BT_ERR(fmt, ...)    BLE_MESH_LOG(ERROR, "%s: " fmt "\n", __func__, ## __VA_ARGS__);
+#define BT_DBG(fmt, ...)    BLE_NPL_LOG(DEBUG, "%s: " fmt "\n", __func__, ## __VA_ARGS__);
+#define BT_INFO(fmt, ...)   BLE_NPL_LOG(INFO, "%s: " fmt "\n", __func__, ## __VA_ARGS__);
+#define BT_WARN(fmt, ...)   BLE_NPL_LOG(WARN, "%s: " fmt "\n", __func__, ## __VA_ARGS__);
+#define BT_ERR(fmt, ...)    BLE_NPL_LOG(ERROR, "%s: " fmt "\n", __func__, ## __VA_ARGS__);
 #define BT_GATT_ERR(_att_err)   (-(_att_err))
 
 typedef ble_addr_t bt_addr_le_t;

diff --git a/nimble/host/mesh/src/access.c b/nimble/host/mesh/src/access.c
@@ -7,7 +7,9 @@
  */
 
 #include "syscfg/syscfg.h"
-#define MESH_LOG_MODULE BLE_MESH_ACCESS_LOG
+
+#define BLE_NPL_LOG_MODULE BLE_MESH_ACCESS_LOG
+#include <nimble/nimble_npl_log.h>
 
 #include <errno.h>
 #include <stdlib.h>

diff --git a/nimble/host/mesh/src/adv.c b/nimble/host/mesh/src/adv.c
@@ -8,7 +8,8 @@
  */
 
 #include "syscfg/syscfg.h"
-#define MESH_LOG_MODULE BLE_MESH_ADV_LOG
+#define BLE_NPL_LOG_MODULE BLE_MESH_ADV_LOG
+#include <nimble/nimble_npl_log.h>
 
 #include "mesh/mesh.h"
 #include "host/ble_hs_adv.h"

diff --git a/nimble/host/mesh/src/adv_ext.c b/nimble/host/mesh/src/adv_ext.c
@@ -7,8 +7,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define MESH_LOG_MODULE BLE_MESH_ADV_LOG
-
+#define BLE_NPL_LOG_MODULE BLE_MESH_ADV_LOG
+#include <nimble/nimble_npl_log.h>
 
 #include "adv.h"
 #include "net.h"

diff --git a/nimble/host/mesh/src/adv_legacy.c b/nimble/host/mesh/src/adv_legacy.c
@@ -7,7 +7,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define MESH_LOG_MODULE BLE_MESH_ADV_LOG
+#define BLE_NPL_LOG_MODULE BLE_MESH_ADV_LOG
+#include <nimble/nimble_npl_log.h>
 
 #include "adv.h"
 #include "net.h"

diff --git a/nimble/host/mesh/src/aes-ccm.c b/nimble/host/mesh/src/aes-ccm.c
@@ -5,8 +5,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#define BLE_NPL_LOG_MODULE BLE_MESH_LOG
+#include <nimble/nimble_npl_log.h>
+
 #include "crypto.h"
-#define MESH_LOG_MODULE BLE_MESH_LOG
 
 static inline void xor16(uint8_t *dst, const uint8_t *a, const uint8_t *b)
 {

diff --git a/nimble/host/mesh/src/app_keys.c b/nimble/host/mesh/src/app_keys.c
@@ -5,6 +5,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#define BLE_NPL_LOG_MODULE BLE_MESH_LOG
+#include <nimble/nimble_npl_log.h>
+
 #include <string.h>
 #include <stdlib.h>
 #include "mesh/mesh.h"
@@ -21,10 +24,6 @@
 #include "access.h"
 #include "subnet.h"
 
-#define MESH_LOG_MODULE BLE_MESH_LOG
-
-#include "log/log.h"
-
 /* Tracking of what storage changes are pending for App Keys. We track this in
  * a separate array here instead of within the respective bt_mesh_app_key
  * struct itselve, since once a key gets deleted its struct becomes invalid

diff --git a/nimble/host/mesh/src/beacon.c b/nimble/host/mesh/src/beacon.c
@@ -7,7 +7,10 @@
  */
 
 #include "syscfg/syscfg.h"
-#define MESH_LOG_MODULE BLE_MESH_BEACON_LOG
+
+#define BLE_NPL_LOG_MODULE BLE_MESH_BEACON_LOG
+#include <nimble/nimble_npl_log.h>
+
 
 #include <errno.h>
 #include <assert.h>

diff --git a/nimble/host/mesh/src/cdb.c b/nimble/host/mesh/src/cdb.c
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define MESH_LOG_MODULE BLE_MESH_LOG
-#include "log/log.h"
+#define BLE_NPL_LOG_MODULE BLE_MESH_LOG
+#include <nimble/nimble_npl_log.h>
+
 #include <stdlib.h>
 
 #include "cdb_priv.h"

diff --git a/nimble/host/mesh/src/cfg.c b/nimble/host/mesh/src/cfg.c
@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#define BLE_NPL_LOG_MODULE BLE_MESH_LOG
+#include <nimble/nimble_npl_log.h>
+
 #include "mesh/mesh.h"
 #include "mesh_priv.h"
 #include "net.h"
@@ -15,9 +18,6 @@
 #include "cfg.h"
 #include "mesh/glue.h"
 
-#define MESH_LOG_MODULE BLE_MESH_LOG
-#include "log/log.h"
-
 /* Miscellaneous configuration server model states */
 struct cfg_val {
 	uint8_t net_transmit;

diff --git a/nimble/host/mesh/src/cfg_cli.c b/nimble/host/mesh/src/cfg_cli.c
@@ -7,7 +7,10 @@
  */
 
 #include "syscfg/syscfg.h"
-#define MESH_LOG_MODULE BLE_MESH_MODEL_LOG
+
+#define BLE_NPL_LOG_MODULE BLE_MESH_MODEL_LOG
+#include <nimble/nimble_npl_log.h>
+
 #if MYNEWT_VAL(BLE_MESH_CFG_CLI)
 
 #include "mesh/mesh.h"

diff --git a/nimble/host/mesh/src/cfg_srv.c b/nimble/host/mesh/src/cfg_srv.c
@@ -7,7 +7,9 @@
  */
 
 #include "syscfg/syscfg.h"
-#define MESH_LOG_MODULE BLE_MESH_MODEL_LOG
+
+#define BLE_NPL_LOG_MODULE BLE_MESH_MODEL_LOG
+#include <nimble/nimble_npl_log.h>
 
 #include <string.h>
 #include <errno.h>

diff --git a/nimble/host/mesh/src/crypto.c b/nimble/host/mesh/src/crypto.c
@@ -7,7 +7,9 @@
  */
 
 #include "syscfg/syscfg.h"
-#define MESH_LOG_MODULE BLE_MESH_CRYPTO_LOG
+
+#define BLE_NPL_LOG_MODULE BLE_MESH_CRYPTO_LOG
+#include <nimble/nimble_npl_log.h>
 
 #include <string.h>
 #include <stdbool.h>

diff --git a/nimble/host/mesh/src/friend.c b/nimble/host/mesh/src/friend.c
@@ -7,7 +7,10 @@
  */
 
 #include "syscfg/syscfg.h"
-#define MESH_LOG_MODULE BLE_MESH_FRIEND_LOG
+
+#define BLE_NPL_LOG_MODULE BLE_MESH_FRIEND_LOG
+#include <nimble/nimble_npl_log.h>
+
 
 #if MYNEWT_VAL(BLE_MESH_FRIEND)
 

diff --git a/nimble/host/mesh/src/glue.c b/nimble/host/mesh/src/glue.c
@@ -18,7 +18,9 @@
  */
 
 #include "syscfg/syscfg.h"
-#define MESH_LOG_MODULE BLE_MESH_LOG
+
+#define BLE_NPL_LOG_MODULE BLE_MESH_LOG
+#include <nimble/nimble_npl_log.h>
 
 #include "mesh/glue.h"
 #include "adv.h"

diff --git a/nimble/host/mesh/src/health_cli.c b/nimble/host/mesh/src/health_cli.c
@@ -7,7 +7,9 @@
  */
 
 #include "syscfg/syscfg.h"
-#define MESH_LOG_MODULE BLE_MESH_MODEL_LOG
+
+#define BLE_NPL_LOG_MODULE BLE_MESH_MODEL_LOG
+#include <nimble/nimble_npl_log.h>
 
 #include <string.h>
 #include <errno.h>

diff --git a/nimble/host/mesh/src/health_srv.c b/nimble/host/mesh/src/health_srv.c
@@ -7,7 +7,9 @@
  */
 
 #include "syscfg/syscfg.h"
-#define MESH_LOG_MODULE BLE_MESH_MODEL_LOG
+
+#define BLE_NPL_LOG_MODULE BLE_MESH_MODEL_LOG
+#include <nimble/nimble_npl_log.h>
 
 #include <string.h>
 #include <errno.h>

diff --git a/nimble/host/mesh/src/heartbeat.c b/nimble/host/mesh/src/heartbeat.c
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define MESH_LOG_MODULE BLE_MESH_HEARTBEAT_LOG
+#define BLE_NPL_LOG_MODULE BLE_MESH_HEARTBEAT_LOG
+#include <nimble/nimble_npl_log.h>
 
 #include "mesh_priv.h"
 #include "net.h"

diff --git a/nimble/host/mesh/src/lpn.c b/nimble/host/mesh/src/lpn.c
@@ -7,7 +7,9 @@
  */
 
 #include "syscfg/syscfg.h"
-#define MESH_LOG_MODULE BLE_MESH_LOW_POWER_LOG
+
+#define BLE_NPL_LOG_MODULE BLE_MESH_LOW_POWER_LOG
+#include <nimble/nimble_npl_log.h>
 
 #if MYNEWT_VAL(BLE_MESH_LOW_POWER)
 

diff --git a/nimble/host/mesh/src/mesh.c b/nimble/host/mesh/src/mesh.c
@@ -7,7 +7,9 @@
  */
 
 #include "syscfg/syscfg.h"
-#define MESH_LOG_MODULE BLE_MESH_LOG
+
+#define BLE_NPL_LOG_MODULE BLE_MESH_LOG
+#include <nimble/nimble_npl_log.h>
 
 #include <stdbool.h>
 #include <errno.h>

diff --git a/nimble/host/mesh/src/model_cli.c b/nimble/host/mesh/src/model_cli.c
@@ -5,7 +5,9 @@
  */
 
 #include "syscfg/syscfg.h"
-#define MESH_LOG_MODULE BLE_MESH_MODEL_LOG
+
+#define BLE_NPL_LOG_MODULE BLE_MESH_MODEL_LOG
+#include <nimble/nimble_npl_log.h>
 
 #include "mesh/mesh.h"
 #include "mesh/model_cli.h"

diff --git a/nimble/host/mesh/src/model_srv.c b/nimble/host/mesh/src/model_srv.c
@@ -5,7 +5,10 @@
  */
 
 #include "syscfg/syscfg.h"
-#define MESH_LOG_MODULE BLE_MESH_MODEL_LOG
+
+#define BLE_NPL_LOG_MODULE BLE_MESH_MODEL_LOG
+#include <nimble/nimble_npl_log.h>
+
 
 #include "mesh/mesh.h"
 #include "mesh/model_srv.h"

diff --git a/nimble/host/mesh/src/net.c b/nimble/host/mesh/src/net.c
@@ -7,7 +7,9 @@
  */
 
 #include "syscfg/syscfg.h"
-#define MESH_LOG_MODULE BLE_MESH_NET_LOG
+
+#define BLE_NPL_LOG_MODULE BLE_MESH_NET_LOG
+#include <nimble/nimble_npl_log.h>
 
 #include <string.h>
 #include <errno.h>

diff --git a/nimble/host/mesh/src/pb_adv.c b/nimble/host/mesh/src/pb_adv.c
@@ -8,7 +8,9 @@
  */
 
 #include "syscfg/syscfg.h"
-#define MESH_LOG_MODULE BLE_MESH_PROV_LOG
+
+#define BLE_NPL_LOG_MODULE BLE_MESH_PROV_LOG
+#include <nimble/nimble_npl_log.h>
 
 #include <stdint.h>
 #include <string.h>

diff --git a/nimble/host/mesh/src/pb_gatt.c b/nimble/host/mesh/src/pb_gatt.c
@@ -7,7 +7,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define MESH_LOG_MODULE BLE_MESH_PROV_LOG
+#define BLE_NPL_LOG_MODULE BLE_MESH_PROV_LOG
+#include <nimble/nimble_npl_log.h>
 
 #include "mesh/mesh.h"
 #include "prov.h"

diff --git a/nimble/host/mesh/src/pb_gatt_srv.c b/nimble/host/mesh/src/pb_gatt_srv.c
@@ -5,7 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define MESH_LOG_MODULE BLE_MESH_PROV_LOG
+#define BLE_NPL_LOG_MODULE BLE_MESH_PROV_LOG
+#include <nimble/nimble_npl_log.h>
 
 #include "mesh_priv.h"
 #include "adv.h"

diff --git a/nimble/host/mesh/src/prov.c b/nimble/host/mesh/src/prov.c
@@ -7,7 +7,9 @@
  */
 
 #include "syscfg/syscfg.h"
-#define MESH_LOG_MODULE BLE_MESH_PROV_LOG
+
+#define BLE_NPL_LOG_MODULE BLE_MESH_PROV_LOG
+#include <nimble/nimble_npl_log.h>
 
 #include <errno.h>