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

NFS update

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4532 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-03-28 00:10:43 +00:00
parent 17245fa174
commit 7bdfdb2623
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/nxconsole/nxcon_internal.h
View File

@ -173,6 +173,12 @@
# endif # endif
#endif #endif
/* Graphics Device */
#ifndef CONFIG_EXAMPLES_NXCON_DEVNO
# define CONFIG_EXAMPLES_NXCON_DEVNO 0
#endif
/* NX Console Device */ /* NX Console Device */
#ifndef CONFIG_EXAMPLES_NXCON_MINOR #ifndef CONFIG_EXAMPLES_NXCON_MINOR

33
examples/nxconsole/nxcon_main.c
View File

@ -321,10 +321,14 @@ static int nxcon_initialize(void)
int MAIN_NAME(int argc, char **argv) int MAIN_NAME(int argc, char **argv)
{ {
int exitcode = EXIT_FAILURE; int exitcode = EXIT_FAILURE;
#if 0 /* Don't re-direct... too hard to debug */
int fd;
#else
FILE *outstream;
#endif
nxgl_mxpixel_t color; nxgl_mxpixel_t color;
int ndx; int ndx;
int ret; int ret;
int fd;
/* Reset all global data */ /* Reset all global data */
@ -432,6 +436,7 @@ int MAIN_NAME(int argc, char **argv)
/* Open the driver */ /* Open the driver */
#if 0 /* Don't re-direct... too hard to debug */
fd = open(CONFIG_EXAMPLES_NXCON_DEVNAME, O_WRONLY); fd = open(CONFIG_EXAMPLES_NXCON_DEVNAME, O_WRONLY);
if (fd < 0) if (fd < 0)
{ {
@ -440,7 +445,10 @@ int MAIN_NAME(int argc, char **argv)
goto errout_with_driver; goto errout_with_driver;
} }
/* Now re-direct stdout and stderr so that they use the NX console driver */ /* Now re-direct stdout and stderr so that they use the NX console driver.
* If debug is enabled, then perform the test using only stderr so that we
* can still get debug output on stdout.
*/
(void)dup2(fd, 1); (void)dup2(fd, 1);
(void)dup2(fd, 2); (void)dup2(fd, 2);
@ -448,6 +456,17 @@ int MAIN_NAME(int argc, char **argv)
/* And we can close our original driver fd */ /* And we can close our original driver fd */
close(fd); close(fd);
#else
/* Open the Console driver as a write-only stream */
outstream = fopen(CONFIG_EXAMPLES_NXCON_DEVNAME, "w");
if (!outstream)
{
message(MAIN_NAME_STRING ": fopen %s read-only failed: %d\n",
CONFIG_EXAMPLES_NXCON_DEVNAME, errno);
goto errout_with_driver;
}
#endif
/* Test Loop **************************************************************/ /* Test Loop **************************************************************/
/* Now loop, adding text to the NX console */ /* Now loop, adding text to the NX console */
@ -461,7 +480,13 @@ int MAIN_NAME(int argc, char **argv)
/* Give another line of text to the NX console.*/ /* Give another line of text to the NX console.*/
#if 0 /* Don't re-direct... too hard to debug */
printf(g_nxcon_msg[ndx]); printf(g_nxcon_msg[ndx]);
fflush(stdout);
#else
fprintf(outstream, g_nxcon_msg[ndx]);
fflush(outstream);
#endif
if (++ndx >= NCON_MSG_NLINES) if (++ndx >= NCON_MSG_NLINES)
{ {
#ifdef CONFIG_NSH_BUILTIN_APPS #ifdef CONFIG_NSH_BUILTIN_APPS
@ -481,6 +506,10 @@ int MAIN_NAME(int argc, char **argv)
/* Clean-up and Error Exits ***********************************************/ /* Clean-up and Error Exits ***********************************************/
#if 1 /* Don't re-direct... too hard to debug */
fclose(outstream);
#endif
errout_with_driver: errout_with_driver:
message(MAIN_NAME_STRING ": Unregister the NX console device\n"); message(MAIN_NAME_STRING ": Unregister the NX console device\n");
(void)nxcon_unregister(g_nxcon_vars.hdrvr); (void)nxcon_unregister(g_nxcon_vars.hdrvr);