Still recovering from recent NX reorganization. Reported by Steve Redler IV

9 files changed, 15 insertions, 6 deletions

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 5352a1857..62fed73d4 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -6398,4 +6398,10 @@
 	  (2014-1-7).
 	* graphics/nxsu/Make.defs:  Typo that crept into build in recent
 	  NX reorganization.  Found by Steve Redler IV (2014-1-7).
+	* graphics/nxsu/:  Another typo from the
+	  recent NX reorganization from Steve Redler IV (2014-1-7).
+	* graphics/nxbe/nxbe_closewindow.c, nx_close.c, nx_constructwindow.c,
+	  nx_open.c, and nx_openwindow.c:  Needs to use kuzalloc and kufree,
+	  not umm_zalloc and umm_free.  Additional typo in nx_constructwindow.c
+	  (wnd should be hwnd). Also noted by Steve Redler IV (2014-1-7).
 
diff --git a/nuttx/graphics/nxbe/nxbe_closewindow.c b/nuttx/graphics/nxbe/nxbe_closewindow.c
index 09c47af22..ae6580e3c 100644
--- a/nuttx/graphics/nxbe/nxbe_closewindow.c
+++ b/nuttx/graphics/nxbe/nxbe_closewindow.c
@@ -137,5 +137,5 @@ void nxbe_closewindow(struct nxbe_window_s *wnd)
    * allocator was used.
    */
 
-  umm_free(wnd);
+  kufree(wnd);
 }
diff --git a/nuttx/graphics/nxsu/nx_close.c b/nuttx/graphics/nxsu/nx_close.c
index 848513b5c..05c6acdd1 100644
--- a/nuttx/graphics/nxsu/nx_close.c
+++ b/nuttx/graphics/nxsu/nx_close.c
@@ -90,6 +90,6 @@ void nx_close(NXHANDLE handle)
 {
   /* For consistency, we use the user-space allocate (if available) */
 
-  umm_free(handle);
+  kufree(handle);
 }
 
diff --git a/nuttx/graphics/nxsu/nx_constructwindow.c b/nuttx/graphics/nxsu/nx_constructwindow.c
index 1be780a2a..d4e90dbfb 100644
--- a/nuttx/graphics/nxsu/nx_constructwindow.c
+++ b/nuttx/graphics/nxsu/nx_constructwindow.c
@@ -100,7 +100,7 @@
  *
  ****************************************************************************/
 
-int nx_constructwindow(NXHANDLE handle, NXWINDOW wnd,
+int nx_constructwindow(NXHANDLE handle, NXWINDOW hwnd,
                        FAR const struct nx_callback_s *cb, FAR void *arg)
 {
   FAR struct nxfe_state_s *fe = (FAR struct nxfe_state_s *)handle;
@@ -116,7 +116,7 @@ int nx_constructwindow(NXHANDLE handle, NXWINDOW wnd,
 
   if (!fe || !cb)
     {
-      umm_free(wnd);
+      kufree(wnd);
       errno = EINVAL;
       return ERROR;
     }
diff --git a/nuttx/graphics/nxsu/nx_open.c b/nuttx/graphics/nxsu/nx_open.c
index 4866f15ce..a8956d8af 100644
--- a/nuttx/graphics/nxsu/nx_open.c
+++ b/nuttx/graphics/nxsu/nx_open.c
@@ -199,7 +199,7 @@ NXHANDLE nx_open(FAR NX_DRIVERTYPE *dev)
    * (if available) for compatibility with the multi-user implementation.
    */
 
-  fe = (FAR struct nxfe_state_s *)umm_zalloc(sizeof(struct nxfe_state_s));
+  fe = (FAR struct nxfe_state_s *)kuzalloc(sizeof(struct nxfe_state_s));
   if (!fe)
     {
       errno = ENOMEM;
diff --git a/nuttx/graphics/nxsu/nx_openwindow.c b/nuttx/graphics/nxsu/nx_openwindow.c
index d085ad03e..4c4afa35b 100644
--- a/nuttx/graphics/nxsu/nx_openwindow.c
+++ b/nuttx/graphics/nxsu/nx_openwindow.c
@@ -107,7 +107,7 @@ NXWINDOW nx_openwindow(NXHANDLE handle, FAR const struct nx_callback_s *cb,
    * available) for compatibility with the multi-user implementation.
    */
 
-  wnd = (FAR struct nxbe_window_s *)umm_zalloc(sizeof(struct nxbe_window_s));
+  wnd = (FAR struct nxbe_window_s *)kuzalloc(sizeof(struct nxbe_window_s));
   if (!wnd)
     {
       errno = ENOMEM;
diff --git a/nuttx/libnx/nxtk/nxtk_bitmaptoolbar.c b/nuttx/libnx/nxtk/nxtk_bitmaptoolbar.c
index 8f99267dc..abeb14d18 100644
--- a/nuttx/libnx/nxtk/nxtk_bitmaptoolbar.c
+++ b/nuttx/libnx/nxtk/nxtk_bitmaptoolbar.c
@@ -39,6 +39,7 @@
 
 #include <nuttx/config.h>
 
+#include <sys/types.h>
 #include <errno.h>
 #include <debug.h>
 
diff --git a/nuttx/libnx/nxtk/nxtk_bitmapwindow.c b/nuttx/libnx/nxtk/nxtk_bitmapwindow.c
index 11956aeb1..da814fe10 100644
--- a/nuttx/libnx/nxtk/nxtk_bitmapwindow.c
+++ b/nuttx/libnx/nxtk/nxtk_bitmapwindow.c
@@ -39,6 +39,7 @@
 
 #include <nuttx/config.h>
 
+#include <sys/types.h>
 #include <errno.h>
 #include <debug.h>
 
diff --git a/nuttx/libnx/nxtk/nxtk_toolbarbounds.c b/nuttx/libnx/nxtk/nxtk_toolbarbounds.c
index 2f5991d70..6303b4d20 100644
--- a/nuttx/libnx/nxtk/nxtk_toolbarbounds.c
+++ b/nuttx/libnx/nxtk/nxtk_toolbarbounds.c
@@ -39,6 +39,7 @@
 
 #include <nuttx/config.h>
 
+#include <sys/types.h>
 #include <assert.h>
 
 #include <nuttx/nx/nx.h>