You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by an...@apache.org on 2017/04/10 11:47:21 UTC
[29/50] incubator-mynewt-core git commit: nimble/att: Use packed
struct for receiving Read Multiple Request
nimble/att: Use packed struct for receiving Read Multiple Request
Use packed structure to map it to received mbuf instead of using
dedicated parsing function. Modern compilers generate effective code
in such case anyway.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/d7da6aa8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/d7da6aa8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/d7da6aa8
Branch: refs/heads/master
Commit: d7da6aa8ceff9e18ffda5cc7eee2f407a19b6110
Parents: ac38eb7
Author: Szymon Janc <sz...@codecoup.pl>
Authored: Fri Mar 24 15:50:05 2017 +0100
Committer: Szymon Janc <sz...@codecoup.pl>
Committed: Mon Apr 10 11:31:32 2017 +0200
----------------------------------------------------------------------
net/nimble/host/src/ble_att_svr.c | 33 ++++++++-------------------------
1 file changed, 8 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d7da6aa8/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 65f3501..f3e4bec 100644
--- a/net/nimble/host/src/ble_att_svr.c
+++ b/net/nimble/host/src/ble_att_svr.c
@@ -1612,7 +1612,6 @@ ble_att_svr_build_read_mult_rsp(uint16_t conn_handle,
struct os_mbuf *txom;
uint16_t handle;
uint16_t mtu;
- uint8_t *dptr;
int rc;
mtu = ble_att_mtu(conn_handle);
@@ -1623,14 +1622,12 @@ ble_att_svr_build_read_mult_rsp(uint16_t conn_handle,
goto done;
}
- dptr = os_mbuf_extend(txom, BLE_ATT_READ_MULT_RSP_BASE_SZ);
- if (dptr == NULL) {
+ if (ble_att_cmd_prepare(BLE_ATT_OP_READ_MULT_RSP, 0, txom) == NULL) {
*att_err = BLE_ATT_ERR_INSUFFICIENT_RES;
*err_handle = 0;
rc = BLE_HS_ENOMEM;
goto done;
}
- ble_att_read_mult_rsp_write(dptr, BLE_ATT_READ_MULT_RSP_BASE_SZ);
/* Iterate through requested handles, reading the corresponding attribute
* for each. Stop when there are no more handles to process, or the
@@ -1679,6 +1676,11 @@ ble_att_svr_rx_read_mult(uint16_t conn_handle, struct os_mbuf **rxom)
uint8_t att_err;
int rc;
+ /* TODO move this to common part
+ * Strip L2CAP ATT header from the front of the mbuf.
+ */
+ os_mbuf_adj(*rxom, 1);
+
BLE_ATT_LOG_EMPTY_CMD(0, "read mult req", conn_handle);
/* Initialize some values in case of early error. */
@@ -1686,30 +1688,11 @@ ble_att_svr_rx_read_mult(uint16_t conn_handle, struct os_mbuf **rxom)
err_handle = 0;
att_err = 0;
- rc = ble_att_svr_pullup_req_base(rxom, BLE_ATT_READ_MULT_REQ_BASE_SZ,
- &att_err);
- if (rc != 0) {
- err_handle = 0;
- goto done;
- }
-
- ble_att_read_mult_req_parse((*rxom)->om_data, (*rxom)->om_len);
-
- /* Strip opcode from request. */
- os_mbuf_adj(*rxom, BLE_ATT_READ_MULT_REQ_BASE_SZ);
-
rc = ble_att_svr_build_read_mult_rsp(conn_handle, rxom, &txom, &att_err,
&err_handle);
- if (rc != 0) {
- goto done;
- }
- rc = 0;
-
-done:
- rc = ble_att_svr_tx_rsp(conn_handle, rc, txom, BLE_ATT_OP_READ_MULT_REQ,
- att_err, err_handle);
- return rc;
+ return ble_att_svr_tx_rsp(conn_handle, rc, txom, BLE_ATT_OP_READ_MULT_REQ,
+ att_err, err_handle);
}
static int