Upated NxWM comments

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4692 7fd9a85b-ad96-42d3-883c-3090e2eb8679

3 files changed, 57 insertions, 39 deletions

diff --git a/nuttx/configs/sim/nxwm/defconfig b/nuttx/configs/sim/nxwm/defconfig
index 5fead7bb84..2fbeb8fa38 100644
--- a/nuttx/configs/sim/nxwm/defconfig
+++ b/nuttx/configs/sim/nxwm/defconfig
@@ -32,7 +32,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-CONFIG_NXWM_TASKBAR_LEFT=y
 #
 # Architecture selection
 #
@@ -281,6 +280,14 @@ CONFIG_HAVE_LIBM=y
 # CONFIG_NAME_MAX - The maximum size of a file name.
 # CONFIG_STDIO_BUFFER_SIZE - Size of the buffer to allocate
 #   on fopen. (Only if CONFIG_NFILE_STREAMS > 0)
+# CONFIG_STDIO_LINEBUFFER - If standard C buffered I/O is enabled
+#   (CONFIG_STDIO_BUFFER_SIZE > 0), then this option may be added
+#   to force automatic, line-oriented flushing the output buffer
+#   for putc(), fputc(), putchar(), puts(), fputs(), printf(),
+#   fprintf(), and vfprintf().  When a newline is encountered in
+#   the output string, the output buffer will be flushed.  This
+#   (slightly) increases the NuttX footprint but supports the kind
+#   of behavior that people expect for printf().
 # CONFIG_NUNGET_CHARS - Number of characters that can be
 #   buffered by ungetc() (Only if CONFIG_NFILE_STREAMS > 0)
 # CONFIG_PREALLOC_MQ_MSGS - The number of pre-allocated message
@@ -305,7 +312,8 @@ CONFIG_NPTHREAD_KEYS=4
 CONFIG_NFILE_DESCRIPTORS=16
 CONFIG_NFILE_STREAMS=16
 CONFIG_NAME_MAX=32
-CONFIG_STDIO_BUFFER_SIZE=1024
+CONFIG_STDIO_BUFFER_SIZE=256
+CONFIG_STDIO_LINEBUFFER=y
 CONFIG_NUNGET_CHARS=2
 CONFIG_PREALLOC_MQ_MSGS=32
 CONFIG_MQ_MAXMSGSIZE=32
@@ -545,17 +553,23 @@ CONFIG_NX_MXSERVERMSGS=32
 CONFIG_NX_MXCLIENTMSGS=16
 
 #
-# NxWidgets
+# NxWidgets / NxWM
 #
 # Use all defaults except
 # 1. Need an especially big server stack size to work with X
 # 2. Make the NxWidgets background color match the NxWM back color
+# 3. Taskbar on the left
+# 4. Bigger stack for NxConsole
 #
 CONFIG_NXWIDGETS_SERVERSTACK=16384
 CONFIG_NXWIDGETS_LISTENERSTACK=8192
 CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR=MKRGB(148,189,215)
 CONFIG_NXWIDGETS_DEFAULT_SELECTEDBACKGROUNDCOLOR=MKRGB(206,227,241)
 
+CONFIG_NXWM_TASKBAR_LEFT=y
+CONFIG_NXWM_NXCONSOLE_STACKSIZE=8192
+CONFIG_NXWM_UNITTEST=y
+
 #
 # NxConsole Configuration Settings:
 #
diff --git a/nuttx/include/cxx/cunistd b/nuttx/include/cxx/cunistd
index 2ddc841445..2f0b712709 100755
--- a/nuttx/include/cxx/cunistd
+++ b/nuttx/include/cxx/cunistd
@@ -41,6 +41,7 @@
 //***************************************************************************
 
 #include <unistd.h>
+
 //***************************************************************************
 // Namespace
 //***************************************************************************
@@ -49,6 +50,8 @@ namespace std
 {
   using ::getpid;
   using ::_exit;
+  using ::sleep;
+  using ::usleep;
   using ::close;
   using ::dup;
   using ::dup2;
diff --git a/nuttx/libxx/README.txt b/nuttx/libxx/README.txt
index c97dae4ba4..6cf066f080 100644
--- a/nuttx/libxx/README.txt
+++ b/nuttx/libxx/README.txt
@@ -1,36 +1,37 @@
-libxx/README.txt

-^^^^^^^^^^^^^^^^

-

-This directory contains a fragmentary C++ library that will allow

-to build only the simplest of C++ applications.  In the deeply

-embedded world, that is probably all that is necessary.  If you

-have a need for more extensive C++ support, the following libraries

-are recommended:

-

- - libstdc++  (part of GCC)

- - STLport    http://www.stlport.org/ 

- - uClibc++   http://cxx.uclibc.org/

-

-At present, only the following are supported here:

-

- - void *operator new(std::size_t nbytes);

- - void operator delete(void* ptr);

- - void operator delete[](void *ptr);

- - void __cxa_pure_virtual(void);

- - int __aeabi_atexit(void* object, void (*destroyer)(void*), void *dso_handle);

- 

-operator new

-------------

-

-  This operator should take a type of size_t.  But size_t has an unknown underlying

-  type.  In the nuttx sys/types.h header file, size_t is typed as uint32_t

-  (which is determined by architecture-specific logic).  But the C++

-  compiler may believe that size_t is of a different type resulting in

-  compilation errors in the operator.  Using the underlying integer type

-  instead of size_t seems to resolve the compilation issues. Need to

-  REVISIT this.

-

-  Once some C++ compilers, this will cause an error:

-

-    Problem:     "'operator new' takes size_t ('...') as first parameter"

-    Workaround:  Add -fpermissive to the compilation flags

+libxx/README.txt
+^^^^^^^^^^^^^^^^
+
+This directory contains a fragmentary C++ library that will allow
+to build only the simplest of C++ applications.  In the deeply
+embedded world, that is probably all that is necessary.  If you
+have a need for more extensive C++ support, the following libraries
+are recommended:
+
+ - libstdc++  (part of GCC)
+ - STLport    http://www.stlport.org/ 
+ - uClibc++   http://cxx.uclibc.org/
+ - uSTL       http://ustl.sourceforge.net/
+
+At present, only the following are supported here:
+
+ - void *operator new(std::size_t nbytes);
+ - void operator delete(void* ptr);
+ - void operator delete[](void *ptr);
+ - void __cxa_pure_virtual(void);
+ - int __aeabi_atexit(void* object, void (*destroyer)(void*), void *dso_handle);
+ 
+operator new
+------------
+
+  This operator should take a type of size_t.  But size_t has an unknown underlying
+  type.  In the nuttx sys/types.h header file, size_t is typed as uint32_t
+  (which is determined by architecture-specific logic).  But the C++
+  compiler may believe that size_t is of a different type resulting in
+  compilation errors in the operator.  Using the underlying integer type
+  instead of size_t seems to resolve the compilation issues. Need to
+  REVISIT this.
+
+  Once some C++ compilers, this will cause an error:
+
+    Problem:     "'operator new' takes size_t ('...') as first parameter"
+    Workaround:  Add -fpermissive to the compilation flags