diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-12-30 14:09:58 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-12-30 14:09:58 -0600 |
| commit | ef06e94a13aa48b0f9c1dde244ee3d4299a9156c (patch) | |
| tree | 255ae18810c3c4339ce91ee019c4cbac021f2655 | |
| parent | fd95f9ae75acb674be870e3a92c05816bcbbd819 (diff) | |
| download | nuttx-ef06e94a13aa48b0f9c1dde244ee3d4299a9156c.tar.gz nuttx-ef06e94a13aa48b0f9c1dde244ee3d4299a9156c.tar.bz2 nuttx-ef06e94a13aa48b0f9c1dde244ee3d4299a9156c.zip | |
Fix some minor kernel mose NxWM build issues
| -rw-r--r-- | nuttx/include/nuttx/nx/nx.h | 2 | ||||
| -rw-r--r-- | nuttx/libc/wqueue/work_usrstart.c | 10 | ||||
| -rw-r--r-- | nuttx/libnx/nxmu/nx_redrawreq.c | 9 |
3 files changed, 7 insertions, 14 deletions
diff --git a/nuttx/include/nuttx/nx/nx.h b/nuttx/include/nuttx/nx/nx.h index 27c738d41..96584db7d 100644 --- a/nuttx/include/nuttx/nx/nx.h +++ b/nuttx/include/nuttx/nx/nx.h @@ -294,7 +294,7 @@ int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev); * ****************************************************************************/ -#if defined(CONFIG_NX_MULTIUSER) && defined(CONFIG_NX_START) +#if defined(CONFIG_NX_MULTIUSER) && defined(CONFIG_NX_NXSTART) int nx_start(void); #endif diff --git a/nuttx/libc/wqueue/work_usrstart.c b/nuttx/libc/wqueue/work_usrstart.c index 5b51931c6..696bf04aa 100644 --- a/nuttx/libc/wqueue/work_usrstart.c +++ b/nuttx/libc/wqueue/work_usrstart.c @@ -88,10 +88,6 @@ int work_usrstart(void) { - int errcode; - - DEBUGASSERT(g_usrwork[USRWORK] == NULL); - /* Start a user-mode worker thread for use by applications. */ svdbg("Starting user-mode worker thread\n"); @@ -102,10 +98,12 @@ int work_usrstart(void) (main_t)work_usrthread, (FAR char * const *)NULL); - errcode = errno; - ASSERT(g_usrwork[USRWORK].pid > 0); + DEBUGASSERT(g_usrwork[USRWORK].pid > 0); if (g_usrwork[USRWORK].pid < 0) { + int errcode = errno; + DEBUGASSERT(errcode > 0); + sdbg("task_create failed: %d\n", errcode); return -errcode; } diff --git a/nuttx/libnx/nxmu/nx_redrawreq.c b/nuttx/libnx/nxmu/nx_redrawreq.c index 6621bb8a1..ed0e63909 100644 --- a/nuttx/libnx/nxmu/nx_redrawreq.c +++ b/nuttx/libnx/nxmu/nx_redrawreq.c @@ -40,6 +40,7 @@ #include <nuttx/config.h> #include <errno.h> +#include <assert.h> #include <debug.h> #include <nuttx/nx/nx.h> @@ -94,13 +95,7 @@ void nx_redrawreq(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect) struct nxsvrmsg_redrawreq_s outmsg; int ret; -#ifdef CONFIG_DEBUG - if (!wnd || !rect) - { - set_errno(EINVAL); - return ERROR; - } -#endif + DEBUGASSERT(wnd && rect); /* Inform the server of the changed position */ |