Move NX header files to include/nuttx/nx

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

ChangeLog.txt

@@ -85,4 +85,5 @@
 	* apps/examples/usbstorage: Can now be built as two NSH "built-in" commands:
 	  'msconn' will connect the USB mass storage device; 'msdis' will disconnect
 	  the USB storage device.
-
+	* apps/examples/nx*:  All NX header files moved from nuttx/include/nuttx to 
+	  nuttx/include/nuttx/nx.

examples/README.txt

@@ -252,7 +252,7 @@ examples/nx
 ^^^^^^^^^^^
 
   This directory contains a simple test of a subset of the NX APIs
-  defined in include/nuttx/nx.h.  The following configuration options
+  defined in include/nuttx/nx/nx.h.  The following configuration options
   can be selected:
 
     CONFIG_EXAMPLES_NX_BUILTIN -- Build the NX example as a "built-in"
@@ -406,7 +406,7 @@ examples/nxtext
 ^^^^^^^^^^^^^^^
 
   This directory contains another simple test of a subset of the NX APIs
-  defined in include/nuttx/nx.h.  This text focuses on text displays on
+  defined in include/nuttx/nx/nx.h.  This text focuses on text displays on
   the dispaly background combined with pop-up displays over the text.
   The text display will continue to update while the pop-up is visible.
 

examples/nx/nx_events.c

@@ -47,8 +47,8 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxtk.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxtk.h>
 #include "nx_internal.h"
 
 /****************************************************************************

examples/nx/nx_internal.h

@@ -1,7 +1,7 @@
 /****************************************************************************
  * examples/nx/nx_internal.h
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,8 +45,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <semaphore.h>
-#include <nuttx/nx.h>
-#include <nuttx/nxtk.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxtk.h>
 
 /****************************************************************************
  * Definitions

examples/nx/nx_kbdin.c

@@ -47,9 +47,9 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxtk.h>
-#include <nuttx/nxfonts.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxtk.h>
+#include <nuttx/nx/nxfonts.h>
 
 #include "nx_internal.h"
 

examples/nx/nx_main.c

@@ -58,9 +58,9 @@
 #endif
 
 #include <nuttx/arch.h>
-#include <nuttx/nx.h>
-#include <nuttx/nxtk.h>
-#include <nuttx/nxfonts.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxtk.h>
+#include <nuttx/nx/nxfonts.h>
 
 #include "nx_internal.h"
 

examples/nx/nx_server.c

@@ -47,7 +47,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 
 #ifdef CONFIG_NX_LCDDRIVER
 #  include <nuttx/lcd/lcd.h>

examples/nxhello/nxhello.h

@@ -46,8 +46,8 @@
 #include <stdbool.h>
 #include <semaphore.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxglib.h>
 
 /****************************************************************************
  * Definitions

examples/nxhello/nxhello_bkgd.c

@@ -48,9 +48,9 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxglib.h>
-#include <nuttx/nxfonts.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxglib.h>
+#include <nuttx/nx/nxfonts.h>
 
 #include "nxhello.h"
 

examples/nxhello/nxhello_main.c

@@ -59,9 +59,9 @@
 #endif
 
 #include <nuttx/arch.h>
-#include <nuttx/nx.h>
-#include <nuttx/nxglib.h>
-#include <nuttx/nxfonts.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxglib.h>
+#include <nuttx/nx/nxfonts.h>
 
 #include "nxhello.h"
 

examples/nximage/nximage.h

@@ -46,8 +46,8 @@
 #include <stdbool.h>
 #include <semaphore.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxglib.h>
 
 /****************************************************************************
  * Definitions

examples/nximage/nximage_bitmap.c

@@ -42,8 +42,8 @@
 #include <stdint.h>
 #include <assert.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxglib.h>
 
 #include "nximage.h"
 

examples/nximage/nximage_bkgd.c

@@ -48,9 +48,9 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxglib.h>
-#include <nuttx/nxfonts.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxglib.h>
+#include <nuttx/nx/nxfonts.h>
 
 #include "nximage.h"
 

examples/nximage/nximage_main.c

@@ -59,9 +59,9 @@
 #endif
 
 #include <nuttx/arch.h>
-#include <nuttx/nx.h>
-#include <nuttx/nxglib.h>
-#include <nuttx/nxfonts.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxglib.h>
+#include <nuttx/nx/nxfonts.h>
 
 #include "nximage.h"
 

examples/nxtext/nxtext_bkgd.c

@@ -48,8 +48,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxfonts.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxfonts.h>
 
 #include "nxtext_internal.h"
 

examples/nxtext/nxtext_internal.h

@@ -45,8 +45,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <semaphore.h>
-#include <nuttx/nx.h>
-#include <nuttx/nxtk.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxtk.h>
 
 /****************************************************************************
  * Definitions

examples/nxtext/nxtext_main.c

@@ -59,9 +59,9 @@
 #endif
 
 #include <nuttx/arch.h>
-#include <nuttx/nx.h>
-#include <nuttx/nxglib.h>
-#include <nuttx/nxfonts.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxglib.h>
+#include <nuttx/nx/nxfonts.h>
 
 #include "nxtext_internal.h"
 

examples/nxtext/nxtext_popup.c

@@ -47,8 +47,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxfonts.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxfonts.h>
 
 #include "nxtext_internal.h"
 

examples/nxtext/nxtext_putc.c

@@ -47,9 +47,9 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxtk.h>
-#include <nuttx/nxfonts.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxtk.h>
+#include <nuttx/nx/nxfonts.h>
 
 #include "nxtext_internal.h"
 

examples/nxtext/nxtext_server.c

@@ -47,7 +47,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 
 #ifdef CONFIG_NX_LCDDRIVER
 #  include <nuttx/lcd/lcd.h>

examples/usbstorage/usbstrg_main.c

@@ -479,5 +479,6 @@ int msdis_main(int argc, char *argv[])
    usbstrg_uninitialize(g_mshandle);
    g_mshandle = NULL;
    message("msdis: Disconnected\n");
+   return 0;
 }
 #endif