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

This commit is contained in:
Gregory Nutt 2013-12-27 15:51:26 -06:00
parent 1e690c5a49
commit ae29bcb5ab
24 changed files with 129 additions and 109 deletions

View File

@ -1,7 +1,7 @@
############################################################################
# graphics/nxglib/Make.defs
#
# Copyright (C) 2008, 2010-2011 Gregory Nutt. All rights reserved.
# Copyright (C) 2008, 2010-2011, 2013 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -33,61 +33,39 @@
#
############################################################################
NXGLIB_ASRCS =
NXGLIB_ASRCS =
SETP1_CSRCS = nxglib_setpixel_1bpp.c nxglib_setpixel_2bpp.c \
nxglib_setpixel_4bpp.c
SETP_CSRCS = nxglib_setpixel_1bpp.c nxglib_setpixel_2bpp.c
SETP_CSRCS += nxglib_setpixel_4bpp.c nxglib_setpixel_8bpp.c
SETP_CSRCS += nxglib_setpixel_16bpp.c nxglib_setpixel_24bpp.c
SETP_CSRCS += nxglib_setpixel_32bpp.c
SETP2_CSRCS = nxglib_setpixel_8bpp.c nxglib_setpixel_16bpp.c \
nxglib_setpixel_24bpp.c nxglib_setpixel_32bpp.c
RFILL_CSRCS = nxglib_fillrectangle_1bpp.c nxglib_fillrectangle_2bpp.c
RFILL_CSRCS += nxglib_fillrectangle_4bpp.c nxglib_fillrectangle_8bpp.c
RFILL_CSRCS += nxglib_fillrectangle_16bpp.c nxglib_fillrectangle_24bpp.c
RFILL_CSRCS += nxglib_fillrectangle_32bpp.c
RFILL1_CSRCS = nxglib_fillrectangle_1bpp.c nxglib_fillrectangle_2bpp.c \
nxglib_fillrectangle_4bpp.c
RGET_CSRCS = nxglib_getrectangle_1bpp.c nxglib_getrectangle_2bpp.c
RGET_CSRCS += nxglib_getrectangle_4bpp.c nxglib_getrectangle_8bpp.c
RGET_CSRCS += nxglib_getrectangle_16bpp.c nxglib_getrectangle_24bpp.c
RGET_CSRCS += nxglib_getrectangle_32bpp.c
RFILL2_CSRCS = nxglib_fillrectangle_8bpp.c nxglib_fillrectangle_16bpp.c \
nxglib_fillrectangle_24bpp.c nxglib_fillrectangle_32bpp.c
TFILL_CSRCS = nxglib_filltrapezoid_1bpp.c nxglib_filltrapezoid_2bpp.c
TFILL_CSRCS += nxglib_filltrapezoid_4bpp.c nxglib_filltrapezoid_8bpp.c
TFILL_CSRCS += nxglib_filltrapezoid_16bpp.c nxglib_filltrapezoid_24bpp.c
TFILL_CSRCS += nxglib_filltrapezoid_32bpp.c
RGET1_CSRCS = nxglib_getrectangle_1bpp.c nxglib_getrectangle_2bpp.c \
nxglib_getrectangle_4bpp.c
RMOVE_CSRCS = nxglib_moverectangle_1bpp.c nxglib_moverectangle_2bpp.c
RMOVE_CSRCS += nxglib_moverectangle_4bpp.cnxglib_moverectangle_8bpp.c
RMOVE_CSRCS += nxglib_moverectangle_16bpp.c nxglib_moverectangle_24bpp.c
RMOVE_CSRCS += nxglib_moverectangle_32bpp.c
RGET2_CSRCS = nxglib_getrectangle_8bpp.c nxglib_getrectangle_16bpp.c \
nxglib_getrectangle_24bpp.c nxglib_getrectangle_32bpp.c
RCOPY_CSRCS = nxglib_copyrectangle_1bpp.c nxglib_copyrectangle_2bpp.c
RCOPY_CSRCS += nxglib_copyrectangle_4bpp.c nxglib_copyrectangle_8bpp.c
RCOPY_CSRCS += nxglib_copyrectangle_16bpp.c nxglib_copyrectangle_24bpp.c
RCOPY_CSRCS += nxglib_copyrectangle_32bpp.c
TFILL1_CSRCS = nxglib_filltrapezoid_1bpp.c nxglib_filltrapezoid_2bpp.c \
nxglib_filltrapezoid_4bpp.c
TFILL2_CSRCS = nxglib_filltrapezoid_8bpp.c nxglib_filltrapezoid_16bpp.c \
nxglib_filltrapezoid_24bpp.c nxglib_filltrapezoid_32bpp.c
RMOVE1_CSRCS = nxglib_moverectangle_1bpp.c nxglib_moverectangle_2bpp.c \
nxglib_moverectangle_4bpp.c
RMOVE2_CSRCS = nxglib_moverectangle_8bpp.c nxglib_moverectangle_16bpp.c \
nxglib_moverectangle_24bpp.c nxglib_moverectangle_32bpp.c
RCOPY1_CSRCS = nxglib_copyrectangle_1bpp.c nxglib_copyrectangle_2bpp.c \
nxglib_copyrectangle_4bpp.c
RCOPY2_CSRCS = nxglib_copyrectangle_8bpp.c nxglib_copyrectangle_16bpp.c \
nxglib_copyrectangle_24bpp.c nxglib_copyrectangle_32bpp.c
RECT_CSRCS = nxglib_rectcopy.c nxglib_rectoffset.c nxglib_vectoradd.c \
nxglib_vectsubtract.c nxglib_rectadd.c nxglib_rectintersect.c \
nxglib_intersecting.c nxglib_nonintersecting.c nxglib_rectunion.c \
nxglib_rectinside.c nxglib_rectoverlap.c nxglib_rectsize.c nxglib_nullrect.c
TRAP_CSRCS = nxglib_runoffset.c nxglib_runcopy.c \
nxglib_trapoffset.c nxglib_trapcopy.c
COLOR_CSRCS = nxglib_colorcopy.c nxglib_rgb2yuv.c nxglib_yuv2rgb.c
DRAW_CSRCS = nxglib_splitline.c nxglib_circlepts.c nxglib_circletraps.c
LCD_CSRCS =
NXGLIB_CSRCS = \
$(SETP1_CSRCS) $(SETP2_CSRCS) $(RFILL1_CSRCS) $(RFILL2_CSRCS) \
$(RGET1_CSRCS) $(RGET2_CSRCS) $(TFILL1_CSRCS) $(TFILL2_CSRCS) \
$(RMOVE1_CSRCS) $(RMOVE2_CSRCS) $(RCOPY1_CSRCS) $(RCOPY2_CSRCS) \
$(RECT_CSRCS) $(TRAP_CSRCS) $(COLOR_CSRCS) $(DRAW_CSRCS) $(LCD_CSRCS)
DRAW_CSRCS = nxglib_splitline.c nxglib_circlepts.c nxglib_circletraps.c
NXGLIB_CSRCS = $(SETP_CSRCS) $(RFILL_CSRCS) $(RGET_CSRCS) $(TFILL_CSRCS)
NXGLIB_CSRCS += $(RMOVE_CSRCS) $(RCOPY_CSRCS) $(DRAW_CSRCS)

