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:31 UTC
[39/50] incubator-mynewt-core git commit: nimble/att: Use endian.h
API for protocol data
nimble/att: Use endian.h API for protocol data
Don't use TOFROMLE16 API for protocol data. This API hide direction of
convertion making code hard to follow.
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/32db7782
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/32db7782
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/32db7782
Branch: refs/heads/master
Commit: 32db7782acd49b787d76d9afb05ea6092844f90b
Parents: d458bb8
Author: Szymon Janc <sz...@codecoup.pl>
Authored: Fri Mar 24 15:50:08 2017 +0100
Committer: Szymon Janc <sz...@codecoup.pl>
Committed: Mon Apr 10 11:31:33 2017 +0200
----------------------------------------------------------------------
net/nimble/host/src/ble_att_cmd.c | 251 ++++++++++++---------------------
1 file changed, 92 insertions(+), 159 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/32db7782/net/nimble/host/src/ble_att_cmd.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_att_cmd.c b/net/nimble/host/src/ble_att_cmd.c
index 9fb81d1..246c7ac 100644
--- a/net/nimble/host/src/ble_att_cmd.c
+++ b/net/nimble/host/src/ble_att_cmd.c
@@ -108,15 +108,6 @@ ble_att_init_write(uint8_t op, void *payload, int min_len, int actual_len)
return u8ptr + 1;
}
-static void
-ble_att_error_rsp_swap(struct ble_att_error_rsp *dst,
- const struct ble_att_error_rsp *src)
-{
- dst->baep_req_op = src->baep_req_op;
- dst->baep_handle = TOFROMLE16(src->baep_handle);
- dst->baep_error_code = src->baep_error_code;
-}
-
void
ble_att_error_rsp_parse(const void *payload, int len,
struct ble_att_error_rsp *dst)
@@ -125,7 +116,10 @@ ble_att_error_rsp_parse(const void *payload, int len,
src = ble_att_init_parse(BLE_ATT_OP_ERROR_RSP, payload,
BLE_ATT_ERROR_RSP_SZ, len);
- ble_att_error_rsp_swap(dst, src);
+
+ dst->baep_req_op = src->baep_req_op;
+ dst->baep_handle = le16toh(src->baep_handle);
+ dst->baep_error_code = src->baep_error_code;
}
void
@@ -136,7 +130,10 @@ ble_att_error_rsp_write(void *payload, int len,
dst = ble_att_init_write(BLE_ATT_OP_ERROR_RSP, payload,
BLE_ATT_ERROR_RSP_SZ, len);
- ble_att_error_rsp_swap(dst, src);
+
+ dst->baep_req_op = src->baep_req_op;
+ dst->baep_handle = htole16(src->baep_handle);
+ dst->baep_error_code = src->baep_error_code;
}
void
@@ -146,13 +143,6 @@ ble_att_error_rsp_log(const struct ble_att_error_rsp *cmd)
cmd->baep_req_op, cmd->baep_handle, cmd->baep_error_code);
}
-static void
-ble_att_mtu_cmd_swap(struct ble_att_mtu_cmd *dst,
- const struct ble_att_mtu_cmd *src)
-{
- dst->bamc_mtu = TOFROMLE16(src->bamc_mtu);
-}
-
void
ble_att_mtu_req_parse(const void *payload, int len,
struct ble_att_mtu_cmd *dst)
@@ -161,7 +151,8 @@ ble_att_mtu_req_parse(const void *payload, int len,
src = ble_att_init_parse(BLE_ATT_OP_MTU_REQ, payload, BLE_ATT_MTU_CMD_SZ,
len);
- ble_att_mtu_cmd_swap(dst, src);
+
+ dst->bamc_mtu = le16toh(src->bamc_mtu);
}
void
@@ -172,7 +163,8 @@ ble_att_mtu_rsp_parse(const void *payload, int len,
src = ble_att_init_parse(BLE_ATT_OP_MTU_RSP, payload, BLE_ATT_MTU_CMD_SZ,
len);
- ble_att_mtu_cmd_swap(dst, src);
+
+ dst->bamc_mtu = le16toh(src->bamc_mtu);
}
void
@@ -183,7 +175,8 @@ ble_att_mtu_req_write(void *payload, int len,
dst = ble_att_init_write(BLE_ATT_OP_MTU_REQ, payload,
BLE_ATT_MTU_CMD_SZ, len);
- ble_att_mtu_cmd_swap(dst, src);
+
+ dst->bamc_mtu = htole16(src->bamc_mtu);
}
void
@@ -194,7 +187,7 @@ ble_att_mtu_rsp_write(void *payload, int len,
dst = ble_att_init_write(BLE_ATT_OP_MTU_RSP, payload,
BLE_ATT_MTU_CMD_SZ, len);
- ble_att_mtu_cmd_swap(dst, src);
+ dst->bamc_mtu = htole16(src->bamc_mtu);
}
void
@@ -203,14 +196,6 @@ ble_att_mtu_cmd_log(const struct ble_att_mtu_cmd *cmd)
BLE_HS_LOG(DEBUG, "mtu=%d", cmd->bamc_mtu);
}
-static void
-ble_att_find_info_req_swap(struct ble_att_find_info_req *dst,
- const struct ble_att_find_info_req *src)
-{
- dst->bafq_start_handle = TOFROMLE16(src->bafq_start_handle);
- dst->bafq_end_handle = TOFROMLE16(src->bafq_end_handle);
-}
-
void
ble_att_find_info_req_parse(const void *payload, int len,
struct ble_att_find_info_req *dst)
@@ -219,7 +204,9 @@ ble_att_find_info_req_parse(const void *payload, int len,
src = ble_att_init_parse(BLE_ATT_OP_FIND_INFO_REQ, payload,
BLE_ATT_FIND_INFO_REQ_SZ, len);
- ble_att_find_info_req_swap(dst, src);
+
+ dst->bafq_start_handle = le16toh(src->bafq_start_handle);
+ dst->bafq_end_handle = le16toh(src->bafq_end_handle);
}
void
@@ -230,7 +217,9 @@ ble_att_find_info_req_write(void *payload, int len,
dst = ble_att_init_write(BLE_ATT_OP_FIND_INFO_REQ, payload,
BLE_ATT_FIND_INFO_REQ_SZ, len);
- ble_att_find_info_req_swap(dst, src);
+
+ dst->bafq_start_handle = htole16(src->bafq_start_handle);
+ dst->bafq_end_handle = htole16(src->bafq_end_handle);
}
void
@@ -240,13 +229,6 @@ ble_att_find_info_req_log(const struct ble_att_find_info_req *cmd)
cmd->bafq_start_handle, cmd->bafq_end_handle);
}
-static void
-ble_att_find_info_rsp_swap(struct ble_att_find_info_rsp *dst,
- const struct ble_att_find_info_rsp *src)
-{
- dst->bafp_format = src->bafp_format;
-}
-
void
ble_att_find_info_rsp_parse(const void *payload, int len,
struct ble_att_find_info_rsp *dst)
@@ -255,7 +237,8 @@ ble_att_find_info_rsp_parse(const void *payload, int len,
src = ble_att_init_parse(BLE_ATT_OP_FIND_INFO_RSP, payload,
BLE_ATT_FIND_INFO_RSP_BASE_SZ, len);
- ble_att_find_info_rsp_swap(dst, src);
+
+ dst->bafp_format = src->bafp_format;
}
void
@@ -266,7 +249,8 @@ ble_att_find_info_rsp_write(void *payload, int len,
dst = ble_att_init_write(BLE_ATT_OP_FIND_INFO_RSP, payload,
BLE_ATT_FIND_INFO_RSP_BASE_SZ, len);
- ble_att_find_info_rsp_swap(dst, src);
+
+ dst->bafp_format = src->bafp_format;
}
void
@@ -275,15 +259,6 @@ ble_att_find_info_rsp_log(const struct ble_att_find_info_rsp *cmd)
BLE_HS_LOG(DEBUG, "format=%d", cmd->bafp_format);
}
-static void
-ble_att_find_type_value_req_swap(struct ble_att_find_type_value_req *dst,
- const struct ble_att_find_type_value_req *src)
-{
- dst->bavq_start_handle = TOFROMLE16(src->bavq_start_handle);
- dst->bavq_end_handle = TOFROMLE16(src->bavq_end_handle);
- dst->bavq_attr_type = TOFROMLE16(src->bavq_attr_type);
-}
-
void
ble_att_find_type_value_req_parse(const void *payload, int len,
struct ble_att_find_type_value_req *dst)
@@ -292,7 +267,10 @@ ble_att_find_type_value_req_parse(const void *payload, int len,
src = ble_att_init_parse(BLE_ATT_OP_FIND_TYPE_VALUE_REQ, payload,
BLE_ATT_FIND_TYPE_VALUE_REQ_BASE_SZ, len);
- ble_att_find_type_value_req_swap(dst, src);
+
+ dst->bavq_start_handle = le16toh(src->bavq_start_handle);
+ dst->bavq_end_handle = le16toh(src->bavq_end_handle);
+ dst->bavq_attr_type = le16toh(src->bavq_attr_type);
}
void
@@ -303,7 +281,10 @@ ble_att_find_type_value_req_write(
dst = ble_att_init_write(BLE_ATT_OP_FIND_TYPE_VALUE_REQ, payload,
BLE_ATT_FIND_TYPE_VALUE_REQ_BASE_SZ, len);
- ble_att_find_type_value_req_swap(dst, src);
+
+ dst->bavq_start_handle = htole16(src->bavq_start_handle);
+ dst->bavq_end_handle = htole16(src->bavq_end_handle);
+ dst->bavq_attr_type = htole16(src->bavq_attr_type);
}
void
@@ -314,14 +295,6 @@ ble_att_find_type_value_req_log(const struct ble_att_find_type_value_req *cmd)
cmd->bavq_attr_type);
}
-static void
-ble_att_read_type_req_swap(struct ble_att_read_type_req *dst,
- const struct ble_att_read_type_req *src)
-{
- dst->batq_start_handle = TOFROMLE16(src->batq_start_handle);
- dst->batq_end_handle = TOFROMLE16(src->batq_end_handle);
-}
-
void
ble_att_read_type_req_parse(const void *payload, int len,
struct ble_att_read_type_req *dst)
@@ -330,7 +303,9 @@ ble_att_read_type_req_parse(const void *payload, int len,
src = ble_att_init_parse(BLE_ATT_OP_READ_TYPE_REQ, payload,
BLE_ATT_READ_TYPE_REQ_BASE_SZ, len);
- ble_att_read_type_req_swap(dst, src);
+
+ dst->batq_start_handle = le16toh(src->batq_start_handle);
+ dst->batq_end_handle = le16toh(src->batq_end_handle);
}
void
@@ -341,7 +316,9 @@ ble_att_read_type_req_write(void *payload, int len,
dst = ble_att_init_write(BLE_ATT_OP_READ_TYPE_REQ, payload,
BLE_ATT_READ_TYPE_REQ_BASE_SZ, len);
- ble_att_read_type_req_swap(dst, src);
+
+ dst->batq_start_handle = htole16(src->batq_start_handle);
+ dst->batq_end_handle = htole16(src->batq_end_handle);
}
void
@@ -351,13 +328,6 @@ ble_att_read_type_req_log(const struct ble_att_read_type_req *cmd)
cmd->batq_start_handle, cmd->batq_end_handle);
}
-static void
-ble_att_read_type_rsp_swap(struct ble_att_read_type_rsp *dst,
- const struct ble_att_read_type_rsp *src)
-{
- dst->batp_length = src->batp_length;
-}
-
void
ble_att_read_type_rsp_parse(const void *payload, int len,
struct ble_att_read_type_rsp *dst)
@@ -366,7 +336,8 @@ ble_att_read_type_rsp_parse(const void *payload, int len,
src = ble_att_init_parse(BLE_ATT_OP_READ_TYPE_RSP, payload,
BLE_ATT_READ_TYPE_RSP_BASE_SZ, len);
- ble_att_read_type_rsp_swap(dst, src);
+
+ dst->batp_length = src->batp_length;
}
void
@@ -377,7 +348,8 @@ ble_att_read_type_rsp_write(void *payload, int len,
dst = ble_att_init_write(BLE_ATT_OP_READ_TYPE_RSP, payload,
BLE_ATT_READ_TYPE_RSP_BASE_SZ, len);
- ble_att_read_type_rsp_swap(dst, src);
+
+ dst->batp_length = src->batp_length;
}
void
@@ -386,13 +358,6 @@ ble_att_read_type_rsp_log(const struct ble_att_read_type_rsp *cmd)
BLE_HS_LOG(DEBUG, "length=%d", cmd->batp_length);
}
-static void
-ble_att_read_req_swap(struct ble_att_read_req *dst,
- const struct ble_att_read_req *src)
-{
- dst->barq_handle = TOFROMLE16(src->barq_handle);
-}
-
void
ble_att_read_req_parse(const void *payload, int len,
struct ble_att_read_req *dst)
@@ -401,7 +366,8 @@ ble_att_read_req_parse(const void *payload, int len,
src = ble_att_init_parse(BLE_ATT_OP_READ_REQ, payload,
BLE_ATT_READ_REQ_SZ, len);
- ble_att_read_req_swap(dst, src);
+
+ dst->barq_handle = le16toh(src->barq_handle);
}
void
@@ -412,7 +378,8 @@ ble_att_read_req_write(void *payload, int len,
dst = ble_att_init_write(BLE_ATT_OP_READ_REQ, payload,
BLE_ATT_READ_REQ_SZ, len);
- ble_att_read_req_swap(dst, src);
+
+ dst->barq_handle = htole16(src->barq_handle);
}
void
@@ -421,14 +388,6 @@ ble_att_read_req_log(const struct ble_att_read_req *cmd)
BLE_HS_LOG(DEBUG, "handle=0x%04x", cmd->barq_handle);
}
-static void
-ble_att_read_blob_req_swap(struct ble_att_read_blob_req *dst,
- const struct ble_att_read_blob_req *src)
-{
- dst->babq_handle = TOFROMLE16(src->babq_handle);
- dst->babq_offset = TOFROMLE16(src->babq_offset);
-}
-
void
ble_att_read_blob_req_parse(const void *payload, int len,
struct ble_att_read_blob_req *dst)
@@ -437,7 +396,9 @@ ble_att_read_blob_req_parse(const void *payload, int len,
src = ble_att_init_parse(BLE_ATT_OP_READ_BLOB_REQ, payload,
BLE_ATT_READ_BLOB_REQ_SZ, len);
- ble_att_read_blob_req_swap(dst, src);
+
+ dst->babq_handle = le16toh(src->babq_handle);
+ dst->babq_offset = le16toh(src->babq_offset);
}
void
@@ -448,7 +409,9 @@ ble_att_read_blob_req_write(void *payload, int len,
dst = ble_att_init_write(BLE_ATT_OP_READ_BLOB_REQ, payload,
BLE_ATT_READ_BLOB_REQ_SZ, len);
- ble_att_read_blob_req_swap(dst, src);
+
+ dst->babq_handle = htole16(src->babq_handle);
+ dst->babq_offset = htole16(src->babq_offset);
}
void
@@ -486,14 +449,6 @@ ble_att_read_mult_rsp_write(void *payload, int len)
BLE_ATT_READ_MULT_RSP_BASE_SZ, len);
}
-static void
-ble_att_read_group_type_req_swap(struct ble_att_read_group_type_req *dst,
- const struct ble_att_read_group_type_req *src)
-{
- dst->bagq_start_handle = TOFROMLE16(src->bagq_start_handle);
- dst->bagq_end_handle = TOFROMLE16(src->bagq_end_handle);
-}
-
void
ble_att_read_group_type_req_parse(const void *payload, int len,
struct ble_att_read_group_type_req *dst)
@@ -502,7 +457,9 @@ ble_att_read_group_type_req_parse(const void *payload, int len,
src = ble_att_init_parse(BLE_ATT_OP_READ_GROUP_TYPE_REQ, payload,
BLE_ATT_READ_GROUP_TYPE_REQ_BASE_SZ, len);
- ble_att_read_group_type_req_swap(dst, src);
+
+ dst->bagq_start_handle = le16toh(src->bagq_start_handle);
+ dst->bagq_end_handle = le16toh(src->bagq_end_handle);
}
void
@@ -513,7 +470,9 @@ ble_att_read_group_type_req_write(
dst = ble_att_init_write(BLE_ATT_OP_READ_GROUP_TYPE_REQ, payload,
BLE_ATT_READ_GROUP_TYPE_REQ_BASE_SZ, len);
- ble_att_read_group_type_req_swap(dst, src);
+
+ dst->bagq_start_handle = htole16(src->bagq_start_handle);
+ dst->bagq_end_handle = htole16(src->bagq_end_handle);
}
void
@@ -523,13 +482,6 @@ ble_att_read_group_type_req_log(const struct ble_att_read_group_type_req *cmd)
cmd->bagq_start_handle, cmd->bagq_end_handle);
}
-static void
-ble_att_read_group_type_rsp_swap(struct ble_att_read_group_type_rsp *dst,
- const struct ble_att_read_group_type_rsp *src)
-{
- dst->bagp_length = src->bagp_length;
-}
-
void
ble_att_read_group_type_rsp_parse(const void *payload, int len,
struct ble_att_read_group_type_rsp *dst)
@@ -538,7 +490,8 @@ ble_att_read_group_type_rsp_parse(const void *payload, int len,
src = ble_att_init_parse(BLE_ATT_OP_READ_GROUP_TYPE_RSP, payload,
BLE_ATT_READ_GROUP_TYPE_RSP_BASE_SZ, len);
- ble_att_read_group_type_rsp_swap(dst, src);
+
+ dst->bagp_length = src->bagp_length;
}
void
@@ -549,7 +502,8 @@ ble_att_read_group_type_rsp_write(
dst = ble_att_init_write(BLE_ATT_OP_READ_GROUP_TYPE_RSP, payload,
BLE_ATT_READ_GROUP_TYPE_RSP_BASE_SZ, len);
- ble_att_read_group_type_rsp_swap(dst, src);
+
+ dst->bagp_length = src->bagp_length;
}
void
@@ -558,13 +512,6 @@ ble_att_read_group_type_rsp_log(const struct ble_att_read_group_type_rsp *cmd)
BLE_HS_LOG(DEBUG, "length=%d", cmd->bagp_length);
}
-static void
-ble_att_write_req_swap(struct ble_att_write_req *dst,
- const struct ble_att_write_req *src)
-{
- dst->bawq_handle = TOFROMLE16(src->bawq_handle);
-}
-
void
ble_att_write_req_parse(const void *payload, int len,
struct ble_att_write_req *dst)
@@ -573,7 +520,8 @@ ble_att_write_req_parse(const void *payload, int len,
src = ble_att_init_parse(BLE_ATT_OP_WRITE_REQ, payload,
BLE_ATT_WRITE_REQ_BASE_SZ, len);
- ble_att_write_req_swap(dst, src);
+
+ dst->bawq_handle = le16toh(src->bawq_handle);
}
void
@@ -584,7 +532,7 @@ ble_att_write_cmd_parse(const void *payload, int len,
src = ble_att_init_parse(BLE_ATT_OP_WRITE_CMD, payload,
BLE_ATT_WRITE_REQ_BASE_SZ, len);
- ble_att_write_req_swap(dst, src);
+ dst->bawq_handle = le16toh(src->bawq_handle);
}
void
@@ -595,7 +543,7 @@ ble_att_write_req_write(void *payload, int len,
dst = ble_att_init_write(BLE_ATT_OP_WRITE_REQ, payload,
BLE_ATT_WRITE_REQ_BASE_SZ, len);
- ble_att_write_req_swap(dst, src);
+ dst->bawq_handle = htole16(src->bawq_handle);
}
void
@@ -606,7 +554,7 @@ ble_att_write_cmd_write(void *payload, int len,
dst = ble_att_init_write(BLE_ATT_OP_WRITE_CMD, payload,
BLE_ATT_WRITE_REQ_BASE_SZ, len);
- ble_att_write_req_swap(dst, src);
+ dst->bawq_handle = htole16(src->bawq_handle);
}
void
@@ -621,14 +569,6 @@ ble_att_write_req_log(const struct ble_att_write_req *req)
BLE_HS_LOG(DEBUG, "handle=0x%04x", req->bawq_handle);
}
-static void
-ble_att_prep_write_cmd_swap(struct ble_att_prep_write_cmd *dst,
- const struct ble_att_prep_write_cmd *src)
-{
- dst->bapc_handle = TOFROMLE16(src->bapc_handle);
- dst->bapc_offset = TOFROMLE16(src->bapc_offset);
-}
-
void
ble_att_prep_write_req_parse(const void *payload, int len,
struct ble_att_prep_write_cmd *dst)
@@ -637,7 +577,9 @@ ble_att_prep_write_req_parse(const void *payload, int len,
src = ble_att_init_parse(BLE_ATT_OP_PREP_WRITE_REQ, payload,
BLE_ATT_PREP_WRITE_CMD_BASE_SZ, len);
- ble_att_prep_write_cmd_swap(dst, src);
+
+ dst->bapc_handle = le16toh(src->bapc_handle);
+ dst->bapc_offset = le16toh(src->bapc_offset);
}
void
@@ -648,7 +590,9 @@ ble_att_prep_write_req_write(void *payload, int len,
dst = ble_att_init_write(BLE_ATT_OP_PREP_WRITE_REQ, payload,
BLE_ATT_PREP_WRITE_CMD_BASE_SZ, len);
- ble_att_prep_write_cmd_swap(dst, src);
+
+ dst->bapc_handle = htole16(src->bapc_handle);
+ dst->bapc_offset = htole16(src->bapc_offset);
}
void
@@ -659,7 +603,9 @@ ble_att_prep_write_rsp_parse(const void *payload, int len,
src = ble_att_init_parse(BLE_ATT_OP_PREP_WRITE_RSP, payload,
BLE_ATT_PREP_WRITE_CMD_BASE_SZ, len);
- ble_att_prep_write_cmd_swap(dst, src);
+
+ dst->bapc_handle = le16toh(src->bapc_handle);
+ dst->bapc_offset = le16toh(src->bapc_offset);
}
void
@@ -670,7 +616,9 @@ ble_att_prep_write_rsp_write(void *payload, int len,
dst = ble_att_init_write(BLE_ATT_OP_PREP_WRITE_RSP, payload,
BLE_ATT_PREP_WRITE_CMD_BASE_SZ, len);
- ble_att_prep_write_cmd_swap(dst, src);
+
+ dst->bapc_handle = htole16(src->bapc_handle);
+ dst->bapc_offset = htole16(src->bapc_offset);
}
void
@@ -680,13 +628,6 @@ ble_att_prep_write_cmd_log(const struct ble_att_prep_write_cmd *cmd)
cmd->bapc_offset);
}
-static void
-ble_att_exec_write_req_swap(struct ble_att_exec_write_req *dst,
- const struct ble_att_exec_write_req *src)
-{
- dst->baeq_flags = src->baeq_flags;
-}
-
void
ble_att_exec_write_req_parse(const void *payload, int len,
struct ble_att_exec_write_req *dst)
@@ -695,7 +636,8 @@ ble_att_exec_write_req_parse(const void *payload, int len,
src = ble_att_init_parse(BLE_ATT_OP_EXEC_WRITE_REQ, payload,
BLE_ATT_EXEC_WRITE_REQ_SZ, len);
- ble_att_exec_write_req_swap(dst, src);
+
+ dst->baeq_flags = src->baeq_flags;
}
void
@@ -706,7 +648,8 @@ ble_att_exec_write_req_write(void *payload, int len,
dst = ble_att_init_write(BLE_ATT_OP_EXEC_WRITE_REQ, payload,
BLE_ATT_EXEC_WRITE_REQ_SZ, len);
- ble_att_exec_write_req_swap(dst, src);
+
+ dst->baeq_flags = src->baeq_flags;
}
void
@@ -729,13 +672,6 @@ ble_att_exec_write_rsp_write(void *payload, int len)
BLE_ATT_EXEC_WRITE_RSP_SZ, len);
}
-static void
-ble_att_notify_req_swap(struct ble_att_notify_req *dst,
- const struct ble_att_notify_req *src)
-{
- dst->banq_handle = TOFROMLE16(src->banq_handle);
-}
-
void
ble_att_notify_req_parse(const void *payload, int len,
struct ble_att_notify_req *dst)
@@ -744,7 +680,8 @@ ble_att_notify_req_parse(const void *payload, int len,
src = ble_att_init_parse(BLE_ATT_OP_NOTIFY_REQ, payload,
BLE_ATT_NOTIFY_REQ_BASE_SZ, len);
- ble_att_notify_req_swap(dst, src);
+
+ dst->banq_handle = le16toh(src->banq_handle);
}
void
@@ -755,7 +692,8 @@ ble_att_notify_req_write(void *payload, int len,
dst = ble_att_init_write(BLE_ATT_OP_NOTIFY_REQ, payload,
BLE_ATT_NOTIFY_REQ_BASE_SZ, len);
- ble_att_notify_req_swap(dst, src);
+
+ dst->banq_handle = htole16(src->banq_handle);
}
void
@@ -764,13 +702,6 @@ ble_att_notify_req_log(const struct ble_att_notify_req *cmd)
BLE_HS_LOG(DEBUG, "handle=0x%04x", cmd->banq_handle);
}
-static void
-ble_att_indicate_req_swap(struct ble_att_indicate_req *dst,
- const struct ble_att_indicate_req *src)
-{
- dst->baiq_handle = TOFROMLE16(src->baiq_handle);
-}
-
void
ble_att_indicate_req_parse(const void *payload, int len,
struct ble_att_indicate_req *dst)
@@ -779,7 +710,8 @@ ble_att_indicate_req_parse(const void *payload, int len,
src = ble_att_init_parse(BLE_ATT_OP_INDICATE_REQ, payload,
BLE_ATT_INDICATE_REQ_BASE_SZ, len);
- ble_att_indicate_req_swap(dst, src);
+
+ dst->baiq_handle = le16toh(src->baiq_handle);
}
void
@@ -790,7 +722,8 @@ ble_att_indicate_req_write(void *payload, int len,
dst = ble_att_init_write(BLE_ATT_OP_INDICATE_REQ, payload,
BLE_ATT_INDICATE_REQ_BASE_SZ, len);
- ble_att_indicate_req_swap(dst, src);
+
+ dst->baiq_handle = htole16(src->baiq_handle);
}
void