Resync new repository with old repo r5166

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5155 42af7a65-404d-4744-a932-0658087f49c3

19 files changed, 44 insertions, 22 deletions

diff --git a/NxWidgets/UnitTests/CButton/cbutton_main.cxx b/NxWidgets/UnitTests/CButton/cbutton_main.cxx
index 973a2cd8a..9418fb0f6 100644
--- a/NxWidgets/UnitTests/CButton/cbutton_main.cxx
+++ b/NxWidgets/UnitTests/CButton/cbutton_main.cxx
@@ -75,7 +75,7 @@ extern "C" int cbutton_main(int argc, char *argv[]);
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
-// user_start/nxheaders_main
+// nxheaders_main
 /////////////////////////////////////////////////////////////////////////////
 
 int cbutton_main(int argc, char *argv[])
diff --git a/NxWidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx b/NxWidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx
index c247d73e5..824ae22c4 100644
--- a/NxWidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx
+++ b/NxWidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx
@@ -193,7 +193,7 @@ static void checkHighlighting(CButtonArray *buttonArray)
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
-// user_start/nxheaders_main
+// nxheaders_main
 /////////////////////////////////////////////////////////////////////////////
 
 int cbuttonarray_main(int argc, char *argv[])
diff --git a/NxWidgets/UnitTests/CCheckBox/ccheckbox_main.cxx b/NxWidgets/UnitTests/CCheckBox/ccheckbox_main.cxx
index 949cbc35f..e2c4bc148 100644
--- a/NxWidgets/UnitTests/CCheckBox/ccheckbox_main.cxx
+++ b/NxWidgets/UnitTests/CCheckBox/ccheckbox_main.cxx
@@ -132,7 +132,7 @@ static void initMemoryUsage(void)
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
-// Name: user_start/nxheaders_main
+// Name: nxheaders_main
 /////////////////////////////////////////////////////////////////////////////
 
 int ccheckbox_main(int argc, char *argv[])
diff --git a/NxWidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx b/NxWidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx
index 95e255dcc..9cf8a73f5 100644
--- a/NxWidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx
+++ b/NxWidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx
@@ -131,7 +131,7 @@ static void initMemoryUsage(void)
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
-// user_start/nxheaders_main
+// nxheaders_main
 /////////////////////////////////////////////////////////////////////////////
 
 int cglyphbutton_main(int argc, char *argv[])
diff --git a/NxWidgets/UnitTests/CImage/cimage_main.cxx b/NxWidgets/UnitTests/CImage/cimage_main.cxx
index 30cf49d3e..bca730202 100644
--- a/NxWidgets/UnitTests/CImage/cimage_main.cxx
+++ b/NxWidgets/UnitTests/CImage/cimage_main.cxx
@@ -146,7 +146,7 @@ static void initMemoryUsage(void)
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
-// Name: user_start/nxheaders_main
+// Name: nxheaders_main
 /////////////////////////////////////////////////////////////////////////////
 
 int cimage_main(int argc, char *argv[])
diff --git a/NxWidgets/UnitTests/CKeypad/ckeypad_main.cxx b/NxWidgets/UnitTests/CKeypad/ckeypad_main.cxx
index 896ef5013..0b246683a 100644
--- a/NxWidgets/UnitTests/CKeypad/ckeypad_main.cxx
+++ b/NxWidgets/UnitTests/CKeypad/ckeypad_main.cxx
@@ -189,7 +189,7 @@ static void clickButtons(CKeypadTest *test, CKeypad *keypad)
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
-// user_start/nxheaders_main
+// nxheaders_main
 /////////////////////////////////////////////////////////////////////////////
 
 int ckeypad_main(int argc, char *argv[])
diff --git a/NxWidgets/UnitTests/CLabel/clabel_main.cxx b/NxWidgets/UnitTests/CLabel/clabel_main.cxx
index 2b800dcab..e80b24476 100644
--- a/NxWidgets/UnitTests/CLabel/clabel_main.cxx
+++ b/NxWidgets/UnitTests/CLabel/clabel_main.cxx
@@ -75,7 +75,7 @@ extern "C" int clabel_main(int argc, char *argv[]);
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
-// user_start/nxheaders_main
+// nxheaders_main
 /////////////////////////////////////////////////////////////////////////////
 
 int clabel_main(int argc, char *argv[])
