sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

graphics/nxmu/nxmu_start.c: Fix a naming collision introduced with the last commit. Ye olde nx_start that started the NX graphics is now nxmu_start().

Browse Source
This commit is contained in:
Gregory Nutt 2019-02-04 16:51:48 -06:00
parent a2e62f557d
commit 7a2bb1f727
8 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Documentation/NXGraphicsSubsystem.html
View File

@ -93,7 +93,7 @@
<i>2.3.3 <a href="#startingnx">Starting the NX Server</a></i>
<p>
<ul>
<i>2.3.3.1 <a href="#nxstart"><code>nx_start()</code></a></i><br>
<i>2.3.3.1 <a href="#nxstart"><code>nxmu_start()</code></a></i><br>
<i>2.3.3.2 <a href="#boardctl"><code>boardctl()</code></a></i><br>
</ul>
<p>
@ -937,13 +937,13 @@ struct nx_callback_s
<ol>
<li>
<p>
The NX server may be started in your board startup logic by simply calling the function <code> nx_start()</code>.
The NX server may be started in your board startup logic by simply calling the function <code> nxmu_start()</code>.
The board startup logic usually resides the the <code>configs/<i>board</i>/src</code> directory.
The boar board startup logic can run automatically during the early system if <code>CONFIG_BOARD_INITIALIZE</code> is defined in the configuration.
Or, the board startup logic can execute under control of the application by calling the <code>boardctl(BOARDIOC_INIT, arg)</code> OS interface.
</p>
<p>
The board initialization logic will run in either case and the simple call to <code>nx_start()</code> will start the NX server.
The board initialization logic will run in either case and the simple call to <code>nxmu_start()</code> will start the NX server.
</p>
</li>
<li>
@ -951,16 +951,16 @@ struct nx_callback_s
</li>
</ol>
<h4>2.3.3.1 <a name="nxstart"><code>nx_start()</code></a></h4>
<h4>2.3.3.1 <a name="nxstart"><code>nxmu_start()</code></a></h4>
<p><b>Function Prototype:</b></p>
<ul><pre>
#include &lt;nuttx/nx/nx.h&gt;
int nx_start(void);
int nxmu_start(void);
</pre></ul>
<p>
<b>Description:</b>
<code>nx_start()</code> provides a wrapper function to simplify and standardize the starting of the NX server.
<code>nxmu_start()</code> provides a wrapper function to simplify and standardize the starting of the NX server.
</p>
<p>
<b>Input Parameters:</b>
@ -996,7 +996,7 @@ int nx_start(void);
In it is especially useful for setting up board operational and test configurations.
</p>
<p>
When called with the <code>cmd</code> of <code>BOARDIOC_NX_START</code>, then the <code>boardctl()</code> will call <code>nx_start</code> indirectly on behalf of the appication.
When called with the <code>cmd</code> of <code>BOARDIOC_NX_START</code>, then the <code>boardctl()</code> will call <code>nxmu_start</code> indirectly on behalf of the appication.
In this case the <code>arg</code> parameter is ignored.
</p>
<p>

4
configs/boardctl.c
View File

@ -407,12 +407,12 @@ int boardctl(unsigned int cmd, uintptr_t arg)
* DESCRIPTION: Start the NX servier
* ARG: None
* CONFIGURATION: CONFIG_NX
* DEPENDENCIES: Base graphics logic provides nx_start()
* DEPENDENCIES: Base graphics logic provides nxmu_start()
*/
case BOARDIOC_NX_START:
{
ret = nx_start();
ret = nxmu_start();
}
break;
#endif

8
graphics/Kconfig
View File

