OrgZephyr/zephyr
OrgZephyr
/
zephyr
mirror of https://github.com/zephyrproject-rtos/zephyr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Bluetooth: tester: Refactor gatt_buf_add and gatt_buf_reserve functions 

This removes a bit of redundant code.
gatt_buf_reserve can call gatt_buf_add with data set to NULL, to
reserve space on gatt_buf.

Change-Id: I533a515bbd022a07ba8e2bfb3cd07e1a9ff8878b
Signed-off-by: Mariusz Skamra <mariusz.skamra@tieto.com>
This commit is contained in:
Mariusz Skamra 2016-02-19 09:25:05 +01:00 committed by Johan Hedberg
parent 9d862b2a61
commit e561f7c021
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tests/bluetooth/tester/src/gatt.c
View File

@ -51,15 +51,20 @@ static struct {
uint8_t buf[MAX_BUFFER_SIZE];
} gatt_buf;
static void *gatt_buf_reserve(size_t len)
static void *gatt_buf_add(const void *data, size_t len)
{
void *ptr;
void *ptr = gatt_buf.buf + gatt_buf.len;
if ((len + gatt_buf.len) > ARRAY_SIZE(gatt_buf.buf)) {
if ((len + gatt_buf.len) > MAX_BUFFER_SIZE) {
return NULL;
}
ptr = memset(gatt_buf.buf + gatt_buf.len, 0, len);
if (data) {
memcpy(ptr, data, len);
} else {
memset(ptr, 0, len);
}
gatt_buf.len += len;
BTTESTER_DBG("%d/%d used", gatt_buf.len, MAX_BUFFER_SIZE);
@ -67,20 +72,9 @@ static void *gatt_buf_reserve(size_t len)
return ptr;
}
static void *gatt_buf_add(const void *data, size_t len)
static void *gatt_buf_reserve(size_t len)
{
void *ptr;
if ((len + gatt_buf.len) > ARRAY_SIZE(gatt_buf.buf)) {
return NULL;
}
ptr = memcpy(gatt_buf.buf + gatt_buf.len, data, len);
gatt_buf.len += len;
BTTESTER_DBG("%d/%d used", gatt_buf.len, MAX_BUFFER_SIZE);
return ptr;
return gatt_buf_add(NULL, len);
}
static void gatt_buf_clear(void)