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/04/12 08:18:11 UTC
incubator-mynewt-core git commit: Finish half-completed transition to
packed structs
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop bfcc17d5b -> 84621ed15
Finish half-completed transition to packed structs
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/84621ed1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/84621ed1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/84621ed1
Branch: refs/heads/develop
Commit: 84621ed150b7ad973f5c18e121842853d461090f
Parents: bfcc17d
Author: Christopher Collins <cc...@apache.org>
Authored: Mon Apr 11 23:17:42 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Mon Apr 11 23:17:42 2016 -0700
----------------------------------------------------------------------
net/nimble/host/src/ble_att_cmd.c | 20 ++++++++++----------
net/nimble/host/src/ble_att_cmd.h | 28 ++++++++++++++--------------
2 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/84621ed1/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 ff4c19e..9fa6b21 100644
--- a/net/nimble/host/src/ble_att_cmd.c
+++ b/net/nimble/host/src/ble_att_cmd.c
@@ -98,7 +98,7 @@ ble_att_error_rsp_write(void *payload, int len, struct ble_att_error_rsp *src)
static void
ble_att_mtu_cmd_swap(struct ble_att_mtu_cmd *dst, struct ble_att_mtu_cmd *src)
{
- dst->bamc_mtu = src->bamc_mtu;
+ dst->bamc_mtu = TOFROMLE16(src->bamc_mtu);
}
void
@@ -310,8 +310,8 @@ static void
ble_att_read_blob_req_swap(struct ble_att_read_blob_req *dst,
struct ble_att_read_blob_req *src)
{
- dst->babq_handle = src->babq_handle;
- dst->babq_offset = src->babq_offset;
+ dst->babq_handle = TOFROMLE16(src->babq_handle);
+ dst->babq_offset = TOFROMLE16(src->babq_offset);
}
void
@@ -368,8 +368,8 @@ static void
ble_att_read_group_type_req_swap(struct ble_att_read_group_type_req *dst,
struct ble_att_read_group_type_req *src)
{
- dst->bagq_start_handle = src->bagq_start_handle;
- dst->bagq_end_handle = src->bagq_end_handle;
+ dst->bagq_start_handle = TOFROMLE16(src->bagq_start_handle);
+ dst->bagq_end_handle = TOFROMLE16(src->bagq_end_handle);
}
void
@@ -427,7 +427,7 @@ static void
ble_att_write_req_swap(struct ble_att_write_req *dst,
struct ble_att_write_req *src)
{
- dst->bawq_handle = src->bawq_handle;
+ dst->bawq_handle = TOFROMLE16(src->bawq_handle);
}
void
@@ -474,8 +474,8 @@ static void
ble_att_prep_write_cmd_swap(struct ble_att_prep_write_cmd *dst,
struct ble_att_prep_write_cmd *src)
{
- dst->bapc_handle = src->bapc_handle;
- dst->bapc_offset = src->bapc_offset;
+ dst->bapc_handle = TOFROMLE16(src->bapc_handle);
+ dst->bapc_offset = TOFROMLE16(src->bapc_offset);
}
void
@@ -569,7 +569,7 @@ static void
ble_att_notify_req_swap(struct ble_att_notify_req *dst,
struct ble_att_notify_req *src)
{
- dst->banq_handle = src->banq_handle;
+ dst->banq_handle = TOFROMLE16(src->banq_handle);
}
void
@@ -598,7 +598,7 @@ static void
ble_att_indicate_req_swap(struct ble_att_indicate_req *dst,
struct ble_att_indicate_req *src)
{
- dst->baiq_handle = src->baiq_handle;
+ dst->baiq_handle = TOFROMLE16(src->baiq_handle);
}
void
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/84621ed1/net/nimble/host/src/ble_att_cmd.h
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_att_cmd.h b/net/nimble/host/src/ble_att_cmd.h
index e3b0444..0dd8f0c 100644
--- a/net/nimble/host/src/ble_att_cmd.h
+++ b/net/nimble/host/src/ble_att_cmd.h
@@ -60,7 +60,7 @@ struct ble_att_mtu_cmd {
struct ble_att_find_info_req {
uint16_t bafq_start_handle;
uint16_t bafq_end_handle;
-};
+} __attribute__((packed));
/**
* | Parameter | Size (octets) |
@@ -73,7 +73,7 @@ struct ble_att_find_info_req {
struct ble_att_find_info_rsp {
uint8_t bafp_format;
/* Followed by information data. */
-};
+} __attribute__((packed));
#define BLE_ATT_FIND_INFO_RSP_FORMAT_16BIT 1
#define BLE_ATT_FIND_INFO_RSP_FORMAT_128BIT 2
@@ -95,7 +95,7 @@ struct ble_att_find_type_value_req {
uint16_t bavq_start_handle;
uint16_t bavq_end_handle;
uint16_t bavq_attr_type;
-};
+} __attribute__((packed));
/**
* | Parameter | Size (octets) |
@@ -120,7 +120,7 @@ struct ble_att_find_type_value_req {
struct ble_att_read_type_req {
uint16_t batq_start_handle;
uint16_t batq_end_handle;
-};
+} __attribute__((packed));
/**
* | Parameter | Size (octets) |
@@ -132,7 +132,7 @@ struct ble_att_read_type_req {
#define BLE_ATT_READ_TYPE_RSP_BASE_SZ 2
struct ble_att_read_type_rsp {
uint8_t batp_length;
-};
+} __attribute__((packed));
#define BLE_ATT_READ_TYPE_ADATA_BASE_SZ 2
@@ -145,7 +145,7 @@ struct ble_att_read_type_rsp {
#define BLE_ATT_READ_REQ_SZ 3
struct ble_att_read_req {
uint16_t barq_handle;
-};
+} __attribute__((packed));
/**
* | Parameter | Size (octets) |
@@ -166,7 +166,7 @@ struct ble_att_read_req {
struct ble_att_read_blob_req {
uint16_t babq_handle;
uint16_t babq_offset;
-};
+} __attribute__((packed));
/**
* | Parameter | Size (octets) |
@@ -206,7 +206,7 @@ struct ble_att_read_blob_req {
struct ble_att_read_group_type_req {
uint16_t bagq_start_handle;
uint16_t bagq_end_handle;
-};
+} __attribute__((packed));
/**
* | Parameter | Size (octets) |
@@ -218,7 +218,7 @@ struct ble_att_read_group_type_req {
#define BLE_ATT_READ_GROUP_TYPE_RSP_BASE_SZ 2
struct ble_att_read_group_type_rsp {
uint8_t bagp_length;
-};
+} __attribute__((packed));
#define BLE_ATT_READ_GROUP_TYPE_ADATA_BASE_SZ 4
#define BLE_ATT_READ_GROUP_TYPE_ADATA_SZ_16 6
@@ -234,7 +234,7 @@ struct ble_att_read_group_type_rsp {
#define BLE_ATT_WRITE_REQ_BASE_SZ 3
struct ble_att_write_req {
uint16_t bawq_handle;
-};
+} __attribute__((packed));
#define BLE_ATT_WRITE_RSP_SZ 1
@@ -250,7 +250,7 @@ struct ble_att_write_req {
struct ble_att_prep_write_cmd {
uint16_t bapc_handle;
uint16_t bapc_offset;
-};
+} __attribute__((packed));
/**
* | Parameter | Size (octets) |
@@ -261,7 +261,7 @@ struct ble_att_prep_write_cmd {
#define BLE_ATT_EXEC_WRITE_REQ_SZ 2
struct ble_att_exec_write_req {
uint8_t baeq_flags;
-};
+} __attribute__((packed));
#define BLE_ATT_EXEC_WRITE_F_CONFIRM 0x01
#define BLE_ATT_EXEC_WRITE_F_RESERVED 0xfe
@@ -283,7 +283,7 @@ struct ble_att_exec_write_req {
#define BLE_ATT_NOTIFY_REQ_BASE_SZ 3
struct ble_att_notify_req {
uint16_t banq_handle;
-};
+} __attribute__((packed));
/**
* | Parameter | Size (octets) |
@@ -295,7 +295,7 @@ struct ble_att_notify_req {
#define BLE_ATT_INDICATE_REQ_BASE_SZ 3
struct ble_att_indicate_req {
uint16_t baiq_handle;
-};
+} __attribute__((packed));
/**
* | Parameter | Size (octets) |