View File

@ -65,7 +65,8 @@ include mqueue/Make.defs
include math/Make.defs
include fixedmath/Make.defs
include net/Make.defs
include nxgl/Make.defs
include nxglib/Make.defs
include nx/Make.defs
include nxmu/Make.defs
include time/Make.defs
include libgen/Make.defs

View File

@ -1,5 +1,5 @@
############################################################################
# libc/nxgl/Make.defs
# libc/nx/Make.defs
#
# Copyright (C) 2013 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
@ -37,10 +37,9 @@
ifeq ($(CONFIG_NX),y)
# Add the nxgl/ directory to the build
# Add the nx/ directory to the build
DEPPATH += --dep-path nxgl
VPATH += :nxgl
DEPPATH += --dep-path nx
VPATH += :nx
endif

53
libc/nxglib/Make.defs Normal file
View File

@ -0,0 +1,53 @@
############################################################################
# libc/nxglib/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)
CSRCS += lib_nxglib_colorcopy.c lib_nxglib_intersecting.c lib_nxglib_nonintersecting.c
CSRCS += lib_nxglib_nullrect.c lib_nxglib_rectadd.c lib_nxglib_rectcopy.c
CSRCS += lib_nxglib_rectinside.c lib_nxglib_rectintersect.c lib_nxglib_rectoffset.c
CSRCS += lib_nxglib_rectoverlap.c lib_nxglib_rectsize.c lib_nxglib_rectunion.c
CSRCS += lib_nxglib_rgb2yuv.c lib_nxglib_runcopy.c lib_nxglib_runoffset.c
CSRCS += lib_nxglib_trapcopy.c lib_nxglib_trapoffset.c lib_nxglib_vectoradd.c
CSRCS += lib_nxglib_vectsubtract.c lib_nxglib_yuv2rgb.c
# Add the nxglib/ directory to the build
DEPPATH += --dep-path nxglib
VPATH += :nxglib
endif

