diff options
| author | Joel Bodenmann <joel@unormal.org> | 2014-07-05 16:00:07 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2014-07-05 16:00:07 +0200 |
| commit | a675812b08fa9b86c841762441b4ed4060ff4aa0 (patch) | |
| tree | eb41a79d6f8ca0aa569fbb33e7f9badfef425636 | |
| parent | 2cc1dd96ea455f1f8e6d6b1e73ed19406eb629d2 (diff) | |
| parent | 7f9a894587ab881ff47b6dddb17e0f441a7cfa59 (diff) | |
| download | uGFX-a675812b08fa9b86c841762441b4ed4060ff4aa0.tar.gz uGFX-a675812b08fa9b86c841762441b4ed4060ff4aa0.tar.bz2 uGFX-a675812b08fa9b86c841762441b4ed4060ff4aa0.zip | |
Merge branch 'master' of bitbucket.org:Tectu/ugfx
| -rw-r--r-- | gfxconf.example.h | 5 | ||||
| -rw-r--r-- | src/gos/sys_options.h | 13 |
2 files changed, 17 insertions, 1 deletions
diff --git a/gfxconf.example.h b/gfxconf.example.h index 66411ec3..686f4473 100644 --- a/gfxconf.example.h +++ b/gfxconf.example.h @@ -26,13 +26,16 @@ /////////////////////////////////////////////////////////////////////////// // GOS - One of these must be defined, preferably in your Makefile // /////////////////////////////////////////////////////////////////////////// -//#define GFX_USE_OS_RAW32 FALSE //#define GFX_USE_OS_CHIBIOS FALSE //#define GFX_USE_OS_FREERTOS FALSE // #define GFX_FREERTOS_USE_TRACE FALSE //#define GFX_USE_OS_WIN32 FALSE //#define GFX_USE_OS_LINUX FALSE //#define GFX_USE_OS_OSX FALSE +//#define GFX_USE_OS_RAW32 FALSE +// #define GOS_RAW_HEAP_SIZE 0 +// #define INTERRUPTS_OFF() optional_code +// #define INTERRUPTS_ON() optional_code /////////////////////////////////////////////////////////////////////////// diff --git a/src/gos/sys_options.h b/src/gos/sys_options.h index cfbed057..c7376878 100644 --- a/src/gos/sys_options.h +++ b/src/gos/sys_options.h @@ -75,6 +75,19 @@ #ifndef GFX_FREERTOS_USE_TRACE #define GFX_FREERTOS_USE_TRACE FALSE #endif + /** + * @brief How much RAM should uGFX use for the heap + * @details Defaults to 0. Only valid with GFX_USE_OS_RAW32 + * @note If 0 then the standard C runtime malloc(), free() and realloc() + * are used. + * @note If it is non-zero then this is the number of bytes of RAM + * to use for the heap (gfxAlloc() and gfxFree()). No C + * runtime routines will be used and a new routine @p gfxAddHeapBlock() + * is added allowing the user to add extra memory blocks to the heap. + */ + #ifndef GOS_RAW_HEAP_SIZE + #define GOS_RAW_HEAP_SIZE 0 + #endif /** @} */ #endif /* _GOS_OPTIONS_H */ |