@ -394,10 +394,10 @@ config NXSTART_EXTERNINIT
select LCD_EXTERNINIT if LCD && LCD_FRAMEBUFFER && NX_LCDDRIVER
---help---
Define to support external display initialization by platform-
specific code. This this option is defined, then nx_start() will
call board_graphics_setup(CONFIG_NXSTART_DEVNO) to initialize the
graphics device. This option is necessary if display is used that
cannot be initialized using the standard LCD or framebuffer
specific code. This this option is defined, then nxmu_start()
will call board_graphics_setup(CONFIG_NXSTART_DEVNO) to initialize
the graphics device. This option is necessary if display is used
that cannot be initialized using the standard LCD or framebuffer
interfaces.
config NXSTART_SERVERPRIO

2
graphics/nxmu/Make.defs
View File

@ -36,7 +36,7 @@
CSRCS += nxmu_kbdin.c nxmu_mouse.c nxmu_openwindow.c nxmu_redrawreq.c
CSRCS += nxmu_releasebkgd.c nxmu_requestbkgd.c nxmu_reportposition.c
CSRCS += nxmu_sendclient.c nxmu_sendclientwindow.c nxmu_server.c
CSRCS += nx_start.c
CSRCS += nxmu_start.c
DEPPATH += --dep-path nxmu
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxmu}

14
graphics/nxmu/nx_start.c → graphics/nxmu/nxmu_start.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxmu/nx_start.c
* graphics/nxmu/nxmu_start.c
*
* Copyright (C) 2013, 2016-2017 Gregory Nutt. All rights reserved.
* Copyright (C) 2013, 2016-2017, 2019 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -153,13 +153,13 @@ static int nx_server(int argc, char *argv[])
****************************************************************************/
/****************************************************************************
* Name: nx_start
* Name: nxmu_start
*
* Description:
* nx_start() provides a wrapper function to simplify and standardize the
* starting of the NX server.
* nxmu_start() provides a wrapper function to simplify and standardize
* the starting of the NX server.
*
* nx_start() can be called (indirectly) from applications via the
* nxmu_start() can be called (indirectly) from applications via the
* boardctl() interface with the BOARDIOC_NX_START command.
*
* Input Parameters:
@ -175,7 +175,7 @@ static int nx_server(int argc, char *argv[])
*
****************************************************************************/
int nx_start(void)
int nxmu_start(void)
{
/* Do nothing is the server has already been started */

2
include/nuttx/board.h
View File

@ -337,7 +337,7 @@ FAR void *board_composite_connect(int port, int configid);
* initialization, then this board interface should be provided.
*
* This is an internal OS interface. It is invoked by graphics sub-system
* initialization logic (nx_start()) or from the LCD framebuffer driver
* initialization logic (nxmu_start()) or from the LCD framebuffer driver
* (when the NX server is not used).
*
****************************************************************************/

10
include/nuttx/nx/nx.h
View File

@ -270,13 +270,13 @@ int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev);
#define nx_run(dev) nx_runinstance(NX_DEFAULT_SERVER_MQNAME, dev)
/****************************************************************************
* Name: nx_start
* Name: nxmu_start
*
* Description:
* nx_start() provides a wrapper function to simplify and standardize the
* starting of the NX server.
* nxmu_start() provides a wrapper function to simplify and standardize
* the starting of the NX server.
*
* nx_start() can be called (indirectly) from applications via the
* nxmu_start() can be called (indirectly) from applications via the
* boardctl() interface with the BOARDIOC_NX_START command.
*
* Input Parameters:
@ -292,7 +292,7 @@ int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev);
*
****************************************************************************/
int nx_start(void);
int nxmu_start(void);
/****************************************************************************
* Name: nx_connectinstance (and nx_connect macro)

2
include/sys/boardctl.h
View File

@ -113,7 +113,7 @@
* DESCRIPTION: Start the NX servier
* ARG: None
* CONFIGURATION: CONFIG_NX
* DEPENDENCIES: Base graphics logic provides nx_start()
* DEPENDENCIES: Base graphics logic provides nxmu_start()
*/
#define BOARDIOC_INIT _BOARDIOC(0x0001)