summaryrefslogtreecommitdiff
path: root/nuttx/graphics/nxsu
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-12-29 08:19:02 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-12-29 08:19:02 -0600
commitb4cb5da06d21015fada0e2e9962ae71e7e76ae16 (patch)
tree3c623d23b85de6ca764eeee74684c60ed8b7859f /nuttx/graphics/nxsu
parent557108c7011c211dddd4920457f950c9e6d33d4f (diff)
downloadnuttx-b4cb5da06d21015fada0e2e9962ae71e7e76ae16.tar.gz
nuttx-b4cb5da06d21015fada0e2e9962ae71e7e76ae16.tar.bz2
nuttx-b4cb5da06d21015fada0e2e9962ae71e7e76ae16.zip
Minor clean-up of typing from last commit
Diffstat (limited to 'nuttx/graphics/nxsu')
-rw-r--r--nuttx/graphics/nxsu/nx_constructwindow.c10
-rw-r--r--nuttx/graphics/nxsu/nx_openwindow.c3
-rw-r--r--nuttx/graphics/nxsu/nxfe.h4
3 files changed, 8 insertions, 9 deletions
diff --git a/nuttx/graphics/nxsu/nx_constructwindow.c b/nuttx/graphics/nxsu/nx_constructwindow.c
index b77025dcf..0703ab644 100644
--- a/nuttx/graphics/nxsu/nx_constructwindow.c
+++ b/nuttx/graphics/nxsu/nx_constructwindow.c
@@ -83,14 +83,14 @@
* inheritance: The caller's window structure may include extensions that
* are not visible to NX.
*
- * NOTE: wnd must have been allocated using kmalloc() (or related allocators)
+ * NOTE: hwnd must have been allocated using kmalloc() (or related allocators)
* Once provided to nx_constructwindow() that memory is owned and managed
* by NX. On certain error conditions or when the window is closed, NX will
* free the window.
*
* Input Parameters:
* handle - The handle returned by nx_connect
- * wnd - The pre-allocated window structure.
+ * hwnd - The pre-allocated window structure.
* cb - Callbacks used to process window events
* arg - User provided value that will be returned with NX callbacks.
*
@@ -100,16 +100,17 @@
*
****************************************************************************/
-int nx_constructwindow(NXHANDLE handle, FAR struct nxbe_window_s *wnd,
+int nx_constructwindow(NXHANDLE handle, NXWINDOW wnd,
FAR const struct nx_callback_s *cb, FAR void *arg)
{
FAR struct nxfe_state_s *fe = (FAR struct nxfe_state_s *)handle;
+ FAR struct nxbe_window_s *wnd = (FAR struct nxbe_window_s *)hwnd;
FAR struct nxbe_state_s *be = &fe->be;
#ifdef CONFIG_DEBUG
if (!wnd)
{
- errno = EINVAL;
+ set_errno(EINVAL);
return ERROR;
}
@@ -149,4 +150,3 @@ int nx_constructwindow(NXHANDLE handle, FAR struct nxbe_window_s *wnd,
return OK;
}
-
diff --git a/nuttx/graphics/nxsu/nx_openwindow.c b/nuttx/graphics/nxsu/nx_openwindow.c
index 83851d94e..773210853 100644
--- a/nuttx/graphics/nxsu/nx_openwindow.c
+++ b/nuttx/graphics/nxsu/nx_openwindow.c
@@ -114,7 +114,7 @@ NXWINDOW nx_openwindow(NXHANDLE handle, FAR const struct nx_callback_s *cb,
/* Then let nx_constructwindow do the rest */
- ret = nx_constructwindow(handle, wnd, cb, arg);
+ ret = nx_constructwindow(handle, (NXWINDOW)wnd, cb, arg);
if (ret < 0)
{
/* An error occurred, the window has been freed */
@@ -126,4 +126,3 @@ NXWINDOW nx_openwindow(NXHANDLE handle, FAR const struct nx_callback_s *cb,
return (NXWINDOW)wnd;
}
-
diff --git a/nuttx/graphics/nxsu/nxfe.h b/nuttx/graphics/nxsu/nxfe.h
index 5bbfb040b..82c1d832b 100644
--- a/nuttx/graphics/nxsu/nxfe.h
+++ b/nuttx/graphics/nxsu/nxfe.h
@@ -59,8 +59,8 @@
/* Server state structure ***************************************************/
-/* This the server 'front-end' state structure. It is really the same
- * as the back-end state, but we wrap the back-end state so that we can add
+/* This the 'front-end' state structure. It is really the same as the
+ * the back-end state, but we wrap the back-end state so that we can add
* things to the structure in the future
*/