summaryrefslogtreecommitdiff
path: root/nuttx/graphics/nxmu
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-03-28 19:29:30 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-03-28 19:29:30 +0000
commitbed8e66d958c4cc177166b473f81ec26445d99a3 (patch)
tree3e362aceae490cf42ce2a690d5e86f7fcb1cfe5b /nuttx/graphics/nxmu
parent51f649620cc2be02b02f31ec872920e5ba2afb79 (diff)
downloadpx4-nuttx-bed8e66d958c4cc177166b473f81ec26445d99a3.tar.gz
px4-nuttx-bed8e66d958c4cc177166b473f81ec26445d99a3.tar.bz2
px4-nuttx-bed8e66d958c4cc177166b473f81ec26445d99a3.zip
The NX console appears to be fully functional
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4536 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/graphics/nxmu')
-rw-r--r--nuttx/graphics/nxmu/nx_disconnect.c2
-rw-r--r--nuttx/graphics/nxmu/nx_releasebkgd.c2
-rw-r--r--nuttx/graphics/nxmu/nxmu_server.c25
3 files changed, 2 insertions, 27 deletions
diff --git a/nuttx/graphics/nxmu/nx_disconnect.c b/nuttx/graphics/nxmu/nx_disconnect.c
index 24fb114f4..f4711b005 100644
--- a/nuttx/graphics/nxmu/nx_disconnect.c
+++ b/nuttx/graphics/nxmu/nx_disconnect.c
@@ -94,7 +94,7 @@ void nx_disconnect(NXHANDLE handle)
/* Inform the server that this client no longer exists */
- msg.msgid = NX_SVRMSG_CONNECT;
+ msg.msgid = NX_SVRMSG_DISCONNECT;
msg.conn = conn;
ret = mq_send(conn->cwrmq, &msg, sizeof(struct nxsvrmsg_s), NX_SVRMSG_PRIO);
diff --git a/nuttx/graphics/nxmu/nx_releasebkgd.c b/nuttx/graphics/nxmu/nx_releasebkgd.c
index 4e8a75679..99815b1e7 100644
--- a/nuttx/graphics/nxmu/nx_releasebkgd.c
+++ b/nuttx/graphics/nxmu/nx_releasebkgd.c
@@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxmu/nx_releasebkgd.c
*
- * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2008-2009, 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/graphics/nxmu/nxmu_server.c b/nuttx/graphics/nxmu/nxmu_server.c
index 9cd9e578a..fbd03464f 100644
--- a/nuttx/graphics/nxmu/nxmu_server.c
+++ b/nuttx/graphics/nxmu/nxmu_server.c
@@ -130,31 +130,6 @@ static inline void nxmu_connect(FAR struct nxfe_conn_s *conn)
}
/****************************************************************************
- * Name: nxmu_release
- ****************************************************************************/
-
-static int nxmu_release(FAR struct nxfe_state_s *fe)
-{
- FAR struct nxbe_window_s *wnd;
- struct nxclimsg_s outmsg;
- int ret;
-
- /* Don't want windows to close while we do this */
-
- for (wnd = fe->be.topwnd; wnd; wnd = wnd->below)
- {
- outmsg.msgid = NX_CLIMSG_DISCONNECTED;
- ret = mq_send(wnd->conn->swrmq, &outmsg, sizeof(struct nxclimsg_s), NX_CLIMSG_PRIO);
- if (ret < 0)
- {
- gdbg("mq_send failed: %d\n", errno);
- }
- }
-
- return OK;
-}
-
-/****************************************************************************
* Name: nxmu_shutdown
****************************************************************************/