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

14 files changed, 28 insertions, 1706 deletions

diff --git a/nuttx/graphics/nxglib/Make.defs b/nuttx/graphics/nxglib/Make.defs
index 1223d3bdc..124b053f6 100644
--- a/nuttx/graphics/nxglib/Make.defs
+++ b/nuttx/graphics/nxglib/Make.defs
@@ -35,7 +35,7 @@
 
 NXGLIB_ASRCS  =
 
-SETP_CSRCS    = nxglib_setpixel_1bpp.c nxglib_setpixel_2bpp.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
@@ -56,7 +56,7 @@ TFILL_CSRCS  += nxglib_filltrapezoid_16bpp.c nxglib_filltrapezoid_24bpp.c
 TFILL_CSRCS  += nxglib_filltrapezoid_32bpp.c
 
 RMOVE_CSRCS   = nxglib_moverectangle_1bpp.c nxglib_moverectangle_2bpp.c
-RMOVE_CSRCS  += nxglib_moverectangle_4bpp.cnxglib_moverectangle_8bpp.c
+RMOVE_CSRCS  += nxglib_moverectangle_4bpp.c nxglib_moverectangle_8bpp.c
 RMOVE_CSRCS  += nxglib_moverectangle_16bpp.c nxglib_moverectangle_24bpp.c
 RMOVE_CSRCS  += nxglib_moverectangle_32bpp.c
 
@@ -65,7 +65,5 @@ 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
 
