Bluetooth: Switch from SYS_LOG to logger-based logging

Initial conversion to use syslog instead of logger.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

drivers/bluetooth/hci/h4.c

@@ -23,6 +23,7 @@
 #include <bluetooth/hci_driver.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)
+#define LOG_MODULE_NAME bt_driver
 #include "common/log.h"
 
 #include "../util.h"

drivers/bluetooth/hci/h5.c

@@ -25,6 +25,7 @@
 #include <bluetooth/hci_driver.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)
+#define LOG_MODULE_NAME bt_driver
 #include "common/log.h"
 
 #include "../util.h"

drivers/bluetooth/hci/spi.c

@@ -16,6 +16,7 @@
 #include <bluetooth/hci_driver.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)
+#define LOG_MODULE_NAME bt_driver
 #include "common/log.h"
 
 #define HCI_CMD			0x01

drivers/bluetooth/hci/userchan.c

@@ -30,6 +30,7 @@
 #include <bluetooth/hci_driver.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)
+#define LOG_MODULE_NAME bt_driver
 #include "common/log.h"
 
 #define BTPROTO_HCI      1

drivers/bluetooth/nrf51_pm.c

@@ -13,6 +13,7 @@
 #include <errno.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)
+#define LOG_MODULE_NAME bt_nrf51_pm
 #include "common/log.h"
 
 #define NBLE_SWDIO_PIN	6

include/bluetooth/rfcomm.h

