Decoupling NX user interfaces to support NX kernel build (phase 3)

29 files changed, 71 insertions, 24 deletions

diff --git a/nuttx/libc/Makefile b/nuttx/libc/Makefile
index 759fcec18..692a4d2a0 100644
--- a/nuttx/libc/Makefile
+++ b/nuttx/libc/Makefile
@@ -65,7 +65,8 @@ include mqueue/Make.defs
 include math/Make.defs
 include fixedmath/Make.defs
 include net/Make.defs
-include nx/Make.defs
+include nxgl/Make.defs
+include nxmu/Make.defs
 include time/Make.defs
 include libgen/Make.defs
 include dirent/Make.defs
diff --git a/nuttx/libc/nxgl/Make.defs b/nuttx/libc/nxgl/Make.defs
new file mode 100644
index 000000000..f97b34f20
--- /dev/null
+++ b/nuttx/libc/nxgl/Make.defs
@@ -0,0 +1,46 @@
+############################################################################
+# libc/nxgl/Make.defs
+#
+#   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+# Expose NXGL interfaces to applications
+
+ifeq ($(CONFIG_NX),y)
+
+# Add the nxgl/ directory to the build
+
+DEPPATH += --dep-path nxgl
+VPATH += :nxgl
+
+endif
+
diff --git a/nuttx/libc/nx/Make.defs b/nuttx/libc/nxmu/Make.defs
index 8ac8adb48..376d0845d 100644
--- a/nuttx/libc/nx/Make.defs
+++ b/nuttx/libc/nxmu/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# libc/nx/Make.defs
+# libc/nxmu/Make.defs
 #
 #   Copyright (C) 2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,15 +33,13 @@
 #
 ############################################################################
 
-# Check if the NX graphics subsystem is enabled
-
-ifeq ($(CONFIG_NX),y)
-
 # All of user-space hooks must be built in for the multi-user NX
 # implementation so that they are available to the application in the kernel
 # build (single use mode cannot be used with the kernel build)
 
+ifeq ($(CONFIG_NX),y)
 ifeq ($(CONFIG_NX_MULTIUSER),y)
+
 CSRCS += lib_nxmu_sendserver.c lib_nx_connect.c lib_nx_disconnect.c
 CSRCS += lib_nxmu_semtake.c lib_nx_block.c
 CSRCS += lib_nx_kbdchin.c lib_nx_kbdin.c lib_nx_mousein.c
@@ -51,10 +49,12 @@ CSRCS += lib_nxmu_sendwindow.c lib_nx_closewindow.c lib_nxmu_constructwindow.c
 CSRCS += lib_nx_bitmap.c lib_nx_fill.c lib_nx_filltrapezoid.c lib_nx_getposition.c
 CSRCS += lib_nx_getrectangle.c lib_nx_lower.c lib_nx_move.c lib_nx_openwindow.c
 CSRCS += lib_nx_raise.c lib_nx_setpixel.c lib_nx_setposition.c lib_nx_setsize.c
-endif
 
-# Add the nx/ directory to the build
+# Add the nxmu/ directory to the build
+
+DEPPATH += --dep-path nxmu
+VPATH += :nxmu
 
-DEPPATH += --dep-path nx
-VPATH += :nx
 endif
+endif
+
diff --git a/nuttx/libc/nx/lib_nx_bitmap.c b/nuttx/libc/nxmu/lib_nx_bitmap.c
index fdd0b9717..56486d1be 100644
--- a/nuttx/libc/nx/lib_nx_bitmap.c
+++ b/nuttx/libc/nxmu/lib_nx_bitmap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libc/nx/lib_nx_bitmap.c
+ * libc/nxmu/lib_nx_bitmap.c
  *
  *   Copyright (C) 2008-2009, 2011-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/libc/nx/lib_nx_block.c b/nuttx/libc/nxmu/lib_nx_block.c
