Add a NuttX logo image example

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

Makefile

@@ -255,7 +255,7 @@ $(TOPDIR)/.version:
 # Create the include/nuttx/version.h file
 
 include/nuttx/version.h: $(TOPDIR)/.version tools/mkversion
-	tools/mkversion $(TOPDIR) > include/nuttx/version.h
+	@tools/mkversion $(TOPDIR) > include/nuttx/version.h
 
 # Build the mkconfig tool used to create include/nuttx/config.h
 
@@ -265,7 +265,7 @@ tools/mkconfig:
 # Create the include/nuttx/config.h file
 
 include/nuttx/config.h: $(TOPDIR)/.config tools/mkconfig
-	tools/mkconfig $(TOPDIR) > include/nuttx/config.h
+	@tools/mkconfig $(TOPDIR) > include/nuttx/config.h
 
 # Link the apps/include directory to include/apps
 

configs/stm3210e-eval/nsh2/defconfig

@@ -1037,6 +1037,43 @@ CONFIG_EXAMPLES_NXHELLO_FONTCOLOR=0xffdf
 CONFIG_EXAMPLES_NXHELLO_BPP=16
 CONFIG_EXAMPLES_NXHELLO_EXTERNINIT=n
 
+#
+# Settings for examples/nximage
+#
+# CONFIG_EXAMPLES_NXIMAGE_BUILTIN -- Build the NXIMAGE example as a "built-in"
+#   that can be executed from the NSH command line    
+# CONFIG_EXAMPLES_NXIMAGE_VPLANE -- The plane to select from the frame-
+#   buffer driver for use in the test.  Default: 0
+# CONFIG_EXAMPLES_NXIMAGE_DEVNO - The LCD device to select from the LCD
+      driver for use in the test: Default: 0
+# CONFIG_EXAMPLES_NXIMAGE_BPP -- Pixels per pixel to use.  Valid options
+#   include 8, 16, and 24.  Default is 16.
+# CONFIG_EXAMPLES_NXIMAGE_XSCALEp5, CONFIG_EXAMPLES_NXIMAGE_XSCALE1p5,
+# CONFIG_EXAMPLES_NXIMAGE_XSCALE2p0 -- The logo image width is 160 columns.
+#   One of these may be defined to rescale the image horizontally by .5, 1.5,
+#   or 2.0.
+# CONFIG_EXAMPLES_NXIMAGE_YSCALEp5, CONFIG_EXAMPLES_NXIMAGE_YSCALE1p5,
+# CONFIG_EXAMPLES_NXIMAGE_YSCALE2p0 -- The logo image height is 160 rows.
+#   One of these may be defined to rescale the image vertically by .5, 1.5,
+#   or 2.0.
+# CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT - The driver for the graphics device on
+#   this platform requires some unusual initialization.  This is the
+#   for, for example, SPI LCD/OLED devices.  If this configuration is
+#   selected, then the platform code must provide an LCD initialization
+#   function.
+#
+CONFIG_EXAMPLES_NXIMAGE_BUILTIN=y
+CONFIG_EXAMPLES_NXIMAGE_VPLANE=0
+CONFIG_EXAMPLES_NXIMAGE_DEVNO=0
+CONFIG_EXAMPLES_NXIMAGE_BPP=16
+CONFIG_EXAMPLES_NXIMAGE_XSCALEp5=n
+CONFIG_EXAMPLES_NXIMAGE_XSCALE1p5=n
+CONFIG_EXAMPLES_NXIMAGE_XSCALE2p0=n
+CONFIG_EXAMPLES_NXIMAGE_YSCALEp5=n
+CONFIG_EXAMPLES_NXIMAGE_YSCALE1p5=n
+CONFIG_EXAMPLES_NXIMAGE_YSCALE2p0=n
+CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n
+
 #
 # Stack and heap information
 #

configs/stm3210e-eval/nx/defconfig

@@ -996,6 +996,43 @@ CONFIG_EXAMPLES_NX_SERVERPRIO=120
 CONFIG_EXAMPLES_NX_NOTIFYSIGNO=4
 CONFIG_EXAMPLES_NX_EXTERNINIT=n
 