diff --git a/NxWidgets/UnitTests/CLatchButton/clatchbutton_main.cxx b/NxWidgets/UnitTests/CLatchButton/clatchbutton_main.cxx
index 13ed0613e..c8f8424d6 100644
--- a/NxWidgets/UnitTests/CLatchButton/clatchbutton_main.cxx
+++ b/NxWidgets/UnitTests/CLatchButton/clatchbutton_main.cxx
@@ -103,7 +103,7 @@ static void showButtonState(CLatchButton *button, bool &clicked, bool &latched)
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
-// user_start/nxheaders_main
+// nxheaders_main
 /////////////////////////////////////////////////////////////////////////////
 
 int clatchbutton_main(int argc, char *argv[])
diff --git a/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx b/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx
index ad7646560..7ffb9cadc 100644
--- a/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx
+++ b/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx
@@ -171,7 +171,7 @@ static void initMemoryUsage(void)
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
-// user_start/nxheaders_main
+// nxheaders_main
 /////////////////////////////////////////////////////////////////////////////
 
 int clatchbuttonarray_main(int argc, char *argv[])
diff --git a/NxWidgets/UnitTests/CListBox/clistbox_main.cxx b/NxWidgets/UnitTests/CListBox/clistbox_main.cxx
index 8711f06e8..e97bb8b50 100644
--- a/NxWidgets/UnitTests/CListBox/clistbox_main.cxx
+++ b/NxWidgets/UnitTests/CListBox/clistbox_main.cxx
@@ -171,7 +171,7 @@ static void initMemoryUsage(void)
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
-// Name: user_start/nxheaders_main
+// Name: nxheaders_main
 /////////////////////////////////////////////////////////////////////////////
 
 int clistbox_main(int argc, char *argv[])
diff --git a/NxWidgets/UnitTests/CProgressBar/cprogressbar_main.cxx b/NxWidgets/UnitTests/CProgressBar/cprogressbar_main.cxx
index cb5fa130e..4343d887c 100644
--- a/NxWidgets/UnitTests/CProgressBar/cprogressbar_main.cxx
+++ b/NxWidgets/UnitTests/CProgressBar/cprogressbar_main.cxx
@@ -132,7 +132,7 @@ static void initMemoryUsage(void)
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
-// Name: user_start/nxheaders_main
+// Name: nxheaders_main
 /////////////////////////////////////////////////////////////////////////////
 
 int cprogressbar_main(int argc, char *argv[])
diff --git a/NxWidgets/UnitTests/CRadioButton/cradiobutton_main.cxx b/NxWidgets/UnitTests/CRadioButton/cradiobutton_main.cxx
index 0ec1ca196..f2dc30844 100644
--- a/NxWidgets/UnitTests/CRadioButton/cradiobutton_main.cxx
+++ b/NxWidgets/UnitTests/CRadioButton/cradiobutton_main.cxx
@@ -132,7 +132,7 @@ static void initMemoryUsage(void)
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
-// Name: user_start/nxheaders_main
+// Name: nxheaders_main
 /////////////////////////////////////////////////////////////////////////////
 
 int cradiobutton_main(int argc, char *argv[])
diff --git a/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx b/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
index 2b9adab11..f9c322299 100644
--- a/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
+++ b/NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
@@ -132,7 +132,7 @@ static void initMemoryUsage(void)
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
-// Name: user_start/nxheaders_main
+// Name: nxheaders_main
 /////////////////////////////////////////////////////////////////////////////
 
 int cscrollbarhorizontal_main(int argc, char *argv[])
diff --git a/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx b/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx
index 26dc70dbd..2bcb3f0d1 100644
--- a/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx
+++ b/NxWidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx
@@ -132,7 +132,7 @@ static void initMemoryUsage(void)
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
-// Name: user_start/nxheaders_main
+// Name: nxheaders_main
 /////////////////////////////////////////////////////////////////////////////
 
 int cscrollbarvertical_main(int argc, char *argv[])
diff --git a/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx b/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx
index a336ba94a..fc57ab98c 100644
--- a/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx
+++ b/NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx
@@ -132,7 +132,7 @@ static void initMemoryUsage(void)
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
-// Name: user_start/nxheaders_main
+// Name: nxheaders_main
 /////////////////////////////////////////////////////////////////////////////
 
 int csliderhorizontal_main(int argc, char *argv[])
