apache/nuttx-apps
1
0
Fork 0
mirror of https://github.com/apache/nuttx-apps.git synced 2025-07-08 04:41:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

graphics/NxWidgets/nxwm/src/cnxterm.cxx: Part of the last change was still in he editor.

Browse Source
This commit is contained in:
Gregory Nutt 2019-03-06 11:12:56 -06:00
parent 061b4338c9
commit c341abff35
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
graphics/NxWidgets/nxwm/src/cnxterm.cxx
View File

@ -349,7 +349,7 @@ void CNxTerm::stop(void)
// Unlink the NxTerm driver // Unlink the NxTerm driver
(void)unlink(devname); (void)unlink(m_devname);
m_nxterm = 0; m_nxterm = 0;
} }
} }
@ -467,8 +467,7 @@ int CNxTerm::nxterm(int argc, char *argv[])
// Construct the driver name using this minor number // Construct the driver name using this minor number
char devname[32]; snprintf(m_devname, 32, "/dev/nxterm%d", g_nxtermvars.minor);
snprintf(devname, 32, "/dev/nxterm%d", g_nxtermvars.minor);
// Increment the minor number while it is protect by the semaphore // Increment the minor number while it is protect by the semaphore
@ -477,9 +476,9 @@ int CNxTerm::nxterm(int argc, char *argv[])
// Open the NxTerm driver // Open the NxTerm driver
#ifdef CONFIG_NXTERM_NXKBDIN #ifdef CONFIG_NXTERM_NXKBDIN
fd = open(devname, O_RDWR); fd = open(m_devname, O_RDWR);
#else #else
fd = open(devname, O_WRONLY); fd = open(m_devname, O_WRONLY);
#endif #endif
if (fd < 0) if (fd < 0)
{ {
@ -535,7 +534,7 @@ int CNxTerm::nxterm(int argc, char *argv[])
return EXIT_SUCCESS; return EXIT_SUCCESS;
errout_with_nxterm: errout_with_nxterm:
(void)unlink(devname); (void)unlink(m_devname);
errout: errout:
g_nxtermvars.nxterm = 0; g_nxtermvars.nxterm = 0;