Adding bitblit functions

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1311 42af7a65-404d-4744-a932-0658087f49c3

4 files changed, 432 insertions, 0 deletions

diff --git a/nuttx/graphics/nxglib/Makefile.sources b/nuttx/graphics/nxglib/Makefile.sources
new file mode 100644
index 000000000..a624488cc
--- /dev/null
+++ b/nuttx/graphics/nxglib/Makefile.sources
@@ -0,0 +1,78 @@
+############################################################################
+# graphics/nxglib/Makefile.sources
+#
+#   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#
+# 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.
+#
+############################################################################
+
+-include $(TOPDIR)/.config
+-include $(TOPDIR)/Make.defs
+
+ifeq ($(NXGLIB_BITSPERPIXEL),1)
+NXGLIB_SUFFIX	:= _1bpp
+endif
+ifeq ($(NXGLIB_BITSPERPIXEL),2)
+NXGLIB_SUFFIX	:= _2bpp
+endif
+ifeq ($(NXGLIB_BITSPERPIXEL),4)
+NXGLIB_SUFFIX	:= _4bpp
+endif
+ifeq ($(NXGLIB_BITSPERPIXEL),8)
+NXGLIB_SUFFIX	:= _8bpp
+endif
+ifeq ($(NXGLIB_BITSPERPIXEL),16)
+NXGLIB_SUFFIX	:= _16bpp
+endif
+ifeq ($(NXGLIB_BITSPERPIXEL),2)
+NXGLIB_SUFFIX	:= _32bpp
+endif
+ifeq ($(NXGLIB_BITSPERPIXEL),2)
+NXGLIB_SUFFIX	:= _64bpp
+endif
+
+CPPFLAGS	+= -DNXGLIB_BITSPERPIXEL=$(NXGLIB_BITSPERPIXEL)
+CPPFLAGS	+= -DNXGLIB_SUFFIX=$(NXGLIB_SUFFIX)
+
+FILL_CSRC	= nxglib_fillrectangle$(NXGLIB_SUFFIX).c
+GEN_CSRCS	= $(FILL_CSRC)
+
+all:	$(GEN_CSRCS)
+.PHONY : clean distclean $(GEN_CSRCS)
+
+$(FILL_CSRC) : nxglib_fillrectangle.c nxglib_bitblit.h
+	$(call PREPROCESS, $<, $@)
+
+clean:
+	@rm -f *~ .*.swp
+
+distclean: clean
+	@rm -f nxglib_fillrectangle_*bpp.c
+
diff --git a/nuttx/graphics/nxglib/nxglib_bitblit.h b/nuttx/graphics/nxglib/nxglib_bitblit.h
new file mode 100644
index 000000000..6ebb97c2b
--- /dev/null
+++ b/nuttx/graphics/nxglib/nxglib_bitblit.h
@@ -0,0 +1,210 @@
+/****************************************************************************
+ * graphics/nxglib/nxglib_bitblit.h
+ *
+ *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+#ifndef __GRAPHICS_NXGLIB_NXGLIB_BITBLIT_H
+#define __GRAPHICS_NXGLIB_NXGLIB_BITBLIT_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <sys/types.h>
+
+#include <nuttx/nxglib.h>
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+
+/* Make sure the the bits-per-pixel value has been set by the includer of
+ * this header file.
+ */
+
+#ifndef NXGLIB_BITSPERPIXEL
+#  error "NXGLIB_BITSPERPIXEL must be defined before including this header file"
+#endif
+
+/* Set up bit blit macros for this BPP */
+
+#if NXGLIB_BITSPERPIXEL == 1
+
+#  define NX_PIXELSHIFT          3
+#  define NX_PIXELMASK           7
+#  define NX_MULTIPIXEL(p)       ((p) ? 0xff | 0x00)
+#  define NX_PIXEL_T             ubyte
+
+#elif NXGLIB_BITSPERPIXEL == 2
+
+#  define NX_PIXELSHIFT          2
+#  define NX_PIXELMASK           3
+#  define NX_MULTIPIXEL(p)       ((ubyte)(p) << 6 | (ubyte)(p) << 4 | (ubyte)(p) << 2 | (p))
+#  define NX_PIXEL_T             ubyte
+
+#elif NXGLIB_BITSPERPIXEL == 4
+
+#  define NX_PIXELSHIFT          1
+#  define NX_PIXELMASK           1
+#  define NX_MULTIPIXEL(p)       ((ubyte)(p) << 4 | (p))
+#  define NX_PIXEL_T             ubyte
+
+#elif NXGLIB_BITSPERPIXEL == 8
+
+#  define NX_SCALEX(x)           (x)
+#  define NX_PIXEL_T             ubyte
+
+#elif NXGLIB_BITSPERPIXEL == 16
+
+#  define NX_SCALEX(x)           ((x) << 1)
+#  define NX_PIXEL_T             uint16
+
+#elif NXGLIB_BITSPERPIXEL == 24
+
+#  define NX_SCALEX(x)           (((x) << 1) + (x))
+#  define NX_PIXEL_T             uint32
+
+#elif NXGLIB_BITSPERPIXEL == 32
+
+#  define NX_SCALEX(x)           ((x) << 2)
+#  define NX_PIXEL_T             uint32
+
+#endif
+
+#if NXGLIB_BITSPERPIXEL < 8
+#  define NX_SCALEX(x)           ((x) >> NX_PIXELSHIFT)
+#  define NX_REMAINDERX(x)       ((x) & NX_PIXELMASK)
+#  define NX_ALIGNDOWN(x)        ((x) & ~NX_PIXELMASK)
+#  define NX_ALIGNUP(x)          (((x) + NX_PIXELMASK) & ~NX_PIXELMASK)
+
+#  ifdef CONFIG_NX_PACKEDMSFIRST
+#    define NX_MASKEDSRC1(s,r)   ((s) & (((ubyte)0xff) >> (8 - ((r) << pixelshift))))
+#    define NX_MASKEDVALUE1(s,r) ((s) & (((ubyte)0xff) << ((r) << NX_PIXELSHFIT)))
+#    define NX_MASKEDSRC2(s,r)   ((s) & (((ubyte)0xff) >> ((r) << pixelshift)))
+#    define NX_MASKEDVALUE2(s,r) ((s) & (((ubyte)0xff) << (8 - ((r) << NX_PIXELSHFIT))))
+#  else
+#    define NX_MASKEDSRC1(s,r)   ((s) & (((ubyte)0xff) >> ((r) << pixelshift)))
+#    define NX_MASKEDVALUE1(s,r) ((s) & (((ubyte)0xff) << (8 - ((r) << NX_PIXELSHFIT))))
+#    define NX_MASKEDSRC2(s,r)   ((s) & (((ubyte)0xff) >> (8 - ((r) << pixelshift))))
+#    define NX_MASKEDVALUE2(s,r) ((s) & (((ubyte)0xff) << ((r) << NX_PIXELSHFIT)))
+#  endif
+
+#  define NXGL_MEMSET(dest,value,width) \
+   { \
+     FAR uybte *_ptr = (FAR ubyte*)dest; \
+     int nbytes      = NX_SCALEX(width)); \
+     while (nbytes--) \
+       { \
+         *_ptr++ = value; \
+       } \
+   }
+#  define NXGL_MEMCPY(dest,src,width) \
+   { \
+     FAR ubyte *_dptr = (FAR ubyte*)dest; \
+     FAR ubyte *_sptr = (FAR ubyte*)src; \
+     int nbytes      = NX_SCALEX(width)); \
+     while (npixels--) \
+       { \
+         *_dptr++ = *_sptr++; \
+       } \
+   }
+
+#elif NXGLIB_BITSPERPIXEL == 24
+#  define NXGL_MEMSET(dest,value,width) \
+   { \
+     FAR uybte *_ptr = (FAR ubyte*)dest; \
+     while (width--) \
+       { \
+         *_ptr++ = value; \
+         *_ptr++ = value >> 8; \
+         *_ptr++ = value >> 16; \
+       } \
+   }
+#  define NXGL_MEMCPY(dest,src,width) \
+   { \
+     FAR ubyte *_dptr = (FAR ubyte*)dest; \
+     FAR ubyte *_sptr = (FAR ubyte*)src; \
+     while (width--) \
+       { \
+         *_dptr++ = *_sptr++; \
+         *_dptr++ = *_sptr++; \
+         *_dptr++ = *_sptr++; \
+       } \
+   }
+#else
+#  define NXGL_MEMSET(dest,value,width) \
+   { \
+     FAR nx_pixel_t *_ptr = (FAR ubyte*)dest; \
+     while (width--) \
+       { \
+         *_ptr++ = value; \
+       } \
+   }
+#  define NXGL_MEMCPY(dest,src,width) \
+   { \
+     FAR nx_pixel_t *_dptr = (FAR ubyte*)dest; \
+     FAR nx_pixel_t *_sptr = (FAR ubyte*)src; \
+     while (width--) \
+       { \
+         *_dptr++ = *_sptr++; \
+       } \
+   }
+#endif
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+#undef EXTERN
+#if defined(__cplusplus)
+#define EXTERN extern "C"
+extern "C" {
+#else
+#define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __GRAPHICS_NXGLIB_NXGLIB_BITBLIT_H */
diff --git a/nuttx/graphics/nxglib/nxglib_fillrectangle.c b/nuttx/graphics/nxglib/nxglib_fillrectangle.c
new file mode 100644
index 000000000..d8550dd7e
--- /dev/null
+++ b/nuttx/graphics/nxglib/nxglib_fillrectangle.c
@@ -0,0 +1,115 @@
+/****************************************************************************
+ * graphics/nxglib/nxglib_fillrectangle.c
+ *
+ *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/types.h>
+#include <nuttx/fb.h>
+#include <nuttx/nxglib.h>
+
+#include "nxglib_bitblit.h"
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+
+#ifndef NXGLIB_SUFFIX
+#  error "NXGLIB_SUFFIX must be defined before including this header file"
+#endif
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxgl_fillrectangle*
+ *
+ * Descripton:
+ *   Fill a rectangle region in the framebuffer memory with a fixed color
+ *
+ ****************************************************************************/
+
+void nxgl_fillrectangle##NXGLIB_SUFFIX
+(
+  FAR struct fb_planeinfo_s *pinfo,
+  FAR const struct nxgl_rect_s *rect, NX_PIXEL_T color
+)
+{
+  ubyte *line;
+  unsigned int width;
+  unsigned int stride;
+  unsigned int rows;
+
+  /* Get the width of the framebuffer in bytes */
+
+  stride = pinfo->stride;
+
+  /* Get the dimensions of the rectange to fill in pixels */
+
+  width  = rect.pt2.x - rect.pt1.x;
+  rows   = rect.pt2.y - rect.pt1.y;
+
+  /* Get the address of the first byte in the first line to write */
+
+  line   = pinfo->fbmem + rect.pt1.y * stride + NX_SCALEX(rect.pt1.x);
+
+  /* Then fill the rectangle line-by-line */
+
+  while (rows--)
+    {
+      NXGL_MEMSET(line, color, width);
+      line += stride;
+    }
+}
diff --git a/nuttx/include/nuttx/nxglib.h b/nuttx/include/nuttx/nxglib.h
index 5d5c509e6..b9269ed52 100644
--- a/nuttx/include/nuttx/nxglib.h
+++ b/nuttx/include/nuttx/nxglib.h
@@ -47,6 +47,35 @@
  * Public Types
  ****************************************************************************/
 
+/* Graphics structures ******************************************************/
+
+/* A given coordinate is limited to the screen height an width.  If either
+ * of those values exceed 32,767 pixels, then the following will have to need
+ * to change:
+ */
+
+typedef sint16 nxgl_coord_t;
+
+/* Describes a point on the display */
+
+struct nxgl_point_s
+{
+  nxgl_coord_t x;         /* Range: 0 to screen width - 1 */
+  nxgl_coord_t y;         /* Rnage: 0 to screen height - 1*/
+};
+
+/* Describes a rectangle on the display */
+
+struct nxgl_rect_s
+{
+  struct nxgl_point_t pt1; /* Upper, left-hand corner */
+  struct nxgl_point_t pt2; /* Lower, right-hand corner */
+};
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
 #undef EXTERN
 #if defined(__cplusplus)
 # define EXTERN extern "C"