From ae29bcb5ab18dc1f28ce9af89890d831245840a6 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 27 Dec 2013 15:51:26 -0600 Subject: [PATCH] Decoupling NX user interfaces to support NX kernel build (phase 4) --- graphics/nxglib/Make.defs | 80 +++++++------------ libc/Makefile | 3 +- libc/{nxgl => nx}/Make.defs | 9 +-- libc/nxglib/Make.defs | 53 ++++++++++++ .../nxglib/lib_nxglib_colorcopy.c | 4 +- .../nxglib/lib_nxglib_intersecting.c | 4 +- .../nxglib/lib_nxglib_nonintersecting.c | 6 +- .../nxglib/lib_nxglib_nullrect.c | 5 +- .../nxglib/lib_nxglib_rectadd.c | 4 +- .../nxglib/lib_nxglib_rectcopy.c | 6 +- .../nxglib/lib_nxglib_rectinside.c | 4 +- .../nxglib/lib_nxglib_rectintersect.c | 4 +- .../nxglib/lib_nxglib_rectoffset.c | 7 +- .../nxglib/lib_nxglib_rectoverlap.c | 5 +- .../nxglib/lib_nxglib_rectsize.c | 4 +- .../nxglib/lib_nxglib_rectunion.c | 4 +- .../nxglib/lib_nxglib_rgb2yuv.c | 4 +- .../nxglib/lib_nxglib_runcopy.c | 4 +- .../nxglib/lib_nxglib_runoffset.c | 4 +- .../nxglib/lib_nxglib_trapcopy.c | 4 +- .../nxglib/lib_nxglib_trapoffset.c | 4 +- .../nxglib/lib_nxglib_vectoradd.c | 6 +- .../nxglib/lib_nxglib_vectsubtract.c | 6 +- .../nxglib/lib_nxglib_yuv2rgb.c | 4 +- 24 files changed, 129 insertions(+), 109 deletions(-) rename libc/{nxgl => nx}/Make.defs (94%) create mode 100644 libc/nxglib/Make.defs rename graphics/nxglib/nxglib_colorcopy.c => libc/nxglib/lib_nxglib_colorcopy.c (97%) rename graphics/nxglib/nxglib_intersecting.c => libc/nxglib/lib_nxglib_intersecting.c (97%) rename graphics/nxglib/nxglib_nonintersecting.c => libc/nxglib/lib_nxglib_nonintersecting.c (98%) rename graphics/nxglib/nxglib_nullrect.c => libc/nxglib/lib_nxglib_nullrect.c (97%) rename graphics/nxglib/nxglib_rectadd.c => libc/nxglib/lib_nxglib_rectadd.c (97%) rename graphics/nxglib/nxglib_rectcopy.c => libc/nxglib/lib_nxglib_rectcopy.c (95%) rename graphics/nxglib/nxglib_rectinside.c => libc/nxglib/lib_nxglib_rectinside.c (97%) rename graphics/nxglib/nxglib_rectintersect.c => libc/nxglib/lib_nxglib_rectintersect.c (97%) rename graphics/nxglib/nxglib_rectoffset.c => libc/nxglib/lib_nxglib_rectoffset.c (97%) rename graphics/nxglib/nxglib_rectoverlap.c => libc/nxglib/lib_nxglib_rectoverlap.c (97%) rename graphics/nxglib/nxglib_rectsize.c => libc/nxglib/lib_nxglib_rectsize.c (96%) rename graphics/nxglib/nxglib_rectunion.c => libc/nxglib/lib_nxglib_rectunion.c (97%) rename graphics/nxglib/nxglib_rgb2yuv.c => libc/nxglib/lib_nxglib_rgb2yuv.c (97%) rename graphics/nxglib/nxglib_runcopy.c => libc/nxglib/lib_nxglib_runcopy.c (97%) rename graphics/nxglib/nxglib_runoffset.c => libc/nxglib/lib_nxglib_runoffset.c (96%) rename graphics/nxglib/nxglib_trapcopy.c => libc/nxglib/lib_nxglib_trapcopy.c (97%) rename graphics/nxglib/nxglib_trapoffset.c => libc/nxglib/lib_nxglib_trapoffset.c (96%) rename graphics/nxglib/nxglib_vectoradd.c => libc/nxglib/lib_nxglib_vectoradd.c (96%) rename graphics/nxglib/nxglib_vectsubtract.c => libc/nxglib/lib_nxglib_vectsubtract.c (96%) rename graphics/nxglib/nxglib_yuv2rgb.c => libc/nxglib/lib_nxglib_yuv2rgb.c (97%) diff --git a/graphics/nxglib/Make.defs b/graphics/nxglib/Make.defs index 240cdbd7cb..1223d3bdc8 100644 --- a/graphics/nxglib/Make.defs +++ b/graphics/nxglib/Make.defs @@ -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 # # 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) diff --git a/libc/Makefile b/libc/Makefile index 692a4d2a05..5573f98f0c 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 nxgl/Make.defs +include nxglib/Make.defs +include nx/Make.defs include nxmu/Make.defs include time/Make.defs include libgen/Make.defs diff --git a/libc/nxgl/Make.defs b/libc/nx/Make.defs similarity index 94% rename from libc/nxgl/Make.defs rename to libc/nx/Make.defs index f97b34f200..1a48ad3165 100644 --- a/libc/nxgl/Make.defs +++ b/libc/nx/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# libc/nxgl/Make.defs +# libc/nx/Make.defs # # Copyright (C) 2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -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 - diff --git a/libc/nxglib/Make.defs b/libc/nxglib/Make.defs new file mode 100644 index 0000000000..f323ae5f41 --- /dev/null +++ b/libc/nxglib/Make.defs @@ -0,0 +1,53 @@ +############################################################################ +# libc/nxglib/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) + +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 diff --git a/graphics/nxglib/nxglib_colorcopy.c b/libc/nxglib/lib_nxglib_colorcopy.c similarity index 97% rename from graphics/nxglib/nxglib_colorcopy.c rename to libc/nxglib/lib_nxglib_colorcopy.c index 42c0d0d451..6f6bbc434a 100644 --- a/graphics/nxglib/nxglib_colorcopy.c +++ b/libc/nxglib/lib_nxglib_colorcopy.c @@ -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 * * Redistribution and use in source and binary forms, with or without diff --git a/graphics/nxglib/nxglib_intersecting.c b/libc/nxglib/lib_nxglib_intersecting.c similarity index 97% rename from graphics/nxglib/nxglib_intersecting.c rename to libc/nxglib/lib_nxglib_intersecting.c index e1370c1404..576d03678d 100644 --- a/graphics/nxglib/nxglib_intersecting.c +++ b/libc/nxglib/lib_nxglib_intersecting.c @@ -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 * * Redistribution and use in source and binary forms, with or without diff --git a/graphics/nxglib/nxglib_nonintersecting.c b/libc/nxglib/lib_nxglib_nonintersecting.c similarity index 98% rename from graphics/nxglib/nxglib_nonintersecting.c rename to libc/nxglib/lib_nxglib_nonintersecting.c index d78da994e8..f406b791fc 100644 --- a/graphics/nxglib/nxglib_nonintersecting.c +++ b/libc/nxglib/lib_nxglib_nonintersecting.c @@ -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 * * 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; } - - diff --git a/graphics/nxglib/nxglib_nullrect.c b/libc/nxglib/lib_nxglib_nullrect.c similarity index 97% rename from graphics/nxglib/nxglib_nullrect.c rename to libc/nxglib/lib_nxglib_nullrect.c index 26fc9e8d72..89fa23d9a2 100644 --- a/graphics/nxglib/nxglib_nullrect.c +++ b/libc/nxglib/lib_nxglib_nullrect.c @@ -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 * * 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); } - diff --git a/graphics/nxglib/nxglib_rectadd.c b/libc/nxglib/lib_nxglib_rectadd.c similarity index 97% rename from graphics/nxglib/nxglib_rectadd.c rename to libc/nxglib/lib_nxglib_rectadd.c index f4eda341d5..2968055d08 100644 --- a/graphics/nxglib/nxglib_rectadd.c +++ b/libc/nxglib/lib_nxglib_rectadd.c @@ -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 * * Redistribution and use in source and binary forms, with or without diff --git a/graphics/nxglib/nxglib_rectcopy.c b/libc/nxglib/lib_nxglib_rectcopy.c similarity index 95% rename from graphics/nxglib/nxglib_rectcopy.c rename to libc/nxglib/lib_nxglib_rectcopy.c index 67e5f6d691..c464a3a28a 100644 --- a/graphics/nxglib/nxglib_rectcopy.c +++ b/libc/nxglib/lib_nxglib_rectcopy.c @@ -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 * * 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. * ****************************************************************************/ diff --git a/graphics/nxglib/nxglib_rectinside.c b/libc/nxglib/lib_nxglib_rectinside.c similarity index 97% rename from graphics/nxglib/nxglib_rectinside.c rename to libc/nxglib/lib_nxglib_rectinside.c index 6ca29ddb6e..2c8f434f75 100644 --- a/graphics/nxglib/nxglib_rectinside.c +++ b/libc/nxglib/lib_nxglib_rectinside.c @@ -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 * * Redistribution and use in source and binary forms, with or without diff --git a/graphics/nxglib/nxglib_rectintersect.c b/libc/nxglib/lib_nxglib_rectintersect.c similarity index 97% rename from graphics/nxglib/nxglib_rectintersect.c rename to libc/nxglib/lib_nxglib_rectintersect.c index 6af24ee268..4804c82d01 100644 --- a/graphics/nxglib/nxglib_rectintersect.c +++ b/libc/nxglib/lib_nxglib_rectintersect.c @@ -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 * * Redistribution and use in source and binary forms, with or without diff --git a/graphics/nxglib/nxglib_rectoffset.c b/libc/nxglib/lib_nxglib_rectoffset.c similarity index 97% rename from graphics/nxglib/nxglib_rectoffset.c rename to libc/nxglib/lib_nxglib_rectoffset.c index 2392d64486..82e2e43c84 100644 --- a/graphics/nxglib/nxglib_rectoffset.c +++ b/libc/nxglib/lib_nxglib_rectoffset.c @@ -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 * * 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; } - - - diff --git a/graphics/nxglib/nxglib_rectoverlap.c b/libc/nxglib/lib_nxglib_rectoverlap.c similarity index 97% rename from graphics/nxglib/nxglib_rectoverlap.c rename to libc/nxglib/lib_nxglib_rectoverlap.c index 779951881b..f278b1e5e2 100644 --- a/graphics/nxglib/nxglib_rectoverlap.c +++ b/libc/nxglib/lib_nxglib_rectoverlap.c @@ -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 * * 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 */ } - diff --git a/graphics/nxglib/nxglib_rectsize.c b/libc/nxglib/lib_nxglib_rectsize.c similarity index 96% rename from graphics/nxglib/nxglib_rectsize.c rename to libc/nxglib/lib_nxglib_rectsize.c index 37d8635968..65342450a9 100644 --- a/graphics/nxglib/nxglib_rectsize.c +++ b/libc/nxglib/lib_nxglib_rectsize.c @@ -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 * * Redistribution and use in source and binary forms, with or without diff --git a/graphics/nxglib/nxglib_rectunion.c b/libc/nxglib/lib_nxglib_rectunion.c similarity index 97% rename from graphics/nxglib/nxglib_rectunion.c rename to libc/nxglib/lib_nxglib_rectunion.c index 36c0968fa3..9e3700c0d1 100644 --- a/graphics/nxglib/nxglib_rectunion.c +++ b/libc/nxglib/lib_nxglib_rectunion.c @@ -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 * * Redistribution and use in source and binary forms, with or without diff --git a/graphics/nxglib/nxglib_rgb2yuv.c b/libc/nxglib/lib_nxglib_rgb2yuv.c similarity index 97% rename from graphics/nxglib/nxglib_rgb2yuv.c rename to libc/nxglib/lib_nxglib_rgb2yuv.c index 31eff23fa7..00b02c7a1a 100644 --- a/graphics/nxglib/nxglib_rgb2yuv.c +++ b/libc/nxglib/lib_nxglib_rgb2yuv.c @@ -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 * * Redistribution and use in source and binary forms, with or without diff --git a/graphics/nxglib/nxglib_runcopy.c b/libc/nxglib/lib_nxglib_runcopy.c similarity index 97% rename from graphics/nxglib/nxglib_runcopy.c rename to libc/nxglib/lib_nxglib_runcopy.c index b6170638c2..fc9dd6c743 100644 --- a/graphics/nxglib/nxglib_runcopy.c +++ b/libc/nxglib/lib_nxglib_runcopy.c @@ -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 * * Redistribution and use in source and binary forms, with or without diff --git a/graphics/nxglib/nxglib_runoffset.c b/libc/nxglib/lib_nxglib_runoffset.c similarity index 96% rename from graphics/nxglib/nxglib_runoffset.c rename to libc/nxglib/lib_nxglib_runoffset.c index 0c569ce2f2..170f8d1dc8 100644 --- a/graphics/nxglib/nxglib_runoffset.c +++ b/libc/nxglib/lib_nxglib_runoffset.c @@ -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 * * Redistribution and use in source and binary forms, with or without diff --git a/graphics/nxglib/nxglib_trapcopy.c b/libc/nxglib/lib_nxglib_trapcopy.c similarity index 97% rename from graphics/nxglib/nxglib_trapcopy.c rename to libc/nxglib/lib_nxglib_trapcopy.c index f35da18e1e..d99aa2faa5 100644 --- a/graphics/nxglib/nxglib_trapcopy.c +++ b/libc/nxglib/lib_nxglib_trapcopy.c @@ -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 * * Redistribution and use in source and binary forms, with or without diff --git a/graphics/nxglib/nxglib_trapoffset.c b/libc/nxglib/lib_nxglib_trapoffset.c similarity index 96% rename from graphics/nxglib/nxglib_trapoffset.c rename to libc/nxglib/lib_nxglib_trapoffset.c index a90631f065..dd2e74f365 100644 --- a/graphics/nxglib/nxglib_trapoffset.c +++ b/libc/nxglib/lib_nxglib_trapoffset.c @@ -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 * * Redistribution and use in source and binary forms, with or without diff --git a/graphics/nxglib/nxglib_vectoradd.c b/libc/nxglib/lib_nxglib_vectoradd.c similarity index 96% rename from graphics/nxglib/nxglib_vectoradd.c rename to libc/nxglib/lib_nxglib_vectoradd.c index 7da5eb1371..50e8cfae4c 100644 --- a/graphics/nxglib/nxglib_vectoradd.c +++ b/libc/nxglib/lib_nxglib_vectoradd.c @@ -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 * * 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; } - - diff --git a/graphics/nxglib/nxglib_vectsubtract.c b/libc/nxglib/lib_nxglib_vectsubtract.c similarity index 96% rename from graphics/nxglib/nxglib_vectsubtract.c rename to libc/nxglib/lib_nxglib_vectsubtract.c index c830a1a33b..2780157d95 100644 --- a/graphics/nxglib/nxglib_vectsubtract.c +++ b/libc/nxglib/lib_nxglib_vectsubtract.c @@ -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 * * 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; } - - diff --git a/graphics/nxglib/nxglib_yuv2rgb.c b/libc/nxglib/lib_nxglib_yuv2rgb.c similarity index 97% rename from graphics/nxglib/nxglib_yuv2rgb.c rename to libc/nxglib/lib_nxglib_yuv2rgb.c index cb4bb9f2fb..0732d173e8 100644 --- a/graphics/nxglib/nxglib_yuv2rgb.c +++ b/libc/nxglib/lib_nxglib_yuv2rgb.c @@ -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 * * Redistribution and use in source and binary forms, with or without