summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-11-01 13:48:54 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-11-01 13:48:54 -0600
commitbd3b213967cdd85c87c15ee0a22efd3e714e70b2 (patch)
tree9e128a5c2623fb9353b955632b02a7ae65295603 /apps
parent955a988db66ac833ed0d12d2f764f3e138415461 (diff)
parent0a8c84a67af2815440f1df241f04a5072ad8407e (diff)
downloadnuttx-bd3b213967cdd85c87c15ee0a22efd3e714e70b2.tar.gz
nuttx-bd3b213967cdd85c87c15ee0a22efd3e714e70b2.tar.bz2
nuttx-bd3b213967cdd85c87c15ee0a22efd3e714e70b2.zip
Merge remote-tracking branch 'origin/master' into bas24
Diffstat (limited to 'apps')
-rw-r--r--apps/examples/serialblaster/serialblaster_main.c2
-rw-r--r--apps/examples/serialrx/serialrx_main.c2
-rw-r--r--apps/examples/serloop/serloop_main.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/apps/examples/serialblaster/serialblaster_main.c b/apps/examples/serialblaster/serialblaster_main.c
index e3e71a4df..7ca5ebe8a 100644
--- a/apps/examples/serialblaster/serialblaster_main.c
+++ b/apps/examples/serialblaster/serialblaster_main.c
@@ -64,7 +64,7 @@ static const char s[] = "abcdefghijklmnopqrstuvwxyz";
****************************************************************************/
/****************************************************************************
- * serloop_main
+ * serialblaster_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
diff --git a/apps/examples/serialrx/serialrx_main.c b/apps/examples/serialrx/serialrx_main.c
index 1a8279694..4fe60929f 100644
--- a/apps/examples/serialrx/serialrx_main.c
+++ b/apps/examples/serialrx/serialrx_main.c
@@ -66,7 +66,7 @@ static int count = 0;
****************************************************************************/
/****************************************************************************
- * serloop_main
+ * serialrx_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
diff --git a/apps/examples/serloop/serloop_main.c b/apps/examples/serloop/serloop_main.c
index 7fad24501..f573a4c7c 100644
--- a/apps/examples/serloop/serloop_main.c
+++ b/apps/examples/serloop/serloop_main.c
@@ -79,6 +79,7 @@ int serloop_main(int argc, char *argv[])
{
ch = '.';
}
+
putchar(ch);
}
#else
@@ -96,6 +97,7 @@ int serloop_main(int argc, char *argv[])
{
ch = '.';
}
+
ret = write(1, &ch, 1);
}
#endif