patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

sys_log: replace old debug macros at bluetooth tester

Browse source 
Bluetooth tester is now using new system log macros.

JIRA: ZEP-311

Change-Id: I6398f2de12d5ba1073e40fd45aa8e0177d1e279d
Signed-off-by: Genaro Saucedo Tejada <genaro.saucedo.tejada@intel.com>
This commit is contained in:
Genaro Saucedo Tejada 2016-07-29 13:59:32 -05:00 committed by Andrew Boie
parent 8ba4f26e5f
commit 58f88179ef
3 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tests/bluetooth/tester/src/bttester.h
View file

@ -32,8 +32,9 @@
#define BTP_STATUS_UNKNOWN_CMD 0x02
#define BTP_STATUS_NOT_READY 0x03
#define BTTESTER_DBG(fmt, ...) printf("bttester: %s: " fmt "\n", __func__, \
##__VA_ARGS__)
#define SYS_LOG_LEVEL SYS_LOG_LEVEL_DEBUG
#define SYS_LOG_DOMAIN "bttester"
#include <misc/sys_log.h>
struct btp_hdr {
uint8_t service;

6
tests/bluetooth/tester/src/gap.c
View file

@ -207,7 +207,7 @@ static void start_advertising(const uint8_t *data, uint16_t len)
for (i = 0, adv_len = 1; i < cmd->adv_data_len; adv_len++) {
if (adv_len >= ARRAY_SIZE(ad)) {
BTTESTER_DBG("ad[] Out of memory");
SYS_LOG_ERR("ad[] Out of memory");
goto fail;
}
@ -219,7 +219,7 @@ static void start_advertising(const uint8_t *data, uint16_t len)
for (i = 0, sd_len = 0; i < cmd->scan_rsp_len; sd_len++) {
if (sd_len >= ARRAY_SIZE(sd)) {
BTTESTER_DBG("sd[] Out of memory");
SYS_LOG_ERR("sd[] Out of memory");
goto fail;
}
@ -234,7 +234,7 @@ static void start_advertising(const uint8_t *data, uint16_t len)
/* BTP API don't allow to set empty scan response data. */
if (bt_le_adv_start(adv_conn ? BT_LE_ADV_CONN : BT_LE_ADV_NCONN,
ad, adv_len, sd_len ? sd : NULL, sd_len) < 0) {
BTTESTER_DBG("Failed to start advertising");
SYS_LOG_ERR("Failed to start advertising");
goto fail;
}

18
tests/bluetooth/tester/src/gatt.c
View file

@ -95,7 +95,7 @@ static void *gatt_buf_add(const void *data, size_t len)
gatt_buf.len += len;
BTTESTER_DBG("%d/%d used", gatt_buf.len, MAX_BUFFER_SIZE);
SYS_LOG_DBG("%d/%d used", gatt_buf.len, MAX_BUFFER_SIZE);
return ptr;
}
@ -146,7 +146,7 @@ static struct bt_gatt_attr *gatt_db_add(const struct bt_gatt_attr *pattern,
memcpy(attr->user_data, pattern->user_data, user_data_len);
}
BTTESTER_DBG("handle 0x%04x", attr->handle);
SYS_LOG_DBG("handle 0x%04x", attr->handle);
attr_count++;
svc_attr_count++;
@ -698,7 +698,11 @@ struct bt_gatt_indicate_params indicate_params;
static void indicate_cb(struct bt_conn *conn, const struct bt_gatt_attr *attr,
uint8_t err)
{
BTTESTER_DBG("Indication %s\n", err != 0 ? "fail" : "success");
if (err != 0) {
SYS_LOG_ERR("Indication fail\n");
} else {
SYS_LOG_DBG("Indication success\n");
}
}
static uint8_t alloc_value(struct bt_gatt_attr *attr, struct set_value *data)
@ -1550,7 +1554,7 @@ static uint8_t notify_func(struct bt_conn *conn,
const bt_addr_le_t *addr = bt_conn_get_dst(conn);
if (!data) {
BTTESTER_DBG("Unsubscribed");
SYS_LOG_DBG("Unsubscribed");
memset(params, 0, sizeof(*params));
return BT_GATT_ITER_STOP;
}
@ -1620,7 +1624,7 @@ static int enable_subscription(struct bt_conn *conn, uint16_t ccc_handle,
{
/* Fail if there is another subscription enabled */
if (subscribe_params.ccc_handle) {
BTTESTER_DBG("Another subscription already enabled");
SYS_LOG_ERR("Another subscription already enabled");
return -EEXIST;
}
@ -1641,7 +1645,7 @@ static int disable_subscription(struct bt_conn *conn, uint16_t ccc_handle)
{
/* Fail if CCC handle doesn't match */
if (ccc_handle != subscribe_params.ccc_handle) {
BTTESTER_DBG("CCC handle doesn't match");
SYS_LOG_ERR("CCC handle doesn't match");
return -EINVAL;
}
@ -1692,7 +1696,7 @@ static void config_subscription(uint8_t *data, uint16_t len, uint16_t op)
}
}
BTTESTER_DBG("Config subscription (op %u) status %u", op, status);
SYS_LOG_DBG("Config subscription (op %u) status %u", op, status);
bt_conn_unref(conn);
tester_rsp(BTP_SERVICE_ID_GATT, op, CONTROLLER_INDEX, status);