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

pkg/nimble: bump version and remove obsolete patch

Browse Source
This commit is contained in:
Hauke Petersen 2020-01-13 21:00:48 +01:00
parent 3e0043021b
commit 723aadcc87
2 changed files with 1 additions and 25 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_URL = https://github.com/apache/mynewt-nimble.git
PKG_VERSION = 946cfb7ff27fcf3adacebcd50c159b89d854fbf2
PKG_VERSION = 37245d0c3f239c35c0c734a337c7b6301fcfd70b
PKG_LICENSE = Apache-2.0
include $(RIOTBASE)/pkg/pkg.mk

24
pkg/nimble/patches/0001-xtimer_member_names.patch
View File

@ -1,24 +0,0 @@
From 6b1223df6884bcfd00f4ecc8918b790baf041021 Mon Sep 17 00:00:00 2001
From: Michel Rottleuthner <michel.rottleuthner@haw-hamburg.de>
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