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

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

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
+

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
+
+# Add the nxmu/ directory to the build
+
+DEPPATH += --dep-path nxmu
+VPATH += :nxmu
+
+endif
 endif
 
-# Add the nx/ directory to the build
-
-DEPPATH += --dep-path nx
-VPATH += :nx
-endif

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>