phone-side
/
nuttx-bb
9
0
Fork 0
Code Releases Activity

Change all variadic macros to C99 style

This commit is contained in:
Gregory Nutt 2014-05-22 09:01:51 -06:00
parent 34cc8f19df
commit 54f7552fbc
53 changed files with 174 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/examples/elf/elf_main.c
View File

@ -106,11 +106,11 @@
#ifdef CONFIG_CPP_HAVE_VARARGS
# ifdef CONFIG_DEBUG
# define message(format, arg...) dbg(format, ##arg)
# define err(format, arg...) dbg(format, ##arg)
# define message(format, ...) dbg(format, ##__VA_ARGS__)
# define err(format, ...) dbg(format, ##__VA_ARGS__)
# else
# define message(format, arg...) printf(format, ##arg)
# define err(format, arg...) fprintf(stderr, format, ##arg)
# define message(format, ...) printf(format, ##__VA_ARGS__)
# define err(format, ...) fprintf(stderr, format, ##__VA_ARGS__)
# endif
#else
# ifdef CONFIG_DEBUG

8
apps/examples/nxflat/nxflat_main.c
View File

@ -102,11 +102,11 @@
#ifdef CONFIG_CPP_HAVE_VARARGS
# ifdef CONFIG_DEBUG
# define message(format, arg...) dbg(format, ##arg)
# define err(format, arg...) dbg(format, ##arg)
# define message(format, ...) dbg(format, ##__VA_ARGS__)
# define err(format, ...) dbg(format, ##__VA_ARGS__)
# else
# define message(format, arg...) printf(format, ##arg)
# define err(format, arg...) fprintf(stderr, format, ##arg)
# define message(format, ...) printf(format, ##__VA_ARGS__)
# define err(format, ...) fprintf(stderr, format, ##__VA_ARGS__)
# endif
#else
# ifdef CONFIG_DEBUG

8
apps/examples/posix_spawn/spawn_main.c
View File

@ -109,11 +109,11 @@
#ifdef CONFIG_CPP_HAVE_VARARGS
# ifdef CONFIG_DEBUG
# define message(format, arg...) dbg(format, ##arg)
# define err(format, arg...) dbg(format, ##arg)
# define message(format, ...) dbg(format, ##__VA_ARGS__)
# define err(format, ...) dbg(format, ##__VA_ARGS__)
# else
# define message(format, arg...) printf(format, ##arg)
# define err(format, arg...) fprintf(stderr, format, ##arg)
# define message(format, ...) printf(format, ##__VA_ARGS__)
# define err(format, ...) fprintf(stderr, format, ##__VA_ARGS__)
# endif
#else
# ifdef CONFIG_DEBUG

8
apps/netutils/thttpd/fdwatch.c
View File

@ -63,10 +63,10 @@
#ifdef CONFIG_THTTPD_FDWATCH_DEBUG
# ifdef CONFIG_CPP_HAVE_VARARGS
# define fwdbg(format, arg...) ndbg(format, ##arg)
# define fwlldbg(format, arg...) nlldbg(format, ##arg)
# define fwvdbg(format, arg...) nvdbg(format, ##arg)
# define fwllvdbg(format, arg...) nllvdbg(format, ##arg)
# define fwdbg(format, ...) ndbg(format, ##__VA_ARGS__)
# define fwlldbg(format, ...) nlldbg(format, ##__VA_ARGS__)
# define fwvdbg(format, ...) nvdbg(format, ##__VA_ARGS__)
# define fwllvdbg(format, ...) nllvdbg(format, ##__VA_ARGS__)
# else
# define fwdbg ndbg
# define fwlldbg nlldbg

2
apps/nshlib/nsh_console.h
View File

@ -63,7 +63,7 @@
#define nsh_exit(v,s) (v)->exit(v,s)
#ifdef CONFIG_CPP_HAVE_VARARGS
# define nsh_output(v, fmt...) (v)->output(v, ##fmt)
# define nsh_output(v, ...) (v)->output(v, ##__VA_ARGS__)
#else
# define nsh_output vtbl->output
#endif

8
apps/system/cle/cle.c
View File

