summaryrefslogtreecommitdiff
path: root/apps/examples/usbterm
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-10-08 08:33:00 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-10-08 08:33:00 -0600
commitfdb1d0a4df496e7a3232a950d5c72231363cf67a (patch)
tree5d18c1b4f9241f17396ec663ff4425bf21e6b57a /apps/examples/usbterm
parent1753a0251a941fa4d1a5b95aec631209e9957670 (diff)
downloadnuttx-fdb1d0a4df496e7a3232a950d5c72231363cf67a.tar.gz
nuttx-fdb1d0a4df496e7a3232a950d5c72231363cf67a.tar.bz2
nuttx-fdb1d0a4df496e7a3232a950d5c72231363cf67a.zip
Remove non-portable references to syslog from apps/examples
Diffstat (limited to 'apps/examples/usbterm')
-rw-r--r--apps/examples/usbterm/usbterm.h20
-rw-r--r--apps/examples/usbterm/usbterm_main.c34
2 files changed, 17 insertions, 37 deletions
diff --git a/apps/examples/usbterm/usbterm.h b/apps/examples/usbterm/usbterm.h
index 560e55346..303d1b9f1 100644
--- a/apps/examples/usbterm/usbterm.h
+++ b/apps/examples/usbterm/usbterm.h
@@ -97,26 +97,6 @@
# define USBTERM_DEVNAME "/dev/ttyUSB0"
#endif
-/* Debug ********************************************************************/
-
-#ifdef CONFIG_CPP_HAVE_VARARGS
-# ifdef CONFIG_DEBUG
-# define message(...) syslog(__VA_ARGS__)
-# define trmessage syslog
-# else
-# define message(...) printf(__VA_ARGS__)
-# define trmessage printf
-# endif
-#else
-# ifdef CONFIG_DEBUG
-# define message lowsyslog
-# define trmessage lowsyslog
-# else
-# define message printf
-# define trmessage printf
-# endif
-#endif
-
#define IOBUFFER_SIZE 256
/****************************************************************************
diff --git a/apps/examples/usbterm/usbterm_main.c b/apps/examples/usbterm/usbterm_main.c
index 18d4733d5..3ec2a4a2b 100644
--- a/apps/examples/usbterm/usbterm_main.c
+++ b/apps/examples/usbterm/usbterm_main.c
@@ -128,7 +128,7 @@ static void dumptrace(void)
static FAR void *usbterm_listener(FAR void *parameter)
{
- message("usbterm_listener: Waiting for remote input\n");
+ printf("usbterm_listener: Waiting for remote input\n");
for (;;)
{
/* Display the prompt string on the remote USB serial connection -- only
@@ -202,18 +202,18 @@ int usbterm_main(int argc, char *argv[])
*/
#ifdef CONFIG_EXAMPLES_USBTERM_DEVINIT
- message("usbterm_main: Performing external device initialization\n");
+ printf("usbterm_main: Performing external device initialization\n");
ret = usbterm_devinit();
if (ret != OK)
{
- message("usbterm_main: usbterm_devinit failed: %d\n", ret);
+ printf("usbterm_main: usbterm_devinit failed: %d\n", ret);
goto errout;
}
#endif
/* Initialize the USB serial driver */
- message("usbterm_main: Registering USB serial driver\n");
+ printf("usbterm_main: Registering USB serial driver\n");
#ifdef CONFIG_CDCACM
ret = cdcacm_initialize(0, NULL);
#else
@@ -221,10 +221,10 @@ int usbterm_main(int argc, char *argv[])
#endif
if (ret < 0)
{
- message("usbterm_main: ERROR: Failed to create the USB serial device: %d\n", -ret);
+ printf("usbterm_main: ERROR: Failed to create the USB serial device: %d\n", -ret);
goto errout_with_devinit;
}
- message("usbterm_main: Successfully registered the serial driver\n");
+ printf("usbterm_main: Successfully registered the serial driver\n");
#if CONFIG_USBDEV_TRACE && CONFIG_USBDEV_TRACE_INITIALIDSET != 0
/* If USB tracing is enabled and tracing of initial USB events is specified,
@@ -243,20 +243,20 @@ int usbterm_main(int argc, char *argv[])
do
{
- message("usbterm_main: Opening USB serial driver\n");
+ printf("usbterm_main: Opening USB serial driver\n");
g_usbterm.outstream = fopen(USBTERM_DEVNAME, "w");
if (g_usbterm.outstream == NULL)
{
int errcode = errno;
- message("usbterm_main: ERROR: Failed to open " USBTERM_DEVNAME " for writing: %d\n",
- errcode);
+ printf("usbterm_main: ERROR: Failed to open " USBTERM_DEVNAME " for writing: %d\n",
+ errcode);
/* ENOTCONN means that the USB device is not yet connected */
if (errcode == ENOTCONN)
{
- message("usbterm_main: Not connected. Wait and try again.\n");
+ printf("usbterm_main: Not connected. Wait and try again.\n");
sleep(5);
}
else
@@ -280,20 +280,20 @@ int usbterm_main(int argc, char *argv[])
g_usbterm.instream = fopen(USBTERM_DEVNAME, "r");
if (g_usbterm.instream == NULL)
{
- message("usbterm_main: ERROR: Failed to open " USBTERM_DEVNAME " for reading: %d\n", errno);
+ printf("usbterm_main: ERROR: Failed to open " USBTERM_DEVNAME " for reading: %d\n", errno);
goto errout_with_outstream;
}
- message("usbterm_main: Successfully opened the serial driver\n");
+ printf("usbterm_main: Successfully opened the serial driver\n");
/* Start the USB term listener thread */
- message("usbterm_main: Starting the listener thread\n");
+ printf("usbterm_main: Starting the listener thread\n");
ret = pthread_attr_init(&attr);
if (ret != OK)
{
- message("usbterm_main: pthread_attr_init failed: %d\n", ret);
+ printf("usbterm_main: pthread_attr_init failed: %d\n", ret);
goto errout_with_streams;
}
@@ -301,13 +301,13 @@ int usbterm_main(int argc, char *argv[])
usbterm_listener, (pthread_addr_t)0);
if (ret != 0)
{
- message("usbterm_main: Error in thread creation: %d\n", ret);
+ printf("usbterm_main: Error in thread creation: %d\n", ret);
goto errout_with_streams;
}
/* Send messages and get responses -- forever */
- message("usbterm_main: Waiting for local input\n");
+ printf("usbterm_main: Waiting for local input\n");
for (;;)
{
/* Display the prompt string on stdout */
@@ -373,7 +373,7 @@ errout_with_devinit:
usbterm_devuninit();
errout:
#endif
- message("usbterm_main: Aborting\n");
+ printf("usbterm_main: Aborting\n");
return 1;
}