diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-04-02 13:05:59 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-04-02 13:05:59 +0000 |
| commit | e8f67437d0007a2a4cd5a05afbd525a1960c188c (patch) | |
| tree | f98aa8c362c1d8d3b5247a63c1cbaadbced2e6b8 /os/common/oslib/src | |
| parent | 4c9f1963a9d92af708dccb93a41f0cebcb43e796 (diff) | |
| download | ChibiOS-e8f67437d0007a2a4cd5a05afbd525a1960c188c.tar.gz ChibiOS-e8f67437d0007a2a4cd5a05afbd525a1960c188c.tar.bz2 ChibiOS-e8f67437d0007a2a4cd5a05afbd525a1960c188c.zip | |
Simulator updates, not complete.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9223 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/common/oslib/src')
| -rw-r--r-- | os/common/oslib/src/chmemcore.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/os/common/oslib/src/chmemcore.c b/os/common/oslib/src/chmemcore.c index af733f395..d72bf73bb 100644 --- a/os/common/oslib/src/chmemcore.c +++ b/os/common/oslib/src/chmemcore.c @@ -86,12 +86,11 @@ void _core_init(void) { endmem = (uint8_t *)MEM_ALIGN_PREV(__heap_end__, PORT_NATURAL_ALIGN);
/*lint restore*/
#else
- static stkalign_t buffer[MEM_ALIGN_NEXT(CH_CFG_MEMCORE_SIZE) /
- PORT_NATURAL_ALIGN];
+ static uint8_t default_heap[MEM_ALIGN_NEXT(CH_CFG_MEMCORE_SIZE,
+ PORT_NATURAL_ALIGN)];
- nextmem = (uint8_t *)&buffer[0];
- endmem = (uint8_t *)&buffer[MEM_ALIGN_NEXT(CH_CFG_MEMCORE_SIZE) /
- PORT_NATURAL_ALIGN];
+ nextmem = (uint8_t *)MEM_ALIGN_NEXT(default_heap, PORT_NATURAL_ALIGN);
+ endmem = (uint8_t *)MEM_ALIGN_PREV(default_heap, PORT_NATURAL_ALIGN);
#endif
}
|