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

20 files changed, 46 insertions, 45 deletions

diff --git a/apps/examples/README.txt b/apps/examples/README.txt
index b241b8f75..52a2d0f58 100644
--- a/apps/examples/README.txt
+++ b/apps/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.
 
diff --git a/apps/examples/nx/nx_events.c b/apps/examples/nx/nx_events.c
index d1074b419..29fe5fb8a 100644
--- a/apps/examples/nx/nx_events.c
+++ b/apps/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"
 
 /****************************************************************************
diff --git a/apps/examples/nx/nx_internal.h b/apps/examples/nx/nx_internal.h
index 897c09722..b733a185f 100644
--- a/apps/examples/nx/nx_internal.h
+++ b/apps/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
diff --git a/apps/examples/nx/nx_kbdin.c b/apps/examples/nx/nx_kbdin.c
index b2a40d352..ebb1ef791 100644
--- a/apps/examples/nx/nx_kbdin.c
+++ b/apps/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"
 
diff --git a/apps/examples/nx/nx_main.c b/apps/examples/nx/nx_main.c
index 366ec80a4..d0beda92e 100644
--- a/apps/examples/nx/nx_main.c
+++ b/apps/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"
 
diff --git a/apps/examples/nx/nx_server.c b/apps/examples/nx/nx_server.c
index 8677c0008..a7a305d63 100644
--- a/apps/examples/nx/nx_server.c
+++ b/apps/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>
diff --git a/apps/examples/nxhello/nxhello.h b/apps/examples/nxhello/nxhello.h
index b7343a054..93c6d8fac 100644
--- a/apps/examples/nxhello/nxhello.h
+++ b/apps/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
diff --git a/apps/examples/nxhello/nxhello_bkgd.c b/apps/examples/nxhello/nxhello_bkgd.c
index 09beac952..43bfc0516 100644
--- a/apps/examples/nxhello/nxhello_bkgd.c
+++ b/apps/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"
 
diff --git a/apps/examples/nxhello/nxhello_main.c b/apps/examples/nxhello/nxhello_main.c
index 38c2e52c2..78a60663e 100644
--- a/apps/examples/nxhello/nxhello_main.c
+++ b/apps/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"
 
diff --git a/apps/examples/nximage/nximage.h b/apps/examples/nximage/nximage.h
index 8a335ddc8..117eff671 100755
--- a/apps/examples/nximage/nximage.h
+++ b/apps/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
diff --git a/apps/examples/nximage/nximage_bitmap.c b/apps/examples/nximage/nximage_bitmap.c
index f672ce3fe..6b0d13718 100644
--- a/apps/examples/nximage/nximage_bitmap.c
+++ b/apps/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"
 
diff --git a/apps/examples/nximage/nximage_bkgd.c b/apps/examples/nximage/nximage_bkgd.c
index 1aa74f58f..e724b3a31 100755
--- a/apps/examples/nximage/nximage_bkgd.c
+++ b/apps/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"
 
diff --git a/apps/examples/nximage/nximage_main.c b/apps/examples/nximage/nximage_main.c
index d07e72a26..3ddfb1c02 100755
--- a/apps/examples/nximage/nximage_main.c
+++ b/apps/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"
 
diff --git a/apps/examples/nxtext/nxtext_bkgd.c b/apps/examples/nxtext/nxtext_bkgd.c
index 37894e20c..a87425112 100644
--- a/apps/examples/nxtext/nxtext_bkgd.c
+++ b/apps/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"
 
diff --git a/apps/examples/nxtext/nxtext_internal.h b/apps/examples/nxtext/nxtext_internal.h
index eb7543329..98579ffdf 100644
--- a/apps/examples/nxtext/nxtext_internal.h
+++ b/apps/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
diff --git a/apps/examples/nxtext/nxtext_main.c b/apps/examples/nxtext/nxtext_main.c
index 58d29d33c..2ff941d0c 100644
--- a/apps/examples/nxtext/nxtext_main.c
+++ b/apps/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"
 
diff --git a/apps/examples/nxtext/nxtext_popup.c b/apps/examples/nxtext/nxtext_popup.c
index 8cc72a89e..c0c66f4ef 100644
--- a/apps/examples/nxtext/nxtext_popup.c
+++ b/apps/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"
 
diff --git a/apps/examples/nxtext/nxtext_putc.c b/apps/examples/nxtext/nxtext_putc.c
index b4e31bb73..5c1749269 100644
--- a/apps/examples/nxtext/nxtext_putc.c
+++ b/apps/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"
 
diff --git a/apps/examples/nxtext/nxtext_server.c b/apps/examples/nxtext/nxtext_server.c
index 08b3a1a20..2049a3121 100644
--- a/apps/examples/nxtext/nxtext_server.c
+++ b/apps/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>
diff --git a/apps/examples/usbstorage/usbstrg_main.c b/apps/examples/usbstorage/usbstrg_main.c
index 76e864fee..2889f60e0 100644
--- a/apps/examples/usbstorage/usbstrg_main.c
+++ b/apps/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