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

4 files changed, 5 insertions, 5 deletions

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;