diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-20 14:18:08 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-20 14:18:08 -0600 |
| commit | 4860036d8f145187cfe700743def8d0ee3548f1b (patch) | |
| tree | df2196f51b1ee2be9f6986f54da4f6056a5ebfd0 /NxWidgets/nxwm/src | |
| parent | 29268dcf2e63a5b3b2d9d8d9f56215819e9e3970 (diff) | |
| download | nuttx-4860036d8f145187cfe700743def8d0ee3548f1b.tar.gz nuttx-4860036d8f145187cfe700743def8d0ee3548f1b.tar.bz2 nuttx-4860036d8f145187cfe700743def8d0ee3548f1b.zip | |
Rename CONFIG_NXCONSOLE* to CONFIG_NXTERM*
Diffstat (limited to 'NxWidgets/nxwm/src')
| -rw-r--r-- | NxWidgets/nxwm/src/cnxconsole.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/NxWidgets/nxwm/src/cnxconsole.cxx b/NxWidgets/nxwm/src/cnxconsole.cxx index be0718a10..f2449e6b1 100644 --- a/NxWidgets/nxwm/src/cnxconsole.cxx +++ b/NxWidgets/nxwm/src/cnxconsole.cxx @@ -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"); |