feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #114 from lchristina26/master

Browse Source 
updates to FREERTOS settings
This commit is contained in:
toddouska
2015-08-03 10:59:36 -07:00
parent 6c02a9acb7 f8feb339fc
commit b330bca4b7
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wolfssl/wolfcrypt/settings.h
View File

@@ -307,6 +307,10 @@
#ifdef FREERTOS #ifdef FREERTOS
#include "FreeRTOS.h"
/* FreeRTOS pvPortRealloc() only in AVR32_UC3 port */
#define XMALLOC(s, h, type) pvPortMalloc((s))
#define XFREE(p, h, type) vPortFree((p))
#ifndef NO_WRITEV #ifndef NO_WRITEV
#define NO_WRITEV #define NO_WRITEV
#endif #endif
@@ -328,7 +332,6 @@
#endif #endif
#ifndef SINGLE_THREADED #ifndef SINGLE_THREADED
#include "FreeRTOS.h"
#include "semphr.h" #include "semphr.h"
#endif #endif
#endif #endif

5
wolfssl/wolfcrypt/types.h
View File

@@ -143,6 +143,9 @@
#ifdef HAVE_THREAD_LS #ifdef HAVE_THREAD_LS
#if defined(_MSC_VER) #if defined(_MSC_VER)
#define THREAD_LS_T __declspec(thread) #define THREAD_LS_T __declspec(thread)
/* Thread local storage only in FreeRTOS v8.2.1 and higher */
#elif defined(FREERTOS)
#define THREAD_LS_T
#else #else
#define THREAD_LS_T __thread #define THREAD_LS_T __thread
#endif #endif
@@ -176,7 +179,7 @@
#define XREALLOC(p, n, h, t) realloc((p), (n)) #define XREALLOC(p, n, h, t) realloc((p), (n))
#elif !defined(MICRIUM_MALLOC) && !defined(EBSNET) \ #elif !defined(MICRIUM_MALLOC) && !defined(EBSNET) \
&& !defined(WOLFSSL_SAFERTOS) && !defined(FREESCALE_MQX) \ && !defined(WOLFSSL_SAFERTOS) && !defined(FREESCALE_MQX) \
&& !defined(WOLFSSL_LEANPSK) && !defined(WOLFSSL_LEANPSK) && !defined(FREERTOS)
/* default C runtime, can install different routines at runtime via cbs */ /* default C runtime, can install different routines at runtime via cbs */
#include <wolfssl/wolfcrypt/memory.h> #include <wolfssl/wolfcrypt/memory.h>
#define XMALLOC(s, h, t) ((void)h, (void)t, wolfSSL_Malloc((s))) #define XMALLOC(s, h, t) ((void)h, (void)t, wolfSSL_Malloc((s)))