Skip to content

apps/bttester: Remove a leftover/broken implementation #2281

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

Open
mkasenberg wants to merge 1 commit into
base: master
Choose a base branch
from
+0 −38
Open

apps/bttester: Remove a leftover/broken implementation #2281

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
20 changes: 0 additions & 20 deletions apps/bttester/src/btp_gatt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1059,12 +1059,6 @@ reliable_write(const void *cmd, uint16_t cmd_len,
return BTP_STATUS_FAILED;
}

static struct bt_gatt_subscribe_params {
uint16_t ccc_handle;
uint16_t value;
uint16_t value_handle;
} subscribe_params;

static uint8_t
read_uuid(const void *cmd, uint16_t cmd_len,
void *rsp, uint16_t *rsp_len)
Expand Down Expand Up @@ -1594,8 +1588,6 @@ enable_subscription(uint16_t conn_handle, uint16_t ccc_handle,
return -EINVAL;
}

subscribe_params.ccc_handle = value;

tester_rsp(BTP_SERVICE_ID_GATT, op, BTP_STATUS_SUCCESS);
return 0;
}
Expand All @@ -1607,18 +1599,11 @@ disable_subscription(uint16_t conn_handle, uint16_t ccc_handle)

SYS_LOG_DBG("");

/* Fail if CCC handle doesn't match */
if (ccc_handle != subscribe_params.ccc_handle) {
SYS_LOG_ERR("CCC handle doesn't match");
return -EINVAL;
}

if (ble_gattc_write_no_rsp_flat(conn_handle, ccc_handle,
&value, sizeof(value))) {
return -EINVAL;
}

subscribe_params.ccc_handle = 0;
return 0;
}

Expand Down Expand Up @@ -2147,10 +2132,6 @@ tester_gatt_notify_rx_ev(uint16_t conn_handle, uint16_t attr_handle,

SYS_LOG_DBG("");

if (!subscribe_params.ccc_handle) {
goto fail;
}

if (ble_gap_conn_find(conn_handle, &conn)) {
goto fail;
}
Expand Down Expand Up @@ -2190,7 +2171,6 @@ tester_gatt_subscribe_ev(uint16_t conn_handle,

if (cur_notify == 0 && cur_indicate == 0) {
SYS_LOG_INF("Unsubscribed");
memset(&subscribe_params, 0, sizeof(subscribe_params));
return 0;
}

Expand Down
18 changes: 0 additions & 18 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 @@ -66,11 +66,6 @@ static struct {
uint8_t buf[MAX_BUFFER_SIZE];
uint16_t cnt;
} gatt_buf;
static struct bt_gatt_subscribe_params {
uint16_t ccc_handle;
uint16_t value;
uint16_t value_handle;
} subscribe_params;

static void *
gatt_buf_add(const void *data, size_t len)
Expand Down Expand Up @@ -1259,8 +1254,6 @@ enable_subscription(uint16_t conn_handle, uint16_t ccc_handle,
return -EINVAL;
}

subscribe_params.ccc_handle = value;

return 0;
}

Expand All @@ -1275,12 +1268,6 @@ disable_subscription(uint16_t conn_handle, uint16_t ccc_handle)
opcode = (uint32_t) (value == 0x0001 ? BTP_GATTC_CFG_NOTIFY_RP
: BTP_GATTC_CFG_INDICATE_RP);

/* Fail if CCC handle doesn't match */
if (ccc_handle != subscribe_params.ccc_handle) {
SYS_LOG_ERR("CCC handle doesn't match");
return -EINVAL;
}

if (ble_gattc_write_flat(conn_handle,
ccc_handle,
&value,
Expand All @@ -1290,7 +1277,6 @@ disable_subscription(uint16_t conn_handle, uint16_t ccc_handle)
return -EINVAL;
}

subscribe_params.ccc_handle = 0;
return 0;
}

Expand Down Expand Up @@ -1458,10 +1444,6 @@ tester_gattc_notify_rx_ev(uint16_t conn_handle, uint16_t attr_handle,

SYS_LOG_DBG("");

if (!subscribe_params.ccc_handle) {
goto fail;
}

if (ble_gap_conn_find(conn_handle, &conn)) {
goto fail;
}
Expand Down
Loading