diff options
| author | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2015-01-15 14:18:29 +0000 |
|---|---|---|
| committer | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2015-01-15 14:18:29 +0000 |
| commit | ae22534ef05f36be6d48e154048dcc6314fa52e2 (patch) | |
| tree | 851a77092bd18529aae07f58d9bd2868107189f0 /os/various/cpp_wrappers | |
| parent | ca2ae96ab5efaca4b160aa4657fd0017a785bfbe (diff) | |
| download | ChibiOS-ae22534ef05f36be6d48e154048dcc6314fa52e2.tar.gz ChibiOS-ae22534ef05f36be6d48e154048dcc6314fa52e2.tar.bz2 ChibiOS-ae22534ef05f36be6d48e154048dcc6314fa52e2.zip | |
CPP wrappers. Added compile time switch CH_CFG_USE_MEMCORE.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7625 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/various/cpp_wrappers')
| -rw-r--r-- | os/various/cpp_wrappers/ch.cpp | 2 | ||||
| -rw-r--r-- | os/various/cpp_wrappers/ch.hpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/os/various/cpp_wrappers/ch.cpp b/os/various/cpp_wrappers/ch.cpp index d566f579e..54cf74692 100644 --- a/os/various/cpp_wrappers/ch.cpp +++ b/os/various/cpp_wrappers/ch.cpp @@ -66,6 +66,7 @@ namespace chibios_rt { /*------------------------------------------------------------------------*
* chibios_rt::Core *
*------------------------------------------------------------------------*/
+#if CH_CFG_USE_MEMCORE
void *Core::alloc(size_t size) {
return chCoreAlloc(size);
@@ -80,6 +81,7 @@ namespace chibios_rt { return chCoreGetStatusX();
}
+#endif /* CH_CFG_USE_MEMCORE */
/*------------------------------------------------------------------------*
* chibios_rt::Timer *
diff --git a/os/various/cpp_wrappers/ch.hpp b/os/various/cpp_wrappers/ch.hpp index ab415c5d2..e50aa6df6 100644 --- a/os/various/cpp_wrappers/ch.hpp +++ b/os/various/cpp_wrappers/ch.hpp @@ -127,6 +127,7 @@ namespace chibios_rt { static bool isTimeWithin(systime_t start, systime_t end);
};
+#if CH_CFG_USE_MEMCORE || defined(__DOXYGEN__)
/*------------------------------------------------------------------------*
* chibios_rt::System *
*------------------------------------------------------------------------*/
@@ -173,6 +174,7 @@ namespace chibios_rt { */
static size_t getStatus(void);
};
+#endif /* CH_CFG_USE_MEMCORE */
/*------------------------------------------------------------------------*
* chibios_rt::Timer *
|