@@ -21,8 +21,6 @@
 extern "C" {
 #endif
 
-/* FIXME: temporary workaround until thread details are made internal */
-#include "../../subsys/bluetooth/common/log.h"
 #include <bluetooth/buf.h>
 #include <bluetooth/conn.h>
 

samples/bluetooth/hci_spi/src/main.c

@@ -27,6 +27,7 @@
 #include <bluetooth/buf.h>
 #include <bluetooth/hci_raw.h>
 
+#define LOG_MODULE_NAME hci_spi
 #include "common/log.h"
 
 #define HCI_CMD                 0x01

samples/bluetooth/hci_uart/src/main.c

@@ -27,6 +27,7 @@
 #include <bluetooth/buf.h>
 #include <bluetooth/hci_raw.h>
 
+#define LOG_MODULE_NAME hci_uart
 #include "common/log.h"
 
 static struct device *hci_uart_dev;

subsys/bluetooth/common/Kconfig

@@ -59,7 +59,7 @@ config BT_DEBUG_LOG
 	bool "Normal printf-style to console"
 	select BT_DEBUG
 	select PRINTK
-	select SYS_LOG
+	select LOG
 	help
 	  This option enables Bluetooth debug going to standard
 	  serial console.

subsys/bluetooth/common/log.h

@@ -54,21 +54,27 @@ __printf_like(2, 3) void bt_log(int prio, const char *fmt, ...);
 
 #elif defined(CONFIG_BT_DEBUG_LOG)
 
-#if !defined(SYS_LOG_DOMAIN)
+#if BT_DBG_ENABLED
-#define SYS_LOG_DOMAIN "bt"
+#define LOG_LEVEL LOG_LEVEL_DBG
+#else
+#define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
 #endif
-#define SYS_LOG_LEVEL SYS_LOG_LEVEL_DEBUG
-#include <logging/sys_log.h>
 
-#define BT_DBG(fmt, ...) \
+#include <logging/log.h>
-	if (BT_DBG_ENABLED) { \
-		SYS_LOG_DBG("(%p) " fmt, k_current_get(), \
-			    ##__VA_ARGS__); \
-	}
 
-#define BT_ERR(fmt, ...) SYS_LOG_ERR(fmt, ##__VA_ARGS__)
+LOG_MODULE_REGISTER(LOG_MODULE_NAME);
-#define BT_WARN(fmt, ...) SYS_LOG_WRN(fmt, ##__VA_ARGS__)
+
-#define BT_INFO(fmt, ...) SYS_LOG_INF(fmt, ##__VA_ARGS__)
+#if IS_ENABLED(CONFIG_LOG_FUNCTION_NAME)
+#define BT_DBG(fmt, ...) LOG_DBG(fmt, ##__VA_ARGS__)
+#define BT_ERR(fmt, ...) LOG_ERR(fmt, ##__VA_ARGS__)
+#define BT_WARN(fmt, ...) LOG_WRN(fmt, ##__VA_ARGS__)
+#else
+#define BT_DBG(fmt, ...) LOG_DBG("%s: " fmt, __func__, ##__VA_ARGS__)
+#define BT_ERR(fmt, ...) LOG_ERR("%s: " fmt, __func__, ##__VA_ARGS__)
+#define BT_WARN(fmt, ...) LOG_WRN("%s: " fmt, __func__, ##__VA_ARGS__)
+#endif
+
+#define BT_INFO(fmt, ...) LOG_INF(fmt, ##__VA_ARGS__)
 
 /* Enabling debug increases stack size requirement considerably */
 #define BT_STACK_DEBUG_EXTRA	300

subsys/bluetooth/common/rpa.c

@@ -25,6 +25,7 @@
 #include <tinycrypt/cmac_mode.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_RPA)
+#define LOG_MODULE_NAME bt_rpa
 #include "common/log.h"
 
 static int ah(const u8_t irk[16], const u8_t r[3], u8_t out[3])

subsys/bluetooth/controller/crypto/crypto.c

@@ -7,6 +7,7 @@
 #include <soc.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)
+#define LOG_MODULE_NAME bt_ctlr_crypto
 #include "common/log.h"
 
 #include "hal/ecb.h"

subsys/bluetooth/controller/hal/nrf5/cntr.c

@@ -10,6 +10,7 @@
 
 #include "hal/cntr.h"
 
+#define LOG_MODULE_NAME bt_ctlr_cntr
 #include "common/log.h"
 #include "hal/debug.h"
 #include "nrf_rtc.h"

subsys/bluetooth/controller/hal/nrf5/ecb.c

@@ -13,6 +13,7 @@
 #include "util/mem.h"
 #include "hal/ecb.h"
 
+#define LOG_MODULE_NAME bt_ctlr_nrf5_ecb
 #include "common/log.h"
 #include "hal/debug.h"
 

subsys/bluetooth/controller/hal/nrf5/mayfly.c

@@ -11,6 +11,7 @@
 #include "util/memq.h"
 #include "util/mayfly.h"
 
+#define LOG_MODULE_NAME bt_ctlr_nrf5_mayfly
 #include "common/log.h"
 #include "hal/debug.h"
 

subsys/bluetooth/controller/hal/nrf5/ticker.c

@@ -16,6 +16,7 @@
 
 #include "ticker/ticker.h"
 
+#define LOG_MODULE_NAME bt_ctlr_nrf5_ticker
 #include "common/log.h"
 #include "hal/debug.h"
 

subsys/bluetooth/controller/hci/hci.c

@@ -34,6 +34,7 @@
 #endif /* CONFIG_BT_CTLR_DTM_HCI */
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)
+#define LOG_MODULE_NAME bt_ctlr_hci
 #include "common/log.h"
 #include "hal/debug.h"
 

subsys/bluetooth/controller/hci/hci_driver.c

@@ -29,6 +29,7 @@
 #endif
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)
+#define LOG_MODULE_NAME bt_ctlr_hci_driver
 #include "common/log.h"
 
 #include "util/util.h"

subsys/bluetooth/controller/ll_sw/ctrl.c

@@ -44,6 +44,7 @@
 #include "ll_filter.h"
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)
+#define LOG_MODULE_NAME bt_ctlr_llsw_ctrl
 #include "common/log.h"
 
 #if defined(CONFIG_BT_CTLR_CONN_RSSI)

subsys/bluetooth/controller/ll_sw/ll.c

@@ -17,6 +17,7 @@
 #include <bluetooth/hci.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)
+#define LOG_MODULE_NAME bt_ctlr_llsw_ll
 #include "common/log.h"
 
 #include "hal/cpu.h"

subsys/bluetooth/controller/ll_sw/ll_filter.c

@@ -22,6 +22,7 @@
 #define ADDR_TYPE_ANON 0xFF
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)
+#define LOG_MODULE_NAME bt_ctlr_llsw_llfilter
 #include "common/log.h"
 
 #include "hal/debug.h"

subsys/bluetooth/controller/ticker/ticker.c

@@ -13,6 +13,7 @@
 
 #include "ticker.h"
 
+#define LOG_MODULE_NAME bt_ctlr_ticker
 #include "common/log.h"
 #include "hal/debug.h"
 

subsys/bluetooth/host/a2dp.c

@@ -23,6 +23,7 @@
 #include <bluetooth/a2dp.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_A2DP)
