Added nxglib.h

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

5 files changed, 85 insertions, 10 deletions

diff --git a/nuttx/arch/arm/src/dm320/dm320_framebuffer.c b/nuttx/arch/arm/src/dm320/dm320_framebuffer.c
index 02f73061d..3535dfe1e 100644
--- a/nuttx/arch/arm/src/dm320/dm320_framebuffer.c
+++ b/nuttx/arch/arm/src/dm320/dm320_framebuffer.c
@@ -46,6 +46,7 @@
 #include <debug.h>
 
 #include <nuttx/fb.h>
+#include <nuttx/nxglib.h>
 
 #include "up_arch.h"
 #include "dm320_memorymap.h"
@@ -1201,7 +1202,7 @@ static int dm320_putcmap(FAR struct fb_vtable_s *vtable, FAR struct fb_cmap_s *c
     {
        /* Convert the RGB to YUV */
 
-       rgb2yuv(cmap->red[i], cmap->green[i], cmap->blue[i], &y, &u, &v);
+       nxgl_rgb2yuv(cmap->red[i], cmap->green[i], cmap->blue[i], &y, &u, &v);
 
        /* Program the CLUT */
 
diff --git a/nuttx/graphics/nxglib/nxglib_rgb2yuv.c b/nuttx/graphics/nxglib/nxglib_rgb2yuv.c
index e76cf98c2..fca2082e2 100644
--- a/nuttx/graphics/nxglib/nxglib_rgb2yuv.c
+++ b/nuttx/graphics/nxglib/nxglib_rgb2yuv.c
@@ -41,9 +41,10 @@
 
 #include <sys/types.h>
 #include <debug.h>
-
 #include <fixedmath.h>
 
+#include <nuttx/nxglib.h>
+
 /****************************************************************************
  * Pre-Processor Definitions
  ****************************************************************************/
@@ -79,7 +80,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nxglib_rgb2yuv
+ * Name: nxgl_rgb2yuv
  *
  * Description:
  *   Convert 8-bit RGB triplet to 8-bit YUV triplet
@@ -87,7 +88,7 @@
  *
  ****************************************************************************/
 
-void nxglib_rgb2yuv(ubyte r, ubyte g, ubyte b, ubyte *y, ubyte *u, ubyte *v)
+void nxgl_rgb2yuv(ubyte r, ubyte g, ubyte b, ubyte *y, ubyte *u, ubyte *v)
 {
   /* Per the JFIF specification:
    *
diff --git a/nuttx/graphics/nxglib/nxglib_yuv2rgb.c b/nuttx/graphics/nxglib/nxglib_yuv2rgb.c
index f39a442b6..18c16dd91 100644
--- a/nuttx/graphics/nxglib/nxglib_yuv2rgb.c
+++ b/nuttx/graphics/nxglib/nxglib_yuv2rgb.c
@@ -41,9 +41,10 @@
 
 #include <sys/types.h>
 #include <debug.h>
-
 #include <fixedmath.h>
 
+#include <nuttx/nxglib.h>
+
 /****************************************************************************
  * Pre-Processor Definitions
  ****************************************************************************/
@@ -75,7 +76,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: nxglib_yuv2rgb
+ * Name: nxgl_yuv2rgb
  *
  * Description:
  *   Convert 8-bit RGB triplet to 8-bit YUV triplet
@@ -83,7 +84,7 @@
  *
  ****************************************************************************/
 
-void nxglib_yuv2rgb(ubyte y, ubyte u, ubyte v, ubyte *r, ubyte *g, ubyte *b)
+void nxgl_yuv2rgb(ubyte y, ubyte u, ubyte v, ubyte *r, ubyte *g, ubyte *b)
 {
   b16_t vm128 = itob16(v) - b16_128P0;
   b16_t um128 = itob16(u) - b16_128P0;
diff --git a/nuttx/include/nuttx/kmalloc.h b/nuttx/include/nuttx/kmalloc.h
index d46aca73c..2f2df3663 100644
--- a/nuttx/include/nuttx/kmalloc.h
+++ b/nuttx/include/nuttx/kmalloc.h
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __KMALLOC_H
-#define __KMALLOC_H
+#ifndef __INCLUDE_NUTTX_KMALLOC_H
+#define __INCLUDE_NUTTX_KMALLOC_H
 
 /****************************************************************************
  * Included Files
@@ -91,4 +91,4 @@ KMALLOC_EXTERN void sched_free(FAR void *address);
 }
 #endif
 
-#endif /* __KMALLOC_H */
+#endif /* __INCLUDE_NUTTX_KMALLOC_H */
diff --git a/nuttx/include/nuttx/nxglib.h b/nuttx/include/nuttx/nxglib.h
new file mode 100644
index 000000000..5d5c509e6
--- /dev/null
+++ b/nuttx/include/nuttx/nxglib.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+ * include/nuttx/nxglib.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 __INCLUDE_NUTTX_NXGLIB_H
+#define __INCLUDE_NUTTX_NXGLIB_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <sys/types.h>
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+#undef EXTERN
+#if defined(__cplusplus)
+# define EXTERN extern "C"
+extern "C" {
+#else
+# define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/* Color conversons */
+
+EXTERN void nxgl_rgb2yuv(ubyte r, ubyte g, ubyte b, ubyte *y, ubyte *u, ubyte *v);
+EXTERN void nxgl_yuv2rgb(ubyte y, ubyte u, ubyte v, ubyte *r, ubyte *g, ubyte *b);
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __INCLUDE_NUTTX_NXGLIB_H */