You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/01/09 01:18:40 UTC
[07/10] incubator-mynewt-larva git commit: Rename some fields in the
ATT context struct.
Rename some fields in the ATT context struct.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/commit/f2de40ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/tree/f2de40ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/diff/f2de40ae
Branch: refs/heads/master
Commit: f2de40aec6a1f93c9dbc913bc8c250529a73a568
Parents: 5afe01a
Author: Christopher Collins <cc...@gmail.com>
Authored: Fri Jan 8 15:36:37 2016 -0800
Committer: Christopher Collins <cc...@gmail.com>
Committed: Fri Jan 8 16:18:09 2016 -0800
----------------------------------------------------------------------
net/nimble/host/include/host/ble_att.h | 3 ++-
net/nimble/host/src/ble_att_svr.c | 16 ++++++++--------
net/nimble/host/src/ble_gattc.c | 4 ++--
net/nimble/host/src/ble_gatts.c | 22 +++++++++++-----------
net/nimble/host/src/test/ble_att_svr_test.c | 16 ++++++++--------
5 files changed, 31 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/f2de40ae/net/nimble/host/include/host/ble_att.h
----------------------------------------------------------------------
diff --git a/net/nimble/host/include/host/ble_att.h b/net/nimble/host/include/host/ble_att.h
index 8c32830..f090c11 100644
--- a/net/nimble/host/include/host/ble_att.h
+++ b/net/nimble/host/include/host/ble_att.h
@@ -67,7 +67,8 @@
struct ble_att_svr_access_ctxt {
void *attr_data;
- int attr_len;
+ uint16_t data_len;
+ uint16_t offset;
};
#define HA_FLAG_PERM_READ (1 << 0)
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/f2de40ae/net/nimble/host/src/ble_att_svr.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_att_svr.c b/net/nimble/host/src/ble_att_svr.c
index 9e12022..ebd97de 100644
--- a/net/nimble/host/src/ble_att_svr.c
+++ b/net/nimble/host/src/ble_att_svr.c
@@ -940,7 +940,7 @@ ble_att_svr_fill_type_value(struct ble_hs_conn *conn,
rc = os_mbuf_memcmp(rxom,
BLE_ATT_FIND_TYPE_VALUE_REQ_BASE_SZ,
ctxt.attr_data,
- ctxt.attr_len);
+ ctxt.data_len);
if (rc == 0) {
match = 1;
}
@@ -1148,10 +1148,10 @@ ble_att_svr_tx_read_type_rsp(struct ble_hs_conn *conn,
goto done;
}
- if (arg.attr_len > ble_l2cap_chan_mtu(chan) - 4) {
+ if (arg.data_len > ble_l2cap_chan_mtu(chan) - 4) {
attr_len = ble_l2cap_chan_mtu(chan) - 4;
} else {
- attr_len = arg.attr_len;
+ attr_len = arg.data_len;
}
if (prev_attr_len == 0) {
@@ -1381,7 +1381,7 @@ ble_att_svr_rx_read(struct ble_hs_conn *conn, struct ble_l2cap_chan *chan,
}
rc = ble_att_svr_tx_read_rsp(conn, chan, arg.attr_data,
- arg.attr_len, &att_err);
+ arg.data_len, &att_err);
if (rc != 0) {
err_handle = req.barq_handle;
goto err;
@@ -1418,7 +1418,7 @@ ble_att_svr_service_uuid(struct ble_att_svr_entry *entry, uint16_t *uuid16,
return rc;
}
- switch (arg.attr_len) {
+ switch (arg.data_len) {
case 16:
*uuid16 = 0;
memcpy(uuid128, arg.attr_data, 16);
@@ -1785,8 +1785,8 @@ ble_att_svr_rx_write(struct ble_hs_conn *conn, struct ble_l2cap_chan *chan,
}
arg.attr_data = ble_att_svr_flat_buf;
- arg.attr_len = OS_MBUF_PKTLEN(*rxom);
- os_mbuf_copydata(*rxom, 0, arg.attr_len, arg.attr_data);
+ arg.data_len = OS_MBUF_PKTLEN(*rxom);
+ os_mbuf_copydata(*rxom, 0, arg.data_len, arg.attr_data);
rc = ble_att_svr_write(conn, entry, &arg, &att_err);
if (rc != 0) {
err_handle = req.bawq_handle;
@@ -1952,7 +1952,7 @@ ble_att_svr_prep_write(struct ble_hs_conn *conn, uint16_t *err_handle)
}
arg.attr_data = ble_att_svr_flat_buf;
- arg.attr_len = buf_off;
+ arg.data_len = buf_off;
rc = ble_att_svr_write(conn, attr, &arg, &att_err);
if (rc != 0) {
*err_handle = entry->bape_handle;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/f2de40ae/net/nimble/host/src/ble_gattc.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_gattc.c b/net/nimble/host/src/ble_gattc.c
index 67efef9..e7f89f8 100644
--- a/net/nimble/host/src/ble_gattc.c
+++ b/net/nimble/host/src/ble_gattc.c
@@ -1965,7 +1965,7 @@ ble_gattc_notify(struct ble_hs_conn *conn, uint16_t chr_val_handle)
}
req.banq_handle = chr_val_handle;
- rc = ble_att_clt_tx_notify(conn, &req, ctxt.attr_data, ctxt.attr_len);
+ rc = ble_att_clt_tx_notify(conn, &req, ctxt.attr_data, ctxt.data_len);
if (rc != 0) {
return rc;
}
@@ -2012,7 +2012,7 @@ ble_gattc_indicate_kick(struct ble_gattc_entry *entry)
goto err;
}
entry->indicate.attr.value = ctxt.attr_data;
- entry->indicate.attr.value_len = ctxt.attr_len;
+ entry->indicate.attr.value_len = ctxt.data_len;
req.baiq_handle = entry->indicate.attr.handle;
rc = ble_att_clt_tx_indicate(conn, &req, entry->indicate.attr.value,
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/f2de40ae/net/nimble/host/src/ble_gatts.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_gatts.c b/net/nimble/host/src/ble_gatts.c
index ca1effc..ce1a683 100644
--- a/net/nimble/host/src/ble_gatts.c
+++ b/net/nimble/host/src/ble_gatts.c
@@ -65,7 +65,7 @@ ble_gatts_svc_access(uint16_t conn_handle, uint16_t attr_handle,
svc = arg;
ctxt->attr_data = svc->uuid128;
- ctxt->attr_len = 16;
+ ctxt->data_len = 16;
return 0;
}
@@ -91,9 +91,9 @@ ble_gatts_inc_access(uint16_t conn_handle, uint16_t attr_handle,
uuid16 = ble_uuid_128_to_16(entry->svc->uuid128);
if (uuid16 != 0) {
htole16(buf + 4, uuid16);
- ctxt->attr_len = 6;
+ ctxt->data_len = 6;
} else {
- ctxt->attr_len = 4;
+ ctxt->data_len = 4;
}
ctxt->attr_data = buf;
@@ -158,10 +158,10 @@ ble_gatts_chr_def_access(uint16_t conn_handle, uint16_t attr_handle,
uuid16 = ble_uuid_128_to_16(chr->uuid128);
if (uuid16 != 0) {
htole16(buf + 3, uuid16);
- ctxt->attr_len = 5;
+ ctxt->data_len = 5;
} else {
memcpy(buf + 3, chr->uuid128, 16);
- ctxt->attr_len = 19;
+ ctxt->data_len = 19;
}
ctxt->attr_data = buf;
@@ -216,7 +216,7 @@ ble_gatts_chr_val_access(uint16_t conn_handle, uint16_t attr_handle,
gatt_op = ble_gatts_chr_op(att_op);
gatt_ctxt.chr_access.chr = chr;
gatt_ctxt.chr_access.data = att_ctxt->attr_data;
- gatt_ctxt.chr_access.len = att_ctxt->attr_len;
+ gatt_ctxt.chr_access.len = att_ctxt->data_len;
rc = chr->access_cb(conn_handle, attr_handle, gatt_op, &gatt_ctxt,
chr->arg);
@@ -225,7 +225,7 @@ ble_gatts_chr_val_access(uint16_t conn_handle, uint16_t attr_handle,
}
att_ctxt->attr_data = gatt_ctxt.chr_access.data;
- att_ctxt->attr_len = gatt_ctxt.chr_access.len;
+ att_ctxt->data_len = gatt_ctxt.chr_access.len;
return 0;
}
@@ -370,11 +370,11 @@ ble_gatts_clt_cfg_access(uint16_t conn_handle, uint16_t attr_handle,
case BLE_ATT_ACCESS_OP_READ:
htole16(buf, clt_cfg->flags & ~BLE_GATTS_CLT_CFG_F_RESERVED);
ctxt->attr_data = buf;
- ctxt->attr_len = sizeof buf;
+ ctxt->data_len = sizeof buf;
break;
case BLE_ATT_ACCESS_OP_WRITE:
- if (ctxt->attr_len != 2) {
+ if (ctxt->data_len != 2) {
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
}
@@ -426,7 +426,7 @@ ble_gatts_dsc_access(uint16_t conn_handle, uint16_t attr_handle,
gatt_op = ble_gatts_dsc_op(att_op);
gatt_ctxt.dsc_access.dsc = dsc;
gatt_ctxt.dsc_access.data = att_ctxt->attr_data;
- gatt_ctxt.dsc_access.len = att_ctxt->attr_len;
+ gatt_ctxt.dsc_access.len = att_ctxt->data_len;
rc = dsc->access_cb(conn_handle, attr_handle, gatt_op, &gatt_ctxt,
dsc->arg);
@@ -435,7 +435,7 @@ ble_gatts_dsc_access(uint16_t conn_handle, uint16_t attr_handle,
}
att_ctxt->attr_data = gatt_ctxt.dsc_access.data;
- att_ctxt->attr_len = gatt_ctxt.dsc_access.len;
+ att_ctxt->data_len = gatt_ctxt.dsc_access.len;
return 0;
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/f2de40ae/net/nimble/host/src/test/ble_att_svr_test.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/test/ble_att_svr_test.c b/net/nimble/host/src/test/ble_att_svr_test.c
index 6043b47..696d211 100644
--- a/net/nimble/host/src/test/ble_att_svr_test.c
+++ b/net/nimble/host/src/test/ble_att_svr_test.c
@@ -70,7 +70,7 @@ ble_att_svr_test_misc_attr_fn_r_1(uint16_t conn_handle, uint16_t attr_handle,
switch (op) {
case BLE_ATT_ACCESS_OP_READ:
ctxt->attr_data = ble_att_svr_test_attr_r_1;
- ctxt->attr_len = ble_att_svr_test_attr_r_1_len;
+ ctxt->data_len = ble_att_svr_test_attr_r_1_len;
return 0;
default:
@@ -87,7 +87,7 @@ ble_att_svr_test_misc_attr_fn_r_2(uint16_t conn_handle, uint16_t attr_handle,
switch (op) {
case BLE_ATT_ACCESS_OP_READ:
ctxt->attr_data = ble_att_svr_test_attr_r_2;
- ctxt->attr_len = ble_att_svr_test_attr_r_2_len;
+ ctxt->data_len = ble_att_svr_test_attr_r_2_len;
return 0;
default:
@@ -138,9 +138,9 @@ ble_att_svr_test_misc_attr_fn_r_group(uint16_t conn_handle,
ctxt->attr_data = vals + attr_handle;
if (memcmp(ctxt->attr_data + 2, zeros, 14) == 0) {
- ctxt->attr_len = 2;
+ ctxt->data_len = 2;
} else {
- ctxt->attr_len = 16;
+ ctxt->data_len = 16;
}
return 0;
@@ -234,8 +234,8 @@ ble_att_svr_test_misc_attr_fn_w_1(uint16_t conn_handle, uint16_t attr_handle,
{
switch (op) {
case BLE_ATT_ACCESS_OP_WRITE:
- memcpy(ble_att_svr_test_attr_w_1, ctxt->attr_data, ctxt->attr_len);
- ble_att_svr_test_attr_w_1_len = ctxt->attr_len;
+ memcpy(ble_att_svr_test_attr_w_1, ctxt->attr_data, ctxt->data_len);
+ ble_att_svr_test_attr_w_1_len = ctxt->data_len;
return 0;
default:
@@ -251,8 +251,8 @@ ble_att_svr_test_misc_attr_fn_w_2(uint16_t conn_handle, uint16_t attr_handle,
{
switch (op) {
case BLE_ATT_ACCESS_OP_WRITE:
- memcpy(ble_att_svr_test_attr_w_2, ctxt->attr_data, ctxt->attr_len);
- ble_att_svr_test_attr_w_2_len = ctxt->attr_len;
+ memcpy(ble_att_svr_test_attr_w_2, ctxt->attr_data, ctxt->data_len);
+ ble_att_svr_test_attr_w_2_len = ctxt->data_len;
return 0;
default: