michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: GATT: Fix taking address of packed member of struct sc_data.

Browse source 
Fix GCC9 warning "warning: taking address of packed member of
'struct sc_data' may result in an unaligned pointer value"
Issue is that the on-air structure of sc_data was re-used for the gatt
service changed data.

Added build assert because data is stored in settings, so the structure
should be the same size to be compatible.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2019-11-14 16:47:21 +01:00 • committed by Carles Cufí
commit ea7a1859af
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
subsys/bluetooth/host/gatt.c
View file

@ -191,11 +191,15 @@ struct sc_data {
struct gatt_sc_cfg {
u8_t id;
bt_addr_le_t peer;
struct sc_data data;
struct {
u16_t start;
u16_t end;
} data;
};
#define SC_CFG_MAX (CONFIG_BT_MAX_PAIRED + CONFIG_BT_MAX_CONN)
static struct gatt_sc_cfg sc_cfg[SC_CFG_MAX];
BUILD_ASSERT(sizeof(struct sc_data) == sizeof(sc_cfg[0].data));
static struct gatt_sc_cfg *find_sc_cfg(u8_t id, bt_addr_le_t *addr)
{