diff options
| -rw-r--r-- | apps/drivers/boards/px4fmu/px4fmu_init.c | 4 | ||||
| -rw-r--r-- | apps/px4/tests/tests.h | 4 | ||||
| -rw-r--r-- | apps/px4io/px4io.c | 4 | ||||
| -rw-r--r-- | apps/px4io/px4io.h | 2 | ||||
| -rw-r--r-- | apps/systemlib/err.c | 8 | ||||
| -rw-r--r-- | nuttx/include/nuttx/serial/serial.h | 3 |
6 files changed, 11 insertions, 14 deletions
diff --git a/apps/drivers/boards/px4fmu/px4fmu_init.c b/apps/drivers/boards/px4fmu/px4fmu_init.c index e88d2861e..9960c6bbd 100644 --- a/apps/drivers/boards/px4fmu/px4fmu_init.c +++ b/apps/drivers/boards/px4fmu/px4fmu_init.c @@ -79,13 +79,13 @@ #ifdef CONFIG_CPP_HAVE_VARARGS # ifdef CONFIG_DEBUG -# define message(...) lib_lowprintf(__VA_ARGS__) +# define message(...) lowsyslog(__VA_ARGS__) # else # define message(...) printf(__VA_ARGS__) # endif #else # ifdef CONFIG_DEBUG -# define message lib_lowprintf +# define message lowsyslog # else # define message printf # endif diff --git a/apps/px4/tests/tests.h b/apps/px4/tests/tests.h index cc3f5493a..c02ea6808 100644 --- a/apps/px4/tests/tests.h +++ b/apps/px4/tests/tests.h @@ -48,7 +48,7 @@ #ifdef CONFIG_CPP_HAVE_VARARGS # ifdef CONFIG_DEBUG -# define message(...) lib_rawprintf(__VA_ARGS__) +# define message(...) lowsyslog(__VA_ARGS__) # define msgflush() # else # define message(...) printf(__VA_ARGS__) @@ -56,7 +56,7 @@ # endif #else # ifdef CONFIG_DEBUG -# define message lib_rawprintf +# define message lowsyslog # define msgflush() # else # define message printf diff --git a/apps/px4io/px4io.c b/apps/px4io/px4io.c index bea9d59bc..88342816e 100644 --- a/apps/px4io/px4io.c +++ b/apps/px4io/px4io.c @@ -73,7 +73,7 @@ int user_start(int argc, char *argv[]) hrt_init(); /* print some startup info */ - lib_lowprintf("\nPX4IO: starting\n"); + lowsyslog("\nPX4IO: starting\n"); /* default all the LEDs to off while we start */ LED_AMBER(false); @@ -98,7 +98,7 @@ int user_start(int argc, char *argv[]) struct mallinfo minfo = mallinfo(); - lib_lowprintf("free %u largest %u\n", minfo.mxordblk, minfo.fordblks); + lowsyslog("free %u largest %u\n", minfo.mxordblk, minfo.fordblks); /* we're done here, go run the communications loop */ comms_main(); diff --git a/apps/px4io/px4io.h b/apps/px4io/px4io.h index e388f65e3..3ce6afc31 100644 --- a/apps/px4io/px4io.h +++ b/apps/px4io/px4io.h @@ -58,7 +58,7 @@ #ifdef DEBUG # include <debug.h> -# define debug(fmt, args...) lib_lowprintf(fmt "\n", ##args) +# define debug(fmt, args...) lowsyslog(fmt "\n", ##args) #else # define debug(fmt, args...) do {} while(0) #endif diff --git a/apps/systemlib/err.c b/apps/systemlib/err.c index 3011743a1..daf17ef8b 100644 --- a/apps/systemlib/err.c +++ b/apps/systemlib/err.c @@ -85,17 +85,17 @@ warnerr_core(int errcode, const char *fmt, va_list args) fprintf(stderr, "\n"); #elif CONFIG_ARCH_LOWPUTC - lib_lowprintf("%s: ", getprogname()); - lib_lowvprintf(fmt, args); + lowsyslog("%s: ", getprogname()); + lowvyslog(fmt, args); /* convenience as many parts of NuttX use negative errno */ if (errcode < 0) errcode = -errcode; if (errcode < NOCODE) - lib_lowprintf(": %s", strerror(errcode)); + lowsyslog(": %s", strerror(errcode)); - lib_lowprintf("\n"); + lowsyslog("\n"); #endif } diff --git a/nuttx/include/nuttx/serial/serial.h b/nuttx/include/nuttx/serial/serial.h index d72038e17..4ee2005ef 100644 --- a/nuttx/include/nuttx/serial/serial.h +++ b/nuttx/include/nuttx/serial/serial.h @@ -220,7 +220,6 @@ struct uart_dev_s #ifndef CONFIG_DISABLE_POLL struct pollfd *fds[CONFIG_SERIAL_NPOLLWAITERS]; #endif -<<<<<<< HEAD /* Terminal control flags */ @@ -230,8 +229,6 @@ struct uart_dev_s tcflag_t tc_lflag; /* Local modes */ #endif -======= ->>>>>>> 049c93446561c6ad3e59183c139f3916230ddee5 }; typedef struct uart_dev_s uart_dev_t; |