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

Merge pull request #12043 from jcarrano/dont-use-tlsf

Browse Source 
pkg/ccn-lite: remove dependency on tlsf-malloc.
This commit is contained in:
Cenk Gündoğan 2019-08-21 15:38:54 +02:00 committed by GitHub
commit 83e092e585
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/ccn-lite-relay/main.c
View File

@ -20,7 +20,6 @@
#include <stdio.h> #include <stdio.h>
#include "tlsf-malloc.h"
#include "msg.h" #include "msg.h"
#include "shell.h" #include "shell.h"
#include "ccn-lite-riot.h" #include "ccn-lite-riot.h"
@ -31,13 +30,8 @@
#define MAIN_QUEUE_SIZE (8) #define MAIN_QUEUE_SIZE (8)
static msg_t _main_msg_queue[MAIN_QUEUE_SIZE]; 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) int main(void)
{ {
tlsf_add_global_pool(_tlsf_heap, sizeof(_tlsf_heap));
msg_init_queue(_main_msg_queue, MAIN_QUEUE_SIZE); msg_init_queue(_main_msg_queue, MAIN_QUEUE_SIZE);
puts("Basic CCN-Lite example"); puts("Basic CCN-Lite example");

1
pkg/ccn-lite/Makefile.dep
View File

@ -3,6 +3,5 @@ ifneq (,$(filter ccn-lite,$(USEPKG)))
USEMODULE += evtimer USEMODULE += evtimer
USEMODULE += random USEMODULE += random
USEMODULE += timex USEMODULE += timex
USEMODULE += tlsf-malloc
USEMODULE += posix_headers USEMODULE += posix_headers
endif endif