From 723aadcc877427b42715a70531d34e19fd894e0c Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Mon, 13 Jan 2020 21:00:48 +0100 Subject: [PATCH] pkg/nimble: bump version and remove obsolete patch --- pkg/nimble/Makefile | 2 +- .../patches/0001-xtimer_member_names.patch | 24 ------------------- 2 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 pkg/nimble/patches/0001-xtimer_member_names.patch diff --git a/pkg/nimble/Makefile b/pkg/nimble/Makefile index bcfc62cde45a..3b414c5a049a 100644 --- a/pkg/nimble/Makefile +++ b/pkg/nimble/Makefile @@ -1,6 +1,6 @@ PKG_NAME = nimble PKG_URL = https://github.com/apache/mynewt-nimble.git -PKG_VERSION = 946cfb7ff27fcf3adacebcd50c159b89d854fbf2 +PKG_VERSION = 37245d0c3f239c35c0c734a337c7b6301fcfd70b PKG_LICENSE = Apache-2.0 include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/nimble/patches/0001-xtimer_member_names.patch b/pkg/nimble/patches/0001-xtimer_member_names.patch deleted file mode 100644 index 9152a393d4f3..000000000000 --- a/pkg/nimble/patches/0001-xtimer_member_names.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 6b1223df6884bcfd00f4ecc8918b790baf041021 Mon Sep 17 00:00:00 2001 -From: Michel Rottleuthner -Date: Wed, 8 Jan 2020 19:50:48 +0100 -Subject: [PATCH] update xtimer_t member names - ---- - porting/npl/riot/include/nimble/nimble_npl_os.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/porting/npl/riot/include/nimble/nimble_npl_os.h b/porting/npl/riot/include/nimble/nimble_npl_os.h -index 67eb74e1..61c1ea8a 100644 ---- a/porting/npl/riot/include/nimble/nimble_npl_os.h -+++ b/porting/npl/riot/include/nimble/nimble_npl_os.h -@@ -209,7 +209,7 @@ ble_npl_callout_stop(struct ble_npl_callout *co) - static inline bool - ble_npl_callout_is_active(struct ble_npl_callout *c) - { -- return (c->timer.target || c->timer.long_target); -+ return (c->timer.offset || c->timer.long_offset); - } - - static inline ble_npl_time_t --- -2.24.1