From e92d687ebb6bdec40959a5a45a0d912586176fd6 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Thu, 17 Dec 2009 19:24:18 +0000
Subject: [PATCH] Fixes for clean NX compile/link

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2374 42af7a65-404d-4744-a932-0658087f49c3
---
 ChangeLog                          | 7 ++++++-
 Documentation/NuttX.html           | 9 +++++++--
 graphics/nxbe/nxbe_fbconfigure.c   | 1 +
 graphics/nxbe/nxbe_lower.c         | 1 +
 graphics/nxfonts/nxfonts_convert.c | 3 ++-
 graphics/nxfonts/nxfonts_getfont.c | 5 +++--
 graphics/nxsu/nx_kbdchin.c         | 1 +
 graphics/nxsu/nx_kbdin.c           | 1 +
 graphics/nxsu/nx_mousein.c         | 1 +
 9 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e3e65a494a..7f20e961b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1000,5 +1000,10 @@
 	* Changed ALL references to non-standard fixed-size types (like uint32,
 	  ubyte, etc.) to standard types (like uint32_t, uint8_t, etc.) from
 	  stdint.h.  Use type bool and {true, false} from stdbool.  This effected
-	  most of the files in the system!
+	  most of the files in the system!  Almost all configurations have been
+	  re-built and many have been re-verified in order to get confidence in
+	  these changes.
+	* graphics/ and examples/nx - Fix numerous build errors that have been
+	  introduced lately.  NXGL has suffered some bit-rot from not being used
+	  in some of the most recent ports.
 
diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html
index f655d0da06..8ec5558f08 100644
--- a/Documentation/NuttX.html
+++ b/Documentation/NuttX.html
@@ -8,7 +8,7 @@
   <tr align="center" bgcolor="#e4e4e4">
     <td>
       <h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
-      <p>Last Updated: December 16, 2009</p>
+      <p>Last Updated: December 17, 2009</p>
     </td>
   </tr>
 </table>
@@ -1626,7 +1626,12 @@ nuttx-2010.1 2010-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
 	* Changed ALL references to non-standard fixed-size types (like uint32,
 	  ubyte, etc.) to standard types (like uint32_t, uint8_t, etc.) from
 	  stdint.h.  Use type bool and {true, false} from stdbool.  This effected
-	  most of the files in the system!
+	  most of the files in the system!  Almost all configurations have been
+	  re-built and many have been re-verified in order to get confidence in
+	  these changes.
+	* graphics/ and examples/nx - Fix numerous build errors that have been
+	  introduced lately.  NXGL has suffered some bit-rot from not being used
+	  in some of the most recent ports.
 
 pascal-2010.1 2010-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
 
diff --git a/graphics/nxbe/nxbe_fbconfigure.c b/graphics/nxbe/nxbe_fbconfigure.c
index fb3e51f6c2..df6dbe0d9c 100644
--- a/graphics/nxbe/nxbe_fbconfigure.c
+++ b/graphics/nxbe/nxbe_fbconfigure.c
@@ -39,6 +39,7 @@
 
 #include <nuttx/config.h>
 
+#include <stddef.h>
 #include <errno.h>
 #include <debug.h>
 
diff --git a/graphics/nxbe/nxbe_lower.c b/graphics/nxbe/nxbe_lower.c
index 334f504922..f2f160e832 100644
--- a/graphics/nxbe/nxbe_lower.c
+++ b/graphics/nxbe/nxbe_lower.c
@@ -39,6 +39,7 @@
 
 #include <nuttx/config.h>
 
+#include <stddef.h>
 #include <debug.h>
 
 #include <nuttx/nxglib.h>
diff --git a/graphics/nxfonts/nxfonts_convert.c b/graphics/nxfonts/nxfonts_convert.c
index 0599faa9bc..ea8672c26f 100644
--- a/graphics/nxfonts/nxfonts_convert.c
+++ b/graphics/nxfonts/nxfonts_convert.c
@@ -40,6 +40,7 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+#include <stddef.h>
 #include <debug.h>
 
 #include <nuttx/nxglib.h>
@@ -145,7 +146,7 @@ int NXF_FUNCNAME(nxf_convert,NXFONTS_SUFFIX)
   FAR NXF_PIXEL_T *dptr;
   FAR const uint8_t *sptr;
   uint8_t bmbyte;
-  uint8_t bmbit;
+  int bmbit;
   int row;
   int col;
   int bmndx;
diff --git a/graphics/nxfonts/nxfonts_getfont.c b/graphics/nxfonts/nxfonts_getfont.c
index 9fcc571559..3c53cae7f7 100644
--- a/graphics/nxfonts/nxfonts_getfont.c
+++ b/graphics/nxfonts/nxfonts_getfont.c
@@ -40,6 +40,7 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+#include <stddef.h>
 #include <debug.h>
 
 #include <nuttx/nxfonts.h>
@@ -136,8 +137,8 @@ FAR const struct nx_font_s *nxf_getfontset(void)
 
 FAR const struct nx_fontbitmap_s *nxf_getbitmap(uint16_t ch)
 {
-  FAR const struct nx_fontset_s *set = nxf_getglyphset(ch);
-  FAR struct nx_fontbitmap_s *bm = NULL;
+  FAR const struct nx_fontset_s    *set = nxf_getglyphset(ch);
+  FAR const struct nx_fontbitmap_s *bm  = NULL;
 
   if (set)
     {
diff --git a/graphics/nxsu/nx_kbdchin.c b/graphics/nxsu/nx_kbdchin.c
index 03db76f48c..51f4d8ce1f 100644
--- a/graphics/nxsu/nx_kbdchin.c
+++ b/graphics/nxsu/nx_kbdchin.c
@@ -95,6 +95,7 @@ int nx_kbdchin(NXHANDLE handle, uint8_t ch)
     {
       wnd->cb->kbdin(wnd, 1, &ch, wnd->arg);
     }
+  return OK;
 }
 
 #endif /* CONFIG_NX_KBD */
diff --git a/graphics/nxsu/nx_kbdin.c b/graphics/nxsu/nx_kbdin.c
index 4a1b93d093..066c31c8e5 100644
--- a/graphics/nxsu/nx_kbdin.c
+++ b/graphics/nxsu/nx_kbdin.c
@@ -94,6 +94,7 @@ int nx_kbdin(NXHANDLE handle, uint8_t nch, FAR const uint8_t *ch)
     {
       wnd->cb->kbdin(wnd, nch, ch, wnd->arg);
     }
+  return OK;
 }
 
 #endif /* CONFIG_NX_KBD */
diff --git a/graphics/nxsu/nx_mousein.c b/graphics/nxsu/nx_mousein.c
index d83da90b0b..2d4c9bec92 100644
--- a/graphics/nxsu/nx_mousein.c
+++ b/graphics/nxsu/nx_mousein.c
@@ -194,6 +194,7 @@ int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, uint8_t buttons)
             }
         }
     }
+  return OK;
 }
 
 #endif /* CONFIG_NX_MOUSE */