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

Rename CONFIG_NXCONSOLE* to CONFIG_NXTERM*

Browse Source
This commit is contained in:
Gregory Nutt 2014-09-20 14:18:08 -06:00
parent d78a62aaf0
commit d4488e79ca
11 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UnitTests/README.txt
View File

@ -87,7 +87,7 @@ Installing and Building the Unit Tests
d) Special configuration requirements for the nxwm unit test:
CONFIG_NXCONSOLE=y
CONFIG_NXTERM=y
CONFIG_NX_MULTIUSER=y
e) Other .config file changes -- NSH configurations only.

2
libnxwidgets/include/cbgwindow.hxx
View File

@ -220,7 +220,7 @@ namespace NXWidgets
* directed to the widgets within the window.
*/
#ifdef CONFIG_NXCONSOLE_NXKBDIN
#ifdef CONFIG_NXTERM_NXKBDIN
inline void redirectNxConsole(NXCONSOLE handle)
{
setNxConsole(handle);

6
libnxwidgets/include/ccallback.hxx
View File

@ -49,7 +49,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/nx/nx.h>
#ifdef CONFIG_NXCONSOLE_NXKBDIN
#ifdef CONFIG_NXTERM_NXKBDIN
# include <nuttx/nx/nxconsole.h>
#endif
@ -93,7 +93,7 @@ namespace NXWidgets
private:
CWidgetControl *m_widgetControl; /**< The widget control instance for this window */
struct nx_callback_s m_callbacks; /**< C-callable vtable of callback function pointers */
#ifdef CONFIG_NXCONSOLE_NXKBDIN
#ifdef CONFIG_NXTERM_NXKBDIN
NXCONSOLE m_nxconsole; /**< The NxConsole handle for redirection of keyboard input */
#endif
@ -257,7 +257,7 @@ namespace NXWidgets
* directed to the widgets within the window.
*/
#ifdef CONFIG_NXCONSOLE_NXKBDIN
#ifdef CONFIG_NXTERM_NXKBDIN
inline void setNxConsole(NXCONSOLE handle)
{
m_nxconsole = handle;

2
libnxwidgets/include/cnxtkwindow.hxx
View File

@ -241,7 +241,7 @@ namespace NXWidgets
* directed to the widgets within the window.
*/
#ifdef CONFIG_NXCONSOLE_NXKBDIN
#ifdef CONFIG_NXTERM_NXKBDIN
inline void redirectNxConsole(NXCONSOLE handle)
{
setNxConsole(handle);

2
libnxwidgets/include/cnxtoolbar.hxx
View File

@ -210,7 +210,7 @@ namespace NXWidgets
* directed to the widgets within the window.
*/
#ifdef CONFIG_NXCONSOLE_NXKBDIN
#ifdef CONFIG_NXTERM_NXKBDIN
inline void redirectNxConsole(NXCONSOLE handle)
{
setNxConsole(handle);

2
libnxwidgets/include/cnxwindow.hxx
View File

@ -214,7 +214,7 @@ namespace NXWidgets
* directed to the widgets within the window.
*/
#ifdef CONFIG_NXCONSOLE_NXKBDIN
#ifdef CONFIG_NXTERM_NXKBDIN
inline void redirectNxConsole(NXCONSOLE handle)
{
setNxConsole(handle);

4
libnxwidgets/include/inxwindow.hxx
View File

@ -47,7 +47,7 @@
#include <stdint.h>
#include <stdbool.h>
#ifdef CONFIG_NXCONSOLE_NXKBDIN
#ifdef CONFIG_NXTERM_NXKBDIN
# include <nuttx/nx/nxconsole.h>
#endif
@ -186,7 +186,7 @@ namespace NXWidgets
* directed to the widgets within the window.
*/
#ifdef CONFIG_NXCONSOLE_NXKBDIN
#ifdef CONFIG_NXTERM_NXKBDIN
virtual void redirectNxConsole(NXCONSOLE handle) = 0;
#endif

4
libnxwidgets/include/nxconfig.hxx
View File

@ -188,8 +188,8 @@
* reducing the AND of these three conditions to a single condition.
*/
#if !defined(CONFIG_NX_KBD) || !defined(CONFIG_NXCONSOLE)
# undef CONFIG_NXCONSOLE_NXKBDIN
#if !defined(CONFIG_NX_KBD) || !defined(CONFIG_NXTERM)
# undef CONFIG_NXTERM_NXKBDIN
#endif
/* NX Server/Device Configuration *******************************************/

6
libnxwidgets/src/ccallback.cxx
View File

@ -44,7 +44,7 @@
#include <stdbool.h>
#include <debug.h>
#ifdef CONFIG_NXCONSOLE_NXKBDIN
#ifdef CONFIG_NXTERM_NXKBDIN
# include <nuttx/nx/nxconsole.h>
#endif
@ -87,7 +87,7 @@ CCallback::CCallback(CWidgetControl *widgetControl)
// Keyboard input is initially direct to the widgets within the window
#ifdef CONFIG_NXCONSOLE_NXKBDIN
#ifdef CONFIG_NXTERM_NXKBDIN
m_nxconsole = (NXCONSOLE)0;
#endif
}
@ -209,7 +209,7 @@ void CCallback::newKeyboardEvent(NXHANDLE hwnd, uint8_t nCh,
// (default) OR is NX keyboard input being re-directed to an NxConsole
// driver?
#ifdef CONFIG_NXCONSOLE_NXKBDIN
#ifdef CONFIG_NXTERM_NXKBDIN
if (This->m_nxconsole)
{
// Keyboard input is going to an NxConsole

6
nxwm/include/nxwmconfig.hxx
View File

@ -57,7 +57,7 @@
* CONFIG_HAVE_CXX : C++ support is required
* CONFIG_NX : NX must enabled
* CONFIG_NX_MULTIUSER=y : NX must be configured in multiuse mode
* CONFIG_NXCONSOLE=y : For NxConsole support
* CONFIG_NXTERM=y : For NxConsole support
* CONFIG_SCHED_ONEXIT : Support for on_exit()
*
* General settings:
@ -89,8 +89,8 @@
* selected
*/
#if defined(CONFIG_NXWM_NXCONSOLE) && !defined(CONFIG_NXCONSOLE)
# warning "NxConsole support may be needed (CONFIG_NXCONSOLE)"
#if defined(CONFIG_NXWM_NXCONSOLE) && !defined(CONFIG_NXTERM)
# warning "NxConsole support may be needed (CONFIG_NXTERM)"
#endif
/**

12
nxwm/src/cnxconsole.cxx
View File

@ -278,7 +278,7 @@ bool CNxConsole::run(void)
// Re-direct NX keyboard input to the new NxConsole driver
DEBUGASSERT(g_nxconvars.nxcon != 0);
#ifdef CONFIG_NXCONSOLE_NXKBDIN
#ifdef CONFIG_NXTERM_NXKBDIN
window->redirectNxConsole(g_nxconvars.nxcon);
#endif
// Save the handle to use in the stop method
@ -331,7 +331,7 @@ void CNxConsole::stop(void)
{
// Re-store NX keyboard input routing
#ifdef CONFIG_NXCONSOLE_NXKBDIN
#ifdef CONFIG_NXTERM_NXKBDIN
NXWidgets::INxWindow *window = m_window->getWindow();
window->redirectNxConsole((NXCONSOLE)0);
#endif
@ -455,7 +455,7 @@ int CNxConsole::nxconsole(int argc, char *argv[])
// Open the NxConsole driver
#ifdef CONFIG_NXCONSOLE_NXKBDIN
#ifdef CONFIG_NXTERM_NXKBDIN
fd = open(devname, O_RDWR);
#else
fd = open(devname, O_WRONLY);
@ -474,19 +474,19 @@ int CNxConsole::nxconsole(int argc, char *argv[])
(void)std::fflush(stdout);
(void)std::fflush(stderr);
#ifdef CONFIG_NXCONSOLE_NXKBDIN
#ifdef CONFIG_NXTERM_NXKBDIN
(void)std::fclose(stdin);
#endif
(void)std::fclose(stdout);
(void)std::fclose(stderr);
#ifdef CONFIG_NXCONSOLE_NXKBDIN
#ifdef CONFIG_NXTERM_NXKBDIN
(void)std::dup2(fd, 0);
#endif
(void)std::dup2(fd, 1);
(void)std::dup2(fd, 2);
#ifdef CONFIG_NXCONSOLE_NXKBDIN
#ifdef CONFIG_NXTERM_NXKBDIN
(void)std::fdopen(0, "r");
#endif
(void)std::fdopen(1, "w");