From 157e80bb9dd6959a83a8f844318b42b0dc8b7beb Mon Sep 17 00:00:00 2001 From: patacongo Date: Tue, 28 Feb 2012 23:38:59 +0000 Subject: [PATCH] Add logic to NSH startup to call C++ static initializers on startup git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4439 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- apps/ChangeLog.txt | 2 ++ apps/examples/nsh/nsh_main.c | 8 ++++++++ nuttx/include/nuttx/arch.h | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index 8c4fdd4df9..8317f25326 100755 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -198,3 +198,5 @@ keyboard mappings of the Backspace key. Submitted by Mike Smith. * apps/examples/cdcacm: An example that illustrates how the CDC/ACM driver may to connected and disconnected through software control. + * apps/examples/nsh/nsh_main.c: If available, call up_cxxinitialize() to + initialize all statically defined C++ classes. diff --git a/apps/examples/nsh/nsh_main.c b/apps/examples/nsh/nsh_main.c index 5d302e3971..1d1592b4d1 100644 --- a/apps/examples/nsh/nsh_main.c +++ b/apps/examples/nsh/nsh_main.c @@ -45,6 +45,8 @@ #include #include +#include + #include /**************************************************************************** @@ -84,6 +86,12 @@ int user_start(int argc, char *argv[]) int exitval = 0; int ret; + /* Call all C++ static constructors */ + +#if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE) + up_cxxinitialize(); +#endif + /* Initialize the NSH library */ nsh_initialize(); diff --git a/nuttx/include/nuttx/arch.h b/nuttx/include/nuttx/arch.h index 18b5e91120..bf6be1ce08 100644 --- a/nuttx/include/nuttx/arch.h +++ b/nuttx/include/nuttx/arch.h @@ -511,7 +511,7 @@ EXTERN void up_udelay(useconds_t microseconds); * This function should then be called in the application-specific * user_start logic in order to perform the C++ initialization. NOTE * that no component of the core NuttX RTOS logic is involved; This - * function defintion only provides the 'contract' between application + * function definition only provides the 'contract' between application * specific C++ code and platform-specific toolchain support * ***************************************************************************/