fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Assorted compile fixes.

Browse Source
This commit is contained in:
px4dev 2013-02-06 23:50:55 -08:00
parent 0c7c32ce95
commit 8cb583cf80
6 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/drivers/boards/px4fmu/px4fmu_init.c
View File

@ -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

4
apps/px4/tests/tests.h
View File

@ -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

4
apps/px4io/px4io.c
View File

@ -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();

2
apps/px4io/px4io.h
View File

@ -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

8
apps/systemlib/err.c
View File

@ -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
}

3
nuttx/include/nuttx/serial/serial.h
View File

@ -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;