+#
+# Settings for examples/nximage
+#
+# CONFIG_EXAMPLES_NXIMAGE_BUILTIN -- Build the NXIMAGE example as a "built-in"
+#   that can be executed from the NSH command line    
+# CONFIG_EXAMPLES_NXIMAGE_VPLANE -- The plane to select from the frame-
+#   buffer driver for use in the test.  Default: 0
+# CONFIG_EXAMPLES_NXIMAGE_DEVNO - The LCD device to select from the LCD
+      driver for use in the test: Default: 0
+# CONFIG_EXAMPLES_NXIMAGE_BPP -- Pixels per pixel to use.  Valid options
+#   include 8, 16, and 24.  Default is 16.
+# CONFIG_EXAMPLES_NXIMAGE_XSCALEp5, CONFIG_EXAMPLES_NXIMAGE_XSCALE1p5,
+# CONFIG_EXAMPLES_NXIMAGE_XSCALE2p0 -- The logo image width is 160 columns.
+#   One of these may be defined to rescale the image horizontally by .5, 1.5,
+#   or 2.0.
+# CONFIG_EXAMPLES_NXIMAGE_YSCALEp5, CONFIG_EXAMPLES_NXIMAGE_YSCALE1p5,
+# CONFIG_EXAMPLES_NXIMAGE_YSCALE2p0 -- The logo image height is 160 rows.
+#   One of these may be defined to rescale the image vertically by .5, 1.5,
+#   or 2.0.
+# CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT - The driver for the graphics device on
+#   this platform requires some unusual initialization.  This is the
+#   for, for example, SPI LCD/OLED devices.  If this configuration is
+#   selected, then the platform code must provide an LCD initialization
+#   function.
+#
+CONFIG_EXAMPLES_NXIMAGE_BUILTIN=n
+CONFIG_EXAMPLES_NXIMAGE_VPLANE=0
+CONFIG_EXAMPLES_NXIMAGE_DEVNO=0
+CONFIG_EXAMPLES_NXIMAGE_BPP=16
+CONFIG_EXAMPLES_NXIMAGE_XSCALEp5=n
+CONFIG_EXAMPLES_NXIMAGE_XSCALE1p5=n
+CONFIG_EXAMPLES_NXIMAGE_XSCALE2p0=n
+CONFIG_EXAMPLES_NXIMAGE_YSCALEp5=n
+CONFIG_EXAMPLES_NXIMAGE_YSCALE1p5=n
+CONFIG_EXAMPLES_NXIMAGE_YSCALE2p0=n
+CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n
+
 #
 # Stack and heap information
 #

configs/stm3210e-eval/nxtext/defconfig

@@ -1051,6 +1051,43 @@ CONFIG_EXAMPLES_NXTEXT_CLIENTPRIO=80
 CONFIG_EXAMPLES_NXTEXT_SERVERPRIO=120
 CONFIG_EXAMPLES_NXTEXT_NOTIFYSIGNO=4
 
+#
+# Settings for examples/nximage
+#
+# CONFIG_EXAMPLES_NXIMAGE_BUILTIN -- Build the NXIMAGE example as a "built-in"
+#   that can be executed from the NSH command line    
+# CONFIG_EXAMPLES_NXIMAGE_VPLANE -- The plane to select from the frame-
+#   buffer driver for use in the test.  Default: 0
+# CONFIG_EXAMPLES_NXIMAGE_DEVNO - The LCD device to select from the LCD
+      driver for use in the test: Default: 0
+# CONFIG_EXAMPLES_NXIMAGE_BPP -- Pixels per pixel to use.  Valid options
+#   include 8, 16, and 24.  Default is 16.
+# CONFIG_EXAMPLES_NXIMAGE_XSCALEp5, CONFIG_EXAMPLES_NXIMAGE_XSCALE1p5,
+# CONFIG_EXAMPLES_NXIMAGE_XSCALE2p0 -- The logo image width is 160 columns.
+#   One of these may be defined to rescale the image horizontally by .5, 1.5,
+#   or 2.0.
+# CONFIG_EXAMPLES_NXIMAGE_YSCALEp5, CONFIG_EXAMPLES_NXIMAGE_YSCALE1p5,
+# CONFIG_EXAMPLES_NXIMAGE_YSCALE2p0 -- The logo image height is 160 rows.
+#   One of these may be defined to rescale the image vertically by .5, 1.5,
+#   or 2.0.
+# CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT - The driver for the graphics device on
+#   this platform requires some unusual initialization.  This is the
+#   for, for example, SPI LCD/OLED devices.  If this configuration is
+#   selected, then the platform code must provide an LCD initialization
+#   function.
+#
+CONFIG_EXAMPLES_NXIMAGE_BUILTIN=n
+CONFIG_EXAMPLES_NXIMAGE_VPLANE=0
+CONFIG_EXAMPLES_NXIMAGE_DEVNO=0
+CONFIG_EXAMPLES_NXIMAGE_BPP=16
+CONFIG_EXAMPLES_NXIMAGE_XSCALEp5=n
+CONFIG_EXAMPLES_NXIMAGE_XSCALE1p5=n
+CONFIG_EXAMPLES_NXIMAGE_XSCALE2p0=n
+CONFIG_EXAMPLES_NXIMAGE_YSCALEp5=n
+CONFIG_EXAMPLES_NXIMAGE_YSCALE1p5=n
+CONFIG_EXAMPLES_NXIMAGE_YSCALE2p0=n
+CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n
+
 #
 # Stack and heap information
 #

sched/sem_wait.c

@@ -171,7 +171,7 @@ int sem_wait(FAR sem_t *sem)
 #endif
           /* Add the TCB to the prioritized semaphore wait queue */
 
-          errno = OK;
+          errno = 0;
           up_block_task(rtcb, TSTATE_WAIT_SEM);
 
           /* When we resume at this point, either (1) the semaphore has been