+#define LOG_MODULE_NAME bt_a2dp
 #include "common/log.h"
 
 #include "hci_core.h"

subsys/bluetooth/host/att.c

@@ -21,6 +21,7 @@
 #include <bluetooth/hci_driver.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_ATT)
+#define LOG_MODULE_NAME bt_att
 #include "common/log.h"
 
 #include "hci_core.h"

subsys/bluetooth/host/avdtp.c

@@ -19,6 +19,7 @@
 #include <bluetooth/avdtp.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_AVDTP)
+#define LOG_MODULE_NAME bt_avdtp
 #include "common/log.h"
 
 #include "hci_core.h"

subsys/bluetooth/host/conn.c

@@ -24,6 +24,7 @@
 #include <bluetooth/att.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_CONN)
+#define LOG_MODULE_NAME bt_conn
 #include "common/log.h"
 
 #include "hci_core.h"

subsys/bluetooth/host/crypto.c

@@ -21,6 +21,7 @@
 #include <tinycrypt/utils.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_CORE)
+#define LOG_MODULE_NAME bt_crypto
 #include "common/log.h"
 
 #include "hci_core.h"

subsys/bluetooth/host/gatt.c

@@ -24,6 +24,7 @@
 #include <bluetooth/hci_driver.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_GATT)
+#define LOG_MODULE_NAME bt_gatt
 #include "common/log.h"
 
 #include "hci_core.h"

subsys/bluetooth/host/hci_core.c

@@ -29,6 +29,7 @@
 #include <bluetooth/hci_driver.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_CORE)
+#define LOG_MODULE_NAME bt_hci_core
 #include "common/log.h"
 
 #include "common/rpa.h"

subsys/bluetooth/host/hci_ecc.c

@@ -24,6 +24,7 @@
 #include <bluetooth/hci_driver.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_CORE)
+#define LOG_MODULE_NAME bt_hci_ecc
 #include "common/log.h"
 
 #include "hci_ecc.h"

subsys/bluetooth/host/hci_raw.c

@@ -13,6 +13,7 @@
 #include <bluetooth/hci_raw.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_CORE)
+#define LOG_MODULE_NAME bt_hci_raw
 #include "common/log.h"
 
 #include "hci_ecc.h"

subsys/bluetooth/host/hfp_hf.c

@@ -15,7 +15,9 @@
 #include <bluetooth/conn.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HFP_HF)
-/* FIXME: #include "common/log.h" */
+#define LOG_MODULE_NAME bt_hfp_hf
+#include "common/log.h"
+
 #include <bluetooth/rfcomm.h>
 #include <bluetooth/hfp_hf.h>
 

subsys/bluetooth/host/keys.c

@@ -19,6 +19,7 @@
 #include <bluetooth/hci.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_KEYS)
+#define LOG_MODULE_NAME bt_keys
 #include "common/log.h"
 
 #include "common/rpa.h"

subsys/bluetooth/host/keys_br.c

@@ -16,6 +16,7 @@
 #include <bluetooth/hci.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_KEYS)
+#define LOG_MODULE_NAME bt_keys_br
 #include "common/log.h"
 
 #include "hci_core.h"

subsys/bluetooth/host/l2cap.c

@@ -19,6 +19,7 @@
 #include <bluetooth/hci_driver.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_L2CAP)
+#define LOG_MODULE_NAME bt_l2cap
 #include "common/log.h"
 
 #include "hci_core.h"

subsys/bluetooth/host/l2cap_br.c

@@ -19,6 +19,7 @@
 #include <bluetooth/hci_driver.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_L2CAP)
+#define LOG_MODULE_NAME bt_l2cap_br
 #include "common/log.h"
 
 #include "hci_core.h"

subsys/bluetooth/host/mesh/access.c

@@ -16,6 +16,7 @@
 #include <bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_ACCESS)
+#define LOG_MODULE_NAME bt_mesh_access
 #include "common/log.h"
 
 #include "mesh.h"

subsys/bluetooth/host/mesh/adv.c

@@ -18,6 +18,7 @@
 #include <bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_ADV)
+#define LOG_MODULE_NAME bt_mesh_adv
 #include "common/log.h"
 
 #include "../hci_core.h"

subsys/bluetooth/host/mesh/beacon.c

@@ -16,6 +16,7 @@
 #include <bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_BEACON)
