Skip to content

Commit

Permalink
Bluetooth: tester: Update to recent conn param related changes in BTP
Browse files Browse the repository at this point in the history 
This updates tester application to recent changes in BTP related
to Connection Parameters Update.
Connected event has been extended with connection parameters.
Connection Parameters Update command and event have beend added to
initiate and track current connection parameters.
Needed to automate qualification test GAP/CONN/CPUP/BV-06-C

Signed-off-by: Mariusz Skamra <mariusz.skamra@codecoup.pl>
  • Loading branch information
@MariuszSkamra @carlescufi
MariuszSkamra authored and carlescufi committed Jul 19, 2019
1 parent 6315752 commit 1074efd
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 3 deletions.
22 changes: 22 additions & 0 deletions tests/bluetooth/tester/src/bttester.h
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -228,6 +228,16 @@ struct gap_passkey_confirm_cmd {
u8_t match; u8_t match;
} __packed; } __packed;


#define GAP_CONN_PARAM_UPDATE 0x16
struct gap_conn_param_update_cmd {
u8_t address_type;
u8_t address[6];
u16_t interval_min;
u16_t interval_max;
u16_t latency;
u16_t timeout;
} __packed;

/* events */ /* events */
#define GAP_EV_NEW_SETTINGS 0x80 #define GAP_EV_NEW_SETTINGS 0x80
struct gap_new_settings_ev { struct gap_new_settings_ev {
Expand All @@ -252,6 +262,9 @@ struct gap_device_found_ev {
struct gap_device_connected_ev { struct gap_device_connected_ev {
u8_t address_type; u8_t address_type;
u8_t address[6]; u8_t address[6];
u16_t interval;
u16_t latency;
u16_t timeout;
} __packed; } __packed;


#define GAP_EV_DEVICE_DISCONNECTED 0x83 #define GAP_EV_DEVICE_DISCONNECTED 0x83
Expand Down Expand Up @@ -288,6 +301,15 @@ struct gap_identity_resolved_ev {
u8_t identity_address[6]; u8_t identity_address[6];
} __packed; } __packed;


#define GAP_EV_CONN_PARAM_UPDATE 0x88
struct gap_conn_param_update_ev {
u8_t address_type;
u8_t address[6];
u16_t interval;
u16_t latency;
u16_t timeout;
} __packed;

/* GATT Service */ /* GATT Service */
/* commands */ /* commands */
#define GATT_READ_SUPPORTED_COMMANDS 0x01 #define GATT_READ_SUPPORTED_COMMANDS 0x01
Expand Down
60 changes: 57 additions & 3 deletions tests/bluetooth/tester/src/gap.c
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -35,14 +35,19 @@ struct bt_conn_auth_cb cb;
static void le_connected(struct bt_conn *conn, u8_t err) static void le_connected(struct bt_conn *conn, u8_t err)
{ {
struct gap_device_connected_ev ev; struct gap_device_connected_ev ev;
const bt_addr_le_t *addr = bt_conn_get_dst(conn); struct bt_conn_info info;


if (err) { if (err) {
return; return;
} }


memcpy(ev.address, addr->a.val, sizeof(ev.address)); bt_conn_get_info(conn, &info);
ev.address_type = addr->type;
memcpy(ev.address, info.le.dst->a.val, sizeof(ev.address));
ev.address_type = info.le.dst->type;
ev.interval = sys_cpu_to_le16(info.le.interval);
ev.latency = sys_cpu_to_le16(info.le.latency);
ev.timeout = sys_cpu_to_le16(info.le.timeout);


tester_send(BTP_SERVICE_ID_GAP, GAP_EV_DEVICE_CONNECTED, tester_send(BTP_SERVICE_ID_GAP, GAP_EV_DEVICE_CONNECTED,
CONTROLLER_INDEX, (u8_t *) &ev, sizeof(ev)); CONTROLLER_INDEX, (u8_t *) &ev, sizeof(ev));
Expand Down Expand Up @@ -76,10 +81,27 @@ static void le_identity_resolved(struct bt_conn *conn, const bt_addr_le_t *rpa,
CONTROLLER_INDEX, (u8_t *) &ev, sizeof(ev)); CONTROLLER_INDEX, (u8_t *) &ev, sizeof(ev));
} }


static void le_param_updated(struct bt_conn *conn, u16_t interval,
u16_t latency, u16_t timeout)
{
struct gap_conn_param_update_ev ev;
const bt_addr_le_t *addr = bt_conn_get_dst(conn);

memcpy(ev.address, addr->a.val, sizeof(ev.address));
ev.address_type = addr->type;
ev.interval = sys_cpu_to_le16(interval);
ev.latency = sys_cpu_to_le16(latency);
ev.timeout = sys_cpu_to_le16(timeout);

tester_send(BTP_SERVICE_ID_GAP, GAP_EV_CONN_PARAM_UPDATE,
CONTROLLER_INDEX, (u8_t *) &ev, sizeof(ev));
}

static struct bt_conn_cb conn_callbacks = { static struct bt_conn_cb conn_callbacks = {
.connected = le_connected, .connected = le_connected,
.disconnected = le_disconnected, .disconnected = le_disconnected,
.identity_resolved = le_identity_resolved, .identity_resolved = le_identity_resolved,
.le_param_updated = le_param_updated,
}; };


static void supported_commands(u8_t *data, u16_t len) static void supported_commands(u8_t *data, u16_t len)
Expand All @@ -103,6 +125,7 @@ static void supported_commands(u8_t *data, u16_t len)
tester_set_bit(cmds, GAP_SET_IO_CAP); tester_set_bit(cmds, GAP_SET_IO_CAP);
tester_set_bit(cmds, GAP_PAIR); tester_set_bit(cmds, GAP_PAIR);
tester_set_bit(cmds, GAP_PASSKEY_ENTRY); tester_set_bit(cmds, GAP_PASSKEY_ENTRY);
tester_set_bit(cmds, GAP_CONN_PARAM_UPDATE);


tester_send(BTP_SERVICE_ID_GAP, GAP_READ_SUPPORTED_COMMANDS, tester_send(BTP_SERVICE_ID_GAP, GAP_READ_SUPPORTED_COMMANDS,
CONTROLLER_INDEX, (u8_t *) rp, sizeof(cmds)); CONTROLLER_INDEX, (u8_t *) rp, sizeof(cmds));
Expand Down Expand Up @@ -640,6 +663,34 @@ static void passkey_entry(const u8_t *data, u16_t len)
status); status);
} }


