mirror of
https://github.com/apache/nuttx.git
synced 2026-05-22 22:20:01 +08:00
Still recovering from recent NX reorganization. Reported by Steve Redler IV
This commit is contained in:
@@ -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).
|
||||
|
||||
|
||||
@@ -137,5 +137,5 @@ void nxbe_closewindow(struct nxbe_window_s *wnd)
|
||||
* allocator was used.
|
||||
*/
|
||||
|
||||
umm_free(wnd);
|
||||
kufree(wnd);
|
||||
}
|
||||
|
||||
@@ -90,6 +90,6 @@ void nx_close(NXHANDLE handle)
|
||||
{
|
||||
/* For consistency, we use the user-space allocate (if available) */
|
||||
|
||||
umm_free(handle);
|
||||
kufree(handle);
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -39,6 +39,7 @@
|
||||
|
||||
#include <nuttx/config.h>
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <errno.h>
|
||||
#include <debug.h>
|
||||
|
||||
|
||||
@@ -39,6 +39,7 @@
|
||||
|
||||
#include <nuttx/config.h>
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <errno.h>
|
||||
#include <debug.h>
|
||||
|
||||
|
||||
@@ -39,6 +39,7 @@
|
||||
|
||||
#include <nuttx/config.h>
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <assert.h>
|
||||
|
||||
#include <nuttx/nx/nx.h>
|
||||
|
||||
Reference in New Issue
Block a user