+#define LOG_MODULE_NAME bt_mesh_beacon
 #include "common/log.h"
 
 #include "adv.h"

subsys/bluetooth/host/mesh/cfg_cli.c

@@ -19,6 +19,7 @@
 #include <bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_MODEL)
+#define LOG_MODULE_NAME bt_mesh_cfg_cli
 #include "common/log.h"
 
 #include "net.h"

subsys/bluetooth/host/mesh/cfg_srv.c

@@ -19,6 +19,7 @@
 #include <bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_MODEL)
+#define LOG_MODULE_NAME bt_mesh_cfg_srv
 #include "common/log.h"
 
 #include "../testing.h"

subsys/bluetooth/host/mesh/crypto.c

@@ -24,6 +24,7 @@
 #include <bluetooth/crypto.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_CRYPTO)
+#define LOG_MODULE_NAME bt_mesh_crypto
 #include "common/log.h"
 
 #include "mesh.h"

subsys/bluetooth/host/mesh/friend.c

@@ -15,6 +15,7 @@
 #include <bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_FRIEND)
+#define LOG_MODULE_NAME bt_mesh_friend
 #include "common/log.h"
 
 #include "crypto.h"

subsys/bluetooth/host/mesh/health_cli.c

@@ -19,6 +19,7 @@
 #include <bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_MODEL)
+#define LOG_MODULE_NAME bt_mesh_health_cli
 #include "common/log.h"
 
 #include "net.h"

subsys/bluetooth/host/mesh/health_srv.c

@@ -18,6 +18,7 @@
 #include <bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_MODEL)
+#define LOG_MODULE_NAME bt_mesh_health_srv
 #include "common/log.h"
 
 #include "mesh.h"

subsys/bluetooth/host/mesh/lpn.c

@@ -15,6 +15,7 @@
 #include <bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_LOW_POWER)
+#define LOG_MODULE_NAME bt_mesh_lpn
 #include "common/log.h"
 
 #include "crypto.h"

subsys/bluetooth/host/mesh/main.c

@@ -17,6 +17,7 @@
 #include <bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG)
+#define LOG_MODULE_NAME bt_mesh_main
 #include "common/log.h"
 
 #include "test.h"

subsys/bluetooth/host/mesh/net.c

@@ -20,6 +20,7 @@
 #include <bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_NET)
+#define LOG_MODULE_NAME bt_mesh_net
 #include "common/log.h"
 
 #include "crypto.h"

subsys/bluetooth/host/mesh/prov.c

@@ -19,6 +19,7 @@
 #include <bluetooth/uuid.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_PROV)
+#define LOG_MODULE_NAME bt_mesh_prov
 #include "common/log.h"
 
 #include "../ecc.h"

subsys/bluetooth/host/mesh/proxy.c

@@ -16,6 +16,7 @@
 #include <bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_PROXY)
+#define LOG_MODULE_NAME bt_mesh_proxy
 #include "common/log.h"
 
 #include "mesh.h"

subsys/bluetooth/host/mesh/settings.c

@@ -21,6 +21,7 @@
 #include <bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_SETTINGS)
+#define LOG_MODULE_NAME bt_mesh_settings
 #include "common/log.h"
 
 #include "../settings.h"

subsys/bluetooth/host/mesh/test.c

@@ -11,6 +11,7 @@
 
 #include <bluetooth/mesh.h>
 
+#define LOG_MODULE_NAME bt_mesh_test
 #include "common/log.h"
 
 #include "mesh.h"

subsys/bluetooth/host/mesh/transport.c

@@ -19,6 +19,7 @@
 #include <bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_TRANS)
+#define LOG_MODULE_NAME bt_mesh_transport
 #include "common/log.h"
 
 #include "../testing.h"

subsys/bluetooth/host/rfcomm.c

@@ -21,7 +21,9 @@
 #include <bluetooth/l2cap.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_RFCOMM)
-/* FIXME: #include "common/log.h" */
+#define LOG_MODULE_NAME bt_rfcomm
+#include "common/log.h"
+
 #include <bluetooth/rfcomm.h>
 
 #include "hci_core.h"

subsys/bluetooth/host/sdp.c

@@ -16,6 +16,7 @@
 #include <bluetooth/sdp.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_SDP)
+#define LOG_MODULE_NAME bt_sdp
 #include "common/log.h"
 
 #include "hci_core.h"

subsys/bluetooth/host/settings.c

