diff --git a/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch b/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch index 895cb47edb0..d1eb29ba6f0 100644 --- a/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch +++ b/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch @@ -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 diff --git a/configs/compal_e99/src/ssd1783.c b/configs/compal_e99/src/ssd1783.c index ac7f8b13cb5..64ed6a2e7ad 100644 --- a/configs/compal_e99/src/ssd1783.c +++ b/configs/compal_e99/src/ssd1783.c @@ -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 diff --git a/configs/hymini-stm32v/src/up_r61505u.c b/configs/hymini-stm32v/src/up_r61505u.c index f894a3de043..af05382a520 100755 --- a/configs/hymini-stm32v/src/up_r61505u.c +++ b/configs/hymini-stm32v/src/up_r61505u.c @@ -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 diff --git a/configs/kwikstik-k40/src/up_lcd.c b/configs/kwikstik-k40/src/up_lcd.c index ff2343c4530..2e28701af5d 100644 --- a/configs/kwikstik-k40/src/up_lcd.c +++ b/configs/kwikstik-k40/src/up_lcd.c @@ -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 diff --git a/configs/lm3s6965-ek/src/up_oled.c b/configs/lm3s6965-ek/src/up_oled.c index 6f95c599a6f..2f10891f4f8 100644 --- a/configs/lm3s6965-ek/src/up_oled.c +++ b/configs/lm3s6965-ek/src/up_oled.c @@ -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) diff --git a/configs/lm3s8962-ek/src/up_oled.c b/configs/lm3s8962-ek/src/up_oled.c index f331a2f0e08..baf258d2a7c 100644 --- a/configs/lm3s8962-ek/src/up_oled.c +++ b/configs/lm3s8962-ek/src/up_oled.c @@ -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) diff --git a/configs/lpcxpresso-lpc1768/src/up_oled.c b/configs/lpcxpresso-lpc1768/src/up_oled.c index 00c5b37a83d..a91473983c1 100644 --- a/configs/lpcxpresso-lpc1768/src/up_oled.c +++ b/configs/lpcxpresso-lpc1768/src/up_oled.c @@ -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) diff --git a/configs/maple/src/up_lcd.c b/configs/maple/src/up_lcd.c index 832272374b5..feb2845613d 100644 --- a/configs/maple/src/up_lcd.c +++ b/configs/maple/src/up_lcd.c @@ -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 diff --git a/configs/olimex-lpc1766stk/src/lpc17_lcd.c b/configs/olimex-lpc1766stk/src/lpc17_lcd.c index e44d9972bd7..4fa4d400d3e 100644 --- a/configs/olimex-lpc1766stk/src/lpc17_lcd.c +++ b/configs/olimex-lpc1766stk/src/lpc17_lcd.c @@ -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) diff --git a/configs/sam3u-ek/src/up_lcd.c b/configs/sam3u-ek/src/up_lcd.c index 393e41f5284..23a0e873e0e 100644 --- a/configs/sam3u-ek/src/up_lcd.c +++ b/configs/sam3u-ek/src/up_lcd.c @@ -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...) diff --git a/configs/sam4l-xplained/src/sam_ug2832hsweg04.c b/configs/sam4l-xplained/src/sam_ug2832hsweg04.c index c4a40b9c02d..10000eb5efb 100644 --- a/configs/sam4l-xplained/src/sam_ug2832hsweg04.c +++ b/configs/sam4l-xplained/src/sam_ug2832hsweg04.c @@ -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...) diff --git a/configs/samd20-xplained/src/sam_ug2832hsweg04.c b/configs/samd20-xplained/src/sam_ug2832hsweg04.c index 8b4754ab960..bc6fde097ff 100644 --- a/configs/samd20-xplained/src/sam_ug2832hsweg04.c +++ b/configs/samd20-xplained/src/sam_ug2832hsweg04.c @@ -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...) diff --git a/configs/stm3210e-eval/src/up_lcd.c b/configs/stm3210e-eval/src/up_lcd.c index 4a65ee4cbaa..cf446a11fa0 100644 --- a/configs/stm3210e-eval/src/up_lcd.c +++ b/configs/stm3210e-eval/src/up_lcd.c @@ -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 diff --git a/configs/stm32f4discovery/src/stm32_ug2864ambag01.c b/configs/stm32f4discovery/src/stm32_ug2864ambag01.c index 4aa01e40b6e..fdc6b88f38b 100644 --- a/configs/stm32f4discovery/src/stm32_ug2864ambag01.c +++ b/configs/stm32f4discovery/src/stm32_ug2864ambag01.c @@ -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...) diff --git a/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c b/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c index 5a32a0e427f..3366b093d79 100644 --- a/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c +++ b/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c @@ -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...) diff --git a/configs/us7032evb1/shterm/shterm.c b/configs/us7032evb1/shterm/shterm.c index c08b5e17e76..455e72f7e30 100644 --- a/configs/us7032evb1/shterm/shterm.c +++ b/configs/us7032evb1/shterm/shterm.c @@ -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 diff --git a/configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch b/configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch index 895cb47edb0..d1eb29ba6f0 100644 --- a/configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch +++ b/configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch @@ -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 diff --git a/configs/zp214xpa/src/up_ug2864ambag01.c b/configs/zp214xpa/src/up_ug2864ambag01.c index 2c2ae847ad5..b58877ca283 100644 --- a/configs/zp214xpa/src/up_ug2864ambag01.c +++ b/configs/zp214xpa/src/up_ug2864ambag01.c @@ -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...)