From 5dc46eb03e8446712af2d561a4a15144da060663 Mon Sep 17 00:00:00 2001 From: Juan Carrano Date: Tue, 20 Aug 2019 17:47:25 +0200 Subject: [PATCH] pkg/ccn-lite: remove dependency on tlsf-malloc. There is no reason why this package would need tlsf. Using tlsf as system malloc is not known to work in all platforms. With this patch CCN-Lite will use the default malloc provided by the target's C library. --- examples/ccn-lite-relay/main.c | 6 ------ pkg/ccn-lite/Makefile.dep | 1 - 2 files changed, 7 deletions(-) diff --git a/examples/ccn-lite-relay/main.c b/examples/ccn-lite-relay/main.c index a1f4eb11af..6338b439c0 100644 --- a/examples/ccn-lite-relay/main.c +++ b/examples/ccn-lite-relay/main.c @@ -20,7 +20,6 @@ #include -#include "tlsf-malloc.h" #include "msg.h" #include "shell.h" #include "ccn-lite-riot.h" @@ -31,13 +30,8 @@ #define MAIN_QUEUE_SIZE (8) static msg_t _main_msg_queue[MAIN_QUEUE_SIZE]; -/* 10kB buffer for the heap should be enough for everyone */ -#define TLSF_BUFFER (10240 / sizeof(uint32_t)) -static uint32_t _tlsf_heap[TLSF_BUFFER]; - int main(void) { - tlsf_add_global_pool(_tlsf_heap, sizeof(_tlsf_heap)); msg_init_queue(_main_msg_queue, MAIN_QUEUE_SIZE); puts("Basic CCN-Lite example"); diff --git a/pkg/ccn-lite/Makefile.dep b/pkg/ccn-lite/Makefile.dep index 5eac60c714..ed47a18454 100644 --- a/pkg/ccn-lite/Makefile.dep +++ b/pkg/ccn-lite/Makefile.dep @@ -3,6 +3,5 @@ ifneq (,$(filter ccn-lite,$(USEPKG))) USEMODULE += evtimer USEMODULE += random USEMODULE += timex - USEMODULE += tlsf-malloc USEMODULE += posix_headers endif