View File

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_colorcopy.c
* libc/nxglib/lib_nxglib_colorcopy.c
*
* Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_intersecting.c
* libc/nxglib/lib_nxglib_intersecting.c
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_rectnonintersecting.c
* libc/nxglib/lib_nxglib_rectnonintersecting.c
*
* Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -147,5 +147,3 @@ void nxgl_nonintersecting(FAR struct nxgl_rect_s result[4],
result[NX_RIGHT_NDX].pt2.x = rect1->pt2.x;
result[NX_RIGHT_NDX].pt2.y = intersection.pt2.y;
}

View File

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_nullrect.c
* libc/nxglib/lib_nxglib_nullrect.c
*
* Copyright (C) 2008-2012 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -79,4 +79,3 @@ bool nxgl_nullrect(FAR const struct nxgl_rect_s *rect)
{
return (rect->pt1.x > rect->pt2.x || rect->pt1.y > rect->pt2.y);
}

View File

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_rectadd.c
* libc/nxglib/lib_nxsglib_rectadd.c
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_rectcopy.c
* libc/nxglib/lib_nxglib_rectcopy.c
*
* Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -70,7 +70,7 @@
*
* Description:
* This is essentially memcpy for rectangles. We don't do structure
* assignements because some compilers are not good at that.
* assignments because some compilers are not good at that.
*
****************************************************************************/

View File

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_rectinside.c
* libc/nxglib/nxglib_rectinside.c
*
* Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_rectintersect.c
* libc/nxglib/lib_nxglib_rectintersect.c
*
* Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_rectoffset.c
* lbic/nxglib/lib_nxsglib_rectoffset.c
*
* Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -82,6 +82,3 @@ void nxgl_rectoffset(FAR struct nxgl_rect_s *dest,
dest->pt2.x = src->pt2.x + dx;
dest->pt2.y = src->pt2.y + dy;
}

View File

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_nulloverlap.c
* libc/nxglib/lib_nxglib_nulloverlap.c
*
* Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -87,4 +87,3 @@ bool nxgl_rectoverlap(FAR struct nxgl_rect_s *rect1,
(rect1->pt1.y <= rect2->pt2.y) && /* false: rect1 is wholly below rect2 */
(rect2->pt1.y <= rect1->pt2.y); /* false: rect2 is wholly below rect1 */
}

View File

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxglib_rectsize.c
* libc/nxglib/lib_nxglib_rectsize.c
*
* Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_rectunion.c
* libc/nxglib/lib_nxsglib_rectunion.c
*
* Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/color/nxglib_rgb2yuv.c
* libc/nxglib/lib_nxglib_rgb2yuv.c
*
* Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2008, 2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_runcopy.c
* libc/nxglib/lib_nxglib_runcopy.c
*
* Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_runoffset.c
* libc/nxglib/lib_nxglib_runoffset.c
*
* Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2009, 2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_trapcopy.c
* libc/nxglib/lib_nxglib_trapcopy.c
*
* Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_trapoffset.c
* libc/nxglib/lib_nxglib_trapoffset.c
*
* Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2009, 2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without

View File

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_vectoradd.c
* libc/nxglib/lib_nxsglib_vectoradd.c
*
* Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -80,5 +80,3 @@ void nxgl_vectoradd(FAR struct nxgl_point_s *dest,
dest->x = v1->x + v2->x;
dest->y = v1->y + v2->y;
}

View File

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_vectorsubtract.c
* libc/nxglib/lib_nxglib_vectorsubtract.c
*
* Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -80,5 +80,3 @@ void nxgl_vectsubtract(FAR struct nxgl_point_s *dest,
dest->x = v1->x - v2->x;
dest->y = v1->y - v2->y;
}

View File

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/color/nxglib_yuv2rgb.c
* libc/nxglib/lib_nxglib_yuv2rgb.c
*
* Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2009, 2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without