diff --git a/Documentation/NXGraphicsSubsystem.html b/Documentation/NXGraphicsSubsystem.html index a9723453ded..273a8fcc836 100644 --- a/Documentation/NXGraphicsSubsystem.html +++ b/Documentation/NXGraphicsSubsystem.html @@ -93,7 +93,7 @@ 2.3.3 Starting the NX Server

@@ -937,13 +937,13 @@ struct nx_callback_s

  1. - The NX server may be started in your board startup logic by simply calling the function nx_start(). + The NX server may be started in your board startup logic by simply calling the function nxmu_start(). The board startup logic usually resides the the configs/board/src directory. The boar board startup logic can run automatically during the early system if CONFIG_BOARD_INITIALIZE is defined in the configuration. Or, the board startup logic can execute under control of the application by calling the boardctl(BOARDIOC_INIT, arg) OS interface.

    - The board initialization logic will run in either case and the simple call to nx_start() will start the NX server. + The board initialization logic will run in either case and the simple call to nxmu_start() will start the NX server.

  2. @@ -951,16 +951,16 @@ struct nx_callback_s
-

2.3.3.1 nx_start()

+

2.3.3.1 nxmu_start()

Function Prototype:

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.

Input Parameters: @@ -996,7 +996,7 @@ int nx_start(void); In it is especially useful for setting up board operational and test configurations.

- When called with the cmd of BOARDIOC_NX_START, then the boardctl() will call nx_start indirectly on behalf of the appication. + When called with the cmd of BOARDIOC_NX_START, then the boardctl() will call nxmu_start indirectly on behalf of the appication. In this case the arg parameter is ignored.

diff --git a/configs/boardctl.c b/configs/boardctl.c index cca53db3c91..b335e76c507 100644 --- a/configs/boardctl.c +++ b/configs/boardctl.c @@ -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 diff --git a/graphics/Kconfig b/graphics/Kconfig index c839aa89240..5f3094678e6 100644 --- a/graphics/Kconfig +++ b/graphics/Kconfig @@ -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 diff --git a/graphics/nxmu/Make.defs b/graphics/nxmu/Make.defs index b872b4cb3b0..21feb883bb1 100644 --- a/graphics/nxmu/Make.defs +++ b/graphics/nxmu/Make.defs @@ -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} diff --git a/graphics/nxmu/nx_start.c b/graphics/nxmu/nxmu_start.c similarity index 94% rename from graphics/nxmu/nx_start.c rename to graphics/nxmu/nxmu_start.c index 757b418d7e9..c76b0eb39d7 100644 --- a/graphics/nxmu/nx_start.c +++ b/graphics/nxmu/nxmu_start.c @@ -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 * * 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 */ diff --git a/include/nuttx/board.h b/include/nuttx/board.h index 8f42a973a9b..581153492c9 100644 --- a/include/nuttx/board.h +++ b/include/nuttx/board.h @@ -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). * ****************************************************************************/ diff --git a/include/nuttx/nx/nx.h b/include/nuttx/nx/nx.h index 209de4fe06a..514c5306978 100644 --- a/include/nuttx/nx/nx.h +++ b/include/nuttx/nx/nx.h @@ -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) diff --git a/include/sys/boardctl.h b/include/sys/boardctl.h index 7d0f4b38a41..14bc6f3b2f7 100644 --- a/include/sys/boardctl.h +++ b/include/sys/boardctl.h @@ -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)