-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)
+NXGLIB_CSRCS += $(RMOVE_CSRCS) $(RCOPY_CSRCS)
diff --git a/nuttx/graphics/nxglib/nxglib_circlepts.c b/nuttx/graphics/nxglib/nxglib_circlepts.c
deleted file mode 100644
index 811953dfc..000000000
--- a/nuttx/graphics/nxglib/nxglib_circlepts.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/****************************************************************************
- * graphics/nxglib/nxglib_circlepts.c
- *
- *   Copyright (C) 2011 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.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <string.h>
-#include <errno.h>
-#include <fixedmath.h>
-
-#include <nuttx/nx/nxglib.h>
-
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-/* Trigonometry */
-
-#define SIN_0p0        0         /* sin(0) = 0 */
-#define COS_0p0        1         /* cos(0) = 1 */
-#define SIN_22p5       25080     /* sin(22.5) = 25080 / 65536 */
-#define COS_22p5       60547     /* cos(22.5) = 60547 / 65536 */
-#define SIN_45p0       46341     /* sin(45) = 46341 / 65536 */
-#define COS_45p0       SIN_45p0  /* cos(45) = sin(45) */
-
-/* Named indices into the 16 circle points generated by nxgl_circlepts */
-
-#define POINT_0p0      0 
-#define POINT_22p5     1
-#define POINT_45p0     2
-#define POINT_67p5     3
-#define POINT_90p0     4
-#define POINT_112p5    5
-#define POINT_135p0    6
-#define POINT_157p5    7
-#define POINT_180p0    8
-#define POINT_202p5    9
-#define POINT_225p0    10
-#define POINT_247p5    11
-#define POINT_270p0    12
-#define POINT_292p5    13
-#define POINT_315p0    14
-#define POINT_337p5    15
-#define NCIRCLE_POINTS 16
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: nxgl_circlepts
- *
- * Description:
- *   Given a description of a circle, return a set of 16 points on the
- *   circumference of the circle.  These points may then be used by
- *   nx_drawcircle() or related APIs to draw a circle outline.
- *
- * Input parameters:
- *   center - A pointer to the point that is the center of the circle
- *   radius - The radius of the circle in pixels.
- *   circle - A pointer the first entry in an array of 16 points where the
- *            circle points will be returned.
- *
- * Returned value:
- *   None
- *
- ****************************************************************************/
-
-void nxgl_circlepts(FAR const struct nxgl_point_s *center, nxgl_coord_t radius,
-                    FAR struct nxgl_point_s *circle)
-{
-  nxgl_coord_t xoffs;
-  nxgl_coord_t yoffs;
-
-  /* 0, 90, 180, and 270 degrees are the easiest */
-
-  circle[POINT_0p0].x   = center->x + radius;
-  circle[POINT_0p0].y   = center->y;
-  circle[POINT_90p0].x  = center->x;
-  circle[POINT_90p0].y  = center->y + radius;
-  circle[POINT_180p0].x = center->x - radius;
-  circle[POINT_180p0].y = center->y;
-  circle[POINT_270p0].x = center->x;
-  circle[POINT_270p0].y = center->y - radius;
-
-  /* Now 22.5, 67.5, 112.5, 157.5, 202.5, 247.5, 292.5, and 337.5 */
-
-  xoffs = b16toi(b16muli(COS_22p5, radius) + b16HALF);
-  yoffs = b16toi(b16muli(SIN_22p5, radius) + b16HALF);
-
-  circle[POINT_22p5].x  = center->x + xoffs;
-  circle[POINT_22p5].y  = center->y + yoffs;
-  circle[POINT_157p5].x = center->x - xoffs;
-  circle[POINT_157p5].y = center->y + yoffs;
-  circle[POINT_202p5].x = center->x - xoffs;
-  circle[POINT_202p5].y = center->y - yoffs;
-  circle[POINT_337p5].x = center->x + xoffs;
-  circle[POINT_337p5].y = center->y - yoffs;
-
-  circle[POINT_67p5].x  = center->x + yoffs;
-  circle[POINT_67p5].y  = center->y + xoffs;
-  circle[POINT_112p5].x = center->x - yoffs;
-  circle[POINT_112p5].y = center->y + xoffs;
-  circle[POINT_247p5].x = center->x - yoffs;
-  circle[POINT_247p5].y = center->y - xoffs;
-  circle[POINT_292p5].x = center->x + yoffs;
-  circle[POINT_292p5].y = center->y - xoffs;
-
-  /* Finally, 45.0, 135.0, 225.0, 315.0 */
-
-  xoffs = b16toi(b16muli(COS_45p0, radius) + b16HALF);
-
-  circle[POINT_45p0].x  = center->x + xoffs;
-  circle[POINT_45p0].y  = center->y + xoffs;
-  circle[POINT_135p0].x = center->x - xoffs;
-  circle[POINT_135p0].y = center->y + xoffs;
-  circle[POINT_225p0].x = center->x - xoffs;
-  circle[POINT_225p0].y = center->y - xoffs;
-  circle[POINT_315p0].x = center->x + xoffs;
-  circle[POINT_315p0].y = center->y - xoffs;
-}
diff --git a/nuttx/graphics/nxglib/nxglib_circletraps.c b/nuttx/graphics/nxglib/nxglib_circletraps.c
deleted file mode 100644
index 8ee287795..000000000
--- a/nuttx/graphics/nxglib/nxglib_circletraps.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/****************************************************************************
- * graphics/nxglib/nxglib_circletraps.c
- *
- *   Copyright (C) 2011 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.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <string.h>
-#include <errno.h>
-#include <fixedmath.h>
-
-#include <nuttx/nx/nxglib.h>
-
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-/* Trigonometry */
-
-#define SIN_0p0        0         /* sin(0) = 0 */
-#define COS_0p0        1         /* cos(0) = 1 */
-#define SIN_22p5       25080     /* sin(22.5) = 25080 / 65536 */
-#define COS_22p5       60547     /* cos(22.5) = 60547 / 65536 */
-#define SIN_45p0       46341     /* sin(45) = 46341 / 65536 */
-#define COS_45p0       SIN_45p0  /* cos(45) = sin(45) */
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: nxgl_circletraps
- *
- * Description:
- *   Given a description of a a circle, return 8 trapezoids that can be
- *   used to fill the circle by nx_fillcircle() and other interfaces.
- *
- * Input parameters:
- *   center - A pointer to the point that is the center of the circle
- *   radius - The radius of the circle in pixels.
- *   circle - A pointer the first entry in an array of 8 trapezoids where
- *            the circle description will be returned.
- *
- * Returned value:
- *   None
- *
- ****************************************************************************/
-
-void nxgl_circletraps(FAR const struct nxgl_point_s *center, nxgl_coord_t radius,
-                      FAR struct nxgl_trapezoid_s *circle)
-{
-  nxgl_coord_t xoffs;
-  nxgl_coord_t yoffs;
-
-  circle[0].top.x1      = itob16(center->x);
-  circle[0].top.x2      = circle[0].top.x1;
-  circle[0].top.y       = center->y - radius;
-
-  circle[7].bot.x1      = circle[0].top.x1;
-  circle[7].bot.x2      = circle[0].top.x1;
-  circle[7].bot.y       = center->y + radius;
-
-  circle[3].bot.x1      = itob16(center->x - radius);
-  circle[3].bot.x2      = itob16(center->x + radius);
-  circle[3].bot.y       = center->y;
-
-  circle[4].top.x1      = circle[3].bot.x1;
-  circle[4].top.x2      = circle[3].bot.x2;
-  circle[4].top.y       = circle[3].bot.y;
-
-  /* Now 22.5, 67.5, 112.5, 157.5, 202.5, 247.5, 292.5, and 337.5 */
-
-  xoffs = b16toi(b16muli(COS_22p5, radius) + b16HALF);
-  yoffs = b16toi(b16muli(SIN_22p5, radius) + b16HALF);
-
-  circle[2].bot.x1      = itob16(center->x - xoffs);
-  circle[2].bot.x2      = itob16(center->x + xoffs);
-  circle[2].bot.y       = center->y - yoffs;
-
-  circle[3].top.x1      = circle[2].bot.x1;
-  circle[3].top.x2      = circle[2].bot.x2;
-  circle[3].top.y       = circle[2].bot.y;
-
-  circle[4].bot.x1      = circle[2].bot.x1;
-  circle[4].bot.x2      = circle[2].bot.x2;
-  circle[4].bot.y       = center->y + yoffs;
-
-  circle[5].top.x1      = circle[4].bot.x1;
-  circle[5].top.x2      = circle[4].bot.x2;
-  circle[5].top.y       = circle[4].bot.y;
-
-  circle[0].bot.x1      = itob16(center->x - yoffs);
-  circle[0].bot.x2      = itob16(center->x + yoffs);
-  circle[0].bot.y       = center->y - xoffs;
-
-  circle[1].top.x1      = circle[0].bot.x1;
-  circle[1].top.x2      = circle[0].bot.x2;
-  circle[1].top.y       = circle[0].bot.y;
-
-  circle[6].bot.x1      = circle[1].top.x1;
-  circle[6].bot.x2      = circle[1].top.x2;
-  circle[6].bot.y       = center->y + xoffs;
-
-  circle[7].top.x1      = circle[6].bot.x1;
-  circle[7].top.x2      = circle[6].bot.x2;
-  circle[7].top.y       = circle[6].bot.y;
-
-  /* Finally, 45.0, 135.0, 225.0, 315.0 */
-
-  xoffs = b16toi(b16muli(COS_45p0, radius) + b16HALF);
-
-  circle[1].bot.x1      = itob16(center->x - xoffs);
-  circle[1].bot.x2      = itob16(center->x + xoffs);
-  circle[1].bot.y       = center->y - xoffs;
-
-  circle[2].top.x1      = circle[1].bot.x1;
-  circle[2].top.x2      = circle[1].bot.x2;
-  circle[2].top.y       = circle[1].bot.y;
-  
-  circle[5].bot.x1      = circle[1].bot.x1;
-  circle[5].bot.x2      = circle[1].bot.x2;
-  circle[5].bot.y       = center->y + xoffs;
-
-  circle[6].top.x1      = circle[5].bot.x1;
-  circle[6].top.x2      = circle[5].bot.x2;
-  circle[6].top.y       = circle[5].bot.y;
-}
diff --git a/nuttx/graphics/nxglib/nxglib_splitline.c b/nuttx/graphics/nxglib/nxglib_splitline.c
deleted file mode 100644
index fa2ccc1a0..000000000
--- a/nuttx/graphics/nxglib/nxglib_splitline.c
+++ /dev/null
@@ -1,532 +0,0 @@
-/****************************************************************************
- * graphics/nxglib/nxglib_splitline.c
- *
- *   Copyright (C) 2011-2012 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.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <debug.h>
-
-#include <nuttx/nx/nxglib.h>
-
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-struct b16point_s
-{
-  b16_t x;
-  b16_t y;
-};
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-static b16_t nxgl_interpolate(b16_t x, b16_t dy, b16_t dxdy)
-{
-  b16_t dx = b16mulb16(dy, dxdy);
-  return x + dx;
-}
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: nxgl_splitline
- *
- * Description:
- *   In the general case, a line with width can be represented as a
- *   parallelogram with a triangle at the top and bottom.  Triangles and
- *   parallelograms are both degenerate versions of a trapeziod.  This
- *   function breaks a wide line into triangles and trapezoids.  This
- *   function also detects other degenerate cases:
- *
- *   1. If y1 == y2 then the line is horizontal and is better represented
- *      as a rectangle.
- *   2. If x1 == x2 then the line is vertical and also better represented
- *      as a rectangle.
- *   3. If the width of the line is 1, then there are no triangles at the
- *      top and bottome (this may also be the case if the width is narrow
- *      and the line is near vertical).
- *   4. If the line is oriented is certain angles, it may consist only of
- *      the upper and lower triangles with no trapezoid in between.  In
- *      this case, 3 trapezoids will be returned, but traps[1] will be
- *      degenerate.
- *
- * Input parameters:
- *   vector - A pointer to the vector described the line to be drawn.
- *   traps  - A pointer to a array of trapezoids (size 3).
- *   rect   - A pointer to a rectangle.
- *
- * Returned value:
- *   0: Line successfully broken up into three trapezoids.  Values in
- *      traps[0], traps[1], and traps[2] are valid.
- *   1: Line successfully represented by one trapezoid. Value in traps[1]
- *      is valid.
- *   2: Line successfully represented by one rectangle. Value in rect is
- *      valid
- *  <0: On errors, a negated errno value is returned.
- *
- ****************************************************************************/
-
-int nxgl_splitline(FAR struct nxgl_vector_s *vector,
-                   FAR struct nxgl_trapezoid_s *traps,
-                   FAR struct nxgl_rect_s *rect,
-                   nxgl_coord_t linewidth)
-{
-  struct nxgl_vector_s line;
-  nxgl_coord_t iheight;
-  nxgl_coord_t iwidth;
-  nxgl_coord_t iyoffset;
-  struct b16point_s quad[4];
-  b16_t b16xoffset;
-  b16_t b16yoffset;
-  b16_t b16dxdy;
-  b16_t angle;
-  b16_t cosangle;
-  b16_t sinangle;
-  b16_t b16x;
-  b16_t b16y;
-
-  gvdbg("vector: (%d,%d)->(%d,%d) linewidth: %d\n",
-        vector->pt1.x, vector->pt1.y, vector->pt2.x, vector->pt2.y, linewidth);
-
-  /* First, check the linewidth */
-
-  if (linewidth < 1)
-    {
-      return -EINVAL;
-    }
-
-  /* Then make sure that the start position of the line is above the end
-   * position of the line... in raster order.
-   */
-
-  if (vector->pt1.y < vector->pt2.y)
-    {
-      /* Vector is already in raster order */
-
-      memcpy(&line, vector, sizeof(struct nxgl_vector_s));
-    }
-  else if (vector->pt1.y > vector->pt2.y)
-    {
-      /* Swap the top and bottom */
-
-      line.pt1.x = vector->pt2.x;
-      line.pt1.y = vector->pt2.y;
-      line.pt2.x = vector->pt1.x;
-      line.pt2.y = vector->pt1.y;
-    }
-  else /* if (vector->pt1.y == vector->pt2.y) */
-    {
-      /* First degenerate case:  The line is horizontal. */
-
-      if (vector->pt1.x < vector->pt2.x)
-        {
-          rect->pt1.x = vector->pt1.x;
-          rect->pt2.x = vector->pt2.x;
-        }
-      else
-        {
-          rect->pt1.x = vector->pt2.x;
-          rect->pt2.x = vector->pt1.x;
-        }
-
-      /* The height of the rectangle is the width of the line, half above
-       * and half below.
-       */
-
-      rect->pt1.y = vector->pt1.y - (linewidth >> 1);
-      rect->pt2.y = rect->pt1.y + linewidth - 1;
-
-      gvdbg("Horizontal rect: (%d,%d),(%d,%d)\n",
-            rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y);
-
-      return 2;
-    }
-
-  /* Check if the line is vertical */
-
-  if (line.pt1.x == line.pt2.x)
-    {
-      /* Second degenerate case:  The line is vertical. */
-
-      rect->pt1.y = line.pt1.y;
-      rect->pt2.y = line.pt2.y;
-
-      rect->pt1.x = line.pt1.x - (linewidth >> 1);
-      rect->pt2.x = rect->pt1.x + linewidth - 1;
-
-      gvdbg("Vertical rect: (%d,%d),(%d,%d)\n",
-            rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y);
-
-      return 2;
-    }
-
-  /* The final degenerate case */
-
-  if (linewidth == 1 &&
-      abs(line.pt2.x - line.pt1.x) < (line.pt2.y - line.pt1.y))
-    {
-      /* A close to vertical line of width 1 is basically
-       * a single parallelogram of width 1.
-       */
-
-      traps[1].top.x1 = itob16(line.pt1.x);
-      traps[1].top.x2 = traps[1].top.x1;
-      traps[1].top.y  = line.pt1.y;
-
-      traps[1].bot.x1 = itob16(line.pt2.x);
-      traps[1].bot.x2 = traps[1].bot.x1;
-      traps[1].bot.y  = line.pt2.y;
-
-      gvdbg("Vertical traps[1]: (%08x,%08x,%d),(%08x,%08x, %d)\n",
-            traps[1].top.x1, traps[1].top.x2, traps[1].top.y,
-            traps[1].bot.x1, traps[1].bot.x2, traps[1].bot.y);
-
-      return 1;
-    }
-
-  /* Okay, then what remains is interesting.
-   *
-   * iheight = |y2 - y1|
-   * iwidth  = |x2 - x1|
-   */
-
-  iheight = line.pt2.y - line.pt1.y + 1;
-  if (line.pt1.x < line.pt2.x)
-    {
-      iwidth  = line.pt2.x - line.pt1.x + 1;
-    }
-  else
-    {
-      iwidth  = line.pt1.x - line.pt2.x + 1;
-    }
-
-  /* Applying the line width to the line results in a rotated, rectangle.
-   * Get the Y offset from an end of the original thin line to a corner of the fat line.
-   *
-   *   Angle of line:      angle      = atan2(iheight, iwidth)
-   *   Y offset from line: b16yoffset = linewidth * cos(angle)
-   *
-   * For near verical lines, b16yoffset is be nearly zero.  For near horizontal
-   * lines, b16yOffset is be about the same as linewidth.
-   */
-
-  angle      = b16atan2(itob16(iheight), itob16(iwidth));
-  cosangle   = b16cos(angle);
-  b16yoffset = (linewidth * cosangle + 1) >> 1;
-
-  /* Get the X offset from an end of the original thin line to a corner of the fat line.
-   *
-   * For near vertical lines, b16xoffset is about the same as linewidth.  For near
-   * horizontal lines, b16xoffset is nearly zero.
-   */
-
-  sinangle   =  b16sin(angle);
-  b16xoffset = (linewidth * sinangle + 1) >> 1;
-
-  gvdbg("height: %d width: %d angle: %08x b16yoffset: %08x b16xoffset: %08x\n",
-        iheight, iwidth, angle, b16yoffset, b16xoffset);
-
-  /* Now we know all four points of the rotated rectangle */
-
-  iyoffset   = b16toi(b16yoffset + b16HALF);
-  if (iyoffset > 0)
-    {
-      /* Get the Y positions of each point */
-
-      b16y      = itob16(line.pt1.y);
-      quad[0].y = b16y - b16yoffset;
-      quad[1].y = b16y + b16yoffset;
-
-      b16y      = itob16(line.pt2.y);
-      quad[2].y = b16y - b16yoffset;
-      quad[3].y = b16y + b16yoffset;
-
-      if (line.pt1.x < line.pt2.x)
-        {
-          /* Line is going "south east". Get the X positions of each point */
-
-          b16x      = itob16(line.pt1.x);
-          quad[0].x = b16x + b16xoffset;
-          quad[1].x = b16x - b16xoffset;
-
-          b16x      = itob16(line.pt2.x);
-          quad[2].x = b16x + b16xoffset;
-          quad[3].x = b16x - b16xoffset;
-
-          gvdbg("Southeast: quad (%08x,%08x),(%08x,%08x),(%08x,%08x),(%08x,%08x)\n",
-                quad[0].x, quad[0].y, quad[1].x, quad[1].y,
-                quad[2].x, quad[2].y, quad[3].x, quad[3].y);
-
-          /* Now we can form the trapezoids.  The top of the first trapezoid
-           * (triangle) is at quad[0]
-           */
-
-          traps[0].top.x1 = quad[0].x;
-          traps[0].top.x2 = quad[0].x;
-          traps[0].top.y  = b16toi(quad[0].y + b16HALF);
-
-          /* The bottom of the first trapezoid (triangle) may be either at
-           * quad[1] or quad[2], depending upon orientation.
-           */
-
-          if (quad[1]. y < quad[2].y)
-            {
-              /* quad[1] is at the bottom left of the triangle. Interpolate
-               * to get the corresponding point on the right side.
-               *
-               * Interpolation is from quad[0] along the line quad[0]->quad[2]
-               * which as the same slope as the line (positive)
-               */
-
-              b16dxdy = itob16(iwidth) / iheight;
-
-              traps[0].bot.x1 = quad[1].x;
-              traps[0].bot.x2 = nxgl_interpolate(quad[0].x, quad[1].y -  quad[0].y, b16dxdy);
-              traps[0].bot.y  = b16toi(quad[1].y + b16HALF);
-
-              /* quad[1] is at the top left of the second trapezoid.  quad[2} is
-               * at the bottom right of the second trapezoid. Interpolate to get
-               * corresponding point on the left side.
-               *
-               * Interpolation is from quad[1] along the line quad[1]->quad[3]
-               * which as the same slope as the line (positive)
-               */
-
-              traps[1].top.x1 = traps[0].bot.x1;
-              traps[1].top.x2 = traps[0].bot.x2;
-              traps[1].top.y  = traps[0].bot.y;
-
-              traps[1].bot.x1 = nxgl_interpolate(traps[1].top.x1, quad[2].y - quad[1].y, b16dxdy);
-              traps[1].bot.x2 = quad[2].x;
-              traps[1].bot.y  = b16toi(quad[2].y + b16HALF);
-            }
-          else
-            {
-              /* quad[2] is at the bottom right of the triangle. Interpolate
-               * to get the corresponding point on the left side.
-               *
-               * Interpolation is from quad[0] along the line quad[0]->quad[1]
-               * which orthogonal to the slope of the line (and negative)
-               */
-
-              b16dxdy = -itob16(iheight) / iwidth;
-
-              traps[0].bot.x1 = nxgl_interpolate(quad[0].x, quad[2].y -  quad[0].y, b16dxdy);
-              traps[0].bot.x2 = quad[2].x;
-              traps[0].bot.y  = b16toi(quad[2].y + b16HALF);
-
-              /* quad[2] is at the top right of the second trapezoid.  quad[1} is
-               * at the bottom left of the second trapezoid. Interpolate to get
-               * corresponding point on the right side.
-               *
-               * Interpolation is from quad[2] along the line quad[2]->quad[3]
-               * which as the same slope as the previous interpolation.
-               */
-
-              traps[1].top.x1 = traps[0].bot.x1;
-              traps[1].top.x2 = traps[0].bot.x2;
-              traps[1].top.y  = traps[0].bot.y;
-
-              traps[1].bot.x1 = quad[1].x;
-              traps[1].bot.x2 = nxgl_interpolate(traps[1].top.x2, quad[1].y - quad[2].y, b16dxdy);
-              traps[1].bot.y  = b16toi(quad[1].y + b16HALF);
-            }
-
-          /* The final trapezond (triangle) at the bottom is new well defined */
-
-          traps[2].top.x1 = traps[1].bot.x1;
-          traps[2].top.x2 = traps[1].bot.x2;
-          traps[2].top.y  = traps[1].bot.y;
-
-          traps[2].bot.x1 = quad[3].x;
-          traps[2].bot.x2 = quad[3].x;
-          traps[2].bot.y  = b16toi(quad[3].y + b16HALF);
-        }
-      else
-        {
-          /* Get the X positions of each point */
-
-          b16x      = itob16(line.pt1.x);
-          quad[0].x = b16x - b16xoffset;
-          quad[1].x = b16x + b16xoffset;
-
-          b16x      = itob16(line.pt2.x);
-          quad[2].x = b16x - b16xoffset;
-          quad[3].x = b16x + b16xoffset;
-
-          gvdbg("Southwest: quad (%08x,%08x),(%08x,%08x),(%08x,%08x),(%08x,%08x)\n",
-                quad[0].x, quad[0].y, quad[1].x, quad[1].y,
-                quad[2].x, quad[2].y, quad[3].x, quad[3].y);
-
-          /* Now we can form the trapezoids.  The top of the first trapezoid
-           * (triangle) is at quad[0]
-           */
-
-          traps[0].top.x1 = quad[0].x;
-          traps[0].top.x2 = quad[0].x;
-          traps[0].top.y  = b16toi(quad[0].y + b16HALF);
-
-          /* The bottom of the first trapezoid (triangle) may be either at
-           * quad[1] or quad[2], depending upon orientation.
-           */
-
-          if (quad[1].y < quad[2].y)
-            {
-              /* quad[1] is at the bottom right of the triangle. Interpolate
-               * to get the corresponding point on the left side.
-               *
-               * Interpolation is from quad[0] along the line quad[0]->quad[2]
-               * which as the same slope as the line (negative)
-               */
-
-              b16dxdy = -itob16(iwidth) / iheight;
-
-              traps[0].bot.x1 = nxgl_interpolate(traps[0].top.x1, quad[1].y - quad[0].y, b16dxdy);
-              traps[0].bot.x2 = quad[1].x;
-              traps[0].bot.y  = b16toi(quad[1].y + b16HALF);
-
-              /* quad[1] is at the top right of the second trapezoid.  quad[2} is
-               * at the bottom left of the second trapezoid. Interpolate to get
-               * corresponding point on the right side.
-               *
-               * Interpolation is from quad[1] along the line quad[1]->quad[3]
-               * which as the same slope as the line (negative)
-               */
-
-              traps[1].top.x1 = traps[0].bot.x1;
-              traps[1].top.x2 = traps[0].bot.x2;
-              traps[1].top.y  = traps[0].bot.y;
-
-              traps[1].bot.x1 = quad[2].x;
-              traps[1].bot.x2 = nxgl_interpolate(traps[1].top.x2, quad[2].y - quad[1].y, b16dxdy);
-              traps[1].bot.y  = b16toi(quad[2].y + b16HALF);
-            }
-          else
-            {
-              /* quad[2] is at the bottom left of the triangle. Interpolate
-               * to get the corresponding point on the right side.
-               *
-               * Interpolation is from quad[0] along the line quad[0]->quad[1]
-               * which orthogonal to the slope of the line (and positive)
-               */
-
-              b16dxdy = itob16(iheight) / iwidth;
-
-              traps[0].bot.x1 = quad[2].x;
-              traps[0].bot.x2 = nxgl_interpolate(traps[0].top.x2, quad[2].y - quad[0].y, b16dxdy);
-              traps[0].bot.y  = b16toi(quad[2].y + b16HALF);
-
-              /* quad[2] is at the top left of the second trapezoid.  quad[1} is
-               * at the bottom right of the second trapezoid. Interpolate to get
-               * corresponding point on the left side.
-               *
-               * Interpolation is from quad[2] along the line quad[2]->quad[3]
-               * which as the same slope as the previous interpolation.
-               */
-
-              traps[1].top.x1 = traps[0].bot.x1;
-              traps[1].top.x2 = traps[0].bot.x2;
-              traps[1].top.y  = traps[0].bot.y;
-
-              traps[1].bot.x1 = nxgl_interpolate(traps[1].top.x1, quad[1].y - quad[2].y, b16dxdy);
-              traps[1].bot.x2 = quad[1].x;
-              traps[1].bot.y  = b16toi(quad[1].y + b16HALF);
-            }
-
-          /* The final trapezond (triangle) at the bottom is new well defined */
-
-          traps[2].top.x1 = traps[1].bot.x1;
-          traps[2].top.x2 = traps[1].bot.x2;
-          traps[2].top.y  = traps[1].bot.y;
-
-          traps[2].bot.x1 = quad[3].x;
-          traps[2].bot.x2 = quad[3].x;
-          traps[2].bot.y  = b16toi(quad[3].y + b16HALF);
-        }
-
-      gvdbg("traps[0]: (%08x,%08x,%d),(%08x,%08x,%d)\n",
-            traps[0].top.x1, traps[0].top.x2, traps[0].top.y,
-            traps[0].bot.x1, traps[0].bot.x2, traps[0].bot.y);
-      gvdbg("traps[1]: (%08x,%08x,%d),(%08x,%08x,%d)\n",
-            traps[1].top.x1, traps[1].top.x2, traps[1].top.y,
-            traps[1].bot.x1, traps[1].bot.x2, traps[1].bot.y);
-      gvdbg("traps[2]: (%08x,%08x,%d),(%08x,%08x,%d)\n",
-            traps[2].top.x1, traps[2].top.x2, traps[2].top.y,
-            traps[2].bot.x1, traps[2].bot.x2, traps[2].bot.y);
-
-      return 0;
-    }
-
-  /* The line is too vertical to have any significant triangular top or
-   * bottom.  Just return the center parallelogram.
-   */
-
-  traps[1].top.x1 = itob16(line.pt1.x - (linewidth >> 1));
-  traps[1].top.x2 = traps[1].top.x1 + itob16(linewidth - 1);
-  traps[1].top.y  = line.pt1.y;
-
-  traps[1].bot.x1 = itob16(line.pt2.x - (linewidth >> 1));
-  traps[1].bot.x2 = traps[1].bot.x1 + itob16(linewidth - 1);
-  traps[1].bot.y  = line.pt2.y;
-
-  gvdbg("Horizontal traps[1]: (%08x,%08x,%d),(%08x,%08x, %d)\n",
-        traps[1].top.x1, traps[1].top.x2, traps[1].top.y,
-        traps[1].bot.x1, traps[1].bot.x2, traps[1].bot.y);
-
-  return 1;
-}
-
diff --git a/nuttx/graphics/nxmu/Make.defs b/nuttx/graphics/nxmu/Make.defs
index 666caeb45..41a660ba1 100644
--- a/nuttx/graphics/nxmu/Make.defs
+++ b/nuttx/graphics/nxmu/Make.defs
@@ -33,13 +33,9 @@
 #
 ############################################################################
 