diff --git a/NxWidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx b/NxWidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx
index df356718b..cc106cbf0 100644
--- a/NxWidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx
+++ b/NxWidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx
@@ -132,7 +132,7 @@ static void initMemoryUsage(void)
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
-// Name: user_start/nxheaders_main
+// Name: nxheaders_main
 /////////////////////////////////////////////////////////////////////////////
 
 int cslidervertical_main(int argc, char *argv[])
diff --git a/NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx b/NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx
index da76c88cf..c4f8c65b8 100644
--- a/NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx
+++ b/NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx
@@ -76,7 +76,7 @@ extern "C" int ctextbox_main(int argc, char *argv[]);
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
-// user_start/nxheaders_main
+// nxheaders_main
 /////////////////////////////////////////////////////////////////////////////
 
 int ctextbox_main(int argc, char *argv[])
diff --git a/NxWidgets/UnitTests/README.txt b/NxWidgets/UnitTests/README.txt
index cc01c3855..9952af012 100644
--- a/NxWidgets/UnitTests/README.txt
+++ b/NxWidgets/UnitTests/README.txt
@@ -74,7 +74,7 @@ Installing and Building the Unit Tests
    writing *ONLY* the sim/nsh2 and stm321-e-eval configurations have C++ support
    pre-enabled).
 
-   c) Enable Debug Options
+   d) Enable Debug Options
 
    If you are running on a simulated target, then you might also want to
    enable debug symbols:
@@ -84,12 +84,12 @@ Installing and Building the Unit Tests
    Then you can run the simulation using GDB or DDD which is a very powerful
    debugging environment!
 
-   d) Special configuration requirements for the nxwm unit test:
+   e) Special configuration requirements for the nxwm unit test:
  
      CONFIG_NXCONSOLE=y
      CONFIG_NX_MULTIUSER=y
 
-   e) Other nuttx/.config changes -- NSH configurations only.
+   f) Other nuttx/.config changes -- NSH configurations only.
  
    If the configuration that you are using supports NSH and NSH built-in tasks
    then all is well.  If it is an NSH configuration, then you will have to define
@@ -101,7 +101,26 @@ Installing and Building the Unit Tests
    to change anything further in the nuttx/.config file if you are using either
    of these configurations.
 
-   f) Other apps/.config changes -- NON-NSH configurations only.
+   g) Other apps/.config changes -- NON-NSH configurations only.
+
+   Entry Point.  You will need to set the entry point in the .config file.
+   For NSH configurations, the entry point will always be "nsh_main" and you
+   will see that setting like:
+
+     CONFIG_USER_ENTRYPOINT="nsh_main"
+
+   If you are not using in NSH, then each unit test has a unique entry point.
+   That entry point is the name of the unit test directory in all lower case
+   plus the suffix "_main".  So, for example, the correct entry for the
+   UnitTests/CButton would be:
+
+     CONFIG_USER_ENTRYPOINT="cbutton_main"
+
+   And the correct entry point for UnitTests/nxwm would be:
+
+     CONFIG_USER_ENTRYPOINT="nxwm_main"
+
+   etc.
 
    For non-NSH configurations (such as the sim/touchscreen) you will have to
    remove the CONFIGURED_APPS seting that contains the user_start function so
@@ -306,6 +325,9 @@ Example
 
    Do nothing... sim/nsh2 already has C++ support enabled.
 
+   Since this is an NSH configuration, the entry point does not need to be
+   changed.
+
 3. Install the CButton C++ application (for example)
    Where: <nxwidgets-directory>/tool
 
diff --git a/NxWidgets/UnitTests/nxwm/nxwm_main.cxx b/NxWidgets/UnitTests/nxwm/nxwm_main.cxx
index eefc44494..fa05d52e4 100644
--- a/NxWidgets/UnitTests/nxwm/nxwm_main.cxx
+++ b/NxWidgets/UnitTests/nxwm/nxwm_main.cxx
@@ -586,7 +586,7 @@ void showTestStepMemory(FAR const char *msg)
 #endif
 
 /////////////////////////////////////////////////////////////////////////////
-// user_start/nxwm_main
+// nxwm_main
 /////////////////////////////////////////////////////////////////////////////
 
 int nxwm_main(int argc, char *argv[])