index 7468ac6eb..7468ac6eb 100644
--- a/nuttx/libc/nx/lib_nx_block.c
+++ b/nuttx/libc/nxmu/lib_nx_block.c
diff --git a/nuttx/libc/nx/lib_nx_closewindow.c b/nuttx/libc/nxmu/lib_nx_closewindow.c
index f38d20922..f38d20922 100644
--- a/nuttx/libc/nx/lib_nx_closewindow.c
+++ b/nuttx/libc/nxmu/lib_nx_closewindow.c
diff --git a/nuttx/libc/nx/lib_nx_connect.c b/nuttx/libc/nxmu/lib_nx_connect.c
index 39ed851f6..39ed851f6 100644
--- a/nuttx/libc/nx/lib_nx_connect.c
+++ b/nuttx/libc/nxmu/lib_nx_connect.c
diff --git a/nuttx/libc/nx/lib_nx_disconnect.c b/nuttx/libc/nxmu/lib_nx_disconnect.c
index 87d2f3b0c..87d2f3b0c 100644
--- a/nuttx/libc/nx/lib_nx_disconnect.c
+++ b/nuttx/libc/nxmu/lib_nx_disconnect.c
diff --git a/nuttx/libc/nx/lib_nx_fill.c b/nuttx/libc/nxmu/lib_nx_fill.c
index bc0307622..9246bfe38 100644
--- a/nuttx/libc/nx/lib_nx_fill.c
+++ b/nuttx/libc/nxmu/lib_nx_fill.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libc/nx/lib_nx_fill.c
+ * libc/nxmu/lib_nx_fill.c
  *
  *   Copyright (C) 2008-2009, 2011-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/libc/nx/lib_nx_filltrapezoid.c b/nuttx/libc/nxmu/lib_nx_filltrapezoid.c
index 0d6b826ec..445891629 100644
--- a/nuttx/libc/nx/lib_nx_filltrapezoid.c
+++ b/nuttx/libc/nxmu/lib_nx_filltrapezoid.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libc/nx/lib_nx_filltrapezoid.c
+ * libc/nxmu/lib_nx_filltrapezoid.c
  *
  *   Copyright (C) 2008-2009, 2011-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/libc/nx/lib_nx_getposition.c b/nuttx/libc/nxmu/lib_nx_getposition.c
index 4a0ae30b9..0f901df08 100644
--- a/nuttx/libc/nx/lib_nx_getposition.c
+++ b/nuttx/libc/nxmu/lib_nx_getposition.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libc/nx/lib_nx_getposition.c
+ * libc/nxmu/lib_nx_getposition.c
  *
  *   Copyright (C) 2008-2009, 2011-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/libc/nx/lib_nx_getrectangle.c b/nuttx/libc/nxmu/lib_nx_getrectangle.c
index e815e5a17..757b1c55b 100644
--- a/nuttx/libc/nx/lib_nx_getrectangle.c
+++ b/nuttx/libc/nxmu/lib_nx_getrectangle.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libc/nx/lib_nx_getrectangle.c
+ * libc/nxmu/lib_nx_getrectangle.c
  *
  *   Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/libc/nx/lib_nx_kbdchin.c b/nuttx/libc/nxmu/lib_nx_kbdchin.c
index 20d99c4b6..20d99c4b6 100644
--- a/nuttx/libc/nx/lib_nx_kbdchin.c
+++ b/nuttx/libc/nxmu/lib_nx_kbdchin.c
diff --git a/nuttx/libc/nx/lib_nx_kbdin.c b/nuttx/libc/nxmu/lib_nx_kbdin.c
index f8d266d98..f8d266d98 100644
--- a/nuttx/libc/nx/lib_nx_kbdin.c
+++ b/nuttx/libc/nxmu/lib_nx_kbdin.c
diff --git a/nuttx/libc/nx/lib_nx_lower.c b/nuttx/libc/nxmu/lib_nx_lower.c
index 64a8b5848..59c80087e 100644
--- a/nuttx/libc/nx/lib_nx_lower.c
+++ b/nuttx/libc/nxmu/lib_nx_lower.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libc/nx/lib_nx_lower.c
+ * libc/nxmu/lib_nx_lower.c
  *
  *   Copyright (C) 2008-2009, 2011-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/libc/nx/lib_nx_mousein.c b/nuttx/libc/nxmu/lib_nx_mousein.c
index bff937daa..bff937daa 100644
--- a/nuttx/libc/nx/lib_nx_mousein.c
+++ b/nuttx/libc/nxmu/lib_nx_mousein.c
diff --git a/nuttx/libc/nx/lib_nx_move.c b/nuttx/libc/nxmu/lib_nx_move.c
index 30ab33259..2adc78ea3 100644
--- a/nuttx/libc/nx/lib_nx_move.c
+++ b/nuttx/libc/nxmu/lib_nx_move.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libc/nx/lib_nx_move.c
+ * libc/nxmu/lib_nx_move.c
  *
  *   Copyright (C) 2008-2009, 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/libc/nx/lib_nx_openwindow.c b/nuttx/libc/nxmu/lib_nx_openwindow.c
index a663b6493..5b7c10c55 100644
--- a/nuttx/libc/nx/lib_nx_openwindow.c
+++ b/nuttx/libc/nxmu/lib_nx_openwindow.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libc/nx/lib_nx_openwindow.c
+ * libc/nxmu/lib_nx_openwindow.c
  *
  *   Copyright (C) 2008-2009, 2011-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/libc/nx/lib_nx_raise.c b/nuttx/libc/nxmu/lib_nx_raise.c
