Skip to content

[WIP] apps/bttester: implement identifier param in GATT_CL #2276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
piotrnarajowski wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −3
Draft

[WIP] apps/bttester: implement identifier param in GATT_CL #2276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions apps/bttester/src/btp/btp_gattc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ struct btp_gattc_exchange_mtu_cmd {
struct btp_gattc_disc_all_prim_svcs_cmd {
ble_addr_t address;
} __packed;
struct btp_gattc_disc_all_prim_svcs_rp {
uint32_t identifier;
};

#define BTP_GATTC_DISC_PRIM_UUID 0x04
struct btp_gattc_disc_prim_uuid_cmd {
Expand Down Expand Up @@ -183,6 +186,7 @@ struct btp_gattc_exchange_mtu_ev {
#define BTP_GATTC_DISC_ALL_PRIM_RP 0x81
struct btp_gattc_disc_prim_svcs_rp {
ble_addr_t address;
uint32_t identifier;
uint8_t status;
uint8_t services_count;
uint8_t data[0];
Expand Down
25 changes: 22 additions & 3 deletions apps/bttester/src/btp_gatt_cl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#define CONTROLLER_INDEX 0
#define MAX_BUFFER_SIZE 2048

static uint32_t identifier = 0;

/* Convert UUID from BTP command to bt_uuid */
static uint8_t
btp2bt_uuid(const uint8_t *uuid, uint8_t len,
Expand Down Expand Up @@ -184,7 +186,9 @@ disc_prim_svcs_cb(uint16_t conn_handle,
const ble_uuid_any_t *uuid;
uint8_t uuid_length;
struct os_mbuf *buf = os_msys_get(0, 0);
uint8_t opcode = (uint8_t) (int) arg;
uint8_t opcode;
uint32_t operation_identifier;
uintptr_t cb_data = (uintptr_t)arg;
uint8_t err = (uint8_t) error->status;
int rc = 0;

Expand All @@ -202,6 +206,10 @@ disc_prim_svcs_cb(uint16_t conn_handle,

memcpy(&rp->address, &conn.peer_ota_addr, sizeof(rp->address));

opcode = cb_data & 0xFF;
operation_identifier = cb_data >> 8;
rp->identifier = operation_identifier;

rp->status = err;
if (error->status != 0 && error->status != BLE_HS_EDONE) {
rp->services_count = 0;
Expand Down Expand Up @@ -255,7 +263,10 @@ disc_all_prim_svcs(const void *cmd, uint16_t cmd_len,
void *rsp, uint16_t *rsp_len)
{
const struct btp_gattc_disc_all_prim_svcs_cmd *cp = cmd;
struct btp_gattc_disc_all_prim_svcs_rp *rp = rsp;
struct ble_gap_conn_desc conn;
uint32_t local_identifier;
uint8_t opcode = BTP_GATTC_DISC_ALL_PRIM_RP;
int rc;

SYS_LOG_DBG("");
Expand All @@ -265,12 +276,20 @@ disc_all_prim_svcs(const void *cmd, uint16_t cmd_len,
return BTP_STATUS_FAILED;
}

if (ble_gattc_disc_all_svcs(conn.conn_handle, disc_prim_svcs_cb,
(void *) BTP_GATTC_DISC_ALL_PRIM_RP)) {
local_identifier = ++identifier;

uintptr_t packed = ((uintptr_t) local_identifier << 8);
packed |= (opcode & 0xFF);
void *cb_arg = (void *)packed;

if (ble_gattc_disc_all_svcs(conn.conn_handle, disc_prim_svcs_cb, cb_arg)) {
discover_destroy();
return BTP_STATUS_FAILED;
}

rp->identifier = local_identifier;
*rsp_len = sizeof(*rp);

return BTP_STATUS_SUCCESS;
}

Expand Down
Loading