riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12775 from haukepetersen/opt_nimble_vernov19andlldatalenfornetif

Browse Source 
pkg/nimble: ver bump + config  improvement
This commit is contained in:
Hauke Petersen 2019-12-17 09:32:43 +01:00 committed by GitHub
commit 5350b79a1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/nimble/Makefile
View File

@ -1,6 +1,6 @@
PKG_NAME = nimble PKG_NAME = nimble
PKG_URL = https://github.com/apache/mynewt-nimble.git PKG_URL = https://github.com/apache/mynewt-nimble.git
PKG_VERSION = fb7651b773734a075c47ff10210b92e6d55ef55b PKG_VERSION = 946cfb7ff27fcf3adacebcd50c159b89d854fbf2
PKG_LICENSE = Apache-2.0 PKG_LICENSE = Apache-2.0
TDIR = $(RIOTPKG)/$(PKG_NAME) TDIR = $(RIOTPKG)/$(PKG_NAME)

5
pkg/nimble/Makefile.include
View File

@ -90,6 +90,11 @@ ifneq (,$(filter nimble_netif,$(USEMODULE)))
# NimBLEs internal buffer need to hold one IPv6 MTU per connection # NimBLEs internal buffer need to hold one IPv6 MTU per connection
# for the internal MTU of 256 byte, we need 10 mbufs per connection... # for the internal MTU of 256 byte, we need 10 mbufs per connection...
CFLAGS += -DMYNEWT_VAL_MSYS_1_BLOCK_COUNT=35 CFLAGS += -DMYNEWT_VAL_MSYS_1_BLOCK_COUNT=35
# optimize the NimBLE controller for IP traffic
ifneq (,$(filter nimble_controller,$(USEMODULE)))
CFLAGS += -DMYNEWT_VAL_BLE_LL_CFG_FEAT_DATA_LEN_EXT=1
endif
endif endif
ifneq (,$(filter nimble_scanlist,$(USEMODULE))) ifneq (,$(filter nimble_scanlist,$(USEMODULE)))
INCLUDES += -I$(RIOTPKG)/nimble/scanlist/include INCLUDES += -I$(RIOTPKG)/nimble/scanlist/include

5
tests/nimble_l2cap/main.c
View File

@ -143,7 +143,10 @@ static void _filter_and_connect(struct ble_gap_disc_desc *disc)
int res; int res;
bluetil_ad_t ad; bluetil_ad_t ad;
bluetil_ad_init(&ad, disc->data,
/* we use the bluetil module read-only here, so its save to cast the AD
* buffer to non-const */
bluetil_ad_init(&ad, (uint8_t *)disc->data,
(size_t)disc->length_data, (size_t)disc->length_data); (size_t)disc->length_data, (size_t)disc->length_data);
res = bluetil_ad_find_and_cmp(&ad, BLE_GAP_AD_NAME, res = bluetil_ad_find_and_cmp(&ad, BLE_GAP_AD_NAME,
APP_NODENAME, (sizeof(APP_NODENAME) - 1)); APP_NODENAME, (sizeof(APP_NODENAME) - 1));