diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-17 19:32:48 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-17 19:32:48 +0000 |
| commit | b1bbea743d6eef38eebf9975a3b19bbfb7e71233 (patch) | |
| tree | 8c587dcf2a7a151343d5b046915c59e3819d0222 /nuttx/graphics/nxmu/nx_connect.c | |
| parent | bcf87589a010480afbe6ab9f1b81cde37c6bdbb5 (diff) | |
| download | px4-nuttx-b1bbea743d6eef38eebf9975a3b19bbfb7e71233.tar.gz px4-nuttx-b1bbea743d6eef38eebf9975a3b19bbfb7e71233.tar.bz2 px4-nuttx-b1bbea743d6eef38eebf9975a3b19bbfb7e71233.zip | |
Re-factor NX messaging logic in preparation for a new message control feature
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4744 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/graphics/nxmu/nx_connect.c')
| -rw-r--r-- | nuttx/graphics/nxmu/nx_connect.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nuttx/graphics/nxmu/nx_connect.c b/nuttx/graphics/nxmu/nx_connect.c index e872f3505..4d91b54d5 100644 --- a/nuttx/graphics/nxmu/nx_connect.c +++ b/nuttx/graphics/nxmu/nx_connect.c @@ -1,8 +1,8 @@ /**************************************************************************** * graphics/nxmu/nx_connect.c * - * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * 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 * modification, are permitted provided that the following conditions @@ -113,7 +113,7 @@ static uint32_t g_nxcid = 1; NXHANDLE nx_connectinstance(FAR const char *svrmqname) { FAR struct nxfe_conn_s *conn; - struct nxsvrmsg_s msg; + struct nxsvrmsg_s outmsg; char climqname[NX_CLIENT_MXNAMELEN]; struct mq_attr attr; int ret; @@ -177,13 +177,13 @@ NXHANDLE nx_connectinstance(FAR const char *svrmqname) /* Inform the server that this client exists */ - msg.msgid = NX_SVRMSG_CONNECT; - msg.conn = conn; + outmsg.msgid = NX_SVRMSG_CONNECT; + outmsg.conn = conn; - ret = mq_send(conn->cwrmq, &msg, sizeof(struct nxsvrmsg_s), NX_SVRMSG_PRIO); + ret = nxmu_sendserver(conn, &outmsg, sizeof(struct nxsvrmsg_s)); if (ret < 0) { - gdbg("mq_send failed: %d\n", errno); + gdbg("nxmu_sendserver failed: %d\n", errno); goto errout_with_wmq; } |