@@ -13,6 +13,7 @@
 #include <bluetooth/conn.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_SETTINGS)
+#define LOG_MODULE_NAME bt_settings
 #include "common/log.h"
 
 #include "hci_core.h"

subsys/bluetooth/host/smp.c

@@ -31,6 +31,7 @@
 #include <tinycrypt/cmac_mode.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_SMP)
+#define LOG_MODULE_NAME bt_smp
 #include "common/log.h"
 
 #include "hci_core.h"

subsys/bluetooth/host/smp_null.c

@@ -19,6 +19,7 @@
 #include <bluetooth/buf.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_CORE)
+#define LOG_MODULE_NAME bt_smp
 #include "common/log.h"
 
 #include "hci_core.h"

subsys/bluetooth/shell/bt.c

@@ -415,6 +415,7 @@ static int cmd_name(const struct shell *shell, size_t argc, char *argv[])
 
 static int cmd_id_create(const struct shell *shell, size_t argc, char *argv[])
 {
+	char addr_str[BT_ADDR_LE_STR_LEN];
 	bt_addr_le_t addr;
 	int err;
 
@@ -432,14 +433,15 @@ static int cmd_id_create(const struct shell *shell, size_t argc, char *argv[])
 		error(shell, "Creating new ID failed (err %d)", err);
 	}
 
-	print(shell, "New identity (%d) created: %s", err,
+	bt_addr_le_to_str(&addr, addr_str, sizeof(addr_str));
-	      bt_addr_le_str(&addr));
+	print(shell, "New identity (%d) created: %s", err, addr_str);
 
 	return 0;
 }
 
 static int cmd_id_reset(const struct shell *shell, size_t argc, char *argv[])
 {
+	char addr_str[BT_ADDR_LE_STR_LEN];
 	bt_addr_le_t addr;
 	u8_t id;
 	int err;
@@ -467,7 +469,8 @@ static int cmd_id_reset(const struct shell *shell, size_t argc, char *argv[])
 		return err;
 	}
 
-	print(shell, "Identity %u reset: %s", id, bt_addr_le_str(&addr));
+	bt_addr_le_to_str(&addr, addr_str, sizeof(addr_str));
+	print(shell, "Identity %u reset: %s", id, addr_str);
 
 	return 0;
 }
@@ -503,8 +506,11 @@ static int cmd_id_show(const struct shell *shell, size_t argc, char *argv[])
 	bt_id_get(addrs, &count);
 
 	for (i = 0; i < count; i++) {
+		char addr_str[BT_ADDR_LE_STR_LEN];
+
+		bt_addr_le_to_str(&addrs[i], addr_str, sizeof(addr_str));
 		print(shell, "%s%zu: %s", i == selected_id ? "*" : " ", i,
-		      bt_addr_le_str(&addrs[i]));
+		      addr_str);
 	}
 
 	return 0;
@@ -512,6 +518,7 @@ static int cmd_id_show(const struct shell *shell, size_t argc, char *argv[])
 
 static int cmd_id_select(const struct shell *shell, size_t argc, char *argv[])
 {
+	char addr_str[BT_ADDR_LE_STR_LEN];
 	bt_addr_le_t addrs[CONFIG_BT_ID_MAX];
 	size_t count = CONFIG_BT_ID_MAX;
 	u8_t id;
@@ -530,8 +537,8 @@ static int cmd_id_select(const struct shell *shell, size_t argc, char *argv[])
 		return -ENOEXEC;
 	}
 
-	print(shell, "Selected identity: %s",
+	bt_addr_le_to_str(&addrs[id], addr_str, sizeof(addr_str));
-		     bt_addr_le_str(&addrs[id]));
+	print(shell, "Selected identity: %s", addr_str);
 	selected_id = id;
 
 	return 0;

tests/bluetooth/shell/prj.conf

@@ -18,8 +18,8 @@ CONFIG_BT_TINYCRYPT_ECC=y
 CONFIG_BT_SHELL=y
 CONFIG_BT_DEVICE_NAME="test shell"
 CONFIG_BT_DEVICE_NAME_DYNAMIC=y
-CONFIG_BT_L2CAP_TX_BUF_COUNT=6
+CONFIG_BT_L2CAP_TX_BUF_COUNT=4
-CONFIG_BT_ID_MAX=4
+CONFIG_BT_ID_MAX=2
 
 CONFIG_BT_SETTINGS=y
 CONFIG_FLASH=y