@ -107,15 +107,15 @@
#ifdef CONFIG_CPP_HAVE_VARARGS
# if CONFIG_SYSTEM_CLE_DEBUGLEVEL > 0
# define cledbg(format, arg...) \
syslog(EXTRA_FMT format EXTRA_ARG, ##arg)
# define cledbg(format, ...) \
syslog(EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
# else
# define cledbg(x...)
# endif
# if CONFIG_SYSTEM_CLE_DEBUGLEVEL > 1
# define clevdbg(format, arg...) \
syslog(EXTRA_FMT format EXTRA_ARG, ##arg)
# define clevdbg(format, ...) \
syslog(EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
# else
# define clevdbg(x...)
# endif

4
apps/system/i2c/i2ctool.h
View File

@ -124,9 +124,9 @@
/* Output is via printf but can be changed using this macro */
#ifdef CONFIG_CPP_HAVE_VARARGS
# define i2c_output(v, fmt...) printf(v, ##fmt)
# define i2c_output(v, ...) printf(v, ##__VA_ARGS__)
#else
# define i2c_output printf
# define i2c_output printf
#endif
/****************************************************************************

8
apps/system/inifile/inifile.c
View File

@ -62,15 +62,15 @@
#ifdef CONFIG_CPP_HAVE_VARARGS
# if CONFIG_SYSTEM_INIFILE_DEBUGLEVEL > 0
# define inidbg(format, arg...) \
printf(EXTRA_FMT format EXTRA_ARG, ##arg)
# define inidbg(format, ...) \
printf(EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
# else
# define inidbg(x...)
# endif
# if CONFIG_SYSTEM_INIFILE_DEBUGLEVEL > 1
# define inivdbg(format, arg...) \
printf(EXTRA_FMT format EXTRA_ARG, ##arg)
# define inivdbg(format, ...) \
printf(EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
# else
# define inivdbg(x...)
# endif

8
apps/system/vi/vi.c
View File

@ -149,8 +149,8 @@
#ifdef CONFIG_CPP_HAVE_VARARGS
# if CONFIG_SYSTEM_VI_DEBUGLEVEL > 0
# define vidbg(format, arg...) \
syslog(EXTRA_FMT format EXTRA_ARG, ##arg)
# define vidbg(format, ...) \
syslog(EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
# define vvidbg(format, ap) \
vsyslog(format, ap)
# else
@ -159,8 +159,8 @@
# endif
# if CONFIG_SYSTEM_VI_DEBUGLEVEL > 1
# define vivdbg(format, arg...) \
syslog(EXTRA_FMT format EXTRA_ARG, ##arg)
# define vivdbg(format, ...) \
syslog(EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
# else
# define vivdbg(x...)
# endif

8
apps/system/zmodem/zm.h
View File

@ -229,16 +229,16 @@
*/
#ifdef CONFIG_DEBUG_ZMODEM
# define zmprintf(format, arg...) fprintf(stderr, format, ##arg)
# define zmdbg(format, arg...) fprintf(stderr, EXTRA_FMT format EXTRA_ARG, ##arg)
# define zmprintf(format, ...) fprintf(stderr, format, ##__VA_ARGS__)
# define zmdbg(format, ...) fprintf(stderr, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
#else
# undef CONFIG_SYSTEM_ZMODEM_DUMPBUFFER
# ifdef CONFIG_CPP_HAVE_VARARGS
# define zmprintf(x...)
# define zmdbg(x...)
# else
# define zmprintf (void)
# define zmdbg (void)
# define zmprintf (void)
# define zmdbg (void)
# endif
#endif

2
nuttx/arch/arm/include/calypso/debug.h
View File

@ -20,7 +20,7 @@
#define dputchar(x) putchar(x)
#define dputs(x) puts(x)
#define dphex(x,y) phex(x,y)
#define printd(x, args ...) printf(x, ## args)
#define printd(x, ...) printf(x, ##__VA_ARGS__)
#else
#define dputchar(x)
#define dputs(x)

2
nuttx/arch/arm/src/armv6-m/up_hardfault.c
View File

@ -56,7 +56,7 @@
****************************************************************************/
#ifdef CONFIG_DEBUG_HARDFAULT
# define hfdbg(format, arg...) lldbg(format, ##arg)
# define hfdbg(format, ...) lldbg(format, ##__VA_ARGS__)
#else
# define hfdbg(x...)
#endif

2
nuttx/arch/arm/src/armv6-m/up_svcall.c
View File

@ -70,7 +70,7 @@
*/
#if defined(CONFIG_DEBUG_SYSCALL) || defined(CONFIG_DEBUG_SVCALL)
# define svcdbg(format, arg...) lldbg(format, ##arg)
# define svcdbg(format, ...) lldbg(format, ##__VA_ARGS__)
#else
# define svcdbg(x...)
#endif

2
nuttx/arch/arm/src/armv7-m/up_hardfault.c
View File

@ -61,7 +61,7 @@
*/
#ifdef CONFIG_DEBUG_HARDFAULT
# define hfdbg(format, arg...) lldbg(format, ##arg)
# define hfdbg(format, ...) lldbg(format, ##__VA_ARGS__)
#else
# define hfdbg(x...)
#endif

2
nuttx/arch/arm/src/armv7-m/up_memfault.c
View File

@ -56,7 +56,7 @@
#undef DEBUG_MEMFAULTS /* Define to debug memory management faults */
#ifdef DEBUG_MEMFAULTS
# define mfdbg(format, arg...) lldbg(format, ##arg)
# define mfdbg(format, ...) lldbg(format, ##__VA_ARGS__)
#else
# define mfdbg(x...)
#endif

2
nuttx/arch/arm/src/armv7-m/up_svcall.c
View File

@ -70,7 +70,7 @@
*/
#if defined(CONFIG_DEBUG_SYSCALL) || defined(CONFIG_DEBUG_SVCALL)
# define svcdbg(format, arg...) lldbg(format, ##arg)
# define svcdbg(format, ...) lldbg(format, ##__VA_ARGS__)
#else
# define svcdbg(x...)
#endif

2
nuttx/arch/mips/src/mips32/up_swint0.c
View File

@ -65,7 +65,7 @@
*/
#ifdef CONFIG_DEBUG_SYSCALL
# define swidbg(format, arg...) lldbg(format, ##arg)
# define swidbg(format, ...) lldbg(format, ##__VA_ARGS__)
#else
# define swidbg(x...)
#endif

6
nuttx/arch/sim/src/up_deviceimage.c
View File

@ -58,9 +58,9 @@
****************************************************************************/
#ifdef VFAT_STANDALONE
# define sdbg(format, arg...) printf(format, ##arg)
# define kmalloc(size) malloc(size)
# define kfree(mem) free(mem)
# define sdbg(format, ...) printf(format, ##__VA_ARGS__)
# define kmalloc(size) malloc(size)
# define kfree(mem) free(mem)
#endif
/****************************************************************************

2
nuttx/arch/sim/src/up_lcd.c
View File

@ -115,7 +115,7 @@
#endif
#ifdef CONFIG_DEBUG_LCD
# define lcddbg(format, arg...) vdbg(format, ##arg)
# define lcddbg(format, ...) vdbg(format, ##__VA_ARGS__)
#else
# define lcddbg(x...)
#endif

2
nuttx/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch
View File

@ -130,7 +130,7 @@ index c78362f..207f9b9 100644
+#if 0
#ifdef CONFIG_CPP_HAVE_VARARGS
# define nsh_output(v, fmt...) (v)->output(v, ##fmt)
# define nsh_output(v, ...) (v)->output(v, ##__VA_ARGS__)
#else
# define nsh_output vtbl->output
#endif

3
nuttx/configs/compal_e99/src/ssd1783.c
View File

@ -65,8 +65,9 @@
# define LCD_YRES 67
/* Debug ******************************************************************************/
#ifdef CONFIG_DEBUG_LCD
# define lcddbg(format, arg...) vdbg(format, ##arg)
# define lcddbg(format, ...) vdbg(format, ##__VA_ARGS__)
#else
# define lcddbg(x...)
#endif

2
nuttx/configs/hymini-stm32v/src/up_r61505u.c
View File

@ -94,7 +94,7 @@
/* Debug ******************************************************************************/
#ifdef CONFIG_DEBUG_LCD
# define lcddbg(format, arg...) vdbg(format, ##arg)
# define lcddbg(format, ...) vdbg(format, ##__VA_ARGS__)
#else
# define lcddbg(x...)
#endif

2
nuttx/configs/kwikstik-k40/src/up_lcd.c
View File

@ -61,7 +61,7 @@
/* Debug ******************************************************************************/
#ifdef CONFIG_DEBUG_LCD
# define lcddbg(format, arg...) vdbg(format, ##arg)
# define lcddbg(format, ...) vdbg(format, ##__VA_ARGS__)
#else
# define lcddbg(x...)
#endif

6
nuttx/configs/lm3s6965-ek/src/up_oled.c
View File

@ -71,9 +71,9 @@
#endif
#ifdef CONFIG_LCD_RITDEBUG
# define ritdbg(format, arg...) vdbg(format, ##arg)
# define oleddc_dumpgpio(m) tiva_dumpgpio(OLEDDC_GPIO, m)
# define oledcs_dumpgpio(m) tiva_dumpgpio(OLEDCS_GPIO, m)
# define ritdbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define oleddc_dumpgpio(m) tiva_dumpgpio(OLEDDC_GPIO, m)
# define oledcs_dumpgpio(m) tiva_dumpgpio(OLEDCS_GPIO, m)
#else
# define ritdbg(x...)
# define oleddc_dumpgpio(m)

6
nuttx/configs/lm3s8962-ek/src/up_oled.c
View File

@ -71,9 +71,9 @@
#endif
#ifdef CONFIG_LCD_RITDEBUG
# define ritdbg(format, arg...) vdbg(format, ##arg)
# define oleddc_dumpgpio(m) tiva_dumpgpio(OLEDDC_GPIO, m)
# define oledcs_dumpgpio(m) tiva_dumpgpio(OLEDCS_GPIO, m)
# define ritdbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define oleddc_dumpgpio(m) tiva_dumpgpio(OLEDDC_GPIO, m)
# define oledcs_dumpgpio(m) tiva_dumpgpio(OLEDCS_GPIO, m)
#else
# define ritdbg(x...)
# define oleddc_dumpgpio(m)

6
nuttx/configs/lpcxpresso-lpc1768/src/up_oled.c
View File

@ -85,9 +85,9 @@
#endif
#ifdef CONFIG_DEBUG_LCD
# define ugdbg(format, arg...) vdbg(format, ##arg)
# define oleddc_dumpgpio(m) lpc17_dumpgpio(LPCXPRESSO_OLED_POWER, m)
# define oledcs_dumpgpio(m) lpc17_dumpgpio(LPCXPRESSO_OLED_CS, m)
# define ugdbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define oleddc_dumpgpio(m) lpc17_dumpgpio(LPCXPRESSO_OLED_POWER, m)
# define oledcs_dumpgpio(m) lpc17_dumpgpio(LPCXPRESSO_OLED_CS, m)
#else
# define ugdbg(x...)
# define oleddc_dumpgpio(m)

2
nuttx/configs/maple/src/up_lcd.c
View File

@ -83,7 +83,7 @@
#endif
#ifdef CONFIG_DEBUG_LCD
# define lcddbg(format, arg...) vdbg(format, ##arg)
# define lcddbg(format, ...) vdbg(format, ##__VA_ARGS__)
#else
# define lcddbg(x...)
#endif

4
nuttx/configs/olimex-lpc1766stk/src/lpc17_lcd.c
View File

@ -86,8 +86,8 @@
#endif
#ifdef CONFIG_LCD_NOKIADBG
# define lcddbg(format, arg...) vdbg(format, ##arg)
# define lcd_dumpgpio(m) lpc17_dumpgpio(LPC1766STK_LCD_RST, m)
# define lcddbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define lcd_dumpgpio(m) lpc17_dumpgpio(LPC1766STK_LCD_RST, m)
#else
# define lcddbg(x...)
# define lcd_dumpgpio(m)

6
nuttx/configs/sam3u-ek/src/up_lcd.c
View File

@ -159,14 +159,14 @@
/* Debug ******************************************************************************/
#ifdef CONFIG_LCD_REGDEBUG
# define regdbg(format, arg...) vdbg(format, ##arg)
# define regdbg(format, ...) vdbg(format, ##__VA_ARGS__)
#else
# define regdbg(x...)
#endif
#ifdef CONFIG_DEBUG_LCD
# define lcddbg(format, arg...) dbg(format, ##arg)
# define lcdvdbg(format, arg...) vdbg(format, ##arg)
# define lcddbg(format, ...) dbg(format, ##__VA_ARGS__)
# define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
#else
# define lcddbg(x...)
# define lcdvdbg(x...)

4
nuttx/configs/sam4l-xplained/src/sam_ug2832hsweg04.c
View File

@ -114,8 +114,8 @@
/* Debug ********************************************************************/
#ifdef CONFIG_DEBUG_LCD
# define lcddbg(format, arg...) dbg(format, ##arg)
# define lcdvdbg(format, arg...) vdbg(format, ##arg)
# define lcddbg(format, ...) dbg(format, ##__VA_ARGS__)
# define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
#else
# define lcddbg(x...)
# define lcdvdbg(x...)

4
nuttx/configs/samd20-xplained/src/sam_ug2832hsweg04.c
View File

@ -144,8 +144,8 @@
/* Debug ********************************************************************/
#ifdef CONFIG_DEBUG_LCD
# define lcddbg(format, arg...) dbg(format, ##arg)
# define lcdvdbg(format, arg...) vdbg(format, ##arg)
# define lcddbg(format, ...) dbg(format, ##__VA_ARGS__)
# define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
#else
# define lcddbg(x...)
# define lcdvdbg(x...)

2
nuttx/configs/stm3210e-eval/src/up_lcd.c
View File

@ -312,7 +312,7 @@
/* Debug ******************************************************************************/
#ifdef CONFIG_DEBUG_LCD
# define lcddbg(format, arg...) vdbg(format, ##arg)
# define lcddbg(format, ...) vdbg(format, ##__VA_ARGS__)
#else
# define lcddbg(x...)
#endif

4
nuttx/configs/stm32f4discovery/src/stm32_ug2864ambag01.c
View File

@ -93,8 +93,8 @@
/* Debug ********************************************************************/
#ifdef CONFIG_DEBUG_LCD
# define lcddbg(format, arg...) dbg(format, ##arg)
# define lcdvdbg(format, arg...) vdbg(format, ##arg)
# define lcddbg(format, ...) dbg(format, ##__VA_ARGS__)
# define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
#else
# define lcddbg(x...)
# define lcdvdbg(x...)

4
nuttx/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c
View File

@ -93,8 +93,8 @@
/* Debug ********************************************************************/
#ifdef CONFIG_DEBUG_LCD
# define lcddbg(format, arg...) dbg(format, ##arg)
# define lcdvdbg(format, arg...) vdbg(format, ##arg)
# define lcddbg(format, ...) dbg(format, ##__VA_ARGS__)
# define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
#else
# define lcddbg(x...)
# define lcdvdbg(x...)

4
nuttx/configs/us7032evb1/shterm/shterm.c
View File

@ -62,8 +62,8 @@
#define DEFAULT_BAUD 9600
#define dbg(format, arg...) if (debug > 0) printconsole(format, ##arg)
#define vdbg(format, arg...) if (debug > 1) printconsole(format, ##arg)
#define dbg(format, ...) if (debug > 0) printconsole(format, ##__VA_ARGS__)
#define vdbg(format, ...) if (debug > 1) printconsole(format, ##__VA_ARGS__)
/****************************************************************************
* Private Types

2
nuttx/configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch
View File

@ -130,7 +130,7 @@ index c78362f..207f9b9 100644
+#if 0
#ifdef CONFIG_CPP_HAVE_VARARGS
# define nsh_output(v, fmt...) (v)->output(v, ##fmt)
# define nsh_output(v, ...) (v)->output(v, ##__VA_ARGS__)
#else
# define nsh_output vtbl->output
#endif

4
nuttx/configs/zp214xpa/src/up_ug2864ambag01.c
View File

@ -99,8 +99,8 @@
/* Debug ********************************************************************/
#ifdef CONFIG_DEBUG_LCD
# define lcddbg(format, arg...) dbg(format, ##arg)
# define lcdvdbg(format, arg...) vdbg(format, ##arg)
# define lcddbg(format, ...) dbg(format, ##__VA_ARGS__)
# define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
#else
# define lcddbg(x...)
# define lcdvdbg(x...)

4
nuttx/drivers/lcd/memlcd.c
View File

@ -112,8 +112,8 @@
/* Debug */
#ifdef CONFIG_DEBUG_LCD
# define lcddbg(format, arg...) dbg(format, ##arg)
# define lcdvdbg(format, arg...) vdbg(format, ##arg)
# define lcddbg(format, ...) dbg(format, ##__VA_ARGS__)
# define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
#else
# define lcddbg(x...)
# define lcdvdbg(x...)

2
nuttx/drivers/lcd/nokia6100.c
View File

@ -308,7 +308,7 @@
/* Debug ******************************************************************************/
#ifdef CONFIG_LCD_REGDEBUG
# define lcddbg(format, arg...) llvdbg(format, ##arg)
# define lcddbg(format, ...) llvdbg(format, ##__VA_ARGS__)
#else
# define lcddbg(x...)
#endif

2
nuttx/drivers/lcd/p14201.c
View File

@ -180,7 +180,7 @@
/* Debug ******************************************************************************/
#ifdef CONFIG_LCD_RITDEBUG
# define ritdbg(format, arg...) vdbg(format, ##arg)
# define ritdbg(format, ...) vdbg(format, ##__VA_ARGS__)
#else
# define ritdbg(x...)
#endif

2
nuttx/drivers/lcd/skeleton.c
View File

@ -90,7 +90,7 @@
/* Debug ******************************************************************************/
#ifdef CONFIG_LCD_SKELDEBUG
# define skeldbg(format, arg...) vdbg(format, ##arg)
# define skeldbg(format, ...) vdbg(format, ##__VA_ARGS__)
#else
# define skeldbg(x...)
#endif

4
nuttx/drivers/lcd/ssd1306.c
View File

@ -301,8 +301,8 @@
/* Debug ******************************************************************************/
#ifdef CONFIG_DEBUG_LCD
# define lcddbg(format, arg...) dbg(format, ##arg)
# define lcdvdbg(format, arg...) vdbg(format, ##arg)
# define lcddbg(format, ...) dbg(format, ##__VA_ARGS__)
# define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
#else
# define lcddbg(x...)
# define lcdvdbg(x...)

2
nuttx/drivers/lcd/st7567.c
View File

@ -209,7 +209,7 @@
/* Debst7567 ******************************************************************************/
#ifdef CONFIG_LCD_ST7567DEBUG
# define st7567dbg(format, arg...) vdbg(format, ##arg)
# define st7567dbg(format, ...) vdbg(format, ##__VA_ARGS__)
#else
# define st7567dbg(x...)
#endif

4
nuttx/drivers/lcd/ug-2864ambag01.c
View File

@ -263,8 +263,8 @@
/* Debug ******************************************************************************/
#ifdef CONFIG_DEBUG_LCD
# define lcddbg(format, arg...) dbg(format, ##arg)
# define lcdvdbg(format, arg...) vdbg(format, ##arg)
# define lcddbg(format, ...) dbg(format, ##__VA_ARGS__)
# define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
#else
# define lcddbg(x...)
# define lcdvdbg(x...)

2
nuttx/drivers/lcd/ug-9664hswag01.c
View File

@ -224,7 +224,7 @@
/* Debug ******************************************************************************/
#ifdef CONFIG_DEBUG_LCD
# define lcddbg(format, arg...) vdbg(format, ##arg)
# define lcddbg(format, ...) vdbg(format, ##__VA_ARGS__)
#else
# define lcddbg(x...)
#endif

2
nuttx/drivers/mmcsd/mmcsd_debug.c
View File

@ -56,7 +56,7 @@
/* This needs to match the logic in include/debug.h */
#ifdef CONFIG_CPP_HAVE_VARARGS
# define message(format, arg...) syslog(format, ##arg)
# define message(format, ...) syslog(format, ##__VA_ARGS__)
#else
# define message syslog
#endif

4
nuttx/drivers/usbdev/usbmsc.h
View File

@ -209,9 +209,9 @@
#ifdef CONFIG_CPP_HAVE_VARARGS
# ifdef CONFIG_DEBUG
# ifdef CONFIG_ARCH_LOWPUTC
# define dbgprintf(format, arg...) lowsyslog(format, ##arg)
# define dbgprintf(format, ...) lowsyslog(format, ##__VA_ARGS__)
# else
# define dbgprintf(format, arg...) syslog(format, ##arg)
# define dbgprintf(format, ...) syslog(format, ##__VA_ARGS__)
# endif
# else
# define dbgprintf(x...)

124
nuttx/include/debug.h
View File

@ -100,26 +100,26 @@
#ifdef CONFIG_CPP_HAVE_VARARGS
/* Variable argument macros supported */
/* C-99 style variadic macros are supported */
#ifdef CONFIG_DEBUG
# define dbg(format, arg...) \
syslog(EXTRA_FMT format EXTRA_ARG, ##arg)
# define dbg(format, ...) \
syslog(EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
# ifdef CONFIG_ARCH_LOWPUTC
# define lldbg(format, arg...) \
lowsyslog(EXTRA_FMT format EXTRA_ARG, ##arg)
# define lldbg(format, ...) \
lowsyslog(EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
# else
# define lldbg(x...)
# endif
# ifdef CONFIG_DEBUG_VERBOSE
# define vdbg(format, arg...) \
syslog(EXTRA_FMT format EXTRA_ARG, ##arg)
# define vdbg(format, ...) \
syslog(EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
# ifdef CONFIG_ARCH_LOWPUTC
# define llvdbg(format, arg...) \
lowsyslog(EXTRA_FMT format EXTRA_ARG, ##arg)
# define llvdbg(format, ...) \
lowsyslog(EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
# else
# define llvdbg(x...)
# endif
@ -141,10 +141,10 @@
/* Subsystem specific debug */
#ifdef CONFIG_DEBUG_MM
# define mdbg(format, arg...) dbg(format, ##arg)
# define mlldbg(format, arg...) lldbg(format, ##arg)
# define mvdbg(format, arg...) vdbg(format, ##arg)
# define mllvdbg(format, arg...) llvdbg(format, ##arg)
# define mdbg(format, ...) dbg(format, ##__VA_ARGS__)
# define mlldbg(format, ...) lldbg(format, ##__VA_ARGS__)
# define mvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define mllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
#else
# define mdbg(x...)
# define mlldbg(x...)
@ -153,10 +153,10 @@
#endif
#ifdef CONFIG_DEBUG_SCHED
# define sdbg(format, arg...) dbg(format, ##arg)
# define slldbg(format, arg...) lldbg(format, ##arg)
# define svdbg(format, arg...) vdbg(format, ##arg)
# define sllvdbg(format, arg...) llvdbg(format, ##arg)
# define sdbg(format, ...) dbg(format, ##__VA_ARGS__)
# define slldbg(format, ...) lldbg(format, ##__VA_ARGS__)
# define svdbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define sllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
#else
# define sdbg(x...)
# define slldbg(x...)
@ -165,10 +165,10 @@
#endif
#ifdef CONFIG_DEBUG_PAGING
# define pgdbg(format, arg...) dbg(format, ##arg)
# define pglldbg(format, arg...) lldbg(format, ##arg)
# define pgvdbg(format, arg...) vdbg(format, ##arg)
# define pgllvdbg(format, arg...) llvdbg(format, ##arg)
# define pgdbg(format, ...) dbg(format, ##__VA_ARGS__)
# define pglldbg(format, ...) lldbg(format, ##__VA_ARGS__)
# define pgvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define pgllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
#else
# define pgdbg(x...)
# define pglldbg(x...)
@ -177,10 +177,10 @@
#endif
#ifdef CONFIG_DEBUG_DMA
# define dmadbg(format, arg...) dbg(format, ##arg)
# define dmalldbg(format, arg...) lldbg(format, ##arg)
# define dmavdbg(format, arg...) vdbg(format, ##arg)
# define dmallvdbg(format, arg...) llvdbg(format, ##arg)
# define dmadbg(format, ...) dbg(format, ##__VA_ARGS__)
# define dmalldbg(format, ...) lldbg(format, ##__VA_ARGS__)
# define dmavdbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define dmallvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
#else
# define dmadbg(x...)
# define dmalldbg(x...)
@ -189,10 +189,10 @@
#endif
#ifdef CONFIG_DEBUG_NET
# define ndbg(format, arg...) dbg(format, ##arg)
# define nlldbg(format, arg...) lldbg(format, ##arg)
# define nvdbg(format, arg...) vdbg(format, ##arg)
# define nllvdbg(format, arg...) llvdbg(format, ##arg)
# define ndbg(format, ...) dbg(format, ##__VA_ARGS__)
# define nlldbg(format, ...) lldbg(format, ##__VA_ARGS__)
# define nvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define nllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
#else
# define ndbg(x...)
# define nlldbg(x...)
@ -201,10 +201,10 @@
#endif
#ifdef CONFIG_DEBUG_USB
# define udbg(format, arg...) dbg(format, ##arg)
# define ulldbg(format, arg...) lldbg(format, ##arg)
# define uvdbg(format, arg...) vdbg(format, ##arg)
# define ullvdbg(format, arg...) llvdbg(format, ##arg)
# define udbg(format, ...) dbg(format, ##__VA_ARGS__)
# define ulldbg(format, ...) lldbg(format, ##__VA_ARGS__)
# define uvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define ullvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
#else
# define udbg(x...)
# define ulldbg(x...)
@ -213,10 +213,10 @@
#endif
#ifdef CONFIG_DEBUG_FS
# define fdbg(format, arg...) dbg(format, ##arg)
# define flldbg(format, arg...) lldbg(format, ##arg)
# define fvdbg(format, arg...) vdbg(format, ##arg)
# define fllvdbg(format, arg...) llvdbg(format, ##arg)
# define fdbg(format, ...) dbg(format, ##__VA_ARGS__)
# define flldbg(format, ...) lldbg(format, ##__VA_ARGS__)
# define fvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define fllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
#else
# define fdbg(x...)
# define flldbg(x...)
@ -225,10 +225,10 @@
#endif
#ifdef CONFIG_DEBUG_INPUT
# define idbg(format, arg...) dbg(format, ##arg)
# define illdbg(format, arg...) lldbg(format, ##arg)
# define ivdbg(format, arg...) vdbg(format, ##arg)
# define illvdbg(format, arg...) llvdbg(format, ##arg)
# define idbg(format, ...) dbg(format, ##__VA_ARGS__)
# define illdbg(format, ...) lldbg(format, ##__VA_ARGS__)
# define ivdbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define illvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
#else
# define idbg(x...)
# define illdbg(x...)
@ -237,10 +237,10 @@
#endif
#ifdef CONFIG_DEBUG_ANALOG
# define adbg(format, arg...) dbg(format, ##arg)
# define alldbg(format, arg...) lldbg(format, ##arg)
# define avdbg(format, arg...) vdbg(format, ##arg)
# define allvdbg(format, arg...) llvdbg(format, ##arg)
# define adbg(format, ...) dbg(format, ##__VA_ARGS__)
# define alldbg(format, ...) lldbg(format, ##__VA_ARGS__)
# define avdbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define allvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
#else
# define adbg(x...)
# define alldbg(x...)
@ -249,10 +249,10 @@
#endif
#ifdef CONFIG_DEBUG_GRAPHICS
# define gdbg(format, arg...) dbg(format, ##arg)
# define glldbg(format, arg...) lldbg(format, ##arg)
# define gvdbg(format, arg...) vdbg(format, ##arg)
# define gllvdbg(format, arg...) llvdbg(format, ##arg)
# define gdbg(format, ...) dbg(format, ##__VA_ARGS__)
# define glldbg(format, ...) lldbg(format, ##__VA_ARGS__)
# define gvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define gllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
#else
# define gdbg(x...)
# define glldbg(x...)
@ -261,10 +261,10 @@
#endif
#ifdef CONFIG_DEBUG_BINFMT
# define bdbg(format, arg...) dbg(format, ##arg)
# define blldbg(format, arg...) lldbg(format, ##arg)
# define bvdbg(format, arg...) vdbg(format, ##arg)
# define bllvdbg(format, arg...) llvdbg(format, ##arg)
# define bdbg(format, ...) dbg(format, ##__VA_ARGS__)
# define blldbg(format, ...) lldbg(format, ##__VA_ARGS__)
# define bvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define bllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
#else
# define bdbg(x...)
# define blldbg(x...)
@ -273,10 +273,10 @@
#endif
#ifdef CONFIG_DEBUG_LIB
# define ldbg(format, arg...) dbg(format, ##arg)
# define llldbg(format, arg...) lldbg(format, ##arg)
# define lvdbg(format, arg...) vdbg(format, ##arg)
# define lllvdbg(format, arg...) llvdbg(format, ##arg)
# define ldbg(format, ...) dbg(format, ##__VA_ARGS__)
# define llldbg(format, ...) lldbg(format, ##__VA_ARGS__)
# define lvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define lllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
#else
# define ldbg(x...)
# define llldbg(x...)
@ -285,10 +285,10 @@
#endif
#ifdef CONFIG_DEBUG_AUDIO
# define auddbg(format, arg...) dbg(format, ##arg)
# define audlldbg(format, arg...) lldbg(format, ##arg)
# define audvdbg(format, arg...) vdbg(format, ##arg)
# define audllvdbg(format, arg...) llvdbg(format, ##arg)
# define auddbg(format, ...) dbg(format, ##__VA_ARGS__)
# define audlldbg(format, ...) lldbg(format, ##__VA_ARGS__)
# define audvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define audllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
#else
# define auddbg(x...)
# define audlldbg(x...)
@ -298,7 +298,7 @@
#else /* CONFIG_CPP_HAVE_VARARGS */
/* Variable argument macros NOT supported */
/* Variadic macros NOT supported */
#ifdef CONFIG_DEBUG
# ifndef CONFIG_ARCH_LOWPUTC

8
nuttx/include/nuttx/wireless/nrf24l01.h
View File

@ -91,10 +91,10 @@
/* NRF24L01 debug */
#ifdef NRF24L01_DEBUG
# define wdbg(format, arg...) dbg(format, ##arg)
# define wlldbg(format, arg...) lldbg(format, ##arg)
# define wvdbg(format, arg...) vdbg(format, ##arg)
# define wllvdbg(format, arg...) llvdbg(format, ##arg)
# define wdbg(format, ...) dbg(format, ##__VA_ARGS__)
# define wlldbg(format, ...) lldbg(format, ##__VA_ARGS__)
# define wvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define wllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
#else
# define wdbg(x...)
# define wlldbg(x...)

4
nuttx/libc/misc/lib_dumpbuffer.c
View File

@ -51,9 +51,9 @@
#ifdef CONFIG_CPP_HAVE_VARARGS
# ifdef CONFIG_ARCH_LOWPUTC
# define message(format, arg...) lowsyslog(format, ##arg)
# define message(format, ...) lowsyslog(format, ##__VA_ARGS__)
# else
# define message(format, arg...) syslog(format, ##arg)
# define message(format, ...) syslog(format, ##__VA_ARGS__)
# endif
#else
# ifdef CONFIG_ARCH_LOWPUTC

8
nuttx/mm/mm_gran.h
View File

@ -63,11 +63,11 @@
#ifdef CONFIG_CPP_HAVE_VARARGS
# ifdef CONFIG_DEBUG_GRAM
# define gramdbg(format, arg...) dbg(format, ##arg)
# define gramvdbg(format, arg...) vdbg(format, ##arg)
# define gramdbg(format, ...) dbg(format, ##__VA_ARGS__)
# define gramvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
# else
# define gramdbg(format, arg...) mdbg(format, ##arg)
# define gramvdbg(format, arg...) mvdbg(format, ##arg)
# define gramdbg(format, ...) mdbg(format, ##__VA_ARGS__)
# define gramvdbg(format, ...) mvdbg(format, ##__VA_ARGS__)
# endif
#else
# ifdef CONFIG_DEBUG_GRAM

8
nuttx/net/uip/uip_igmpgroup.c
View File

@ -86,10 +86,10 @@
#ifdef CONFIG_CPP_HAVE_VARARGS
# ifdef IGMP_GRPDEBUG
# define grpdbg(format, arg...) ndbg(format, ##arg)
# define grplldbg(format, arg...) nlldbg(format, ##arg)
# define grpvdbg(format, arg...) nvdbg(format, ##arg)
# define grpllvdbg(format, arg...) nllvdbg(format, ##arg)
# define grpdbg(format, ...) ndbg(format, ##__VA_ARGS__)
# define grplldbg(format, ...) nlldbg(format, ##__VA_ARGS__)
# define grpvdbg(format, ...) nvdbg(format, ##__VA_ARGS__)
# define grpllvdbg(format, ...) nllvdbg(format, ##__VA_ARGS__)
# else
# define grpdbg(x...)
# define grplldbg(x...)

8
nuttx/net/uip/uip_igmptimer.c
View File

@ -70,10 +70,10 @@
#ifdef CONFIG_CPP_HAVE_VARARGS
# ifdef IGMP_GTMRDEBUG
# define gtmrdbg(format, arg...) ndbg(format, ##arg)
# define gtmrlldbg(format, arg...) nlldbg(format, ##arg)
# define gtmrvdbg(format, arg...) nvdbg(format, ##arg)
# define gtmrllvdbg(format, arg...) nllvdbg(format, ##arg)
# define gtmrdbg(format, ...) ndbg(format, ##__VA_ARGS__)
# define gtmrlldbg(format, ...) nlldbg(format, ##__VA_ARGS__)
# define gtmrvdbg(format, ...) nvdbg(format, ##__VA_ARGS__)
# define gtmrllvdbg(format, ...) nllvdbg(format, ##__VA_ARGS__)
# else
# define gtmrdbg(x...)
# define gtmrlldbg(x...)