diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-04-17 01:46:15 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-04-17 01:46:15 +0000 |
| commit | 3696bf9a4590f113b47e69335f00a83df8e2b8d4 (patch) | |
| tree | e7a7a1c485b291939ad07691c94b2506f558e0f3 /nuttx | |
| parent | 51a8a55a1b0ee73fddc3a243399dc25148910693 (diff) | |
| download | px4-nuttx-3696bf9a4590f113b47e69335f00a83df8e2b8d4.tar.gz px4-nuttx-3696bf9a4590f113b47e69335f00a83df8e2b8d4.tar.bz2 px4-nuttx-3696bf9a4590f113b47e69335f00a83df8e2b8d4.zip | |
Separating out framebuffer dependencies
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2595 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
19 files changed, 37 insertions, 45 deletions
diff --git a/nuttx/graphics/nxglib/Makefile.sources b/nuttx/graphics/nxglib/Makefile.sources index 7e83b8e34..fe2812e42 100644 --- a/nuttx/graphics/nxglib/Makefile.sources +++ b/nuttx/graphics/nxglib/Makefile.sources @@ -1,7 +1,7 @@ ############################################################################ # graphics/nxglib/Makefile.sources # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -96,33 +96,39 @@ RCOPY_TMP = $(RCOPY_CSRC:.c=.i) GEN_CSRCS = $(RFILL_CSRC) $(TFILL_CSRC) $(RMOVE_CSRC) $(RCOPY_CSRC) +ifeq ($(CONFIG_NX_LCDDRIVER),y) +BLITDIR = lcd +else +BLITDIR = fb +endif + all: $(GEN_CSRCS) .PHONY : clean distclean -$(RFILL_CSRC) : nxglib_fillrectangle.c nxglib_bitblit.h +$(RFILL_CSRC) : $(BLITDIR)/nxglib_fillrectangle.c nxglib_bitblit.h ifneq ($(NXGLIB_BITSPERPIXEL),) - @$(call PREPROCESS, nxglib_fillrectangle.c, $(RFILL_TMP)) + @$(call PREPROCESS, $(BLITDIR)/nxglib_fillrectangle.c, $(RFILL_TMP)) @cat $(RFILL_TMP) | sed -e "/^#/d" >$@ @rm -f $(RFILL_TMP) endif -$(TFILL_CSRC) : nxglib_filltrapezoid.c nxglib_bitblit.h +$(TFILL_CSRC) : $(BLITDIR)/nxglib_filltrapezoid.c nxglib_bitblit.h ifneq ($(NXGLIB_BITSPERPIXEL),) - @$(call PREPROCESS, nxglib_filltrapezoid.c, $(TFILL_TMP)) + @$(call PREPROCESS, $(BLITDIR)/nxglib_filltrapezoid.c, $(TFILL_TMP)) @cat $(TFILL_TMP) | sed -e "/^#/d" >$@ @rm -f $(TFILL_TMP) endif -$(RMOVE_CSRC) : nxglib_moverectangle.c nxglib_bitblit.h +$(RMOVE_CSRC) : $(BLITDIR)/nxglib_moverectangle.c nxglib_bitblit.h ifneq ($(NXGLIB_BITSPERPIXEL),) - @$(call PREPROCESS, nxglib_moverectangle.c, $(RMOVE_TMP)) + @$(call PREPROCESS, $(BLITDIR)/nxglib_moverectangle.c, $(RMOVE_TMP)) @cat $(RMOVE_TMP) | sed -e "/^#/d" >$@ @rm -f $(RMOVE_TMP) endif -$(RCOPY_CSRC) : nxglib_copyrectangle.c nxglib_bitblit.h +$(RCOPY_CSRC) : $(BLITDIR)/nxglib_copyrectangle.c nxglib_bitblit.h ifneq ($(NXGLIB_BITSPERPIXEL),) - @$(call PREPROCESS, nxglib_copyrectangle.c, $(RCOPY_TMP)) + @$(call PREPROCESS, $(BLITDIR)/nxglib_copyrectangle.c, $(RCOPY_TMP)) @cat $(RCOPY_TMP) | sed -e "/^#/d" >$@ @rm -f $(RCOPY_TMP) endif diff --git a/nuttx/graphics/nxglib/nxglib_copyrectangle.c b/nuttx/graphics/nxglib/fb/nxglib_copyrectangle.c index 4cb1e182e..70ff8c329 100644 --- a/nuttx/graphics/nxglib/nxglib_copyrectangle.c +++ b/nuttx/graphics/nxglib/fb/nxglib_copyrectangle.c @@ -1,7 +1,7 @@ /**************************************************************************** - * graphics/nxglib/nxsglib_copyrectangle.c + * graphics/nxglib/fb/nxsglib_copyrectangle.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without diff --git a/nuttx/graphics/nxglib/nxglib_fillrectangle.c b/nuttx/graphics/nxglib/fb/nxglib_fillrectangle.c index 3d0d13285..47fd6096f 100644 --- a/nuttx/graphics/nxglib/nxglib_fillrectangle.c +++ b/nuttx/graphics/nxglib/fb/nxglib_fillrectangle.c @@ -1,7 +1,7 @@ /**************************************************************************** - * graphics/nxglib/nxglib_fillrectangle.c + * graphics/nxglib/fb/nxglib_fillrectangle.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without diff --git a/nuttx/graphics/nxglib/nxglib_filltrapezoid.c b/nuttx/graphics/nxglib/fb/nxglib_filltrapezoid.c index 4fd94fe82..89fd5ed62 100644 --- a/nuttx/graphics/nxglib/nxglib_filltrapezoid.c +++ b/nuttx/graphics/nxglib/fb/nxglib_filltrapezoid.c @@ -1,7 +1,7 @@ /**************************************************************************** - * graphics/nxglib/nxglib_filltrapezoid.c + * graphics/nxglib/fb/nxglib_filltrapezoid.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without diff --git a/nuttx/graphics/nxglib/nxglib_moverectangle.c b/nuttx/graphics/nxglib/fb/nxglib_moverectangle.c index dc1ec00cd..228bc3bb9 100644 --- a/nuttx/graphics/nxglib/nxglib_moverectangle.c +++ b/nuttx/graphics/nxglib/fb/nxglib_moverectangle.c @@ -1,7 +1,7 @@ /**************************************************************************** - * graphics/nxglib/nxglib_moverectangle.c + * graphics/nxglib/fb/nxglib_moverectangle.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without diff --git a/nuttx/graphics/nxglib/nxglib_colorcopy.c b/nuttx/graphics/nxglib/nxglib_colorcopy.c index 43e348969..ecbb3b6fe 100644 --- a/nuttx/graphics/nxglib/nxglib_colorcopy.c +++ b/nuttx/graphics/nxglib/nxglib_colorcopy.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_colorcopy.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <nuttx/fb.h> #include <nuttx/nxglib.h> /**************************************************************************** diff --git a/nuttx/graphics/nxglib/nxglib_nonintersecting.c b/nuttx/graphics/nxglib/nxglib_nonintersecting.c index fd5cddfb3..dcfc2590f 100644 --- a/nuttx/graphics/nxglib/nxglib_nonintersecting.c +++ b/nuttx/graphics/nxglib/nxglib_nonintersecting.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_rectnonintersecting.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <nuttx/fb.h> #include <nuttx/nxglib.h> /**************************************************************************** diff --git a/nuttx/graphics/nxglib/nxglib_nullrect.c b/nuttx/graphics/nxglib/nxglib_nullrect.c index c472dc50b..fb0980480 100644 --- a/nuttx/graphics/nxglib/nxglib_nullrect.c +++ b/nuttx/graphics/nxglib/nxglib_nullrect.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_nullrect.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -41,7 +41,6 @@ #include <stdbool.h> -#include <nuttx/fb.h> #include <nuttx/nxglib.h> /**************************************************************************** diff --git a/nuttx/graphics/nxglib/nxglib_rectcopy.c b/nuttx/graphics/nxglib/nxglib_rectcopy.c index 53fb18cbf..561c18e5c 100644 --- a/nuttx/graphics/nxglib/nxglib_rectcopy.c +++ b/nuttx/graphics/nxglib/nxglib_rectcopy.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_rectcopy.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <nuttx/fb.h> #include <nuttx/nxglib.h> /**************************************************************************** diff --git a/nuttx/graphics/nxglib/nxglib_rectinside.c b/nuttx/graphics/nxglib/nxglib_rectinside.c index 615646e70..864de7fd6 100644 --- a/nuttx/graphics/nxglib/nxglib_rectinside.c +++ b/nuttx/graphics/nxglib/nxglib_rectinside.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_rectinside.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -41,7 +41,6 @@ #include <stdbool.h> -#include <nuttx/fb.h> #include <nuttx/nxglib.h> /**************************************************************************** diff --git a/nuttx/graphics/nxglib/nxglib_rectintersect.c b/nuttx/graphics/nxglib/nxglib_rectintersect.c index 1f41898c7..b4e04e440 100644 --- a/nuttx/graphics/nxglib/nxglib_rectintersect.c +++ b/nuttx/graphics/nxglib/nxglib_rectintersect.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_rectintersect.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <nuttx/fb.h> #include <nuttx/nxglib.h> /**************************************************************************** diff --git a/nuttx/graphics/nxglib/nxglib_rectoffset.c b/nuttx/graphics/nxglib/nxglib_rectoffset.c index e4775cdcc..95502ffc0 100644 --- a/nuttx/graphics/nxglib/nxglib_rectoffset.c +++ b/nuttx/graphics/nxglib/nxglib_rectoffset.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_rectoffset.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <nuttx/fb.h> #include <nuttx/nxglib.h> /**************************************************************************** diff --git a/nuttx/graphics/nxglib/nxglib_rectoverlap.c b/nuttx/graphics/nxglib/nxglib_rectoverlap.c index 57414b2c8..84d1cec7b 100644 --- a/nuttx/graphics/nxglib/nxglib_rectoverlap.c +++ b/nuttx/graphics/nxglib/nxglib_rectoverlap.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_nulloverlap.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -41,7 +41,6 @@ #include <stdbool.h> -#include <nuttx/fb.h> #include <nuttx/nxglib.h> /**************************************************************************** diff --git a/nuttx/graphics/nxglib/nxglib_rectsize.c b/nuttx/graphics/nxglib/nxglib_rectsize.c index c1fb68f8e..93cc6861e 100644 --- a/nuttx/graphics/nxglib/nxglib_rectsize.c +++ b/nuttx/graphics/nxglib/nxglib_rectsize.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxglib_rectsize.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <nuttx/fb.h> #include <nuttx/nxglib.h> /**************************************************************************** diff --git a/nuttx/graphics/nxglib/nxglib_rectunion.c b/nuttx/graphics/nxglib/nxglib_rectunion.c index 6f8951886..fa618f3d9 100644 --- a/nuttx/graphics/nxglib/nxglib_rectunion.c +++ b/nuttx/graphics/nxglib/nxglib_rectunion.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_rectunion.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <nuttx/fb.h> #include <nuttx/nxglib.h> /**************************************************************************** diff --git a/nuttx/graphics/nxglib/nxglib_runcopy.c b/nuttx/graphics/nxglib/nxglib_runcopy.c index 70320599d..b5f322c9a 100644 --- a/nuttx/graphics/nxglib/nxglib_runcopy.c +++ b/nuttx/graphics/nxglib/nxglib_runcopy.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_runcopy.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <nuttx/fb.h> #include <nuttx/nxglib.h> /**************************************************************************** diff --git a/nuttx/graphics/nxglib/nxglib_trapcopy.c b/nuttx/graphics/nxglib/nxglib_trapcopy.c index d50f13568..cfb27ba30 100644 --- a/nuttx/graphics/nxglib/nxglib_trapcopy.c +++ b/nuttx/graphics/nxglib/nxglib_trapcopy.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_trapcopy.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <nuttx/fb.h> #include <nuttx/nxglib.h> /**************************************************************************** diff --git a/nuttx/graphics/nxglib/nxglib_vectoradd.c b/nuttx/graphics/nxglib/nxglib_vectoradd.c index 7259fc04f..031d9cd0a 100644 --- a/nuttx/graphics/nxglib/nxglib_vectoradd.c +++ b/nuttx/graphics/nxglib/nxglib_vectoradd.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_vectoradd.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <nuttx/fb.h> #include <nuttx/nxglib.h> /**************************************************************************** diff --git a/nuttx/graphics/nxglib/nxglib_vectsubtract.c b/nuttx/graphics/nxglib/nxglib_vectsubtract.c index 7cff66ef0..a30b5c39a 100644 --- a/nuttx/graphics/nxglib/nxglib_vectsubtract.c +++ b/nuttx/graphics/nxglib/nxglib_vectsubtract.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxglib/nxsglib_vectorsubtract.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <nuttx/fb.h> #include <nuttx/nxglib.h> /**************************************************************************** |