From 1e690c5a497d4a08dcbccfb4082507dc9a6b8c13 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 27 Dec 2013 14:49:40 -0600 Subject: [PATCH] Decoupling NX user interfaces to support NX kernel build (phase 3) --- libc/Makefile | 3 +- libc/nxgl/Make.defs | 46 ++++++++++++++++++++ libc/{nx => nxmu}/Make.defs | 20 ++++----- libc/{nx => nxmu}/lib_nx_bitmap.c | 2 +- libc/{nx => nxmu}/lib_nx_block.c | 0 libc/{nx => nxmu}/lib_nx_closewindow.c | 0 libc/{nx => nxmu}/lib_nx_connect.c | 0 libc/{nx => nxmu}/lib_nx_disconnect.c | 0 libc/{nx => nxmu}/lib_nx_fill.c | 2 +- libc/{nx => nxmu}/lib_nx_filltrapezoid.c | 2 +- libc/{nx => nxmu}/lib_nx_getposition.c | 2 +- libc/{nx => nxmu}/lib_nx_getrectangle.c | 2 +- libc/{nx => nxmu}/lib_nx_kbdchin.c | 0 libc/{nx => nxmu}/lib_nx_kbdin.c | 0 libc/{nx => nxmu}/lib_nx_lower.c | 2 +- libc/{nx => nxmu}/lib_nx_mousein.c | 0 libc/{nx => nxmu}/lib_nx_move.c | 2 +- libc/{nx => nxmu}/lib_nx_openwindow.c | 2 +- libc/{nx => nxmu}/lib_nx_raise.c | 2 +- libc/{nx => nxmu}/lib_nx_releasebkgd.c | 0 libc/{nx => nxmu}/lib_nx_requestbkgd.c | 0 libc/{nx => nxmu}/lib_nx_setbgcolor.c | 0 libc/{nx => nxmu}/lib_nx_setpixel.c | 2 +- libc/{nx => nxmu}/lib_nx_setposition.c | 2 +- libc/{nx => nxmu}/lib_nx_setsize.c | 2 +- libc/{nx => nxmu}/lib_nxmu_constructwindow.c | 0 libc/{nx => nxmu}/lib_nxmu_semtake.c | 0 libc/{nx => nxmu}/lib_nxmu_sendserver.c | 2 +- libc/{nx => nxmu}/lib_nxmu_sendwindow.c | 2 +- 29 files changed, 72 insertions(+), 25 deletions(-) create mode 100644 libc/nxgl/Make.defs rename libc/{nx => nxmu}/Make.defs (94%) rename libc/{nx => nxmu}/lib_nx_bitmap.c (99%) rename libc/{nx => nxmu}/lib_nx_block.c (100%) rename libc/{nx => nxmu}/lib_nx_closewindow.c (100%) rename libc/{nx => nxmu}/lib_nx_connect.c (100%) rename libc/{nx => nxmu}/lib_nx_disconnect.c (100%) rename libc/{nx => nxmu}/lib_nx_fill.c (99%) rename libc/{nx => nxmu}/lib_nx_filltrapezoid.c (99%) rename libc/{nx => nxmu}/lib_nx_getposition.c (99%) rename libc/{nx => nxmu}/lib_nx_getrectangle.c (99%) rename libc/{nx => nxmu}/lib_nx_kbdchin.c (100%) rename libc/{nx => nxmu}/lib_nx_kbdin.c (100%) rename libc/{nx => nxmu}/lib_nx_lower.c (99%) rename libc/{nx => nxmu}/lib_nx_mousein.c (100%) rename libc/{nx => nxmu}/lib_nx_move.c (99%) rename libc/{nx => nxmu}/lib_nx_openwindow.c (99%) rename libc/{nx => nxmu}/lib_nx_raise.c (99%) rename libc/{nx => nxmu}/lib_nx_releasebkgd.c (100%) rename libc/{nx => nxmu}/lib_nx_requestbkgd.c (100%) rename libc/{nx => nxmu}/lib_nx_setbgcolor.c (100%) rename libc/{nx => nxmu}/lib_nx_setpixel.c (99%) rename libc/{nx => nxmu}/lib_nx_setposition.c (99%) rename libc/{nx => nxmu}/lib_nx_setsize.c (99%) rename libc/{nx => nxmu}/lib_nxmu_constructwindow.c (100%) rename libc/{nx => nxmu}/lib_nxmu_semtake.c (100%) rename libc/{nx => nxmu}/lib_nxmu_sendserver.c (99%) rename libc/{nx => nxmu}/lib_nxmu_sendwindow.c (99%) diff --git a/libc/Makefile b/libc/Makefile index 759fcec184..692a4d2a05 100644 --- a/libc/Makefile +++ b/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/libc/nxgl/Make.defs b/libc/nxgl/Make.defs new file mode 100644 index 0000000000..f97b34f200 --- /dev/null +++ b/libc/nxgl/Make.defs @@ -0,0 +1,46 @@ +############################################################################ +# libc/nxgl/Make.defs +# +# Copyright (C) 2013 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# 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/libc/nx/Make.defs b/libc/nxmu/Make.defs similarity index 94% rename from libc/nx/Make.defs rename to libc/nxmu/Make.defs index 8ac8adb481..376d0845d8 100644 --- a/libc/nx/Make.defs +++ b/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 @@ -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 diff --git a/libc/nx/lib_nx_bitmap.c b/libc/nxmu/lib_nx_bitmap.c similarity index 99% rename from libc/nx/lib_nx_bitmap.c rename to libc/nxmu/lib_nx_bitmap.c index fdd0b97173..56486d1be6 100644 --- a/libc/nx/lib_nx_bitmap.c +++ b/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 diff --git a/libc/nx/lib_nx_block.c b/libc/nxmu/lib_nx_block.c similarity index 100% rename from libc/nx/lib_nx_block.c rename to libc/nxmu/lib_nx_block.c diff --git a/libc/nx/lib_nx_closewindow.c b/libc/nxmu/lib_nx_closewindow.c similarity index 100% rename from libc/nx/lib_nx_closewindow.c rename to libc/nxmu/lib_nx_closewindow.c diff --git a/libc/nx/lib_nx_connect.c b/libc/nxmu/lib_nx_connect.c similarity index 100% rename from libc/nx/lib_nx_connect.c rename to libc/nxmu/lib_nx_connect.c diff --git a/libc/nx/lib_nx_disconnect.c b/libc/nxmu/lib_nx_disconnect.c similarity index 100% rename from libc/nx/lib_nx_disconnect.c rename to libc/nxmu/lib_nx_disconnect.c diff --git a/libc/nx/lib_nx_fill.c b/libc/nxmu/lib_nx_fill.c similarity index 99% rename from libc/nx/lib_nx_fill.c rename to libc/nxmu/lib_nx_fill.c index bc03076225..9246bfe38a 100644 --- a/libc/nx/lib_nx_fill.c +++ b/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 diff --git a/libc/nx/lib_nx_filltrapezoid.c b/libc/nxmu/lib_nx_filltrapezoid.c similarity index 99% rename from libc/nx/lib_nx_filltrapezoid.c rename to libc/nxmu/lib_nx_filltrapezoid.c index 0d6b826ec2..445891629d 100644 --- a/libc/nx/lib_nx_filltrapezoid.c +++ b/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 diff --git a/libc/nx/lib_nx_getposition.c b/libc/nxmu/lib_nx_getposition.c similarity index 99% rename from libc/nx/lib_nx_getposition.c rename to libc/nxmu/lib_nx_getposition.c index 4a0ae30b95..0f901df083 100644 --- a/libc/nx/lib_nx_getposition.c +++ b/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 diff --git a/libc/nx/lib_nx_getrectangle.c b/libc/nxmu/lib_nx_getrectangle.c similarity index 99% rename from libc/nx/lib_nx_getrectangle.c rename to libc/nxmu/lib_nx_getrectangle.c index e815e5a17f..757b1c55b0 100644 --- a/libc/nx/lib_nx_getrectangle.c +++ b/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 diff --git a/libc/nx/lib_nx_kbdchin.c b/libc/nxmu/lib_nx_kbdchin.c similarity index 100% rename from libc/nx/lib_nx_kbdchin.c rename to libc/nxmu/lib_nx_kbdchin.c diff --git a/libc/nx/lib_nx_kbdin.c b/libc/nxmu/lib_nx_kbdin.c similarity index 100% rename from libc/nx/lib_nx_kbdin.c rename to libc/nxmu/lib_nx_kbdin.c diff --git a/libc/nx/lib_nx_lower.c b/libc/nxmu/lib_nx_lower.c similarity index 99% rename from libc/nx/lib_nx_lower.c rename to libc/nxmu/lib_nx_lower.c index 64a8b58480..59c80087e9 100644 --- a/libc/nx/lib_nx_lower.c +++ b/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 diff --git a/libc/nx/lib_nx_mousein.c b/libc/nxmu/lib_nx_mousein.c similarity index 100% rename from libc/nx/lib_nx_mousein.c rename to libc/nxmu/lib_nx_mousein.c diff --git a/libc/nx/lib_nx_move.c b/libc/nxmu/lib_nx_move.c similarity index 99% rename from libc/nx/lib_nx_move.c rename to libc/nxmu/lib_nx_move.c index 30ab332591..2adc78ea34 100644 --- a/libc/nx/lib_nx_move.c +++ b/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 diff --git a/libc/nx/lib_nx_openwindow.c b/libc/nxmu/lib_nx_openwindow.c similarity index 99% rename from libc/nx/lib_nx_openwindow.c rename to libc/nxmu/lib_nx_openwindow.c index a663b6493e..5b7c10c556 100644 --- a/libc/nx/lib_nx_openwindow.c +++ b/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 diff --git a/libc/nx/lib_nx_raise.c b/libc/nxmu/lib_nx_raise.c similarity index 99% rename from libc/nx/lib_nx_raise.c rename to libc/nxmu/lib_nx_raise.c index 6f35fc7cd4..586b11c241 100644 --- a/libc/nx/lib_nx_raise.c +++ b/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 diff --git a/libc/nx/lib_nx_releasebkgd.c b/libc/nxmu/lib_nx_releasebkgd.c similarity index 100% rename from libc/nx/lib_nx_releasebkgd.c rename to libc/nxmu/lib_nx_releasebkgd.c diff --git a/libc/nx/lib_nx_requestbkgd.c b/libc/nxmu/lib_nx_requestbkgd.c similarity index 100% rename from libc/nx/lib_nx_requestbkgd.c rename to libc/nxmu/lib_nx_requestbkgd.c diff --git a/libc/nx/lib_nx_setbgcolor.c b/libc/nxmu/lib_nx_setbgcolor.c similarity index 100% rename from libc/nx/lib_nx_setbgcolor.c rename to libc/nxmu/lib_nx_setbgcolor.c diff --git a/libc/nx/lib_nx_setpixel.c b/libc/nxmu/lib_nx_setpixel.c similarity index 99% rename from libc/nx/lib_nx_setpixel.c rename to libc/nxmu/lib_nx_setpixel.c index 7712f034f9..107b0f20f1 100644 --- a/libc/nx/lib_nx_setpixel.c +++ b/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 diff --git a/libc/nx/lib_nx_setposition.c b/libc/nxmu/lib_nx_setposition.c similarity index 99% rename from libc/nx/lib_nx_setposition.c rename to libc/nxmu/lib_nx_setposition.c index d83da41a74..4e5bd9387c 100644 --- a/libc/nx/lib_nx_setposition.c +++ b/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 diff --git a/libc/nx/lib_nx_setsize.c b/libc/nxmu/lib_nx_setsize.c similarity index 99% rename from libc/nx/lib_nx_setsize.c rename to libc/nxmu/lib_nx_setsize.c index 860d5bd1e5..cb5e99dc7d 100644 --- a/libc/nx/lib_nx_setsize.c +++ b/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 diff --git a/libc/nx/lib_nxmu_constructwindow.c b/libc/nxmu/lib_nxmu_constructwindow.c similarity index 100% rename from libc/nx/lib_nxmu_constructwindow.c rename to libc/nxmu/lib_nxmu_constructwindow.c diff --git a/libc/nx/lib_nxmu_semtake.c b/libc/nxmu/lib_nxmu_semtake.c similarity index 100% rename from libc/nx/lib_nxmu_semtake.c rename to libc/nxmu/lib_nxmu_semtake.c diff --git a/libc/nx/lib_nxmu_sendserver.c b/libc/nxmu/lib_nxmu_sendserver.c similarity index 99% rename from libc/nx/lib_nxmu_sendserver.c rename to libc/nxmu/lib_nxmu_sendserver.c index 1bdae3b02f..2a089aae21 100644 --- a/libc/nx/lib_nxmu_sendserver.c +++ b/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 diff --git a/libc/nx/lib_nxmu_sendwindow.c b/libc/nxmu/lib_nxmu_sendwindow.c similarity index 99% rename from libc/nx/lib_nxmu_sendwindow.c rename to libc/nxmu/lib_nxmu_sendwindow.c index e7602005c9..b841bcf2c8 100644 --- a/libc/nx/lib_nxmu_sendwindow.c +++ b/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