index 6f35fc7cd..586b11c24 100644
--- a/nuttx/libc/nx/lib_nx_raise.c
+++ b/nuttx/libc/nxmu/lib_nx_raise.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libc/nx/lib_nx_raise.c
+ * libc/nxmu/lib_nx_raise.c
  *
  *   Copyright (C) 2008-2009, 2011-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/libc/nx/lib_nx_releasebkgd.c b/nuttx/libc/nxmu/lib_nx_releasebkgd.c
index 2d2987eae..2d2987eae 100644
--- a/nuttx/libc/nx/lib_nx_releasebkgd.c
+++ b/nuttx/libc/nxmu/lib_nx_releasebkgd.c
diff --git a/nuttx/libc/nx/lib_nx_requestbkgd.c b/nuttx/libc/nxmu/lib_nx_requestbkgd.c
index d61f3f9ad..d61f3f9ad 100644
--- a/nuttx/libc/nx/lib_nx_requestbkgd.c
+++ b/nuttx/libc/nxmu/lib_nx_requestbkgd.c
diff --git a/nuttx/libc/nx/lib_nx_setbgcolor.c b/nuttx/libc/nxmu/lib_nx_setbgcolor.c
index d8f0803d6..d8f0803d6 100644
--- a/nuttx/libc/nx/lib_nx_setbgcolor.c
+++ b/nuttx/libc/nxmu/lib_nx_setbgcolor.c
diff --git a/nuttx/libc/nx/lib_nx_setpixel.c b/nuttx/libc/nxmu/lib_nx_setpixel.c
index 7712f034f..107b0f20f 100644
--- a/nuttx/libc/nx/lib_nx_setpixel.c
+++ b/nuttx/libc/nxmu/lib_nx_setpixel.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libc/nx/lib_nx_setpixel.c
+ * libc/nxmu/lib_nx_setpixel.c
  *
  *   Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/libc/nx/lib_nx_setposition.c b/nuttx/libc/nxmu/lib_nx_setposition.c
index d83da41a7..4e5bd9387 100644
--- a/nuttx/libc/nx/lib_nx_setposition.c
+++ b/nuttx/libc/nxmu/lib_nx_setposition.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libc/nx/lib_nx_setposition.c
+ * libc/nxmu/lib_nx_setposition.c
  *
  *   Copyright (C) 2008-2009, 2011-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/libc/nx/lib_nx_setsize.c b/nuttx/libc/nxmu/lib_nx_setsize.c
index 860d5bd1e..cb5e99dc7 100644
--- a/nuttx/libc/nx/lib_nx_setsize.c
+++ b/nuttx/libc/nxmu/lib_nx_setsize.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libc/nx/lib_nx_setsize.c
+ * libc/nxmu/lib_nx_setsize.c
  *
  *   Copyright (C) 2008-2009, 2011-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/libc/nx/lib_nxmu_constructwindow.c b/nuttx/libc/nxmu/lib_nxmu_constructwindow.c
index 70d951b4e..70d951b4e 100644
--- a/nuttx/libc/nx/lib_nxmu_constructwindow.c
+++ b/nuttx/libc/nxmu/lib_nxmu_constructwindow.c
diff --git a/nuttx/libc/nx/lib_nxmu_semtake.c b/nuttx/libc/nxmu/lib_nxmu_semtake.c
index 2d5ad181d..2d5ad181d 100644
--- a/nuttx/libc/nx/lib_nxmu_semtake.c
+++ b/nuttx/libc/nxmu/lib_nxmu_semtake.c
diff --git a/nuttx/libc/nx/lib_nxmu_sendserver.c b/nuttx/libc/nxmu/lib_nxmu_sendserver.c
index 1bdae3b02..2a089aae2 100644
--- a/nuttx/libc/nx/lib_nxmu_sendserver.c
+++ b/nuttx/libc/nxmu/lib_nxmu_sendserver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libc/nx/lib_nxmu_sendserver.c
+ * libc/nxmu/lib_nxmu_sendserver.c
  *
  *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/libc/nx/lib_nxmu_sendwindow.c b/nuttx/libc/nxmu/lib_nxmu_sendwindow.c
index e7602005c..b841bcf2c 100644
--- a/nuttx/libc/nx/lib_nxmu_sendwindow.c
+++ b/nuttx/libc/nxmu/lib_nxmu_sendwindow.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libc/nx/lib_nxmu_sendserver.c
+ * libc/nxmu/lib_nxmu_sendserver.c
  *
  *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>