static void conn_param_update(const u8_t *data, u16_t len)
{
const struct gap_conn_param_update_cmd *cmd = (void *) data;
struct bt_le_conn_param param = {
.interval_min = sys_le16_to_cpu(cmd->interval_min),
.interval_max = sys_le16_to_cpu(cmd->interval_max),
.latency = sys_le16_to_cpu(cmd->latency),
.timeout = sys_le16_to_cpu(cmd->timeout),
};
struct bt_conn *conn;
u8_t status = BTP_STATUS_FAILED;

conn = bt_conn_lookup_addr_le(BT_ID_DEFAULT, (bt_addr_le_t *)data);
if (!conn) {
goto rsp;
}

if (!bt_conn_le_param_update(conn, &param)) {
status = BTP_STATUS_SUCCESS;
}

bt_conn_unref(conn);

rsp:
tester_rsp(BTP_SERVICE_ID_GAP, GAP_PASSKEY_ENTRY, CONTROLLER_INDEX,
status);
}

void tester_handle_gap(u8_t opcode, u8_t index, u8_t *data, void tester_handle_gap(u8_t opcode, u8_t index, u8_t *data,
u16_t len) u16_t len)
{ {
Expand Down Expand Up @@ -707,6 +758,9 @@ void tester_handle_gap(u8_t opcode, u8_t index, u8_t *data,
case GAP_PASSKEY_ENTRY: case GAP_PASSKEY_ENTRY:
passkey_entry(data, len); passkey_entry(data, len);
return; return;
case GAP_CONN_PARAM_UPDATE:
conn_param_update(data, len);
return;
default: default:
tester_rsp(BTP_SERVICE_ID_GAP, opcode, index, tester_rsp(BTP_SERVICE_ID_GAP, opcode, index,
BTP_STATUS_UNKNOWN_CMD); BTP_STATUS_UNKNOWN_CMD);
Expand Down

0 comments on commit 1074efd

Please sign in to comment.