-NX_ASRCS     =
+NX_ASRCS   =
 
-NXAPI_CSRCS  = nx_eventhandler.c nx_eventnotify.c
-NXAPI_CSRCS += nx_drawcircle.c nx_drawline.c nx_fillcircle.c
-
-NXMU_CSRCS   = nxmu_kbdin.c nxmu_mouse.c nxmu_openwindow.c nxmu_redrawreq.c
-NXMU_CSRCS  += nxmu_releasebkgd.c nxmu_requestbkgd.c nxmu_reportposition.c
-NXMU_CSRCS  += nxmu_sendclient.c nxmu_sendclientwindow.c nxmu_server.c
-
-NX_CSRCS     = $(NXAPI_CSRCS) $(NXMU_CSRCS)
+NX_CSRCS   = nx_eventhandler.c nx_eventnotify.c
+NX_CSRCS  += nxmu_kbdin.c nxmu_mouse.c nxmu_openwindow.c nxmu_redrawreq.c
+NX_CSRCS  += nxmu_releasebkgd.c nxmu_requestbkgd.c nxmu_reportposition.c
+NX_CSRCS  += nxmu_sendclient.c nxmu_sendclientwindow.c nxmu_server.c
diff --git a/nuttx/graphics/nxmu/nx_drawcircle.c b/nuttx/graphics/nxmu/nx_drawcircle.c
deleted file mode 100644
index 22424c19d..000000000
--- a/nuttx/graphics/nxmu/nx_drawcircle.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/****************************************************************************
- * graphics/nxmu/nx_drawcircle.c
- *
- *   Copyright (C) 2011 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.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <sys/types.h>
-#include <debug.h>
-#include <errno.h>
-
-#include <nuttx/nx/nxglib.h>
-#include <nuttx/nx/nx.h>
-
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-/* Named indices into the 16 circle points generated by nxgl_circlepts */
-
-#define POINT_0p0      0 
-#define POINT_22p5     1
-#define POINT_45p0     2
-#define POINT_67p5     3
-#define POINT_90p0     4
-#define POINT_112p5    5
-#define POINT_135p0    6
-#define POINT_157p5    7
-#define POINT_180p0    8
-#define POINT_202p5    9
-#define POINT_225p0    10
-#define POINT_247p5    11
-#define POINT_270p0    12
-#define POINT_292p5    13
-#define POINT_315p0    14
-#define POINT_337p5    15
-#define NCIRCLE_POINTS 16
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: nx_drawcircle
- *
- * Description:
- *  Draw a circular outline using the specified line thickness and color.
- *
- * Input Parameters:
- *   hwnd   - The window handle
- *   center - A pointer to the point that is the center of the circle
- *   radius - The radius of the circle in pixels.
- *   width  - The width of the line
- *   color  - The color to use to fill the line
- *
- * Return:
- *   OK on success; ERROR on failure with errno set appropriately
- *
- ****************************************************************************/
-
-int nx_drawcircle(NXWINDOW hwnd, FAR const struct nxgl_point_s *center,
-                  nxgl_coord_t radius, nxgl_coord_t width,
-                  nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
-{
-  struct nxgl_point_s pts[NCIRCLE_POINTS];
-  FAR struct nxgl_vector_s vector;
-  int i;
-  int ret;
-
-  /* Convert the circle to a set of 16 points */
-
-  nxgl_circlepts(center, radius, pts);
-
-  /* Draw each pair of points as a vector */
-
-  for (i = POINT_0p0; i < POINT_337p5; i++)
-    {
-      vector.pt1.x = pts[i].x;
-      vector.pt1.y = pts[i].y;
-      vector.pt2.x = pts[i+1].x;
-      vector.pt2.y = pts[i+1].y;
-      ret = nx_drawline(hwnd, &vector, width, color);
-      if (ret != OK)
-        {
-          return ret;
-        }
-    }
-
-  /* The final, closing vector is a special case */
-
-  vector.pt1.x = pts[POINT_337p5].x;
-  vector.pt1.y = pts[POINT_337p5].y;
-  vector.pt2.x = pts[POINT_0p0].x;
-  vector.pt2.y = pts[POINT_0p0].y;
-  return nx_drawline(hwnd, &vector, width, color);
-}
diff --git a/nuttx/graphics/nxmu/nx_drawline.c b/nuttx/graphics/nxmu/nx_drawline.c
deleted file mode 100644
index 7de0af1c1..000000000
--- a/nuttx/graphics/nxmu/nx_drawline.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/****************************************************************************
- * graphics/nxmu/nx_drawline.c
- *
- *   Copyright (C) 2011 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.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <sys/types.h>
-#include <debug.h>
-#include <errno.h>
-
-#include <nuttx/nx/nxglib.h>
-#include <nuttx/nx/nx.h>
-
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: nx_drawline
- *
- * Description:
- *  Fill the specified line in the window with the specified color.  This
- *  is simply a wrapper that uses nxgl_splitline() to break the line into
- *  trapezoids and then calls nx_filltrapezoid() to render the line.
- *
- * Input Parameters:
- *   hwnd   - The window handle
- *   vector - Describes the line to be drawn
- *   width  - The width of the line
- *   color  - The color to use to fill the line
- *
- * Return:
- *   OK on success; ERROR on failure with errno set appropriately
- *
- ****************************************************************************/
-
-int nx_drawline(NXWINDOW hwnd, FAR struct nxgl_vector_s *vector,
-                nxgl_coord_t width, nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
-{
-  struct nxgl_trapezoid_s trap[3];
-  struct nxgl_rect_s rect;
-  int ret;
-
-#ifdef CONFIG_DEBUG
-  if (!hwnd || !vector || width < 1 || !color)
-    {
-      set_errno(EINVAL);
-      return ERROR;
-    }
-#endif
-
-  ret = nxgl_splitline(vector, trap, &rect, width);
-  switch (ret)
-    {
-      case 0:
-        ret = nx_filltrapezoid(hwnd, NULL, &trap[0], color);
-        if (ret == OK)
-          {
-            ret = nx_filltrapezoid(hwnd, NULL, &trap[1], color);
-            if (ret == OK)
-              {
-                ret = nx_filltrapezoid(hwnd, NULL, &trap[2], color);
-              }
-          }
-        break;
-
-      case 1:
-        ret = nx_filltrapezoid(hwnd, NULL, &trap[1], color);
-        break;
-
-      case 2:
-        ret = nx_fill(hwnd, &rect, color);
-        break;
-
-      default:
-        set_errno(-ret);
-        return ERROR;
-    }
-
-  return ret;
-}
diff --git a/nuttx/graphics/nxmu/nx_fillcircle.c b/nuttx/graphics/nxmu/nx_fillcircle.c
deleted file mode 100644
index 5c9671695..000000000
--- a/nuttx/graphics/nxmu/nx_fillcircle.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/****************************************************************************
- * graphics/nxsu/nx_fillcircle.c
- *
- *   Copyright (C) 2011 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.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <sys/types.h>
-#include <debug.h>
-#include <errno.h>
-
-#include <nuttx/nx/nxglib.h>
-#include <nuttx/nx/nx.h>
-
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-#define NCIRCLE_TRAPS 8
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: nx_fillcircle
- *
- * Description:
- *  Fill a circular region using the specified color.
- *
- * Input Parameters:
- *   hwnd   - The window handle
- *   center - A pointer to the point that is the center of the circle
- *   radius - The radius of the circle in pixels.
- *   color  - The color to use to fill the circle.
- *
- * Return:
- *   OK on success; ERROR on failure with errno set appropriately
- *
- ****************************************************************************/
-
-int nx_fillcircle(NXWINDOW hwnd, FAR const struct nxgl_point_s *center,
-                  nxgl_coord_t radius, nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
-{
-  FAR struct nxgl_trapezoid_s traps[NCIRCLE_TRAPS];
-  int i;
-  int ret;
-
-  /* Describe the circular region as a sequence of 8 trapezoids */
-
-  nxgl_circletraps(center, radius, traps);
-
-  /* Then rend those trapezoids */
-
-  for (i = 0; i < NCIRCLE_TRAPS; i++)
-    {
-      ret = nx_filltrapezoid(hwnd, NULL, &traps[i], color);
-      if (ret != OK)
-        {
-          return ret;
-        }
-    }
-  return OK;
-}
diff --git a/nuttx/graphics/nxsu/Make.defs b/nuttx/graphics/nxsu/Make.defs
index d16fe549c..cf668d93c 100644
--- a/nuttx/graphics/nxsu/Make.defs
+++ b/nuttx/graphics/nxsu/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # graphics/nxsu/Make.defs
 #
-#   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
@@ -33,12 +33,11 @@
 #
 ############################################################################
 
-NX_ASRCS	=
-NXAPI_CSRCS	= nx_bitmap.c nx_close.c nx_closewindow.c nx_fill.c \
-		  nx_filltrapezoid.c nx_getposition.c nx_getrectangle.c nx_kbdchin.c  \
-		  nx_kbdin.c nx_lower.c nx_mousein.c nx_move.c nx_open.c \
-		  nx_openwindow.c nx_raise.c nx_releasebkgd.c nx_requestbkgd.c \
-		  nx_setpixel.c nx_setsize.c nx_setbgcolor.c nx_setposition.c \
-		  nx_drawcircle.c nx_drawline.c nx_fillcircle.c
-NXSU_CSRCS	= nxsu_constructwindow.c nxsu_redrawreq.c nxsu_reportposition.c
-NX_CSRCS	= $(NXAPI_CSRCS) $(NXSU_CSRCS)
+NX_ASRCS  =
+
+NX_CSRCS  = nx_bitmap.c nx_close.c nx_closewindow.c nx_fill.c
+NX_CSRCS += nx_filltrapezoid.c nx_getposition.c nx_getrectangle.c nx_kbdchin.c
+NX_CSRCS += nx_kbdin.c nx_lower.c nx_mousein.c nx_move.c nx_open.c
+NX_CSRCS += nx_openwindow.c nx_raise.c nx_releasebkgd.c nx_requestbkgd.c
+NX_CSRCS += nx_setpixel.c nx_setsize.c nx_setbgcolor.c nx_setposition.c
+NX_CSRCS += nxsu_constructwindow.c nxsu_redrawreq.c nxsu_reportposition.c
diff --git a/nuttx/graphics/nxsu/nx_drawcircle.c b/nuttx/graphics/nxsu/nx_drawcircle.c
deleted file mode 100644
index 30b307219..000000000
--- a/nuttx/graphics/nxsu/nx_drawcircle.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/****************************************************************************
- * graphics/nxsu/nx_drawcircle.c
- *
- *   Copyright (C) 2011 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.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <sys/types.h>
-#include <debug.h>
-#include <errno.h>
-
-#include <nuttx/nx/nxglib.h>
-#include <nuttx/nx/nx.h>
-
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-/* Named indices into the 16 circle points generated by nxgl_circlepts */
-
-#define POINT_0p0      0 
-#define POINT_22p5     1
-#define POINT_45p0     2
-#define POINT_67p5     3
-#define POINT_90p0     4
-#define POINT_112p5    5
-#define POINT_135p0    6
-#define POINT_157p5    7
-#define POINT_180p0    8
-#define POINT_202p5    9
-#define POINT_225p0    10
-#define POINT_247p5    11
-#define POINT_270p0    12
-#define POINT_292p5    13
-#define POINT_315p0    14
-#define POINT_337p5    15
-#define NCIRCLE_POINTS 16
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: nx_drawcircle
- *
- * Description:
- *  Draw a circular outline using the specified line thickness and color.
- *
- * Input Parameters:
- *   hwnd   - The window handle
- *   center - A pointer to the point that is the center of the circle
- *   radius - The radius of the circle in pixels.
- *   width  - The width of the line
- *   color  - The color to use to fill the line
- *
- * Return:
- *   OK on success; ERROR on failure with errno set appropriately
- *
- ****************************************************************************/
-
-int nx_drawcircle(NXWINDOW hwnd, FAR const struct nxgl_point_s *center,
-                  nxgl_coord_t radius, nxgl_coord_t width,
-                  nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
-{
-  struct nxgl_point_s pts[NCIRCLE_POINTS];
-  FAR struct nxgl_vector_s vector;
-  int i;
-  int ret;
-
-  /* Convert the circle to a set of 16 points */
-
-  nxgl_circlepts(center, radius, pts);
-
-  /* Draw each pair of points as a vector */
-
-  for (i = POINT_0p0; i < POINT_337p5; i++)
-    {
-      vector.pt1.x = pts[i].x;
-      vector.pt1.y = pts[i].y;
-      vector.pt2.x = pts[i+1].x;
-      vector.pt2.y = pts[i+1].y;
-      ret = nx_drawline(hwnd, &vector, width, color);
-      if (ret != OK)
-        {
-          return ret;
-        }
-    }
-
-  /* The final, closing vector is a special case */
-
-  vector.pt1.x = pts[POINT_337p5].x;
-  vector.pt1.y = pts[POINT_337p5].y;
-  vector.pt2.x = pts[POINT_0p0].x;
-  vector.pt2.y = pts[POINT_0p0].y;
-  return nx_drawline(hwnd, &vector, width, color);
-}
diff --git a/nuttx/graphics/nxsu/nx_drawline.c b/nuttx/graphics/nxsu/nx_drawline.c
deleted file mode 100644
index 99e3494b9..000000000
--- a/nuttx/graphics/nxsu/nx_drawline.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/****************************************************************************
- * graphics/nxsu/nx_drawline.c
- *
- *   Copyright (C) 2011 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.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <sys/types.h>
-#include <debug.h>
-#include <errno.h>
-
-#include <nuttx/nx/nxglib.h>
-#include <nuttx/nx/nx.h>
-
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: nx_drawline
- *
- * Description:
- *  Fill the specified line in the window with the specified color.  This
- *  is simply a wrapper that uses nxgl_splitline() to break the line into
- *  trapezoids and then calls nx_filltrapezoid() to render the line.
- *
- * Input Parameters:
- *   hwnd   - The window handle
- *   vector - Describes the line to be drawn
- *   width  - The width of the line
- *   color  - The color to use to fill the line
- *
- * Return:
- *   OK on success; ERROR on failure with errno set appropriately
- *
- ****************************************************************************/
-
-int nx_drawline(NXWINDOW hwnd, FAR struct nxgl_vector_s *vector,
-                nxgl_coord_t width, nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
-{
-  struct nxgl_trapezoid_s trap[3];
-  struct nxgl_rect_s rect;
-  int ret;
-
-#ifdef CONFIG_DEBUG
-  if (!hwnd || !vector || width < 1 || !color)
-    {
-      set_errno(EINVAL);
-      return ERROR;
-    }
-#endif
-
-  ret = nxgl_splitline(vector, trap, &rect, width);
-  switch (ret)
-    {
-      case 0:
-        ret = nx_filltrapezoid(hwnd, NULL, &trap[0], color);
-        if (ret == OK)
-          {
-            ret = nx_filltrapezoid(hwnd, NULL, &trap[1], color);
-            if (ret == OK)
-              {
-                ret = nx_filltrapezoid(hwnd, NULL, &trap[2], color);
-              }
-          }
-        break;
-
-      case 1:
-        ret = nx_filltrapezoid(hwnd, NULL, &trap[1], color);
-        break;
-
-      case 2:
-        ret = nx_fill(hwnd, &rect, color);
-        break;
-
-      default:
-        set_errno(-ret);
-        return ERROR;
-    }
-
-  return ret;
-}
diff --git a/nuttx/graphics/nxsu/nx_fillcircle.c b/nuttx/graphics/nxsu/nx_fillcircle.c
deleted file mode 100644
index f3876057a..000000000
--- a/nuttx/graphics/nxsu/nx_fillcircle.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/****************************************************************************
- * graphics/nxmu/nx_fillcircle.c
- *
- *   Copyright (C) 2011 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.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <sys/types.h>
-#include <debug.h>
-#include <errno.h>
-
-#include <nuttx/nx/nxglib.h>
-#include <nuttx/nx/nx.h>
-
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-#define NCIRCLE_TRAPS 8
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: nx_fillcircle
- *
- * Description:
- *  Fill a circular region using the specified color.
- *
- * Input Parameters:
- *   hwnd   - The window handle
- *   center - A pointer to the point that is the center of the circle
- *   radius - The radius of the circle in pixels.
- *   color  - The color to use to fill the circle.
- *
- * Return:
- *   OK on success; ERROR on failure with errno set appropriately
- *
- ****************************************************************************/
-
-int nx_fillcircle(NXWINDOW hwnd, FAR const struct nxgl_point_s *center,
-                  nxgl_coord_t radius, nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
-{
-  FAR struct nxgl_trapezoid_s traps[NCIRCLE_TRAPS];
-  int i;
-  int ret;
-
-  /* Describe the circular region as a sequence of 8 trapezoids */
-
-  nxgl_circletraps(center, radius, traps);
-
-  /* Then rend those trapezoids */
-
-  for (i = 0; i < NCIRCLE_TRAPS; i++)
-    {
-      ret = nx_filltrapezoid(hwnd, NULL, &traps[i], color);
-      if (ret != OK)
-        {
-          return ret;
-        }
-    }
-  return OK;
-}
diff --git a/nuttx/graphics/nxsu/nxfe.h b/nuttx/graphics/nxsu/nxfe.h
index 40c310d1a..cd76dd16f 100644
--- a/nuttx/graphics/nxsu/nxfe.h
+++ b/nuttx/graphics/nxsu/nxfe.h
@@ -81,7 +81,8 @@ struct nxfe_state_s
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
@@ -116,14 +117,12 @@ EXTERN const struct nx_callback_s g_bkgdcb;
  *
  * Return:
  *   OK on success; ERROR on failure with errno set appropriately.  In the
- *   case of ERROR, NX will have dealloated the pre-allocated window.
+ *   case of ERROR, NX will have deallocated the pre-allocated window.
  *
  ****************************************************************************/
 
-EXTERN int nxfe_constructwindow(NXHANDLE handle,
-                                FAR struct nxbe_window_s *wnd,
-                                FAR const struct nx_callback_s *cb,
-                                FAR void *arg);
+int nxfe_constructwindow(NXHANDLE handle, FAR struct nxbe_window_s *wnd,
+                         FAR const struct nx_callback_s *cb, FAR void *arg);
 
 /****************************************************************************
  * Name: nxfe_redrawreq
@@ -133,8 +132,8 @@ EXTERN int nxfe_constructwindow(NXHANDLE handle,
  *
  ****************************************************************************/
 
-EXTERN void nxfe_redrawreq(FAR struct nxbe_window_s *wnd,
-                           FAR const struct nxgl_rect_s *rect);
+void nxfe_redrawreq(FAR struct nxbe_window_s *wnd,
+                    FAR const struct nxgl_rect_s *rect);
 
 /****************************************************************************
  * Name: nxfe_reportposition
@@ -144,7 +143,7 @@ EXTERN void nxfe_redrawreq(FAR struct nxbe_window_s *wnd,
  *
  ****************************************************************************/
 
-EXTERN void nxfe_reportposition(FAR struct nxbe_window_s *wnd);
+void nxfe_reportposition(FAR struct nxbe_window_s *wnd);
 
 /****************************************************************************
  * Name: nxmu_mouseinit
@@ -155,7 +154,7 @@ EXTERN void nxfe_reportposition(FAR struct nxbe_window_s *wnd);
  ****************************************************************************/
 
 #ifdef CONFIG_NX_MOUSE
-EXTERN void nxsu_mouseinit(int x, int y);
+void nxsu_mouseinit(int x, int y);
 #endif
 
 /****************************************************************************
@@ -173,7 +172,7 @@ EXTERN void nxsu_mouseinit(int x, int y);
  ****************************************************************************/
 
 #ifdef CONFIG_NX_MOUSE
-EXTERN int nxsu_mousereport(struct nxbe_window_s *wnd);
+int nxsu_mousereport(struct nxbe_window_s *wnd);
 #endif
 
 #undef EXTERN
@@ -182,4 +181,3 @@ EXTERN int nxsu_mousereport(struct nxbe_window_s *wnd);
 #endif
 
 #endif  /* __GRAPHICS_NXSU_NXFE_H */
-
diff --git a/nuttx/graphics/nxsu/nxsu_constructwindow.c b/nuttx/graphics/nxsu/nxsu_constructwindow.c
index 194a62106..46b010cee 100644
--- a/nuttx/graphics/nxsu/nxsu_constructwindow.c
+++ b/nuttx/graphics/nxsu/nxsu_constructwindow.c
@@ -96,7 +96,7 @@
  *
  * Return:
  *   OK on success; ERROR on failure with errno set appropriately.  In the
- *   case of ERROR, NX will have dealloated the pre-allocated window.
+ *   case of ERROR, NX will have deallocated the pre-allocated window.
  *
  ****************************************************************************/