From 509853906338b4e2e1d9038b7959a3f17314f59b Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 16 Jun 2016 12:12:34 -0600 Subject: [PATCH] Add _ to front of remaining debug macros --- examples/chat/chat_main.c | 16 +- examples/elf/elf_main.c | 8 +- examples/fstest/Makefile | 2 +- examples/helloxx/helloxx_main.cxx | 4 +- examples/ltdc/dma2d.c | 340 +++++++++--------- examples/ltdc/ltdc_main.c | 248 ++++++------- examples/nxflat/nxflat_main.c | 8 +- examples/nxflat/tests/pthread/Makefile | 2 +- examples/pca9635/pca9635_main.c | 2 +- examples/posix_spawn/spawn_main.c | 8 +- netutils/chat/chat.c | 34 +- nshlib/nsh_console.c | 2 +- nshlib/nsh_fscmds.c | 2 +- nshlib/nsh_parse.c | 4 +- nshlib/nsh_telnetd.c | 6 +- platform/arduino-due/sam_cxxinitialize.c | 2 +- platform/cloudctrl/stm32_cxxinitialize.c | 2 +- platform/fire-stm32v2/stm32_cxxinitialize.c | 2 +- platform/mikroe-stm32f4/stm32_cxxinitialize.c | 2 +- platform/nucleo-144/stm32_cxxinitialize.c | 2 +- platform/nucleo-f303re/stm32_cxxinitialize.c | 2 +- platform/nucleo-f4x1re/stm32_cxxinitialize.c | 2 +- platform/nucleo-l476rg/stm32_cxxinitialize.c | 2 +- .../olimex-stm32-h405/stm32_cxxinitialize.c | 2 +- .../olimex-stm32-h407/stm32_cxxinitialize.c | 2 +- .../olimex-stm32-p207/stm32_cxxinitialize.c | 2 +- .../olimexino-stm32/stm32_cxxinitialize.c | 2 +- platform/pcduino-a10/a1x_cxxinitialize.c | 2 +- platform/sabre-6quad/imx_cxxinitialize.c | 2 +- platform/sam3u-ek/sam_cxxinitialized.c | 2 +- platform/sam4e-ek/sam_cxxinitialize.c | 2 +- platform/sam4l-xplained/sam_cxxinitialize.c | 2 +- .../sam4s-xplained-pro/sam_cxxinitialize.c | 2 +- platform/sam4s-xplained/sam_cxxinitialize.c | 2 +- platform/sama5d2-xult/sam_cxxinitialize.c | 2 +- platform/sama5d3-xplained/sam_cxxinitialize.c | 2 +- platform/sama5d3x-ek/sam_cxxinitialize.c | 2 +- platform/sama5d4-ek/sam_cxxinitialize.c | 2 +- platform/samd20-xplained/sam_cxxinitialize.c | 2 +- platform/samd21-xplained/sam_cxxinitialize.c | 2 +- platform/same70-xplained/sam_cxxinitialize.c | 2 +- platform/saml21-xplained/sam_cxxinitialize.c | 2 +- platform/samv71-xult/sam_cxxinitialize.c | 2 +- platform/shenzhou/stm32_cxxinitialize.c | 2 +- platform/spark/stm32_cxxinitialize.c | 2 +- platform/stm3220g-eval/stm32_cxxinitialize.c | 2 +- platform/stm3240g-eval/stm32_cxxinitialize.c | 2 +- .../stm32f3discovery/stm32_cxxinitialize.c | 2 +- .../stm32f429i-disco/stm32_cxxinitialize.c | 2 +- .../stm32f4discovery/stm32_cxxinitialize.c | 2 +- .../stm32f746g-disco/stm32_cxxinitialize.c | 2 +- .../stm32l476vg-disco/stm32_cxxinitialize.c | 2 +- .../stm32ldiscovery/stm32_cxxinitialize.c | 2 +- platform/teensy-lc/kl_cxxinitialize.c | 2 +- .../viewtool-stm32f107/stm32_cxxinitialize.c | 2 +- system/i2c/i2c_main.c | 2 +- system/ubloxmodem/ubloxmodem_main.c | 12 +- system/zmodem/zm_receive.c | 2 +- 58 files changed, 391 insertions(+), 391 deletions(-) diff --git a/examples/chat/chat_main.c b/examples/chat/chat_main.c index a6799db73..b094abafa 100644 --- a/examples/chat/chat_main.c +++ b/examples/chat/chat_main.c @@ -128,7 +128,7 @@ static int chat_script_preset(FAR struct chat_app* priv, int script_number) { int ret = 0; - info("preset script %d\n", script_number); + _info("preset script %d\n", script_number); switch (script_number) { @@ -340,11 +340,11 @@ int chat_main(int argc, FAR char** argv) priv.script_dynalloc = false; strncpy(priv.tty, CONFIG_EXAMPLES_CHAT_TTY_DEVNODE, CHAT_TTYNAME_SIZE-1); - info("parsing the arguments\n"); + _info("parsing the arguments\n"); ret = chat_parse_args((FAR struct chat_app*) &priv); if (ret < 0) { - info("Command line parsing failed: code %d, errno %d\n", ret, errno); + _info("Command line parsing failed: code %d, errno %d\n", ret, errno); chat_show_usage(); exit_code = EXIT_FAILURE; goto with_script; @@ -357,20 +357,20 @@ int chat_main(int argc, FAR char** argv) goto no_script; } - info("opening %s\n", priv.tty); + _info("opening %s\n", priv.tty); priv.ctl.fd = open(priv.tty, O_RDWR); if (priv.ctl.fd < 0) { - info("Failed to open %s: %d\n", priv.tty, errno); + _info("Failed to open %s: %d\n", priv.tty, errno); exit_code = EXIT_FAILURE; goto with_script; } - info("setting up character device\n"); + _info("setting up character device\n"); ret = chat_chardev(&priv); if (ret < 0) { - info("Failed to open %s: %d\n", priv.tty, errno); + _info("Failed to open %s: %d\n", priv.tty, errno); exit_code = EXIT_FAILURE; goto with_tty_dev; } @@ -390,6 +390,6 @@ no_script: fflush(stderr); fflush(stdout); - info("Exit code %d\n", exit_code); + _info("Exit code %d\n", exit_code); return exit_code; } diff --git a/examples/elf/elf_main.c b/examples/elf/elf_main.c index 0b72f61ca..247620dd2 100644 --- a/examples/elf/elf_main.c +++ b/examples/elf/elf_main.c @@ -106,16 +106,16 @@ #ifdef CONFIG_CPP_HAVE_VARARGS # ifdef CONFIG_DEBUG_FEATURES -# define message(format, ...) info(format, ##__VA_ARGS__) -# define errmsg(format, ...) _err(format, ##__VA_ARGS__) +# define message(format, ...) _info(format, ##__VA_ARGS__) +# define errmsg(format, ...) _err(format, ##__VA_ARGS__) # else # define message(format, ...) printf(format, ##__VA_ARGS__) # define errmsg(format, ...) fprintf(stderr, format, ##__VA_ARGS__) # endif #else # ifdef CONFIG_DEBUG_FEATURES -# define message info -# define errmsg _err +# define message _info +# define errmsg _err # else # define message printf # define errmsg printf diff --git a/examples/fstest/Makefile b/examples/fstest/Makefile index 9fb9c9434..b95ec2e03 100644 --- a/examples/fstest/Makefile +++ b/examples/fstest/Makefile @@ -35,7 +35,7 @@ -include $(TOPDIR)/Make.defs -# Generic file system stress test appliation info +# Generic file system stress test application info APPNAME = fstest PRIORITY = SCHED_PRIORITY_DEFAULT diff --git a/examples/helloxx/helloxx_main.cxx b/examples/helloxx/helloxx_main.cxx index 1e6a5dbb7..f91e9a9a5 100644 --- a/examples/helloxx/helloxx_main.cxx +++ b/examples/helloxx/helloxx_main.cxx @@ -63,10 +63,10 @@ #endif #ifdef CONFIG_DEBUG_CXX -# define cxxdbg _err +# define cxxdbg _err # define cxxllerr llerr # ifdef CONFIG_DEBUG_INFO -# define cxxinfo info +# define cxxinfo _info # define cxxllinfo llinfo # else # define cxxinfo(x...) diff --git a/examples/ltdc/dma2d.c b/examples/ltdc/dma2d.c index ee17a7442..ea3cc0be4 100644 --- a/examples/ltdc/dma2d.c +++ b/examples/ltdc/dma2d.c @@ -92,7 +92,7 @@ static FAR struct dma2d_surface *ltdc_create_dma2d_surface(uint16_t xres, if (!sur->dma2d) { - _err("ERROR: up_dma2dcreatelayer failed\n"); + _err("ERROR: up_dma2dcreatelayer failed\n"); free(sur); sur = NULL; } @@ -102,7 +102,7 @@ static FAR struct dma2d_surface *ltdc_create_dma2d_surface(uint16_t xres, if (ret != OK) { - _err("ERROR: getvideoinfo() failed\n"); + _err("ERROR: getvideoinfo() failed\n"); } else { @@ -110,7 +110,7 @@ static FAR struct dma2d_surface *ltdc_create_dma2d_surface(uint16_t xres, if (ret != OK) { - _err("ERROR: getplaneinfo() failed\n"); + _err("ERROR: getplaneinfo() failed\n"); } } @@ -123,7 +123,7 @@ static FAR struct dma2d_surface *ltdc_create_dma2d_surface(uint16_t xres, { int lid; sur->dma2d->getlid(sur->dma2d, &lid); - info("dma2d layer %d is created with: " + _info("dma2d layer %d is created with: " "layer = %p, xres = %d, yres = %d, fb start address = %p, " "fb size = %d, fmt = %d, bpp = %d\n", lid, sur->dma2d, sur->vinfo.xres, sur->vinfo.yres, @@ -411,7 +411,7 @@ static void ltdc_dma2d_interface(void) #endif FAR struct dma2d_layer_s *dma2d = active->dma2d; - info("Perform simple dma2d interface test\n"); + _info("Perform simple dma2d interface test\n"); /* test setalpha */ @@ -419,7 +419,7 @@ static void ltdc_dma2d_interface(void) if (ret != OK) { - _err("ERROR: setalpha() failed\n"); + _err("ERROR: setalpha() failed\n"); _exit(1); } @@ -429,7 +429,7 @@ static void ltdc_dma2d_interface(void) if (ret != OK || alpha != 127) { - _err("ERROR: getalpha() failed\n"); + _err("ERROR: getalpha() failed\n"); _exit(1); } @@ -439,7 +439,7 @@ static void ltdc_dma2d_interface(void) if (ret != OK) { - _err("ERROR: setblendmode() failed\n"); + _err("ERROR: setblendmode() failed\n"); _exit(1); } @@ -449,7 +449,7 @@ static void ltdc_dma2d_interface(void) if (ret != OK || blendmode != DMA2D_BLEND_ALPHA) { - _err("ERROR: getblendmode() failed\n"); + _err("ERROR: getblendmode() failed\n"); _exit(1); } @@ -475,20 +475,20 @@ static void ltdc_dma2d_interface(void) if (ret != OK) { - _err("ERROR: ltdc getclut() failed\n"); + _err("ERROR: ltdc getclut() failed\n"); _exit(1); } for (i = 0; i < LTDC_EXAMPLE_NCOLORS; i++) { #ifdef CONFIG_FB_TRANSPARENCY - info("ltdc color %d, %02x:%02x:%02x:%02x\n", i, + _info("ltdc color %d, %02x:%02x:%02x:%02x\n", i, cmapltdc->transp[i], cmapltdc->red[i], cmapltdc->green[i], cmapltdc->blue[i]); #else - info("ltdc color %d, %02x:%02x:%02x\n", i, + _info("ltdc color %d, %02x:%02x:%02x\n", i, cmapltdc->red[i], cmapltdc->green[i], cmapltdc->blue[i]); @@ -499,7 +499,7 @@ static void ltdc_dma2d_interface(void) if (ret != OK) { - _err("ERROR: getclut() failed\n"); + _err("ERROR: getclut() failed\n"); _exit(1); } @@ -509,13 +509,13 @@ static void ltdc_dma2d_interface(void) #ifdef CONFIG_FB_TRANSPARENCY memset(cmap->transp, 0, 256); #endif - info("set color lookup table to black\n"); + _info("set color lookup table to black\n"); ret = dma2d->setclut(dma2d, cmap); if (ret != OK) { - _err("ERROR: setclut() failed\n"); + _err("ERROR: setclut() failed\n"); _exit(1); } @@ -523,7 +523,7 @@ static void ltdc_dma2d_interface(void) if (ret != OK) { - _err("ERROR: getclut() failed\n"); + _err("ERROR: getclut() failed\n"); _exit(1); } @@ -538,7 +538,7 @@ static void ltdc_dma2d_interface(void) memcmp(cmap->red, cmap->green, 256)) #endif { - _err("ERROR: unexpected clut content\n"); + _err("ERROR: unexpected clut content\n"); _exit(1); } @@ -548,7 +548,7 @@ static void ltdc_dma2d_interface(void) if (ret != OK) { - _err("ERROR: ltdc getclut() failed\n"); + _err("ERROR: ltdc getclut() failed\n"); _exit(1); } @@ -563,7 +563,7 @@ static void ltdc_dma2d_interface(void) memcmp(cmap->red, cmap->green, 256)) #endif { - _err("ERROR: unexpected clut content\n"); + _err("ERROR: unexpected clut content\n"); _exit(1); } @@ -575,7 +575,7 @@ static void ltdc_dma2d_interface(void) if (ret != OK) { - _err("ERROR: ltdc setclut() failed\n"); + _err("ERROR: ltdc setclut() failed\n"); _exit(1); } @@ -585,7 +585,7 @@ static void ltdc_dma2d_interface(void) if (ret != OK) { - _err("ERROR: getclut() failed\n"); + _err("ERROR: getclut() failed\n"); _exit(1); } @@ -600,12 +600,12 @@ static void ltdc_dma2d_interface(void) memcmp(cmap->blue, cmapltdc->blue, LTDC_EXAMPLE_NCOLORS)) #endif { - _err("ERROR: clut of ltdc layer and related dma2d layer are different\n"); + _err("ERROR: clut of ltdc layer and related dma2d layer are different\n"); _exit(1); } else { - info("ok, changing the clut by the ltdc layer also changed the clut of " + _info("ok, changing the clut by the ltdc layer also changed the clut of " "the dma2d layer as expected.\n"); } @@ -617,11 +617,11 @@ static void ltdc_dma2d_interface(void) if (ret == OK) { - _err("ERROR: setclut() failed, expected error if first color exceeds 256\n"); + _err("ERROR: setclut() failed, expected error if first color exceeds 256\n"); } else { - info("setclut() Ok, unsupported cmap detected\n"); + _info("setclut() Ok, unsupported cmap detected\n"); } /* Check expected getclut error */ @@ -630,11 +630,11 @@ static void ltdc_dma2d_interface(void) if (ret == OK) { - _err("ERROR: getclut() failed, expected error if first color exceeds 256\n"); + _err("ERROR: getclut() failed, expected error if first color exceeds 256\n"); } else { - info("getclut() Ok, unsupported cmap detected\n"); + _info("getclut() Ok, unsupported cmap detected\n"); } cmap->first = 0; @@ -645,7 +645,7 @@ static void ltdc_dma2d_interface(void) if (ret != OK) { - _err("ERROR: ltdc setclut() failed\n"); + _err("ERROR: ltdc setclut() failed\n"); _exit(1); } @@ -672,7 +672,7 @@ static void ltdc_dma2d_fillarea(void) #ifdef CONFIG_STM32_DMA2D_L8 if (active->vinfo.fmt == FB_FMT_RGB8) { - warn("WARNING: skipped, output to layer with CLUT pixel format not supported\n"); + _warn("WARNING: skipped, output to layer with CLUT pixel format not supported\n"); return; } #endif @@ -684,7 +684,7 @@ static void ltdc_dma2d_fillarea(void) area.xres = active->vinfo.xres; area.yres = active->vinfo.yres; - info("check if the ltdc driver recognized when positioning overflows the whole" + _info("check if the ltdc driver recognized when positioning overflows the whole" " layer buffer\n"); if (active->layer->fillarea(active->layer, &area, 0) != OK) @@ -702,14 +702,14 @@ static void ltdc_dma2d_fillarea(void) if (ret == OK) { - info("ok, driver detects wrong positioning\n"); + _info("ok, driver detects wrong positioning\n"); } else { - _err("ERROR: fail, wrong positioning can overflow layer buffer\n"); + _err("ERROR: fail, wrong positioning can overflow layer buffer\n"); } - info("check if the dma2d driver recognized when positioning overflows the" + _info("check if the dma2d driver recognized when positioning overflows the" " whole layer buffer\n"); if (active->dma2d->fillarea(active->dma2d, &area, 0) != OK) @@ -727,31 +727,31 @@ static void ltdc_dma2d_fillarea(void) if (ret == OK) { - info("ok, driver detects wrong positioning\n"); + _info("ok, driver detects wrong positioning\n"); } else { - _err("ERROR: fail, wrong positioning can overflow layer buffer\n"); + _err("ERROR: fail, wrong positioning can overflow layer buffer\n"); } /* Flip with non blend */ - info("Perform fillarea test\n"); + _info("Perform fillarea test\n"); - info("Ensure that the active layer is opaque\n"); + _info("Ensure that the active layer is opaque\n"); active->layer->setalpha(active->layer, 0xff); - info("Disable blend mode for the active layer\n"); + _info("Disable blend mode for the active layer\n"); active->layer->setblendmode(active->layer, LTDC_BLEND_NONE); - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_drawcolor(&active->vinfo, active->pinfo.fbmem, active->vinfo.xres, active->vinfo.yres, ltdc_color(&active->vinfo, LTDC_BLACK)); - info("Flip the top layer to the active visible layer\n"); + _info("Flip the top layer to the active visible layer\n"); active->layer->update(active->layer, LTDC_UPDATE_ACTIVATE|LTDC_SYNC_VBLANK); - info("Draw a red rectangle in top left quarter of the screen\n"); + _info("Draw a red rectangle in top left quarter of the screen\n"); area.xpos = 0; area.ypos = 0; @@ -763,12 +763,12 @@ static void ltdc_dma2d_fillarea(void) usleep(1000000); - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_drawcolor(&active->vinfo, active->pinfo.fbmem, active->vinfo.xres, active->vinfo.yres, ltdc_color(&active->vinfo, LTDC_BLACK)); - info("Draw a green rectangle in top right quarter of the screen\n"); + _info("Draw a green rectangle in top right quarter of the screen\n"); area.xpos = active->vinfo.xres/2; area.ypos = 0; @@ -778,12 +778,12 @@ static void ltdc_dma2d_fillarea(void) usleep(1000000); - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_drawcolor(&active->vinfo, active->pinfo.fbmem, active->vinfo.xres, active->vinfo.yres, ltdc_color(&active->vinfo, LTDC_BLACK)); - info("Draw a white rectangle in bottom left quarter of the screen\n"); + _info("Draw a white rectangle in bottom left quarter of the screen\n"); area.xpos = 0; area.ypos = active->vinfo.yres/2; @@ -791,11 +791,11 @@ static void ltdc_dma2d_fillarea(void) active->layer->fillarea(active->layer, &area, ltdc_color(&active->vinfo, LTDC_WHITE)); - info("Draw a blue rectangle in bottom right quarter of the screen\n"); + _info("Draw a blue rectangle in bottom right quarter of the screen\n"); usleep(1000000); - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_drawcolor(&active->vinfo, active->pinfo.fbmem, active->vinfo.xres, active->vinfo.yres, ltdc_color(&active->vinfo, LTDC_BLACK)); @@ -808,7 +808,7 @@ static void ltdc_dma2d_fillarea(void) usleep(1000000); - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_drawcolor(&active->vinfo, active->pinfo.fbmem, active->vinfo.xres, active->vinfo.yres, ltdc_color(&active->vinfo, LTDC_BLACK)); @@ -832,37 +832,37 @@ static void ltdc_dma2d_blitsimple(void) #ifdef CONFIG_STM32_DMA2D_L8 if (active->vinfo.fmt == FB_FMT_RGB8) { - warn("WARNING: skipped, output to layer with CLUT pixel format not supported\n"); + _warn("WARNING: skipped, output to layer with CLUT pixel format not supported\n"); return; } #endif /* Flip with non blend */ - info("Perform simple blit operation\n"); + _info("Perform simple blit operation\n"); - info("active->pinfo.fbmem = %p\n", active->pinfo.fbmem); - info("inactive->pinfo.fbmem = %p\n", inactive->pinfo.fbmem); + _info("active->pinfo.fbmem = %p\n", active->pinfo.fbmem); + _info("inactive->pinfo.fbmem = %p\n", inactive->pinfo.fbmem); - info("Ensure that both ltdc layer are opaque\n"); + _info("Ensure that both ltdc layer are opaque\n"); active->layer->setalpha(active->layer, 0xff); inactive->layer->setalpha(inactive->layer, 0xff); - info("Disable blend mode for ltdc both layer\n"); + _info("Disable blend mode for ltdc both layer\n"); active->layer->setblendmode(active->layer, LTDC_BLEND_NONE); inactive->layer->setblendmode(inactive->layer, LTDC_BLEND_NONE); /* Fullscreen blit */ - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); - info("Flip the top layer to the active visible layer\n"); + _info("Flip the top layer to the active visible layer\n"); inactive->layer->update(active->layer, LTDC_UPDATE_ACTIVATE|LTDC_SYNC_VBLANK); ltdc_simple_draw(&inactive->vinfo, &inactive->pinfo); - info("Blit the whole bottom layer to the top layer\n"); + _info("Blit the whole bottom layer to the top layer\n"); area.xpos = 0; area.ypos = 0; area.xres = inactive->vinfo.xres; @@ -873,7 +873,7 @@ static void ltdc_dma2d_blitsimple(void) /* Top left to the middle blit */ - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); area.xpos = 0; @@ -881,7 +881,7 @@ static void ltdc_dma2d_blitsimple(void) area.xres = inactive->vinfo.xres/2; area.yres = inactive->vinfo.yres/2; - info("Blit the top left red rectangle from the bottom layer with the" + _info("Blit the top left red rectangle from the bottom layer with the" " top layer\n"); active->layer->blit(active->layer, active->vinfo.xres/4, @@ -891,7 +891,7 @@ static void ltdc_dma2d_blitsimple(void) /* Top right to the middle blit */ - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); area.xpos = inactive->vinfo.xres/2; @@ -899,7 +899,7 @@ static void ltdc_dma2d_blitsimple(void) area.xres = inactive->vinfo.xres/2; area.yres = inactive->vinfo.yres/2; - info("Blit the top right green rectangle from the bottom layer with the" + _info("Blit the top right green rectangle from the bottom layer with the" " top layer\n"); active->layer->blit(active->layer, active->vinfo.xres/4, @@ -909,7 +909,7 @@ static void ltdc_dma2d_blitsimple(void) /* Bottom left to the middle blit */ - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); area.xpos = 0; @@ -917,7 +917,7 @@ static void ltdc_dma2d_blitsimple(void) area.xres = inactive->vinfo.xres/2; area.yres = inactive->vinfo.yres/2; - info("Blit the bottom left white rectangle from the bottom layer with the" + _info("Blit the bottom left white rectangle from the bottom layer with the" " top layer\n"); active->layer->blit(active->layer, active->vinfo.xres/4, @@ -927,7 +927,7 @@ static void ltdc_dma2d_blitsimple(void) /* Bottom right to the middle blit */ - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); area.xpos = inactive->vinfo.xres/2; @@ -935,7 +935,7 @@ static void ltdc_dma2d_blitsimple(void) area.xres = inactive->vinfo.xres/2; area.yres = inactive->vinfo.yres/2; - info("Blit the bottom right blue rectangle from the bottom layer with the" + _info("Blit the bottom right blue rectangle from the bottom layer with the" " top layer\n"); active->layer->blit(active->layer, active->vinfo.xres/4, @@ -963,29 +963,29 @@ static void ltdc_dma2d_blitpositioning(void) #ifdef CONFIG_STM32_DMA2D_L8 if (active->vinfo.fmt == FB_FMT_RGB8) { - warn("WARNING: skipped, output to layer with CLUT pixel format not supported\n"); + _warn("WARNING: skipped, output to layer with CLUT pixel format not supported\n"); return; } #endif /* Set layer in the middle of the screen */ - info("active->pinfo.fbmem = %p\n", active->pinfo.fbmem); - info("inactive->pinfo.fbmem = %p\n", inactive->pinfo.fbmem); + _info("active->pinfo.fbmem = %p\n", active->pinfo.fbmem); + _info("inactive->pinfo.fbmem = %p\n", inactive->pinfo.fbmem); - info("Ensure that both ltdc layer opaque\n"); + _info("Ensure that both ltdc layer opaque\n"); active->layer->setalpha(active->layer, 0xff); inactive->layer->setalpha(inactive->layer, 0xff); - info("Disable blend mode for both ltdc layer\n"); + _info("Disable blend mode for both ltdc layer\n"); active->layer->setblendmode(active->layer, LTDC_BLEND_NONE); inactive->layer->setblendmode(inactive->layer, LTDC_BLEND_NONE); /* Fullscreen blit */ - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); - info("Flip the top layer to the active visible layer\n"); + _info("Flip the top layer to the active visible layer\n"); inactive->layer->update(active->layer, LTDC_UPDATE_ACTIVATE|LTDC_SYNC_VBLANK); @@ -993,7 +993,7 @@ static void ltdc_dma2d_blitpositioning(void) ltdc_simple_draw(&inactive->vinfo, &inactive->pinfo); - info("Perform positioning test\n"); + _info("Perform positioning test\n"); area.xres = inactive->vinfo.xres/2; area.yres = inactive->vinfo.yres/2; @@ -1073,14 +1073,14 @@ static void ltdc_dma2d_blitpositioning(void) usleep(5); } - info("Perform move test\n"); + _info("Perform move test\n"); area.xpos = inactive->vinfo.xres/4; area.ypos = inactive->vinfo.yres/4; area.xres = inactive->vinfo.xres/2; area.yres = inactive->vinfo.yres/2; - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); /* Move right */ @@ -1138,14 +1138,14 @@ static void ltdc_dma2d_blitpositioning(void) usleep(5); } - info("Perform reference positioning test\n"); + _info("Perform reference positioning test\n"); area.xres = inactive->vinfo.xres/2; area.yres = inactive->vinfo.yres/2; area.xpos = inactive->vinfo.xres/4; area.ypos = inactive->vinfo.yres/4; - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); /* Move right */ @@ -1227,35 +1227,35 @@ static void ltdc_dma2d_blendsimple(void) #ifdef CONFIG_STM32_DMA2D_L8 if (active->vinfo.fmt == FB_FMT_RGB8) { - warn("WARNING: skipped, output to layer with CLUT pixel format not supported\n"); + _warn("WARNING: skipped, output to layer with CLUT pixel format not supported\n"); return; } #endif - info("Perform simple blend operation\n"); + _info("Perform simple blend operation\n"); - info("active->pinfo.fbmem = %p\n", active->pinfo.fbmem); - info("inactive->pinfo.fbmem = %p\n", inactive->pinfo.fbmem); + _info("active->pinfo.fbmem = %p\n", active->pinfo.fbmem); + _info("inactive->pinfo.fbmem = %p\n", inactive->pinfo.fbmem); - info("Ensure that both ltdc layer are opaque\n"); + _info("Ensure that both ltdc layer are opaque\n"); active->layer->setalpha(active->layer, 0xff); inactive->layer->setalpha(inactive->layer, 0xff); - info("Enable alpha blend mode for both dma2d layer\n"); + _info("Enable alpha blend mode for both dma2d layer\n"); active->dma2d->setblendmode(active->dma2d, DMA2D_BLEND_ALPHA); inactive->dma2d->setblendmode(inactive->dma2d, DMA2D_BLEND_ALPHA); /* Fullscreen blend */ - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); - info("Flip the top layer to the active visible layer\n"); + _info("Flip the top layer to the active visible layer\n"); active->layer->update(active->layer, LTDC_UPDATE_ACTIVATE|LTDC_UPDATE_SIM|LTDC_SYNC_VBLANK); ltdc_simple_draw(&inactive->vinfo, &inactive->pinfo); - info("Blend the whole bottom layer to the top layer\n"); + _info("Blend the whole bottom layer to the top layer\n"); area.xpos = 0; area.ypos = 0; @@ -1274,7 +1274,7 @@ static void ltdc_dma2d_blendsimple(void) /* Blend top left to the middle */ - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); area.xpos = 0; @@ -1282,7 +1282,7 @@ static void ltdc_dma2d_blendsimple(void) area.xres = inactive->vinfo.xres/2; area.yres = inactive->vinfo.yres/2; - info("Blend the top left red rectangle from the bottom layer with the middle" + _info("Blend the top left red rectangle from the bottom layer with the middle" " of the top layer\n"); for (alpha = 0; alpha < 255 ; alpha++) @@ -1297,7 +1297,7 @@ static void ltdc_dma2d_blendsimple(void) /* Top right to the middle blit */ - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); area.xpos = inactive->vinfo.xres/2; @@ -1305,7 +1305,7 @@ static void ltdc_dma2d_blendsimple(void) area.xres = inactive->vinfo.xres/2; area.yres = inactive->vinfo.yres/2; - info("Blend the top right green rectangle from the bottom layer with the" + _info("Blend the top right green rectangle from the bottom layer with the" " middle of the top layer\n"); for (alpha = 0; alpha < 255 ; alpha++) @@ -1320,7 +1320,7 @@ static void ltdc_dma2d_blendsimple(void) /* Bottom left to the middle blit */ - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); area.xpos = 0; @@ -1328,7 +1328,7 @@ static void ltdc_dma2d_blendsimple(void) area.xres = inactive->vinfo.xres/2; area.yres = inactive->vinfo.yres/2; - info("Blit the bottom left white rectangle from the bottom layer with the" + _info("Blit the bottom left white rectangle from the bottom layer with the" " middle of the top layer\n"); for (alpha = 0; alpha < 255 ; alpha++) @@ -1343,7 +1343,7 @@ static void ltdc_dma2d_blendsimple(void) /* Bottom right to the middle blit */ - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); area.xpos = inactive->vinfo.xres/2; @@ -1351,7 +1351,7 @@ static void ltdc_dma2d_blendsimple(void) area.xres = inactive->vinfo.xres/2; area.yres = inactive->vinfo.yres/2; - info("Blit the bottom right blue rectangle from the bottom layer with the" + _info("Blit the bottom right blue rectangle from the bottom layer with the" " middle of the top layer\n"); for (alpha = 0; alpha < 255 ; alpha++) @@ -1364,7 +1364,7 @@ static void ltdc_dma2d_blendsimple(void) usleep(5); } - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); } #endif /* CONFIG_STM32_LTDC_L2 */ @@ -1390,7 +1390,7 @@ static void ltdc_dma2d_blitdynamiclayer(void) #ifdef CONFIG_STM32_DMA2D_L8 if (active->vinfo.fmt == FB_FMT_RGB8) { - warn("WARNING: skipped, output to layer with CLUT pixel format not supported\n"); + _warn("WARNING: skipped, output to layer with CLUT pixel format not supported\n"); return; } #endif @@ -1404,7 +1404,7 @@ static void ltdc_dma2d_blitdynamiclayer(void) _exit(1); } - info("create background dma2d surface: %p\n", back); + _info("create background dma2d surface: %p\n", back); fore = ltdc_create_dma2d_surface(active->vinfo.xres/2, active->vinfo.yres/2, active->vinfo.fmt); @@ -1415,7 +1415,7 @@ static void ltdc_dma2d_blitdynamiclayer(void) _exit(1); } - info("create foreground dma2d surface: %p\n", fore); + _info("create foreground dma2d surface: %p\n", fore); /* Wrong positioning detection */ @@ -1424,7 +1424,7 @@ static void ltdc_dma2d_blitdynamiclayer(void) forearea.xres = fore->vinfo.xres; forearea.yres = fore->vinfo.yres; - info("check if the ltdc driver recognized when positioning overflows the whole" + _info("check if the ltdc driver recognized when positioning overflows the whole" " layer buffer\n"); if (active->layer->blit(active->layer, @@ -1458,14 +1458,14 @@ static void ltdc_dma2d_blitdynamiclayer(void) if (ret == OK) { - info("ok, driver detects wrong positioning\n"); + _info("ok, driver detects wrong positioning\n"); } else { - _err("ERROR: fail, wrong positioning can overflow layer buffer\n"); + _err("ERROR: fail, wrong positioning can overflow layer buffer\n"); } - info("check if the dma2d driver recognized when positioning overflows the" + _info("check if the dma2d driver recognized when positioning overflows the" " whole layer buffer\n"); forearea.xpos = 0; @@ -1502,11 +1502,11 @@ static void ltdc_dma2d_blitdynamiclayer(void) if (ret == OK) { - info("ok, driver detects wrong positioning\n"); + _info("ok, driver detects wrong positioning\n"); } else { - _err("ERROR: fail, wrong positioning can overflow layer buffer\n"); + _err("ERROR: fail, wrong positioning can overflow layer buffer\n"); } /* Initialize the dma2d fullscreen background layer */ @@ -1522,23 +1522,23 @@ static void ltdc_dma2d_blitdynamiclayer(void) /* Blit test */ - info("Perform simple dma2d blit operation\n"); + _info("Perform simple dma2d blit operation\n"); - info("Ensure that the ltdc layer is opaque\n"); + _info("Ensure that the ltdc layer is opaque\n"); active->layer->setalpha(active->layer, 0xff); - info("Disable blend mode for the ltdc layer\n"); + _info("Disable blend mode for the ltdc layer\n"); active->layer->setblendmode(active->layer, LTDC_BLEND_NONE); - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); - info("Flip the top layer to the active visible layer\n"); + _info("Flip the top layer to the active visible layer\n"); active->layer->update(active->layer, LTDC_UPDATE_ACTIVATE|LTDC_SYNC_VBLANK); /* Top left to the middle blit */ - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); area.xpos = 0; @@ -1546,11 +1546,11 @@ static void ltdc_dma2d_blitdynamiclayer(void) area.xres = active->vinfo.xres/2; area.yres = active->vinfo.yres/2; - info("Blit the top left red rectangle from the background layer to the" + _info("Blit the top left red rectangle from the background layer to the" " foreground layer\n"); fore->dma2d->blit(fore->dma2d, 0, 0, back->dma2d, &area); - info("Blit the resulting dma2d layer to the middle of the screen\n"); + _info("Blit the resulting dma2d layer to the middle of the screen\n"); active->layer->blit(active->layer, active->vinfo.xres/4, active->vinfo.yres/4, back->dma2d, &forearea); @@ -1558,7 +1558,7 @@ static void ltdc_dma2d_blitdynamiclayer(void) /* Top right to the middle blit */ - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); area.xpos = active->vinfo.xres/2; @@ -1566,11 +1566,11 @@ static void ltdc_dma2d_blitdynamiclayer(void) area.xres = active->vinfo.xres/2; area.yres = active->vinfo.yres/2; - info("Blit the top right green rectangle from the background layer to the" + _info("Blit the top right green rectangle from the background layer to the" " foreground layer\n"); fore->dma2d->blit(fore->dma2d, 0, 0, back->dma2d, &area); - info("Blit the resulting dma2d layer to the middle of the screen\n"); + _info("Blit the resulting dma2d layer to the middle of the screen\n"); active->layer->blit(active->layer, active->vinfo.xres/4, active->vinfo.yres/4, fore->dma2d, &forearea); @@ -1578,7 +1578,7 @@ static void ltdc_dma2d_blitdynamiclayer(void) /* Bottom left to the middle blit */ - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); area.xpos = 0; @@ -1586,11 +1586,11 @@ static void ltdc_dma2d_blitdynamiclayer(void) area.xres = active->vinfo.xres/2; area.yres = active->vinfo.yres/2; - info("Blit the bottom left white rectangle from the background layer to the" + _info("Blit the bottom left white rectangle from the background layer to the" " foreground layer\n"); fore->dma2d->blit(fore->dma2d, 0, 0, back->dma2d, &area); - info("Blit the resulting dma2d layer to the middle of the screen\n"); + _info("Blit the resulting dma2d layer to the middle of the screen\n"); active->layer->blit(active->layer, active->vinfo.xres/4, active->vinfo.yres/4, fore->dma2d, &forearea); @@ -1598,7 +1598,7 @@ static void ltdc_dma2d_blitdynamiclayer(void) /* Bottom right to the middle blit */ - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); area.xpos = active->vinfo.xres/2; @@ -1606,11 +1606,11 @@ static void ltdc_dma2d_blitdynamiclayer(void) area.xres = active->vinfo.xres/2; area.yres = active->vinfo.yres/2; - info("Blit the bottom right blue rectangle from the background layer to the" + _info("Blit the bottom right blue rectangle from the background layer to the" " foreground layer\n"); fore->dma2d->blit(fore->dma2d, 0, 0, back->dma2d, &area); - info("Blit the resulting dma2d layer to the middle of the screen\n"); + _info("Blit the resulting dma2d layer to the middle of the screen\n"); active->layer->blit(active->layer, active->vinfo.xres/4, active->vinfo.yres/4, fore->dma2d, &forearea); @@ -1618,7 +1618,7 @@ static void ltdc_dma2d_blitdynamiclayer(void) /* Middle to the middle blit */ - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); @@ -1627,11 +1627,11 @@ static void ltdc_dma2d_blitdynamiclayer(void) area.xres = active->vinfo.xres/2; area.yres = active->vinfo.yres/2; - info("Blit the bottom half rectangle from the background layers to the middle" + _info("Blit the bottom half rectangle from the background layers to the middle" " of the foreground layer\n"); fore->dma2d->blit(fore->dma2d, 0, 0, back->dma2d, &area); - info("Blit the resulting dma2d layer to the middle of the screen\n"); + _info("Blit the resulting dma2d layer to the middle of the screen\n"); active->layer->blit(active->layer, active->vinfo.xres/4, active->vinfo.yres/4, fore->dma2d, &forearea); @@ -1662,7 +1662,7 @@ static void ltdc_dma2d_blenddynamiclayer(void) #ifdef CONFIG_STM32_DMA2D_L8 if (active->vinfo.fmt == FB_FMT_RGB8) { - warn("WARNING: skipped, output to layer with CLUT pixel format not supported\n"); + _warn("WARNING: skipped, output to layer with CLUT pixel format not supported\n"); return; } #endif @@ -1676,7 +1676,7 @@ static void ltdc_dma2d_blenddynamiclayer(void) _exit(1); } - info("create background dma2d surface: %p\n", back); + _info("create background dma2d surface: %p\n", back); fore = ltdc_create_dma2d_surface(active->vinfo.xres/2, active->vinfo.yres/2, active->vinfo.fmt); @@ -1687,11 +1687,11 @@ static void ltdc_dma2d_blenddynamiclayer(void) _exit(1); } - info("create foreground dma2d surface: %p\n", fore); + _info("create foreground dma2d surface: %p\n", fore); /* Wrong positioning detection */ - info("check if the ltdc driver recognized when positioning overflows the whole" + _info("check if the ltdc driver recognized when positioning overflows the whole" " layer buffer\n"); area.xpos = 0; @@ -1746,14 +1746,14 @@ static void ltdc_dma2d_blenddynamiclayer(void) if (ret == OK) { - info("ok, driver detects wrong positioning\n"); + _info("ok, driver detects wrong positioning\n"); } else { - _err("ERROR: fail, wrong positioning can overflow layer buffer\n"); + _err("ERROR: fail, wrong positioning can overflow layer buffer\n"); } - info("check if the dma2d driver recognized when positioning overflows the" + _info("check if the dma2d driver recognized when positioning overflows the" " whole layer buffer\n"); area.xpos = 0; @@ -1806,11 +1806,11 @@ static void ltdc_dma2d_blenddynamiclayer(void) if (ret == OK) { - info("ok, driver detects wrong positioning\n"); + _info("ok, driver detects wrong positioning\n"); } else { - _err("ERROR: fail, wrong positioning can overflow layer buffer\n"); + _err("ERROR: fail, wrong positioning can overflow layer buffer\n"); } /* Initialize the dma2d fullscreen background layer */ @@ -1819,26 +1819,26 @@ static void ltdc_dma2d_blenddynamiclayer(void) /* Blit test */ - info("Perform simple dma2d blend operation\n"); + _info("Perform simple dma2d blend operation\n"); - info("Ensure that the ltdc layer is opaque\n"); + _info("Ensure that the ltdc layer is opaque\n"); active->layer->setalpha(active->layer, 0xff); - info("Disable blend mode for the ltdc layer\n"); + _info("Disable blend mode for the ltdc layer\n"); active->layer->setblendmode(active->layer, LTDC_BLEND_NONE); - info("Enable alpha blend mode for both dma2d layer\n"); + _info("Enable alpha blend mode for both dma2d layer\n"); fore->dma2d->setblendmode(fore->dma2d, DMA2D_BLEND_ALPHA); back->dma2d->setblendmode(back->dma2d, DMA2D_BLEND_ALPHA); - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); - info("Flip the top layer to the active visible layer\n"); + _info("Flip the top layer to the active visible layer\n"); active->layer->update(active->layer, LTDC_UPDATE_ACTIVATE|LTDC_SYNC_VBLANK); /* Top left to the middle */ - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); area.xpos = 0; @@ -1846,7 +1846,7 @@ static void ltdc_dma2d_blenddynamiclayer(void) area.xres = active->vinfo.xres/2; area.yres = active->vinfo.yres/2; - info("Blend the top left red rectangle from the background layer with the" + _info("Blend the top left red rectangle from the background layer with the" " middle of the foreground layer\n"); for (alpha = 0; alpha < 255 ; alpha++) @@ -1863,7 +1863,7 @@ static void ltdc_dma2d_blenddynamiclayer(void) /* Top right to the middle blit */ - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); area.xpos = active->vinfo.xres/2; @@ -1871,7 +1871,7 @@ static void ltdc_dma2d_blenddynamiclayer(void) area.xres = active->vinfo.xres/2; area.yres = active->vinfo.yres/2; - info("Blend the top right green rectangle from the background layer with the" + _info("Blend the top right green rectangle from the background layer with the" " middle of the foreground layer\n"); for (alpha = 0; alpha < 255 ; alpha++) @@ -1888,7 +1888,7 @@ static void ltdc_dma2d_blenddynamiclayer(void) /* Bottom left to the middle blit */ - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); area.xpos = 0; @@ -1896,7 +1896,7 @@ static void ltdc_dma2d_blenddynamiclayer(void) area.xres = active->vinfo.xres/2; area.yres = active->vinfo.yres/2; - info("Blend the bottom left white rectangle from the background layer with the" + _info("Blend the bottom left white rectangle from the background layer with the" " middle of foreground layer\n"); for (alpha = 0; alpha < 255 ; alpha++) @@ -1913,7 +1913,7 @@ static void ltdc_dma2d_blenddynamiclayer(void) /* Bottom right to the middle blit */ - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); area.xpos = active->vinfo.xres/2; @@ -1921,7 +1921,7 @@ static void ltdc_dma2d_blenddynamiclayer(void) area.xres = active->vinfo.xres/2; area.yres = active->vinfo.yres/2; - info("Blend the bottom right blue rectangle from the background layer with the" + _info("Blend the bottom right blue rectangle from the background layer with the" " middle of the foreground layer\n"); for (alpha = 0; alpha < 255 ; alpha++) @@ -1938,7 +1938,7 @@ static void ltdc_dma2d_blenddynamiclayer(void) /* Middle to the middle blit */ - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); @@ -1947,7 +1947,7 @@ static void ltdc_dma2d_blenddynamiclayer(void) area.xres = active->vinfo.xres/2; area.yres = active->vinfo.yres/2; - info("Blend the bottom half screen rectangle from the background layers middle" + _info("Blend the bottom half screen rectangle from the background layers middle" " with the middle of the foreground layer\n"); for (alpha = 0; alpha < 255 ; alpha++) @@ -1987,7 +1987,7 @@ static void ltdc_dma2d_blitflippositioning(void) #ifdef CONFIG_STM32_DMA2D_L8 if (active->vinfo.fmt == FB_FMT_RGB8 || inactive->vinfo.fmt == FB_FMT_RGB8) { - warn("WARNING: skipped, output to layer with CLUT pixel format not supported\n"); + _warn("WARNING: skipped, output to layer with CLUT pixel format not supported\n"); return; } #endif @@ -2002,7 +2002,7 @@ static void ltdc_dma2d_blitflippositioning(void) _exit(1); } - info("create foreground dma2d surface: %p\n", fore); + _info("create foreground dma2d surface: %p\n", fore); back = ltdc_create_dma2d_surface(active->vinfo.xres/2, active->vinfo.yres/2, active->vinfo.fmt); @@ -2013,7 +2013,7 @@ static void ltdc_dma2d_blitflippositioning(void) _exit(1); } - info("create background dma2d surface: %p\n", back); + _info("create background dma2d surface: %p\n", back); image = ltdc_create_dma2d_surface(active->vinfo.xres, active->vinfo.yres, active->vinfo.fmt); @@ -2025,26 +2025,26 @@ static void ltdc_dma2d_blitflippositioning(void) _exit(1); } - info("create the dma2d surface to store the image: %p\n", image); + _info("create the dma2d surface to store the image: %p\n", image); - info("Enable alpha blending for both dma2d layer\n"); + _info("Enable alpha blending for both dma2d layer\n"); fore->dma2d->setblendmode(fore->dma2d, DMA2D_BLEND_ALPHA); back->dma2d->setblendmode(back->dma2d, DMA2D_BLEND_ALPHA); - info("Ensure that both ltdc layer opaque\n"); + _info("Ensure that both ltdc layer opaque\n"); active->layer->setalpha(active->layer, 0xff); inactive->layer->setalpha(inactive->layer, 0xff); - info("Disable blend mode for both ltdc layer\n"); + _info("Disable blend mode for both ltdc layer\n"); active->layer->setblendmode(active->layer, LTDC_BLEND_NONE); inactive->layer->setblendmode(inactive->layer, LTDC_BLEND_NONE); /* Fullscreen blit */ - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_clearlayer(active, LTDC_BLACK); - info("Flip the top layer to the active visible layer\n"); + _info("Flip the top layer to the active visible layer\n"); inactive->layer->update(active->layer, LTDC_UPDATE_ACTIVATE|LTDC_SYNC_VBLANK); @@ -2052,7 +2052,7 @@ static void ltdc_dma2d_blitflippositioning(void) ltdc_simple_draw(&image->vinfo, &image->pinfo); - info("Perform positioning test\n"); + _info("Perform positioning test\n"); area.xpos = inactive->vinfo.xres/4; area.ypos = inactive->vinfo.yres/4; @@ -2131,7 +2131,7 @@ static void ltdc_dma2d_blitflippositioning(void) ltdc_blendoutline(fore, back); - info("Perform move test\n"); + _info("Perform move test\n"); area.xpos = inactive->vinfo.xres/4; area.ypos = inactive->vinfo.yres/4; @@ -2198,7 +2198,7 @@ static void ltdc_dma2d_blitflippositioning(void) } - info("Perform reference positioning test\n"); + _info("Perform reference positioning test\n"); area.xpos = inactive->vinfo.xres/4; area.ypos = inactive->vinfo.yres/4; @@ -2289,7 +2289,7 @@ static void ltdc_screensaver(void) #ifdef CONFIG_STM32_DMA2D_L8 if (active->vinfo.fmt == FB_FMT_RGB8 || inactive->vinfo.fmt == FB_FMT_RGB8) { - info("skipped, output to layer with CLUT pixel format not supported\n"); + _info("skipped, output to layer with CLUT pixel format not supported\n"); return; } #endif @@ -2305,7 +2305,7 @@ static void ltdc_screensaver(void) _exit(1); } - info("create a scratch dma2d layer: %p\n", scratch); + _info("create a scratch dma2d layer: %p\n", scratch); rect1 = ltdc_create_dma2d_surface(active->vinfo.xres/4, active->vinfo.yres/4, @@ -2317,7 +2317,7 @@ static void ltdc_screensaver(void) _exit(1); } - info("create a dma2d layer for the rectangle 1: %p\n", rect1); + _info("create a dma2d layer for the rectangle 1: %p\n", rect1); rect2 = ltdc_create_dma2d_surface(active->vinfo.xres/4, active->vinfo.yres/4, @@ -2330,7 +2330,7 @@ static void ltdc_screensaver(void) _exit(1); } - info("create a dma2d layer for rectangle 2: %p\n", rect2); + _info("create a dma2d layer for rectangle 2: %p\n", rect2); image = ltdc_create_dma2d_surface(active->vinfo.xres, active->vinfo.yres, @@ -2344,19 +2344,19 @@ static void ltdc_screensaver(void) _exit(1); } - info("create a dma2d layer to store the background image: %p\n", image); + _info("create a dma2d layer to store the background image: %p\n", image); - info("Enable alpha blending for the dma2d layer\n"); + _info("Enable alpha blending for the dma2d layer\n"); scratch->dma2d->setblendmode(scratch->dma2d, DMA2D_BLEND_ALPHA); rect1->dma2d->setblendmode(rect1->dma2d, DMA2D_BLEND_ALPHA); rect2->dma2d->setblendmode(rect2->dma2d, DMA2D_BLEND_ALPHA); /* ltdc layer settings */ - info("Ensure that both ltdc layer opaque\n"); + _info("Ensure that both ltdc layer opaque\n"); active->layer->setalpha(active->layer, 0xff); inactive->layer->setalpha(inactive->layer, 0xff); - info("Disable blend mode for both ltdc layer\n"); + _info("Disable blend mode for both ltdc layer\n"); active->layer->setblendmode(active->layer, LTDC_BLEND_NONE); inactive->layer->setblendmode(inactive->layer, LTDC_BLEND_NONE); @@ -2364,7 +2364,7 @@ static void ltdc_screensaver(void) ltdc_simple_draw(&image->vinfo, &image->pinfo); - info("Perform screensaver\n"); + _info("Perform screensaver\n"); area.xpos = image->vinfo.xres/4 + image->vinfo.xres / 8; area.ypos = image->vinfo.yres/4 + image->vinfo.yres / 8; diff --git a/examples/ltdc/ltdc_main.c b/examples/ltdc/ltdc_main.c index f95240523..4c05f6587 100644 --- a/examples/ltdc/ltdc_main.c +++ b/examples/ltdc/ltdc_main.c @@ -96,23 +96,23 @@ static int ltdc_init_surface(int lid, uint32_t mode) if (!sur->layer) { - _err("ERROR: up_ltdcgetlayer() failed\n"); + _err("ERROR: up_ltdcgetlayer() failed\n"); return -1; } if (sur->layer->getvideoinfo(sur->layer, &sur->vinfo) != OK) { - _err("ERROR: getvideoinfo() failed\n"); + _err("ERROR: getvideoinfo() failed\n"); return -1; } if (sur->layer->getplaneinfo(sur->layer, 0, &sur->pinfo) != OK) { - _err("ERROR: getplaneinfo() failed\n"); + _err("ERROR: getplaneinfo() failed\n"); return -1; } - info("layer %d is configured with: xres = %d, yres = %d," + _info("layer %d is configured with: xres = %d, yres = %d," "fb start address = %p, fb size = %d, fmt = %d, bpp = %d\n", lid, sur->vinfo.xres, sur->vinfo.yres, sur->pinfo.fbmem, sur->pinfo.fblen, sur->vinfo.fmt, sur->pinfo.bpp); @@ -133,7 +133,7 @@ static int ltdc_init_surface(int lid, uint32_t mode) if (sur->layer->getlid(sur->layer, &lid, LTDC_LAYER_DMA2D) != OK) { - _err("ERROR: getlid() failed\n"); + _err("ERROR: getlid() failed\n"); return -1; } @@ -141,7 +141,7 @@ static int ltdc_init_surface(int lid, uint32_t mode) if (sur->dma2d == NULL) { - _err("ERROR: up_dma2dgetlayer() failed\n"); + _err("ERROR: up_dma2dgetlayer() failed\n"); return -1; } #endif @@ -168,7 +168,7 @@ static void ltdc_setget_test(void) FAR struct ltdc_area_s area; FAR struct surface *sur = ltdc_get_surface(LTDC_LAYER_ACTIVE); - info("Perform set and get test\n"); + _info("Perform set and get test\n"); /* setalpha */ @@ -176,14 +176,14 @@ static void ltdc_setget_test(void) if (ret != OK) { - _err("ERROR: setalpha() failed\n"); + _err("ERROR: setalpha() failed\n"); } ret = sur->layer->getalpha(sur->layer, &alpha); if (ret != OK || alpha != 0x7f) { - _err("ERROR: getalpha() failed\n"); + _err("ERROR: getalpha() failed\n"); } /* setcolor */ @@ -192,14 +192,14 @@ static void ltdc_setget_test(void) if (ret != OK) { - _err("ERROR: setcolor() failed\n"); + _err("ERROR: setcolor() failed\n"); } ret = sur->layer->getcolor(sur->layer, &color); if (ret != OK || color != 0x11223344) { - _err("ERROR: getcolor() failed\n"); + _err("ERROR: getcolor() failed\n"); } /* setcolorkey */ @@ -208,14 +208,14 @@ static void ltdc_setget_test(void) if (ret != OK) { - _err("ERROR: setcolorkey() failed\n"); + _err("ERROR: setcolorkey() failed\n"); } ret = sur->layer->getcolorkey(sur->layer, &color); if (ret != OK || color != 0x55667788) { - _err("ERROR: getcolorkey() failed\n"); + _err("ERROR: getcolorkey() failed\n"); } /* setblendmode */ @@ -224,14 +224,14 @@ static void ltdc_setget_test(void) if (ret != OK) { - _err("ERROR: setblendmode() failed\n"); + _err("ERROR: setblendmode() failed\n"); } ret = sur->layer->getblendmode(sur->layer, &mode); if (ret != OK || mode != LTDC_BLEND_NONE) { - _err("ERROR: getblendmode() failed\n"); + _err("ERROR: getblendmode() failed\n"); } /* setarea */ @@ -246,7 +246,7 @@ static void ltdc_setget_test(void) if (ret != OK) { - _err("ERROR: setarea() failed\n"); + _err("ERROR: setarea() failed\n"); } ret = sur->layer->getarea(sur->layer, &area, &xpos, &ypos); @@ -255,7 +255,7 @@ static void ltdc_setget_test(void) area.xpos != sur->vinfo.xres/4 || area.ypos != sur->vinfo.yres/4 || area.xres != sur->vinfo.xres/2 || area.yres != sur->vinfo.yres/2) { - _err("ERROR: getarea() failed\n"); + _err("ERROR: getarea() failed\n"); } #ifdef CONFIG_FB_CMAP @@ -275,7 +275,7 @@ static void ltdc_setget_test(void) if (ret != OK) { - _err("ERROR: setclut() failed\n"); + _err("ERROR: setclut() failed\n"); } /* Clear all colors to black */ @@ -291,7 +291,7 @@ static void ltdc_setget_test(void) if (ret != OK) { - _err("ERROR: getclut() failed\n"); + _err("ERROR: getclut() failed\n"); } #ifdef CONFIG_FB_TRANSPARENCY @@ -305,7 +305,7 @@ static void ltdc_setget_test(void) ltdc_cmpcolor(g_cmap.green, cmap->green, LTDC_EXAMPLE_NCOLORS)) #endif { - _err("ERROR: getclut() failed, unexpected cmap content\n"); + _err("ERROR: getclut() failed, unexpected cmap content\n"); } ltdc_deletecmap(cmap); @@ -318,7 +318,7 @@ static void ltdc_setget_test(void) if (ret != OK) { - _err("ERROR: setclut() failed\n"); + _err("ERROR: setclut() failed\n"); } } #endif @@ -363,22 +363,22 @@ static void ltdc_color_test(void) /* Default Color black */ - info("Set default color to black\n"); + _info("Set default color to black\n"); sur->layer->setcolor(sur->layer, 0xff000000); - info("Update the layer\n"); + _info("Update the layer\n"); sur->layer->update(sur->layer, LTDC_SYNC_VBLANK|LTDC_SYNC_WAIT); /* Set active layer to the upper half of the screen */ - info("Set area to xpos = %d, ypos = %d, xres = %d, yres = %d\n", + _info("Set area to xpos = %d, ypos = %d, xres = %d, yres = %d\n", area.xpos, area.ypos, area.xres, area.yres); sur->layer->setarea(sur->layer, &area, area.xpos, area.ypos); - info("Update the layer, should be black outside the colorful rectangle\n"); + _info("Update the layer, should be black outside the colorful rectangle\n"); sur->layer->update(sur->layer, LTDC_SYNC_VBLANK|LTDC_SYNC_WAIT); @@ -386,11 +386,11 @@ static void ltdc_color_test(void) /* Default Color red */ - info("Update the layer, should be red outside the colorful rectangle\n"); + _info("Update the layer, should be red outside the colorful rectangle\n"); sur->layer->setcolor(sur->layer, 0xffff0000); - info("Update the layer\n"); + _info("Update the layer\n"); sur->layer->update(sur->layer, LTDC_SYNC_VBLANK|LTDC_SYNC_WAIT); @@ -398,11 +398,11 @@ static void ltdc_color_test(void) /* Default Color green */ - info("Update the layer, should be green outside the colorful rectangle\n"); + _info("Update the layer, should be green outside the colorful rectangle\n"); sur->layer->setcolor(sur->layer, 0xff00ff00); - info("Update the layer\n"); + _info("Update the layer\n"); sur->layer->update(sur->layer, LTDC_SYNC_VBLANK|LTDC_SYNC_WAIT); @@ -410,11 +410,11 @@ static void ltdc_color_test(void) /* Default Color blue */ - info("Update the layer, should be blue outside the colorful rectangle\n"); + _info("Update the layer, should be blue outside the colorful rectangle\n"); sur->layer->setcolor(sur->layer, 0xff0000ff); - info("Update the layer\n"); + _info("Update the layer\n"); sur->layer->update(sur->layer, LTDC_SYNC_VBLANK|LTDC_SYNC_WAIT); @@ -427,18 +427,18 @@ static void ltdc_color_test(void) area.xres = sur->vinfo.xres; area.yres = sur->vinfo.yres; - info("Set area to xpos = %d, ypos = %d, xres = %d, yres = %d\n", + _info("Set area to xpos = %d, ypos = %d, xres = %d, yres = %d\n", area.xpos, area.ypos, area.xres, area.yres); sur->layer->setarea(sur->layer, &area, area.xpos, area.ypos); /* Default Color black */ - info("Set default color to black\n"); + _info("Set default color to black\n"); sur->layer->setcolor(sur->layer, 0); - info("Update the layer\n"); + _info("Update the layer\n"); sur->layer->update(sur->layer, LTDC_SYNC_VBLANK|LTDC_SYNC_WAIT); @@ -468,7 +468,7 @@ static void ltdc_colorkey_test(void) /* Resize active layer */ - info("Set area to xpos = %d, ypos = %d, xres = %d, yres = %d\n", + _info("Set area to xpos = %d, ypos = %d, xres = %d, yres = %d\n", area.xpos, area.ypos, area.xres, area.yres); sur->layer->setarea(sur->layer, &area, area.xpos, area.ypos); @@ -479,11 +479,11 @@ static void ltdc_colorkey_test(void) /* Color key white */ - info("Set colorkey to white\n"); + _info("Set colorkey to white\n"); sur->layer->setcolorkey(sur->layer, 0xffffff); - info("Update the layer\n"); + _info("Update the layer\n"); sur->layer->update(sur->layer, LTDC_SYNC_VBLANK|LTDC_SYNC_WAIT); @@ -491,11 +491,11 @@ static void ltdc_colorkey_test(void) /* Color key red */ - info("Set colorkey to red\n"); + _info("Set colorkey to red\n"); sur->layer->setcolorkey(sur->layer, 0xff0000); - info("Update the layer\n"); + _info("Update the layer\n"); sur->layer->update(sur->layer, LTDC_SYNC_VBLANK|LTDC_SYNC_WAIT); @@ -503,11 +503,11 @@ static void ltdc_colorkey_test(void) /* Color key green */ - info("Set colorkey to green\n"); + _info("Set colorkey to green\n"); sur->layer->setcolorkey(sur->layer, 0xff00); - info("Update the layer\n"); + _info("Update the layer\n"); sur->layer->update(sur->layer, LTDC_SYNC_VBLANK|LTDC_SYNC_WAIT); @@ -515,15 +515,15 @@ static void ltdc_colorkey_test(void) /* Color key red */ - info("Set colorkey to blue\n"); + _info("Set colorkey to blue\n"); sur->layer->setcolorkey(sur->layer, 0xff); - info("Update the layer\n"); + _info("Update the layer\n"); sur->layer->update(sur->layer, LTDC_SYNC_VBLANK|LTDC_SYNC_WAIT); - info("Disable colorkey\n"); + _info("Disable colorkey\n"); usleep(1000000); @@ -536,7 +536,7 @@ static void ltdc_colorkey_test(void) area.xres = sur->vinfo.xres; area.yres = sur->vinfo.yres; - info("Set area to xpos = %d, ypos = %d, xres = %d, yres = %d\n", + _info("Set area to xpos = %d, ypos = %d, xres = %d, yres = %d\n", area.xpos, area.ypos, area.xres, area.yres); sur->layer->setarea(sur->layer, &area, 0, 0); @@ -545,7 +545,7 @@ static void ltdc_colorkey_test(void) sur->layer->setblendmode(sur->layer, LTDC_BLEND_NONE); - info("Update the layer\n"); + _info("Update the layer\n"); sur->layer->update(sur->layer, LTDC_SYNC_VBLANK|LTDC_SYNC_WAIT); @@ -568,7 +568,7 @@ static void ltdc_area_test(void) struct ltdc_area_s area; FAR struct surface *sur = ltdc_get_surface(LTDC_LAYER_ACTIVE); - info("Perform area test\n"); + _info("Perform area test\n"); ltdc_simple_draw(&sur->vinfo, &sur->pinfo); @@ -581,12 +581,12 @@ static void ltdc_area_test(void) area.xres = sur->vinfo.xres/2; area.yres = sur->vinfo.yres/2; - info("Set area to xpos = %d, ypos = %d, xres = %d, yres = %d\n", + _info("Set area to xpos = %d, ypos = %d, xres = %d, yres = %d\n", area.xpos, area.ypos, area.xres, area.yres); sur->layer->setarea(sur->layer, &area, area.xpos, area.ypos); - info("Update the layer, to show the upper left rectangle of the screen\n"); + _info("Update the layer, to show the upper left rectangle of the screen\n"); sur->layer->update(sur->layer, LTDC_SYNC_VBLANK); @@ -599,12 +599,12 @@ static void ltdc_area_test(void) area.xres = sur->vinfo.xres/2; area.yres = sur->vinfo.yres/2; - info("Set area to xpos = %d, ypos = %d, xres = %d, yres = %d\n", + _info("Set area to xpos = %d, ypos = %d, xres = %d, yres = %d\n", area.xpos, area.ypos, area.xres, area.yres); sur->layer->setarea(sur->layer, &area, area.xpos, area.ypos); - info("Update the layer, to show the upper right rectangle of the screen\n"); + _info("Update the layer, to show the upper right rectangle of the screen\n"); sur->layer->update(sur->layer, LTDC_SYNC_VBLANK); @@ -617,12 +617,12 @@ static void ltdc_area_test(void) area.xres = sur->vinfo.xres/2; area.yres = sur->vinfo.yres/2; - info("Set area to xpos = %d, ypos = %d, xres = %d, yres = %d\n", + _info("Set area to xpos = %d, ypos = %d, xres = %d, yres = %d\n", area.xpos, area.ypos, area.xres, area.yres); sur->layer->setarea(sur->layer, &area, area.xpos, area.ypos); - info("Update the layer, to show the lower left rectangle of the screen\n"); + _info("Update the layer, to show the lower left rectangle of the screen\n"); sur->layer->update(sur->layer, LTDC_SYNC_VBLANK); @@ -635,12 +635,12 @@ static void ltdc_area_test(void) area.xres = sur->vinfo.xres/2; area.yres = sur->vinfo.yres/2; - info("Set area to xpos = %d, ypos = %d, xres = %d, yres = %d\n", + _info("Set area to xpos = %d, ypos = %d, xres = %d, yres = %d\n", area.xpos, area.ypos, area.xres, area.yres); sur->layer->setarea(sur->layer, &area, area.xpos, area.ypos); - info("Update the layer, to show the lower right rectangle of the screen\n"); + _info("Update the layer, to show the lower right rectangle of the screen\n"); sur->layer->update(sur->layer, LTDC_SYNC_VBLANK); @@ -648,7 +648,7 @@ static void ltdc_area_test(void) /* Perform layer positioning */ - info("Perform positioning test\n"); + _info("Perform positioning test\n"); /* Set layer in the middle of the screen */ @@ -712,7 +712,7 @@ static void ltdc_area_test(void) /* Perform move */ - info("Perform move test\n"); + _info("Perform move test\n"); /* Set layer in the middle of the screen */ @@ -786,7 +786,7 @@ static void ltdc_area_test(void) /* Perform Reference position */ - info("Perform reference positioning test\n"); + _info("Perform reference positioning test\n"); /* Set layer in the middle of the screen */ @@ -862,12 +862,12 @@ static void ltdc_area_test(void) area.xres = sur->vinfo.xres; area.yres = sur->vinfo.yres; - info("Set area to xpos = %d, ypos = %d, xres = %d, yres = %d\n", + _info("Set area to xpos = %d, ypos = %d, xres = %d, yres = %d\n", area.xpos, area.ypos, area.xres, area.yres); sur->layer->setarea(sur->layer, &area, area.xpos, area.ypos); - info("Update the layer to fullscreen\n"); + _info("Update the layer to fullscreen\n"); sur->layer->update(sur->layer, LTDC_SYNC_VBLANK); @@ -893,7 +893,7 @@ static void ltdc_common_test(void) struct ltdc_area_s area; FAR struct surface *sur; - info("Set layer 2 to the active layer, blend with subjacent layer 1\n"); + _info("Set layer 2 to the active layer, blend with subjacent layer 1\n"); sur = ltdc_get_surface(LTDC_LAYER_TOP); @@ -905,7 +905,7 @@ static void ltdc_common_test(void) /* Perform area test */ - info("Perform area test\n"); + _info("Perform area test\n"); /* Set layer in the middle of the screen */ @@ -1026,7 +1026,7 @@ static void ltdc_common_test(void) /* Perform positioning test */ - info("Perform positioning test\n"); + _info("Perform positioning test\n"); /* Set layer in the middle of the screen */ @@ -1145,7 +1145,7 @@ static void ltdc_common_test(void) /* Perform Reference position */ - info("Perform reference positioning test\n"); + _info("Perform reference positioning test\n"); /* Set layer in the middle of the screen */ @@ -1271,7 +1271,7 @@ static void ltdc_common_test(void) area.xres = sur->vinfo.xres; area.yres = sur->vinfo.yres; - info("Set area to xpos = %d, ypos = %d, xres = %d, yres = %d\n", + _info("Set area to xpos = %d, ypos = %d, xres = %d, yres = %d\n", area.xpos, area.ypos, area.xres, area.yres); sur->layer->setarea(sur->layer, &area, area.xpos, area.ypos); @@ -1281,7 +1281,7 @@ static void ltdc_common_test(void) sur->layer->setcolorkey(sur->layer, 0); sur->layer->setblendmode(sur->layer, LTDC_BLEND_NONE); - info("Update the layer to fullscreen\n"); + _info("Update the layer to fullscreen\n"); sur->layer->update(sur->layer, LTDC_SYNC_VBLANK); @@ -1306,16 +1306,16 @@ static void ltdc_alpha_blend_test(void) /* Ensure operation on layer 2 */ - info("Set layer 2 to the active layer, blend with subjacent layer 1\n"); + _info("Set layer 2 to the active layer, blend with subjacent layer 1\n"); top = ltdc_get_surface(LTDC_LAYER_TOP); bottom = ltdc_get_surface(LTDC_LAYER_BOTTOM); - info("top = %p, bottom = %p\n", top->pinfo.fbmem, bottom->pinfo.fbmem); + _info("top = %p, bottom = %p\n", top->pinfo.fbmem, bottom->pinfo.fbmem); ltdc_simple_draw(&top->vinfo, &top->pinfo); - info("Fill layer1 with color black\n"); + _info("Fill layer1 with color black\n"); ltdc_drawcolor(&bottom->vinfo, bottom->pinfo.fbmem, bottom->vinfo.xres, bottom->vinfo.yres, @@ -1326,26 +1326,26 @@ static void ltdc_alpha_blend_test(void) area.xres = top->vinfo.xres/2; area.yres = top->vinfo.yres/2; - info("Set area to xpos = %d, ypos = %d, xres = %d, yres = %d\n", + _info("Set area to xpos = %d, ypos = %d, xres = %d, yres = %d\n", area.xpos, area.ypos, area.xres, area.yres); top->layer->setarea(top->layer, &area, area.xpos, area.ypos); - info("Set alpha blending with bottom layer1\n"); + _info("Set alpha blending with bottom layer1\n"); top->layer->setblendmode(top->layer, LTDC_BLEND_ALPHA); - info("Disable blending for bottom layer1 to make the layer color visible\n"); + _info("Disable blending for bottom layer1 to make the layer color visible\n"); bottom->layer->setblendmode(bottom->layer, LTDC_BLEND_NONE); bottom->layer->setalpha(bottom->layer, 0xff); - info("Fill bottom layer1 with color black\n"); + _info("Fill bottom layer1 with color black\n"); ltdc_drawcolor(&bottom->vinfo, bottom->pinfo.fbmem, bottom->vinfo.xres, bottom->vinfo.yres, ltdc_color(&bottom->vinfo, LTDC_BLACK)); - info("Blend in black subjacent layer\n"); + _info("Blend in black subjacent layer\n"); for (i = 255; i >= 0; i--) { @@ -1353,13 +1353,13 @@ static void ltdc_alpha_blend_test(void) top->layer->update(top->layer, LTDC_UPDATE_SIM|LTDC_SYNC_VBLANK); } - info("Fill bottom layer1 with color red\n"); + _info("Fill bottom layer1 with color red\n"); ltdc_drawcolor(&bottom->vinfo, bottom->pinfo.fbmem, bottom->vinfo.xres, bottom->vinfo.yres, ltdc_color(&bottom->vinfo, LTDC_RED)); - info("Blend in red subjacent layer\n"); + _info("Blend in red subjacent layer\n"); for (i = 255; i >= 0; i--) { @@ -1367,13 +1367,13 @@ static void ltdc_alpha_blend_test(void) top->layer->update(top->layer, LTDC_UPDATE_SIM|LTDC_SYNC_VBLANK); } - info("Fill bottom layer1 with color green\n"); + _info("Fill bottom layer1 with color green\n"); ltdc_drawcolor(&bottom->vinfo, bottom->pinfo.fbmem, bottom->vinfo.xres, bottom->vinfo.yres, ltdc_color(&bottom->vinfo, LTDC_GREEN)); - info("Blend in green subjacent layer\n"); + _info("Blend in green subjacent layer\n"); for (i = 255; i >= 0; i--) { @@ -1381,13 +1381,13 @@ static void ltdc_alpha_blend_test(void) top->layer->update(top->layer, LTDC_UPDATE_SIM|LTDC_SYNC_VBLANK); } - info("Fill bottom layer1 with color blue\n"); + _info("Fill bottom layer1 with color blue\n"); ltdc_drawcolor(&bottom->vinfo, bottom->pinfo.fbmem, bottom->vinfo.xres, bottom->vinfo.yres, ltdc_color(&bottom->vinfo, LTDC_BLUE)); - info("Blend in blue subjacent layer\n"); + _info("Blend in blue subjacent layer\n"); for (i = 255; i >= 0; i--) { @@ -1395,13 +1395,13 @@ static void ltdc_alpha_blend_test(void) top->layer->update(top->layer, LTDC_UPDATE_SIM|LTDC_SYNC_VBLANK); } - info("Fill bottom layer1 with color white\n"); + _info("Fill bottom layer1 with color white\n"); ltdc_drawcolor(&bottom->vinfo, bottom->pinfo.fbmem, bottom->vinfo.xres, bottom->vinfo.yres, ltdc_color(&bottom->vinfo, LTDC_WHITE)); - info("Blend in white subjacent layer\n"); + _info("Blend in white subjacent layer\n"); for (i = 255; i >= 0; i--) { @@ -1437,32 +1437,32 @@ static void ltdc_flip_test(void) /* Flip with non blend */ - info("Perform flip test without blending\n"); + _info("Perform flip test without blending\n"); - info("active->pinfo.fbmem = %p\n", active->pinfo.fbmem); - info("inactive->pinfo.fbmem = %p\n", inactive->pinfo.fbmem); + _info("active->pinfo.fbmem = %p\n", active->pinfo.fbmem); + _info("inactive->pinfo.fbmem = %p\n", inactive->pinfo.fbmem); - info("Ensure that both layer opaque\n"); + _info("Ensure that both layer opaque\n"); active->layer->setalpha(active->layer, 0xff); inactive->layer->setalpha(inactive->layer, 0xff); active->layer->setblendmode(active->layer, LTDC_BLEND_NONE); inactive->layer->setblendmode(inactive->layer, LTDC_BLEND_NONE); - info("Set the active layer to fullscreen black\n"); + _info("Set the active layer to fullscreen black\n"); ltdc_drawcolor(&active->vinfo, active->pinfo.fbmem, active->vinfo.xres, active->vinfo.yres, ltdc_color(&active->vinfo, LTDC_BLACK)); usleep(1000000); - info("Set invisible layer to fullscreen blue\n"); + _info("Set invisible layer to fullscreen blue\n"); ltdc_drawcolor(&inactive->vinfo, inactive->pinfo.fbmem, inactive->vinfo.xres, inactive->vinfo.yres, ltdc_color(&inactive->vinfo, LTDC_BLUE)); usleep(1000000); - info("Flip layer to see the blue fullscreen\n"); + _info("Flip layer to see the blue fullscreen\n"); inactive->layer->update(inactive->layer, LTDC_UPDATE_FLIP|LTDC_SYNC_VBLANK); @@ -1470,41 +1470,41 @@ static void ltdc_flip_test(void) /* Active layer is now inactive */ - info("Set invisible layer to fullscreen green\n"); + _info("Set invisible layer to fullscreen green\n"); ltdc_drawcolor(&active->vinfo, active->pinfo.fbmem, active->vinfo.xres, active->vinfo.yres, ltdc_color(&active->vinfo, LTDC_GREEN)); usleep(1000000); - info("Flip layer to see the green fullscreen\n"); + _info("Flip layer to see the green fullscreen\n"); inactive->layer->update(inactive->layer, LTDC_UPDATE_FLIP|LTDC_SYNC_VBLANK); usleep(1000000); - info("Set invisible layer to fullscreen red\n"); + _info("Set invisible layer to fullscreen red\n"); ltdc_drawcolor(&inactive->vinfo, inactive->pinfo.fbmem, inactive->vinfo.xres, inactive->vinfo.yres, ltdc_color(&inactive->vinfo, LTDC_RED)); usleep(1000000); - info("Flip layer to see the red fullscreen\n"); + _info("Flip layer to see the red fullscreen\n"); inactive->layer->update(inactive->layer, LTDC_UPDATE_FLIP|LTDC_SYNC_VBLANK); usleep(1000000); /* Flip with alpha blend */ - info("Perform flip test with alpha blending\n"); + _info("Perform flip test with alpha blending\n"); /* Set the bottom layer to the current active layer */ active = ltdc_get_surface(LTDC_LAYER_BOTTOM); inactive = ltdc_get_surface(LTDC_LAYER_TOP); - info("Ensure that both layer fullscreen black\n"); + _info("Ensure that both layer fullscreen black\n"); ltdc_drawcolor(&active->vinfo, active->pinfo.fbmem, active->vinfo.xres, active->vinfo.yres, ltdc_color(&active->vinfo, LTDC_BLACK)); @@ -1512,15 +1512,15 @@ static void ltdc_flip_test(void) inactive->vinfo.xres, inactive->vinfo.yres, ltdc_color(&inactive->vinfo, LTDC_BLACK)); - info("Ensure that both layer semitransparent\n"); + _info("Ensure that both layer semitransparent\n"); active->layer->setalpha(active->layer, 0x7f); inactive->layer->setalpha(inactive->layer, 0x7f); active->layer->setblendmode(active->layer, LTDC_BLEND_ALPHA); inactive->layer->setblendmode(inactive->layer, LTDC_BLEND_ALPHA); - info("Enter in the flip mode sequence\n"); - info("Set the bottom layer to the active layer\n"); - info("Also update both layer simultaneous\n"); + _info("Enter in the flip mode sequence\n"); + _info("Set the bottom layer to the active layer\n"); + _info("Also update both layer simultaneous\n"); active->layer->update(active->layer,LTDC_UPDATE_ACTIVATE| LTDC_UPDATE_SIM| LTDC_UPDATE_FLIP| @@ -1528,28 +1528,28 @@ static void ltdc_flip_test(void) usleep(1000000); - info("Set invisible layer to fullscreen blue\n"); + _info("Set invisible layer to fullscreen blue\n"); ltdc_drawcolor(&inactive->vinfo, inactive->pinfo.fbmem, inactive->vinfo.xres, inactive->vinfo.yres, ltdc_color(&inactive->vinfo, LTDC_BLUE)); usleep(1000000); - info("Flip layer to see the blue fullscreen\n"); + _info("Flip layer to see the blue fullscreen\n"); inactive->layer->update(active->layer, LTDC_UPDATE_FLIP|LTDC_SYNC_VBLANK); usleep(1000000); /* Active layer is top now */ - info("Set invisible layer to fullscreen green\n"); + _info("Set invisible layer to fullscreen green\n"); ltdc_drawcolor(&active->vinfo, active->pinfo.fbmem, active->vinfo.xres, active->vinfo.yres, ltdc_color(&active->vinfo, LTDC_GREEN)); usleep(1000000); - info("Flip layer to see the green fullscreen\n"); + _info("Flip layer to see the green fullscreen\n"); inactive->layer->update(active->layer, LTDC_UPDATE_FLIP|LTDC_SYNC_VBLANK); @@ -1557,32 +1557,32 @@ static void ltdc_flip_test(void) /* Active layer is bottom now */ - info("Set invisible layer to fullscreen red\n"); + _info("Set invisible layer to fullscreen red\n"); ltdc_drawcolor(&inactive->vinfo, inactive->pinfo.fbmem, inactive->vinfo.xres, inactive->vinfo.yres, ltdc_color(&inactive->vinfo, LTDC_RED)); usleep(1000000); - info("Flip layer to see the red fullscreen\n"); + _info("Flip layer to see the red fullscreen\n"); inactive->layer->update(active->layer, LTDC_UPDATE_FLIP|LTDC_SYNC_VBLANK); usleep(1000000); /* Active layer is top now */ - info("Set bottom layer back to fullscreen black\n"); + _info("Set bottom layer back to fullscreen black\n"); ltdc_drawcolor(&active->vinfo, active->pinfo.fbmem, active->vinfo.xres, active->vinfo.yres, ltdc_color(&active->vinfo, LTDC_BLACK)); - info("Set bottom layer to alpha %d and disable blend mode\n", 0xff); + _info("Set bottom layer to alpha %d and disable blend mode\n", 0xff); inactive->layer->setalpha(active->layer, 0xff); inactive->layer->setblendmode(active->layer, LTDC_BLEND_NONE); usleep(1000000); - info("Flip layer to see the black fullscreen\n"); + _info("Flip layer to see the black fullscreen\n"); inactive->layer->update(active->layer, LTDC_UPDATE_FLIP|LTDC_SYNC_VBLANK); @@ -1596,16 +1596,16 @@ static void ltdc_flip_test(void) /* Restore settings */ - info("Finally set the top layer back to fullscreen black\n"); + _info("Finally set the top layer back to fullscreen black\n"); ltdc_drawcolor(&inactive->vinfo, inactive->pinfo.fbmem, inactive->vinfo.xres, inactive->vinfo.yres, ltdc_color(&inactive->vinfo, LTDC_BLACK)); - info("Set top layer to alpha %d and disable blend mode\n", 0xff); + _info("Set top layer to alpha %d and disable blend mode\n", 0xff); inactive->layer->setalpha(inactive->layer, 0xff); inactive->layer->setblendmode(inactive->layer, LTDC_BLEND_NONE); - info("Flip to the top layer\n"); + _info("Flip to the top layer\n"); inactive->layer->update(inactive->layer, LTDC_UPDATE_ACTIVATE|LTDC_SYNC_VBLANK); @@ -1728,7 +1728,7 @@ FAR struct fb_cmap_s * ltdc_createcmap(uint16_t ncolors) if (!clut) { - _err("ERROR: malloc() failed\n"); + _err("ERROR: malloc() failed\n"); free(cmap); return NULL;; } @@ -1805,7 +1805,7 @@ uint32_t ltdc_color(FAR struct fb_videoinfo_s *vinfo, uint8_t color) break; #endif default: - _err("ERROR: Unsupported pixel format %d\n", vinfo->fmt); + _err("ERROR: Unsupported pixel format %d\n", vinfo->fmt); value = 0; break; } @@ -1828,8 +1828,8 @@ void ltdc_simple_draw(FAR struct fb_videoinfo_s *vinfo, uint16_t xres = vinfo->xres; uint16_t yres = vinfo->yres; - info("draw a red and green rectangle in the upper half\n"); - info("draw a white and blue rectangle in the lower half\n"); + _info("draw a red and green rectangle in the upper half\n"); + _info("draw a white and blue rectangle in the lower half\n"); #if defined(CONFIG_STM32_LTDC_L1_L8) || defined(CONFIG_STM32_LTDC_L2_L8) if (vinfo->fmt == FB_FMT_RGB8) @@ -1982,7 +1982,7 @@ void ltdc_drawcolor(FAR struct fb_videoinfo_s *vinfo, void *buffer, /* draw a blue rectangle */ - info("draw a full screen rectangle with color %08x\n", color); + _info("draw a full screen rectangle with color %08x\n", color); #if defined(CONFIG_STM32_LTDC_L1_L8) || defined(CONFIG_STM32_LTDC_L2_L8) if (vinfo->fmt == FB_FMT_RGB8) @@ -2059,13 +2059,13 @@ struct surface * ltdc_get_surface(uint32_t mode) if (ret != OK) { - _err("ERROR: getlid() failed\n"); + _err("ERROR: getlid() failed\n"); _exit(1); } if (lid < 0 || lid > 1) { - _err("ERROR: invalid layer id %d\n", lid); + _err("ERROR: invalid layer id %d\n", lid); _exit(1); } @@ -2086,7 +2086,7 @@ int ltdc_main(int argc, char *argv[]) if (up_fbinitialize(0) < 0) { - _err("ERROR: up_fbinitialize() failed\n"); + _err("ERROR: up_fbinitialize() failed\n"); return -1; } @@ -2094,23 +2094,23 @@ int ltdc_main(int argc, char *argv[]) if (!fbtable) { - _err("ERROR: up_fbgetvplane() failed\n"); + _err("ERROR: up_fbgetvplane() failed\n"); return -1; } if (fbtable->getvideoinfo(fbtable, &vinfo)<0) { - _err("ERROR: getvideoinfo failed\n"); + _err("ERROR: getvideoinfo failed\n"); return -1; } if (fbtable->getplaneinfo(fbtable, 0, &pinfo)<0) { - _err("ERROR: getplaneinfo failed\n"); + _err("ERROR: getplaneinfo failed\n"); return -1; } - info("fb is configured with: xres = %d, yres = %d, \ + _info("fb is configured with: xres = %d, yres = %d, \ fb start address = %p, fb size = %d, fmt = %d, bpp = %d\n", vinfo.xres, vinfo.yres, pinfo.fbmem, pinfo.fblen, vinfo.fmt, pinfo.bpp); @@ -2122,7 +2122,7 @@ int ltdc_main(int argc, char *argv[]) { if (fbtable->putcmap(fbtable, &g_cmap) != OK) { - _err("ERROR: putcmap() failed\n"); + _err("ERROR: putcmap() failed\n"); return -1; } } diff --git a/examples/nxflat/nxflat_main.c b/examples/nxflat/nxflat_main.c index b742959d5..b742fbd2a 100644 --- a/examples/nxflat/nxflat_main.c +++ b/examples/nxflat/nxflat_main.c @@ -102,16 +102,16 @@ #ifdef CONFIG_CPP_HAVE_VARARGS # ifdef CONFIG_DEBUG_FEATURES -# define message(format, ...) info(format, ##__VA_ARGS__) -# define errmsg(format, ...) _err(format, ##__VA_ARGS__) +# define message(format, ...) _info(format, ##__VA_ARGS__) +# define errmsg(format, ...) _err(format, ##__VA_ARGS__) # else # define message(format, ...) printf(format, ##__VA_ARGS__) # define errmsg(format, ...) fprintf(stderr, format, ##__VA_ARGS__) # endif #else # ifdef CONFIG_DEBUG_FEATURES -# define message info -# define errmsg _err +# define message _info +# define errmsg _err # else # define message printf # define errmsg printf diff --git a/examples/nxflat/tests/pthread/Makefile b/examples/nxflat/tests/pthread/Makefile index e16a8f623..663a46929 100644 --- a/examples/nxflat/tests/pthread/Makefile +++ b/examples/nxflat/tests/pthread/Makefile @@ -34,7 +34,7 @@ ############################################################################ -include $(TOPDIR)/.config # Current configuration --include $(TOPDIR)/Make.defs # Basic make info +-include $(TOPDIR)/Make.defs # Basic make _info BIN = pthread diff --git a/examples/pca9635/pca9635_main.c b/examples/pca9635/pca9635_main.c index c8bdf939b..42ab4d914 100644 --- a/examples/pca9635/pca9635_main.c +++ b/examples/pca9635/pca9635_main.c @@ -98,7 +98,7 @@ int pca9635_main(int argc, char *argv[]) ret = ioctl(fd, PWMIOC_SETLED_BRIGHTNESS, (unsigned long)&ledbright); if (ret < 0) { - _err("ERROR: ioctl(PWMIOC_SETLED_BRIGHTNESS) failed: %d\n", errno); + _err("ERROR: ioctl(PWMIOC_SETLED_BRIGHTNESS) failed: %d\n", errno); } } diff --git a/examples/posix_spawn/spawn_main.c b/examples/posix_spawn/spawn_main.c index 9212060f7..1fb341166 100644 --- a/examples/posix_spawn/spawn_main.c +++ b/examples/posix_spawn/spawn_main.c @@ -109,16 +109,16 @@ #ifdef CONFIG_CPP_HAVE_VARARGS # ifdef CONFIG_DEBUG_FEATURES -# define message(format, ...) info(format, ##__VA_ARGS__) -# define errmsg(format, ...) _err(format, ##__VA_ARGS__) +# define message(format, ...) _info(format, ##__VA_ARGS__) +# define errmsg(format, ...) _err(format, ##__VA_ARGS__) # else # define message(format, ...) printf(format, ##__VA_ARGS__) # define errmsg(format, ...) fprintf(stderr, format, ##__VA_ARGS__) # endif #else # ifdef CONFIG_DEBUG_FEATURES -# define message info -# define errmsg _err +# define message _info +# define errmsg _err # else # define message printf # define errmsg printf diff --git a/netutils/chat/chat.c b/netutils/chat/chat.c index c10873d78..c837ccaf5 100644 --- a/netutils/chat/chat.c +++ b/netutils/chat/chat.c @@ -155,14 +155,14 @@ static int chat_tokenise(FAR struct chat* priv, tok_pos = 0; - info("%s (%d)\n", tok->string, tok->no_termin); + _info("%s (%d)\n", tok->string, tok->no_termin); return 0; } /* Tokenizer start */ DEBUGASSERT(script != NULL); - info("%s\n", script); + _info("%s\n", script); while (!ret && *cursor != '\0') { @@ -279,7 +279,7 @@ static int chat_tokenise(FAR struct chat* priv, ret = tok_on_delimiter(); } - info("result %d\n", ret); + _info("result %d\n", ret); return ret; } @@ -297,7 +297,7 @@ static int chat_internalise(FAR struct chat* priv, while (tok && !ret) { DEBUGASSERT(tok->string); - info("(%c) %s\n", rhs ? 'R' : 'L', tok->string); + _info("(%c) %s\n", rhs ? 'R' : 'L', tok->string); if (!rhs) { @@ -406,7 +406,7 @@ static int chat_internalise(FAR struct chat* priv, ret = -ENODATA; } - info("result %d, rhs %d\n", ret, rhs); + _info("result %d, rhs %d\n", ret, rhs); return ret; } @@ -426,7 +426,7 @@ static void chat_tokens_free(FAR struct chat_token* first_tok) first_tok = next_tok; } - info("tokens freed\n"); + _info("tokens freed\n"); } /* Main parsing function. */ @@ -463,14 +463,14 @@ static int chat_readb(FAR struct chat* priv, FAR char* c, int timeout_ms) ret = poll(&fds, 1, timeout_ms); if (ret <= 0) { - info("poll timed out\n"); + _info("poll timed out\n"); return -ETIMEDOUT; } ret = read(priv->ctl.fd, c, 1); if (ret != 1) { - info("read failed\n"); + _info("read failed\n"); return -EPERM; } @@ -479,7 +479,7 @@ static int chat_readb(FAR struct chat* priv, FAR char* c, int timeout_ms) fputc(*c, stderr); } - info("read \'%c\' (0x%02X)\n", *c, *c); + _info("read \'%c\' (0x%02X)\n", *c, *c); return 0; } @@ -487,9 +487,9 @@ static void chat_flush(FAR struct chat* priv) { char c; - info("starting\n"); + _info("starting\n"); while (chat_readb(priv, (FAR char*) &c, 0) == 0); - info("done\n"); + _info("done\n"); } static int chat_expect(FAR struct chat* priv, FAR const char* s) @@ -541,7 +541,7 @@ static int chat_expect(FAR struct chat* priv, FAR const char* s) } } - info("result %d\n", ret); + _info("result %d\n", ret); return ret; } @@ -553,7 +553,7 @@ static int chat_send(FAR struct chat* priv, FAR const char* s) /* 'write' returns the number of successfully written characters */ ret = write(priv->ctl.fd, s, len); - info("wrote %d out of %d bytes of \'%s\'\n", ret, len, s); + _info("wrote %d out of %d bytes of \'%s\'\n", ret, len, s); if (ret > 0) { /* Just SUCCESS */ @@ -570,7 +570,7 @@ static int chat_line_run(FAR struct chat* priv, int ret = 0; int numarg; - info("type %d, rhs %s\n", line->type, line->rhs); + _info("type %d, rhs %s\n", line->type, line->rhs); switch (line->type) { @@ -617,11 +617,11 @@ static int chat_line_run(FAR struct chat* priv, numarg = atoi(line->rhs); if (numarg < 0) { - info("invalid timeout string %s\n", line->rhs); + _info("invalid timeout string %s\n", line->rhs); } else { - info("timeout is %d s\n", numarg); + _info("timeout is %d s\n", numarg); priv->ctl.timeout = numarg; } @@ -678,7 +678,7 @@ static int chat_script_run(FAR struct chat* priv) } } - info("Script result %d, exited on line %d\n", ret, line_num); + _info("Script result %d, exited on line %d\n", ret, line_num); return ret; } diff --git a/nshlib/nsh_console.c b/nshlib/nsh_console.c index e47bb2a2f..6d68e3acb 100644 --- a/nshlib/nsh_console.c +++ b/nshlib/nsh_console.c @@ -183,7 +183,7 @@ static ssize_t nsh_consolewrite(FAR struct nsh_vtbl_s *vtbl, ret = fwrite(buffer, 1, nbytes, pstate->cn_outstream); if (ret < 0) { - _err("ERROR: [%d] Failed to send buffer: %d\n", + _err("ERROR: [%d] Failed to send buffer: %d\n", pstate->cn_outfd, errno); } return ret; diff --git a/nshlib/nsh_fscmds.c b/nshlib/nsh_fscmds.c index b60e6a7e5..49ea07bfa 100644 --- a/nshlib/nsh_fscmds.c +++ b/nshlib/nsh_fscmds.c @@ -1293,7 +1293,7 @@ int cmd_mkrd(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) #ifdef CONFIG_DEBUG_INFO memset(buffer, 0, sectsize * nsectors); #endif - info("RAMDISK at %p\n", buffer); + _info("RAMDISK at %p\n", buffer); /* Then register the ramdisk */ diff --git a/nshlib/nsh_parse.c b/nshlib/nsh_parse.c index 2d5701728..9e2a09cd0 100644 --- a/nshlib/nsh_parse.c +++ b/nshlib/nsh_parse.c @@ -363,7 +363,7 @@ static pthread_addr_t nsh_child(pthread_addr_t arg) struct cmdarg_s *carg = (struct cmdarg_s *)arg; int ret; - info("BG %s\n", carg->argv[0]); + _info("BG %s\n", carg->argv[0]); /* Execute the specified command on the child thread */ @@ -371,7 +371,7 @@ static pthread_addr_t nsh_child(pthread_addr_t arg) /* Released the cloned arguments */ - info("BG %s complete\n", carg->argv[0]); + _info("BG %s complete\n", carg->argv[0]); nsh_releaseargs(carg); return (pthread_addr_t)((uintptr_t)ret); } diff --git a/nshlib/nsh_telnetd.c b/nshlib/nsh_telnetd.c index 3972c3c80..5746008db 100644 --- a/nshlib/nsh_telnetd.c +++ b/nshlib/nsh_telnetd.c @@ -67,7 +67,7 @@ static int nsh_telnetmain(int argc, char *argv[]) DEBUGASSERT(pstate != NULL); vtbl = &pstate->cn_vtbl; - info("Session [%d] Started\n", getpid()); + _info("Session [%d] Started\n", getpid()); #ifdef CONFIG_NSH_TELNET_LOGIN /* Login User and Password Check */ @@ -201,11 +201,11 @@ int nsh_telnetstart(void) /* Start the telnet daemon */ - info("Starting the Telnet daemon\n"); + _info("Starting the Telnet daemon\n"); ret = telnetd_start(&config); if (ret < 0) { - _err("ERROR: Failed to tart the Telnet daemon: %d\n", ret); + _err("ERROR: Failed to tart the Telnet daemon: %d\n", ret); } return ret; diff --git a/platform/arduino-due/sam_cxxinitialize.c b/platform/arduino-due/sam_cxxinitialize.c index db73f5b5c..0342c03f7 100644 --- a/platform/arduino-due/sam_cxxinitialize.c +++ b/platform/arduino-due/sam_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/cloudctrl/stm32_cxxinitialize.c b/platform/cloudctrl/stm32_cxxinitialize.c index 4f65d0803..e34c8aeec 100644 --- a/platform/cloudctrl/stm32_cxxinitialize.c +++ b/platform/cloudctrl/stm32_cxxinitialize.c @@ -55,7 +55,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/fire-stm32v2/stm32_cxxinitialize.c b/platform/fire-stm32v2/stm32_cxxinitialize.c index c4c525f77..31f334f10 100644 --- a/platform/fire-stm32v2/stm32_cxxinitialize.c +++ b/platform/fire-stm32v2/stm32_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/mikroe-stm32f4/stm32_cxxinitialize.c b/platform/mikroe-stm32f4/stm32_cxxinitialize.c index 44d05ef15..1b4bd9be7 100644 --- a/platform/mikroe-stm32f4/stm32_cxxinitialize.c +++ b/platform/mikroe-stm32f4/stm32_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/nucleo-144/stm32_cxxinitialize.c b/platform/nucleo-144/stm32_cxxinitialize.c index 30bc36b1b..8a60c2cb0 100644 --- a/platform/nucleo-144/stm32_cxxinitialize.c +++ b/platform/nucleo-144/stm32_cxxinitialize.c @@ -55,7 +55,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/nucleo-f303re/stm32_cxxinitialize.c b/platform/nucleo-f303re/stm32_cxxinitialize.c index fb9bc1142..f414f3c45 100644 --- a/platform/nucleo-f303re/stm32_cxxinitialize.c +++ b/platform/nucleo-f303re/stm32_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/nucleo-f4x1re/stm32_cxxinitialize.c b/platform/nucleo-f4x1re/stm32_cxxinitialize.c index b0667f577..292f708c0 100644 --- a/platform/nucleo-f4x1re/stm32_cxxinitialize.c +++ b/platform/nucleo-f4x1re/stm32_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/nucleo-l476rg/stm32_cxxinitialize.c b/platform/nucleo-l476rg/stm32_cxxinitialize.c index 4730302fc..2dd722ba4 100644 --- a/platform/nucleo-l476rg/stm32_cxxinitialize.c +++ b/platform/nucleo-l476rg/stm32_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/olimex-stm32-h405/stm32_cxxinitialize.c b/platform/olimex-stm32-h405/stm32_cxxinitialize.c index a6ccc64ae..634c80ccc 100644 --- a/platform/olimex-stm32-h405/stm32_cxxinitialize.c +++ b/platform/olimex-stm32-h405/stm32_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/olimex-stm32-h407/stm32_cxxinitialize.c b/platform/olimex-stm32-h407/stm32_cxxinitialize.c index c65073a17..a81ede5fb 100644 --- a/platform/olimex-stm32-h407/stm32_cxxinitialize.c +++ b/platform/olimex-stm32-h407/stm32_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/olimex-stm32-p207/stm32_cxxinitialize.c b/platform/olimex-stm32-p207/stm32_cxxinitialize.c index 521739eec..b60195f8d 100644 --- a/platform/olimex-stm32-p207/stm32_cxxinitialize.c +++ b/platform/olimex-stm32-p207/stm32_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/olimexino-stm32/stm32_cxxinitialize.c b/platform/olimexino-stm32/stm32_cxxinitialize.c index f634fdadf..00d3114d3 100644 --- a/platform/olimexino-stm32/stm32_cxxinitialize.c +++ b/platform/olimexino-stm32/stm32_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/pcduino-a10/a1x_cxxinitialize.c b/platform/pcduino-a10/a1x_cxxinitialize.c index bfdd3b4d4..47d4ce1f6 100644 --- a/platform/pcduino-a10/a1x_cxxinitialize.c +++ b/platform/pcduino-a10/a1x_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/sabre-6quad/imx_cxxinitialize.c b/platform/sabre-6quad/imx_cxxinitialize.c index fe5e5d465..cd21604de 100644 --- a/platform/sabre-6quad/imx_cxxinitialize.c +++ b/platform/sabre-6quad/imx_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/sam3u-ek/sam_cxxinitialized.c b/platform/sam3u-ek/sam_cxxinitialized.c index c95a03efa..facb7cb36 100644 --- a/platform/sam3u-ek/sam_cxxinitialized.c +++ b/platform/sam3u-ek/sam_cxxinitialized.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/sam4e-ek/sam_cxxinitialize.c b/platform/sam4e-ek/sam_cxxinitialize.c index 516c7e07f..36898f6e7 100644 --- a/platform/sam4e-ek/sam_cxxinitialize.c +++ b/platform/sam4e-ek/sam_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/sam4l-xplained/sam_cxxinitialize.c b/platform/sam4l-xplained/sam_cxxinitialize.c index e0dff6945..7d5efaaec 100644 --- a/platform/sam4l-xplained/sam_cxxinitialize.c +++ b/platform/sam4l-xplained/sam_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/sam4s-xplained-pro/sam_cxxinitialize.c b/platform/sam4s-xplained-pro/sam_cxxinitialize.c index e1182d21f..8a1b6921e 100644 --- a/platform/sam4s-xplained-pro/sam_cxxinitialize.c +++ b/platform/sam4s-xplained-pro/sam_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/sam4s-xplained/sam_cxxinitialize.c b/platform/sam4s-xplained/sam_cxxinitialize.c index e68182e13..90abcb81f 100644 --- a/platform/sam4s-xplained/sam_cxxinitialize.c +++ b/platform/sam4s-xplained/sam_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/sama5d2-xult/sam_cxxinitialize.c b/platform/sama5d2-xult/sam_cxxinitialize.c index 00d28a083..0b61505ea 100644 --- a/platform/sama5d2-xult/sam_cxxinitialize.c +++ b/platform/sama5d2-xult/sam_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/sama5d3-xplained/sam_cxxinitialize.c b/platform/sama5d3-xplained/sam_cxxinitialize.c index fb13d3eaf..686892046 100644 --- a/platform/sama5d3-xplained/sam_cxxinitialize.c +++ b/platform/sama5d3-xplained/sam_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/sama5d3x-ek/sam_cxxinitialize.c b/platform/sama5d3x-ek/sam_cxxinitialize.c index 03f9d5f56..359013ad7 100644 --- a/platform/sama5d3x-ek/sam_cxxinitialize.c +++ b/platform/sama5d3x-ek/sam_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/sama5d4-ek/sam_cxxinitialize.c b/platform/sama5d4-ek/sam_cxxinitialize.c index c020f55fe..153d5086b 100644 --- a/platform/sama5d4-ek/sam_cxxinitialize.c +++ b/platform/sama5d4-ek/sam_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/samd20-xplained/sam_cxxinitialize.c b/platform/samd20-xplained/sam_cxxinitialize.c index b25e594f2..1ef302032 100644 --- a/platform/samd20-xplained/sam_cxxinitialize.c +++ b/platform/samd20-xplained/sam_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/samd21-xplained/sam_cxxinitialize.c b/platform/samd21-xplained/sam_cxxinitialize.c index 3766534f0..2bcda4ad8 100644 --- a/platform/samd21-xplained/sam_cxxinitialize.c +++ b/platform/samd21-xplained/sam_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/same70-xplained/sam_cxxinitialize.c b/platform/same70-xplained/sam_cxxinitialize.c index 06f2dd75b..e114dee46 100644 --- a/platform/same70-xplained/sam_cxxinitialize.c +++ b/platform/same70-xplained/sam_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/saml21-xplained/sam_cxxinitialize.c b/platform/saml21-xplained/sam_cxxinitialize.c index 126c9496b..14b597a71 100644 --- a/platform/saml21-xplained/sam_cxxinitialize.c +++ b/platform/saml21-xplained/sam_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/samv71-xult/sam_cxxinitialize.c b/platform/samv71-xult/sam_cxxinitialize.c index 40edce139..372c9106b 100644 --- a/platform/samv71-xult/sam_cxxinitialize.c +++ b/platform/samv71-xult/sam_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/shenzhou/stm32_cxxinitialize.c b/platform/shenzhou/stm32_cxxinitialize.c index 5bad27c7d..cc013c3e4 100644 --- a/platform/shenzhou/stm32_cxxinitialize.c +++ b/platform/shenzhou/stm32_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/spark/stm32_cxxinitialize.c b/platform/spark/stm32_cxxinitialize.c index f11ef6ed5..2f21a83f0 100644 --- a/platform/spark/stm32_cxxinitialize.c +++ b/platform/spark/stm32_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/stm3220g-eval/stm32_cxxinitialize.c b/platform/stm3220g-eval/stm32_cxxinitialize.c index 99c0eaaee..defc7cf11 100644 --- a/platform/stm3220g-eval/stm32_cxxinitialize.c +++ b/platform/stm3220g-eval/stm32_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/stm3240g-eval/stm32_cxxinitialize.c b/platform/stm3240g-eval/stm32_cxxinitialize.c index c03e76c20..179a96588 100644 --- a/platform/stm3240g-eval/stm32_cxxinitialize.c +++ b/platform/stm3240g-eval/stm32_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/stm32f3discovery/stm32_cxxinitialize.c b/platform/stm32f3discovery/stm32_cxxinitialize.c index c899d50be..f492a45aa 100644 --- a/platform/stm32f3discovery/stm32_cxxinitialize.c +++ b/platform/stm32f3discovery/stm32_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/stm32f429i-disco/stm32_cxxinitialize.c b/platform/stm32f429i-disco/stm32_cxxinitialize.c index bea0b04cd..c019c5547 100644 --- a/platform/stm32f429i-disco/stm32_cxxinitialize.c +++ b/platform/stm32f429i-disco/stm32_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/stm32f4discovery/stm32_cxxinitialize.c b/platform/stm32f4discovery/stm32_cxxinitialize.c index d3165aaba..05f598e9f 100644 --- a/platform/stm32f4discovery/stm32_cxxinitialize.c +++ b/platform/stm32f4discovery/stm32_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/stm32f746g-disco/stm32_cxxinitialize.c b/platform/stm32f746g-disco/stm32_cxxinitialize.c index 33eb1d3f1..70b88472d 100644 --- a/platform/stm32f746g-disco/stm32_cxxinitialize.c +++ b/platform/stm32f746g-disco/stm32_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/stm32l476vg-disco/stm32_cxxinitialize.c b/platform/stm32l476vg-disco/stm32_cxxinitialize.c index b438b564d..a6e649aa0 100644 --- a/platform/stm32l476vg-disco/stm32_cxxinitialize.c +++ b/platform/stm32l476vg-disco/stm32_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/stm32ldiscovery/stm32_cxxinitialize.c b/platform/stm32ldiscovery/stm32_cxxinitialize.c index 1e5313369..0383a5ba0 100644 --- a/platform/stm32ldiscovery/stm32_cxxinitialize.c +++ b/platform/stm32ldiscovery/stm32_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/teensy-lc/kl_cxxinitialize.c b/platform/teensy-lc/kl_cxxinitialize.c index 45fa933de..218b588b5 100644 --- a/platform/teensy-lc/kl_cxxinitialize.c +++ b/platform/teensy-lc/kl_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/platform/viewtool-stm32f107/stm32_cxxinitialize.c b/platform/viewtool-stm32f107/stm32_cxxinitialize.c index b92f9dfee..404bab80f 100644 --- a/platform/viewtool-stm32f107/stm32_cxxinitialize.c +++ b/platform/viewtool-stm32f107/stm32_cxxinitialize.c @@ -54,7 +54,7 @@ */ #ifdef CONFIG_DEBUG_CXX -# define cxxinfo info +# define cxxinfo _info #else # define cxxinfo(x...) #endif diff --git a/system/i2c/i2c_main.c b/system/i2c/i2c_main.c index 5fc238bf5..0d80d39f2 100644 --- a/system/i2c/i2c_main.c +++ b/system/i2c/i2c_main.c @@ -426,7 +426,7 @@ ssize_t i2ctool_write(FAR struct i2ctool_s *i2ctool, FAR const void *buffer, siz ret = fwrite(buffer, 1, nbytes, OUTSTREAM(i2ctool)); if (ret < 0) { - _err("ERROR: [%d] Failed to send buffer: %d\n", OUTFD(i2ctool), errno); + _err("ERROR: [%d] Failed to send buffer: %d\n", OUTFD(i2ctool), errno); } return ret; diff --git a/system/ubloxmodem/ubloxmodem_main.c b/system/ubloxmodem/ubloxmodem_main.c index 3598e7027..f9a897515 100644 --- a/system/ubloxmodem/ubloxmodem_main.c +++ b/system/ubloxmodem/ubloxmodem_main.c @@ -59,12 +59,12 @@ ****************************************************************************/ #ifdef CONFIG_MODEM_U_BLOX_DEBUG -# define m_err _err -# define m_warn llwarn -# define m_info info -# define m_llerr llerr -# define m_llwarn llwarn -# define m_llinfo llinfo +# define m_err _err +# define m_warn _llwarn +# define m_info _info +# define m_llerr _llerr +# define m_llwarn _llwarn +# define m_llinfo _llinfo #else # define m_err(x...) # define m_warn(x...) diff --git a/system/zmodem/zm_receive.c b/system/zmodem/zm_receive.c index 60378d456..32066eee6 100644 --- a/system/zmodem/zm_receive.c +++ b/system/zmodem/zm_receive.c @@ -839,7 +839,7 @@ static int zmr_filedata(FAR struct zm_state_s *pzm) * Timed out waiting: * * 1) In state ZMR_INITWAIT - Received ZSINIT, waiting for data, or - * 2) In state XMRS_FILENAME - Received ZFILE, waiting for file info + * 2) In state XMRS_FILENAME - Received ZFILE, waiting for file _info * ****************************************************************************/