diff --git a/Kconfig b/Kconfig index e14a7387cd..7e9ae4eed3 100644 --- a/Kconfig +++ b/Kconfig @@ -413,7 +413,7 @@ config DEBUG_ERROR bool "Enable Error Output" default n ---help--- - Enables output from err() statements. Errors are significant system + Enables output from [a-z]err() statements. Errors are significant system exceptions that require immediate attention. config DEBUG_WARN @@ -421,7 +421,7 @@ config DEBUG_WARN default n depends on DEBUG_ERROR ---help--- - Enables output from warn() statements. Warnings are considered to + Enables output from [a-z]warn() statements. Warnings are considered to be various unexpected conditions, potential errors or errors that will not have serious consequences. diff --git a/arch/arm/src/a1x/a1x_serial.c b/arch/arm/src/a1x/a1x_serial.c index 3ae955a99d..8c28eabb37 100644 --- a/arch/arm/src/a1x/a1x_serial.c +++ b/arch/arm/src/a1x/a1x_serial.c @@ -1156,7 +1156,7 @@ static int uart_interrupt(struct uart_dev_s *dev) /* Read the modem status register (MSR) to clear */ status = up_serialin(priv, A1X_UART_MSR_OFFSET); - info("MSR: %02x\n", status); + _info("MSR: %02x\n", status); break; } @@ -1167,7 +1167,7 @@ static int uart_interrupt(struct uart_dev_s *dev) /* Read the line status register (LSR) to clear */ status = up_serialin(priv, A1X_UART_LSR_OFFSET); - info("LSR: %02x\n", status); + _info("LSR: %02x\n", status); break; } @@ -1192,7 +1192,7 @@ static int uart_interrupt(struct uart_dev_s *dev) default: { - llerr("Unexpected IIR: %02x\n", status); + _llerr("Unexpected IIR: %02x\n", status); break; } } diff --git a/arch/arm/src/armv6-m/up_dumpnvic.c b/arch/arm/src/armv6-m/up_dumpnvic.c index a50d91aac0..ba4974a0ac 100644 --- a/arch/arm/src/armv6-m/up_dumpnvic.c +++ b/arch/arm/src/armv6-m/up_dumpnvic.c @@ -72,25 +72,25 @@ void up_dumpnvic(FAR const char *msg) flags = enter_critical_section(); - llinfo("NVIC: %s\n", msg); - llinfo(" ISER: %08x ICER: %08x ISPR: %08x ICPR: %08x\n", + _llinfo("NVIC: %s\n", msg); + _llinfo(" ISER: %08x ICER: %08x ISPR: %08x ICPR: %08x\n", getreg32(ARMV6M_NVIC_ISER), getreg32(ARMV6M_NVIC_ICER), getreg32(ARMV6M_NVIC_ISPR), getreg32(ARMV6M_NVIC_ICPR)); for (i = 0 ; i < 8; i += 4) { - llinfo(" IPR%d: %08x IPR%d: %08x IPR%d: %08x IPR%d: %08x\n", + _llinfo(" IPR%d: %08x IPR%d: %08x IPR%d: %08x IPR%d: %08x\n", i, getreg32(ARMV6M_NVIC_IPR(i)), i+1, getreg32(ARMV6M_NVIC_IPR(i+1)), i+2, getreg32(ARMV6M_NVIC_IPR(i+2)), i+3, getreg32(ARMV6M_NVIC_IPR(i+3))); } - llinfo("SYSCON:\n"); - llinfo(" CPUID: %08x ICSR: %08x AIRCR: %08x SCR: %08x\n", + _llinfo("SYSCON:\n"); + _llinfo(" CPUID: %08x ICSR: %08x AIRCR: %08x SCR: %08x\n", getreg32(ARMV6M_SYSCON_CPUID), getreg32(ARMV6M_SYSCON_ICSR), getreg32(ARMV6M_SYSCON_AIRCR), getreg32(ARMV6M_SYSCON_SCR)); - llinfo(" CCR: %08x SHPR2: %08x SHPR3: %08x\n", + _llinfo(" CCR: %08x SHPR2: %08x SHPR3: %08x\n", getreg32(ARMV6M_SYSCON_CCR), getreg32(ARMV6M_SYSCON_SHPR2), getreg32(ARMV6M_SYSCON_SHPR3)); diff --git a/arch/arm/src/armv6-m/up_hardfault.c b/arch/arm/src/armv6-m/up_hardfault.c index 873a76d972..ef5c59ba2e 100644 --- a/arch/arm/src/armv6-m/up_hardfault.c +++ b/arch/arm/src/armv6-m/up_hardfault.c @@ -55,25 +55,13 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_HARDFAULT -# define hferr(format, ...) llerr(format, ##__VA_ARGS__) +# define hferr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define hferr(x...) #endif #define INSN_SVC0 0xdf00 /* insn: svc 0 */ -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/**************************************************************************** - * Public Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ @@ -149,7 +137,7 @@ int up_hardfault(int irq, FAR void *context) #endif (void)up_irq_save(); - llerr("PANIC!!! Hard fault\n"); + _llerr("PANIC!!! Hard fault\n"); PANIC(); return OK; /* Won't get here */ } diff --git a/arch/arm/src/armv7-a/arm_cpustart.c b/arch/arm/src/armv7-a/arm_cpustart.c index 30653ed197..98aee251ab 100644 --- a/arch/arm/src/armv7-a/arm_cpustart.c +++ b/arch/arm/src/armv7-a/arm_cpustart.c @@ -64,19 +64,19 @@ static inline void arm_registerdump(FAR struct tcb_s *tcb) { int regndx; - llerr("CPU%d:\n", up_cpu_index()); + _llerr("CPU%d:\n", up_cpu_index()); /* Dump the startup registers */ for (regndx = REG_R0; regndx <= REG_R15; regndx += 8) { uint32_t *ptr = (uint32_t *)&tcb->xcp.regs[regndx]; - llerr("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", + _llerr("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", regndx, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7]); } - llerr("CPSR: %08x\n", tcb->xcp.regs[REG_CPSR]); + _llerr("CPSR: %08x\n", tcb->xcp.regs[REG_CPSR]); } #else # define arm_registerdump(tcb) diff --git a/arch/arm/src/armv7-a/arm_l2cc_pl310.c b/arch/arm/src/armv7-a/arm_l2cc_pl310.c index 1b88cca350..94a1a343dc 100644 --- a/arch/arm/src/armv7-a/arm_l2cc_pl310.c +++ b/arch/arm/src/armv7-a/arm_l2cc_pl310.c @@ -411,7 +411,7 @@ void up_l2ccinitialize(void) putreg32(L2CC_CR_L2CEN, L2CC_CR); } - llerr("(%d ways) * (%d bytes/way) = %d bytes\n", + _llerr("(%d ways) * (%d bytes/way) = %d bytes\n", PL310_NWAYS, PL310_WAYSIZE, PL310_CACHE_SIZE); } diff --git a/arch/arm/src/armv7-m/mpu.h b/arch/arm/src/armv7-m/mpu.h index 6f4617a670..3ff96371cb 100644 --- a/arch/arm/src/armv7-m/mpu.h +++ b/arch/arm/src/armv7-m/mpu.h @@ -222,7 +222,7 @@ static inline void mpu_showtype(void) #ifdef CONFIG_DEBUG_ERROR uint32_t regval = getreg32(MPU_TYPE); - err("%s MPU Regions: data=%d instr=%d\n", + _err("%s MPU Regions: data=%d instr=%d\n", (regval & MPU_TYPE_SEPARATE) != 0 ? "Separate" : "Unified", (regval & MPU_TYPE_DREGION_MASK) >> MPU_TYPE_DREGION_SHIFT, (regval & MPU_TYPE_IREGION_MASK) >> MPU_TYPE_IREGION_SHIFT); diff --git a/arch/arm/src/armv7-m/up_hardfault.c b/arch/arm/src/armv7-m/up_hardfault.c index b08466258f..225ca8337e 100644 --- a/arch/arm/src/armv7-m/up_hardfault.c +++ b/arch/arm/src/armv7-m/up_hardfault.c @@ -60,7 +60,7 @@ */ #ifdef CONFIG_DEBUG_HARDFAULT -# define hferr(format, ...) llerr(format, ##__VA_ARGS__) +# define hferr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define hferr(x...) #endif @@ -179,7 +179,7 @@ int up_hardfault(int irq, FAR void *context) #endif (void)up_irq_save(); - llerr("PANIC!!! Hard fault: %08x\n", getreg32(NVIC_HFAULTS)); + _llerr("PANIC!!! Hard fault: %08x\n", getreg32(NVIC_HFAULTS)); PANIC(); return OK; } diff --git a/arch/arm/src/armv7-m/up_memfault.c b/arch/arm/src/armv7-m/up_memfault.c index 629304d6d2..4359072e65 100644 --- a/arch/arm/src/armv7-m/up_memfault.c +++ b/arch/arm/src/armv7-m/up_memfault.c @@ -55,7 +55,7 @@ #undef DEBUG_MEMFAULTS /* Define to debug memory management faults */ #ifdef DEBUG_MEMFAULTS -# define mferr(format, ...) llerr(format, ##__VA_ARGS__) +# define mferr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define mferr(x...) #endif @@ -92,9 +92,9 @@ int up_memfault(int irq, FAR void *context) /* Dump some memory management fault info */ (void)up_irq_save(); - llerr("PANIC!!! Memory Management Fault:\n"); + _llerr("PANIC!!! Memory Management Fault:\n"); mferr(" IRQ: %d context: %p\n", irq, regs); - llerr(" CFAULTS: %08x MMFAR: %08x\n", + _llerr(" CFAULTS: %08x MMFAR: %08x\n", getreg32(NVIC_CFAULTS), getreg32(NVIC_MEMMANAGE_ADDR)); mferr(" BASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n", getbasepri(), getprimask(), getipsr(), getcontrol()); diff --git a/arch/arm/src/armv7-r/arm_assert.c b/arch/arm/src/armv7-r/arm_assert.c index 9218e4da8a..b6f6b23546 100644 --- a/arch/arm/src/armv7-r/arm_assert.c +++ b/arch/arm/src/armv7-r/arm_assert.c @@ -98,7 +98,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_base) for (stack = sp & ~0x1f; stack < stack_base; stack += 32) { uint32_t *ptr = (uint32_t *)stack; - llerr("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n", + _llerr("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n", stack, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7]); } @@ -117,11 +117,11 @@ static void up_taskdump(FAR struct tcb_s *tcb, FAR void *arg) /* Dump interesting properties of this task */ #if CONFIG_TASK_NAME_SIZE > 0 - llerr("%s: PID=%d Stack Used=%lu of %lu\n", + _llerr("%s: PID=%d Stack Used=%lu of %lu\n", tcb->name, tcb->pid, (unsigned long)up_check_tcbstack(tcb), (unsigned long)tcb->adj_stack_size); #else - llerr("PID: %d Stack Used=%lu of %lu\n", + _llerr("PID: %d Stack Used=%lu of %lu\n", tcb->pid, (unsigned long)up_check_tcbstack(tcb), (unsigned long)tcb->adj_stack_size); #endif @@ -161,12 +161,12 @@ static inline void up_registerdump(void) for (regs = REG_R0; regs <= REG_R15; regs += 8) { uint32_t *ptr = (uint32_t *)&CURRENT_REGS[regs]; - llerr("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", + _llerr("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", regs, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7]); } - llerr("CPSR: %08x\n", CURRENT_REGS[REG_CPSR]); + _llerr("CPSR: %08x\n", CURRENT_REGS[REG_CPSR]); } } #else @@ -230,7 +230,7 @@ static void up_dumpstate(void) ustacksize = (uint32_t)rtcb->adj_stack_size; } - llerr("Current sp: %08x\n", sp); + _llerr("Current sp: %08x\n", sp); #if CONFIG_ARCH_INTERRUPTSTACK > 3 /* Get the limits on the interrupt stack memory */ @@ -240,21 +240,21 @@ static void up_dumpstate(void) /* Show interrupt stack info */ - llerr("Interrupt stack:\n"); - llerr(" base: %08x\n", istackbase); - llerr(" size: %08x\n", istacksize); + _llerr("Interrupt stack:\n"); + _llerr(" base: %08x\n", istackbase); + _llerr(" size: %08x\n", istacksize); #ifdef CONFIG_STACK_COLORATION - llerr(" used: %08x\n", up_check_intstack()); + _llerr(" used: %08x\n", up_check_intstack()); #endif #endif /* Show user stack info */ - llerr("User stack:\n"); - llerr(" base: %08x\n", ustackbase); - llerr(" size: %08x\n", ustacksize); + _llerr("User stack:\n"); + _llerr(" base: %08x\n", ustackbase); + _llerr(" size: %08x\n", ustacksize); #ifdef CONFIG_STACK_COLORATION - llerr(" used: %08x\n", up_check_tcbstack(rtcb)); + _llerr(" used: %08x\n", up_check_tcbstack(rtcb)); #endif #ifdef CONFIG_ARCH_KERNEL_STACK @@ -264,9 +264,9 @@ static void up_dumpstate(void) { kstackbase = (uint32_t)rtcb->xcp.kstack + CONFIG_ARCH_KERNEL_STACKSIZE - 4; - llerr("Kernel stack:\n"); - llerr(" base: %08x\n", kstackbase); - llerr(" size: %08x\n", CONFIG_ARCH_KERNEL_STACKSIZE); + _llerr("Kernel stack:\n"); + _llerr(" base: %08x\n", kstackbase); + _llerr(" size: %08x\n", CONFIG_ARCH_KERNEL_STACKSIZE); } #endif @@ -277,7 +277,7 @@ static void up_dumpstate(void) { /* Yes.. dump the interrupt stack */ - llerr("Interrupt Stack\n", sp); + _llerr("Interrupt Stack\n", sp); up_stackdump(sp, istackbase); /* Extract the user stack pointer which should lie @@ -285,7 +285,7 @@ static void up_dumpstate(void) */ sp = g_intstackbase; - llerr("User sp: %08x\n", sp); + _llerr("User sp: %08x\n", sp); } #endif @@ -295,7 +295,7 @@ static void up_dumpstate(void) if (sp > ustackbase - ustacksize && sp < ustackbase) { - llerr("User Stack\n", sp); + _llerr("User Stack\n", sp); up_stackdump(sp, ustackbase); } @@ -306,7 +306,7 @@ static void up_dumpstate(void) if (sp >= (uint32_t)rtcb->xcp.kstack && sp < kstackbase) { - llerr("Kernel Stack\n", sp); + _llerr("Kernel Stack\n", sp); up_stackdump(sp, kstackbase); } #endif @@ -373,10 +373,10 @@ void up_assert(const uint8_t *filename, int lineno) board_autoled_on(LED_ASSERTION); #if CONFIG_TASK_NAME_SIZE > 0 - llerr("Assertion failed at file:%s line: %d task: %s\n", + _llerr("Assertion failed at file:%s line: %d task: %s\n", filename, lineno, rtcb->name); #else - llerr("Assertion failed at file:%s line: %d\n", + _llerr("Assertion failed at file:%s line: %d\n", filename, lineno); #endif up_dumpstate(); diff --git a/arch/arm/src/armv7-r/arm_l2cc_pl310.c b/arch/arm/src/armv7-r/arm_l2cc_pl310.c index e389c87e59..f606dadc8a 100644 --- a/arch/arm/src/armv7-r/arm_l2cc_pl310.c +++ b/arch/arm/src/armv7-r/arm_l2cc_pl310.c @@ -411,7 +411,7 @@ void up_l2ccinitialize(void) putreg32(L2CC_CR_L2CEN, L2CC_CR); } - llerr("(%d ways) * (%d bytes/way) = %d bytes\n", + _llerr("(%d ways) * (%d bytes/way) = %d bytes\n", PL310_NWAYS, PL310_WAYSIZE, PL310_CACHE_SIZE); } diff --git a/arch/arm/src/armv7-r/mpu.h b/arch/arm/src/armv7-r/mpu.h index 7428e9cac2..07b1969760 100644 --- a/arch/arm/src/armv7-r/mpu.h +++ b/arch/arm/src/armv7-r/mpu.h @@ -361,7 +361,7 @@ static inline void mpu_showtype(void) { #ifdef CONFIG_DEBUG_FEATURES uint32_t regval = mpu_get_mpuir(); - err("%s MPU Regions: data=%d instr=%d\n", + _err("%s MPU Regions: data=%d instr=%d\n", (regval & MPUIR_SEPARATE) != 0 ? "Separate" : "Unified", (regval & MPUIR_DREGION_MASK) >> MPUIR_DREGION_SHIFT, (regval & MPUIR_IREGION_MASK) >> MPUIR_IREGION_SHIFT); diff --git a/arch/arm/src/c5471/c5471_watchdog.c b/arch/arm/src/c5471/c5471_watchdog.c index 011357fb5c..51363ec8df 100644 --- a/arch/arm/src/c5471/c5471_watchdog.c +++ b/arch/arm/src/c5471/c5471_watchdog.c @@ -155,7 +155,7 @@ static inline unsigned int wdt_prescaletoptv(unsigned int prescale) } } - err("prescale=%d -> ptv=%d\n", prescale, ptv); + _err("prescale=%d -> ptv=%d\n", prescale, ptv); return ptv; } @@ -173,7 +173,7 @@ static int wdt_setusec(uint32_t usec) uint32_t divisor = 1; uint32_t mode; - err("usec=%d\n", usec); + _err("usec=%d\n", usec); /* Calculate a value of prescaler and divisor that will be able * to count to the usec. It may not be exact or the best @@ -186,7 +186,7 @@ static int wdt_setusec(uint32_t usec) do { divisor = (CLOCK_MHZx2 * usec) / (prescaler * 2); - err("divisor=0x%x prescaler=0x%x\n", divisor, prescaler); + _err("divisor=0x%x prescaler=0x%x\n", divisor, prescaler); if (divisor >= 0x10000) { @@ -194,7 +194,7 @@ static int wdt_setusec(uint32_t usec) { /* This is the max possible ~2.5 seconds. */ - err("prescaler=0x%x too big!\n", prescaler); + _err("prescaler=0x%x too big!\n", prescaler); return ERROR; } @@ -207,19 +207,19 @@ static int wdt_setusec(uint32_t usec) } while (divisor >= 0x10000); - err("prescaler=0x%x divisor=0x%x\n", prescaler, divisor); + _err("prescaler=0x%x divisor=0x%x\n", prescaler, divisor); mode = wdt_prescaletoptv(prescaler); mode &= ~C5471_TIMER_AUTORELOAD; /* One shot mode. */ mode |= divisor << 5; - err("mode=0x%x\n", mode); + _err("mode=0x%x\n", mode); c5471_wdt_cntl = mode; /* Now start the watchdog */ c5471_wdt_cntl |= C5471_TIMER_STARTBIT; - err("cntl_timer=0x%x\n", c5471_wdt_cntl); + _err("cntl_timer=0x%x\n", c5471_wdt_cntl); return 0; } @@ -234,17 +234,17 @@ static int wdt_setusec(uint32_t usec) static int wdt_interrupt(int irq, void *context) { - err("expired\n"); + _err("expired\n"); #if defined(CONFIG_SOFTWARE_REBOOT) # if defined(CONFIG_SOFTWARE_TEST) - err(" Test only\n"); + _err(" Test only\n"); # else - err(" Re-booting\n"); + _err(" Re-booting\n"); # warning "Add logic to reset CPU here" # endif #else - err(" No reboot\n"); + _err(" No reboot\n"); #endif return OK; } @@ -259,7 +259,7 @@ static ssize_t wdt_read(struct file *filep, char *buffer, size_t buflen) * not work if the user provides a buffer smaller than 18 bytes. */ - err("buflen=%d\n", buflen); + _err("buflen=%d\n", buflen); if (buflen >= 18) { sprintf(buffer, "%08x %08x\n", c5471_wdt_cntl, c5471_wdt_count); @@ -274,7 +274,7 @@ static ssize_t wdt_read(struct file *filep, char *buffer, size_t buflen) static ssize_t wdt_write(struct file *filep, const char *buffer, size_t buflen) { - err("buflen=%d\n", buflen); + _err("buflen=%d\n", buflen); if (buflen) { /* Reset the timer to the maximum delay */ @@ -292,7 +292,7 @@ static ssize_t wdt_write(struct file *filep, const char *buffer, size_t buflen) static int wdt_ioctl(FAR struct file *filep, int cmd, unsigned long arg) { - err("ioctl Call: cmd=0x%x arg=0x%x", cmd, arg); + _err("ioctl Call: cmd=0x%x arg=0x%x", cmd, arg); /* Process the IOCTL command (see arch/watchdog.h) */ @@ -315,7 +315,7 @@ static int wdt_ioctl(FAR struct file *filep, int cmd, unsigned long arg) static int wdt_open(struct file *filep) { - err(""); + _err(""); if (g_wdtopen) { @@ -339,7 +339,7 @@ static int wdt_open(struct file *filep) static int wdt_close(struct file *filep) { - err(""); + _err(""); /* The task controlling the watchdog has terminated. Take the timer * the @@ -367,7 +367,7 @@ int up_wdtinit(void) { int ret; - err("C547x Watchdog Driver\n"); + _err("C547x Watchdog Driver\n"); /* Register as /dev/wdt */ @@ -379,7 +379,7 @@ int up_wdtinit(void) /* Register for an interrupt level callback through wdt_interrupt */ - err("Attach to IRQ=%d\n", C5471_IRQ_WATCHDOG); + _err("Attach to IRQ=%d\n", C5471_IRQ_WATCHDOG); /* Make sure that the timer is stopped */ diff --git a/arch/arm/src/calypso/calypso_spi.c b/arch/arm/src/calypso/calypso_spi.c index fb5f871dfb..6278c32707 100644 --- a/arch/arm/src/calypso/calypso_spi.c +++ b/arch/arm/src/calypso/calypso_spi.c @@ -216,7 +216,7 @@ int spi_xfer(uint8_t dev_idx, uint8_t bitlen, const void *dout, void *din) tmp <<= (32-bitlen); /* align to MSB */ } - err("spi_xfer(dev_idx=%u, bitlen=%u, data_out=0x%08x): ", + _err("spi_xfer(dev_idx=%u, bitlen=%u, data_out=0x%08x): ", dev_idx, bitlen, tmp); /* fill transmit registers */ @@ -236,14 +236,14 @@ int spi_xfer(uint8_t dev_idx, uint8_t bitlen, const void *dout, void *din) } putreg16(reg_ctrl, SPI_REG(REG_CTRL)); - err("reg_ctrl=0x%04x ", reg_ctrl); + _err("reg_ctrl=0x%04x ", reg_ctrl); /* wait until the transfer is complete */ while (1) { reg_status = getreg16(SPI_REG(REG_STATUS)); - err("status=0x%04x ", reg_status); + _err("status=0x%04x ", reg_status); if (din && (reg_status & SPI_STATUS_RE)) { break; @@ -262,7 +262,7 @@ int spi_xfer(uint8_t dev_idx, uint8_t bitlen, const void *dout, void *din) { tmp = getreg16(SPI_REG(REG_RX_MSB)) << 16; tmp |= getreg16(SPI_REG(REG_RX_LSB)); - err("data_in=0x%08x ", tmp); + _err("data_in=0x%08x ", tmp); if (bitlen <= 8) { @@ -278,7 +278,7 @@ int spi_xfer(uint8_t dev_idx, uint8_t bitlen, const void *dout, void *din) } } - err("\n"); + _err("\n"); return 0; } diff --git a/arch/arm/src/calypso/calypso_uwire.c b/arch/arm/src/calypso/calypso_uwire.c index ee932b2924..7ad9075b1e 100644 --- a/arch/arm/src/calypso/calypso_uwire.c +++ b/arch/arm/src/calypso/calypso_uwire.c @@ -112,7 +112,7 @@ int uwire_xfer(int cs, int bitlen, const void *dout, void *din) /* FIXME uwire_init always selects CS0 for now */ - err("uwire_xfer(dev_idx=%u, bitlen=%u\n", cs, bitlen); + _err("uwire_xfer(dev_idx=%u, bitlen=%u\n", cs, bitlen); /* select the chip */ @@ -128,7 +128,7 @@ int uwire_xfer(int cs, int bitlen, const void *dout, void *din) tmp <<= 16 - bitlen; /* align to MSB */ putreg16(tmp, UWIRE_REG(REG_DATA)); - err(", data_out=0x%04hx", tmp); + _err(", data_out=0x%04hx", tmp); } tmp = (dout ? UWIRE_CSR_BITS_WR(bitlen) : 0) | @@ -142,7 +142,7 @@ int uwire_xfer(int cs, int bitlen, const void *dout, void *din) _uwire_wait(UWIRE_CSR_RDRB, UWIRE_CSR_RDRB); tmp = getreg16(UWIRE_REG(REG_DATA)); - err(", data_in=0x%08x", tmp); + _err(", data_in=0x%08x", tmp); if (bitlen <= 8) *(uint8_t *)din = tmp & 0xff; @@ -155,7 +155,7 @@ int uwire_xfer(int cs, int bitlen, const void *dout, void *din) putreg16(UWIRE_CSR_IDX(0) | 0, UWIRE_REG(REG_CSR)); _uwire_wait(UWIRE_CSR_CSRB, 0); - err(")\n"); + _err(")\n"); return 0; } diff --git a/arch/arm/src/common/up_initialize.c b/arch/arm/src/common/up_initialize.c index 6482a5fce2..5316eacbb6 100644 --- a/arch/arm/src/common/up_initialize.c +++ b/arch/arm/src/common/up_initialize.c @@ -77,13 +77,13 @@ static void up_calibratedelay(void) { int i; - llerr("Beginning 100s delay\n"); + _llerr("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } - llerr("End 100s delay\n"); + _llerr("End 100s delay\n"); } #else # define up_calibratedelay() diff --git a/arch/arm/src/dm320/dm320_usbdev.c b/arch/arm/src/dm320/dm320_usbdev.c index 7f3229b7fc..ad1641db1f 100644 --- a/arch/arm/src/dm320/dm320_usbdev.c +++ b/arch/arm/src/dm320/dm320_usbdev.c @@ -443,7 +443,7 @@ static uint8_t dm320_getreg8(uint32_t addr) { if (count == 4) { - llerr("...\n"); + _llerr("...\n"); } return val; @@ -460,7 +460,7 @@ static uint8_t dm320_getreg8(uint32_t addr) { /* Yes.. then show how many times the value repeated */ - llerr("[repeats %d more times]\n", count-3); + _llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -472,7 +472,7 @@ static uint8_t dm320_getreg8(uint32_t addr) /* Show the register value read */ - llerr("%08x->%02x\n", addr, val); + _llerr("%08x->%02x\n", addr, val); return val; } #endif @@ -506,7 +506,7 @@ static uint32_t dm320_getreg16(uint32_t addr) { if (count == 4) { - llerr("...\n"); + _llerr("...\n"); } return val; @@ -523,7 +523,7 @@ static uint32_t dm320_getreg16(uint32_t addr) { /* Yes.. then show how many times the value repeated */ - llerr("[repeats %d more times]\n", count-3); + _llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -535,7 +535,7 @@ static uint32_t dm320_getreg16(uint32_t addr) /* Show the register value read */ - llerr("%08x->%04x\n", addr, val); + _llerr("%08x->%04x\n", addr, val); return val; } #endif @@ -569,7 +569,7 @@ static uint32_t dm320_getreg32(uint32_t addr) { if (count == 4) { - llerr("...\n"); + _llerr("...\n"); } return val; @@ -586,7 +586,7 @@ static uint32_t dm320_getreg32(uint32_t addr) { /* Yes.. then show how many times the value repeated */ - llerr("[repeats %d more times]\n", count-3); + _llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -598,7 +598,7 @@ static uint32_t dm320_getreg32(uint32_t addr) /* Show the register value read */ - llerr("%08x->%08x\n", addr, val); + _llerr("%08x->%08x\n", addr, val); return val; } #endif @@ -616,7 +616,7 @@ static void dm320_putreg8(uint8_t val, uint32_t addr) { /* Show the register value being written */ - llerr("%08x<-%02x\n", addr, val); + _llerr("%08x<-%02x\n", addr, val); /* Write the value */ @@ -637,7 +637,7 @@ static void dm320_putreg16(uint16_t val, uint32_t addr) { /* Show the register value being written */ - llerr("%08x<-%04x\n", addr, val); + _llerr("%08x<-%04x\n", addr, val); /* Write the value */ @@ -658,7 +658,7 @@ static void dm320_putreg32(uint32_t val, uint32_t addr) { /* Show the register value being written */ - llerr("%08x<-%08x\n", addr, val); + _llerr("%08x<-%08x\n", addr, val); /* Write the value */ diff --git a/arch/arm/src/efm32/efm32_idle.c b/arch/arm/src/efm32/efm32_idle.c index 5d42299d70..b5a2278a1a 100644 --- a/arch/arm/src/efm32/efm32_idle.c +++ b/arch/arm/src/efm32/efm32_idle.c @@ -110,7 +110,7 @@ static void up_idlepm(void) /* Perform board-specific, state-dependent logic here */ - llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); + _llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); /* Then force the global state change */ diff --git a/arch/arm/src/efm32/efm32_irq.c b/arch/arm/src/efm32/efm32_irq.c index 74a5385f47..05d28c74a4 100644 --- a/arch/arm/src/efm32/efm32_irq.c +++ b/arch/arm/src/efm32/efm32_irq.c @@ -170,7 +170,7 @@ static void efm32_dumpnvic(const char *msg, int irq) static int efm32_nmi(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! NMI received\n"); + _err("PANIC!!! NMI received\n"); PANIC(); return 0; } @@ -178,7 +178,7 @@ static int efm32_nmi(int irq, FAR void *context) static int efm32_busfault(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS)); + _err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS)); PANIC(); return 0; } @@ -186,7 +186,7 @@ static int efm32_busfault(int irq, FAR void *context) static int efm32_usagefault(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS)); + _err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS)); PANIC(); return 0; } @@ -194,7 +194,7 @@ static int efm32_usagefault(int irq, FAR void *context) static int efm32_pendsv(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! PendSV received\n"); + _err("PANIC!!! PendSV received\n"); PANIC(); return 0; } @@ -202,7 +202,7 @@ static int efm32_pendsv(int irq, FAR void *context) static int efm32_errmonitor(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Debug Monitor received\n"); + _err("PANIC!!! Debug Monitor received\n"); PANIC(); return 0; } @@ -210,7 +210,7 @@ static int efm32_errmonitor(int irq, FAR void *context) static int efm32_reserved(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Reserved interrupt\n"); + _err("PANIC!!! Reserved interrupt\n"); PANIC(); return 0; } diff --git a/arch/arm/src/efm32/efm32_leserial.c b/arch/arm/src/efm32/efm32_leserial.c index 63fbd5f8cd..02126a92f3 100644 --- a/arch/arm/src/efm32/efm32_leserial.c +++ b/arch/arm/src/efm32/efm32_leserial.c @@ -518,7 +518,7 @@ static int efm32_interrupt(struct uart_dev_s *dev) * FERR - Framing Error Interrupt Enable */ - llerr("RX ERROR: %08x\n", intflags); + _llerr("RX ERROR: %08x\n", intflags); } /* Check for transmit errors */ @@ -527,7 +527,7 @@ static int efm32_interrupt(struct uart_dev_s *dev) { /* TXOF - TX Overflow Interrupt Enable */ - llerr("RX ERROR: %08x\n", intflags); + _llerr("RX ERROR: %08x\n", intflags); } #endif diff --git a/arch/arm/src/efm32/efm32_rmu.h b/arch/arm/src/efm32/efm32_rmu.h index d633c9f73c..215f0c85e8 100644 --- a/arch/arm/src/efm32/efm32_rmu.h +++ b/arch/arm/src/efm32/efm32_rmu.h @@ -56,9 +56,9 @@ #endif #ifdef CONFIG_EFM32_RMU_DEBUG -# define rmuerr llerr +# define rmuerr _llerr # ifdef CONFIG_DEBUG_INFO -# define rmuinfo llerr +# define rmuinfo _llerr # else # define rmuinfo(x...) # endif diff --git a/arch/arm/src/efm32/efm32_serial.c b/arch/arm/src/efm32/efm32_serial.c index 762da175a9..ff8c0f7dac 100644 --- a/arch/arm/src/efm32/efm32_serial.c +++ b/arch/arm/src/efm32/efm32_serial.c @@ -780,7 +780,7 @@ static int efm32_rxinterrupt(struct uart_dev_s *dev) * FERR - Framing Error Interrupt Enable */ - llerr("RX ERROR: %08x\n", intflags); + _llerr("RX ERROR: %08x\n", intflags); } #endif @@ -863,7 +863,7 @@ static int efm32_txinterrupt(struct uart_dev_s *dev) { /* TXOF - TX Overflow Interrupt Enable */ - llerr("RX ERROR: %08x\n", intflags); + _llerr("RX ERROR: %08x\n", intflags); } #endif diff --git a/arch/arm/src/efm32/efm32_usbdev.c b/arch/arm/src/efm32/efm32_usbdev.c index a6f4c7362c..207cce2e94 100644 --- a/arch/arm/src/efm32/efm32_usbdev.c +++ b/arch/arm/src/efm32/efm32_usbdev.c @@ -815,7 +815,7 @@ static uint32_t efm32_getreg(uint32_t addr) { if (count == 4) { - llerr("...\n"); + _llerr("...\n"); } return val; @@ -832,7 +832,7 @@ static uint32_t efm32_getreg(uint32_t addr) { /* Yes.. then show how many times the value repeated */ - llerr("[repeats %d more times]\n", count-3); + _llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -844,7 +844,7 @@ static uint32_t efm32_getreg(uint32_t addr) /* Show the register value read */ - llerr("%08x->%08x\n", addr, val); + _llerr("%08x->%08x\n", addr, val); return val; } #endif @@ -862,7 +862,7 @@ static void efm32_putreg(uint32_t val, uint32_t addr) { /* Show the register value being written */ - llerr("%08x<-%08x\n", addr, val); + _llerr("%08x<-%08x\n", addr, val); /* Write the value */ diff --git a/arch/arm/src/efm32/efm32_usbhost.c b/arch/arm/src/efm32/efm32_usbhost.c index 55786d14e0..ccfd96e34b 100644 --- a/arch/arm/src/efm32/efm32_usbhost.c +++ b/arch/arm/src/efm32/efm32_usbhost.c @@ -582,7 +582,7 @@ static const struct efm32_usbhost_trace_s g_trace2[TRACE2_NSTRINGS] = #ifdef CONFIG_EFM32_USBHOST_REGDEBUG static void efm32_printreg(uint32_t addr, uint32_t val, bool iswrite) { - llerr("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val); + _llerr("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val); } #endif @@ -632,7 +632,7 @@ static void efm32_checkreg(uint32_t addr, uint32_t val, bool iswrite) { /* No.. More than one. */ - llerr("[repeats %d more times]\n", count); + _llerr("[repeats %d more times]\n", count); } } diff --git a/arch/arm/src/kinetis/kinetis_irq.c b/arch/arm/src/kinetis/kinetis_irq.c index a7a5cab620..2ce3d373a9 100644 --- a/arch/arm/src/kinetis/kinetis_irq.c +++ b/arch/arm/src/kinetis/kinetis_irq.c @@ -173,7 +173,7 @@ static void kinetis_dumpnvic(const char *msg, int irq) static int kinetis_nmi(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! NMI received\n"); + _err("PANIC!!! NMI received\n"); PANIC(); return 0; } @@ -181,7 +181,7 @@ static int kinetis_nmi(int irq, FAR void *context) static int kinetis_busfault(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Bus fault recived\n"); + _err("PANIC!!! Bus fault recived\n"); PANIC(); return 0; } @@ -189,7 +189,7 @@ static int kinetis_busfault(int irq, FAR void *context) static int kinetis_usagefault(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Usage fault received\n"); + _err("PANIC!!! Usage fault received\n"); PANIC(); return 0; } @@ -197,7 +197,7 @@ static int kinetis_usagefault(int irq, FAR void *context) static int kinetis_pendsv(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! PendSV received\n"); + _err("PANIC!!! PendSV received\n"); PANIC(); return 0; } @@ -205,7 +205,7 @@ static int kinetis_pendsv(int irq, FAR void *context) static int kinetis_errmonitor(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Debug Monitor received\n"); + _err("PANIC!!! Debug Monitor received\n"); PANIC(); return 0; } @@ -213,7 +213,7 @@ static int kinetis_errmonitor(int irq, FAR void *context) static int kinetis_reserved(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Reserved interrupt\n"); + _err("PANIC!!! Reserved interrupt\n"); PANIC(); return 0; } diff --git a/arch/arm/src/kinetis/kinetis_serial.c b/arch/arm/src/kinetis/kinetis_serial.c index 3b169232a9..084204daa9 100644 --- a/arch/arm/src/kinetis/kinetis_serial.c +++ b/arch/arm/src/kinetis/kinetis_serial.c @@ -805,7 +805,7 @@ static int up_interrupt(int irq, void *context) */ regval = up_serialin(priv, KINETIS_UART_S1_OFFSET); - llerr("S1: %02x\n", regval); + _llerr("S1: %02x\n", regval); UNUSED(regval); regval = up_serialin(priv, KINETIS_UART_D_OFFSET); diff --git a/arch/arm/src/kinetis/kinetis_start.c b/arch/arm/src/kinetis/kinetis_start.c index 4b0451acf8..6744012f07 100644 --- a/arch/arm/src/kinetis/kinetis_start.c +++ b/arch/arm/src/kinetis/kinetis_start.c @@ -156,7 +156,7 @@ void __start(void) /* Show reset status */ - err("Reset status: %02x:%02x\n", + _err("Reset status: %02x:%02x\n", getreg8(KINETIS_SMC_SRSH), getreg8(KINETIS_SMC_SRSL)); /* Then start NuttX */ diff --git a/arch/arm/src/kinetis/kinetis_usbdev.c b/arch/arm/src/kinetis/kinetis_usbdev.c index dee28aed0a..406880cb2a 100644 --- a/arch/arm/src/kinetis/kinetis_usbdev.c +++ b/arch/arm/src/kinetis/kinetis_usbdev.c @@ -369,9 +369,9 @@ const struct trace_msg_t g_usb_trace_strings_deverror[] = # undef CONFIG_KHCI_USBDEV_BDTDEBUG # define CONFIG_KHCI_USBDEV_BDTDEBUG 1 -# define regerr llerr +# define regerr _llerr # ifdef CONFIG_DEBUG_INFO -# define reginfo llerr +# define reginfo _llerr # else # define reginfo(x...) # endif @@ -389,9 +389,9 @@ const struct trace_msg_t g_usb_trace_strings_deverror[] = #ifdef CONFIG_KHCI_USBDEV_BDTDEBUG -# define bdterr llerr +# define bdterr _llerr # ifdef CONFIG_DEBUG_INFO -# define bdtinfo llerr +# define bdtinfo _llerr # else # define bdtinfo(x...) # endif @@ -714,7 +714,7 @@ static uint16_t khci_getreg(uint32_t addr) { if (count == 4) { - llerr("...\n"); + _llerr("...\n"); } return val; } @@ -730,7 +730,7 @@ static uint16_t khci_getreg(uint32_t addr) { /* Yes.. then show how many times the value repeated */ - llerr("[repeats %d more times]\n", count-3); + _llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -742,7 +742,7 @@ static uint16_t khci_getreg(uint32_t addr) /* Show the register value read */ - llerr("%08x->%04x\n", addr, val); + _llerr("%08x->%04x\n", addr, val); return val; } #endif @@ -756,7 +756,7 @@ static void khci_putreg(uint32_t val, uint32_t addr) { /* Show the register value being written */ - llerr("%08x<-%04x\n", addr, val); + _llerr("%08x<-%04x\n", addr, val); /* Write the value */ diff --git a/arch/arm/src/kl/kl_dumpgpio.c b/arch/arm/src/kl/kl_dumpgpio.c index 60eea46009..8ca8e15002 100644 --- a/arch/arm/src/kl/kl_dumpgpio.c +++ b/arch/arm/src/kl/kl_dumpgpio.c @@ -118,9 +118,9 @@ void kl_dumpgpio(gpio_cfgset_t pinset, const char *msg) flags = enter_critical_section(); - llinfo("GPIO%c pinset: %08x base: %08x -- %s\n", + _llinfo("GPIO%c pinset: %08x base: %08x -- %s\n", g_portchar[port], pinset, base, msg); - llinfo(" PDOR: %08x PDIR: %08x PDDR: %08x\n", + _llinfo(" PDOR: %08x PDIR: %08x PDDR: %08x\n", getreg32(base + KL_GPIO_PDOR_OFFSET), getreg32(base + KL_GPIO_PDIR_OFFSET), getreg32(base + KL_GPIO_PDDR_OFFSET)); diff --git a/arch/arm/src/kl/kl_idle.c b/arch/arm/src/kl/kl_idle.c index b8a51b04da..1122cf4391 100644 --- a/arch/arm/src/kl/kl_idle.c +++ b/arch/arm/src/kl/kl_idle.c @@ -103,7 +103,7 @@ static void up_idlepm(void) /* Perform board-specific, state-dependent logic here */ - llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); + _llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); /* Then force the global state change */ diff --git a/arch/arm/src/kl/kl_irq.c b/arch/arm/src/kl/kl_irq.c index 100b91edba..c76a07ed25 100644 --- a/arch/arm/src/kl/kl_irq.c +++ b/arch/arm/src/kl/kl_irq.c @@ -141,7 +141,7 @@ static void kl_dumpnvic(const char *msg, int irq) static int kl_nmi(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! NMI received\n"); + _err("PANIC!!! NMI received\n"); PANIC(); return 0; } @@ -149,7 +149,7 @@ static int kl_nmi(int irq, FAR void *context) static int kl_pendsv(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! PendSV received\n"); + _err("PANIC!!! PendSV received\n"); PANIC(); return 0; } @@ -157,7 +157,7 @@ static int kl_pendsv(int irq, FAR void *context) static int kl_reserved(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Reserved interrupt\n"); + _err("PANIC!!! Reserved interrupt\n"); PANIC(); return 0; } diff --git a/arch/arm/src/lpc11xx/lpc11_i2c.c b/arch/arm/src/lpc11xx/lpc11_i2c.c index 6d4c60f852..46011f7508 100644 --- a/arch/arm/src/lpc11xx/lpc11_i2c.c +++ b/arch/arm/src/lpc11xx/lpc11_i2c.c @@ -485,7 +485,7 @@ struct i2c_master_s *lpc11_i2cbus_initialize(int port) if (port > 1) { - err("lpc I2C Only support 0,1\n"); + _err("lpc I2C Only support 0,1\n"); return NULL; } diff --git a/arch/arm/src/lpc11xx/lpc11_irq.c b/arch/arm/src/lpc11xx/lpc11_irq.c index 793463eb5f..d907b7d4ae 100644 --- a/arch/arm/src/lpc11xx/lpc11_irq.c +++ b/arch/arm/src/lpc11xx/lpc11_irq.c @@ -137,7 +137,7 @@ static void lpc11_dumpnvic(const char *msg, int irq) static int lpc11_nmi(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! NMI received\n"); + _err("PANIC!!! NMI received\n"); PANIC(); return 0; } @@ -145,7 +145,7 @@ static int lpc11_nmi(int irq, FAR void *context) static int lpc11_pendsv(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! PendSV received\n"); + _err("PANIC!!! PendSV received\n"); PANIC(); return 0; } @@ -153,7 +153,7 @@ static int lpc11_pendsv(int irq, FAR void *context) static int lpc11_reserved(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Reserved interrupt\n"); + _err("PANIC!!! Reserved interrupt\n"); PANIC(); return 0; } diff --git a/arch/arm/src/lpc11xx/lpc11_serial.c b/arch/arm/src/lpc11xx/lpc11_serial.c index 331c4df7c2..b9365615da 100644 --- a/arch/arm/src/lpc11xx/lpc11_serial.c +++ b/arch/arm/src/lpc11xx/lpc11_serial.c @@ -630,7 +630,7 @@ static int up_interrupt(int irq, void *context) /* Read the line status register (LSR) to clear */ status = up_serialin(priv, LPC11_UART_LSR_OFFSET); - info("LSR: %02x\n", status); + _info("LSR: %02x\n", status); break; } @@ -638,7 +638,7 @@ static int up_interrupt(int irq, void *context) default: { - err("Unexpected IIR: %02x\n", status); + _err("Unexpected IIR: %02x\n", status); break; } } diff --git a/arch/arm/src/lpc17xx/lpc17_can.c b/arch/arm/src/lpc17xx/lpc17_can.c index d1b66ac3b6..802fe89ae9 100644 --- a/arch/arm/src/lpc17xx/lpc17_can.c +++ b/arch/arm/src/lpc17xx/lpc17_can.c @@ -308,7 +308,7 @@ static void can_printreg(uint32_t addr, uint32_t value) { if (count == 4) { - llerr("...\n"); + _llerr("...\n"); } return; @@ -325,7 +325,7 @@ static void can_printreg(uint32_t addr, uint32_t value) { /* Yes.. then show how many times the value repeated */ - llerr("[repeats %d more times]\n", count-3); + _llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -337,7 +337,7 @@ static void can_printreg(uint32_t addr, uint32_t value) /* Show the register value read */ - llerr("%08x->%08x\n", addr, value); + _llerr("%08x->%08x\n", addr, value); } #endif @@ -398,7 +398,7 @@ static void can_putreg(struct up_dev_s *priv, int offset, uint32_t value) /* Show the register value being written */ - llerr("%08x<-%08x\n", addr, value); + _llerr("%08x<-%08x\n", addr, value); /* Write the value */ @@ -458,7 +458,7 @@ static void can_putcommon(uint32_t addr, uint32_t value) { /* Show the register value being written */ - llerr("%08x<-%08x\n", addr, value); + _llerr("%08x<-%08x\n", addr, value); /* Write the value */ @@ -681,7 +681,7 @@ static void can_txint(FAR struct can_dev_s *dev, bool enable) static int can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg) { - err("Fix me:Not Implemented\n"); + _err("Fix me:Not Implemented\n"); return 0; } @@ -701,7 +701,7 @@ static int can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg) static int can_remoterequest(FAR struct can_dev_s *dev, uint16_t id) { - err("Fix me:Not Implemented\n"); + _err("Fix me:Not Implemented\n"); return 0; } diff --git a/arch/arm/src/lpc17xx/lpc17_dac.c b/arch/arm/src/lpc17xx/lpc17_dac.c index 6508b09683..d936aa0fc5 100644 --- a/arch/arm/src/lpc17xx/lpc17_dac.c +++ b/arch/arm/src/lpc17xx/lpc17_dac.c @@ -172,7 +172,7 @@ static int dac_send(FAR struct dac_dev_s *dev, FAR struct dac_msg_s *msg) static int dac_ioctl(FAR struct dac_dev_s *dev, int cmd, unsigned long arg) { - err("Fix me:Not Implemented\n"); + _err("Fix me:Not Implemented\n"); return 0; } diff --git a/arch/arm/src/lpc17xx/lpc17_ethernet.c b/arch/arm/src/lpc17xx/lpc17_ethernet.c index ef4957cba7..a7a28a2616 100644 --- a/arch/arm/src/lpc17xx/lpc17_ethernet.c +++ b/arch/arm/src/lpc17xx/lpc17_ethernet.c @@ -415,7 +415,7 @@ static void lpc17_ethreset(struct lpc17_driver_s *priv); #ifdef CONFIG_NET_REGDEBUG static void lpc17_printreg(uint32_t addr, uint32_t val, bool iswrite) { - err("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val); + _err("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val); } #endif @@ -465,7 +465,7 @@ static void lpc17_checkreg(uint32_t addr, uint32_t val, bool iswrite) { /* No.. More than one. */ - err("[repeats %d more times]\n", count); + _err("[repeats %d more times]\n", count); } } @@ -2319,14 +2319,14 @@ static void lpc17_showpins(void) #if defined(CONFIG_NET_REGDEBUG) && defined(LPC17_HAVE_PHY) static void lpc17_showmii(uint8_t phyaddr, const char *msg) { - err("PHY " LPC17_PHYNAME ": %s\n", msg); - err(" MCR: %04x\n", lpc17_phyread(phyaddr, MII_MCR)); - err(" MSR: %04x\n", lpc17_phyread(phyaddr, MII_MSR)); - err(" ADVERTISE: %04x\n", lpc17_phyread(phyaddr, MII_ADVERTISE)); - err(" LPA: %04x\n", lpc17_phyread(phyaddr, MII_LPA)); - err(" EXPANSION: %04x\n", lpc17_phyread(phyaddr, MII_EXPANSION)); + _err("PHY " LPC17_PHYNAME ": %s\n", msg); + _err(" MCR: %04x\n", lpc17_phyread(phyaddr, MII_MCR)); + _err(" MSR: %04x\n", lpc17_phyread(phyaddr, MII_MSR)); + _err(" ADVERTISE: %04x\n", lpc17_phyread(phyaddr, MII_ADVERTISE)); + _err(" LPA: %04x\n", lpc17_phyread(phyaddr, MII_LPA)); + _err(" EXPANSION: %04x\n", lpc17_phyread(phyaddr, MII_EXPANSION)); #ifdef CONFIG_ETH0_PHY_KS8721 - err(" 10BTCR: %04x\n", lpc17_phyread(phyaddr, MII_KS8721_10BTCR)); + _err(" 10BTCR: %04x\n", lpc17_phyread(phyaddr, MII_KS8721_10BTCR)); #endif } #endif diff --git a/arch/arm/src/lpc17xx/lpc17_i2c.c b/arch/arm/src/lpc17xx/lpc17_i2c.c index 7b5346e9f3..a4f817be33 100644 --- a/arch/arm/src/lpc17xx/lpc17_i2c.c +++ b/arch/arm/src/lpc17xx/lpc17_i2c.c @@ -485,7 +485,7 @@ struct i2c_master_s *lpc17_i2cbus_initialize(int port) if (port > 1) { - err("lpc I2C Only support 0,1\n"); + _err("lpc I2C Only support 0,1\n"); return NULL; } diff --git a/arch/arm/src/lpc17xx/lpc17_irq.c b/arch/arm/src/lpc17xx/lpc17_irq.c index 595e9cf594..a3ada9cbe8 100644 --- a/arch/arm/src/lpc17xx/lpc17_irq.c +++ b/arch/arm/src/lpc17xx/lpc17_irq.c @@ -152,7 +152,7 @@ static void lpc17_dumpnvic(const char *msg, int irq) static int lpc17_nmi(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! NMI received\n"); + _err("PANIC!!! NMI received\n"); PANIC(); return 0; } @@ -160,7 +160,7 @@ static int lpc17_nmi(int irq, FAR void *context) static int lpc17_busfault(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Bus fault recived\n"); + _err("PANIC!!! Bus fault recived\n"); PANIC(); return 0; } @@ -168,7 +168,7 @@ static int lpc17_busfault(int irq, FAR void *context) static int lpc17_usagefault(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Usage fault received\n"); + _err("PANIC!!! Usage fault received\n"); PANIC(); return 0; } @@ -176,7 +176,7 @@ static int lpc17_usagefault(int irq, FAR void *context) static int lpc17_pendsv(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! PendSV received\n"); + _err("PANIC!!! PendSV received\n"); PANIC(); return 0; } @@ -184,7 +184,7 @@ static int lpc17_pendsv(int irq, FAR void *context) static int lpc17_errmonitor(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Debug Monitor received\n"); + _err("PANIC!!! Debug Monitor received\n"); PANIC(); return 0; } @@ -192,7 +192,7 @@ static int lpc17_errmonitor(int irq, FAR void *context) static int lpc17_reserved(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Reserved interrupt\n"); + _err("PANIC!!! Reserved interrupt\n"); PANIC(); return 0; } diff --git a/arch/arm/src/lpc17xx/lpc17_serial.c b/arch/arm/src/lpc17xx/lpc17_serial.c index 94a92873d2..0ec62236a6 100644 --- a/arch/arm/src/lpc17xx/lpc17_serial.c +++ b/arch/arm/src/lpc17xx/lpc17_serial.c @@ -1134,7 +1134,7 @@ static int up_interrupt(int irq, void *context) /* Read the modem status register (MSR) to clear */ status = up_serialin(priv, LPC17_UART_MSR_OFFSET); - info("MSR: %02x\n", status); + _info("MSR: %02x\n", status); break; } @@ -1145,7 +1145,7 @@ static int up_interrupt(int irq, void *context) /* Read the line status register (LSR) to clear */ status = up_serialin(priv, LPC17_UART_LSR_OFFSET); - info("LSR: %02x\n", status); + _info("LSR: %02x\n", status); break; } @@ -1153,7 +1153,7 @@ static int up_interrupt(int irq, void *context) default: { - err("Unexpected IIR: %02x\n", status); + _err("Unexpected IIR: %02x\n", status); break; } } diff --git a/arch/arm/src/lpc17xx/lpc17_usbdev.c b/arch/arm/src/lpc17xx/lpc17_usbdev.c index f96e91f6aa..d2c4606283 100644 --- a/arch/arm/src/lpc17xx/lpc17_usbdev.c +++ b/arch/arm/src/lpc17xx/lpc17_usbdev.c @@ -531,7 +531,7 @@ static struct lpc17_dmadesc_s g_usbddesc[CONFIG_LPC17_USBDEV_NDMADESCRIPTORS]; #ifdef CONFIG_LPC17_USBDEV_REGDEBUG static void lpc17_printreg(uint32_t addr, uint32_t val, bool iswrite) { - llerr("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val); + _llerr("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val); } #endif @@ -581,7 +581,7 @@ static void lpc17_checkreg(uint32_t addr, uint32_t val, bool iswrite) { /* No.. More than one. */ - llerr("[repeats %d more times]\n", count); + _llerr("[repeats %d more times]\n", count); } } diff --git a/arch/arm/src/lpc17xx/lpc17_usbhost.c b/arch/arm/src/lpc17xx/lpc17_usbhost.c index 7825df9672..7d707daf79 100644 --- a/arch/arm/src/lpc17xx/lpc17_usbhost.c +++ b/arch/arm/src/lpc17xx/lpc17_usbhost.c @@ -456,7 +456,7 @@ static struct lpc17_xfrinfo_s g_xfrbuffers[CONFIG_LPC17_USBHOST_NPREALLOC]; #ifdef CONFIG_LPC17_USBHOST_REGDEBUG static void lpc17_printreg(uint32_t addr, uint32_t val, bool iswrite) { - llerr("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val); + _llerr("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val); } #endif @@ -506,7 +506,7 @@ static void lpc17_checkreg(uint32_t addr, uint32_t val, bool iswrite) { /* No.. More than one. */ - llerr("[repeats %d more times]\n", count); + _llerr("[repeats %d more times]\n", count); } } diff --git a/arch/arm/src/lpc214x/lpc214x_serial.c b/arch/arm/src/lpc214x/lpc214x_serial.c index b0bcafd44e..1f699f5129 100644 --- a/arch/arm/src/lpc214x/lpc214x_serial.c +++ b/arch/arm/src/lpc214x/lpc214x_serial.c @@ -530,7 +530,7 @@ static int up_interrupt(int irq, void *context) /* Read the modem status register (MSR) to clear */ status = up_serialin(priv, LPC214X_UART_MSR_OFFSET); - info("MSR: %02x\n", status); + _info("MSR: %02x\n", status); break; } @@ -541,7 +541,7 @@ static int up_interrupt(int irq, void *context) /* Read the line status register (LSR) to clear */ status = up_serialin(priv, LPC214X_UART_LSR_OFFSET); - info("LSR: %02x\n", status); + _info("LSR: %02x\n", status); break; } @@ -549,7 +549,7 @@ static int up_interrupt(int irq, void *context) default: { - err("Unexpected IIR: %02x\n", status); + _err("Unexpected IIR: %02x\n", status); break; } } diff --git a/arch/arm/src/lpc214x/lpc214x_usbdev.c b/arch/arm/src/lpc214x/lpc214x_usbdev.c index 431b71655e..e9ea74f088 100644 --- a/arch/arm/src/lpc214x/lpc214x_usbdev.c +++ b/arch/arm/src/lpc214x/lpc214x_usbdev.c @@ -539,7 +539,7 @@ static uint32_t lpc214x_getreg(uint32_t addr) { if (count == 4) { - llerr("...\n"); + _llerr("...\n"); } return val; @@ -556,7 +556,7 @@ static uint32_t lpc214x_getreg(uint32_t addr) { /* Yes.. then show how many times the value repeated */ - llerr("[repeats %d more times]\n", count-3); + _llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -568,7 +568,7 @@ static uint32_t lpc214x_getreg(uint32_t addr) /* Show the register value read */ - llerr("%08x->%08x\n", addr, val); + _llerr("%08x->%08x\n", addr, val); return val; } #endif @@ -586,7 +586,7 @@ static void lpc214x_putreg(uint32_t val, uint32_t addr) { /* Show the register value being written */ - llerr("%08x<-%08x\n", addr, val); + _llerr("%08x<-%08x\n", addr, val); /* Write the value */ diff --git a/arch/arm/src/lpc2378/lpc23xx_i2c.c b/arch/arm/src/lpc2378/lpc23xx_i2c.c index d3bec89884..6932e93210 100644 --- a/arch/arm/src/lpc2378/lpc23xx_i2c.c +++ b/arch/arm/src/lpc2378/lpc23xx_i2c.c @@ -490,7 +490,7 @@ struct i2c_master_s *lpc2378_i2cbus_initialize(int port) if (port > 1) { - err("lpc I2C Only support 0,1\n"); + _err("lpc I2C Only support 0,1\n"); return NULL; } diff --git a/arch/arm/src/lpc2378/lpc23xx_serial.c b/arch/arm/src/lpc2378/lpc23xx_serial.c index 9ea299783d..50aaa662a6 100644 --- a/arch/arm/src/lpc2378/lpc23xx_serial.c +++ b/arch/arm/src/lpc2378/lpc23xx_serial.c @@ -648,7 +648,7 @@ static int up_interrupt(int irq, void *context) /* Read the modem status register (MSR) to clear */ status = up_serialin(priv, UART_MSR_OFFSET); - info("MSR: %02x\n", status); + _info("MSR: %02x\n", status); break; } @@ -659,7 +659,7 @@ static int up_interrupt(int irq, void *context) /* Read the line status register (LSR) to clear */ status = up_serialin(priv, UART_LSR_OFFSET); - info("LSR: %02x\n", status); + _info("LSR: %02x\n", status); break; } @@ -667,7 +667,7 @@ static int up_interrupt(int irq, void *context) default: { - err("Unexpected IIR: %02x\n", status); + _err("Unexpected IIR: %02x\n", status); break; } } diff --git a/arch/arm/src/lpc31xx/lpc31_ehci.c b/arch/arm/src/lpc31xx/lpc31_ehci.c index 0734e85e51..1532feddbd 100644 --- a/arch/arm/src/lpc31xx/lpc31_ehci.c +++ b/arch/arm/src/lpc31xx/lpc31_ehci.c @@ -826,7 +826,7 @@ static uint32_t lpc31_swap32(uint32_t value) static void lpc31_printreg(volatile uint32_t *regaddr, uint32_t regval, bool iswrite) { - llerr("%08x%s%08x\n", (uintptr_t)regaddr, iswrite ? "<-" : "->", regval); + _llerr("%08x%s%08x\n", (uintptr_t)regaddr, iswrite ? "<-" : "->", regval); } #endif @@ -877,7 +877,7 @@ static void lpc31_checkreg(volatile uint32_t *regaddr, uint32_t regval, bool isw { /* No.. More than one. */ - llerr("[repeats %d more times]\n", count); + _llerr("[repeats %d more times]\n", count); } } diff --git a/arch/arm/src/lpc31xx/lpc31_serial.c b/arch/arm/src/lpc31xx/lpc31_serial.c index c3b9b3f509..b46c0598fc 100644 --- a/arch/arm/src/lpc31xx/lpc31_serial.c +++ b/arch/arm/src/lpc31xx/lpc31_serial.c @@ -560,7 +560,7 @@ static int up_interrupt(int irq, void *context) default: { - err("Unexpected IIR: %02x\n", status); + _err("Unexpected IIR: %02x\n", status); break; } } diff --git a/arch/arm/src/lpc31xx/lpc31_spi.c b/arch/arm/src/lpc31xx/lpc31_spi.c index c72a0221c0..074bbe2b7d 100644 --- a/arch/arm/src/lpc31xx/lpc31_spi.c +++ b/arch/arm/src/lpc31xx/lpc31_spi.c @@ -207,7 +207,7 @@ static bool spi_checkreg(bool wr, uint32_t value, uint32_t address) { if (g_ntimes > 0) { - llerr("...[Repeats %d times]...\n", g_ntimes); + _llerr("...[Repeats %d times]...\n", g_ntimes); } g_wrlast = wr; @@ -239,7 +239,7 @@ static void spi_putreg(uint32_t value, uint32_t address) { if (spi_checkreg(true, value, address)) { - llerr("%08x<-%08x\n", address, value); + _llerr("%08x<-%08x\n", address, value); } putreg32(value, address); } @@ -265,7 +265,7 @@ static uint32_t spi_getreg(uint32_t address) uint32_t value = getreg32(address); if (spi_checkreg(false, value, address)) { - llerr("%08x->%08x\n", address, value); + _llerr("%08x->%08x\n", address, value); } return value; } @@ -921,7 +921,7 @@ FAR struct spi_dev_s *lpc31_spibus_initialize(int port) */ #ifdef CONFIG_LPC31_SPI_REGDEBUG - llerr("PINS: %08x MODE0: %08x MODE1: %08x\n", + _llerr("PINS: %08x MODE0: %08x MODE1: %08x\n", spi_getreg(LPC31_IOCONFIG_SPI_PINS), spi_getreg(LPC31_IOCONFIG_SPI_MODE0), spi_getreg(LPC31_IOCONFIG_SPI_MODE1)); diff --git a/arch/arm/src/lpc31xx/lpc31_usbdev.c b/arch/arm/src/lpc31xx/lpc31_usbdev.c index 3d56725cea..f75eb1aa52 100644 --- a/arch/arm/src/lpc31xx/lpc31_usbdev.c +++ b/arch/arm/src/lpc31xx/lpc31_usbdev.c @@ -501,7 +501,7 @@ static uint32_t lpc31_getreg(uint32_t addr) { if (count == 4) { - llerr("...\n"); + _llerr("...\n"); } return val; @@ -518,7 +518,7 @@ static uint32_t lpc31_getreg(uint32_t addr) { /* Yes.. then show how many times the value repeated */ - llerr("[repeats %d more times]\n", count-3); + _llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -530,7 +530,7 @@ static uint32_t lpc31_getreg(uint32_t addr) /* Show the register value read */ - llerr("%08x->%08x\n", addr, val); + _llerr("%08x->%08x\n", addr, val); return val; } #endif @@ -548,7 +548,7 @@ static void lpc31_putreg(uint32_t val, uint32_t addr) { /* Show the register value being written */ - llerr("%08x<-%08x\n", addr, val); + _llerr("%08x<-%08x\n", addr, val); /* Write the value */ diff --git a/arch/arm/src/lpc43xx/lpc43_dac.c b/arch/arm/src/lpc43xx/lpc43_dac.c index b9ab14b874..f14186f7d1 100644 --- a/arch/arm/src/lpc43xx/lpc43_dac.c +++ b/arch/arm/src/lpc43xx/lpc43_dac.c @@ -173,7 +173,7 @@ static int dac_send(FAR struct dac_dev_s *dev, FAR struct dac_msg_s *msg) static int dac_ioctl(FAR struct dac_dev_s *dev, int cmd, unsigned long arg) { - err("Fix me:Not Implemented\n"); + _err("Fix me:Not Implemented\n"); return 0; } diff --git a/arch/arm/src/lpc43xx/lpc43_ehci.c b/arch/arm/src/lpc43xx/lpc43_ehci.c index a0d4d1160e..a0483accd4 100644 --- a/arch/arm/src/lpc43xx/lpc43_ehci.c +++ b/arch/arm/src/lpc43xx/lpc43_ehci.c @@ -817,7 +817,7 @@ static uint32_t lpc43_swap32(uint32_t value) static void lpc43_printreg(volatile uint32_t *regaddr, uint32_t regval, bool iswrite) { - llerr("%08x%s%08x\n", (uintptr_t)regaddr, iswrite ? "<-" : "->", regval); + _llerr("%08x%s%08x\n", (uintptr_t)regaddr, iswrite ? "<-" : "->", regval); } #endif @@ -868,7 +868,7 @@ static void lpc43_checkreg(volatile uint32_t *regaddr, uint32_t regval, bool isw { /* No.. More than one. */ - llerr("[repeats %d more times]\n", count); + _llerr("[repeats %d more times]\n", count); } } diff --git a/arch/arm/src/lpc43xx/lpc43_ethernet.c b/arch/arm/src/lpc43xx/lpc43_ethernet.c index 37e39dee6d..13b2983aaf 100644 --- a/arch/arm/src/lpc43xx/lpc43_ethernet.c +++ b/arch/arm/src/lpc43xx/lpc43_ethernet.c @@ -704,7 +704,7 @@ static uint32_t lpc43_getreg(uint32_t addr) { if (count == 4) { - llerr("...\n"); + _llerr("...\n"); } return val; @@ -721,7 +721,7 @@ static uint32_t lpc43_getreg(uint32_t addr) { /* Yes.. then show how many times the value repeated */ - llerr("[repeats %d more times]\n", count-3); + _llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -733,7 +733,7 @@ static uint32_t lpc43_getreg(uint32_t addr) /* Show the register value read */ - llerr("%08x->%08x\n", addr, val); + _llerr("%08x->%08x\n", addr, val); return val; } #endif @@ -760,7 +760,7 @@ static void lpc43_putreg(uint32_t val, uint32_t addr) { /* Show the register value being written */ - llerr("%08x<-%08x\n", addr, val); + _llerr("%08x<-%08x\n", addr, val); /* Write the value */ diff --git a/arch/arm/src/lpc43xx/lpc43_i2c.c b/arch/arm/src/lpc43xx/lpc43_i2c.c index 9bc4f4b6e0..4ec260760b 100644 --- a/arch/arm/src/lpc43xx/lpc43_i2c.c +++ b/arch/arm/src/lpc43xx/lpc43_i2c.c @@ -464,7 +464,7 @@ struct i2c_master_s *lpc43_i2cbus_initialize(int port) if (port > 1) { - err("lpc I2C Only support 0,1\n"); + _err("lpc I2C Only support 0,1\n"); return NULL; } diff --git a/arch/arm/src/lpc43xx/lpc43_idle.c b/arch/arm/src/lpc43xx/lpc43_idle.c index 4dc5a30209..89c9d98e83 100644 --- a/arch/arm/src/lpc43xx/lpc43_idle.c +++ b/arch/arm/src/lpc43xx/lpc43_idle.c @@ -98,7 +98,7 @@ static void up_idlepm(void) /* Perform board-specific, state-dependent logic here */ - llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); + _llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); /* Then force the global state change */ diff --git a/arch/arm/src/lpc43xx/lpc43_irq.c b/arch/arm/src/lpc43xx/lpc43_irq.c index 77189d2079..ea87cec8fe 100644 --- a/arch/arm/src/lpc43xx/lpc43_irq.c +++ b/arch/arm/src/lpc43xx/lpc43_irq.c @@ -161,7 +161,7 @@ static void lpc43_dumpnvic(const char *msg, int irq) static int lpc43_nmi(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! NMI received\n"); + _err("PANIC!!! NMI received\n"); PANIC(); return 0; } @@ -169,7 +169,7 @@ static int lpc43_nmi(int irq, FAR void *context) static int lpc43_busfault(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Bus fault recived\n"); + _err("PANIC!!! Bus fault recived\n"); PANIC(); return 0; } @@ -177,7 +177,7 @@ static int lpc43_busfault(int irq, FAR void *context) static int lpc43_usagefault(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Usage fault received\n"); + _err("PANIC!!! Usage fault received\n"); PANIC(); return 0; } @@ -185,7 +185,7 @@ static int lpc43_usagefault(int irq, FAR void *context) static int lpc43_pendsv(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! PendSV received\n"); + _err("PANIC!!! PendSV received\n"); PANIC(); return 0; } @@ -193,7 +193,7 @@ static int lpc43_pendsv(int irq, FAR void *context) static int lpc43_errmonitor(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Debug Monitor received\n"); + _err("PANIC!!! Debug Monitor received\n"); PANIC(); return 0; } @@ -201,7 +201,7 @@ static int lpc43_errmonitor(int irq, FAR void *context) static int lpc43_reserved(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Reserved interrupt\n"); + _err("PANIC!!! Reserved interrupt\n"); PANIC(); return 0; } diff --git a/arch/arm/src/lpc43xx/lpc43_rit.c b/arch/arm/src/lpc43xx/lpc43_rit.c index 2b153fb1b3..7d68c8f58b 100644 --- a/arch/arm/src/lpc43xx/lpc43_rit.c +++ b/arch/arm/src/lpc43xx/lpc43_rit.c @@ -201,7 +201,7 @@ void up_timer_initialize(void) mask_bits++; } - llerr("mask_bits = %d, mask = %X, ticks_per_int = %d\r\n", + _llerr("mask_bits = %d, mask = %X, ticks_per_int = %d\r\n", mask_bits, (0xffffffff << (32 - mask_bits)), ticks_per_int); /* Set the mask and compare value so we get interrupts every diff --git a/arch/arm/src/lpc43xx/lpc43_serial.c b/arch/arm/src/lpc43xx/lpc43_serial.c index 1e045e13d7..e423e2c0da 100644 --- a/arch/arm/src/lpc43xx/lpc43_serial.c +++ b/arch/arm/src/lpc43xx/lpc43_serial.c @@ -854,7 +854,7 @@ static int up_interrupt(int irq, void *context) /* Read the modem status register (MSR) to clear */ status = up_serialin(priv, LPC43_UART_MSR_OFFSET); - info("MSR: %02x\n", status); + _info("MSR: %02x\n", status); break; } @@ -865,7 +865,7 @@ static int up_interrupt(int irq, void *context) /* Read the line status register (LSR) to clear */ status = up_serialin(priv, LPC43_UART_LSR_OFFSET); - info("LSR: %02x\n", status); + _info("LSR: %02x\n", status); break; } @@ -873,7 +873,7 @@ static int up_interrupt(int irq, void *context) default: { - err("Unexpected IIR: %02x\n", status); + _err("Unexpected IIR: %02x\n", status); break; } } diff --git a/arch/arm/src/lpc43xx/lpc43_usb0dev.c b/arch/arm/src/lpc43xx/lpc43_usb0dev.c index 035b1827b9..af5337bda2 100644 --- a/arch/arm/src/lpc43xx/lpc43_usb0dev.c +++ b/arch/arm/src/lpc43xx/lpc43_usb0dev.c @@ -522,7 +522,7 @@ static uint32_t lpc43_getreg(uint32_t addr) { if (count == 4) { - llerr("...\n"); + _llerr("...\n"); } return val; @@ -539,7 +539,7 @@ static uint32_t lpc43_getreg(uint32_t addr) { /* Yes.. then show how many times the value repeated */ - llerr("[repeats %d more times]\n", count-3); + _llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -551,7 +551,7 @@ static uint32_t lpc43_getreg(uint32_t addr) /* Show the register value read */ - llerr("%08x->%08x\n", addr, val); + _llerr("%08x->%08x\n", addr, val); return val; } #endif @@ -569,7 +569,7 @@ static void lpc43_putreg(uint32_t val, uint32_t addr) { /* Show the register value being written */ - llerr("%08x<-%08x\n", addr, val); + _llerr("%08x<-%08x\n", addr, val); /* Write the value */ diff --git a/arch/arm/src/moxart/moxart_irq.c b/arch/arm/src/moxart/moxart_irq.c index 71d9e68629..0dfd4d92ea 100644 --- a/arch/arm/src/moxart/moxart_irq.c +++ b/arch/arm/src/moxart/moxart_irq.c @@ -145,15 +145,15 @@ void up_irqinitialize(void) #if 1 #define REG(x) (*(volatile uint32_t *)(x)) - llerr("\n=============================================================\n"); - llerr("TM CNTL=%08x INTRS=%08x MASK=%08x LOAD=%08x COUNT=%08x M1=%08x\n", + _llerr("\n=============================================================\n"); + _llerr("TM CNTL=%08x INTRS=%08x MASK=%08x LOAD=%08x COUNT=%08x M1=%08x\n", REG(0x98400030), REG(0x98400034), REG(0x98400038), REG(0x98400004), REG(0x98400000), REG(0x98400008)); - llerr("IRQ STATUS=%08x MASK=%08x MODE=%08x LEVEL=%08x\n", + _llerr("IRQ STATUS=%08x MASK=%08x MODE=%08x LEVEL=%08x\n", REG(0x98800014), REG(0x98800004), REG(0x9880000C), REG(0x98800010)); - llerr("FIQ STATUS=%08x MASK=%08x MODE=%08x LEVEL=%08x\n", + _llerr("FIQ STATUS=%08x MASK=%08x MODE=%08x LEVEL=%08x\n", REG(0x98800034), REG(0x98800024), REG(0x9880002C), REG(0x98800020)); - llerr("=============================================================\n"); + _llerr("=============================================================\n"); #endif #ifndef CONFIG_SUPPRESS_INTERRUPTS diff --git a/arch/arm/src/nuc1xx/nuc_dumpgpio.c b/arch/arm/src/nuc1xx/nuc_dumpgpio.c index 45db371a8b..780f8c61d4 100644 --- a/arch/arm/src/nuc1xx/nuc_dumpgpio.c +++ b/arch/arm/src/nuc1xx/nuc_dumpgpio.c @@ -124,19 +124,19 @@ void nuc_dumpgpio(gpio_cfgset_t pinset, const char *msg) flags = enter_critical_section(); - llerr("GPIO%c pinset: %08x base: %08x -- %s\n", + _llerr("GPIO%c pinset: %08x base: %08x -- %s\n", g_portchar[port], pinset, base, msg); - llerr(" PMD: %08x OFFD: %08x DOUT: %08x DMASK: %08x\n", + _llerr(" PMD: %08x OFFD: %08x DOUT: %08x DMASK: %08x\n", getreg32(base + NUC_GPIO_PMD_OFFSET), getreg32(base + NUC_GPIO_OFFD_OFFSET), getreg32(base + NUC_GPIO_DOUT_OFFSET), getreg32(base + NUC_GPIO_DMASK_OFFSET)); - llerr(" PIN: %08x DBEN: %08x IMD: %08x IEN: %08x\n", + _llerr(" PIN: %08x DBEN: %08x IMD: %08x IEN: %08x\n", getreg32(base + NUC_GPIO_PIN_OFFSET), getreg32(base + NUC_GPIO_DBEN_OFFSET), getreg32(base + NUC_GPIO_IMD_OFFSET), getreg32(base + NUC_GPIO_IEN_OFFSET)); - llerr(" ISRC: %08x\n", + _llerr(" ISRC: %08x\n", getreg32(base + NUC_GPIO_ISRC_OFFSET)); leave_critical_section(flags); diff --git a/arch/arm/src/nuc1xx/nuc_idle.c b/arch/arm/src/nuc1xx/nuc_idle.c index e0e0131059..7462aa24aa 100644 --- a/arch/arm/src/nuc1xx/nuc_idle.c +++ b/arch/arm/src/nuc1xx/nuc_idle.c @@ -99,7 +99,7 @@ static void up_idlepm(void) /* Perform board-specific, state-dependent logic here */ - llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); + _llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); /* Then force the global state change */ diff --git a/arch/arm/src/nuc1xx/nuc_irq.c b/arch/arm/src/nuc1xx/nuc_irq.c index 19da86459e..ec045c3734 100644 --- a/arch/arm/src/nuc1xx/nuc_irq.c +++ b/arch/arm/src/nuc1xx/nuc_irq.c @@ -141,7 +141,7 @@ static void nuc_dumpnvic(const char *msg, int irq) static int nuc_nmi(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! NMI received\n"); + _err("PANIC!!! NMI received\n"); PANIC(); return 0; } @@ -149,7 +149,7 @@ static int nuc_nmi(int irq, FAR void *context) static int nuc_pendsv(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! PendSV received\n"); + _err("PANIC!!! PendSV received\n"); PANIC(); return 0; } @@ -157,7 +157,7 @@ static int nuc_pendsv(int irq, FAR void *context) static int nuc_reserved(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Reserved interrupt\n"); + _err("PANIC!!! Reserved interrupt\n"); PANIC(); return 0; } diff --git a/arch/arm/src/sam34/sam4cm_tc.c b/arch/arm/src/sam34/sam4cm_tc.c index 2ffe713072..8766a88720 100644 --- a/arch/arm/src/sam34/sam4cm_tc.c +++ b/arch/arm/src/sam34/sam4cm_tc.c @@ -390,20 +390,20 @@ static void sam_regdump(struct sam_chan_s *chan, const char *msg) uintptr_t base; base = chan->base; - llerr("TC%d [%08x]: %s\n", chan->chan, (int)base, msg); - llerr(" BMR: %08x QIMR: %08x QISR: %08x WPMR: %08x\n", + _llerr("TC%d [%08x]: %s\n", chan->chan, (int)base, msg); + _llerr(" BMR: %08x QIMR: %08x QISR: %08x WPMR: %08x\n", getreg32(base+SAM_TC_BMR_OFFSET), getreg32(base+SAM_TC_QIMR_OFFSET), getreg32(base+SAM_TC_QISR_OFFSET), getreg32(base+SAM_TC_WPMR_OFFSET)); base = chan->base; - llerr("TC%d Channel %d [%08x]: %s\n", chan->chan, chan->chan, (int)base, msg); - llerr(" CMR: %08x SSMR: %08x RAB: %08x CV: %08x\n", + _llerr("TC%d Channel %d [%08x]: %s\n", chan->chan, chan->chan, (int)base, msg); + _llerr(" CMR: %08x SSMR: %08x RAB: %08x CV: %08x\n", getreg32(base+SAM_TC_CMR_OFFSET), getreg32(base+SAM_TC_SMMR_OFFSET), getreg32(base+SAM_TC_RAB_OFFSET), getreg32(base+SAM_TC_CV_OFFSET)); - llerr(" RA: %08x RB: %08x RC: %08x SR: %08x\n", + _llerr(" RA: %08x RB: %08x RC: %08x SR: %08x\n", getreg32(base+SAM_TC_RA_OFFSET), getreg32(base+SAM_TC_RB_OFFSET), getreg32(base+SAM_TC_RC_OFFSET), getreg32(base+SAM_TC_SR_OFFSET)); - llerr(" IMR: %08x\n", + _llerr(" IMR: %08x\n", getreg32(base+SAM_TC_IMR_OFFSET)); } #endif @@ -447,7 +447,7 @@ static bool sam_checkreg(struct sam_chan_s *chan, bool wr, uint32_t regaddr, { /* Yes... show how many times we did it */ - llerr("...[Repeats %d times]...\n", chan->ntimes); + _llerr("...[Repeats %d times]...\n", chan->ntimes); } /* Save information about the new access */ @@ -481,7 +481,7 @@ static inline uint32_t sam_chan_getreg(struct sam_chan_s *chan, #ifdef CONFIG_SAM34_TC_REGDEBUG if (sam_checkreg(chan, false, regaddr, regval)) { - llerr("%08x->%08x\n", regaddr, regval); + _llerr("%08x->%08x\n", regaddr, regval); } #endif @@ -504,7 +504,7 @@ static inline void sam_chan_putreg(struct sam_chan_s *chan, unsigned int offset, #ifdef CONFIG_SAM34_TC_REGDEBUG if (sam_checkreg(chan, true, regaddr, regval)) { - llerr("%08x<-%08x\n", regaddr, regval); + _llerr("%08x<-%08x\n", regaddr, regval); } #endif diff --git a/arch/arm/src/sam34/sam_emac.c b/arch/arm/src/sam34/sam_emac.c index 1c7d627677..5a8d2673b8 100644 --- a/arch/arm/src/sam34/sam_emac.c +++ b/arch/arm/src/sam34/sam_emac.c @@ -490,7 +490,7 @@ static bool sam_checkreg(struct sam_emac_s *priv, bool wr, uint32_t regval, { /* Yes... show how many times we did it */ - llerr("...[Repeats %d times]...\n", priv->ntimes); + _llerr("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -522,7 +522,7 @@ static uint32_t sam_getreg(struct sam_emac_s *priv, uintptr_t address) if (sam_checkreg(priv, false, regval, address)) { - llerr("%08x->%08x\n", address, regval); + _llerr("%08x->%08x\n", address, regval); } return regval; @@ -543,7 +543,7 @@ static void sam_putreg(struct sam_emac_s *priv, uintptr_t address, { if (sam_checkreg(priv, true, regval, address)) { - llerr("%08x<-%08x\n", address, regval); + _llerr("%08x<-%08x\n", address, regval); } putreg32(regval, address); diff --git a/arch/arm/src/sam34/sam_irq.c b/arch/arm/src/sam34/sam_irq.c index 7dc6371541..7e002224fb 100644 --- a/arch/arm/src/sam34/sam_irq.c +++ b/arch/arm/src/sam34/sam_irq.c @@ -177,7 +177,7 @@ static void sam_dumpnvic(const char *msg, int irq) static int sam_nmi(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! NMI received\n"); + _err("PANIC!!! NMI received\n"); PANIC(); return 0; } @@ -185,7 +185,7 @@ static int sam_nmi(int irq, FAR void *context) static int sam_busfault(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS)); + _err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS)); PANIC(); return 0; } @@ -193,7 +193,7 @@ static int sam_busfault(int irq, FAR void *context) static int sam_usagefault(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS)); + _err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS)); PANIC(); return 0; } @@ -201,7 +201,7 @@ static int sam_usagefault(int irq, FAR void *context) static int sam_pendsv(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! PendSV received\n"); + _err("PANIC!!! PendSV received\n"); PANIC(); return 0; } @@ -209,7 +209,7 @@ static int sam_pendsv(int irq, FAR void *context) static int sam_errmonitor(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Debug Monitor received\n"); + _err("PANIC!!! Debug Monitor received\n"); PANIC(); return 0; } @@ -217,7 +217,7 @@ static int sam_errmonitor(int irq, FAR void *context) static int sam_reserved(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Reserved interrupt\n"); + _err("PANIC!!! Reserved interrupt\n"); PANIC(); return 0; } diff --git a/arch/arm/src/sam34/sam_rtt.c b/arch/arm/src/sam34/sam_rtt.c index e2972e00ba..385aa37d01 100644 --- a/arch/arm/src/sam34/sam_rtt.c +++ b/arch/arm/src/sam34/sam_rtt.c @@ -81,8 +81,8 @@ */ #ifdef CONFIG_DEBUG_RTT -# define rtterr llerr -# define rttinfo llinfo +# define rtterr _llerr +# define rttinfo _llinfo #else # define rtterr(x...) # define rttinfo(x...) @@ -214,7 +214,7 @@ static uint32_t sam34_getreg(uint32_t addr) { if (count == 4) { - llerr("...\n"); + _llerr("...\n"); } return val; @@ -231,7 +231,7 @@ static uint32_t sam34_getreg(uint32_t addr) { /* Yes.. then show how many times the value repeated */ - llerr("[repeats %d more times]\n", count-3); + _llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -243,7 +243,7 @@ static uint32_t sam34_getreg(uint32_t addr) /* Show the register value read */ - llerr("%08lx->%08lx\n", addr, val); + _llerr("%08lx->%08lx\n", addr, val); return val; } #endif @@ -261,7 +261,7 @@ static void sam34_putreg(uint32_t val, uint32_t addr) { /* Show the register value being written */ - llerr("%08lx<-%08lx\n", addr, val); + _llerr("%08lx<-%08lx\n", addr, val); /* Write the value */ diff --git a/arch/arm/src/sam34/sam_spi.c b/arch/arm/src/sam34/sam_spi.c index 0c01cb7dad..488a0d8d1e 100644 --- a/arch/arm/src/sam34/sam_spi.c +++ b/arch/arm/src/sam34/sam_spi.c @@ -420,7 +420,7 @@ static bool spi_checkreg(struct sam_spidev_s *spi, bool wr, uint32_t value, { /* Yes... show how many times we did it */ - llerr("...[Repeats %d times]...\n", spi->ntimes); + _llerr("...[Repeats %d times]...\n", spi->ntimes); } /* Save information about the new access */ @@ -454,7 +454,7 @@ static inline uint32_t spi_getreg(struct sam_spidev_s *spi, #ifdef CONFIG_SAM34_SPI_REGDEBUG if (spi_checkreg(spi, false, value, address)) { - llerr("%08x->%08x\n", address, value); + _llerr("%08x->%08x\n", address, value); } #endif @@ -477,7 +477,7 @@ static inline void spi_putreg(struct sam_spidev_s *spi, uint32_t value, #ifdef CONFIG_SAM34_SPI_REGDEBUG if (spi_checkreg(spi, true, value, address)) { - llerr("%08x<-%08x\n", address, value); + _llerr("%08x<-%08x\n", address, value); } #endif diff --git a/arch/arm/src/sam34/sam_tc.c b/arch/arm/src/sam34/sam_tc.c index 8feea0a727..26a73eff82 100644 --- a/arch/arm/src/sam34/sam_tc.c +++ b/arch/arm/src/sam34/sam_tc.c @@ -179,7 +179,7 @@ static uint32_t sam34_getreg(uint32_t addr) { if (count == 4) { - llerr("...\n"); + _llerr("...\n"); } return val; @@ -196,7 +196,7 @@ static uint32_t sam34_getreg(uint32_t addr) { /* Yes.. then show how many times the value repeated */ - llerr("[repeats %d more times]\n", count-3); + _llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -208,7 +208,7 @@ static uint32_t sam34_getreg(uint32_t addr) /* Show the register value read */ - llerr("%08lx->%08lx\n", addr, val); + _llerr("%08lx->%08lx\n", addr, val); return val; } #endif @@ -226,7 +226,7 @@ static void sam34_putreg(uint32_t val, uint32_t addr) { /* Show the register value being written */ - llerr("%08lx<-%08lx\n", addr, val); + _llerr("%08lx<-%08lx\n", addr, val); /* Write the value */ diff --git a/arch/arm/src/sam34/sam_twi.c b/arch/arm/src/sam34/sam_twi.c index a91d9af815..bc13070664 100644 --- a/arch/arm/src/sam34/sam_twi.c +++ b/arch/arm/src/sam34/sam_twi.c @@ -273,7 +273,7 @@ static bool twi_checkreg(struct twi_dev_s *priv, bool wr, uint32_t value, { /* Yes... show how many times we did it */ - llerr("...[Repeats %d times]...\n", priv->ntimes); + _llerr("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -305,7 +305,7 @@ static uint32_t twi_getabs(struct twi_dev_s *priv, uintptr_t address) if (twi_checkreg(priv, false, value, address)) { - llerr("%08x->%08x\n", address, value); + _llerr("%08x->%08x\n", address, value); } return value; @@ -326,7 +326,7 @@ static void twi_putabs(struct twi_dev_s *priv, uintptr_t address, { if (twi_checkreg(priv, true, value, address)) { - llerr("%08x<-%08x\n", address, value); + _llerr("%08x<-%08x\n", address, value); } putreg32(value, address); diff --git a/arch/arm/src/sam34/sam_udp.c b/arch/arm/src/sam34/sam_udp.c index 851b61c741..4615cd01b0 100644 --- a/arch/arm/src/sam34/sam_udp.c +++ b/arch/arm/src/sam34/sam_udp.c @@ -606,7 +606,7 @@ const struct trace_msg_t g_usb_trace_strings_intdecode[] = #ifdef CONFIG_SAM34_UDP_REGDEBUG static void sam_printreg(uintptr_t regaddr, uint32_t regval, bool iswrite) { - llinfo("%p%s%08x\n", regaddr, iswrite ? "<-" : "->", regval); + _llinfo("%p%s%08x\n", regaddr, iswrite ? "<-" : "->", regval); } #endif @@ -657,7 +657,7 @@ static void sam_checkreg(uintptr_t regaddr, uint32_t regval, bool iswrite) { /* No.. More than one. */ - llinfo("[repeats %d more times]\n", count); + _llinfo("[repeats %d more times]\n", count); } } @@ -737,15 +737,15 @@ static void sam_dumpep(struct sam_usbdev_s *priv, uint8_t epno) { /* Global Registers */ - llinfo("Global Registers:\n"); - llinfo(" FRMNUM: %08x\n", sam_getreg(SAM_UDP_FRMNUM)); - llinfo("GLBSTAT: %08x\n", sam_getreg(SAM_UDP_GLBSTAT)); - llinfo(" FADDR: %08x\n", sam_getreg(SAM_UDP_FADDR)); - llinfo(" IMR: %08x\n", sam_getreg(SAM_UDP_IMR)); - llinfo(" ISR: %08x\n", sam_getreg(SAM_UDP_ISR)); - llinfo(" RSTEP: %08x\n", sam_getreg(SAM_UDP_RSTEP)); - llinfo(" TXVC: %08x\n", sam_getreg(SAM_UDP_TXVC)); - llinfo(" CSR[%d]: %08x\n", epno, sam_getreg(SAM_UDPEP_CSR(epno))); + _llinfo("Global Registers:\n"); + _llinfo(" FRMNUM: %08x\n", sam_getreg(SAM_UDP_FRMNUM)); + _llinfo("GLBSTAT: %08x\n", sam_getreg(SAM_UDP_GLBSTAT)); + _llinfo(" FADDR: %08x\n", sam_getreg(SAM_UDP_FADDR)); + _llinfo(" IMR: %08x\n", sam_getreg(SAM_UDP_IMR)); + _llinfo(" ISR: %08x\n", sam_getreg(SAM_UDP_ISR)); + _llinfo(" RSTEP: %08x\n", sam_getreg(SAM_UDP_RSTEP)); + _llinfo(" TXVC: %08x\n", sam_getreg(SAM_UDP_TXVC)); + _llinfo(" CSR[%d]: %08x\n", epno, sam_getreg(SAM_UDPEP_CSR(epno))); } #endif diff --git a/arch/arm/src/sam34/sam_wdt.c b/arch/arm/src/sam34/sam_wdt.c index d54297f5ab..aa033f4e87 100644 --- a/arch/arm/src/sam34/sam_wdt.c +++ b/arch/arm/src/sam34/sam_wdt.c @@ -183,7 +183,7 @@ static uint32_t sam34_getreg(uint32_t addr) { if (count == 4) { - llerr("...\n"); + _llerr("...\n"); } return val; @@ -200,7 +200,7 @@ static uint32_t sam34_getreg(uint32_t addr) { /* Yes.. then show how many times the value repeated */ - llerr("[repeats %d more times]\n", count-3); + _llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -212,7 +212,7 @@ static uint32_t sam34_getreg(uint32_t addr) /* Show the register value read */ - llerr("%08x->%08x\n", addr, val); + _llerr("%08x->%08x\n", addr, val); return val; } #endif @@ -230,7 +230,7 @@ static void sam34_putreg(uint32_t val, uint32_t addr) { /* Show the register value being written */ - llerr("%08x<-%08x\n", addr, val); + _llerr("%08x<-%08x\n", addr, val); /* Write the value */ diff --git a/arch/arm/src/sama5/sam_adc.c b/arch/arm/src/sama5/sam_adc.c index 35bb4ea9fe..24099c0d92 100644 --- a/arch/arm/src/sama5/sam_adc.c +++ b/arch/arm/src/sama5/sam_adc.c @@ -544,7 +544,7 @@ static bool sam_adc_checkreg(struct sam_adc_s *priv, bool wr, { /* Yes... show how many times we did it */ - llerr("...[Repeats %d times]...\n", priv->ntimes); + _llerr("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -2187,7 +2187,7 @@ uint32_t sam_adc_getreg(struct sam_adc_s *priv, uintptr_t address) if (sam_adc_checkreg(priv, false, regval, address)) { - llerr("%08x->%08x\n", address, regval); + _llerr("%08x->%08x\n", address, regval); } return regval; @@ -2207,7 +2207,7 @@ void sam_adc_putreg(struct sam_adc_s *priv, uintptr_t address, uint32_t regval) { if (sam_adc_checkreg(priv, true, regval, address)) { - llerr("%08x<-%08x\n", address, regval); + _llerr("%08x<-%08x\n", address, regval); } putreg32(regval, address); diff --git a/arch/arm/src/sama5/sam_allocateheap.c b/arch/arm/src/sama5/sam_allocateheap.c index c666b09ce6..f772735bae 100644 --- a/arch/arm/src/sama5/sam_allocateheap.c +++ b/arch/arm/src/sama5/sam_allocateheap.c @@ -312,9 +312,9 @@ void up_addregion(void) } else { - llerr("ERROR: SDRAM memory not added to heap. CONFIG_MM_NREGIONS=%d\n", + _llerr("ERROR: SDRAM memory not added to heap. CONFIG_MM_NREGIONS=%d\n", CONFIG_MM_REGIONS); - llerr(" Increase the size of CONFIG_MM_NREGIONS\n"); + _llerr(" Increase the size of CONFIG_MM_NREGIONS\n"); } #endif @@ -331,9 +331,9 @@ void up_addregion(void) } else { - llerr("ERROR: CS0 memory not added to heap. CONFIG_MM_NREGIONS=%d\n", + _llerr("ERROR: CS0 memory not added to heap. CONFIG_MM_NREGIONS=%d\n", CONFIG_MM_REGIONS); - llerr(" Increase the size of CONFIG_MM_NREGIONS\n"); + _llerr(" Increase the size of CONFIG_MM_NREGIONS\n"); } #endif @@ -350,9 +350,9 @@ void up_addregion(void) } else { - llerr("ERROR: CS1 memory not added to heap. CONFIG_MM_NREGIONS=%d\n", + _llerr("ERROR: CS1 memory not added to heap. CONFIG_MM_NREGIONS=%d\n", CONFIG_MM_REGIONS); - llerr(" Increase the size of CONFIG_MM_NREGIONS\n"); + _llerr(" Increase the size of CONFIG_MM_NREGIONS\n"); } #endif @@ -369,9 +369,9 @@ void up_addregion(void) } else { - llerr("ERROR: CS2 memory not added to heap. CONFIG_MM_NREGIONS=%d\n", + _llerr("ERROR: CS2 memory not added to heap. CONFIG_MM_NREGIONS=%d\n", CONFIG_MM_REGIONS); - llerr(" Increase the size of CONFIG_MM_NREGIONS\n"); + _llerr(" Increase the size of CONFIG_MM_NREGIONS\n"); } #endif @@ -388,9 +388,9 @@ void up_addregion(void) } else { - llerr("ERROR: CS3 memory not added to heap. CONFIG_MM_NREGIONS=%d\n", + _llerr("ERROR: CS3 memory not added to heap. CONFIG_MM_NREGIONS=%d\n", CONFIG_MM_REGIONS); - llerr(" Increase the size of CONFIG_MM_NREGIONS\n"); + _llerr(" Increase the size of CONFIG_MM_NREGIONS\n"); } #endif @@ -398,9 +398,9 @@ void up_addregion(void) if (nregions > 0) { - llerr("ERROR: Not all regions added to heap: %d added, but CONFIG_MM_NREGIONS=%d\n", + _llerr("ERROR: Not all regions added to heap: %d added, but CONFIG_MM_NREGIONS=%d\n", CONFIG_MM_REGIONS - nregions, CONFIG_MM_REGIONS); - llerr(" Decrease the size of CONFIG_MM_NREGIONS\n"); + _llerr(" Decrease the size of CONFIG_MM_NREGIONS\n"); } } #endif diff --git a/arch/arm/src/sama5/sam_can.c b/arch/arm/src/sama5/sam_can.c index c09c4fd610..bb580c9e14 100644 --- a/arch/arm/src/sama5/sam_can.c +++ b/arch/arm/src/sama5/sam_can.c @@ -371,7 +371,7 @@ static uint32_t can_getreg(FAR struct sam_can_s *priv, int offset) { if (priv->count == 4) { - llerr("...\n"); + _llerr("...\n"); } return regval; @@ -388,7 +388,7 @@ static uint32_t can_getreg(FAR struct sam_can_s *priv, int offset) { /* Yes.. then show how many times the value repeated */ - llerr("[repeats %d more times]\n", priv->count - 3); + _llerr("[repeats %d more times]\n", priv->count - 3); } /* Save the new address, value, and count */ @@ -400,7 +400,7 @@ static uint32_t can_getreg(FAR struct sam_can_s *priv, int offset) /* Show the register value read */ - llerr("%08x->%08x\n", regaddr, regval); + _llerr("%08x->%08x\n", regaddr, regval); return regval; } @@ -437,7 +437,7 @@ static void can_putreg(FAR struct sam_can_s *priv, int offset, uint32_t regval) /* Show the register value being written */ - llerr("%08x<-%08x\n", regaddr, regval); + _llerr("%08x<-%08x\n", regaddr, regval); /* Write the value */ @@ -483,17 +483,17 @@ static void can_dumpctrlregs(FAR struct sam_can_s *priv, FAR const char *msg) /* CAN control and status registers */ - llerr(" MR: %08x IMR: %08x SR: %08x\n", + _llerr(" MR: %08x IMR: %08x SR: %08x\n", getreg32(config->base + SAM_CAN_MR_OFFSET), getreg32(config->base + SAM_CAN_IMR_OFFSET), getreg32(config->base + SAM_CAN_SR_OFFSET)); - llerr(" BR: %08x TIM: %08x TIMESTP: %08x\n", + _llerr(" BR: %08x TIM: %08x TIMESTP: %08x\n", getreg32(config->base + SAM_CAN_BR_OFFSET), getreg32(config->base + SAM_CAN_TIM_OFFSET), getreg32(config->base + SAM_CAN_TIMESTP_OFFSET)); - llerr(" ECR: %08x WPMR: %08x WPSR: %08x\n", + _llerr(" ECR: %08x WPMR: %08x WPSR: %08x\n", getreg32(config->base + SAM_CAN_ECR_OFFSET), getreg32(config->base + SAM_CAN_TCR_OFFSET), getreg32(config->base + SAM_CAN_ACR_OFFSET)); @@ -533,17 +533,17 @@ static void can_dumpmbregs(FAR struct sam_can_s *priv, FAR const char *msg) for (i = 0; i < SAM_CAN_NMAILBOXES; i++) { mbbase = config->base + SAM_CAN_MBn_OFFSET(i); - llerr(" MB%d:\n", i); + _llerr(" MB%d:\n", i); /* CAN mailbox registers */ - llerr(" MMR: %08x MAM: %08x MID: %08x MFID: %08x\n", + _llerr(" MMR: %08x MAM: %08x MID: %08x MFID: %08x\n", getreg32(mbbase + SAM_CAN_MMR_OFFSET), getreg32(mbbase + SAM_CAN_MAM_OFFSET), getreg32(mbbase + SAM_CAN_MID_OFFSET), getreg32(mbbase + SAM_CAN_MFID_OFFSET)); - llerr(" MSR: %08x MDL: %08x MDH: %08x\n", + _llerr(" MSR: %08x MDL: %08x MDH: %08x\n", getreg32(mbbase + SAM_CAN_MSR_OFFSET), getreg32(mbbase + SAM_CAN_MDL_OFFSET), getreg32(mbbase + SAM_CAN_MDH_OFFSET)); diff --git a/arch/arm/src/sama5/sam_ehci.c b/arch/arm/src/sama5/sam_ehci.c index 731290b6ab..b39d925c8b 100644 --- a/arch/arm/src/sama5/sam_ehci.c +++ b/arch/arm/src/sama5/sam_ehci.c @@ -628,7 +628,7 @@ static uint32_t sam_swap32(uint32_t value) static void sam_printreg(volatile uint32_t *regaddr, uint32_t regval, bool iswrite) { - llerr("%08x%s%08x\n", (uintptr_t)regaddr, iswrite ? "<-" : "->", regval); + _llerr("%08x%s%08x\n", (uintptr_t)regaddr, iswrite ? "<-" : "->", regval); } #endif @@ -679,7 +679,7 @@ static void sam_checkreg(volatile uint32_t *regaddr, uint32_t regval, bool iswri { /* No.. More than one. */ - llerr("[repeats %d more times]\n", count); + _llerr("[repeats %d more times]\n", count); } } diff --git a/arch/arm/src/sama5/sam_emaca.c b/arch/arm/src/sama5/sam_emaca.c index 86d0b5ffa1..04267d09a8 100644 --- a/arch/arm/src/sama5/sam_emaca.c +++ b/arch/arm/src/sama5/sam_emaca.c @@ -461,7 +461,7 @@ static bool sam_checkreg(struct sam_emac_s *priv, bool wr, uint32_t regval, { /* Yes... show how many times we did it */ - llerr("...[Repeats %d times]...\n", priv->ntimes); + _llerr("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -493,7 +493,7 @@ static uint32_t sam_getreg(struct sam_emac_s *priv, uintptr_t address) if (sam_checkreg(priv, false, regval, address)) { - llerr("%08x->%08x\n", address, regval); + _llerr("%08x->%08x\n", address, regval); } return regval; @@ -514,7 +514,7 @@ static void sam_putreg(struct sam_emac_s *priv, uintptr_t address, { if (sam_checkreg(priv, true, regval, address)) { - llerr("%08x<-%08x\n", address, regval); + _llerr("%08x<-%08x\n", address, regval); } putreg32(regval, address); diff --git a/arch/arm/src/sama5/sam_emacb.c b/arch/arm/src/sama5/sam_emacb.c index f36722abb8..66155406e9 100644 --- a/arch/arm/src/sama5/sam_emacb.c +++ b/arch/arm/src/sama5/sam_emacb.c @@ -820,7 +820,7 @@ static bool sam_checkreg(struct sam_emac_s *priv, bool wr, uint32_t regval, { /* Yes... show how many times we did it */ - llerr("...[Repeats %d times]...\n", priv->ntimes); + _llerr("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -853,7 +853,7 @@ static uint32_t sam_getreg(struct sam_emac_s *priv, uint16_t offset) #ifdef CONFIG_SAMA5_EMACB_REGDEBUG if (sam_checkreg(priv, false, regval, regaddr)) { - llerr("%08x->%08x\n", regaddr, regval); + _llerr("%08x->%08x\n", regaddr, regval); } #endif @@ -877,7 +877,7 @@ static void sam_putreg(struct sam_emac_s *priv, uint16_t offset, #ifdef CONFIG_SAMA5_EMACB_REGDEBUG if (sam_checkreg(priv, true, regval, regaddr)) { - llerr("%08x<-%08x\n", regaddr, regval); + _llerr("%08x<-%08x\n", regaddr, regval); } #endif diff --git a/arch/arm/src/sama5/sam_gmac.c b/arch/arm/src/sama5/sam_gmac.c index 078841fbb1..3bf136c310 100644 --- a/arch/arm/src/sama5/sam_gmac.c +++ b/arch/arm/src/sama5/sam_gmac.c @@ -392,7 +392,7 @@ static bool sam_checkreg(struct sam_gmac_s *priv, bool wr, uint32_t regval, { /* Yes... show how many times we did it */ - llerr("...[Repeats %d times]...\n", priv->ntimes); + _llerr("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -424,7 +424,7 @@ static uint32_t sam_getreg(struct sam_gmac_s *priv, uintptr_t address) if (sam_checkreg(priv, false, regval, address)) { - llerr("%08x->%08x\n", address, regval); + _llerr("%08x->%08x\n", address, regval); } return regval; @@ -445,7 +445,7 @@ static void sam_putreg(struct sam_gmac_s *priv, uintptr_t address, { if (sam_checkreg(priv, true, regval, address)) { - llerr("%08x<-%08x\n", address, regval); + _llerr("%08x<-%08x\n", address, regval); } putreg32(regval, address); diff --git a/arch/arm/src/sama5/sam_hsmci.c b/arch/arm/src/sama5/sam_hsmci.c index 5bb44bec4d..026424fae7 100644 --- a/arch/arm/src/sama5/sam_hsmci.c +++ b/arch/arm/src/sama5/sam_hsmci.c @@ -725,7 +725,7 @@ static bool sam_checkreg(struct sam_dev_s *priv, bool wr, uint32_t value, { /* Yes... show how many times we did it */ - llerr("...[Repeats %d times]...\n", priv->ntimes); + _llerr("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -758,7 +758,7 @@ static inline uint32_t sam_getreg(struct sam_dev_s *priv, unsigned int offset) #ifdef CONFIG_SAMA5_HSMCI_REGDEBUG if (sam_checkreg(priv, false, value, address)) { - llerr("%08x->%08x\n", address, value); + _llerr("%08x->%08x\n", address, value); } #endif @@ -781,7 +781,7 @@ static inline void sam_putreg(struct sam_dev_s *priv, uint32_t value, #ifdef CONFIG_SAMA5_HSMCI_REGDEBUG if (sam_checkreg(priv, true, value, address)) { - llerr("%08x<-%08x\n", address, value); + _llerr("%08x<-%08x\n", address, value); } #endif diff --git a/arch/arm/src/sama5/sam_lcd.c b/arch/arm/src/sama5/sam_lcd.c index b1a0fd9760..eef9767adf 100644 --- a/arch/arm/src/sama5/sam_lcd.c +++ b/arch/arm/src/sama5/sam_lcd.c @@ -1021,7 +1021,7 @@ static bool sam_checkreg(bool wr, uint32_t regval, uintptr_t address) { /* Yes... show how many times we did it */ - llerr("...[Repeats %d times]...\n", g_lcdc.ntimes); + _llerr("...[Repeats %d times]...\n", g_lcdc.ntimes); } /* Save information about the new access */ @@ -1053,7 +1053,7 @@ static uint32_t sam_getreg(uintptr_t address) if (sam_checkreg(false, regval, address)) { - llerr("%08x->%08x\n", address, regval); + _llerr("%08x->%08x\n", address, regval); } return regval; @@ -1073,7 +1073,7 @@ static void sam_putreg(uintptr_t address, uint32_t regval) { if (sam_checkreg(true, regval, address)) { - llerr("%08x<-%08x\n", address, regval); + _llerr("%08x<-%08x\n", address, regval); } putreg32(regval, address); diff --git a/arch/arm/src/sama5/sam_memories.c b/arch/arm/src/sama5/sam_memories.c index d6b18aa792..6588309b88 100644 --- a/arch/arm/src/sama5/sam_memories.c +++ b/arch/arm/src/sama5/sam_memories.c @@ -766,7 +766,7 @@ uintptr_t sam_physregaddr(uintptr_t virtregaddr) * address */ - err("Bad virtual address: %08lx\n", virtregaddr); + _err("Bad virtual address: %08lx\n", virtregaddr); DEBUGPANIC(); return virtregaddr; } @@ -925,7 +925,7 @@ uintptr_t sam_physramaddr(uintptr_t virtramaddr) if (virtramaddr != 0) { - err("Bad virtual address: %08lx\n", virtramaddr); + _err("Bad virtual address: %08lx\n", virtramaddr); DEBUGPANIC(); } @@ -1058,7 +1058,7 @@ uintptr_t sam_virtramaddr(uintptr_t physramaddr) if (physramaddr != 0) { - err("Bad physical address: %08lx\n|", physramaddr); + _err("Bad physical address: %08lx\n|", physramaddr); DEBUGPANIC(); } diff --git a/arch/arm/src/sama5/sam_nand.c b/arch/arm/src/sama5/sam_nand.c index 425120b8d3..6cb56fea97 100644 --- a/arch/arm/src/sama5/sam_nand.c +++ b/arch/arm/src/sama5/sam_nand.c @@ -1163,7 +1163,7 @@ static void nand_dma_sampleinit(struct sam_nandcs_s *priv) #ifdef CONFIG_SAMA5_NAND_DMADEBUG static void nand_dma_sampledone(struct sam_nandcs_s *priv, int result) { - llerr("result: %d\n", result); + _llerr("result: %d\n", result); /* Sample the final registers */ @@ -3088,7 +3088,7 @@ bool nand_checkreg(bool wr, uintptr_t regaddr, uint32_t regval) { /* Yes... show how many times we did it */ - llerr("...[Repeats %d times]...\n", g_nand.ntimes); + _llerr("...[Repeats %d times]...\n", g_nand.ntimes); } /* Save information about the new access */ diff --git a/arch/arm/src/sama5/sam_nand.h b/arch/arm/src/sama5/sam_nand.h index 352b45b491..81e6cb8003 100644 --- a/arch/arm/src/sama5/sam_nand.h +++ b/arch/arm/src/sama5/sam_nand.h @@ -518,7 +518,7 @@ static inline uint32_t nand_getreg(uintptr_t regaddr) #ifdef CONFIG_SAMA5_NAND_REGDEBUG if (nand_checkreg(false, regaddr, regval)) { - llerr("%08x->%08x\n", regaddr, regval); + _llerr("%08x->%08x\n", regaddr, regval); } #endif @@ -538,7 +538,7 @@ static inline void nand_putreg(uintptr_t regaddr, uint32_t regval) #ifdef CONFIG_SAMA5_NAND_REGDEBUG if (nand_checkreg(true, regaddr, regval)) { - llerr("%08x<-%08x\n", regaddr, regval); + _llerr("%08x<-%08x\n", regaddr, regval); } #endif diff --git a/arch/arm/src/sama5/sam_ohci.c b/arch/arm/src/sama5/sam_ohci.c index e20a1adb24..76899223c6 100644 --- a/arch/arm/src/sama5/sam_ohci.c +++ b/arch/arm/src/sama5/sam_ohci.c @@ -524,7 +524,7 @@ static uint8_t g_bufalloc[SAM_BUFALLOC] #ifdef CONFIG_SAMA5_OHCI_REGDEBUG static void sam_printreg(uint32_t addr, uint32_t val, bool iswrite) { - llerr("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val); + _llerr("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val); } #endif @@ -574,7 +574,7 @@ static void sam_checkreg(uint32_t addr, uint32_t val, bool iswrite) { /* No.. More than one. */ - llerr("[repeats %d more times]\n", count); + _llerr("[repeats %d more times]\n", count); } } diff --git a/arch/arm/src/sama5/sam_pck.c b/arch/arm/src/sama5/sam_pck.c index 9b7e406a38..dc96ab678c 100644 --- a/arch/arm/src/sama5/sam_pck.c +++ b/arch/arm/src/sama5/sam_pck.c @@ -151,7 +151,7 @@ uint32_t sam_pck_configure(enum pckid_e pckid, enum pckid_clksrc_e clksrc, break; default: - err("ERROR: Unknown clock source\n"); + _err("ERROR: Unknown clock source\n"); return 0; } diff --git a/arch/arm/src/sama5/sam_pwm.c b/arch/arm/src/sama5/sam_pwm.c index 6fe331db44..4aac3affa8 100644 --- a/arch/arm/src/sama5/sam_pwm.c +++ b/arch/arm/src/sama5/sam_pwm.c @@ -689,7 +689,7 @@ static bool pwm_checkreg(FAR struct sam_pwm_s *pwm, bool wr, uint32_t regval, { /* Yes... show how many times we did it */ - llerr("...[Repeats %d times]...\n", pwm->count); + _llerr("...[Repeats %d times]...\n", pwm->count); } /* Save information about the new access */ @@ -733,7 +733,7 @@ static uint32_t pwm_getreg(struct sam_pwm_chan_s *chan, int offset) #ifdef CONFIG_SAMA5_PWM_REGDEBUG if (pwm_checkreg(&g_pwm, false, regval, regaddr)) { - llerr("%08x->%08x\n", regaddr, regval); + _llerr("%08x->%08x\n", regaddr, regval); } #endif @@ -750,7 +750,7 @@ static uint32_t pwm_getreg(struct sam_pwm_chan_s *chan, int offset) #ifdef CONFIG_SAMA5_PWM_REGDEBUG if (pwm_checkreg(pwm, false, regval, regaddr)) { - llerr("%08x->%08x\n", regaddr, regval); + _llerr("%08x->%08x\n", regaddr, regval); } #endif @@ -789,7 +789,7 @@ static uint32_t pwm_chan_getreg(struct sam_pwm_chan_s *chan, int offset) if (pwm_checkreg(chan->pwm, false, regval, regaddr)) #endif { - llerr("%08x->%08x\n", regaddr, regval); + _llerr("%08x->%08x\n", regaddr, regval); } #endif @@ -820,7 +820,7 @@ static void pwm_putreg(struct sam_pwm_chan_s *chan, int offset, #ifdef CONFIG_SAMA5_PWM_REGDEBUG if (pwm_checkreg(&g_pwm, true, regval, regaddr)) { - llerr("%08x<-%08x\n", regaddr, regval); + _llerr("%08x<-%08x\n", regaddr, regval); } #endif @@ -833,7 +833,7 @@ static void pwm_putreg(struct sam_pwm_chan_s *chan, int offset, #ifdef CONFIG_SAMA5_PWM_REGDEBUG if (pwm_checkreg(pwm, true, regval, regaddr)) { - llerr("%08x<-%08x\n", regaddr, regval); + _llerr("%08x<-%08x\n", regaddr, regval); } #endif @@ -869,7 +869,7 @@ static void pwm_chan_putreg(struct sam_pwm_chan_s *chan, int offset, if (pwm_checkreg(chan->pwm, true, regval, regaddr)) #endif { - llerr("%08x<-%08x\n", regaddr, regval); + _llerr("%08x<-%08x\n", regaddr, regval); } #endif diff --git a/arch/arm/src/sama5/sam_spi.c b/arch/arm/src/sama5/sam_spi.c index 0bc887534a..33cd3cb93e 100644 --- a/arch/arm/src/sama5/sam_spi.c +++ b/arch/arm/src/sama5/sam_spi.c @@ -409,7 +409,7 @@ static bool spi_checkreg(struct sam_spidev_s *spi, bool wr, uint32_t value, { /* Yes... show how many times we did it */ - llerr("...[Repeats %d times]...\n", spi->ntimes); + _llerr("...[Repeats %d times]...\n", spi->ntimes); } /* Save information about the new access */ @@ -443,7 +443,7 @@ static inline uint32_t spi_getreg(struct sam_spidev_s *spi, #ifdef CONFIG_SAMA5_SPI_REGDEBUG if (spi_checkreg(spi, false, value, address)) { - llerr("%08x->%08x\n", address, value); + _llerr("%08x->%08x\n", address, value); } #endif @@ -466,7 +466,7 @@ static inline void spi_putreg(struct sam_spidev_s *spi, uint32_t value, #ifdef CONFIG_SAMA5_SPI_REGDEBUG if (spi_checkreg(spi, true, value, address)) { - llerr("%08x<-%08x\n", address, value); + _llerr("%08x<-%08x\n", address, value); } #endif diff --git a/arch/arm/src/sama5/sam_ssc.c b/arch/arm/src/sama5/sam_ssc.c index d33b1588ff..46c564b66e 100644 --- a/arch/arm/src/sama5/sam_ssc.c +++ b/arch/arm/src/sama5/sam_ssc.c @@ -703,7 +703,7 @@ static bool ssc_checkreg(struct sam_ssc_s *priv, bool wr, uint32_t regval, { /* Yes... show how many times we did it */ - llerr("...[Repeats %d times]...\n", priv->count); + _llerr("...[Repeats %d times]...\n", priv->count); } /* Save information about the new access */ @@ -737,7 +737,7 @@ static inline uint32_t ssc_getreg(struct sam_ssc_s *priv, #ifdef CONFIG_SAMA5_SSC_REGDEBUG if (ssc_checkreg(priv, false, regval, regaddr)) { - llerr("%08x->%08x\n", regaddr, regval); + _llerr("%08x->%08x\n", regaddr, regval); } #endif @@ -760,7 +760,7 @@ static inline void ssc_putreg(struct sam_ssc_s *priv, unsigned int offset, #ifdef CONFIG_SAMA5_SSC_REGDEBUG if (ssc_checkreg(priv, true, regval, regaddr)) { - llerr("%08x<-%08x\n", regaddr, regval); + _llerr("%08x<-%08x\n", regaddr, regval); } #endif @@ -1090,7 +1090,7 @@ static void ssc_dma_sampleinit(struct sam_ssc_s *priv, #if defined(CONFIG_SAMA5_SSC_DMADEBUG) && defined(SSC_HAVE_RX) static void ssc_rxdma_sampledone(struct sam_ssc_s *priv, int result) { - llerr("result: %d\n", result); + _llerr("result: %d\n", result); /* Sample the final registers */ @@ -1155,7 +1155,7 @@ static void ssc_rxdma_sampledone(struct sam_ssc_s *priv, int result) #if defined(CONFIG_SAMA5_SSC_DMADEBUG) && defined(SSC_HAVE_TX) static void ssc_txdma_sampledone(struct sam_ssc_s *priv, int result) { - llerr("result: %d\n", result); + _llerr("result: %d\n", result); /* Sample the final registers */ diff --git a/arch/arm/src/sama5/sam_tc.c b/arch/arm/src/sama5/sam_tc.c index 5d51f82047..9ea38a333d 100644 --- a/arch/arm/src/sama5/sam_tc.c +++ b/arch/arm/src/sama5/sam_tc.c @@ -501,20 +501,20 @@ static void sam_regdump(struct sam_chan_s *chan, const char *msg) uintptr_t base; base = tc->base; - llerr("TC%d [%08x]: %s\n", tc->tc, (int)base, msg); - llerr(" BMR: %08x QIMR: %08x QISR: %08x WPMR: %08x\n", + _llerr("TC%d [%08x]: %s\n", tc->tc, (int)base, msg); + _llerr(" BMR: %08x QIMR: %08x QISR: %08x WPMR: %08x\n", getreg32(base+SAM_TC_BMR_OFFSET), getreg32(base+SAM_TC_QIMR_OFFSET), getreg32(base+SAM_TC_QISR_OFFSET), getreg32(base+SAM_TC_WPMR_OFFSET)); base = chan->base; - llerr("TC%d Channel %d [%08x]: %s\n", tc->tc, chan->chan, (int)base, msg); - llerr(" CMR: %08x SSMR: %08x RAB: %08x CV: %08x\n", + _llerr("TC%d Channel %d [%08x]: %s\n", tc->tc, chan->chan, (int)base, msg); + _llerr(" CMR: %08x SSMR: %08x RAB: %08x CV: %08x\n", getreg32(base+SAM_TC_CMR_OFFSET), getreg32(base+SAM_TC_SMMR_OFFSET), getreg32(base+SAM_TC_RAB_OFFSET), getreg32(base+SAM_TC_CV_OFFSET)); - llerr(" RA: %08x RB: %08x RC: %08x SR: %08x\n", + _llerr(" RA: %08x RB: %08x RC: %08x SR: %08x\n", getreg32(base+SAM_TC_RA_OFFSET), getreg32(base+SAM_TC_RB_OFFSET), getreg32(base+SAM_TC_RC_OFFSET), getreg32(base+SAM_TC_SR_OFFSET)); - llerr(" IMR: %08x\n", + _llerr(" IMR: %08x\n", getreg32(base+SAM_TC_IMR_OFFSET)); } #endif @@ -558,7 +558,7 @@ static bool sam_checkreg(struct sam_tc_s *tc, bool wr, uint32_t regaddr, { /* Yes... show how many times we did it */ - llerr("...[Repeats %d times]...\n", tc->ntimes); + _llerr("...[Repeats %d times]...\n", tc->ntimes); } /* Save information about the new access */ @@ -593,7 +593,7 @@ static inline uint32_t sam_tc_getreg(struct sam_chan_s *chan, #ifdef CONFIG_SAMA5_TC_REGDEBUG if (sam_checkreg(tc, false, regaddr, regval)) { - llerr("%08x->%08x\n", regaddr, regval); + _llerr("%08x->%08x\n", regaddr, regval); } #endif @@ -617,7 +617,7 @@ static inline void sam_tc_putreg(struct sam_chan_s *chan, uint32_t regval, #ifdef CONFIG_SAMA5_TC_REGDEBUG if (sam_checkreg(tc, true, regaddr, regval)) { - llerr("%08x<-%08x\n", regaddr, regval); + _llerr("%08x<-%08x\n", regaddr, regval); } #endif @@ -641,7 +641,7 @@ static inline uint32_t sam_chan_getreg(struct sam_chan_s *chan, #ifdef CONFIG_SAMA5_TC_REGDEBUG if (sam_checkreg(chan->tc, false, regaddr, regval)) { - llerr("%08x->%08x\n", regaddr, regval); + _llerr("%08x->%08x\n", regaddr, regval); } #endif @@ -664,7 +664,7 @@ static inline void sam_chan_putreg(struct sam_chan_s *chan, unsigned int offset, #ifdef CONFIG_SAMA5_TC_REGDEBUG if (sam_checkreg(chan->tc, true, regaddr, regval)) { - llerr("%08x<-%08x\n", regaddr, regval); + _llerr("%08x<-%08x\n", regaddr, regval); } #endif diff --git a/arch/arm/src/sama5/sam_twi.c b/arch/arm/src/sama5/sam_twi.c index aae56067bb..095fb7e895 100644 --- a/arch/arm/src/sama5/sam_twi.c +++ b/arch/arm/src/sama5/sam_twi.c @@ -369,7 +369,7 @@ static bool twi_checkreg(struct twi_dev_s *priv, bool wr, uint32_t value, { /* Yes... show how many times we did it */ - llerr("...[Repeats %d times]...\n", priv->ntimes); + _llerr("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -401,7 +401,7 @@ static uint32_t twi_getabs(struct twi_dev_s *priv, uintptr_t address) if (twi_checkreg(priv, false, value, address)) { - llerr("%08x->%08x\n", address, value); + _llerr("%08x->%08x\n", address, value); } return value; @@ -422,7 +422,7 @@ static void twi_putabs(struct twi_dev_s *priv, uintptr_t address, { if (twi_checkreg(priv, true, value, address)) { - llerr("%08x<-%08x\n", address, value); + _llerr("%08x<-%08x\n", address, value); } putreg32(value, address); diff --git a/arch/arm/src/sama5/sam_udphs.c b/arch/arm/src/sama5/sam_udphs.c index 00f85e6381..a5dba4368d 100644 --- a/arch/arm/src/sama5/sam_udphs.c +++ b/arch/arm/src/sama5/sam_udphs.c @@ -671,7 +671,7 @@ const struct trace_msg_t g_usb_trace_strings_intdecode[] = #ifdef CONFIG_SAMA5_UDPHS_REGDEBUG static void sam_printreg(uintptr_t regaddr, uint32_t regval, bool iswrite) { - llerr("%p%s%08x\n", regaddr, iswrite ? "<-" : "->", regval); + _llerr("%p%s%08x\n", regaddr, iswrite ? "<-" : "->", regval); } #endif @@ -722,7 +722,7 @@ static void sam_checkreg(uintptr_t regaddr, uint32_t regval, bool iswrite) { /* No.. More than one. */ - llerr("[repeats %d more times]\n", count); + _llerr("[repeats %d more times]\n", count); } } @@ -802,31 +802,31 @@ static void sam_dumpep(struct sam_usbdev_s *priv, int epno) { /* Global Registers */ - llerr("Global Register:\n"); - llerr(" CTRL: %04x\n", sam_getreg(SAM_UDPHS_CTRL)); - llerr(" FNUM: %04x\n", sam_getreg(SAM_UDPHS_FNUM)); - llerr(" IEN: %04x\n", sam_getreg(SAM_UDPHS_IEN)); - llerr(" INSTA: %04x\n", sam_getreg(SAM_UDPHS_INTSTA)); - llerr(" TST: %04x\n", sam_getreg(SAM_UDPHS_TST)); + _llerr("Global Register:\n"); + _llerr(" CTRL: %04x\n", sam_getreg(SAM_UDPHS_CTRL)); + _llerr(" FNUM: %04x\n", sam_getreg(SAM_UDPHS_FNUM)); + _llerr(" IEN: %04x\n", sam_getreg(SAM_UDPHS_IEN)); + _llerr(" INSTA: %04x\n", sam_getreg(SAM_UDPHS_INTSTA)); + _llerr(" TST: %04x\n", sam_getreg(SAM_UDPHS_TST)); /* Endpoint registers */ - llerr("Endpoint %d Register:\n", epno); - llerr(" CFG: %04x\n", sam_getreg(SAM_UDPHS_EPTCFG(epno))); - llerr(" CTL: %04x\n", sam_getreg(SAM_UDPHS_EPTCTL(epno))); - llerr(" STA: %04x\n", sam_getreg(SAM_UDPHS_EPTSTA(epno))); + _llerr("Endpoint %d Register:\n", epno); + _llerr(" CFG: %04x\n", sam_getreg(SAM_UDPHS_EPTCFG(epno))); + _llerr(" CTL: %04x\n", sam_getreg(SAM_UDPHS_EPTCTL(epno))); + _llerr(" STA: %04x\n", sam_getreg(SAM_UDPHS_EPTSTA(epno))); - llerr("DMA %d Register:\n", epno); + _llerr("DMA %d Register:\n", epno); if ((SAM_EPSET_DMA & SAM_EP_BIT(epno)) != 0) { - llerr(" NXTDSC: %04x\n", sam_getreg(SAM_UDPHS_DMANXTDSC(epno))); - llerr(" ADDRESS: %04x\n", sam_getreg(SAM_UDPHS_DMAADDRESS(epno))); - llerr(" CONTROL: %04x\n", sam_getreg(SAM_UDPHS_DMACONTROL(epno))); - llerr(" STATUS: %04x\n", sam_getreg(SAM_UDPHS_DMASTATUS(epno))); + _llerr(" NXTDSC: %04x\n", sam_getreg(SAM_UDPHS_DMANXTDSC(epno))); + _llerr(" ADDRESS: %04x\n", sam_getreg(SAM_UDPHS_DMAADDRESS(epno))); + _llerr(" CONTROL: %04x\n", sam_getreg(SAM_UDPHS_DMACONTROL(epno))); + _llerr(" STATUS: %04x\n", sam_getreg(SAM_UDPHS_DMASTATUS(epno))); } else { - llerr(" None\n"); + _llerr(" None\n"); } } #endif diff --git a/arch/arm/src/sama5/sam_wdt.c b/arch/arm/src/sama5/sam_wdt.c index be77357e97..aa16905888 100644 --- a/arch/arm/src/sama5/sam_wdt.c +++ b/arch/arm/src/sama5/sam_wdt.c @@ -185,7 +185,7 @@ static uint32_t sam_getreg(uintptr_t regaddr) { if (count == 4) { - llerr("...\n"); + _llerr("...\n"); } return regval; @@ -202,7 +202,7 @@ static uint32_t sam_getreg(uintptr_t regaddr) { /* Yes.. then show how many times the value repeated */ - llerr("[repeats %d more times]\n", count-3); + _llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -214,7 +214,7 @@ static uint32_t sam_getreg(uintptr_t regaddr) /* Show the register value read */ - llerr("%08x->%048\n", regaddr, regval); + _llerr("%08x->%048\n", regaddr, regval); return regval; } #endif @@ -232,7 +232,7 @@ static void sam_putreg(uint32_t regval, uintptr_t regaddr) { /* Show the register value being written */ - llerr("%08x<-%08x\n", regaddr, regval); + _llerr("%08x<-%08x\n", regaddr, regval); /* Write the value */ diff --git a/arch/arm/src/samdl/sam_idle.c b/arch/arm/src/samdl/sam_idle.c index b54d8d3a7d..a6fb024527 100644 --- a/arch/arm/src/samdl/sam_idle.c +++ b/arch/arm/src/samdl/sam_idle.c @@ -99,7 +99,7 @@ static void up_idlepm(void) /* Perform board-specific, state-dependent logic here */ - llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); + _llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); /* Then force the global state change */ diff --git a/arch/arm/src/samdl/sam_irq.c b/arch/arm/src/samdl/sam_irq.c index 0def4718bf..ea20c689bf 100644 --- a/arch/arm/src/samdl/sam_irq.c +++ b/arch/arm/src/samdl/sam_irq.c @@ -97,7 +97,7 @@ volatile uint32_t *g_current_regs[1]; static int sam_nmi(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! NMI received\n"); + _err("PANIC!!! NMI received\n"); PANIC(); return 0; } @@ -105,7 +105,7 @@ static int sam_nmi(int irq, FAR void *context) static int sam_pendsv(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! PendSV received\n"); + _err("PANIC!!! PendSV received\n"); PANIC(); return 0; } @@ -113,7 +113,7 @@ static int sam_pendsv(int irq, FAR void *context) static int sam_reserved(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Reserved interrupt\n"); + _err("PANIC!!! Reserved interrupt\n"); PANIC(); return 0; } diff --git a/arch/arm/src/samdl/sam_port.c b/arch/arm/src/samdl/sam_port.c index 58d0550df3..1b4cd115fb 100644 --- a/arch/arm/src/samdl/sam_port.c +++ b/arch/arm/src/samdl/sam_port.c @@ -538,16 +538,16 @@ int sam_dumpport(uint32_t pinset, const char *msg) /* The following requires exclusive access to the PORT registers */ flags = enter_critical_section(); - llerr("PORT%c pin: %d pinset: %08x base: %08x -- %s\n", + _llerr("PORT%c pin: %d pinset: %08x base: %08x -- %s\n", g_portchar[port], pin, pinset, base, msg); - llerr(" DIR: %08x OUT: %08x IN: %08x\n", + _llerr(" DIR: %08x OUT: %08x IN: %08x\n", getreg32(base + SAM_PORT_DIR_OFFSET), getreg32(base + SAM_PORT_OUT_OFFSET), getreg32(base + SAM_PORT_IN_OFFSET)); - llerr(" CTRL: %08x WRCONFIG: %08x\n", + _llerr(" CTRL: %08x WRCONFIG: %08x\n", getreg32(base + SAM_PORT_CTRL_OFFSET), getreg32(base + SAM_PORT_WRCONFIG_OFFSET)); - llerr(" PMUX[%08x]: %02x PINCFG[%08x]: %02x\n", + _llerr(" PMUX[%08x]: %02x PINCFG[%08x]: %02x\n", base + SAM_PORT_PMUX_OFFSET(pin), getreg8(base + SAM_PORT_PMUX_OFFSET(pin)), base + SAM_PORT_PINCFG_OFFSET(pin), diff --git a/arch/arm/src/samdl/sam_spi.c b/arch/arm/src/samdl/sam_spi.c index 6211147a85..1d8f2c4163 100644 --- a/arch/arm/src/samdl/sam_spi.c +++ b/arch/arm/src/samdl/sam_spi.c @@ -540,7 +540,7 @@ static bool spi_checkreg(struct sam_spidev_s *priv, bool wr, uint32_t regval, { /* Yes... show how many times we did it */ - llerr("...[Repeats %d times]...\n", priv->ntimes); + _llerr("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -573,7 +573,7 @@ static uint8_t spi_getreg8(struct sam_spidev_s *priv, unsigned int offset) #ifdef CONFIG_SAMDL_SPI_REGDEBUG if (spi_checkreg(priv, false, (uint32_t)regval, regaddr)) { - llerr("%08x->%02x\n", regaddr, regval); + _llerr("%08x->%02x\n", regaddr, regval); } #endif @@ -596,7 +596,7 @@ static void spi_putreg8(struct sam_spidev_s *priv, uint8_t regval, #ifdef CONFIG_SAMDL_SPI_REGDEBUG if (spi_checkreg(priv, true, (uint32_t)regval, regaddr)) { - llerr("%08x<-%02x\n", regaddr, regval); + _llerr("%08x<-%02x\n", regaddr, regval); } #endif @@ -619,7 +619,7 @@ static uint16_t spi_getreg16(struct sam_spidev_s *priv, unsigned int offset) #ifdef CONFIG_SAMDL_SPI_REGDEBUG if (spi_checkreg(priv, false, (uint32_t)regval, regaddr)) { - llerr("%08x->%04x\n", regaddr, regval); + _llerr("%08x->%04x\n", regaddr, regval); } #endif @@ -642,7 +642,7 @@ static void spi_putreg16(struct sam_spidev_s *priv, uint16_t regval, #ifdef CONFIG_SAMDL_SPI_REGDEBUG if (spi_checkreg(priv, true, (uint32_t)regval, regaddr)) { - llerr("%08x<-%04x\n", regaddr, regval); + _llerr("%08x<-%04x\n", regaddr, regval); } #endif @@ -665,7 +665,7 @@ static uint32_t spi_getreg32(struct sam_spidev_s *priv, unsigned int offset) #ifdef CONFIG_SAMDL_SPI_REGDEBUG if (spi_checkreg(priv, false, regval, regaddr)) { - llerr("%08x->%08x\n", regaddr, regval); + _llerr("%08x->%08x\n", regaddr, regval); } #endif @@ -688,7 +688,7 @@ static void spi_putreg32(struct sam_spidev_s *priv, uint32_t regval, #ifdef CONFIG_SAMDL_SPI_REGDEBUG if (spi_checkreg(priv, true, regval, regaddr)) { - llerr("%08x<-%08x\n", regaddr, regval); + _llerr("%08x<-%08x\n", regaddr, regval); } #endif diff --git a/arch/arm/src/samv7/sam_emac.c b/arch/arm/src/samv7/sam_emac.c index b11150ffaa..f43d432b68 100644 --- a/arch/arm/src/samv7/sam_emac.c +++ b/arch/arm/src/samv7/sam_emac.c @@ -966,7 +966,7 @@ static bool sam_checkreg(struct sam_emac_s *priv, bool wr, uint32_t regval, { /* Yes... show how many times we did it */ - llerr("...[Repeats %d times]...\n", priv->ntimes); + _llerr("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -999,7 +999,7 @@ static uint32_t sam_getreg(struct sam_emac_s *priv, uint16_t offset) #ifdef CONFIG_SAMV7_EMAC_REGDEBUG if (sam_checkreg(priv, false, regval, regaddr)) { - llerr("%08x->%08x\n", regaddr, regval); + _llerr("%08x->%08x\n", regaddr, regval); } #endif @@ -1023,7 +1023,7 @@ static void sam_putreg(struct sam_emac_s *priv, uint16_t offset, #ifdef CONFIG_SAMV7_EMAC_REGDEBUG if (sam_checkreg(priv, true, regval, regaddr)) { - llerr("%08x<-%08x\n", regaddr, regval); + _llerr("%08x<-%08x\n", regaddr, regval); } #endif diff --git a/arch/arm/src/samv7/sam_hsmci.c b/arch/arm/src/samv7/sam_hsmci.c index 8c487a75fd..ec664e0e93 100644 --- a/arch/arm/src/samv7/sam_hsmci.c +++ b/arch/arm/src/samv7/sam_hsmci.c @@ -653,7 +653,7 @@ static bool sam_checkreg(struct sam_dev_s *priv, bool wr, uint32_t value, { /* Yes... show how many times we did it */ - llerr("...[Repeats %d times]...\n", priv->ntimes); + _llerr("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -686,7 +686,7 @@ static inline uint32_t sam_getreg(struct sam_dev_s *priv, unsigned int offset) #ifdef CONFIG_SAMV7_HSMCI_REGDEBUG if (sam_checkreg(priv, false, value, address)) { - llerr("%08x->%08x\n", address, value); + _llerr("%08x->%08x\n", address, value); } #endif @@ -709,7 +709,7 @@ static inline void sam_putreg(struct sam_dev_s *priv, uint32_t value, #ifdef CONFIG_SAMV7_HSMCI_REGDEBUG if (sam_checkreg(priv, true, value, address)) { - llerr("%08x<-%08x\n", address, value); + _llerr("%08x<-%08x\n", address, value); } #endif diff --git a/arch/arm/src/samv7/sam_irq.c b/arch/arm/src/samv7/sam_irq.c index 4c729272e4..faf021fa47 100644 --- a/arch/arm/src/samv7/sam_irq.c +++ b/arch/arm/src/samv7/sam_irq.c @@ -177,7 +177,7 @@ static void sam_dumpnvic(const char *msg, int irq) static int sam_nmi(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! NMI received\n"); + _err("PANIC!!! NMI received\n"); PANIC(); return 0; } @@ -185,7 +185,7 @@ static int sam_nmi(int irq, FAR void *context) static int sam_busfault(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS)); + _err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS)); PANIC(); return 0; } @@ -193,7 +193,7 @@ static int sam_busfault(int irq, FAR void *context) static int sam_usagefault(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS)); + _err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS)); PANIC(); return 0; } @@ -201,7 +201,7 @@ static int sam_usagefault(int irq, FAR void *context) static int sam_pendsv(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! PendSV received\n"); + _err("PANIC!!! PendSV received\n"); PANIC(); return 0; } @@ -209,7 +209,7 @@ static int sam_pendsv(int irq, FAR void *context) static int sam_errmonitor(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Debug Monitor received\n"); + _err("PANIC!!! Debug Monitor received\n"); PANIC(); return 0; } @@ -217,7 +217,7 @@ static int sam_errmonitor(int irq, FAR void *context) static int sam_reserved(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Reserved interrupt\n"); + _err("PANIC!!! Reserved interrupt\n"); PANIC(); return 0; } diff --git a/arch/arm/src/samv7/sam_mcan.c b/arch/arm/src/samv7/sam_mcan.c index ab169b13af..1cf299e055 100644 --- a/arch/arm/src/samv7/sam_mcan.c +++ b/arch/arm/src/samv7/sam_mcan.c @@ -1195,7 +1195,7 @@ static uint32_t mcan_getreg(FAR struct sam_mcan_s *priv, int offset) { if (priv->count == 4) { - llerr("...\n"); + _llerr("...\n"); } return regval; @@ -1212,7 +1212,7 @@ static uint32_t mcan_getreg(FAR struct sam_mcan_s *priv, int offset) { /* Yes.. then show how many times the value repeated */ - llerr("[repeats %d more times]\n", priv->count - 3); + _llerr("[repeats %d more times]\n", priv->count - 3); } /* Save the new address, value, and count */ @@ -1224,7 +1224,7 @@ static uint32_t mcan_getreg(FAR struct sam_mcan_s *priv, int offset) /* Show the register value read */ - llerr("%08x->%08x\n", regaddr, regval); + _llerr("%08x->%08x\n", regaddr, regval); return regval; } @@ -1261,7 +1261,7 @@ static void mcan_putreg(FAR struct sam_mcan_s *priv, int offset, uint32_t regval /* Show the register value being written */ - llerr("%08x<-%08x\n", regaddr, regval); + _llerr("%08x<-%08x\n", regaddr, regval); /* Write the value */ @@ -1296,70 +1296,70 @@ static void mcan_dumpregs(FAR struct sam_mcan_s *priv, FAR const char *msg) { FAR const struct sam_config_s *config = priv->config; - llerr("MCAN%d Registers: %s\n", config->port, msg); - llerr(" Base: %08x\n", config->base); + _llerr("MCAN%d Registers: %s\n", config->port, msg); + _llerr(" Base: %08x\n", config->base); - llerr(" CUST: %08x FBTP: %08x TEST: %08x RWD: %08x\n", + _llerr(" CUST: %08x FBTP: %08x TEST: %08x RWD: %08x\n", getreg32(config->base + SAM_MCAN_CUST_OFFSET), getreg32(config->base + SAM_MCAN_FBTP_OFFSET), getreg32(config->base + SAM_MCAN_TEST_OFFSET), getreg32(config->base + SAM_MCAN_RWD_OFFSET)); - llerr(" CCCR: %08x BTP: %08x TSCC: %08x TSCV: %08x\n", + _llerr(" CCCR: %08x BTP: %08x TSCC: %08x TSCV: %08x\n", getreg32(config->base + SAM_MCAN_CCCR_OFFSET), getreg32(config->base + SAM_MCAN_BTP_OFFSET), getreg32(config->base + SAM_MCAN_TSCC_OFFSET), getreg32(config->base + SAM_MCAN_TSCV_OFFSET)); - llerr(" TOCC: %08x TOCV: %08x ECR: %08x PSR: %08x\n", + _llerr(" TOCC: %08x TOCV: %08x ECR: %08x PSR: %08x\n", getreg32(config->base + SAM_MCAN_TOCC_OFFSET), getreg32(config->base + SAM_MCAN_TOCV_OFFSET), getreg32(config->base + SAM_MCAN_ECR_OFFSET), getreg32(config->base + SAM_MCAN_PSR_OFFSET)); - llerr(" IR: %08x IE: %08x ILS: %08x ILE: %08x\n", + _llerr(" IR: %08x IE: %08x ILS: %08x ILE: %08x\n", getreg32(config->base + SAM_MCAN_IR_OFFSET), getreg32(config->base + SAM_MCAN_IE_OFFSET), getreg32(config->base + SAM_MCAN_ILS_OFFSET), getreg32(config->base + SAM_MCAN_ILE_OFFSET)); - llerr(" GFC: %08x SIDFC: %08x XIDFC: %08x XIDAM: %08x\n", + _llerr(" GFC: %08x SIDFC: %08x XIDFC: %08x XIDAM: %08x\n", getreg32(config->base + SAM_MCAN_GFC_OFFSET), getreg32(config->base + SAM_MCAN_SIDFC_OFFSET), getreg32(config->base + SAM_MCAN_XIDFC_OFFSET), getreg32(config->base + SAM_MCAN_XIDAM_OFFSET)); - llerr(" HPMS: %08x NDAT1: %08x NDAT2: %08x RXF0C: %08x\n", + _llerr(" HPMS: %08x NDAT1: %08x NDAT2: %08x RXF0C: %08x\n", getreg32(config->base + SAM_MCAN_HPMS_OFFSET), getreg32(config->base + SAM_MCAN_NDAT1_OFFSET), getreg32(config->base + SAM_MCAN_NDAT2_OFFSET), getreg32(config->base + SAM_MCAN_RXF0C_OFFSET)); - llerr(" RXF0S: %08x FXF0A: %08x RXBC: %08x RXF1C: %08x\n", + _llerr(" RXF0S: %08x FXF0A: %08x RXBC: %08x RXF1C: %08x\n", getreg32(config->base + SAM_MCAN_RXF0S_OFFSET), getreg32(config->base + SAM_MCAN_RXF0A_OFFSET), getreg32(config->base + SAM_MCAN_RXBC_OFFSET), getreg32(config->base + SAM_MCAN_RXF1C_OFFSET)); - llerr(" RXF1S: %08x FXF1A: %08x RXESC: %08x TXBC: %08x\n", + _llerr(" RXF1S: %08x FXF1A: %08x RXESC: %08x TXBC: %08x\n", getreg32(config->base + SAM_MCAN_RXF1S_OFFSET), getreg32(config->base + SAM_MCAN_RXF1A_OFFSET), getreg32(config->base + SAM_MCAN_RXESC_OFFSET), getreg32(config->base + SAM_MCAN_TXBC_OFFSET)); - llerr(" TXFQS: %08x TXESC: %08x TXBRP: %08x TXBAR: %08x\n", + _llerr(" TXFQS: %08x TXESC: %08x TXBRP: %08x TXBAR: %08x\n", getreg32(config->base + SAM_MCAN_TXFQS_OFFSET), getreg32(config->base + SAM_MCAN_TXESC_OFFSET), getreg32(config->base + SAM_MCAN_TXBRP_OFFSET), getreg32(config->base + SAM_MCAN_TXBAR_OFFSET)); - llerr(" TXBCR: %08x TXBTO: %08x TXBCF: %08x TXBTIE: %08x\n", + _llerr(" TXBCR: %08x TXBTO: %08x TXBCF: %08x TXBTIE: %08x\n", getreg32(config->base + SAM_MCAN_TXBCR_OFFSET), getreg32(config->base + SAM_MCAN_TXBTO_OFFSET), getreg32(config->base + SAM_MCAN_TXBCF_OFFSET), getreg32(config->base + SAM_MCAN_TXBTIE_OFFSET)); - llerr("TXBCIE: %08x TXEFC: %08x TXEFS: %08x TXEFA: %08x\n", + _llerr("TXBCIE: %08x TXEFC: %08x TXEFS: %08x TXEFA: %08x\n", getreg32(config->base + SAM_MCAN_TXBCIE_OFFSET), getreg32(config->base + SAM_MCAN_TXEFC_OFFSET), getreg32(config->base + SAM_MCAN_TXEFS_OFFSET), diff --git a/arch/arm/src/samv7/sam_pck.c b/arch/arm/src/samv7/sam_pck.c index ddfc7371fa..3511d0d9ce 100644 --- a/arch/arm/src/samv7/sam_pck.c +++ b/arch/arm/src/samv7/sam_pck.c @@ -128,7 +128,7 @@ uint32_t sam_pck_configure(enum pckid_e pckid, enum pckid_clksrc_e clksrc, break; default: - err("ERROR: Unknown clock source\n"); + _err("ERROR: Unknown clock source\n"); return 0; } @@ -272,7 +272,7 @@ uint32_t sam_pck_frequency(enum pckid_e pckid) break; default: - err("ERROR: Unknown clock source\n"); + _err("ERROR: Unknown clock source\n"); return 0; } diff --git a/arch/arm/src/samv7/sam_qspi.c b/arch/arm/src/samv7/sam_qspi.c index 3418d183a6..569f374702 100644 --- a/arch/arm/src/samv7/sam_qspi.c +++ b/arch/arm/src/samv7/sam_qspi.c @@ -374,7 +374,7 @@ static bool qspi_checkreg(struct sam_qspidev_s *priv, bool wr, uint32_t value, { /* Yes... show how many times we did it */ - llerr("...[Repeats %d times]...\n", priv->ntimes); + _llerr("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -408,7 +408,7 @@ static inline uint32_t qspi_getreg(struct sam_qspidev_s *priv, #ifdef CONFIG_SAMV7_QSPI_REGDEBUG if (qspi_checkreg(priv, false, value, address)) { - llerr("%08x->%08x\n", address, value); + _llerr("%08x->%08x\n", address, value); } #endif @@ -431,7 +431,7 @@ static inline void qspi_putreg(struct sam_qspidev_s *priv, uint32_t value, #ifdef CONFIG_SAMV7_QSPI_REGDEBUG if (qspi_checkreg(priv, true, value, address)) { - llerr("%08x<-%08x\n", address, value); + _llerr("%08x<-%08x\n", address, value); } #endif diff --git a/arch/arm/src/samv7/sam_rswdt.c b/arch/arm/src/samv7/sam_rswdt.c index a097a7056f..3723a0bc83 100644 --- a/arch/arm/src/samv7/sam_rswdt.c +++ b/arch/arm/src/samv7/sam_rswdt.c @@ -185,7 +185,7 @@ static uint32_t sam_getreg(uintptr_t regaddr) { if (count == 4) { - llerr("...\n"); + _llerr("...\n"); } return regval; @@ -202,7 +202,7 @@ static uint32_t sam_getreg(uintptr_t regaddr) { /* Yes.. then show how many times the value repeated */ - llerr("[repeats %d more times]\n", count-3); + _llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -214,7 +214,7 @@ static uint32_t sam_getreg(uintptr_t regaddr) /* Show the register value read */ - llerr("%08x->%048\n", regaddr, regval); + _llerr("%08x->%048\n", regaddr, regval); return regval; } #endif @@ -232,7 +232,7 @@ static void sam_putreg(uint32_t regval, uintptr_t regaddr) { /* Show the register value being written */ - llerr("%08x<-%08x\n", regaddr, regval); + _llerr("%08x<-%08x\n", regaddr, regval); /* Write the value */ diff --git a/arch/arm/src/samv7/sam_spi.c b/arch/arm/src/samv7/sam_spi.c index 7f200b0422..7af29d3a70 100644 --- a/arch/arm/src/samv7/sam_spi.c +++ b/arch/arm/src/samv7/sam_spi.c @@ -428,7 +428,7 @@ static bool spi_checkreg(struct sam_spidev_s *spi, bool wr, uint32_t value, { /* Yes... show how many times we did it */ - llerr("...[Repeats %d times]...\n", spi->ntimes); + _llerr("...[Repeats %d times]...\n", spi->ntimes); } /* Save information about the new access */ @@ -462,7 +462,7 @@ static inline uint32_t spi_getreg(struct sam_spidev_s *spi, #ifdef CONFIG_SAMV7_SPI_REGDEBUG if (spi_checkreg(spi, false, value, address)) { - llerr("%08x->%08x\n", address, value); + _llerr("%08x->%08x\n", address, value); } #endif @@ -485,7 +485,7 @@ static inline void spi_putreg(struct sam_spidev_s *spi, uint32_t value, #ifdef CONFIG_SAMV7_SPI_REGDEBUG if (spi_checkreg(spi, true, value, address)) { - llerr("%08x<-%08x\n", address, value); + _llerr("%08x<-%08x\n", address, value); } #endif diff --git a/arch/arm/src/samv7/sam_spi_slave.c b/arch/arm/src/samv7/sam_spi_slave.c index 80d6f436e0..574b5ab0bf 100644 --- a/arch/arm/src/samv7/sam_spi_slave.c +++ b/arch/arm/src/samv7/sam_spi_slave.c @@ -248,7 +248,7 @@ static bool spi_checkreg(struct sam_spidev_s *priv, bool wr, uint32_t value, { /* Yes... show how many times we did it */ - llerr("...[Repeats %d times]...\n", priv->ntimes); + _llerr("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -281,7 +281,7 @@ static uint32_t spi_getreg(struct sam_spidev_s *priv, unsigned int offset) #ifdef CONFIG_SAMV7_SPI_REGDEBUG if (spi_checkreg(priv, false, value, address)) { - llerr("%08x->%08x\n", address, value); + _llerr("%08x->%08x\n", address, value); } #endif @@ -304,7 +304,7 @@ static void spi_putreg(struct sam_spidev_s *priv, uint32_t value, #ifdef CONFIG_SAMV7_SPI_REGDEBUG if (spi_checkreg(priv, true, value, address)) { - llerr("%08x<-%08x\n", address, value); + _llerr("%08x<-%08x\n", address, value); } #endif diff --git a/arch/arm/src/samv7/sam_ssc.c b/arch/arm/src/samv7/sam_ssc.c index c9204f093f..eb21113bd3 100644 --- a/arch/arm/src/samv7/sam_ssc.c +++ b/arch/arm/src/samv7/sam_ssc.c @@ -674,7 +674,7 @@ static bool ssc_checkreg(struct sam_ssc_s *priv, bool wr, uint32_t regval, { /* Yes... show how many times we did it */ - llerr("...[Repeats %d times]...\n", priv->count); + _llerr("...[Repeats %d times]...\n", priv->count); } /* Save information about the new access */ @@ -708,7 +708,7 @@ static inline uint32_t ssc_getreg(struct sam_ssc_s *priv, #ifdef CONFIG_SAMV7_SSC_REGDEBUG if (ssc_checkreg(priv, false, regval, regaddr)) { - llerr("%08x->%08x\n", regaddr, regval); + _llerr("%08x->%08x\n", regaddr, regval); } #endif @@ -731,7 +731,7 @@ static inline void ssc_putreg(struct sam_ssc_s *priv, unsigned int offset, #ifdef CONFIG_SAMV7_SSC_REGDEBUG if (ssc_checkreg(priv, true, regval, regaddr)) { - llerr("%08x<-%08x\n", regaddr, regval); + _llerr("%08x<-%08x\n", regaddr, regval); } #endif @@ -1060,7 +1060,7 @@ static void ssc_dma_sampleinit(struct sam_ssc_s *priv, #if defined(CONFIG_SAMV7_SSC_DMADEBUG) && defined(SSC_HAVE_RX) static void ssc_rxdma_sampledone(struct sam_ssc_s *priv, int result) { - llerr("result: %d\n", result); + _llerr("result: %d\n", result); /* Sample the final registers */ @@ -1125,7 +1125,7 @@ static void ssc_rxdma_sampledone(struct sam_ssc_s *priv, int result) #if defined(CONFIG_SAMV7_SSC_DMADEBUG) && defined(SSC_HAVE_TX) static void ssc_txdma_sampledone(struct sam_ssc_s *priv, int result) { - llerr("result: %d\n", result); + _llerr("result: %d\n", result); /* Sample the final registers */ diff --git a/arch/arm/src/samv7/sam_tc.c b/arch/arm/src/samv7/sam_tc.c index 968c5528d0..4eba2f077b 100644 --- a/arch/arm/src/samv7/sam_tc.c +++ b/arch/arm/src/samv7/sam_tc.c @@ -643,17 +643,17 @@ static void sam_regdump(struct sam_chan_s *chan, const char *msg) uintptr_t base; base = tc->base; - llerr("TC%d [%08x]: %s\n", tc->tc, (int)base, msg); - llerr(" BMR: %08x QIMR: %08x QISR: %08x WPMR: %08x\n", + _llerr("TC%d [%08x]: %s\n", tc->tc, (int)base, msg); + _llerr(" BMR: %08x QIMR: %08x QISR: %08x WPMR: %08x\n", getreg32(base+SAM_TC_BMR_OFFSET), getreg32(base+SAM_TC_QIMR_OFFSET), getreg32(base+SAM_TC_QISR_OFFSET), getreg32(base+SAM_TC_WPMR_OFFSET)); base = chan->base; - llerr("TC%d Channel %d [%08x]: %s\n", tc->tc, chan->chan, (int)base, msg); - llerr(" CMR: %08x SSMR: %08x RAB: %08x CV: %08x\n", + _llerr("TC%d Channel %d [%08x]: %s\n", tc->tc, chan->chan, (int)base, msg); + _llerr(" CMR: %08x SSMR: %08x RAB: %08x CV: %08x\n", getreg32(base+SAM_TC_CMR_OFFSET), getreg32(base+SAM_TC_SMMR_OFFSET), getreg32(base+SAM_TC_RAB_OFFSET), getreg32(base+SAM_TC_CV_OFFSET)); - llerr(" RA: %08x RB: %08x RC: %08x IMR: %08x\n", + _llerr(" RA: %08x RB: %08x RC: %08x IMR: %08x\n", getreg32(base+SAM_TC_RA_OFFSET), getreg32(base+SAM_TC_RB_OFFSET), getreg32(base+SAM_TC_RC_OFFSET), getreg32(base+SAM_TC_IMR_OFFSET)); } @@ -698,7 +698,7 @@ static bool sam_checkreg(struct sam_tc_s *tc, bool wr, uint32_t regaddr, { /* Yes... show how many times we did it */ - llerr("...[Repeats %d times]...\n", tc->ntimes); + _llerr("...[Repeats %d times]...\n", tc->ntimes); } /* Save information about the new access */ @@ -733,7 +733,7 @@ static inline uint32_t sam_tc_getreg(struct sam_chan_s *chan, #ifdef CONFIG_SAMV7_TC_REGDEBUG if (sam_checkreg(tc, false, regaddr, regval)) { - llerr("%08x->%08x\n", regaddr, regval); + _llerr("%08x->%08x\n", regaddr, regval); } #endif @@ -757,7 +757,7 @@ static inline void sam_tc_putreg(struct sam_chan_s *chan, uint32_t regval, #ifdef CONFIG_SAMV7_TC_REGDEBUG if (sam_checkreg(tc, true, regaddr, regval)) { - llerr("%08x<-%08x\n", regaddr, regval); + _llerr("%08x<-%08x\n", regaddr, regval); } #endif @@ -781,7 +781,7 @@ static inline uint32_t sam_chan_getreg(struct sam_chan_s *chan, #ifdef CONFIG_SAMV7_TC_REGDEBUG if (sam_checkreg(chan->tc, false, regaddr, regval)) { - llerr("%08x->%08x\n", regaddr, regval); + _llerr("%08x->%08x\n", regaddr, regval); } #endif @@ -804,7 +804,7 @@ static inline void sam_chan_putreg(struct sam_chan_s *chan, unsigned int offset, #ifdef CONFIG_SAMV7_TC_REGDEBUG if (sam_checkreg(chan->tc, true, regaddr, regval)) { - llerr("%08x<-%08x\n", regaddr, regval); + _llerr("%08x<-%08x\n", regaddr, regval); } #endif diff --git a/arch/arm/src/samv7/sam_twihs.c b/arch/arm/src/samv7/sam_twihs.c index b57662cc18..4dc6fcae9b 100644 --- a/arch/arm/src/samv7/sam_twihs.c +++ b/arch/arm/src/samv7/sam_twihs.c @@ -349,7 +349,7 @@ static bool twi_checkreg(struct twi_dev_s *priv, bool wr, uint32_t value, { /* Yes... show how many times we did it */ - llerr("...[Repeats %d times]...\n", priv->ntimes); + _llerr("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -381,7 +381,7 @@ static uint32_t twi_getabs(struct twi_dev_s *priv, uintptr_t address) if (twi_checkreg(priv, false, value, address)) { - llerr("%08x->%08x\n", address, value); + _llerr("%08x->%08x\n", address, value); } return value; @@ -402,7 +402,7 @@ static void twi_putabs(struct twi_dev_s *priv, uintptr_t address, { if (twi_checkreg(priv, true, value, address)) { - llerr("%08x<-%08x\n", address, value); + _llerr("%08x<-%08x\n", address, value); } putreg32(value, address); diff --git a/arch/arm/src/samv7/sam_usbdevhs.c b/arch/arm/src/samv7/sam_usbdevhs.c index 8c8cde272a..43a86c0e79 100644 --- a/arch/arm/src/samv7/sam_usbdevhs.c +++ b/arch/arm/src/samv7/sam_usbdevhs.c @@ -743,7 +743,7 @@ const struct trace_msg_t g_usb_trace_strings_intdecode[] = #ifdef CONFIG_SAMV7_USBHS_REGDEBUG static void sam_printreg(uintptr_t regaddr, uint32_t regval, bool iswrite) { - llerr("%p%s%08x\n", regaddr, iswrite ? "<-" : "->", regval); + _llerr("%p%s%08x\n", regaddr, iswrite ? "<-" : "->", regval); } #endif @@ -794,7 +794,7 @@ static void sam_checkreg(uintptr_t regaddr, uint32_t regval, bool iswrite) { /* No.. More than one. */ - llerr("[repeats %d more times]\n", count); + _llerr("[repeats %d more times]\n", count); } } @@ -874,31 +874,31 @@ static void sam_dumpep(struct sam_usbdev_s *priv, int epno) { /* Global Registers */ - llerr("Global Register:\n"); - llerr(" CTRL: %08x\n", sam_getreg(SAM_USBHS_DEVCTRL)); - llerr(" ISR: %08x\n", sam_getreg(SAM_USBHS_DEVISR)); - llerr(" IMR: %08x\n", sam_getreg(SAM_USBHS_DEVIMR)); - llerr(" EPT: %08x\n", sam_getreg(SAM_USBHS_DEVEPT)); - llerr(" FNUM: %08x\n", sam_getreg(SAM_USBHS_DEVFNUM)); + _llerr("Global Register:\n"); + _llerr(" CTRL: %08x\n", sam_getreg(SAM_USBHS_DEVCTRL)); + _llerr(" ISR: %08x\n", sam_getreg(SAM_USBHS_DEVISR)); + _llerr(" IMR: %08x\n", sam_getreg(SAM_USBHS_DEVIMR)); + _llerr(" EPT: %08x\n", sam_getreg(SAM_USBHS_DEVEPT)); + _llerr(" FNUM: %08x\n", sam_getreg(SAM_USBHS_DEVFNUM)); /* Endpoint registers */ - llerr("Endpoint %d Register:\n", epno); - llerr(" CFG: %08x\n", sam_getreg(SAM_USBHS_DEVEPTCFG(epno))); - llerr(" ISR: %08x\n", sam_getreg(SAM_USBHS_DEVEPTISR(epno))); - llerr(" IMR: %08x\n", sam_getreg(SAM_USBHS_DEVEPTIMR(epno))); + _llerr("Endpoint %d Register:\n", epno); + _llerr(" CFG: %08x\n", sam_getreg(SAM_USBHS_DEVEPTCFG(epno))); + _llerr(" ISR: %08x\n", sam_getreg(SAM_USBHS_DEVEPTISR(epno))); + _llerr(" IMR: %08x\n", sam_getreg(SAM_USBHS_DEVEPTIMR(epno))); - llerr("DMA %d Register:\n", epno); + _llerr("DMA %d Register:\n", epno); if ((SAM_EPSET_DMA & SAM_EP_BIT(epno)) != 0) { - llerr(" NXTDSC: %08x\n", sam_getreg(SAM_USBHS_DEVDMANXTDSC(epno))); - llerr(" ADDRESS: %08x\n", sam_getreg(SAM_USBHS_DEVDMAADDR(epno))); - llerr(" CONTROL: %08x\n", sam_getreg(SAM_USBHS_DEVDMACTRL(epno))); - llerr(" STATUS: %08x\n", sam_getreg(SAM_USBHS_DEVDMASTA(epno))); + _llerr(" NXTDSC: %08x\n", sam_getreg(SAM_USBHS_DEVDMANXTDSC(epno))); + _llerr(" ADDRESS: %08x\n", sam_getreg(SAM_USBHS_DEVDMAADDR(epno))); + _llerr(" CONTROL: %08x\n", sam_getreg(SAM_USBHS_DEVDMACTRL(epno))); + _llerr(" STATUS: %08x\n", sam_getreg(SAM_USBHS_DEVDMASTA(epno))); } else { - llerr(" None\n"); + _llerr(" None\n"); } } #endif diff --git a/arch/arm/src/samv7/sam_wdt.c b/arch/arm/src/samv7/sam_wdt.c index 1c2d81cd9b..d8c870b1f6 100644 --- a/arch/arm/src/samv7/sam_wdt.c +++ b/arch/arm/src/samv7/sam_wdt.c @@ -185,7 +185,7 @@ static uint32_t sam_getreg(uintptr_t regaddr) { if (count == 4) { - llerr("...\n"); + _llerr("...\n"); } return regval; @@ -202,7 +202,7 @@ static uint32_t sam_getreg(uintptr_t regaddr) { /* Yes.. then show how many times the value repeated */ - llerr("[repeats %d more times]\n", count-3); + _llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -214,7 +214,7 @@ static uint32_t sam_getreg(uintptr_t regaddr) /* Show the register value read */ - llerr("%08x->%048\n", regaddr, regval); + _llerr("%08x->%048\n", regaddr, regval); return regval; } #endif @@ -232,7 +232,7 @@ static void sam_putreg(uint32_t regval, uintptr_t regaddr) { /* Show the register value being written */ - llerr("%08x<-%08x\n", regaddr, regval); + _llerr("%08x<-%08x\n", regaddr, regval); /* Write the value */ diff --git a/arch/arm/src/stm32/stm32_bbsram.c b/arch/arm/src/stm32/stm32_bbsram.c index e2ca52eee4..e35f5e05a7 100644 --- a/arch/arm/src/stm32/stm32_bbsram.c +++ b/arch/arm/src/stm32/stm32_bbsram.c @@ -187,14 +187,14 @@ static void stm32_bbsram_rd(void) static void stm32_bbsram_dump(FAR struct bbsramfh_s *bbf, char *op) { BBSRAM_DEBUG_READ(); - info("%s:\n", op); - info(" File Address:0x%8x\n", bbf); - info(" crc:0x%8x\n", bbf->crc); - info(" fileno:%d\n", (int) bbf->fileno); - info(" dirty:%d\n", (int) bbf->dirty); - info(" length:%d\n", (int) bbf->len); - info(" time:%ld:%ld\n", bbf->lastwrite.tv_sec, bbf->lastwrite.tv_nsec); - info(" data: 0x%2x 0x%2x 0x%2x 0x%2x 0x%2x\n", + _info("%s:\n", op); + _info(" File Address:0x%8x\n", bbf); + _info(" crc:0x%8x\n", bbf->crc); + _info(" fileno:%d\n", (int) bbf->fileno); + _info(" dirty:%d\n", (int) bbf->dirty); + _info(" length:%d\n", (int) bbf->len); + _info(" time:%ld:%ld\n", bbf->lastwrite.tv_sec, bbf->lastwrite.tv_nsec); + _info(" data: 0x%2x 0x%2x 0x%2x 0x%2x 0x%2x\n", bbf->data[0], bbf->data[1], bbf->data[2], bbf->data[3], bbf->data[4]); } #endif diff --git a/arch/arm/src/stm32/stm32_dumpgpio.c b/arch/arm/src/stm32/stm32_dumpgpio.c index 5de501f033..b50f8b84cc 100644 --- a/arch/arm/src/stm32/stm32_dumpgpio.c +++ b/arch/arm/src/stm32/stm32_dumpgpio.c @@ -120,18 +120,18 @@ int stm32_dumpgpio(uint32_t pinset, const char *msg) flags = enter_critical_section(); #if defined(CONFIG_STM32_STM32F10XX) - llinfo("GPIO%c pinset: %08x base: %08x -- %s\n", + _llinfo("GPIO%c pinset: %08x base: %08x -- %s\n", g_portchar[port], pinset, base, msg); if ((getreg32(STM32_RCC_APB2ENR) & RCC_APB2ENR_IOPEN(port)) != 0) { - llinfo(" CR: %08x %08x IDR: %04x ODR: %04x LCKR: %04x\n", + _llinfo(" CR: %08x %08x IDR: %04x ODR: %04x LCKR: %04x\n", getreg32(base + STM32_GPIO_CRH_OFFSET), getreg32(base + STM32_GPIO_CRL_OFFSET), getreg32(base + STM32_GPIO_IDR_OFFSET), getreg32(base + STM32_GPIO_ODR_OFFSET), getreg32(base + STM32_GPIO_LCKR_OFFSET)); - llinfo(" EVCR: %02x MAPR: %08x CR: %04x %04x %04x %04x\n", + _llinfo(" EVCR: %02x MAPR: %08x CR: %04x %04x %04x %04x\n", getreg32(STM32_AFIO_EVCR), getreg32(STM32_AFIO_MAPR), getreg32(STM32_AFIO_EXTICR1), getreg32(STM32_AFIO_EXTICR2), @@ -140,57 +140,57 @@ int stm32_dumpgpio(uint32_t pinset, const char *msg) } else { - llinfo(" GPIO%c not enabled: APB2ENR: %08x\n", + _llinfo(" GPIO%c not enabled: APB2ENR: %08x\n", g_portchar[port], getreg32(STM32_RCC_APB2ENR)); } #elif defined(CONFIG_STM32_STM32L15XX) DEBUGASSERT(port < STM32_NGPIO_PORTS); - llinfo("GPIO%c pinset: %08x base: %08x -- %s\n", + _llinfo("GPIO%c pinset: %08x base: %08x -- %s\n", g_portchar[port], pinset, base, msg); if ((getreg32(STM32_RCC_AHBENR) & RCC_AHBENR_GPIOEN(port)) != 0) { - llinfo(" MODE: %08x OTYPE: %04x OSPEED: %08x PUPDR: %08x\n", + _llinfo(" MODE: %08x OTYPE: %04x OSPEED: %08x PUPDR: %08x\n", getreg32(base + STM32_GPIO_MODER_OFFSET), getreg32(base + STM32_GPIO_OTYPER_OFFSET), getreg32(base + STM32_GPIO_OSPEED_OFFSET), getreg32(base + STM32_GPIO_PUPDR_OFFSET)); - llinfo(" IDR: %04x ODR: %04x BSRR: %08x LCKR: %04x\n", + _llinfo(" IDR: %04x ODR: %04x BSRR: %08x LCKR: %04x\n", getreg32(base + STM32_GPIO_IDR_OFFSET), getreg32(base + STM32_GPIO_ODR_OFFSET), getreg32(base + STM32_GPIO_BSRR_OFFSET), getreg32(base + STM32_GPIO_LCKR_OFFSET)); - llinfo(" AFRH: %08x AFRL: %08x\n", + _llinfo(" AFRH: %08x AFRL: %08x\n", getreg32(base + STM32_GPIO_AFRH_OFFSET), getreg32(base + STM32_GPIO_AFRL_OFFSET)); } else { - llinfo(" GPIO%c not enabled: AHBENR: %08x\n", + _llinfo(" GPIO%c not enabled: AHBENR: %08x\n", g_portchar[port], getreg32(STM32_RCC_AHBENR)); } #elif defined(CONFIG_STM32_STM32F30XX) || defined(CONFIG_STM32_STM32F37XX) DEBUGASSERT(port < STM32_NGPIO_PORTS); - llinfo("GPIO%c pinset: %08x base: %08x -- %s\n", + _llinfo("GPIO%c pinset: %08x base: %08x -- %s\n", g_portchar[port], pinset, base, msg); /* GPIOs are always enabled */ - llinfo(" MODE: %08x OTYPE: %04x OSPEED: %08x PUPDR: %08x\n", + _llinfo(" MODE: %08x OTYPE: %04x OSPEED: %08x PUPDR: %08x\n", getreg32(base + STM32_GPIO_MODER_OFFSET), getreg32(base + STM32_GPIO_OTYPER_OFFSET), getreg32(base + STM32_GPIO_OSPEED_OFFSET), getreg32(base + STM32_GPIO_PUPDR_OFFSET)); - llinfo(" IDR: %04x ODR: %04x BSRR: %08x LCKR: %04x\n", + _llinfo(" IDR: %04x ODR: %04x BSRR: %08x LCKR: %04x\n", getreg32(base + STM32_GPIO_IDR_OFFSET), getreg32(base + STM32_GPIO_ODR_OFFSET), getreg32(base + STM32_GPIO_BSRR_OFFSET), getreg32(base + STM32_GPIO_LCKR_OFFSET)); - llinfo(" AFRH: %08x AFRL: %08x BRR: %04x\n", + _llinfo(" AFRH: %08x AFRL: %08x BRR: %04x\n", getreg32(base + STM32_GPIO_AFRH_OFFSET), getreg32(base + STM32_GPIO_AFRL_OFFSET), getreg32(base + STM32_GPIO_BRR_OFFSET)); @@ -198,28 +198,28 @@ int stm32_dumpgpio(uint32_t pinset, const char *msg) #elif defined(CONFIG_STM32_STM32F20XX) || defined(CONFIG_STM32_STM32F40XX) DEBUGASSERT(port < STM32_NGPIO_PORTS); - llinfo("GPIO%c pinset: %08x base: %08x -- %s\n", + _llinfo("GPIO%c pinset: %08x base: %08x -- %s\n", g_portchar[port], pinset, base, msg); if ((getreg32(STM32_RCC_AHB1ENR) & RCC_AHB1ENR_GPIOEN(port)) != 0) { - llinfo(" MODE: %08x OTYPE: %04x OSPEED: %08x PUPDR: %08x\n", + _llinfo(" MODE: %08x OTYPE: %04x OSPEED: %08x PUPDR: %08x\n", getreg32(base + STM32_GPIO_MODER_OFFSET), getreg32(base + STM32_GPIO_OTYPER_OFFSET), getreg32(base + STM32_GPIO_OSPEED_OFFSET), getreg32(base + STM32_GPIO_PUPDR_OFFSET)); - llinfo(" IDR: %04x ODR: %04x BSRR: %08x LCKR: %04x\n", + _llinfo(" IDR: %04x ODR: %04x BSRR: %08x LCKR: %04x\n", getreg32(base + STM32_GPIO_IDR_OFFSET), getreg32(base + STM32_GPIO_ODR_OFFSET), getreg32(base + STM32_GPIO_BSRR_OFFSET), getreg32(base + STM32_GPIO_LCKR_OFFSET)); - llinfo(" AFRH: %08x AFRL: %08x\n", + _llinfo(" AFRH: %08x AFRL: %08x\n", getreg32(base + STM32_GPIO_AFRH_OFFSET), getreg32(base + STM32_GPIO_AFRL_OFFSET)); } else { - llinfo(" GPIO%c not enabled: AHB1ENR: %08x\n", + _llinfo(" GPIO%c not enabled: AHB1ENR: %08x\n", g_portchar[port], getreg32(STM32_RCC_AHB1ENR)); } #else diff --git a/arch/arm/src/stm32/stm32_idle.c b/arch/arm/src/stm32/stm32_idle.c index 64e08a1b04..888ed17ed7 100644 --- a/arch/arm/src/stm32/stm32_idle.c +++ b/arch/arm/src/stm32/stm32_idle.c @@ -101,7 +101,7 @@ static void up_idlepm(void) /* Perform board-specific, state-dependent logic here */ - llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); + _llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); /* Then force the global state change */ diff --git a/arch/arm/src/stm32/stm32_irq.c b/arch/arm/src/stm32/stm32_irq.c index 810c4a8f5b..1e9570cc90 100644 --- a/arch/arm/src/stm32/stm32_irq.c +++ b/arch/arm/src/stm32/stm32_irq.c @@ -164,7 +164,7 @@ static void stm32_dumpnvic(const char *msg, int irq) static int stm32_nmi(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! NMI received\n"); + _err("PANIC!!! NMI received\n"); PANIC(); return 0; } @@ -172,7 +172,7 @@ static int stm32_nmi(int irq, FAR void *context) static int stm32_busfault(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS)); + _err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS)); PANIC(); return 0; } @@ -180,7 +180,7 @@ static int stm32_busfault(int irq, FAR void *context) static int stm32_usagefault(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS)); + _err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS)); PANIC(); return 0; } @@ -188,7 +188,7 @@ static int stm32_usagefault(int irq, FAR void *context) static int stm32_pendsv(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! PendSV received\n"); + _err("PANIC!!! PendSV received\n"); PANIC(); return 0; } @@ -196,7 +196,7 @@ static int stm32_pendsv(int irq, FAR void *context) static int stm32_errmonitor(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Debug Monitor received\n"); + _err("PANIC!!! Debug Monitor received\n"); PANIC(); return 0; } @@ -204,7 +204,7 @@ static int stm32_errmonitor(int irq, FAR void *context) static int stm32_reserved(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Reserved interrupt\n"); + _err("PANIC!!! Reserved interrupt\n"); PANIC(); return 0; } diff --git a/arch/arm/src/stm32/stm32_rng.c b/arch/arm/src/stm32/stm32_rng.c index 11477eb893..fce55ebf0a 100644 --- a/arch/arm/src/stm32/stm32_rng.c +++ b/arch/arm/src/stm32/stm32_rng.c @@ -102,7 +102,7 @@ static int stm32_rnginitialize() { uint32_t regval; - info("Initializing RNG\n"); + _info("Initializing RNG\n"); memset(&g_rngdev, 0, sizeof(struct rng_dev_s)); @@ -112,7 +112,7 @@ static int stm32_rnginitialize() { /* We could not attach the ISR to the interrupt */ - info("Could not attach IRQ.\n"); + _info("Could not attach IRQ.\n"); return -EAGAIN; } diff --git a/arch/arm/src/stm32f7/stm32_irq.c b/arch/arm/src/stm32f7/stm32_irq.c index 407e756e98..62c4aee7aa 100644 --- a/arch/arm/src/stm32f7/stm32_irq.c +++ b/arch/arm/src/stm32f7/stm32_irq.c @@ -189,7 +189,7 @@ static void stm32_dumpnvic(const char *msg, int irq) static int stm32_nmi(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! NMI received\n"); + _err("PANIC!!! NMI received\n"); PANIC(); return 0; } @@ -197,7 +197,7 @@ static int stm32_nmi(int irq, FAR void *context) static int stm32_busfault(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS)); + _err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS)); PANIC(); return 0; } @@ -205,7 +205,7 @@ static int stm32_busfault(int irq, FAR void *context) static int stm32_usagefault(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS)); + _err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS)); PANIC(); return 0; } @@ -213,7 +213,7 @@ static int stm32_usagefault(int irq, FAR void *context) static int stm32_pendsv(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! PendSV received\n"); + _err("PANIC!!! PendSV received\n"); PANIC(); return 0; } @@ -221,7 +221,7 @@ static int stm32_pendsv(int irq, FAR void *context) static int stm32_errmonitor(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Debug Monitor received\n"); + _err("PANIC!!! Debug Monitor received\n"); PANIC(); return 0; } @@ -229,7 +229,7 @@ static int stm32_errmonitor(int irq, FAR void *context) static int stm32_reserved(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Reserved interrupt\n"); + _err("PANIC!!! Reserved interrupt\n"); PANIC(); return 0; } diff --git a/arch/arm/src/stm32l4/stm32l4_idle.c b/arch/arm/src/stm32l4/stm32l4_idle.c index 00cceb1470..f17bd4d75e 100644 --- a/arch/arm/src/stm32l4/stm32l4_idle.c +++ b/arch/arm/src/stm32l4/stm32l4_idle.c @@ -101,7 +101,7 @@ static void up_idlepm(void) /* Perform board-specific, state-dependent logic here */ - llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); + _llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); /* Then force the global state change */ diff --git a/arch/arm/src/stm32l4/stm32l4_irq.c b/arch/arm/src/stm32l4/stm32l4_irq.c index 75fec84dfd..7d5f948c81 100644 --- a/arch/arm/src/stm32l4/stm32l4_irq.c +++ b/arch/arm/src/stm32l4/stm32l4_irq.c @@ -163,7 +163,7 @@ static void stm32l4_dumpnvic(const char *msg, int irq) static int stm32l4_nmi(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! NMI received\n"); + _err("PANIC!!! NMI received\n"); PANIC(); return 0; } @@ -171,7 +171,7 @@ static int stm32l4_nmi(int irq, FAR void *context) static int stm32l4_busfault(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS)); + _err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS)); PANIC(); return 0; } @@ -179,7 +179,7 @@ static int stm32l4_busfault(int irq, FAR void *context) static int stm32l4_usagefault(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS)); + _err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS)); PANIC(); return 0; } @@ -187,7 +187,7 @@ static int stm32l4_usagefault(int irq, FAR void *context) static int stm32l4_pendsv(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! PendSV received\n"); + _err("PANIC!!! PendSV received\n"); PANIC(); return 0; } @@ -195,7 +195,7 @@ static int stm32l4_pendsv(int irq, FAR void *context) static int stm32l4_errmonitor(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Debug Monitor received\n"); + _err("PANIC!!! Debug Monitor received\n"); PANIC(); return 0; } @@ -203,7 +203,7 @@ static int stm32l4_errmonitor(int irq, FAR void *context) static int stm32l4_reserved(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Reserved interrupt\n"); + _err("PANIC!!! Reserved interrupt\n"); PANIC(); return 0; } diff --git a/arch/arm/src/stm32l4/stm32l4_rng.c b/arch/arm/src/stm32l4/stm32l4_rng.c index 2a27348bee..f9324fb6f1 100644 --- a/arch/arm/src/stm32l4/stm32l4_rng.c +++ b/arch/arm/src/stm32l4/stm32l4_rng.c @@ -107,7 +107,7 @@ static const struct file_operations g_rngops = static int stm32l4_rnginitialize(void) { - info("Initializing RNG\n"); + _info("Initializing RNG\n"); memset(&g_rngdev, 0, sizeof(struct rng_dev_s)); @@ -117,7 +117,7 @@ static int stm32l4_rnginitialize(void) { /* We could not attach the ISR to the interrupt */ - info("Could not attach IRQ.\n"); + _info("Could not attach IRQ.\n"); return -EAGAIN; } diff --git a/arch/arm/src/tiva/tiva_irq.c b/arch/arm/src/tiva/tiva_irq.c index d7152a3eed..8f95e071d9 100644 --- a/arch/arm/src/tiva/tiva_irq.c +++ b/arch/arm/src/tiva/tiva_irq.c @@ -199,7 +199,7 @@ static void tiva_dumpnvic(const char *msg, int irq) static int tiva_nmi(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! NMI received\n"); + _err("PANIC!!! NMI received\n"); PANIC(); return 0; } @@ -207,7 +207,7 @@ static int tiva_nmi(int irq, FAR void *context) static int tiva_busfault(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Bus fault recived\n"); + _err("PANIC!!! Bus fault recived\n"); PANIC(); return 0; } @@ -215,7 +215,7 @@ static int tiva_busfault(int irq, FAR void *context) static int tiva_usagefault(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Usage fault received\n"); + _err("PANIC!!! Usage fault received\n"); PANIC(); return 0; } @@ -223,7 +223,7 @@ static int tiva_usagefault(int irq, FAR void *context) static int tiva_pendsv(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! PendSV received\n"); + _err("PANIC!!! PendSV received\n"); PANIC(); return 0; } @@ -231,7 +231,7 @@ static int tiva_pendsv(int irq, FAR void *context) static int tiva_errmonitor(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Debug Monitor received\n"); + _err("PANIC!!! Debug Monitor received\n"); PANIC(); return 0; } @@ -239,7 +239,7 @@ static int tiva_errmonitor(int irq, FAR void *context) static int tiva_reserved(int irq, FAR void *context) { (void)up_irq_save(); - err("PANIC!!! Reserved interrupt\n"); + _err("PANIC!!! Reserved interrupt\n"); PANIC(); return 0; } diff --git a/arch/arm/src/tiva/tm4c_ethernet.c b/arch/arm/src/tiva/tm4c_ethernet.c index 5860a55b87..575f6b2edc 100644 --- a/arch/arm/src/tiva/tm4c_ethernet.c +++ b/arch/arm/src/tiva/tm4c_ethernet.c @@ -808,7 +808,7 @@ static uint32_t tiva_getreg(uint32_t addr) { if (count == 4) { - llinfo("...\n"); + _llinfo("...\n"); } return val; @@ -825,7 +825,7 @@ static uint32_t tiva_getreg(uint32_t addr) { /* Yes.. then show how many times the value repeated */ - llinfo("[repeats %d more times]\n", count-3); + _llinfo("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -837,7 +837,7 @@ static uint32_t tiva_getreg(uint32_t addr) /* Show the register value read */ - llinfo("%08x->%08x\n", addr, val); + _llinfo("%08x->%08x\n", addr, val); return val; } #endif @@ -864,7 +864,7 @@ static void tiva_putreg(uint32_t val, uint32_t addr) { /* Show the register value being written */ - llinfo("%08x<-%08x\n", addr, val); + _llinfo("%08x<-%08x\n", addr, val); /* Write the value */ diff --git a/arch/arm/src/tms570/tms570_esm.c b/arch/arm/src/tms570/tms570_esm.c index 601fefa86d..e6eec90c5f 100644 --- a/arch/arm/src/tms570/tms570_esm.c +++ b/arch/arm/src/tms570/tms570_esm.c @@ -155,7 +155,7 @@ int tms570_esm_interrupt(int irq, void *context) /* Crash -- possibly showing diagnostic debug information. */ - llerr("ERROR: ESM Interrupt. PC: %08x\n", CURRENT_REGS[REG_PC]); + _llerr("ERROR: ESM Interrupt. PC: %08x\n", CURRENT_REGS[REG_PC]); PANIC(); return OK; /* To keep the compiler happy */ } diff --git a/arch/arm/src/tms570/tms570_gio.c b/arch/arm/src/tms570/tms570_gio.c index 1e4b156c10..3a771ff1d8 100644 --- a/arch/arm/src/tms570/tms570_gio.c +++ b/arch/arm/src/tms570/tms570_gio.c @@ -296,7 +296,7 @@ int tms570_dumpgio(uint32_t pinset, const char *msg) uintptr_t base; unsigned int port; - llinfo("GIO%c pinset: %08x base: %08x -- %s\n", + _llinfo("GIO%c pinset: %08x base: %08x -- %s\n", g_portchar[port], pinset, base, msg); /* Get the base address associated with the GIO port */ @@ -310,19 +310,19 @@ int tms570_dumpgio(uint32_t pinset, const char *msg) /* Show global GIO registers */ - llinfo(" GCR0: %08x INTDET: %08x POL: %08x ENA: %08x\n", + _llinfo(" GCR0: %08x INTDET: %08x POL: %08x ENA: %08x\n", getreg32(TMS570_GIO_GCR0), getreg32(TMS570_GIO_INTDET), getreg32(TMS570_GIO_POL), getreg32(TMS570_GIO_ENASET)); - llinfo(" LVL: %08x FLG: %08x EMU1: %08x EMU2: %08x\n", + _llinfo(" LVL: %08x FLG: %08x EMU1: %08x EMU2: %08x\n", getreg32(TMS570_GIO_LVLSET), getreg32(TMS570_GIO_FLG), getreg32(TMS570_GIO_EMU1), getreg32(TMS570_GIO_EMU2)); /* Port specific registers */ - llinfo(" DIR: %08x DIN: %08x DOUT: %08x PDR: %08x\n", + _llinfo(" DIR: %08x DIN: %08x DOUT: %08x PDR: %08x\n", getreg32(base + TMS570_GIO_DIR_OFFSET), getreg32(base + TMS570_GIO_DIN_OFFSET), getreg32(base + TMS570_GIO_DOUT_OFFSET), getreg32(base + TMS570_GIO_PDR_OFFSET)); - llinfo(" PULDIS: %08x PSL: %08x\n", + _llinfo(" PULDIS: %08x PSL: %08x\n", getreg32(base + TMS570_GIO_PULDIS_OFFSET), getreg32(base + TMS570_GIO_PSL_OFFSET)); leave_critical_section(flags); diff --git a/arch/avr/src/at32uc3/at32uc3_gpioirq.c b/arch/avr/src/at32uc3/at32uc3_gpioirq.c index 0972429bae..a62dc41aa6 100644 --- a/arch/avr/src/at32uc3/at32uc3_gpioirq.c +++ b/arch/avr/src/at32uc3/at32uc3_gpioirq.c @@ -228,7 +228,7 @@ static void gpio_porthandler(uint32_t regbase, int irqbase, uint32_t irqset, voi } else { - llerr("ERROR: No handler: pin=%d ifr=%08x irqset=%08x", + _llerr("ERROR: No handler: pin=%d ifr=%08x irqset=%08x", pin, ifr, irqset); } } @@ -247,7 +247,7 @@ static void gpio_porthandler(uint32_t regbase, int irqbase, uint32_t irqset, voi putreg32(bit, regbase + AVR32_GPIO_IFRC_OFFSET); ifr &= ~bit; - llwarn("WARNING: IRQ on unconfigured pin: pin=%d ifr=%08x irqset=%08x", + _llwarn("WARNING: IRQ on unconfigured pin: pin=%d ifr=%08x irqset=%08x", pin, ifr, irqset); } } diff --git a/arch/avr/src/at32uc3/at32uc3_irq.c b/arch/avr/src/at32uc3/at32uc3_irq.c index f6964b7404..c552f462a9 100644 --- a/arch/avr/src/at32uc3/at32uc3_irq.c +++ b/arch/avr/src/at32uc3/at32uc3_irq.c @@ -321,11 +321,11 @@ unsigned int avr32_intirqno(unsigned int level) mask <<= 1; } - llerr("ERROR: Spurious interrupt: group=%d IRR=%08x\n", group, irr); + _llerr("ERROR: Spurious interrupt: group=%d IRR=%08x\n", group, irr); return -ENODEV; } - llerr("ERROR: Bad group: %d\n", group); + _llerr("ERROR: Bad group: %d\n", group); return AVR32_IRQ_BADVECTOR; } diff --git a/arch/avr/src/common/up_initialize.c b/arch/avr/src/common/up_initialize.c index 8f58cdcf6e..b79f95876c 100644 --- a/arch/avr/src/common/up_initialize.c +++ b/arch/avr/src/common/up_initialize.c @@ -125,13 +125,13 @@ static void up_calibratedelay(void) { int i; - llwarn("Beginning 100s delay\n"); + _llwarn("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } - llwarn("End 100s delay\n"); + _llwarn("End 100s delay\n"); } #else # define up_calibratedelay() diff --git a/arch/hc/src/common/up_initialize.c b/arch/hc/src/common/up_initialize.c index a358d29e9b..47c8abfe94 100644 --- a/arch/hc/src/common/up_initialize.c +++ b/arch/hc/src/common/up_initialize.c @@ -74,13 +74,13 @@ static void up_calibratedelay(void) { int i; - llwarn("Beginning 100s delay\n"); + _llwarn("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } - llwarn("End 100s delay\n"); + _llwarn("End 100s delay\n"); } #else # define up_calibratedelay() diff --git a/arch/mips/src/common/up_initialize.c b/arch/mips/src/common/up_initialize.c index 2529020267..dbb950424b 100644 --- a/arch/mips/src/common/up_initialize.c +++ b/arch/mips/src/common/up_initialize.c @@ -76,13 +76,13 @@ static void up_calibratedelay(void) { int i; - llwarn("Beginning 100s delay\n"); + _llwarn("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } - llwarn("End 100s delay\n"); + _llwarn("End 100s delay\n"); } #else # define up_calibratedelay() diff --git a/arch/mips/src/pic32mx/pic32mx-serial.c b/arch/mips/src/pic32mx/pic32mx-serial.c index 20a50bf2bb..7617a8f3a0 100644 --- a/arch/mips/src/pic32mx/pic32mx-serial.c +++ b/arch/mips/src/pic32mx/pic32mx-serial.c @@ -500,7 +500,7 @@ static int up_interrupt(int irq, void *context) /* Clear the pending error interrupt */ up_clrpend_irq(priv->irqe); - llerr("ERROR: interrupt STA: %08x\n", + _llerr("ERROR: interrupt STA: %08x\n", up_serialin(priv, PIC32MX_UART_STA_OFFSET)); handled = true; } diff --git a/arch/mips/src/pic32mx/pic32mx-spi.c b/arch/mips/src/pic32mx/pic32mx-spi.c index dddadf2c02..c56ff271c3 100644 --- a/arch/mips/src/pic32mx/pic32mx-spi.c +++ b/arch/mips/src/pic32mx/pic32mx-spi.c @@ -315,7 +315,7 @@ static uint32_t spi_getreg(FAR struct pic32mx_dev_s *priv, unsigned int offset) { if (count == 4) { - llinfo("...\n"); + _llinfo("...\n"); } return value; } @@ -331,7 +331,7 @@ static uint32_t spi_getreg(FAR struct pic32mx_dev_s *priv, unsigned int offset) { /* Yes.. then show how many times the value repeated */ - llinfo("[repeats %d more times]\n", count-3); + _llinfo("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -343,7 +343,7 @@ static uint32_t spi_getreg(FAR struct pic32mx_dev_s *priv, unsigned int offset) /* Show the register value read */ - llinfo("%08x->%08x\n", addr, value); + _llinfo("%08x->%08x\n", addr, value); return value; } #else @@ -381,7 +381,7 @@ static void spi_putreg(FAR struct pic32mx_dev_s *priv, unsigned int offset, /* Show the register value being written */ - llinfo("%08x<-%08x\n", addr, value); + _llinfo("%08x<-%08x\n", addr, value); /* Then do the write */ diff --git a/arch/mips/src/pic32mx/pic32mx-usbdev.c b/arch/mips/src/pic32mx/pic32mx-usbdev.c index 0c43382e1c..85d2705c70 100644 --- a/arch/mips/src/pic32mx/pic32mx-usbdev.c +++ b/arch/mips/src/pic32mx/pic32mx-usbdev.c @@ -280,9 +280,9 @@ # undef CONFIG_PIC32MX_USBDEV_BDTDEBUG # define CONFIG_PIC32MX_USBDEV_BDTDEBUG 1 -# define regerr llerr -# define regwarn llwarn -# define reginfo llinfo +# define regerr _llerr +# define regwarn _llwarn +# define reginfo _llinfo #else @@ -298,9 +298,9 @@ #ifdef CONFIG_PIC32MX_USBDEV_BDTDEBUG -# define bdterr llerr -# define bdtwarn llwarn -# define bdtinfo llinfo +# define bdterr _llerr +# define bdtwarn _llwarn +# define bdtinfo _llinfo #else diff --git a/arch/mips/src/pic32mz/pic32mz-serial.c b/arch/mips/src/pic32mz/pic32mz-serial.c index c9b56f3ff4..e14ab4472f 100644 --- a/arch/mips/src/pic32mz/pic32mz-serial.c +++ b/arch/mips/src/pic32mz/pic32mz-serial.c @@ -758,7 +758,7 @@ static int up_interrupt(struct uart_dev_s *dev) /* Clear the pending error interrupt */ up_clrpend_irq(priv->irqe); - llerr("ERROR: interrupt STA: %08x\n", + _llerr("ERROR: interrupt STA: %08x\n", up_serialin(priv, PIC32MZ_UART_STA_OFFSET)); handled = true; } diff --git a/arch/mips/src/pic32mz/pic32mz-spi.c b/arch/mips/src/pic32mz/pic32mz-spi.c index 5297a370b8..b2ddd66d7c 100644 --- a/arch/mips/src/pic32mz/pic32mz-spi.c +++ b/arch/mips/src/pic32mz/pic32mz-spi.c @@ -482,7 +482,7 @@ static bool spi_checkreg(struct pic32mz_dev_s *priv, uintptr_t regaddr, { /* Yes... show how many times we did it */ - llinfo("...[Repeats %d times]...\n", priv->ntimes); + _llinfo("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -532,7 +532,7 @@ static uint32_t spi_getreg(FAR struct pic32mz_dev_s *priv, { /* Yes.. */ - llinfo("%08lx->%08lx\n", + _llinfo("%08lx->%08lx\n", (unsigned long)regaddr, (unsigned long)regval); } @@ -574,7 +574,7 @@ static void spi_putaddr(FAR struct pic32mz_dev_s *priv, uintptr_t regaddr, { /* Yes.. */ - llinfo("%08lx<-%08lx\n", + _llinfo("%08lx<-%08lx\n", (unsigned long)regaddr, (unsigned long)regval); } diff --git a/arch/rgmp/src/bridge.c b/arch/rgmp/src/bridge.c index 46f45a8f59..320019ba9f 100644 --- a/arch/rgmp/src/bridge.c +++ b/arch/rgmp/src/bridge.c @@ -98,7 +98,7 @@ static const struct file_operations up_bridge_fops = int rtos_bridge_init(struct rgmp_bridge *b) { - int err; + int errcode; struct bridge *bridge; char path[30] = {'/', 'd', 'e', 'v', '/'}; @@ -106,10 +106,10 @@ int rtos_bridge_init(struct rgmp_bridge *b) goto err0; bridge->b = b; - if ((err = sem_init(&bridge->rd_lock, 0, 1)) == ERROR) + if ((errcode = sem_init(&bridge->rd_lock, 0, 1)) == ERROR) goto err1; - if ((err = sem_init(&bridge->wr_lock, 0, 1)) == ERROR) + if ((errcode = sem_init(&bridge->wr_lock, 0, 1)) == ERROR) goto err1; // make rgmp_bridge0 to be the console @@ -119,7 +119,7 @@ int rtos_bridge_init(struct rgmp_bridge *b) else strlcpy(path + 5, b->vdev->name, 25); - if ((err = register_driver(path, &up_bridge_fops, 0666, bridge)) == ERROR) + if ((errcode = register_driver(path, &up_bridge_fops, 0666, bridge)) == ERROR) { cprintf("NuttX: register bridge %s fail\n", b->vdev->name); goto err1; diff --git a/arch/rgmp/src/nuttx.c b/arch/rgmp/src/nuttx.c index 0832e8f9ec..4a274264d7 100644 --- a/arch/rgmp/src/nuttx.c +++ b/arch/rgmp/src/nuttx.c @@ -258,7 +258,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state) if ((tcb->task_state < FIRST_READY_TO_RUN_STATE) || (tcb->task_state > LAST_READY_TO_RUN_STATE)) { - warn("%s: task sched error\n", __func__); + _warn("%s: task sched error\n", __func__); return; } else @@ -304,7 +304,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state) if (g_pendingtasks.head) { - warn("Disable preemption failed for task block itself\n"); + _warn("Disable preemption failed for task block itself\n"); sched_mergepending(); } @@ -353,7 +353,7 @@ void up_unblock_task(struct tcb_s *tcb) if ((tcb->task_state < FIRST_BLOCKED_STATE) || (tcb->task_state > LAST_BLOCKED_STATE)) { - warn("%s: task sched error\n", __func__); + _warn("%s: task sched error\n", __func__); return; } else @@ -453,7 +453,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) #endif ) { - warn("%s: task sched error\n", __func__); + _warn("%s: task sched error\n", __func__); return; } else @@ -496,7 +496,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) if (g_pendingtasks.head) { - warn("Disable preemption failed for reprioritize task\n"); + _warn("Disable preemption failed for reprioritize task\n"); sched_mergepending(); } diff --git a/arch/rgmp/src/x86/com.c b/arch/rgmp/src/x86/com.c index 495aa4b692..8c8d076cc0 100644 --- a/arch/rgmp/src/x86/com.c +++ b/arch/rgmp/src/x86/com.c @@ -258,7 +258,7 @@ static int up_setup(struct uart_dev_s *dev) inb(base+COM_RX); if (inb(base+COM_LSR) == 0xff) { - err("ERROR: COM %d does not exist\n", base); + _err("ERROR: COM %d does not exist\n", base); return -1; } @@ -591,14 +591,14 @@ void up_serialinit(void) dev = up_alloc_com(COM1, 4); if (dev == NULL) { - err("ERROR: alloc com1 fail\n"); + _err("ERROR: alloc com1 fail\n"); } else { errcode = uart_register("/dev/ttyS0", dev); if (errcode) { - err("ERROR: register com1 fail\n"); + _err("ERROR: register com1 fail\n"); } } #endif @@ -606,14 +606,14 @@ void up_serialinit(void) dev = up_alloc_com(COM2, 3); if (dev == NULL) { - err("ERROR: alloc com2 fail\n"); + _err("ERROR: alloc com2 fail\n"); } else { errcode = uart_register("/dev/ttyS1", dev); if (errcode) { - err("ERROR: register com2 fail\n"); + _err("ERROR: register com2 fail\n"); } } #endif @@ -621,14 +621,14 @@ void up_serialinit(void) dev = up_alloc_com(COM3, 4); if (dev == NULL) { - err("ERROR: alloc com3 fail\n"); + _err("ERROR: alloc com3 fail\n"); } else { errcode = uart_register("/dev/ttyS2", dev); if (errcode) { - err("ERROR: register com3 fail\n"); + _err("ERROR: register com3 fail\n"); } } #endif @@ -636,14 +636,14 @@ void up_serialinit(void) dev = up_alloc_com(COM4, 3); if (dev == NULL) { - err("ERROR: alloc com4 fail\n"); + _err("ERROR: alloc com4 fail\n"); } else { errcode = uart_register("/dev/ttyS3", dev); if (errcode) { - err("ERROR: register com4 fail\n"); + _err("ERROR: register com4 fail\n"); } } #endif diff --git a/arch/sh/src/m16c/m16c_serial.c b/arch/sh/src/m16c/m16c_serial.c index 34c3d9019a..4bc1f969ce 100644 --- a/arch/sh/src/m16c/m16c_serial.c +++ b/arch/sh/src/m16c/m16c_serial.c @@ -588,7 +588,7 @@ static int up_setup(struct uart_dev_s *dev) else #endif { - err("ERROR: Invalid UART #\n"); + _err("ERROR: Invalid UART #\n"); } /* Set UART transmit/receive control register 1 to enable transmit and receive */ @@ -613,7 +613,7 @@ static int up_setup(struct uart_dev_s *dev) } else { - err("ERROR: Invalid bits=%d\n", priv->bits); + _err("ERROR: Invalid bits=%d\n", priv->bits); } if (priv->parity != 0) @@ -665,7 +665,7 @@ static int up_setup(struct uart_dev_s *dev) else #endif { - err("ERROR: Invalid UART #\n"); + _err("ERROR: Invalid UART #\n"); } /* Read any data left in the RX fifo */ @@ -872,7 +872,7 @@ static void m16c_rxint(struct up_dev_s *dev, bool enable) else #endif { - err("ERROR: Invalid UART #\n"); + _err("ERROR: Invalid UART #\n"); return; } @@ -1027,7 +1027,7 @@ static void m16c_txint(struct up_dev_s *dev, bool enable) else #endif { - err("ERROR: Invalid UART #\n"); + _err("ERROR: Invalid UART #\n"); return; } diff --git a/arch/sh/src/sh1/sh1_irq.c b/arch/sh/src/sh1/sh1_irq.c index 36164ae9d1..bb59877340 100644 --- a/arch/sh/src/sh1/sh1_irq.c +++ b/arch/sh/src/sh1/sh1_irq.c @@ -95,7 +95,7 @@ void up_prioritize_irq(int irq, int priority) #ifdef CONFIG_DEBUG_FEATURES if ((unsigned) irq > NR_IRQS || (unsigned)priority > 15) { - err("ERROR: Invalid parameters\n"); + _err("ERROR: Invalid parameters\n"); return; } #endif @@ -260,7 +260,7 @@ void up_prioritize_irq(int irq, int priority) #endif default: - err("ERROR: Invalid irq=%d\n", irq); + _err("ERROR: Invalid irq=%d\n", irq); return; } diff --git a/arch/sim/src/up_framebuffer.c b/arch/sim/src/up_framebuffer.c index ff1e3629bc..1de73fd514 100644 --- a/arch/sim/src/up_framebuffer.c +++ b/arch/sim/src/up_framebuffer.c @@ -191,14 +191,14 @@ struct fb_vtable_s g_fbobject = static int up_getvideoinfo(FAR struct fb_vtable_s *vtable, FAR struct fb_videoinfo_s *vinfo) { - info("vtable=%p vinfo=%p\n", vtable, vinfo); + _info("vtable=%p vinfo=%p\n", vtable, vinfo); if (vtable && vinfo) { memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s)); return OK; } - err("ERROR: Returning EINVAL\n"); + _err("ERROR: Returning EINVAL\n"); return -EINVAL; } @@ -209,14 +209,14 @@ static int up_getvideoinfo(FAR struct fb_vtable_s *vtable, static int up_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno, FAR struct fb_planeinfo_s *pinfo) { - info("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo); + _info("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo); if (vtable && planeno == 0 && pinfo) { memcpy(pinfo, &g_planeinfo, sizeof(struct fb_planeinfo_s)); return OK; } - err("ERROR: Returning EINVAL\n"); + _err("ERROR: Returning EINVAL\n"); return -EINVAL; } @@ -230,7 +230,7 @@ static int up_getcmap(FAR struct fb_vtable_s *vtable, FAR struct fb_cmap_s *cmap int len; int i; - info("vtable=%p cmap=%p len=%d\n", vtable, cmap, cmap->len); + _info("vtable=%p cmap=%p len=%d\n", vtable, cmap, cmap->len); if (vtable && cmap) { for (i = cmap->first, len = 0; i < 256 && len < cmap->len; i++, len++) @@ -247,7 +247,7 @@ static int up_getcmap(FAR struct fb_vtable_s *vtable, FAR struct fb_cmap_s *cmap return OK; } - err("ERROR: Returning EINVAL\n"); + _err("ERROR: Returning EINVAL\n"); return -EINVAL; } #endif @@ -262,13 +262,13 @@ static int up_putcmap(FAR struct fb_vtable_s *vtable, FAR const struct fb_cmap_s #ifdef CONFIG_SIM_X11FB return up_x11cmap(cmap->first, cmap->len, cmap->red, cmap->green, cmap->blue, NULL); #else - info("vtable=%p cmap=%p len=%d\n", vtable, cmap, cmap->len); + _info("vtable=%p cmap=%p len=%d\n", vtable, cmap, cmap->len); if (vtable && cmap) { return OK; } - err("ERROR: Returning EINVAL\n"); + _err("ERROR: Returning EINVAL\n"); return -EINVAL; #endif } @@ -282,24 +282,24 @@ static int up_putcmap(FAR struct fb_vtable_s *vtable, FAR const struct fb_cmap_s static int up_getcursor(FAR struct fb_vtable_s *vtable, FAR struct fb_cursorattrib_s *attrib) { - info("vtable=%p attrib=%p\n", vtable, attrib); + _info("vtable=%p attrib=%p\n", vtable, attrib); if (vtable && attrib) { #ifdef CONFIG_FB_HWCURSORIMAGE attrib->fmt = FB_FMT; #endif - info("pos: (x=%d, y=%d)\n", g_cpos.x, g_cpos.y); + _info("pos: (x=%d, y=%d)\n", g_cpos.x, g_cpos.y); attrib->pos = g_cpos; #ifdef CONFIG_FB_HWCURSORSIZE attrib->mxsize.h = CONFIG_SIM_FBHEIGHT; attrib->mxsize.w = CONFIG_SIM_FBWIDTH; - info("size: (h=%d, w=%d)\n", g_csize.h, g_csize.w); + _info("size: (h=%d, w=%d)\n", g_csize.h, g_csize.w); attrib->size = g_csize; #endif return OK; } - err("ERROR: Returning EINVAL\n"); + _err("ERROR: Returning EINVAL\n"); return -EINVAL; } #endif @@ -312,33 +312,33 @@ static int up_getcursor(FAR struct fb_vtable_s *vtable, static int up_setcursor(FAR struct fb_vtable_s *vtable, FAR struct fb_setcursor_s *setttings) { - info("vtable=%p setttings=%p\n", vtable, setttings); + _info("vtable=%p setttings=%p\n", vtable, setttings); if (vtable && setttings) { - info("flags: %02x\n", settings->flags); + _info("flags: %02x\n", settings->flags); if ((flags & FB_CUR_SETPOSITION) != 0) { g_cpos = settings->pos; - info("pos: (h:%d, w:%d)\n", g_cpos.x, g_cpos.y); + _info("pos: (h:%d, w:%d)\n", g_cpos.x, g_cpos.y); } #ifdef CONFIG_FB_HWCURSORSIZE if ((flags & FB_CUR_SETSIZE) != 0) { g_csize = settings->size; - info("size: (h:%d, w:%d)\n", g_csize.h, g_csize.w); + _info("size: (h:%d, w:%d)\n", g_csize.h, g_csize.w); } #endif #ifdef CONFIG_FB_HWCURSORIMAGE if ((flags & FB_CUR_SETIMAGE) != 0) { - info("image: (h:%d, w:%d) @ %p\n", + _info("image: (h:%d, w:%d) @ %p\n", settings->img.height, settings->img.width, settings->img.image); } #endif return OK; } - err("ERROR: Returning EINVAL\n"); + _err("ERROR: Returning EINVAL\n"); return -EINVAL; } #endif diff --git a/arch/x86/src/common/up_initialize.c b/arch/x86/src/common/up_initialize.c index ff68a14fc2..15197e93a5 100644 --- a/arch/x86/src/common/up_initialize.c +++ b/arch/x86/src/common/up_initialize.c @@ -76,13 +76,13 @@ static void up_calibratedelay(void) { int i; - llwarn("Beginning 100s delay\n"); + _llwarn("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } - llwarn("End 100s delay\n"); + _llwarn("End 100s delay\n"); } #else # define up_calibratedelay() diff --git a/arch/z16/src/common/up_initialize.c b/arch/z16/src/common/up_initialize.c index a832942f19..853ae0ce7a 100644 --- a/arch/z16/src/common/up_initialize.c +++ b/arch/z16/src/common/up_initialize.c @@ -87,13 +87,13 @@ static void up_calibratedelay(void) { int i; - llwarn("Beginning 100s delay\n"); + _llwarn("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } - llwarn("End 100s delay\n"); + _llwarn("End 100s delay\n"); } #else # define up_calibratedelay() diff --git a/arch/z16/src/common/up_stackdump.c b/arch/z16/src/common/up_stackdump.c index 4b439b8d87..35bc6d4979 100644 --- a/arch/z16/src/common/up_stackdump.c +++ b/arch/z16/src/common/up_stackdump.c @@ -73,7 +73,7 @@ static void up_stackdump(void) if (sp >= stack_base || sp < stack_base - stack_size) { - llerr("ERROR: Stack pointer is not within allocated stack\n"); + _llerr("ERROR: Stack pointer is not within allocated stack\n"); return; } else diff --git a/arch/z80/src/common/up_blocktask.c b/arch/z80/src/common/up_blocktask.c index 3ce49030af..a4aa7b8ed5 100644 --- a/arch/z80/src/common/up_blocktask.c +++ b/arch/z80/src/common/up_blocktask.c @@ -85,7 +85,7 @@ void up_block_task(FAR struct tcb_s *tcb, tstate_t task_state) ASSERT((tcb->task_state >= FIRST_READY_TO_RUN_STATE) && (tcb->task_state <= LAST_READY_TO_RUN_STATE)); - /* info("Blocking TCB=%p\n", tcb); */ + /* _info("Blocking TCB=%p\n", tcb); */ /* Remove the tcb task from the ready-to-run list. If we * are blocking the task at the head of the task list (the diff --git a/arch/z80/src/common/up_exit.c b/arch/z80/src/common/up_exit.c index ac534d7222..a5e9832133 100644 --- a/arch/z80/src/common/up_exit.c +++ b/arch/z80/src/common/up_exit.c @@ -88,8 +88,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg) int i; #endif - llinfo(" TCB=%p name=%s\n", tcb, tcb->argv[0]); - llinfo(" priority=%d state=%d\n", tcb->sched_priority, tcb->task_state); + _llinfo(" TCB=%p name=%s\n", tcb, tcb->argv[0]); + _llinfo(" priority=%d state=%d\n", tcb->sched_priority, tcb->task_state); #if CONFIG_NFILE_DESCRIPTORS > 0 filelist = tcb->group->tg_filelist; @@ -98,7 +98,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg) struct inode *inode = filelist->fl_files[i].f_inode; if (inode) { - llinfo(" fd=%d refcount=%d\n", + _llinfo(" fd=%d refcount=%d\n", i, inode->i_crefs); } } @@ -112,11 +112,11 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg) if (filep->fs_fd >= 0) { #if CONFIG_STDIO_BUFFER_SIZE > 0 - llinfo(" fd=%d nbytes=%d\n", + _llinfo(" fd=%d nbytes=%d\n", filep->fs_fd, filep->fs_bufpos - filep->fs_bufstart); #else - llinfo(" fd=%d\n", filep->fs_fd); + _llinfo(" fd=%d\n", filep->fs_fd); #endif } } @@ -152,7 +152,7 @@ void _exit(int status) sllinfo("TCB=%p exiting\n", tcb); #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES) - llinfo("Other tasks:\n"); + _llinfo("Other tasks:\n"); sched_foreach(_up_dumponexit, NULL); #endif diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c index f631238c46..b773d95892 100644 --- a/arch/z80/src/common/up_initialize.c +++ b/arch/z80/src/common/up_initialize.c @@ -75,13 +75,13 @@ static void up_calibratedelay(void) { int i; - llwarn("Beginning 100s delay\n"); + _llwarn("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } - llwarn("End 100s delay\n"); + _llwarn("End 100s delay\n"); } #else # define up_calibratedelay() diff --git a/arch/z80/src/common/up_unblocktask.c b/arch/z80/src/common/up_unblocktask.c index 123881386e..3539ef404d 100644 --- a/arch/z80/src/common/up_unblocktask.c +++ b/arch/z80/src/common/up_unblocktask.c @@ -81,7 +81,7 @@ void up_unblock_task(FAR struct tcb_s *tcb) ASSERT((tcb->task_state >= FIRST_BLOCKED_STATE) && (tcb->task_state <= LAST_BLOCKED_STATE)); - /* info("Unblocking TCB=%p\n", tcb); */ + /* _info("Unblocking TCB=%p\n", tcb); */ /* Remove the task from the blocked task list */ diff --git a/arch/z80/src/ez80/ez80_i2c.c b/arch/z80/src/ez80/ez80_i2c.c index 04c45c3c4c..0e4bdb1b28 100644 --- a/arch/z80/src/ez80/ez80_i2c.c +++ b/arch/z80/src/ez80/ez80_i2c.c @@ -404,7 +404,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit) { /* This error should never occur */ - err("ERROR: Bad START status: %02x\n", sr); + _err("ERROR: Bad START status: %02x\n", sr); ez80_i2c_clriflg(); return -EIO; } @@ -426,7 +426,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit) sr = ez80_i2c_waitiflg(); if (sr != I2C_SR_MADDRWRACK && sr != I2C_SR_MADDRWR) { - err("ERROR: Bad ADDR8 status: %02x\n", sr); + _err("ERROR: Bad ADDR8 status: %02x\n", sr); goto failure; } } @@ -445,7 +445,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit) sr = ez80_i2c_waitiflg(); if (sr != I2C_SR_MADDRWRACK && sr != I2C_SR_MADDRWR) { - err("ERROR: Bad ADDR10H status: %02x\n", sr); + _err("ERROR: Bad ADDR10H status: %02x\n", sr); goto failure; } @@ -459,7 +459,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit) sr = ez80_i2c_waitiflg(); if (sr != I2C_SR_MADDR2WRACK && sr != I2C_SR_MADDR2WR) { - err("ERROR: Bad ADDR10L status: %02x\n", sr); + _err("ERROR: Bad ADDR10L status: %02x\n", sr); goto failure; } } @@ -479,12 +479,12 @@ failure: * Call address received, ACK transmitted */ case I2C_SR_ARBLOST4: /* Arbitration lost in address as master, slave * address and Read bit received, ACK transmitted */ - err("ERROR: Arbitration lost: %02x\n", sr); + _err("ERROR: Arbitration lost: %02x\n", sr); ez80_i2c_clriflg(); return -EAGAIN; default: - err("ERROR: Unexpected status: %02x\n", sr); + _err("ERROR: Unexpected status: %02x\n", sr); ez80_i2c_clriflg(); return -EIO; } @@ -634,7 +634,7 @@ static int ez80_i2c_read_transfer(FAR struct ez80_i2cdev_s *priv, * this will cause the whole transfer to start over */ - err("ERROR: Arbitration lost: %02x\n", regval); + _err("ERROR: Arbitration lost: %02x\n", regval); ez80_i2c_clriflg(); break; } @@ -643,7 +643,7 @@ static int ez80_i2c_read_transfer(FAR struct ez80_i2cdev_s *priv, else { - err("ERROR: Unexpected status: %02x\n", regval); + _err("ERROR: Unexpected status: %02x\n", regval); ez80_i2c_clriflg(); return-EIO; } @@ -731,7 +731,7 @@ static int ez80_i2c_write_transfer(FAR struct ez80_i2cdev_s *priv, sr = ez80_i2c_waitiflg(); if (sr != I2C_SR_MDATAWRACK && sr != I2C_SR_MDATAWR) { - err("ERROR: Bad DATA status: %02x\n", sr); + _err("ERROR: Bad DATA status: %02x\n", sr); ez80_i2c_clriflg(); if (sr == I2C_SR_ARBLOST1) { diff --git a/arch/z80/src/z180/z180_schedulesigaction.c b/arch/z80/src/z180/z180_schedulesigaction.c index ade86734e9..c53663f783 100644 --- a/arch/z80/src/z180/z180_schedulesigaction.c +++ b/arch/z80/src/z180/z180_schedulesigaction.c @@ -125,7 +125,7 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver) { irqstate_t flags; - info("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver); + _info("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver); /* Make sure that interrupts are disabled */ diff --git a/arch/z80/src/z8/z8_i2c.c b/arch/z80/src/z8/z8_i2c.c index a5c597cba9..e8c2a0e046 100644 --- a/arch/z80/src/z8/z8_i2c.c +++ b/arch/z80/src/z8/z8_i2c.c @@ -236,7 +236,7 @@ static uint16_t z8_i2c_getbrg(uint32_t frequency) if (frequency > 400*1000) { - err("ERROR: Invalid inputs\n"); + _err("ERROR: Invalid inputs\n"); frequency = 400*1000; } diff --git a/arch/z80/src/z8/z8_schedulesigaction.c b/arch/z80/src/z8/z8_schedulesigaction.c index 679bccd617..338bf3096a 100644 --- a/arch/z80/src/z8/z8_schedulesigaction.c +++ b/arch/z80/src/z8/z8_schedulesigaction.c @@ -125,7 +125,7 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver) { irqstate_t flags; - info("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver); + _info("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver); /* Make sure that interrupts are disabled */ diff --git a/arch/z80/src/z80/z80_schedulesigaction.c b/arch/z80/src/z80/z80_schedulesigaction.c index dbb3cb5537..439808b0ca 100644 --- a/arch/z80/src/z80/z80_schedulesigaction.c +++ b/arch/z80/src/z80/z80_schedulesigaction.c @@ -125,7 +125,7 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver) { irqstate_t flags; - info("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver); + _info("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver); /* Make sure that interrupts are disabled */ diff --git a/audio/pcm_decode.c b/audio/pcm_decode.c index a9d739dd44..383d8ef261 100644 --- a/audio/pcm_decode.c +++ b/audio/pcm_decode.c @@ -259,23 +259,23 @@ static void pcm_callback(FAR void *arg, uint16_t reason, #ifdef CONFIG_PCM_DEBUG static void pcm_dump(FAR const struct wav_header_s *wav) { - info("Wave file header\n"); - info(" Header Chunk:\n"); - info(" Chunk ID: 0x%08x\n", wav->hdr.chunkid); - info(" Chunk Size: %u\n", wav->hdr.chunklen); - info(" Format: 0x%08x\n", wav->hdr.format); - info(" Format Chunk:\n"); - info(" Chunk ID: 0x%08x\n", wav->fmt.chunkid); - info(" Chunk Size: %u\n", wav->fmt.chunklen); - info(" Audio Format: 0x%04x\n", wav->fmt.format); - info(" Num. Channels: %d\n", wav->fmt.nchannels); - info(" Sample Rate: %u\n", wav->fmt.samprate); - info(" Byte Rate: %u\n", wav->fmt.byterate); - info(" Block Align: %d\n", wav->fmt.align); - info(" Bits Per Sample: %d\n", wav->fmt.bpsamp); - info(" Data Chunk:\n"); - info(" Chunk ID: 0x%08x\n", wav->data.chunkid); - info(" Chunk Size: %u\n", wav->data.chunklen); + _info("Wave file header\n"); + _info(" Header Chunk:\n"); + _info(" Chunk ID: 0x%08x\n", wav->hdr.chunkid); + _info(" Chunk Size: %u\n", wav->hdr.chunklen); + _info(" Format: 0x%08x\n", wav->hdr.format); + _info(" Format Chunk:\n"); + _info(" Chunk ID: 0x%08x\n", wav->fmt.chunkid); + _info(" Chunk Size: %u\n", wav->fmt.chunklen); + _info(" Audio Format: 0x%04x\n", wav->fmt.format); + _info(" Num. Channels: %d\n", wav->fmt.nchannels); + _info(" Sample Rate: %u\n", wav->fmt.samprate); + _info(" Byte Rate: %u\n", wav->fmt.byterate); + _info(" Block Align: %d\n", wav->fmt.align); + _info(" Bits Per Sample: %d\n", wav->fmt.bpsamp); + _info(" Data Chunk:\n"); + _info(" Chunk ID: 0x%08x\n", wav->data.chunkid); + _info(" Chunk Size: %u\n", wav->data.chunklen); } #endif diff --git a/binfmt/pcode.c b/binfmt/pcode.c index 3913d38ed5..8e52b75aab 100644 --- a/binfmt/pcode.c +++ b/binfmt/pcode.c @@ -366,7 +366,7 @@ static int pcode_load(struct binary_s *binp) if (memcmp(&hdr.fh_ident, FHI_POFF_MAG, 4) != 0 || hdr.fh_type != FHT_EXEC) { - err("ERROR: File is not a P-code executable: %d\n"); + _err("ERROR: File is not a P-code executable: %d\n"); ret = -ENOEXEC; goto errout_with_fd; } diff --git a/configs/compal_e99/src/ssd1783.c b/configs/compal_e99/src/ssd1783.c index 1482bb85eb..75725fc920 100644 --- a/configs/compal_e99/src/ssd1783.c +++ b/configs/compal_e99/src/ssd1783.c @@ -244,7 +244,7 @@ static void lcd_write_prepare(unsigned int x1, unsigned int x2, unsigned int y1, { END, 0x00 } }; - info("x1:%d, x2:%d, y1:%d, y2:%d\n",x1, x2,y1, y2); + _info("x1:%d, x2:%d, y1:%d, y2:%d\n",x1, x2,y1, y2); fb_ssd1783_send_cmdlist(prepare_disp_write_cmds); } diff --git a/configs/dk-tm4c129x/src/tm4c_bringup.c b/configs/dk-tm4c129x/src/tm4c_bringup.c index b6ddd0be28..e2207559b7 100644 --- a/configs/dk-tm4c129x/src/tm4c_bringup.c +++ b/configs/dk-tm4c129x/src/tm4c_bringup.c @@ -86,14 +86,14 @@ static void tm4c_i2c_register(int bus) i2c = tiva_i2cbus_initialize(bus); if (i2c == NULL) { - err("ERROR: Failed to get I2C%d interface\n", bus); + _err("ERROR: Failed to get I2C%d interface\n", bus); } else { ret = i2c_register(i2c, bus); if (ret < 0) { - err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret); + _err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret); tiva_i2cbus_uninitialize(i2c); } } @@ -174,7 +174,7 @@ int tm4c_bringup(void) ret = tiva_tmp100_initialize(TMP100_DEVNAME); if (ret < 0) { - err("ERROR: Failed to initialize TMP100 driver: %d\n", ret); + _err("ERROR: Failed to initialize TMP100 driver: %d\n", ret); } #endif @@ -184,7 +184,7 @@ int tm4c_bringup(void) ret = tiva_timer_configure(); if (ret < 0) { - err("ERROR: Failed to initialize timer driver: %d\n", ret); + _err("ERROR: Failed to initialize timer driver: %d\n", ret); } #endif diff --git a/configs/fire-stm32v2/src/stm32_appinit.c b/configs/fire-stm32v2/src/stm32_appinit.c index 7e894cc4af..aa962b5b77 100644 --- a/configs/fire-stm32v2/src/stm32_appinit.c +++ b/configs/fire-stm32v2/src/stm32_appinit.c @@ -147,14 +147,14 @@ static void stm32_i2c_register(int bus) i2c = stm32_i2cbus_initialize(bus); if (i2c == NULL) { - err("ERROR: Failed to get I2C%d interface\n", bus); + _err("ERROR: Failed to get I2C%d interface\n", bus); } else { ret = i2c_register(i2c, bus); if (ret < 0) { - err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret); + _err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret); stm32_i2cbus_uninitialize(i2c); } } diff --git a/configs/freedom-kl25z/src/kl_appinit.c b/configs/freedom-kl25z/src/kl_appinit.c index f0126fdd31..1f0d218ece 100644 --- a/configs/freedom-kl25z/src/kl_appinit.c +++ b/configs/freedom-kl25z/src/kl_appinit.c @@ -86,7 +86,7 @@ int board_app_initialize(uintptr_t arg) ret = adxl345_archinitialize(0); if (ret < 0) { - err("ERROR: adxl345_archinitialize failed: %d\n", ret); + _err("ERROR: adxl345_archinitialize failed: %d\n", ret); } #endif return OK; diff --git a/configs/hymini-stm32v/src/stm32_appinit.c b/configs/hymini-stm32v/src/stm32_appinit.c index bff825036b..725a212619 100644 --- a/configs/hymini-stm32v/src/stm32_appinit.c +++ b/configs/hymini-stm32v/src/stm32_appinit.c @@ -216,7 +216,7 @@ int board_app_initialize(uintptr_t arg) /* Use SD card detect pin to check if a card is inserted */ cd_status = !stm32_gpioread(GPIO_SD_CD); - info("Card detect : %hhu\n", cd_status); + _info("Card detect : %hhu\n", cd_status); sdio_mediachange(g_sdiodev, cd_status); #endif diff --git a/configs/lm3s6965-ek/src/lm_oled.c b/configs/lm3s6965-ek/src/lm_oled.c index de1a4a23e2..bc28b2ac79 100644 --- a/configs/lm3s6965-ek/src/lm_oled.c +++ b/configs/lm3s6965-ek/src/lm_oled.c @@ -73,7 +73,7 @@ #endif #ifdef CONFIG_LCD_RITDEBUG -# define riterr(format, ...) info(format, ##__VA_ARGS__) +# define riterr(format, ...) _info(format, ##__VA_ARGS__) # define oleddc_dumpgpio(m) tiva_dumpgpio(OLEDDC_GPIO, m) # define oledcs_dumpgpio(m) tiva_dumpgpio(OLEDCS_GPIO, m) #else diff --git a/configs/lm3s8962-ek/src/lm_oled.c b/configs/lm3s8962-ek/src/lm_oled.c index d6298212e5..0be8eaf874 100644 --- a/configs/lm3s8962-ek/src/lm_oled.c +++ b/configs/lm3s8962-ek/src/lm_oled.c @@ -72,7 +72,7 @@ #endif #ifdef CONFIG_LCD_RITDEBUG -# define riterr(format, ...) info(format, ##__VA_ARGS__) +# define riterr(format, ...) _info(format, ##__VA_ARGS__) # define oleddc_dumpgpio(m) tiva_dumpgpio(OLEDDC_GPIO, m) # define oledcs_dumpgpio(m) tiva_dumpgpio(OLEDCS_GPIO, m) #else diff --git a/configs/lpc4337-ws/src/lpc43_appinit.c b/configs/lpc4337-ws/src/lpc43_appinit.c index b9dadd3090..3ae071fe12 100644 --- a/configs/lpc4337-ws/src/lpc43_appinit.c +++ b/configs/lpc4337-ws/src/lpc43_appinit.c @@ -70,14 +70,14 @@ static void lpc43_i2c_register(int bus) i2c = lpc43_i2cbus_initialize(bus); if (i2c == NULL) { - err("ERROR: Failed to get I2C%d interface\n", bus); + _err("ERROR: Failed to get I2C%d interface\n", bus); } else { ret = i2c_register(i2c, bus); if (ret < 0) { - err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret); + _err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret); lpc43_i2cbus_uninitialize(i2c); } } diff --git a/configs/lpc4370-link2/src/lpc43_appinit.c b/configs/lpc4370-link2/src/lpc43_appinit.c index a2f013613d..8493fb391d 100644 --- a/configs/lpc4370-link2/src/lpc43_appinit.c +++ b/configs/lpc4370-link2/src/lpc43_appinit.c @@ -70,14 +70,14 @@ static void lpc43_i2c_register(int bus) i2c = lpc43_i2cbus_initialize(bus); if (i2c == NULL) { - err("ERROR: Failed to get I2C%d interface\n", bus); + _err("ERROR: Failed to get I2C%d interface\n", bus); } else { ret = i2c_register(i2c, bus); if (ret < 0) { - err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret); + _err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret); lpc43_i2cbus_uninitialize(i2c); } } diff --git a/configs/mikroe-stm32f4/src/stm32_idle.c b/configs/mikroe-stm32f4/src/stm32_idle.c index bde6c70038..54265e8a47 100644 --- a/configs/mikroe-stm32f4/src/stm32_idle.c +++ b/configs/mikroe-stm32f4/src/stm32_idle.c @@ -125,7 +125,7 @@ static void up_idlepm(void) if (newstate != oldstate) { - llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); + _llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); flags = enter_critical_section(); diff --git a/configs/mikroe-stm32f4/src/stm32_pwm.c b/configs/mikroe-stm32f4/src/stm32_pwm.c index a7eda30906..0710d42f8b 100644 --- a/configs/mikroe-stm32f4/src/stm32_pwm.c +++ b/configs/mikroe-stm32f4/src/stm32_pwm.c @@ -119,7 +119,7 @@ int board_pwm_setup(void) pwm = stm32_pwminitialize(STM32F4DISCOVERY_PWMTIMER); if (!pwm) { - err("ERROR: Failed to get the STM32 PWM lower half\n"); + _err("ERROR: Failed to get the STM32 PWM lower half\n"); return -ENODEV; } diff --git a/configs/mirtoo/README.txt b/configs/mirtoo/README.txt index 35fbb83c6a..d97e6d198c 100644 --- a/configs/mirtoo/README.txt +++ b/configs/mirtoo/README.txt @@ -592,7 +592,7 @@ Analog Input spi = pic32mx_spibus_initialize(2); if (!spi) { - err("ERROR: Failed to initialize SPI port 2\n"); + _err("ERROR: Failed to initialize SPI port 2\n"); return -ENODEV; } @@ -601,7 +601,7 @@ Analog Input handle = pga11x_initialize(spi); if (!handle) { - err("ERROR: Failed to bind SPI port 2 to the PGA117 driver\n"); + _err("ERROR: Failed to bind SPI port 2 to the PGA117 driver\n"); return -ENODEV; } @@ -617,7 +617,7 @@ Analog Input ret = pga11x_select(handle, &settings); if (ret < 0) { - err("ERROR: Failed to select channel 2, gain 2\n"); + _err("ERROR: Failed to select channel 2, gain 2\n"); return -EIO; } diff --git a/configs/ne64badge/src/m9s12_buttons.c b/configs/ne64badge/src/m9s12_buttons.c index ecd4c6741b..dc67eeec6a 100644 --- a/configs/ne64badge/src/m9s12_buttons.c +++ b/configs/ne64badge/src/m9s12_buttons.c @@ -61,9 +61,9 @@ #undef BUTTON_VERBOSE /* Define to enable verbose debug */ #ifdef BUTTON_DEBUG -# define btnerr llerr +# define btnerr _llerr # ifdef BUTTON_VERBOSE -# define btninfo llerr +# define btninfo _llerr # else # define btninfo(x...) # endif diff --git a/configs/sabre-6quad/src/imx_bringup.c b/configs/sabre-6quad/src/imx_bringup.c index 051da9635f..5bb167a90b 100644 --- a/configs/sabre-6quad/src/imx_bringup.c +++ b/configs/sabre-6quad/src/imx_bringup.c @@ -51,9 +51,9 @@ /* Debug ********************************************************************/ #ifdef CONFIG_BOARD_INITIALIZE -# define SYSLOG llerr +# define SYSLOG _llerr #else -# define SYSLOG err +# define SYSLOG _err #endif /**************************************************************************** diff --git a/configs/sam4e-ek/src/sam_ethernet.c b/configs/sam4e-ek/src/sam_ethernet.c index b949658ada..1e2948da57 100644 --- a/configs/sam4e-ek/src/sam_ethernet.c +++ b/configs/sam4e-ek/src/sam_ethernet.c @@ -74,12 +74,12 @@ */ #ifdef CONFIG_NETDEV_PHY_DEBUG -# define phyerr err -# define phywarn warn -# define phyinfo info -# define phyllerr llerr -# define phyllwarn llwarn -# define phyllinfo llinfo +# define phyerr _err +# define phywarn _warn +# define phyinfo _info +# define phyllerr _llerr +# define phyllwarn _llwarn +# define phyllinfo _llinfo #else # define phyerr(x...) # define phywarn(x...) diff --git a/configs/sama5d2-xult/src/sam_bringup.c b/configs/sama5d2-xult/src/sam_bringup.c index 133e3f5199..eb02652441 100644 --- a/configs/sama5d2-xult/src/sam_bringup.c +++ b/configs/sama5d2-xult/src/sam_bringup.c @@ -50,9 +50,9 @@ ****************************************************************************/ #ifdef CONFIG_BOARD_INITIALIZE -# define SYSLOG llerr +# define SYSLOG _llerr #else -# define SYSLOG err +# define SYSLOG _err #endif /**************************************************************************** diff --git a/configs/sama5d3-xplained/src/sam_ethernet.c b/configs/sama5d3-xplained/src/sam_ethernet.c index c6ef0d3f53..5f38d395b1 100644 --- a/configs/sama5d3-xplained/src/sam_ethernet.c +++ b/configs/sama5d3-xplained/src/sam_ethernet.c @@ -84,12 +84,12 @@ */ #ifdef CONFIG_NETDEV_PHY_DEBUG -# define phyerr err -# define phywarn warn -# define phyinfo info -# define phyllerr llerr -# define phyllwarn llwarn -# define phyllinfo llinfo +# define phyerr _err +# define phywarn _warn +# define phyinfo _info +# define phyllerr _llerr +# define phyllwarn _llwarn +# define phyllinfo _llinfo #else # define phyerr(x...) # define phywarn(x...) diff --git a/configs/sama5d3-xplained/src/sam_i2schar.c b/configs/sama5d3-xplained/src/sam_i2schar.c index 67d271edc6..51510b4e6e 100644 --- a/configs/sama5d3-xplained/src/sam_i2schar.c +++ b/configs/sama5d3-xplained/src/sam_i2schar.c @@ -99,7 +99,7 @@ int i2schar_devinit(void) i2s = sam_ssc_initialize(CONFIG_SAMA5D3XPLAINED_SSC_PORT); if (!i2s) { - err("ERROR: Failed to get the SAMA5 SSC/I2S driver for SSC%d\n", + _err("ERROR: Failed to get the SAMA5 SSC/I2S driver for SSC%d\n", CONFIG_SAMA5D3XPLAINED_SSC_PORT); return -ENODEV; } diff --git a/configs/sama5d3-xplained/src/sam_pwm.c b/configs/sama5d3-xplained/src/sam_pwm.c index cd78ff2338..91664c1d21 100644 --- a/configs/sama5d3-xplained/src/sam_pwm.c +++ b/configs/sama5d3-xplained/src/sam_pwm.c @@ -139,7 +139,7 @@ int board_pwm_setup(void) pwm = sam_pwminitialize(CONFIG_SAMA5D3XPLAINED_CHANNEL); if (!pwm) { - err("ERROR: Failed to get the SAMA5 PWM lower half\n"); + _err("ERROR: Failed to get the SAMA5 PWM lower half\n"); return -ENODEV; } diff --git a/configs/sama5d3x-ek/src/sam_ethernet.c b/configs/sama5d3x-ek/src/sam_ethernet.c index ec7a9a21c6..b4d0d31c0b 100644 --- a/configs/sama5d3x-ek/src/sam_ethernet.c +++ b/configs/sama5d3x-ek/src/sam_ethernet.c @@ -84,12 +84,12 @@ */ #ifdef CONFIG_NETDEV_PHY_DEBUG -# define phyerr err -# define phywarn warn -# define phyinfo info -# define phyllerr llerr -# define phyllwarn llwarn -# define phyllinfo llinfo +# define phyerr _err +# define phywarn _warn +# define phyinfo _info +# define phyllerr _llerr +# define phyllwarn _llwarn +# define phyllinfo _llinfo #else # define phyerr(x...) # define phywarn(x...) diff --git a/configs/sama5d3x-ek/src/sam_i2schar.c b/configs/sama5d3x-ek/src/sam_i2schar.c index 21a88b3743..86c06aafa7 100644 --- a/configs/sama5d3x-ek/src/sam_i2schar.c +++ b/configs/sama5d3x-ek/src/sam_i2schar.c @@ -99,7 +99,7 @@ int i2schar_devinit(void) i2s = sam_ssc_initialize(CONFIG_SAMA5D3xEK_SSC_PORT); if (!i2s) { - err("ERROR: Failed to get the SAMA5 SSC/I2S driver for SSC%d\n", + _err("ERROR: Failed to get the SAMA5 SSC/I2S driver for SSC%d\n", CONFIG_SAMA5D3xEK_SSC_PORT); return -ENODEV; } diff --git a/configs/sama5d3x-ek/src/sam_pwm.c b/configs/sama5d3x-ek/src/sam_pwm.c index 26d14ce4dc..ef90855451 100644 --- a/configs/sama5d3x-ek/src/sam_pwm.c +++ b/configs/sama5d3x-ek/src/sam_pwm.c @@ -139,7 +139,7 @@ int board_pwm_setup(void) pwm = sam_pwminitialize(CONFIG_SAMA5D3xEK_CHANNEL); if (!pwm) { - err("ERROR: Failed to get the SAMA5 PWM lower half\n"); + _err("ERROR: Failed to get the SAMA5 PWM lower half\n"); return -ENODEV; } diff --git a/configs/sama5d4-ek/src/sam_bringup.c b/configs/sama5d4-ek/src/sam_bringup.c index 489249b04a..953a40b498 100644 --- a/configs/sama5d4-ek/src/sam_bringup.c +++ b/configs/sama5d4-ek/src/sam_bringup.c @@ -72,9 +72,9 @@ /* Debug ********************************************************************/ #ifdef CONFIG_BOARD_INITIALIZE -# define SYSLOG llerr +# define SYSLOG _llerr #else -# define SYSLOG err +# define SYSLOG _err #endif /**************************************************************************** @@ -98,14 +98,14 @@ static void sam_i2c_register(int bus) i2c = sam_i2cbus_initialize(bus); if (i2c == NULL) { - err("ERROR: Failed to get I2C%d interface\n", bus); + _err("ERROR: Failed to get I2C%d interface\n", bus); } else { ret = i2c_register(i2c, bus); if (ret < 0) { - err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret); + _err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret); sam_i2cbus_uninitialize(i2c); } } diff --git a/configs/sama5d4-ek/src/sam_ethernet.c b/configs/sama5d4-ek/src/sam_ethernet.c index 952d60771a..30fd1e6124 100644 --- a/configs/sama5d4-ek/src/sam_ethernet.c +++ b/configs/sama5d4-ek/src/sam_ethernet.c @@ -84,12 +84,12 @@ */ #ifdef CONFIG_NETDEV_PHY_DEBUG -# define phyerr err -# define phywarn warn -# define phyinfo info -# define phyllerr llerr -# define phyllwarn llwarn -# define phyllinfo llinfo +# define phyerr _err +# define phywarn _warn +# define phyinfo _info +# define phyllerr _llerr +# define phyllwarn _llwarn +# define phyllinfo _llinfo #else # define phyerr(x...) # define phywarn(x...) diff --git a/configs/sama5d4-ek/src/sam_pmic.c b/configs/sama5d4-ek/src/sam_pmic.c index ca4edf718e..63e6967141 100644 --- a/configs/sama5d4-ek/src/sam_pmic.c +++ b/configs/sama5d4-ek/src/sam_pmic.c @@ -80,7 +80,7 @@ void sam_pmic_initialize(void) i2c = sam_i2cbus_initialize(PMIC_TWI_BUS); if (!i2c) { - err("ERROR: Failed to initialize TWI%d\n", PMIC_TWI_BUS); + _err("ERROR: Failed to initialize TWI%d\n", PMIC_TWI_BUS); } else { diff --git a/configs/sama5d4-ek/src/sam_pwm.c b/configs/sama5d4-ek/src/sam_pwm.c index 5e74de17f1..b69d8f5e5a 100644 --- a/configs/sama5d4-ek/src/sam_pwm.c +++ b/configs/sama5d4-ek/src/sam_pwm.c @@ -139,7 +139,7 @@ int board_pwm_setup(void) pwm = sam_pwminitialize(CONFIG_SAMA5D4EK_CHANNEL); if (!pwm) { - err("ERROR: Failed to get the SAMA5 PWM lower half\n"); + _err("ERROR: Failed to get the SAMA5 PWM lower half\n"); return -ENODEV; } diff --git a/configs/same70-xplained/src/sam_bringup.c b/configs/same70-xplained/src/sam_bringup.c index 23600e6f5d..814953748e 100644 --- a/configs/same70-xplained/src/sam_bringup.c +++ b/configs/same70-xplained/src/sam_bringup.c @@ -79,9 +79,9 @@ /* Debug ********************************************************************/ #ifdef CONFIG_BOARD_INITIALIZE -# define SYSLOG llerr +# define SYSLOG _llerr #else -# define SYSLOG err +# define SYSLOG _err #endif /**************************************************************************** @@ -105,14 +105,14 @@ static void sam_i2c_register(int bus) i2c = sam_i2cbus_initialize(bus); if (i2c == NULL) { - err("ERROR: Failed to get I2C%d interface\n", bus); + _err("ERROR: Failed to get I2C%d interface\n", bus); } else { ret = i2c_register(i2c, bus); if (ret < 0) { - err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret); + _err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret); sam_i2cbus_uninitialize(i2c); } } diff --git a/configs/same70-xplained/src/sam_ethernet.c b/configs/same70-xplained/src/sam_ethernet.c index ca56f783d6..f7a2d9113c 100644 --- a/configs/same70-xplained/src/sam_ethernet.c +++ b/configs/same70-xplained/src/sam_ethernet.c @@ -80,12 +80,12 @@ */ #ifdef CONFIG_NETDEV_PHY_DEBUG -# define phyerr err -# define phywarn warn -# define phyinfo info -# define phyllerr llerr -# define phyllwarn llwarn -# define phyllinfo llinfo +# define phyerr _err +# define phywarn _warn +# define phyinfo _info +# define phyllerr _llerr +# define phyllwarn _llwarn +# define phyllinfo _llinfo #else # define phyerr(x...) # define phywarn(x...) diff --git a/configs/samv71-xult/src/sam_bringup.c b/configs/samv71-xult/src/sam_bringup.c index 6e00088027..85dca37057 100644 --- a/configs/samv71-xult/src/sam_bringup.c +++ b/configs/samv71-xult/src/sam_bringup.c @@ -102,9 +102,9 @@ /* Debug ********************************************************************/ #ifdef CONFIG_BOARD_INITIALIZE -# define SYSLOG llerr +# define SYSLOG _llerr #else -# define SYSLOG err +# define SYSLOG _err #endif /**************************************************************************** @@ -128,14 +128,14 @@ static void sam_i2c_register(int bus) i2c = sam_i2cbus_initialize(bus); if (i2c == NULL) { - err("ERROR: Failed to get I2C%d interface\n", bus); + _err("ERROR: Failed to get I2C%d interface\n", bus); } else { ret = i2c_register(i2c, bus); if (ret < 0) { - err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret); + _err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret); sam_i2cbus_uninitialize(i2c); } } diff --git a/configs/samv71-xult/src/sam_ethernet.c b/configs/samv71-xult/src/sam_ethernet.c index 119ada6455..00d91314a0 100644 --- a/configs/samv71-xult/src/sam_ethernet.c +++ b/configs/samv71-xult/src/sam_ethernet.c @@ -80,12 +80,12 @@ */ #ifdef CONFIG_NETDEV_PHY_DEBUG -# define phyerr err -# define phywarn warn -# define phyinfo info -# define phyllerr llerr -# define phyllwarn llwarn -# define phyllinfo llinfo +# define phyerr _err +# define phywarn _warn +# define phyinfo _info +# define phyllerr _llerr +# define phyllwarn _llwarn +# define phyllinfo _llinfo #else # define phyerr(x...) # define phywarn(x...) diff --git a/configs/shenzhou/src/stm32_ili93xx.c b/configs/shenzhou/src/stm32_ili93xx.c index 84646484fa..553e847bd3 100644 --- a/configs/shenzhou/src/stm32_ili93xx.c +++ b/configs/shenzhou/src/stm32_ili93xx.c @@ -569,18 +569,18 @@ static struct stm32_dev_s g_lcddev = #ifdef CONFIG_LCD_REGDEBUG static void stm32_lcdshow(FAR struct stm32_lower_s *priv, FAR const char *msg) { - info("%s:\n", msg); - info(" CRTL RS: %d CS: %d RD: %d WR: %d LE: %d\n", + _info("%s:\n", msg); + _info(" CRTL RS: %d CS: %d RD: %d WR: %d LE: %d\n", getreg32(LCD_RS_READ), getreg32(LCD_CS_READ), getreg32(LCD_RD_READ), getreg32(LCD_WR_READ), getreg32(LCD_LE_READ)); - info(" DATA CR: %08x %08x\n", getreg32(LCD_CRL), getreg32(LCD_CRH)); + _info(" DATA CR: %08x %08x\n", getreg32(LCD_CRL), getreg32(LCD_CRH)); if (priv->output) { - info(" OUTPUT: %08x\n", getreg32(LCD_ODR)); + _info(" OUTPUT: %08x\n", getreg32(LCD_ODR)); } else { - info(" INPUT: %08x\n", getreg32(LCD_IDR)); + _info(" INPUT: %08x\n", getreg32(LCD_IDR)); } } #endif diff --git a/configs/shenzhou/src/stm32_ssd1289.c b/configs/shenzhou/src/stm32_ssd1289.c index 65b7f70e20..413a49c9e4 100644 --- a/configs/shenzhou/src/stm32_ssd1289.c +++ b/configs/shenzhou/src/stm32_ssd1289.c @@ -252,18 +252,18 @@ static struct stm32_lower_s g_lcdlower = #ifdef CONFIG_LCD_REGDEBUG static void stm32_lcdshow(FAR struct stm32_lower_s *priv, FAR const char *msg) { - info("%s:\n", msg); - info(" CRTL RS: %d CS: %d RD: %d WR: %d LE: %d\n", + _info("%s:\n", msg); + _info(" CRTL RS: %d CS: %d RD: %d WR: %d LE: %d\n", getreg32(LCD_RS_READ), getreg32(LCD_CS_READ), getreg32(LCD_RD_READ), getreg32(LCD_WR_READ), getreg32(LCD_LE_READ)); - info(" DATA CR: %08x %08x\n", getreg32(LCD_CRL), getreg32(LCD_CRH)); + _info(" DATA CR: %08x %08x\n", getreg32(LCD_CRL), getreg32(LCD_CRH)); if (priv->output) { - info(" OUTPUT: %08x\n", getreg32(LCD_ODR)); + _info(" OUTPUT: %08x\n", getreg32(LCD_ODR)); } else { - info(" INPUT: %08x\n", getreg32(LCD_IDR)); + _info(" INPUT: %08x\n", getreg32(LCD_IDR)); } } #endif diff --git a/configs/sim/src/sim_bringup.c b/configs/sim/src/sim_bringup.c index 08b7e9f6ce..28b4c8fdcb 100644 --- a/configs/sim/src/sim_bringup.c +++ b/configs/sim/src/sim_bringup.c @@ -60,9 +60,9 @@ int trv_mount_world(int minor, FAR const char *mountpoint); /* Debug ********************************************************************/ #ifdef CONFIG_BOARD_INITIALIZE -# define SYSLOG llerr +# define SYSLOG _llerr #else -# define SYSLOG err +# define SYSLOG _err #endif /**************************************************************************** diff --git a/configs/stm3210e-eval/src/stm32_appinit.c b/configs/stm3210e-eval/src/stm32_appinit.c index 831a4f341e..10d617c0da 100644 --- a/configs/stm3210e-eval/src/stm32_appinit.c +++ b/configs/stm3210e-eval/src/stm32_appinit.c @@ -129,14 +129,14 @@ static void stm32_i2c_register(int bus) i2c = stm32_i2cbus_initialize(bus); if (i2c == NULL) { - err("ERROR: Failed to get I2C%d interface\n", bus); + _err("ERROR: Failed to get I2C%d interface\n", bus); } else { ret = i2c_register(i2c, bus); if (ret < 0) { - err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret); + _err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret); stm32_i2cbus_uninitialize(i2c); } } diff --git a/configs/stm3210e-eval/src/stm32_idle.c b/configs/stm3210e-eval/src/stm32_idle.c index cbe7e9f812..5dc94ece4e 100644 --- a/configs/stm3210e-eval/src/stm32_idle.c +++ b/configs/stm3210e-eval/src/stm32_idle.c @@ -290,7 +290,7 @@ static void stm32_idlepm(void) if (newstate != oldstate) { - llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); + _llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); sched_lock(); diff --git a/configs/stm3220g-eval/src/stm32_appinit.c b/configs/stm3220g-eval/src/stm32_appinit.c index e763f2fbe4..93ed87e3c4 100644 --- a/configs/stm3220g-eval/src/stm32_appinit.c +++ b/configs/stm3220g-eval/src/stm32_appinit.c @@ -142,14 +142,14 @@ static void stm32_i2c_register(int bus) i2c = stm32_i2cbus_initialize(bus); if (i2c == NULL) { - err("ERROR: Failed to get I2C%d interface\n", bus); + _err("ERROR: Failed to get I2C%d interface\n", bus); } else { ret = i2c_register(i2c, bus); if (ret < 0) { - err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret); + _err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret); stm32_i2cbus_uninitialize(i2c); } } diff --git a/configs/stm3240g-eval/src/stm32_appinit.c b/configs/stm3240g-eval/src/stm32_appinit.c index 144f237c1a..58938c9c2e 100644 --- a/configs/stm3240g-eval/src/stm32_appinit.c +++ b/configs/stm3240g-eval/src/stm32_appinit.c @@ -160,14 +160,14 @@ static void stm32_i2c_register(int bus) i2c = stm32_i2cbus_initialize(bus); if (i2c == NULL) { - err("ERROR: Failed to get I2C%d interface\n", bus); + _err("ERROR: Failed to get I2C%d interface\n", bus); } else { ret = i2c_register(i2c, bus); if (ret < 0) { - err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret); + _err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret); stm32_i2cbus_uninitialize(i2c); } } diff --git a/configs/stm32_tiny/src/stm32_wireless.c b/configs/stm32_tiny/src/stm32_wireless.c index e13bf24c97..bbfdedc13b 100644 --- a/configs/stm32_tiny/src/stm32_wireless.c +++ b/configs/stm32_tiny/src/stm32_wireless.c @@ -79,7 +79,7 @@ static xcpt_t g_isr; static int stm32tiny_wl_irq_attach(xcpt_t isr) { - info("Attach IRQ\n"); + _info("Attach IRQ\n"); g_isr = isr; stm32_gpiosetevent(GPIO_NRF24L01_IRQ, false, true, false, g_isr); return OK; @@ -87,7 +87,7 @@ static int stm32tiny_wl_irq_attach(xcpt_t isr) static void stm32tiny_wl_chip_enable(bool enable) { - info("CE:%d\n", enable); + _info("CE:%d\n", enable); stm32_gpiowrite(GPIO_NRF24L01_CE, enable); } @@ -114,14 +114,14 @@ void stm32_wlinitialize(void) spidev = stm32_spibus_initialize(2); if (!spidev) { - err("ERROR: Failed to initialize SPI bus\n"); + _err("ERROR: Failed to initialize SPI bus\n"); return; } result = nrf24l01_register(spidev, &nrf_cfg); if (result != OK) { - err("ERROR: Failed to register initialize SPI bus\n"); + _err("ERROR: Failed to register initialize SPI bus\n"); return; } } diff --git a/configs/stm32f4discovery/src/stm32_ethernet.c b/configs/stm32f4discovery/src/stm32_ethernet.c index 6c58def651..e8418d41f7 100644 --- a/configs/stm32f4discovery/src/stm32_ethernet.c +++ b/configs/stm32f4discovery/src/stm32_ethernet.c @@ -79,12 +79,12 @@ */ #ifdef CONFIG_NETDEV_PHY_DEBUG -# define phyerr err -# define phywarn warn -# define phyinfo info -# define phyllerr llerr -# define phyllwarn llwarn -# define phyllinfo llinfo +# define phyerr _err +# define phywarn _warn +# define phyinfo _info +# define phyllerr _llerr +# define phyllwarn _llwarn +# define phyllinfo _llinfo #else # define phyerr(x...) # define phywarn(x...) diff --git a/configs/stm32f4discovery/src/stm32_pca9635.c b/configs/stm32f4discovery/src/stm32_pca9635.c index 739b43e16a..dfea887d0e 100644 --- a/configs/stm32f4discovery/src/stm32_pca9635.c +++ b/configs/stm32f4discovery/src/stm32_pca9635.c @@ -86,7 +86,7 @@ int stm32_pca9635_initialize(void) i2c = stm32_i2cbus_initialize(PCA9635_I2CBUS); if (!i2c) { - err("ERROR: Failed to initialize I2C%d\n", PCA9635_I2CBUS); + _err("ERROR: Failed to initialize I2C%d\n", PCA9635_I2CBUS); return -1; } diff --git a/configs/stm32l476vg-disco/src/stm32_appinit.c b/configs/stm32l476vg-disco/src/stm32_appinit.c index fee33a2b3e..3d3cf8a76b 100644 --- a/configs/stm32l476vg-disco/src/stm32_appinit.c +++ b/configs/stm32l476vg-disco/src/stm32_appinit.c @@ -93,20 +93,12 @@ /* Debug ********************************************************************/ #ifdef CONFIG_BOARD_INITIALIZE -# define SYSLOG llerr +# define SYSLOG _llerr #else -# define SYSLOG err +# define SYSLOG _err #endif /**************************************************************************** - * Private Type Definitions - ****************************************************************************/ - -/**************************************************************************** - * Private Function Prototypes - ****************************************************************************/ - - /**************************************************************************** * Private Data ****************************************************************************/ diff --git a/configs/stm32ldiscovery/src/stm32_pwm.c b/configs/stm32ldiscovery/src/stm32_pwm.c index 9285c2a821..8da1601b71 100644 --- a/configs/stm32ldiscovery/src/stm32_pwm.c +++ b/configs/stm32ldiscovery/src/stm32_pwm.c @@ -120,7 +120,7 @@ int board_pwm_setup(void) pwm = stm32_pwminitialize(STM32F3DISCOVERY_PWMTIMER); if (!pwm) { - err("ERROR: Failed to get the STM32 PWM lower half\n"); + _err("ERROR: Failed to get the STM32 PWM lower half\n"); return -ENODEV; } diff --git a/configs/tm4c1294-launchpad/src/tm4c_bringup.c b/configs/tm4c1294-launchpad/src/tm4c_bringup.c index 53bd6a965b..9c8a60f2b4 100644 --- a/configs/tm4c1294-launchpad/src/tm4c_bringup.c +++ b/configs/tm4c1294-launchpad/src/tm4c_bringup.c @@ -76,14 +76,14 @@ static void tm4c_i2c_register(int bus) i2c = tiva_i2cbus_initialize(bus); if (i2c == NULL) { - err("ERROR: Failed to get I2C%d interface\n", bus); + _err("ERROR: Failed to get I2C%d interface\n", bus); } else { ret = i2c_register(i2c, bus); if (ret < 0) { - err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret); + _err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret); tiva_i2cbus_uninitialize(i2c); } } @@ -164,7 +164,7 @@ int tm4c_bringup(void) ret = tiva_timer_configure(); if (ret < 0) { - err("ERROR: Failed to initialize timer driver: %d\n", ret); + _err("ERROR: Failed to initialize timer driver: %d\n", ret); } #endif diff --git a/configs/u-blox-c027/src/lpc17_ubxmdm.c b/configs/u-blox-c027/src/lpc17_ubxmdm.c index 8f8e113297..f926026eba 100644 --- a/configs/u-blox-c027/src/lpc17_ubxmdm.c +++ b/configs/u-blox-c027/src/lpc17_ubxmdm.c @@ -62,10 +62,10 @@ /* Non-standard debug that may be enabled just for testing the modem driver */ #ifdef CONFIG_MODEM_U_BLOX_DEBUG -# define m_err err -# define m_info info -# define m_vllerr llerr -# define m_vllinfo llinfo +# define m_err _err +# define m_info _info +# define m_vllerr _llerr +# define m_vllinfo _llinfo #else # define m_err(x...) # define m_info(x...) diff --git a/configs/us7032evb1/shterm/shterm.c b/configs/us7032evb1/shterm/shterm.c index b9a1ff5b14..8b70d71301 100644 --- a/configs/us7032evb1/shterm/shterm.c +++ b/configs/us7032evb1/shterm/shterm.c @@ -62,8 +62,8 @@ #define DEFAULT_BAUD 9600 -#define err(format, ...) if (debug > 0) printconsole(format, ##__VA_ARGS__) -#define info(format, ...) if (debug > 1) printconsole(format, ##__VA_ARGS__) +#define _err(format, ...) if (debug > 0) printconsole(format, ##__VA_ARGS__) +#define _info(format, ...) if (debug > 1) printconsole(format, ##__VA_ARGS__) /**************************************************************************** * Private Types diff --git a/configs/zkit-arm-1769/src/lpc17_appinit.c b/configs/zkit-arm-1769/src/lpc17_appinit.c index 2eebdc5196..9cc219af0a 100644 --- a/configs/zkit-arm-1769/src/lpc17_appinit.c +++ b/configs/zkit-arm-1769/src/lpc17_appinit.c @@ -117,13 +117,13 @@ #ifdef CONFIG_CPP_HAVE_VARARGS # ifdef CONFIG_DEBUG_INFO -# define message(...) llinfo(__VA_ARGS__) +# define message(...) _llinfo(__VA_ARGS__) # else # define message(...) printf(__VA_ARGS__) # endif #else # ifdef CONFIG_DEBUG_FEATURES -# define message llinfo +# define message _llinfo # else # define message printf # endif diff --git a/drivers/analog/ad5410.c b/drivers/analog/ad5410.c index 15ceedf4a7..5aeede163c 100644 --- a/drivers/analog/ad5410.c +++ b/drivers/analog/ad5410.c @@ -256,7 +256,7 @@ static int dac_send(FAR struct dac_dev_s *dev, FAR struct dac_msg_s *msg) static int dac_ioctl(FAR struct dac_dev_s *dev, int cmd, unsigned long arg) { - err("ERROR: Fix me; Not Implemented\n"); + _err("ERROR: Fix me; Not Implemented\n"); return 0; } diff --git a/drivers/analog/ads1242.c b/drivers/analog/ads1242.c index d15f58e3b4..ee7c39582e 100644 --- a/drivers/analog/ads1242.c +++ b/drivers/analog/ads1242.c @@ -403,15 +403,15 @@ static void ads1242_print_regs(FAR struct ads1242_dev_s *dev, char const *msg) uint8_t mux_reg_value = 0; uint8_t acr_reg_value = 0; - info("%s\n", msg); + _info("%s\n", msg); ads1242_read_reg(dev, ADS1242_REG_SETUP, &setup_reg_value); ads1242_read_reg(dev, ADS1242_REG_MUX, &mux_reg_value); ads1242_read_reg(dev, ADS1242_REG_ACR, &acr_reg_value); - info("SETUP %02X\n", setup_reg_value); - info("MUX %02X\n", mux_reg_value); - info("ACR %02X\n", acr_reg_value); + _info("SETUP %02X\n", setup_reg_value); + _info("MUX %02X\n", mux_reg_value); + _info("ACR %02X\n", acr_reg_value); } #endif /* CONFIG_DEBUG_FEATURES && CONFIG_DEBUG_INFO */ @@ -552,7 +552,7 @@ static int ads1242_ioctl (FAR struct file *filep, int cmd, unsigned long arg) /* Command was not recognized */ default: - err ("Unrecognized cmd: %d\n", cmd); + _err("ERROR: Unrecognized cmd: %d\n", cmd); ret = -ENOTTY; break; } @@ -596,7 +596,7 @@ int ads1242_register(FAR const char *devpath, FAR struct spi_dev_s *spi, priv = (FAR struct ads1242_dev_s *)kmm_malloc(sizeof(struct ads1242_dev_s)); if (priv == NULL) { - err ("Failed to allocate instance\n"); + _err("ERROR: Failed to allocate instance\n"); return -ENOMEM; } @@ -610,7 +610,7 @@ int ads1242_register(FAR const char *devpath, FAR struct spi_dev_s *spi, ret = register_driver(devpath, &g_ads1242_fops, 0666, priv); if (ret < 0) { - err ("Failed to register driver: %d\n", ret); + _err("ERROR: Failed to register driver: %d\n", ret); kmm_free(priv); } diff --git a/drivers/analog/ads1255.c b/drivers/analog/ads1255.c index ea70d36174..75b256cf16 100644 --- a/drivers/analog/ads1255.c +++ b/drivers/analog/ads1255.c @@ -396,7 +396,7 @@ static void adc_rxint(FAR struct adc_dev_s *dev, bool enable) static int adc_ioctl(FAR struct adc_dev_s *dev, int cmd, unsigned long arg) { - err("ERROR: Fix me; Not Implemented\n"); + _err("ERROR: Fix me; Not Implemented\n"); return 0; } diff --git a/drivers/bch/bchdev_unregister.c b/drivers/bch/bchdev_unregister.c index 6c2e4dd506..cf7d681de8 100644 --- a/drivers/bch/bchdev_unregister.c +++ b/drivers/bch/bchdev_unregister.c @@ -103,7 +103,7 @@ int bchdev_unregister(FAR const char *chardev) fd = open(chardev, O_RDONLY); if (fd < 0) { - err("ERROR: Failed to open %s: %d\n", chardev, errno); + _err("ERROR: Failed to open %s: %d\n", chardev, errno); return -errno; } @@ -116,7 +116,7 @@ int bchdev_unregister(FAR const char *chardev) if (ret < 0) { - err("ERROR: ioctl failed: %d\n", errno); + _err("ERROR: ioctl failed: %d\n", errno); return -errno; } diff --git a/drivers/input/stmpe811_base.c b/drivers/input/stmpe811_base.c index 8aea42e09d..3cfb7ad099 100644 --- a/drivers/input/stmpe811_base.c +++ b/drivers/input/stmpe811_base.c @@ -427,7 +427,7 @@ uint8_t stmpe811_getreg8(FAR struct stmpe811_dev_s *priv, uint8_t regaddr) } #ifdef CONFIG_STMPE811_REGDEBUG - err("%02x->%02x\n", regaddr, regval); + _err("%02x->%02x\n", regaddr, regval); #endif return regval; } @@ -455,7 +455,7 @@ void stmpe811_putreg8(FAR struct stmpe811_dev_s *priv, int ret; #ifdef CONFIG_STMPE811_REGDEBUG - err("%02x<-%02x\n", regaddr, regval); + _err("%02x<-%02x\n", regaddr, regval); #endif /* Setup to the data to be transferred. Two bytes: The STMPE811 register @@ -535,7 +535,7 @@ uint16_t stmpe811_getreg16(FAR struct stmpe811_dev_s *priv, uint8_t regaddr) } #ifdef CONFIG_STMPE811_REGDEBUG - err("%02x->%02x%02x\n", regaddr, rxbuffer[0], rxbuffer[1]); + _err("%02x->%02x%02x\n", regaddr, rxbuffer[0], rxbuffer[1]); #endif return (uint16_t)rxbuffer[0] << 8 | (uint16_t)rxbuffer[1]; } diff --git a/drivers/lcd/p14201.c b/drivers/lcd/p14201.c index f7d2d91b97..147e6414ed 100644 --- a/drivers/lcd/p14201.c +++ b/drivers/lcd/p14201.c @@ -180,9 +180,9 @@ /* Debug ******************************************************************************/ #ifdef CONFIG_LCD_RITDEBUG -# define riterr(format, ...) err(format, ##__VA_ARGS__) -# define ritwarn(format, ...) warn(format, ##__VA_ARGS__) -# define ritinfo(format, ...) info(format, ##__VA_ARGS__) +# define riterr(format, ...) _err(format, ##__VA_ARGS__) +# define ritwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define ritinfo(format, ...) _info(format, ##__VA_ARGS__) #else # define riterr(x...) # define ritwarn(x...) diff --git a/drivers/lcd/skeleton.c b/drivers/lcd/skeleton.c index 3bcfc9bcf1..96be4b2e2c 100644 --- a/drivers/lcd/skeleton.c +++ b/drivers/lcd/skeleton.c @@ -90,9 +90,9 @@ /* Debug ******************************************************************************/ #ifdef CONFIG_LCD_SKELDEBUG -# define skelerr(format, ...) err(format, ##__VA_ARGS__) -# define skelwarn(format, ...) warn(format, ##__VA_ARGS__) -# define skelinfo(format, ...) info(format, ##__VA_ARGS__) +# define skelerr(format, ...) _err(format, ##__VA_ARGS__) +# define skelwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define skelinfo(format, ...) _info(format, ##__VA_ARGS__) #else # define skelerr(x...) # define skelwarn(x...) diff --git a/drivers/lcd/ssd1306_i2c.c b/drivers/lcd/ssd1306_i2c.c index 343a0e3199..969eec4769 100644 --- a/drivers/lcd/ssd1306_i2c.c +++ b/drivers/lcd/ssd1306_i2c.c @@ -71,7 +71,7 @@ void ssd1306_sendbyte(FAR struct ssd1306_dev_s *priv, uint8_t regval) int ret; #ifdef CONFIG_LCD_SSD1306_REGDEBUG - llerr("-> 0x%02x\n", regval); + _llerr("-> 0x%02x\n", regval); #endif /* Setup to the data to be transferred. Two bytes: The SSD1306 register diff --git a/drivers/lcd/ssd1306_spi.c b/drivers/lcd/ssd1306_spi.c index dfa7acfc02..c53faf15d4 100644 --- a/drivers/lcd/ssd1306_spi.c +++ b/drivers/lcd/ssd1306_spi.c @@ -89,7 +89,7 @@ static inline void ssd1306_configspi(FAR struct spi_dev_s *spi) void ssd1306_sendbyte(FAR struct ssd1306_dev_s *priv, uint8_t regval) { #ifdef CONFIG_LCD_SSD1306_REGDEBUG - llerr("->0x%02x\n", regval); + _llerr("->0x%02x\n", regval); #endif /* Send byte value to display */ diff --git a/drivers/loop/losetup.c b/drivers/loop/losetup.c index fe4a9b3792..65d9f9e9cd 100644 --- a/drivers/loop/losetup.c +++ b/drivers/loop/losetup.c @@ -246,7 +246,7 @@ static ssize_t loop_read(FAR struct inode *inode, FAR unsigned char *buffer, if (start_sector + nsectors > dev->nsectors) { - err("ERROR: Read past end of file\n"); + _err("ERROR: Read past end of file\n"); return -EIO; } @@ -256,7 +256,7 @@ static ssize_t loop_read(FAR struct inode *inode, FAR unsigned char *buffer, ret = lseek(dev->fd, offset, SEEK_SET); if (ret == (off_t)-1) { - err("ERROR: Seek failed for offset=%d: %d\n", (int)offset, get_errno()); + _err("ERROR: Seek failed for offset=%d: %d\n", (int)offset, get_errno()); return -EIO; } @@ -267,7 +267,7 @@ static ssize_t loop_read(FAR struct inode *inode, FAR unsigned char *buffer, nbytesread = read(dev->fd, buffer, nsectors * dev->sectsize); if (nbytesread < 0 && get_errno() != EINTR) { - err("ERROR: Read failed: %d\n", get_errno()); + _err("ERROR: Read failed: %d\n", get_errno()); return -get_errno(); } } @@ -304,7 +304,7 @@ static ssize_t loop_write(FAR struct inode *inode, ret = lseek(dev->fd, offset, SEEK_SET); if (ret == (off_t)-1) { - err("ERROR: Seek failed for offset=%d: %d\n", (int)offset, get_errno()); + _err("ERROR: Seek failed for offset=%d: %d\n", (int)offset, get_errno()); } /* Then write the requested number of sectors to that position */ @@ -314,7 +314,7 @@ static ssize_t loop_write(FAR struct inode *inode, nbyteswritten = write(dev->fd, buffer, nsectors * dev->sectsize); if (nbyteswritten < 0 && get_errno() != EINTR) { - err("ERROR: Write failed: %d\n", get_errno()); + _err("ERROR: Write failed: %d\n", get_errno()); return -get_errno(); } } @@ -391,7 +391,7 @@ int losetup(FAR const char *devname, FAR const char *filename, ret = stat(filename, &sb); if (ret < 0) { - err("ERROR: Failed to stat %s: %d\n", filename, get_errno()); + _err("ERROR: Failed to stat %s: %d\n", filename, get_errno()); return -get_errno(); } @@ -399,7 +399,7 @@ int losetup(FAR const char *devname, FAR const char *filename, if (sb.st_size - offset < sectsize) { - err("ERROR: File is too small for blocksize\n"); + _err("ERROR: File is too small for blocksize\n"); return -ERANGE; } @@ -445,7 +445,7 @@ int losetup(FAR const char *devname, FAR const char *filename, dev->fd = open(filename, O_RDWR); if (dev->fd < 0) { - err("ERROR: Failed to open %s: %d\n", filename, get_errno()); + _err("ERROR: Failed to open %s: %d\n", filename, get_errno()); ret = -get_errno(); goto errout_with_dev; } @@ -499,7 +499,7 @@ int loteardown(FAR const char *devname) ret = open_blockdriver(devname, MS_RDONLY, &inode); if (ret < 0) { - err("ERROR: Failed to open %s: %d\n", devname, -ret); + _err("ERROR: Failed to open %s: %d\n", devname, -ret); return ret; } diff --git a/drivers/modem/u-blox.c b/drivers/modem/u-blox.c index 5925d33bf4..f3cf094ebe 100644 --- a/drivers/modem/u-blox.c +++ b/drivers/modem/u-blox.c @@ -58,10 +58,10 @@ /* Non-standard debug that may be enabled just for testing the modem driver */ #ifdef CONFIG_MODEM_U_BLOX_DEBUG -# define m_err err -# define m_info info -# define m_vllerr llerr -# define m_vllinfo llinfo +# define m_err _err +# define m_info _info +# define m_vllerr _llerr +# define m_vllinfo _llinfo #else # define m_err(x...) # define m_info(x...) diff --git a/drivers/mtd/filemtd.c b/drivers/mtd/filemtd.c index 5eb2963eab..57c4f3d834 100644 --- a/drivers/mtd/filemtd.c +++ b/drivers/mtd/filemtd.c @@ -187,7 +187,7 @@ static ssize_t filemtd_write(FAR struct file_dev_s *priv, size_t offset, #ifdef CONFIG_DEBUG_FEATURES if (newvalue != srcvalue) { - err("ERROR: Bad write: source=%02x dest=%02x result=%02x\n", + _err("ERROR: Bad write: source=%02x dest=%02x result=%02x\n", srcvalue, oldvalue, newvalue); } #endif @@ -514,7 +514,7 @@ FAR struct mtd_dev_s *filemtd_initialize(FAR const char *path, size_t offset, ret = stat(path, &sb); if (ret < 0) { - err("ERROR: Failed to stat %s: %d\n", path, get_errno()); + _err("ERROR: Failed to stat %s: %d\n", path, get_errno()); return NULL; } diff --git a/drivers/mtd/rammtd.c b/drivers/mtd/rammtd.c index 46abf5fde2..66c350888c 100644 --- a/drivers/mtd/rammtd.c +++ b/drivers/mtd/rammtd.c @@ -172,7 +172,7 @@ static void *ram_write(FAR void *dest, FAR const void *src, size_t len) #ifdef CONFIG_DEBUG_FEATURES if (newvalue != srcvalue) { - err("ERROR: Bad write: source=%02x dest=%02x result=%02x\n", + _err("ERROR: Bad write: source=%02x dest=%02x result=%02x\n", srcvalue, oldvalue, newvalue); } #endif diff --git a/drivers/mtd/smart.c b/drivers/mtd/smart.c index 050b38a9fc..52676e7ea7 100644 --- a/drivers/mtd/smart.c +++ b/drivers/mtd/smart.c @@ -1387,7 +1387,7 @@ static int smart_add_sector_to_cache(FAR struct smart_struct_s *dev, if (dev->debuglevel > 1) { - err("Add Cache sector: Log=%d, Phys=%d at index %d from line %d\n", + _err("Add Cache sector: Log=%d, Phys=%d at index %d from line %d\n", logical, physical, index, line); } @@ -1575,7 +1575,7 @@ static void smart_update_cache(FAR struct smart_struct_s *dev, uint16_t if (dev->debuglevel > 1) { - err("Update Cache: Log=%d, Phys=%d at index %d\n", logical, physical, x); + _err("Update Cache: Log=%d, Phys=%d at index %d\n", logical, physical, x); } break; @@ -1712,7 +1712,7 @@ static int smart_set_wear_level(FAR struct smart_struct_s *dev, uint16_t block, if (level > 15) { - err("ERROR: Fatal Design Error! Wear level > 15, block=%d\n", block); + _err("ERROR: Fatal Design Error! Wear level > 15, block=%d\n", block); /* This is a design flaw, but we still allow processing, otherwise we * will corrupt the volume. It's better to have a few blocks that are diff --git a/drivers/mtd/sst26.c b/drivers/mtd/sst26.c index 4b70c0f285..016d72b5b4 100644 --- a/drivers/mtd/sst26.c +++ b/drivers/mtd/sst26.c @@ -208,10 +208,10 @@ /* Debug ****************************************************************************/ #ifdef CONFIG_SST26_DEBUG -# define ssterr(format, ...) err(format, ##__VA_ARGS__) -# define sstllerr(format, ...) llerr(format, ##__VA_ARGS__) -# define sstinfo(format, ...) info(format, ##__VA_ARGS__) -# define sstllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define ssterr(format, ...) _err(format, ##__VA_ARGS__) +# define sstllerr(format, ...) _llerr(format, ##__VA_ARGS__) +# define sstinfo(format, ...) _info(format, ##__VA_ARGS__) +# define sstllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define ssterr(x...) # define sstllerr(x...) @@ -340,7 +340,7 @@ static inline int sst26_readid(struct sst26_dev_s *priv) SPI_SELECT(priv->dev, SPIDEV_FLASH, false); sst26_unlock(priv->dev); - llinfo("manufacturer: %02x memory: %02x capacity: %02x\n", + _llinfo("manufacturer: %02x memory: %02x capacity: %02x\n", manufacturer, memory, capacity); /* Check for a valid manufacturer and memory type */ diff --git a/drivers/net/phy_notify.c b/drivers/net/phy_notify.c index d480a361a8..96b6109b67 100644 --- a/drivers/net/phy_notify.c +++ b/drivers/net/phy_notify.c @@ -82,10 +82,10 @@ */ #ifdef CONFIG_NETDEV_PHY_DEBUG -# define phyinfo info -# define phyllinfo llinfo -# define phyerr err -# define phyllerr llerr +# define phyinfo _info +# define phyllinfo _llinfo +# define phyerr _err +# define phyllerr _llerr #else # define phyinfo(x...) # define phyllinfo(x...) diff --git a/drivers/pipes/pipe_common.c b/drivers/pipes/pipe_common.c index 2b9eb67e3a..21fe124f16 100644 --- a/drivers/pipes/pipe_common.c +++ b/drivers/pipes/pipe_common.c @@ -519,9 +519,9 @@ ssize_t pipecommon_write(FAR struct file *filep, FAR const char *buffer, /* At present, this method cannot be called from interrupt handlers. That is * because it calls sem_wait (via pipecommon_semtake below) and sem_wait cannot * be called from interrupt level. This actually happens fairly commonly - * IF err() is called from interrupt handlers and stdout is being redirected + * IF [a-z]err() is called from interrupt handlers and stdout is being redirected * via a pipe. In that case, the debug output will try to go out the pipe - * (interrupt handlers should use the llerr() APIs). + * (interrupt handlers should use the _llerr() APIs). * * On the other hand, it would be very valuable to be able to feed the pipe * from an interrupt handler! TODO: Consider disabling interrupts instead diff --git a/drivers/power/battery_charger.c b/drivers/power/battery_charger.c index 514329f03e..0a573375dc 100644 --- a/drivers/power/battery_charger.c +++ b/drivers/power/battery_charger.c @@ -228,7 +228,7 @@ static int bat_charger_ioctl(FAR struct file *filep, int cmd, break; default: - err("ERROR: Unrecognized cmd: %d\n", cmd); + _err("ERROR: Unrecognized cmd: %d\n", cmd); ret = -ENOTTY; break; } @@ -268,7 +268,7 @@ int battery_charger_register(FAR const char *devpath, ret = register_driver(devpath, &g_batteryops, 0555, dev); if (ret < 0) { - err("ERROR: Failed to register driver: %d\n", ret); + _err("ERROR: Failed to register driver: %d\n", ret); } return ret; diff --git a/drivers/power/battery_gauge.c b/drivers/power/battery_gauge.c index 247d319180..f0b2f9f66c 100644 --- a/drivers/power/battery_gauge.c +++ b/drivers/power/battery_gauge.c @@ -213,7 +213,7 @@ static int bat_gauge_ioctl(FAR struct file *filep, int cmd, unsigned long arg) break; default: - err("ERROR: Unrecognized cmd: %d\n", cmd); + _err("ERROR: Unrecognized cmd: %d\n", cmd); ret = -ENOTTY; break; } @@ -253,7 +253,7 @@ int battery_gauge_register(FAR const char *devpath, ret = register_driver(devpath, &g_batteryops, 0555, dev); if (ret < 0) { - err("ERROR: Failed to register driver: %d\n", ret); + _err("ERROR: Failed to register driver: %d\n", ret); } return ret; diff --git a/drivers/power/bq2425x.c b/drivers/power/bq2425x.c index 04a864b775..661187cdee 100644 --- a/drivers/power/bq2425x.c +++ b/drivers/power/bq2425x.c @@ -78,8 +78,8 @@ /* Debug ********************************************************************/ #ifdef CONFIG_DEBUG_BQ2425X -# define baterr err -# define batreg err +# define baterr _err +# define batreg _err #else # ifdef CONFIG_CPP_HAVE_VARARGS # define baterr(x...) diff --git a/drivers/power/max1704x.c b/drivers/power/max1704x.c index ac1d7ef80f..00f98fc189 100644 --- a/drivers/power/max1704x.c +++ b/drivers/power/max1704x.c @@ -160,7 +160,7 @@ /* Debug ********************************************************************/ #ifdef CONFIG_DEBUG_MAX1704X -# define baterr err +# define baterr _err #else # ifdef CONFIG_CPP_HAVE_VARARGS # define baterr(x...) diff --git a/drivers/sensors/adxl345_i2c.c b/drivers/sensors/adxl345_i2c.c index a522c36fdf..96731bbe8a 100644 --- a/drivers/sensors/adxl345_i2c.c +++ b/drivers/sensors/adxl345_i2c.c @@ -102,7 +102,7 @@ uint8_t adxl345_getreg8(FAR struct adxl345_dev_s *priv, uint8_t regaddr) } #ifdef CONFIG_ADXL345_REGDEBUG - err("%02x->%02x\n", regaddr, regval); + _err("%02x->%02x\n", regaddr, regval); #endif return regval; } @@ -130,7 +130,7 @@ void adxl345_putreg8(FAR struct adxl345_dev_s *priv, int ret; #ifdef CONFIG_ADXL345_REGDEBUG - err("%02x<-%02x\n", regaddr, regval); + _err("%02x<-%02x\n", regaddr, regval); #endif /* Setup to the data to be transferred. Two bytes: The ADXL345 register @@ -209,7 +209,7 @@ uint16_t adxl345_getreg16(FAR struct adxl345_dev_s *priv, uint8_t regaddr) } #ifdef CONFIG_ADXL345_REGDEBUG - err("%02x->%02x%02x\n", regaddr, rxbuffer[0], rxbuffer[1]); + _err("%02x->%02x%02x\n", regaddr, rxbuffer[0], rxbuffer[1]); #endif return (uint16_t)rxbuffer[0] << 8 | (uint16_t)rxbuffer[1]; } diff --git a/drivers/sensors/adxl345_spi.c b/drivers/sensors/adxl345_spi.c index 38dd9179c2..a2d524bf50 100644 --- a/drivers/sensors/adxl345_spi.c +++ b/drivers/sensors/adxl345_spi.c @@ -113,7 +113,7 @@ uint8_t adxl345_getreg8(FAR struct adxl345_dev_s *priv, uint8_t regaddr) (void)SPI_LOCK(priv->spi, false); #ifdef CONFIG_ADXL345_REGDEBUG - err("%02x->%02x\n", regaddr, regval); + _err("%02x->%02x\n", regaddr, regval); #endif return regval; } @@ -130,7 +130,7 @@ void adxl345_putreg8(FAR struct adxl345_dev_s *priv, uint8_t regaddr, uint8_t regval) { #ifdef CONFIG_ADXL345_REGDEBUG - err("%02x<-%02x\n", regaddr, regval); + _err("%02x<-%02x\n", regaddr, regval); #endif /* If SPI bus is shared then lock and configure it */ @@ -191,7 +191,7 @@ uint16_t adxl345_getreg16(FAR struct adxl345_dev_s *priv, uint8_t regaddr) (void)SPI_LOCK(priv->spi, false); #ifdef CONFIG_ADXL345_REGDEBUG - err("%02x->%04x\n", regaddr, regval); + _err("%02x->%04x\n", regaddr, regval); #endif return regval; diff --git a/drivers/sensors/mpl115a.c b/drivers/sensors/mpl115a.c index 5631bd7073..38763f5c71 100644 --- a/drivers/sensors/mpl115a.c +++ b/drivers/sensors/mpl115a.c @@ -157,7 +157,7 @@ static uint8_t mpl115a_getreg8(FAR struct mpl115a_dev_s *priv, uint8_t regaddr) (void)SPI_LOCK(priv->spi, false); #ifdef CONFIG_MPL115A_REGDEBUG - err("%02x->%02x\n", regaddr, regval); + _err("%02x->%02x\n", regaddr, regval); #endif return regval; } diff --git a/drivers/sensors/ms58xx.c b/drivers/sensors/ms58xx.c index 4c948714b0..47f04e57ca 100644 --- a/drivers/sensors/ms58xx.c +++ b/drivers/sensors/ms58xx.c @@ -1178,14 +1178,14 @@ int ms58xx_register(FAR const char *devpath, FAR struct i2c_master_s *i2c, if (ret < 0) { snerr("ERROR: ms58xx_setosr failed: %d\n", ret); - goto err; + goto errout; } ret = ms58xx_reset(priv); if (ret < 0) { snerr("ERROR: ms58xx_reset failed: %d\n", ret); - goto err; + goto errout; } /* Register the character driver */ @@ -1194,12 +1194,12 @@ int ms58xx_register(FAR const char *devpath, FAR struct i2c_master_s *i2c, if (ret < 0) { snerr("ERROR: Failed to register driver: %d\n", ret); - goto err; + goto errout; } return ret; -err: +errout: kmm_free(priv); return ret; } diff --git a/drivers/sercomm/console.c b/drivers/sercomm/console.c index 579a3f605a..c12c35af5f 100644 --- a/drivers/sercomm/console.c +++ b/drivers/sercomm/console.c @@ -187,7 +187,7 @@ int sercomm_register(FAR const char *path, FAR uart_dev_t *dev) sem_init(&dev->pollsem, 0, 1); #endif - info("Registering %s\n", path); + _info("Registering %s\n", path); return register_driver(path, &g_sercom_console_ops, 0666, NULL); } diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c index ca695afb76..c98867d6ff 100644 --- a/drivers/serial/serial.c +++ b/drivers/serial/serial.c @@ -1369,7 +1369,7 @@ int uart_register(FAR const char *path, FAR uart_dev_t *dev) sem_init(&dev->pollsem, 0, 1); #endif - info("Registering %s\n", path); + _info("Registering %s\n", path); return register_driver(path, &g_serialops, 0666, dev); } diff --git a/drivers/serial/uart_16550.c b/drivers/serial/uart_16550.c index 59ebdbfa9a..022adf3abe 100644 --- a/drivers/serial/uart_16550.c +++ b/drivers/serial/uart_16550.c @@ -829,7 +829,7 @@ static int u16550_interrupt(int irq, void *context) /* Read the modem status register (MSR) to clear */ status = u16550_serialin(priv, UART_MSR_OFFSET); - info("MSR: %02x\n", status); + _info("MSR: %02x\n", status); break; } @@ -840,7 +840,7 @@ static int u16550_interrupt(int irq, void *context) /* Read the line status register (LSR) to clear */ status = u16550_serialin(priv, UART_LSR_OFFSET); - info("LSR: %02x\n", status); + _info("LSR: %02x\n", status); break; } @@ -848,7 +848,7 @@ static int u16550_interrupt(int irq, void *context) default: { - err("ERROR: Unexpected IIR: %02x\n", status); + _err("ERROR: Unexpected IIR: %02x\n", status); break; } } diff --git a/drivers/timers/cs2100-cp.c b/drivers/timers/cs2100-cp.c index dfd1c58ba8..82c80bf403 100644 --- a/drivers/timers/cs2100-cp.c +++ b/drivers/timers/cs2100-cp.c @@ -69,24 +69,24 @@ #undef cserr #ifdef CONFIG_CS2100CP_DEBUG # ifdef CONFIG_CPP_HAVE_VARARGS -# define cserr(format, ...) err(format, ##__VA_ARGS__) +# define cserr(format, ...) _err(format, ##__VA_ARGS__) # else -# define cserr err +# define cserr _err # endif #else # ifdef CONFIG_CPP_HAVE_VARARGS # define cserr(x...) # else -# define cserr (void) +# define cserr (void) # endif #endif #undef reginfo #ifdef CONFIG_CS2100CP_REGDEBUG # ifdef CONFIG_CPP_HAVE_VARARGS -# define reginfo(format, ...) err(format, ##__VA_ARGS__) +# define reginfo(format, ...) _err(format, ##__VA_ARGS__) # else -# define reginfo err +# define reginfo _err # endif #else # ifdef CONFIG_CPP_HAVE_VARARGS @@ -96,14 +96,6 @@ # endif #endif -/**************************************************************************** - * Public Types - ****************************************************************************/ - -/**************************************************************************** - * Public Data - ****************************************************************************/ - /**************************************************************************** * Private Functions ****************************************************************************/ diff --git a/drivers/video/ov2640.c b/drivers/video/ov2640.c index 28b3c4ebc7..06f88d1bf4 100644 --- a/drivers/video/ov2640.c +++ b/drivers/video/ov2640.c @@ -696,7 +696,7 @@ static int ov2640_putreg(FAR struct i2c_master_s *i2c, uint8_t regaddr, int ret; #ifdef CONFIG_OV2640_REGDEBUG - err("%02x <- %02x\n", regaddr, regval); + _err("%02x <- %02x\n", regaddr, regval); #endif /* Set up for the transfer */ @@ -771,7 +771,7 @@ static uint8_t ov2640_getreg(FAR struct i2c_master_s *i2c, uint8_t regaddr) #ifdef CONFIG_OV2640_REGDEBUG else { - err("%02x -> %02x\n", regaddr, regval); + _err("%02x -> %02x\n", regaddr, regval); } #endif diff --git a/drivers/wireless/cc3000/cc3000.c b/drivers/wireless/cc3000/cc3000.c index 1e14d98fdf..4d08431d9e 100644 --- a/drivers/wireless/cc3000/cc3000.c +++ b/drivers/wireless/cc3000/cc3000.c @@ -124,8 +124,8 @@ CCASSERT(sizeof(cc3000_buffer_desc) <= CONFIG_MQ_MAXMSGSIZE); # define PROBE(pin,state) #endif -#define waitllerr(x,...) // llerr -#define waitllinfo(x,...) // llinfo +#define waitllerr(x,...) // _llerr +#define waitllinfo(x,...) // _llinfo /**************************************************************************** * Private Function Prototypes diff --git a/drivers/wireless/cc3000/socket.c b/drivers/wireless/cc3000/socket.c index 255ce62b2f..d8eea4ebd3 100644 --- a/drivers/wireless/cc3000/socket.c +++ b/drivers/wireless/cc3000/socket.c @@ -62,8 +62,8 @@ # define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #endif -#define waitllerr(x,...) // llerr -#define waitllinfo(x,...) // llinfo +#define waitllerr(x,...) // _llerr +#define waitllinfo(x,...) // _llinfo /**************************************************************************** * Private Types diff --git a/drivers/wireless/ieee802154/mrf24j40.c b/drivers/wireless/ieee802154/mrf24j40.c index c49713cd3e..efbbb8c7b2 100644 --- a/drivers/wireless/ieee802154/mrf24j40.c +++ b/drivers/wireless/ieee802154/mrf24j40.c @@ -779,7 +779,7 @@ static int mrf24j40_settxpower(FAR struct ieee802154_dev_s *ieee, return -EINVAL; } - llinfo("remaining attenuation: %d mBm\n",txpwr); + _llinfo("remaining attenuation: %d mBm\n",txpwr); switch(txpwr/100) { diff --git a/drivers/wireless/pn532.c b/drivers/wireless/pn532.c index afb575e7b1..e9bf42737c 100644 --- a/drivers/wireless/pn532.c +++ b/drivers/wireless/pn532.c @@ -57,8 +57,8 @@ ****************************************************************************/ #ifdef CONFIG_WL_PN532_DEBUG -# define pn532err err -# define pn532info info +# define pn532err _err +# define pn532info _info #else # ifdef CONFIG_CPP_HAVE_VARARGS # define pn532err(x...) diff --git a/graphics/vnc/server/vnc_server.h b/graphics/vnc/server/vnc_server.h index 9b9406038b..fc1e398fc4 100644 --- a/graphics/vnc/server/vnc_server.h +++ b/graphics/vnc/server/vnc_server.h @@ -186,19 +186,19 @@ #ifdef CONFIG_VNCSERVER_UPDATE_DEBUG # ifdef CONFIG_CPP_HAVE_VARARGS -# define upderr(format, ...) err(format, ##__VA_ARGS__) -# define updllerr(format, ...) llerr(format, ##__VA_ARGS__) -# define updinfo(format, ...) info(format, ##__VA_ARGS__) -# define updllinfo(format, ...) llinfo(format, ##__VA_ARGS__) -# define updinfo(format, ...) info(format, ##__VA_ARGS__) -# define updllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define upderr(format, ...) _err(format, ##__VA_ARGS__) +# define updllerr(format, ...) _llerr(format, ##__VA_ARGS__) +# define updinfo(format, ...) _info(format, ##__VA_ARGS__) +# define updllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) +# define updinfo(format, ...) _info(format, ##__VA_ARGS__) +# define updllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) # else -# define upderr err -# define updllerr llerr -# define updwarn warn -# define updllwarn llwarn -# define updinfo info -# define updllinfo llinfo +# define upderr _err +# define updllerr _llerr +# define updwarn _warn +# define updllwarn _llwarn +# define updinfo _info +# define updllinfo _llinfo # endif #else # ifdef CONFIG_CPP_HAVE_VARARGS diff --git a/include/debug.h b/include/debug.h index 5479cd45e1..7251839ea6 100644 --- a/include/debug.h +++ b/include/debug.h @@ -64,7 +64,7 @@ * * The first character of the macro name indicates the system system * (e.g., n=network, f=filesystm, etc.). If the first character is - * missing (i.e., info()), then it is common. The common info() macro + * missing (i.e., _info()), then it is common. The common _info() macro * is enabled simply with CONFIG_DEBUG_INFO. Subsystem debug requires an * additional configuration setting to enable it (e.g., CONFIG_DEBUG_NET * for the network, CONFIG_DEBUG_FS for the file system, etc). @@ -118,15 +118,6 @@ # define EXTRA_ARG #endif -/* The actual logger function may be overridden in arch/debug.h if needed. */ - -#ifndef __arch_syslog -# define __arch_syslog syslog -#endif -#ifndef __arch_lowsyslog -# define __arch_lowsyslog lowsyslog -#endif - /* Debug macros will differ depending upon if the toolchain supports * macros with a variable number of arguments or not. */ @@ -135,6 +126,17 @@ /* C-99 style variadic macros are supported */ +/* The actual logger function may be overridden in arch/debug.h if needed. + * (Currently only if the pre-processor supports variadic macros) + */ + +#ifndef __arch_syslog +# define __arch_syslog syslog +#endif +#ifndef __arch_lowsyslog +# define __arch_lowsyslog lowsyslog +#endif + #ifdef CONFIG_ARCH_LOWPUTC # define alert(format, ...) \ __arch_lowsyslog(LOG_EMERG, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__) @@ -143,743 +145,743 @@ # endif #ifdef CONFIG_DEBUG_ERROR -# define err(format, ...) \ +# define _err(format, ...) \ __arch_syslog(LOG_ERR, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__) # ifdef CONFIG_ARCH_LOWPUTC -# define llerr(format, ...) \ +# define _llerr(format, ...) \ __arch_lowsyslog(LOG_ERR, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__) # else -# define llerr(x...) +# define _llerr(x...) # endif #else /* CONFIG_DEBUG_ERROR */ -# define err(x...) -# define llerr(x...) +# define _err(x...) +# define _llerr(x...) #endif #ifdef CONFIG_DEBUG_WARN -# define warn(format, ...) \ +# define _warn(format, ...) \ __arch_syslog(LOG_WARNING, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__) # ifdef CONFIG_ARCH_LOWPUTC -# define llwarn(format, ...) \ +# define _llwarn(format, ...) \ __arch_lowsyslog(LOG_WARNING, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__) # else -# define llwarn(x...) +# define _llwarn(x...) # endif #else /* CONFIG_DEBUG_INFO */ -# define warn(x...) -# define llwarn(x...) +# define _warn(x...) +# define _llwarn(x...) #endif /* CONFIG_DEBUG_INFO */ #ifdef CONFIG_DEBUG_INFO -# define info(format, ...) \ +# define _info(format, ...) \ __arch_syslog(LOG_INFO, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__) # ifdef CONFIG_ARCH_LOWPUTC -# define llinfo(format, ...) \ +# define _llinfo(format, ...) \ __arch_lowsyslog(LOG_INFO, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__) # else -# define llinfo(x...) +# define _llinfo(x...) # endif #else /* CONFIG_DEBUG_INFO */ -# define info(x...) -# define llinfo(x...) +# define _info(x...) +# define _llinfo(x...) #endif /* CONFIG_DEBUG_INFO */ /* Subsystem specific debug */ #ifdef CONFIG_DEBUG_MM_ERROR -# define merr(format, ...) err(format, ##__VA_ARGS__) -# define mllerr(format, ...) llerr(format, ##__VA_ARGS__) +# define merr(format, ...) _err(format, ##__VA_ARGS__) +# define mllerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define merr(x...) # define mllerr(x...) #endif #ifdef CONFIG_DEBUG_MM_WARN -# define mwarn(format, ...) warn(format, ##__VA_ARGS__) -# define mllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define mwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define mllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define mwarn(x...) # define mllwarn(x...) #endif #ifdef CONFIG_DEBUG_MM_INFO -# define minfo(format, ...) info(format, ##__VA_ARGS__) -# define mllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define minfo(format, ...) _info(format, ##__VA_ARGS__) +# define mllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define minfo(x...) # define mllinfo(x...) #endif #ifdef CONFIG_DEBUG_SCHED_ERROR -# define serr(format, ...) err(format, ##__VA_ARGS__) -# define sllerr(format, ...) llerr(format, ##__VA_ARGS__) +# define serr(format, ...) _err(format, ##__VA_ARGS__) +# define sllerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define serr(x...) # define sllerr(x...) #endif #ifdef CONFIG_DEBUG_SCHED_WARN -# define swarn(format, ...) warn(format, ##__VA_ARGS__) -# define sllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define swarn(format, ...) _warn(format, ##__VA_ARGS__) +# define sllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define swarn(x...) # define sllwarn(x...) #endif #ifdef CONFIG_DEBUG_SCHED_INFO -# define sinfo(format, ...) info(format, ##__VA_ARGS__) -# define sllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define sinfo(format, ...) _info(format, ##__VA_ARGS__) +# define sllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define sinfo(x...) # define sllinfo(x...) #endif #ifdef CONFIG_DEBUG_SYSCALL_ERROR -# define svcerr(format, ...) err(format, ##__VA_ARGS__) -# define svcllerr(format, ...) llerr(format, ##__VA_ARGS__) +# define svcerr(format, ...) _err(format, ##__VA_ARGS__) +# define svcllerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define svcerr(x...) # define svcllerr(x...) #endif #ifdef CONFIG_DEBUG_SYSCALL_WARN -# define svcwarn(format, ...) warn(format, ##__VA_ARGS__) -# define svcllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define svcwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define svcllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define svcwarn(x...) # define svcllwarn(x...) #endif #ifdef CONFIG_DEBUG_SYSCALL_INFO -# define svcinfo(format, ...) info(format, ##__VA_ARGS__) -# define svcllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define svcinfo(format, ...) _info(format, ##__VA_ARGS__) +# define svcllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define svcinfo(x...) # define svcllinfo(x...) #endif #ifdef CONFIG_DEBUG_PAGING_ERROR -# define pgerr(format, ...) err(format, ##__VA_ARGS__) -# define pgllerr(format, ...) llerr(format, ##__VA_ARGS__) +# define pgerr(format, ...) _err(format, ##__VA_ARGS__) +# define pgllerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define pgerr(x...) # define pgllerr(x...) #endif #ifdef CONFIG_DEBUG_PAGING_WARN -# define pgwarn(format, ...) warn(format, ##__VA_ARGS__) -# define pgllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define pgwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define pgllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define pgwarn(x...) # define pgllwarn(x...) #endif #ifdef CONFIG_DEBUG_PAGING_INFO -# define pginfo(format, ...) info(format, ##__VA_ARGS__) -# define pgllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define pginfo(format, ...) _info(format, ##__VA_ARGS__) +# define pgllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define pgerr(x...) # define pgllerr(x...) #endif #ifdef CONFIG_DEBUG_NET_ERROR -# define nerr(format, ...) err(format, ##__VA_ARGS__) -# define nllerr(format, ...) llerr(format, ##__VA_ARGS__) +# define nerr(format, ...) _err(format, ##__VA_ARGS__) +# define nllerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define nerr(x...) # define nllerr(x...) #endif #ifdef CONFIG_DEBUG_NET_WARN -# define nwarn(format, ...) warn(format, ##__VA_ARGS__) -# define nllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define nwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define nllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define nwarn(x...) # define nllwarn(x...) #endif #ifdef CONFIG_DEBUG_NET_INFO -# define ninfo(format, ...) info(format, ##__VA_ARGS__) -# define nllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define ninfo(format, ...) _info(format, ##__VA_ARGS__) +# define nllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define ninfo(x...) # define nllinfo(x...) #endif #ifdef CONFIG_DEBUG_FS_ERROR -# define ferr(format, ...) err(format, ##__VA_ARGS__) -# define fllerr(format, ...) llerr(format, ##__VA_ARGS__) +# define ferr(format, ...) _err(format, ##__VA_ARGS__) +# define fllerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define ferr(x...) # define fllerr(x...) #endif #ifdef CONFIG_DEBUG_FS_WARN -# define fwarn(format, ...) warn(format, ##__VA_ARGS__) -# define fllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define fwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define fllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define fwarn(x...) # define fllwarn(x...) #endif #ifdef CONFIG_DEBUG_FS_INFO -# define finfo(format, ...) info(format, ##__VA_ARGS__) -# define fllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define finfo(format, ...) _info(format, ##__VA_ARGS__) +# define fllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define finfo(x...) # define fllinfo(x...) #endif #ifdef CONFIG_DEBUG_CRYPTO_ERROR -# define crypterr(format, ...) err(format, ##__VA_ARGS__) -# define cryptllerr(format, ...) llerr(format, ##__VA_ARGS__) +# define crypterr(format, ...) _err(format, ##__VA_ARGS__) +# define cryptllerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define crypterr(x...) # define cryptllerr(x...) #endif #ifdef CONFIG_DEBUG_CRYPTO_WARN -# define cryptwarn(format, ...) warn(format, ##__VA_ARGS__) -# define cryptllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define cryptwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define cryptllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define cryptwarn(x...) # define cryptllwarn(x...) #endif #ifdef CONFIG_DEBUG_CRYPTO_INFO -# define cryptinfo(format, ...) info(format, ##__VA_ARGS__) -# define cryptllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define cryptinfo(format, ...) _info(format, ##__VA_ARGS__) +# define cryptllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define cryptinfo(x...) # define cryptllinfo(x...) #endif #ifdef CONFIG_DEBUG_INPUT_ERROR -# define ierr(format, ...) err(format, ##__VA_ARGS__) -# define illerr(format, ...) llerr(format, ##__VA_ARGS__) +# define ierr(format, ...) _err(format, ##__VA_ARGS__) +# define illerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define ierr(x...) # define illerr(x...) #endif #ifdef CONFIG_DEBUG_INPUT_WARN -# define iwarn(format, ...) warn(format, ##__VA_ARGS__) -# define illwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define iwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define illwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define iwarn(x...) # define illwarn(x...) #endif #ifdef CONFIG_DEBUG_INPUT_INFO -# define iinfo(format, ...) info(format, ##__VA_ARGS__) -# define illinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define iinfo(format, ...) _info(format, ##__VA_ARGS__) +# define illinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define iinfo(x...) # define illinfo(x...) #endif #ifdef CONFIG_DEBUG_ANALOG_ERROR -# define aerr(format, ...) err(format, ##__VA_ARGS__) -# define allerr(format, ...) llerr(format, ##__VA_ARGS__) +# define aerr(format, ...) _err(format, ##__VA_ARGS__) +# define allerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define aerr(x...) # define allerr(x...) #endif #ifdef CONFIG_DEBUG_ANALOG_WARN -# define awarn(format, ...) warn(format, ##__VA_ARGS__) -# define allwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define awarn(format, ...) _warn(format, ##__VA_ARGS__) +# define allwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define awarn(x...) # define allwarn(x...) #endif #ifdef CONFIG_DEBUG_ANALOG_INFO -# define ainfo(format, ...) info(format, ##__VA_ARGS__) -# define allinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define ainfo(format, ...) _info(format, ##__VA_ARGS__) +# define allinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define ainfo(x...) # define allinfo(x...) #endif #ifdef CONFIG_DEBUG_CAN_ERROR -# define canerr(format, ...) err(format, ##__VA_ARGS__) -# define canllerr(format, ...) llerr(format, ##__VA_ARGS__) +# define canerr(format, ...) _err(format, ##__VA_ARGS__) +# define canllerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define canerr(x...) # define canllerr(x...) #endif #ifdef CONFIG_DEBUG_CAN_WARN -# define canwarn(format, ...) warn(format, ##__VA_ARGS__) -# define canllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define canwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define canllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define canwarn(x...) # define canllwarn(x...) #endif #ifdef CONFIG_DEBUG_CAN_INFO -# define caninfo(format, ...) info(format, ##__VA_ARGS__) -# define canllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define caninfo(format, ...) _info(format, ##__VA_ARGS__) +# define canllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define caninfo(x...) # define canllinfo(x...) #endif #ifdef CONFIG_DEBUG_GRAPHICS_ERROR -# define gerr(format, ...) err(format, ##__VA_ARGS__) -# define gllerr(format, ...) llerr(format, ##__VA_ARGS__) +# define gerr(format, ...) _err(format, ##__VA_ARGS__) +# define gllerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define gerr(x...) # define gllerr(x...) #endif #ifdef CONFIG_DEBUG_GRAPHICS_WARN -# define gwarn(format, ...) warn(format, ##__VA_ARGS__) -# define gllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define gwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define gllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define gwarn(x...) # define gllwarn(x...) #endif #ifdef CONFIG_DEBUG_GRAPHICS_INFO -# define ginfo(format, ...) info(format, ##__VA_ARGS__) -# define gllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define ginfo(format, ...) _info(format, ##__VA_ARGS__) +# define gllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define ginfo(x...) # define gllinfo(x...) #endif #ifdef CONFIG_DEBUG_BINFMT_ERROR -# define berr(format, ...) err(format, ##__VA_ARGS__) -# define bllerr(format, ...) llerr(format, ##__VA_ARGS__) +# define berr(format, ...) _err(format, ##__VA_ARGS__) +# define bllerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define berr(x...) # define bllerr(x...) #endif #ifdef CONFIG_DEBUG_BINFMT_WARN -# define bwarn(format, ...) warn(format, ##__VA_ARGS__) -# define bllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define bwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define bllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define bwarn(x...) # define bllwarn(x...) #endif #ifdef CONFIG_DEBUG_BINFMT_INFO -# define binfo(format, ...) info(format, ##__VA_ARGS__) -# define bllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define binfo(format, ...) _info(format, ##__VA_ARGS__) +# define bllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define binfo(x...) # define bllinfo(x...) #endif #ifdef CONFIG_DEBUG_LIB_ERROR -# define lerr(format, ...) err(format, ##__VA_ARGS__) -# define lllerr(format, ...) llerr(format, ##__VA_ARGS__) +# define lerr(format, ...) _err(format, ##__VA_ARGS__) +# define lllerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define lerr(x...) # define lllerr(x...) #endif #ifdef CONFIG_DEBUG_LIB_WARN -# define lwarn(format, ...) warn(format, ##__VA_ARGS__) -# define lllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define lwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define lllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define lwarn(x...) # define lllwarn(x...) #endif #ifdef CONFIG_DEBUG_LIB_INFO -# define linfo(format, ...) info(format, ##__VA_ARGS__) -# define lllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define linfo(format, ...) _info(format, ##__VA_ARGS__) +# define lllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define linfo(x...) # define lllinfo(x...) #endif #ifdef CONFIG_DEBUG_AUDIO_ERROR -# define auderr(format, ...) err(format, ##__VA_ARGS__) -# define audllerr(format, ...) llerr(format, ##__VA_ARGS__) +# define auderr(format, ...) _err(format, ##__VA_ARGS__) +# define audllerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define auderr(x...) # define audllerr(x...) #endif #ifdef CONFIG_DEBUG_AUDIO_WARN -# define audwarn(format, ...) warn(format, ##__VA_ARGS__) -# define audllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define audwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define audllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define audwarn(x...) # define audllwarn(x...) #endif #ifdef CONFIG_DEBUG_AUDIO_INFO -# define audinfo(format, ...) info(format, ##__VA_ARGS__) -# define audllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define audinfo(format, ...) _info(format, ##__VA_ARGS__) +# define audllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define audinfo(x...) # define audllinfo(x...) #endif #ifdef CONFIG_DEBUG_DMA_ERROR -# define dmaerr(format, ...) err(format, ##__VA_ARGS__) -# define dmallerr(format, ...) llerr(format, ##__VA_ARGS__) +# define dmaerr(format, ...) _err(format, ##__VA_ARGS__) +# define dmallerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define dmaerr(x...) # define dmallerr(x...) #endif #ifdef CONFIG_DEBUG_DMA_WARN -# define dmawarn(format, ...) warn(format, ##__VA_ARGS__) -# define dmallwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define dmawarn(format, ...) _warn(format, ##__VA_ARGS__) +# define dmallwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define dmawarn(x...) # define dmallwarn(x...) #endif #ifdef CONFIG_DEBUG_DMA_INFO -# define dmainfo(format, ...) info(format, ##__VA_ARGS__) -# define dmallinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define dmainfo(format, ...) _info(format, ##__VA_ARGS__) +# define dmallinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define dmainfo(x...) # define dmallinfo(x...) #endif #ifdef CONFIG_DEBUG_IRQ_ERROR -# define irqerr(format, ...) err(format, ##__VA_ARGS__) -# define irqllerr(format, ...) llerr(format, ##__VA_ARGS__) +# define irqerr(format, ...) _err(format, ##__VA_ARGS__) +# define irqllerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define irqerr(x...) # define irqllerr(x...) #endif #ifdef CONFIG_DEBUG_IRQ_WARN -# define irqwarn(format, ...) warn(format, ##__VA_ARGS__) -# define irqllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define irqwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define irqllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define irqwarn(x...) # define irqllwarn(x...) #endif #ifdef CONFIG_DEBUG_IRQ_INFO -# define irqinfo(format, ...) info(format, ##__VA_ARGS__) -# define irqllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define irqinfo(format, ...) _info(format, ##__VA_ARGS__) +# define irqllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define irqinfo(x...) # define irqllinfo(x...) #endif #ifdef CONFIG_DEBUG_LCD_ERROR -# define lcderr(format, ...) err(format, ##__VA_ARGS__) -# define lcdllerr(format, ...) llerr(format, ##__VA_ARGS__) +# define lcderr(format, ...) _err(format, ##__VA_ARGS__) +# define lcdllerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define lcderr(x...) # define lcdllerr(x...) #endif #ifdef CONFIG_DEBUG_LCD_WARN -# define lcdwarn(format, ...) warn(format, ##__VA_ARGS__) -# define lcdllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define lcdwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define lcdllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define lcdwarn(x...) # define lcdllwarn(x...) #endif #ifdef CONFIG_DEBUG_LCD_INFO -# define lcdinfo(format, ...) info(format, ##__VA_ARGS__) -# define lcdllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define lcdinfo(format, ...) _info(format, ##__VA_ARGS__) +# define lcdllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define lcdinfo(x...) # define lcdllinfo(x...) #endif #ifdef CONFIG_DEBUG_LEDS_ERROR -# define lederr(format, ...) err(format, ##__VA_ARGS__) -# define ledllerr(format, ...) llerr(format, ##__VA_ARGS__) +# define lederr(format, ...) _err(format, ##__VA_ARGS__) +# define ledllerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define lederr(x...) # define ledllerr(x...) #endif #ifdef CONFIG_DEBUG_LEDS_WARN -# define ledwarn(format, ...) warn(format, ##__VA_ARGS__) -# define ledllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define ledwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define ledllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define ledwarn(x...) # define ledllwarn(x...) #endif #ifdef CONFIG_DEBUG_LEDS_INFO -# define ledinfo(format, ...) info(format, ##__VA_ARGS__) -# define ledllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define ledinfo(format, ...) _info(format, ##__VA_ARGS__) +# define ledllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define ledinfo(x...) # define ledllinfo(x...) #endif #ifdef CONFIG_DEBUG_GPIO_ERROR -# define gpioerr(format, ...) err(format, ##__VA_ARGS__) -# define gpiollerr(format, ...) llerr(format, ##__VA_ARGS__) +# define gpioerr(format, ...) _err(format, ##__VA_ARGS__) +# define gpiollerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define gpioerr(x...) # define gpiollerr(x...) #endif #ifdef CONFIG_DEBUG_GPIO_WARN -# define gpiowarn(format, ...) warn(format, ##__VA_ARGS__) -# define gpiollwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define gpiowarn(format, ...) _warn(format, ##__VA_ARGS__) +# define gpiollwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define gpiowarn(x...) # define gpiollwarn(x...) #endif #ifdef CONFIG_DEBUG_GPIO_INFO -# define gpioinfo(format, ...) info(format, ##__VA_ARGS__) -# define gpiollinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define gpioinfo(format, ...) _info(format, ##__VA_ARGS__) +# define gpiollinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define gpioinfo(x...) # define gpiollinfo(x...) #endif #ifdef CONFIG_DEBUG_I2C_ERROR -# define i2cerr(format, ...) err(format, ##__VA_ARGS__) -# define i2cllerr(format, ...) llerr(format, ##__VA_ARGS__) +# define i2cerr(format, ...) _err(format, ##__VA_ARGS__) +# define i2cllerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define i2cerr(x...) # define i2cllerr(x...) #endif #ifdef CONFIG_DEBUG_I2C_WARN -# define i2cwarn(format, ...) warn(format, ##__VA_ARGS__) -# define i2cllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define i2cwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define i2cllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define i2cwarn(x...) # define i2cllwarn(x...) #endif #ifdef CONFIG_DEBUG_I2C_INFO -# define i2cinfo(format, ...) info(format, ##__VA_ARGS__) -# define i2cllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define i2cinfo(format, ...) _info(format, ##__VA_ARGS__) +# define i2cllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define i2cinfo(x...) # define i2cllinfo(x...) #endif #ifdef CONFIG_DEBUG_I2S_ERROR -# define i2serr(format, ...) err(format, ##__VA_ARGS__) -# define i2sllerr(format, ...) llerr(format, ##__VA_ARGS__) +# define i2serr(format, ...) _err(format, ##__VA_ARGS__) +# define i2sllerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define i2serr(x...) # define i2sllerr(x...) #endif #ifdef CONFIG_DEBUG_I2S_WARN -# define i2swarn(format, ...) warn(format, ##__VA_ARGS__) -# define i2sllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define i2swarn(format, ...) _warn(format, ##__VA_ARGS__) +# define i2sllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define i2swarn(x...) # define i2sllwarn(x...) #endif #ifdef CONFIG_DEBUG_I2S_INFO -# define i2sinfo(format, ...) info(format, ##__VA_ARGS__) -# define i2sllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define i2sinfo(format, ...) _info(format, ##__VA_ARGS__) +# define i2sllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define i2sinfo(x...) # define i2sllinfo(x...) #endif #ifdef CONFIG_DEBUG_PWM_ERROR -# define pwmerr(format, ...) err(format, ##__VA_ARGS__) -# define pwmllerr(format, ...) llerr(format, ##__VA_ARGS__) +# define pwmerr(format, ...) _err(format, ##__VA_ARGS__) +# define pwmllerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define pwmerr(x...) # define pwmllerr(x...) #endif #ifdef CONFIG_DEBUG_PWM_WARN -# define pwmwarn(format, ...) warn(format, ##__VA_ARGS__) -# define pwmllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define pwmwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define pwmllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define pwmwarn(x...) # define pwmllwarn(x...) #endif #ifdef CONFIG_DEBUG_PWM_INFO -# define pwminfo(format, ...) info(format, ##__VA_ARGS__) -# define pwmllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define pwminfo(format, ...) _info(format, ##__VA_ARGS__) +# define pwmllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define pwminfo(x...) # define pwmllinfo(x...) #endif #ifdef CONFIG_DEBUG_RTC_ERROR -# define rtcerr(format, ...) err(format, ##__VA_ARGS__) -# define rtcllerr(format, ...) llerr(format, ##__VA_ARGS__) +# define rtcerr(format, ...) _err(format, ##__VA_ARGS__) +# define rtcllerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define rtcerr(x...) # define rtcllerr(x...) #endif #ifdef CONFIG_DEBUG_RTC_WARN -# define rtcwarn(format, ...) warn(format, ##__VA_ARGS__) -# define rtcllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define rtcwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define rtcllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define rtcwarn(x...) # define rtcllwarn(x...) #endif #ifdef CONFIG_DEBUG_RTC_INFO -# define rtcinfo(format, ...) info(format, ##__VA_ARGS__) -# define rtcllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define rtcinfo(format, ...) _info(format, ##__VA_ARGS__) +# define rtcllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define rtcinfo(x...) # define rtcllinfo(x...) #endif #ifdef CONFIG_DEBUG_MEMCARD_ERROR -# define mcerr(format, ...) err(format, ##__VA_ARGS__) -# define mcllerr(format, ...) llerr(format, ##__VA_ARGS__) +# define mcerr(format, ...) _err(format, ##__VA_ARGS__) +# define mcllerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define mcerr(x...) # define mcllerr(x...) #endif #ifdef CONFIG_DEBUG_MEMCARD_WARN -# define mcwarn(format, ...) warn(format, ##__VA_ARGS__) -# define mcllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define mcwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define mcllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define mcwarn(x...) # define mcllwarn(x...) #endif #ifdef CONFIG_DEBUG_MEMCARD_INFO -# define mcinfo(format, ...) info(format, ##__VA_ARGS__) -# define mcllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define mcinfo(format, ...) _info(format, ##__VA_ARGS__) +# define mcllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define mcinfo(x...) # define mcllinfo(x...) #endif #ifdef CONFIG_DEBUG_SENSORS_ERROR -# define snerr(format, ...) err(format, ##__VA_ARGS__) -# define snllerr(format, ...) llerr(format, ##__VA_ARGS__) +# define snerr(format, ...) _err(format, ##__VA_ARGS__) +# define snllerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define snerr(x...) # define snllerr(x...) #endif #ifdef CONFIG_DEBUG_SENSORS_WARN -# define snwarn(format, ...) warn(format, ##__VA_ARGS__) -# define snllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define snwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define snllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define snwarn(x...) # define snllwarn(x...) #endif #ifdef CONFIG_DEBUG_SENSORS_INFO -# define sninfo(format, ...) info(format, ##__VA_ARGS__) -# define snllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define sninfo(format, ...) _info(format, ##__VA_ARGS__) +# define snllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define sninfo(x...) # define snllinfo(x...) #endif #ifdef CONFIG_DEBUG_SPI_ERROR -# define spierr(format, ...) err(format, ##__VA_ARGS__) -# define spillerr(format, ...) llerr(format, ##__VA_ARGS__) +# define spierr(format, ...) _err(format, ##__VA_ARGS__) +# define spillerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define spierr(x...) # define spillerr(x...) #endif #ifdef CONFIG_DEBUG_SPI_WARN -# define spiwarn(format, ...) warn(format, ##__VA_ARGS__) -# define spillwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define spiwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define spillwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define spiwarn(x...) # define spillwarn(x...) #endif #ifdef CONFIG_DEBUG_SPI_INFO -# define spiinfo(format, ...) info(format, ##__VA_ARGS__) -# define spillinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define spiinfo(format, ...) _info(format, ##__VA_ARGS__) +# define spillinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define spiinfo(x...) # define spillinfo(x...) #endif #ifdef CONFIG_DEBUG_TIMER_ERROR -# define tmrerr(format, ...) err(format, ##__VA_ARGS__) -# define tmrllerr(format, ...) llerr(format, ##__VA_ARGS__) +# define tmrerr(format, ...) _err(format, ##__VA_ARGS__) +# define tmrllerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define tmrerr(x...) # define tmrllerr(x...) #endif #ifdef CONFIG_DEBUG_TIMER_WARN -# define tmrwarn(format, ...) warn(format, ##__VA_ARGS__) -# define tmrllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define tmrwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define tmrllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define tmrwarn(x...) # define tmrllwarn(x...) #endif #ifdef CONFIG_DEBUG_TIMER_INFO -# define tmrinfo(format, ...) info(format, ##__VA_ARGS__) -# define tmrllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define tmrinfo(format, ...) _info(format, ##__VA_ARGS__) +# define tmrllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define tmrinfo(x...) # define tmrllinfo(x...) #endif #ifdef CONFIG_DEBUG_USB_ERROR -# define uerr(format, ...) err(format, ##__VA_ARGS__) -# define ullerr(format, ...) llerr(format, ##__VA_ARGS__) +# define uerr(format, ...) _err(format, ##__VA_ARGS__) +# define ullerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define uerr(x...) # define ullerr(x...) #endif #ifdef CONFIG_DEBUG_USB_WARN -# define uwarn(format, ...) warn(format, ##__VA_ARGS__) -# define ullwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define uwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define ullwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define uwarn(x...) # define ullwarn(x...) #endif #ifdef CONFIG_DEBUG_USB_INFO -# define uinfo(format, ...) info(format, ##__VA_ARGS__) -# define ullinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define uinfo(format, ...) _info(format, ##__VA_ARGS__) +# define ullinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define uinfo(x...) # define ullinfo(x...) #endif #ifdef CONFIG_DEBUG_WATCHDOG_ERROR -# define wderr(format, ...) err(format, ##__VA_ARGS__) -# define wdllerr(format, ...) llerr(format, ##__VA_ARGS__) +# define wderr(format, ...) _err(format, ##__VA_ARGS__) +# define wdllerr(format, ...) _llerr(format, ##__VA_ARGS__) #else # define wderr(x...) # define wdllerr(x...) #endif #ifdef CONFIG_DEBUG_WATCHDOG_WARN -# define wdwarn(format, ...) warn(format, ##__VA_ARGS__) -# define wdllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +# define wdwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define wdllwarn(format, ...) _llwarn(format, ##__VA_ARGS__) #else # define wdwarn(x...) # define wdllwarn(x...) #endif #ifdef CONFIG_DEBUG_WATCHDOG_INFO -# define wdinfo(format, ...) info(format, ##__VA_ARGS__) -# define wdllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define wdinfo(format, ...) _info(format, ##__VA_ARGS__) +# define wdllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define wdinfo(x...) # define wdllinfo(x...) @@ -895,724 +897,724 @@ #ifdef CONFIG_DEBUG_ERROR # ifndef CONFIG_ARCH_LOWPUTC -# define llerr (void) +# define _llerr (void) # endif #else -# define err (void) -# define llerr (void) +# define _err (void) +# define _llerr (void) #endif #ifdef CONFIG_DEBUG_WARN # ifndef CONFIG_ARCH_LOWPUTC -# define llwarn (void) +# define _llwarn (void) # endif #else -# define warn (void) -# define llwarn (void) +# define _warn (void) +# define _llwarn (void) #endif #ifdef CONFIG_DEBUG_INFO # ifndef CONFIG_ARCH_LOWPUTC -# define llinfo (void) +# define _llinfo (void) # endif #else -# define info (void) -# define llinfo (void) +# define _info (void) +# define _llinfo (void) #endif /* Subsystem specific debug */ #ifdef CONFIG_DEBUG_MM_ERROR -# define merr err -# define mllerr llerr +# define merr _err +# define mllerr _llerr #else # define merr (void) # define mllerr (void) #endif #ifdef CONFIG_DEBUG_MM_WARN -# define mwarn warn -# define mllwarn llwarn +# define mwarn _warn +# define mllwarn _llwarn #else # define mwarn (void) # define mllwarn (void) #endif #ifdef CONFIG_DEBUG_MM_INFO -# define minfo info -# define mllinfo llinfo +# define minfo _info +# define mllinfo _llinfo #else # define minfo (void) # define mllinfo (void) #endif #ifdef CONFIG_DEBUG_SCHED_ERROR -# define serr err -# define sllerr llerr +# define serr _err +# define sllerr _llerr #else # define serr (void) # define sllerr (void) #endif #ifdef CONFIG_DEBUG_SCHED_WARN -# define swarn warn -# define sllwarn llwarn +# define swarn _warn +# define sllwarn _llwarn #else # define swarn (void) # define sllwarn (void) #endif #ifdef CONFIG_DEBUG_SCHED_INFO -# define sinfo info -# define sllinfo llinfo +# define sinfo _info +# define sllinfo _llinfo #else # define sinfo (void) # define sllinfo (void) #endif #ifdef CONFIG_DEBUG_SYSCALL_ERROR -# define svcerr err -# define svcllerr llerr +# define svcerr _err +# define svcllerr _llerr #else # define svcerr (void) # define svcllerr (void) #endif #ifdef CONFIG_DEBUG_SYSCALL_WARN -# define svcwarn warn -# define svcllwarn llwarn +# define svcwarn _warn +# define svcllwarn _llwarn #else # define svcwarn (void) # define svcllwarn (void) #endif #ifdef CONFIG_DEBUG_SYSCALL_INFO -# define svcinfo info -# define svcllinfo llinfo +# define svcinfo _info +# define svcllinfo _llinfo #else # define svcinfo (void) # define svcllinfo (void) #endif #ifdef CONFIG_DEBUG_PAGING_ERROR -# define pgerr err -# define pgllerr llerr +# define pgerr _err +# define pgllerr _llerr #else # define pgerr (void) # define pgllerr (void) #endif #ifdef CONFIG_DEBUG_PAGING_WARN -# define pgwarn warn -# define pgllwarn llwarn +# define pgwarn _warn +# define pgllwarn _llwarn #else # define pgwarn (void) # define pgllwarn (void) #endif #ifdef CONFIG_DEBUG_PAGING_INFO -# define pginfo info -# define pgllinfo llinfo +# define pginfo _info +# define pgllinfo _llinfo #else # define pginfo (void) # define pgllinfo (void) #endif #ifdef CONFIG_DEBUG_NET_ERROR -# define nerr err -# define nllerr llerr +# define nerr _err +# define nllerr _llerr #else # define nerr (void) # define nllerr (void) #endif #ifdef CONFIG_DEBUG_NET_WARN -# define nwarn warn -# define nllwarn llwarn +# define nwarn _warn +# define nllwarn _llwarn #else # define nwarn (void) # define nllwarn (void) #endif #ifdef CONFIG_DEBUG_NET_INFO -# define ninfo info -# define nllinfo llinfo +# define ninfo _info +# define nllinfo _llinfo #else # define ninfo (void) # define nllinfo (void) #endif #ifdef CONFIG_DEBUG_FS_ERROR -# define ferr err -# define fllerr llerr +# define ferr _err +# define fllerr _llerr #else # define ferr (void) # define fllerr (void) #endif #ifdef CONFIG_DEBUG_FS_WARN -# define fwarn warn -# define fllwarn llwarn +# define fwarn _warn +# define fllwarn _llwarn #else # define fwarn (void) # define fllwarn (void) #endif #ifdef CONFIG_DEBUG_FS_INFO -# define finfo info -# define fllinfo llinfo +# define finfo _info +# define fllinfo _llinfo #else # define finfo (void) # define fllinfo (void) #endif #ifdef CONFIG_DEBUG_CRYPTO_ERROR -# define crypterr err -# define cryptllerr llerr +# define crypterr _err +# define cryptllerr _llerr #else # define crypterr (void) # define cryptllerr (void) #endif #ifdef CONFIG_DEBUG_CRYPTO_WARN -# define cryptwarn warn -# define cryptllwarn llwarn +# define cryptwarn _warn +# define cryptllwarn _llwarn #else # define cryptwarn (void) # define cryptllwarn (void) #endif #ifdef CONFIG_DEBUG_CRYPTO_INFO -# define cryptinfo info -# define cryptllinfo llinfo +# define cryptinfo _info +# define cryptllinfo _llinfo #else # define cryptinfo(x...) # define cryptllinfo(x...) #endif #ifdef CONFIG_DEBUG_INPUT_ERROR -# define ierr err -# define illerr llerr +# define ierr _err +# define illerr _llerr #else # define ierr (void) # define illerr (void) #endif #ifdef CONFIG_DEBUG_INPUT_WARN -# define iwarn warn -# define illwarn llwarn +# define iwarn _warn +# define illwarn _llwarn #else # define iwarn (void) # define illwarn (void) #endif #ifdef CONFIG_DEBUG_INPUT_INFO -# define iinfo info -# define illinfo llinfo +# define iinfo _info +# define illinfo _llinfo #else # define iinfo (void) # define illinfo (void) #endif #ifdef CONFIG_DEBUG_ANALOG_ERROR -# define aerr err -# define allerr llerr +# define aerr _err +# define allerr _llerr #else # define aerr (void) # define allerr (void) #endif #ifdef CONFIG_DEBUG_ANALOG_WARN -# define awarn warn -# define allwarn llwarn +# define awarn _warn +# define allwarn _llwarn #else # define awarn (void) # define allwarn (void) #endif #ifdef CONFIG_DEBUG_ANALOG_INFO -# define ainfo info -# define allinfo llinfo +# define ainfo _info +# define allinfo _llinfo #else # define ainfo (void) # define allinfo (void) #endif #ifdef CONFIG_DEBUG_CAN_ERROR -# define canerr err -# define canllerr llerr +# define canerr _err +# define canllerr _llerr #else -# define canerr (void) -# define canllerr (void) +# define canerr (void) +# define canllerr (void) #endif #ifdef CONFIG_DEBUG_CAN_WARN -# define canwarn warn -# define canllwarn llwarn +# define canwarn _warn +# define canllwarn _llwarn #else -# define canwarn (void) -# define canllwarn (void) +# define canwarn (void) +# define canllwarn (void) #endif #ifdef CONFIG_DEBUG_CAN_INFO -# define caninfo info -# define canllinfo llinfo +# define caninfo _info +# define canllinfo _llinfo #else -# define caninfo (void) -# define canllinfo (void) +# define caninfo (void) +# define canllinfo (void) #endif #ifdef CONFIG_DEBUG_GRAPHICS_ERROR -# define gerr err -# define gllerr llerr +# define gerr _err +# define gllerr _llerr #else # define gerr (void) # define gllerr (void) #endif #ifdef CONFIG_DEBUG_GRAPHICS_WARN -# define gwarn warn -# define gllwarn llwarn +# define gwarn _warn +# define gllwarn _llwarn #else # define gwarn (void) # define gllwarn (void) #endif #ifdef CONFIG_DEBUG_GRAPHICS_INFO -# define ginfo info -# define gllinfo llinfo +# define ginfo _info +# define gllinfo _llinfo #else # define ginfo (void) # define gllinfo (void) #endif #ifdef CONFIG_DEBUG_BINFMT_ERROR -# define berr err -# define bllerr llerr +# define berr _err +# define bllerr _llerr #else # define berr (void) # define bllerr (void) #endif #ifdef CONFIG_DEBUG_BINFMT_WARN -# define bwarn warn -# define bllwarn llwarn +# define bwarn _warn +# define bllwarn _llwarn #else # define bwarn (void) # define bllwarn (void) #endif #ifdef CONFIG_DEBUG_BINFMT_INFO -# define binfo info -# define bllinfo llinfo +# define binfo _info +# define bllinfo _llinfo #else # define binfo (void) # define bllinfo (void) #endif #ifdef CONFIG_DEBUG_LIB_ERROR -# define lerr err -# define lllerr llerr +# define lerr _err +# define lllerr _llerr #else # define lerr (void) # define lllerr (void) #endif #ifdef CONFIG_DEBUG_LIB_WARN -# define lwarn warn -# define lllwarn llwarn +# define lwarn _warn +# define lllwarn _llwarn #else # define lwarn (void) # define lllwarn (void) #endif #ifdef CONFIG_DEBUG_LIB_INFO -# define linfo info -# define lllinfo llinfo +# define linfo _info +# define lllinfo _llinfo #else # define linfo (void) # define lllinfo (void) #endif #ifdef CONFIG_DEBUG_AUDIO_ERROR -# define auderr err -# define audllerr llerr +# define auderr _err +# define audllerr _llerr #else # define auderr (void) # define audllerr (void) #endif #ifdef CONFIG_DEBUG_AUDIO_WARN -# define audwarn warn -# define audllwarn llwarn +# define audwarn _warn +# define audllwarn _llwarn #else # define audwarn (void) # define audllwarn (void) #endif #ifdef CONFIG_DEBUG_AUDIO_INFO -# define audinfo info -# define audllinfo llinfo +# define audinfo _info +# define audllinfo _llinfo #else # define audinfo (void) # define audllinfo (void) #endif #ifdef CONFIG_DEBUG_DMA_ERROR -# define dmaerr err -# define dmallerr llerr +# define dmaerr _err +# define dmallerr _llerr #else # define dmaerr (void) # define dmallerr (void) #endif #ifdef CONFIG_DEBUG_DMA_WARN -# define dmawarn warn -# define dmallwarn llwarn +# define dmawarn _warn +# define dmallwarn _llwarn #else # define dmawarn (void) # define dmallwarn (void) #endif #ifdef CONFIG_DEBUG_DMA_INFO -# define dmainfo info -# define dmallinfo llinfo +# define dmainfo _info +# define dmallinfo _llinfo #else # define dmainfo (void) # define dmallinfo (void) #endif #ifdef CONFIG_DEBUG_IRQ_ERROR -# define irqerr err -# define irqllerr llerr +# define irqerr _err +# define irqllerr _llerr #else # define irqerr (void) # define irqllerr (void) #endif #ifdef CONFIG_DEBUG_IRQ_WARN -# define irqwarn warn -# define irqllwarn llwarn +# define irqwarn _warn +# define irqllwarn _llwarn #else # define irqwarn (void) # define irqllwarn (void) #endif #ifdef CONFIG_DEBUG_IRQ_INFO -# define irqinfo info -# define irqllinfo llinfo +# define irqinfo _info +# define irqllinfo _llinfo #else # define irqinfo (void) # define irqllinfo (void) #endif #ifdef CONFIG_DEBUG_LCD_ERROR -# define lcderr err -# define lcdllerr llerr +# define lcderr _err +# define lcdllerr _llerr #else # define lcderr (void) # define lcdllerr (void) #endif #ifdef CONFIG_DEBUG_LCD_WARN -# define lcdwarn warn -# define lcdllwarn llwarn +# define lcdwarn _warn +# define lcdllwarn _llwarn #else # define lcdwarn (void) # define lcdllwarn (void) #endif #ifdef CONFIG_DEBUG_LCD_INFO -# define lcdinfo info -# define lcdllinfo llinfo +# define lcdinfo _info +# define lcdllinfo _llinfo #else # define lcdinfo (void) # define lcdllinfo (void) #endif #ifdef CONFIG_DEBUG_LEDS_ERROR -# define lederr err -# define ledllerr llerr +# define lederr _err +# define ledllerr _llerr #else # define lederr (void) # define ledllerr (void) #endif #ifdef CONFIG_DEBUG_LEDS_WARN -# define ledwarn warn -# define ledllwarn llwarn +# define ledwarn _warn +# define ledllwarn _llwarn #else # define ledwarn (void) # define ledllwarn (void) #endif #ifdef CONFIG_DEBUG_LEDS_INFO -# define ledinfo info -# define ledllinfo llinfo +# define ledinfo _info +# define ledllinfo _llinfo #else # define ledinfo (void) # define ledllinfo (void) #endif #ifdef CONFIG_DEBUG_GPIO_ERROR -# define gpioerr err -# define gpiollerr llerr +# define gpioerr _err +# define gpiollerr _llerr #else # define gpioerr (void) # define gpiollerr (void) #endif #ifdef CONFIG_DEBUG_GPIO_WARN -# define gpiowarn warn -# define gpiollwarn llwarn +# define gpiowarn _warn +# define gpiollwarn _llwarn #else # define gpiowarn (void) # define gpiollwarn (void) #endif #ifdef CONFIG_DEBUG_GPIO_INFO -# define gpioinfo info -# define gpiollinfo llinfo +# define gpioinfo _info +# define gpiollinfo _llinfo #else # define gpioinfo (void) # define gpiollinfo (void) #endif #ifdef CONFIG_DEBUG_I2C_ERROR -# define i2cerr err -# define i2cllerr llerr +# define i2cerr _err +# define i2cllerr _llerr #else # define i2cerr (void) # define i2cllerr (void) #endif #ifdef CONFIG_DEBUG_I2C_WARN -# define i2cwarn warn -# define i2cllwarn llwarn +# define i2cwarn _warn +# define i2cllwarn _llwarn #else # define i2cwarn (void) # define i2cllwarn (void) #endif #ifdef CONFIG_DEBUG_I2C_INFO -# define i2cinfo info -# define i2cllinfo llinfo +# define i2cinfo _info +# define i2cllinfo _llinfo #else # define i2cinfo (void) # define i2cllinfo (void) #endif #ifdef CONFIG_DEBUG_I2S_ERROR -# define i2serr err -# define i2sllerr llerr +# define i2serr _err +# define i2sllerr _llerr #else # define i2serr (void) # define i2sllerr (void) #endif #ifdef CONFIG_DEBUG_I2S_WARN -# define i2swarn warn -# define i2sllwarn llwarn +# define i2swarn _warn +# define i2sllwarn _llwarn #else # define i2swarn (void) # define i2sllwarn (void) #endif #ifdef CONFIG_DEBUG_I2S_INFO -# define i2sinfo info -# define i2sllinfo llinfo +# define i2sinfo _info +# define i2sllinfo _llinfo #else # define i2sinfo (void) # define i2sllinfo (void) #endif #ifdef CONFIG_DEBUG_PWM_ERROR -# define pwmerr err -# define pwmllerr llerr +# define pwmerr _err +# define pwmllerr _llerr #else # define pwmerr (void) # define pwmllerr (void) #endif #ifdef CONFIG_DEBUG_PWM_WARN -# define pwmwarn warn -# define pwmllwarn llwarn +# define pwmwarn _warn +# define pwmllwarn _llwarn #else # define pwmwarn (void) # define pwmllwarn (void) #endif #ifdef CONFIG_DEBUG_PWM_INFO -# define pwminfo info -# define pwmllinfo llinfo +# define pwminfo _info +# define pwmllinfo _llinfo #else # define pwminfo (void) # define pwmllinfo (void) #endif #ifdef CONFIG_DEBUG_RTC_ERROR -# define rtcerr err -# define rtcllerr llerr +# define rtcerr _err +# define rtcllerr _llerr #else # define rtcerr (void) # define rtcllerr (void) #endif #ifdef CONFIG_DEBUG_RTC_WARN -# define rtcwarn warn -# define rtcllwarn llwarn +# define rtcwarn _warn +# define rtcllwarn _llwarn #else # define rtcwarn (void) # define rtcllwarn (void) #endif #ifdef CONFIG_DEBUG_RTC_INFO -# define rtcinfo info -# define rtcllinfo llinfo +# define rtcinfo _info +# define rtcllinfo _llinfo #else # define rtcinfo (void) # define rtcllinfo (void) #endif #ifdef CONFIG_DEBUG_MEMCARD_ERROR -# define mcerr err -# define mcllerr llerr +# define mcerr _err +# define mcllerr _llerr #else # define mcerr (void) # define mcllerr (void) #endif #ifdef CONFIG_DEBUG_MEMCARD_WARN -# define mcwarn warn -# define mcllwarn llwarn +# define mcwarn _warn +# define mcllwarn _llwarn #else # define mcwarn (void) # define mcllwarn (void) #endif #ifdef CONFIG_DEBUG_MEMCARD_INFO -# define mcinfo info -# define mcllinfo llinfo +# define mcinfo _info +# define mcllinfo _llinfo #else # define mcinfo (void) # define mcllinfo (void) #endif #ifdef CONFIG_DEBUG_SENSORS_ERROR -# define snerr err -# define snllerr llerr +# define snerr _err +# define snllerr _llerr #else # define snerr (void) # define snllerr (void) #endif #ifdef CONFIG_DEBUG_SENSORS_WARN -# define snwarn warn -# define snllwarn llwarn +# define snwarn _warn +# define snllwarn _llwarn #else # define snwarn (void) # define snllwarn (void) #endif #ifdef CONFIG_DEBUG_SENSORS_INFO -# define sninfo info -# define snllinfo llinfo +# define sninfo _info +# define snllinfo _llinfo #else # define sninfo (void) # define snllinfo (void) #endif #ifdef CONFIG_DEBUG_SPI_ERROR -# define spierr err -# define spillerr llerr +# define spierr _err +# define spillerr _llerr #else # define spierr (void) # define spillerr (void) #endif #ifdef CONFIG_DEBUG_SPI_WARN -# define spiwarn warn -# define spillwarn llwarn +# define spiwarn _warn +# define spillwarn _llwarn #else # define spiwarn (void) # define spillwarn (void) #endif #ifdef CONFIG_DEBUG_SPI_INFO -# define spiinfo info -# define spillinfo llinfo +# define spiinfo _info +# define spillinfo _llinfo #else # define spiinfo (void) # define spillinfo (void) #endif #ifdef CONFIG_DEBUG_TIMER_ERROR -# define tmrerr err -# define tmrllerr llerr +# define tmrerr _err +# define tmrllerr _llerr #else # define tmrerr (void) # define tmrllerr (void) #endif #ifdef CONFIG_DEBUG_TIMER_WARN -# define tmrwarn warn -# define tmrllwarn llwarn +# define tmrwarn _warn +# define tmrllwarn _llwarn #else # define tmrwarn (void) # define tmrllwarn (void) #endif #ifdef CONFIG_DEBUG_TIMER_INFO -# define tmrinfo info -# define tmrllinfo llinfo +# define tmrinfo _info +# define tmrllinfo _llinfo #else # define tmrinfo (void) # define tmrllinfo (void) #endif #ifdef CONFIG_DEBUG_USB_ERROR -# define uerr err -# define ullerr llerr +# define uerr _err +# define ullerr _llerr #else # define uerr (void) # define ullerr (void) #endif #ifdef CONFIG_DEBUG_USB_WARN -# define uwarn warn -# define ullwarn llwarn +# define uwarn _warn +# define ullwarn _llwarn #else # define uwarn (void) # define ullwarn (void) #endif #ifdef CONFIG_DEBUG_USB_INFO -# define uinfo info -# define ullinfo llinfo +# define uinfo _info +# define ullinfo _llinfo #else # define uinfo (void) # define ullinfo (void) #endif #ifdef CONFIG_DEBUG_WATCHDOG_ERROR -# define wderr err -# define wdllerr llerr +# define wderr _err +# define wdllerr _llerr #else # define wderr (void) # define wdllerr (void) #endif #ifdef CONFIG_DEBUG_WATCHDOG_WARN -# define wdwarn warn -# define wdllwarn llwarn +# define wdwarn _warn +# define wdllwarn _llwarn #else # define wdwarn (void) # define wdllwarn (void) #endif #ifdef CONFIG_DEBUG_WATCHDOG_INFO -# define wdinfo info -# define wdllinfo llinfo +# define wdinfo _info +# define wdllinfo _llinfo #else # define wdinfo (void) # define wdllinfo (void) @@ -1897,26 +1899,26 @@ int alert(const char *format, ...); #endif #ifdef CONFIG_DEBUG_ERROR -int err(const char *format, ...); +int _err(const char *format, ...); # ifdef CONFIG_ARCH_LOWPUTC -int llerr(const char *format, ...); +int _llerr(const char *format, ...); # endif #endif /* CONFIG_DEBUG_ERROR */ #ifdef CONFIG_DEBUG_WARN -int warn(const char *format, ...); +int _warn(const char *format, ...); # ifdef CONFIG_ARCH_LOWPUTC -int llwarn(const char *format, ...); +int _llwarn(const char *format, ...); # endif #endif /* CONFIG_DEBUG_WARN */ #ifdef CONFIG_DEBUG_INFO -int info(const char *format, ...); +int _info(const char *format, ...); # ifdef CONFIG_ARCH_LOWPUTC -int llinfo(const char *format, ...); +int _llinfo(const char *format, ...); # endif #endif /* CONFIG_DEBUG_INFO */ #endif /* CONFIG_CPP_HAVE_VARARGS */ diff --git a/include/nuttx/mm/shm.h b/include/nuttx/mm/shm.h index 80d36f2f94..35f19c50d2 100644 --- a/include/nuttx/mm/shm.h +++ b/include/nuttx/mm/shm.h @@ -77,16 +77,16 @@ #ifdef CONFIG_CPP_HAVE_VARARGS # ifdef CONFIG_DEBUG_SHM -# define shmerr(format, ...) err(format, ##__VA_ARGS__) -# define shminfo(format, ...) info(format, ##__VA_ARGS__) +# define shmerr(format, ...) _err(format, ##__VA_ARGS__) +# define shminfo(format, ...) _info(format, ##__VA_ARGS__) # else # define shmerr(format, ...) merr(format, ##__VA_ARGS__) # define shminfo(format, ...) minfo(format, ##__VA_ARGS__) # endif #else # ifdef CONFIG_DEBUG_SHM -# define shmerr err -# define shminfo info +# define shmerr _err +# define shminfo _info # else # define shmerr (void) # define shminfo (void) diff --git a/include/nuttx/wireless/nrf24l01.h b/include/nuttx/wireless/nrf24l01.h index a166ebf034..4bb1482757 100644 --- a/include/nuttx/wireless/nrf24l01.h +++ b/include/nuttx/wireless/nrf24l01.h @@ -91,10 +91,10 @@ /* NRF24L01 debug */ #ifdef NRF24L01_DEBUG -# define werr(format, ...) err(format, ##__VA_ARGS__) -# define wllerr(format, ...) llerr(format, ##__VA_ARGS__) -# define winfo(format, ...) info(format, ##__VA_ARGS__) -# define wllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +# define werr(format, ...) _err(format, ##__VA_ARGS__) +# define wllerr(format, ...) _llerr(format, ##__VA_ARGS__) +# define winfo(format, ...) _info(format, ##__VA_ARGS__) +# define wllinfo(format, ...) _llinfo(format, ##__VA_ARGS__) #else # define werr(x...) # define wllerr(x...) diff --git a/include/sys/wait.h b/include/sys/wait.h index b46e302879..500c8b51f9 100644 --- a/include/sys/wait.h +++ b/include/sys/wait.h @@ -50,7 +50,7 @@ ****************************************************************************/ /* The following are provided for analysis of returned status values. - * Encoded is as follows as 2 bytes of info(MS) then two bytes of code (LS). + * Encoded is as follows as 2 bytes of _info(MS) then two bytes of code (LS). * Code: * 0 - Child has exited, info is the exit code. * Other values - Not implemented diff --git a/libc/libc.csv b/libc/libc.csv index 87a98f778d..2c9eabe0b9 100644 --- a/libc/libc.csv +++ b/libc/libc.csv @@ -26,7 +26,7 @@ "dq_rem","queue.h","","void","FAR dq_entry_t *","dq_queue_t *" "dq_remfirst","queue.h","","FAR dq_entry_t","dq_queue_t *" "dq_remlast","queue.h","","FAR dq_entry_t","dq_queue_t *" -"err","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_ERROR)","int","const char *","..." +"_err","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_ERROR)","int","const char *","..." "ether_ntoa","netinet/ether.h","","FAR char","FAR const struct ether_addr *" "fclose","stdio.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","FAR FILE *" "fdopen","stdio.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","FAR FILE","int","FAR const char *" @@ -64,9 +64,9 @@ "lib_dumpbuffer","debug.h","","void","FAR const char *","FAR const uint8_t *","unsigned int" "lio_listio","aio.h","defined(CONFIG_FS_AIO)","int","int","FAR struct aiocb *const []|FAR struct aiocb *const *","int","FAR struct sigevent *" "llabs","stdlib.h","defined(CONFIG_HAVE_LONG_LONG)","long long int","long long int" -"llerr","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_ERROR) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..." -"llinfo","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_INFO) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..." -"llwarn","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_WARN) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..." +"_llerr","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_ERROR) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..." +"_llinfo","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_INFO) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..." +"_llwarn","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_WARN) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..." "lowsyslog","syslog.h","","int","int","FAR const char *","..." "lowvsyslog","syslog.h","","int","int","FAR const char *","va_list" "match","nuttx/regex.h","","int","const char *","const char *" @@ -169,11 +169,11 @@ "ub16sqr","fixedmath.h","!defined(CONFIG_HAVE_LONG_LONG)","ub16_t","ub16_t" "ungetc","stdio.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","int","FAR FILE *" "usleep","unistd.h","!defined(CONFIG_DISABLE_SIGNALS)","int","int","FAR FILE *" -"info","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_INFO)","int","const char *","..." +"_info","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_INFO)","int","const char *","..." "vfprintf","stdio.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","FAR FILE *","const char *","va_list" "vprintf","stdio.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","FAR const char *","va_list" "vsnprintf","stdio.h","","int","FAR char *","size_t","const char *","va_list" "vsprintf","stdio.h","","int","FAR char *","const char *","va_list" "vsscanf","stdio.h","","int","char *","const char *","va_list" "vsyslog","syslog.h","","int","int","FAR const char *","va_list" -"warn","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_WARN)","int","const char *","..." +"_warn","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_WARN)","int","const char *","..." diff --git a/libc/misc/lib_debug.c b/libc/misc/lib_debug.c index cd1e703c09..7e6a33f8aa 100644 --- a/libc/misc/lib_debug.c +++ b/libc/misc/lib_debug.c @@ -51,7 +51,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: alert, err, llerr, warn, llwarn, info, llinfo + * Name: alert, err, llerr, warn, llwarn, info, _llinfo * * Description: * If the cross-compiler's pre-processor does not support variable @@ -60,7 +60,7 @@ ****************************************************************************/ #ifdef CONFIG_ARCH_LOWPUTC -int alert(const char *format, ...) +int _alert(const char *format, ...) { va_list ap; int ret; @@ -74,7 +74,7 @@ int alert(const char *format, ...) #endif /* CONFIG_ARCH_LOWPUTC */ #ifdef CONFIG_DEBUG_FEATURES -int err(const char *format, ...) +int _err(const char *format, ...) { va_list ap; int ret; @@ -87,7 +87,7 @@ int err(const char *format, ...) } #ifdef CONFIG_ARCH_LOWPUTC -int llerr(const char *format, ...) +int _llerr(const char *format, ...) { va_list ap; int ret; @@ -102,7 +102,7 @@ int llerr(const char *format, ...) #endif /* CONFIG_DEBUG_FEATURES */ #ifdef CONFIG_DEBUG_WARN -int warn(const char *format, ...) +int _warn(const char *format, ...) { va_list ap; int ret; @@ -115,7 +115,7 @@ int warn(const char *format, ...) } #ifdef CONFIG_ARCH_LOWPUTC -int llwarn(const char *format, ...) +int _llwarn(const char *format, ...) { va_list ap; int ret; @@ -130,7 +130,7 @@ int llwarn(const char *format, ...) #endif /* CONFIG_DEBUG_INFO */ #ifdef CONFIG_DEBUG_INFO -int info(const char *format, ...) +int _info(const char *format, ...) { va_list ap; int ret; @@ -143,7 +143,7 @@ int info(const char *format, ...) } #ifdef CONFIG_ARCH_LOWPUTC -int llinfo(const char *format, ...) +int _llinfo(const char *format, ...) { va_list ap; int ret; diff --git a/libc/spawn/lib_psa_dump.c b/libc/spawn/lib_psa_dump.c index 81ccc7a675..9a66501556 100644 --- a/libc/spawn/lib_psa_dump.c +++ b/libc/spawn/lib_psa_dump.c @@ -74,63 +74,63 @@ void posix_spawnattr_dump(posix_spawnattr_t *attr) { #ifdef CONFIG_DEBUG_ERROR - err("attr[%p]:\n", attr); - err(" flags: %04x\n", attr->flags); + _err("attr[%p]:\n", attr); + _err(" flags: %04x\n", attr->flags); if (attr->flags == 0) { - err(" None\n"); + _err(" None\n"); } else { if ((attr->flags & POSIX_SPAWN_RESETIDS) != 0) { - err(" POSIX_SPAWN_RESETIDS\n"); + _err(" POSIX_SPAWN_RESETIDS\n"); } if ((attr->flags & POSIX_SPAWN_SETPGROUP) != 0) { - err(" POSIX_SPAWN_SETPGROUP\n"); + _err(" POSIX_SPAWN_SETPGROUP\n"); } if ((attr->flags & POSIX_SPAWN_SETSCHEDPARAM) != 0) { - err(" POSIX_SPAWN_SETSCHEDPARAM\n"); + _err(" POSIX_SPAWN_SETSCHEDPARAM\n"); } if ((attr->flags & POSIX_SPAWN_SETSCHEDULER) != 0) { - err(" POSIX_SPAWN_SETSCHEDULER\n"); + _err(" POSIX_SPAWN_SETSCHEDULER\n"); } if ((attr->flags & POSIX_SPAWN_SETSIGDEF) != 0) { - err(" POSIX_SPAWN_SETSIGDEF\n"); + _err(" POSIX_SPAWN_SETSIGDEF\n"); } if ((attr->flags & POSIX_SPAWN_SETSIGMASK) != 0) { - err(" POSIX_SPAWN_SETSIGMASK\n"); + _err(" POSIX_SPAWN_SETSIGMASK\n"); } } - err(" priority: %d\n", attr->priority); + _err(" priority: %d\n", attr->priority); - err(" policy: %d\n", attr->policy); + _err(" policy: %d\n", attr->policy); if (attr->policy == SCHED_FIFO) { - err(" SCHED_FIFO\n"); + _err(" SCHED_FIFO\n"); } else if (attr->policy == SCHED_RR) { - err(" SCHED_RR\n"); + _err(" SCHED_RR\n"); } else { - err(" Unrecognized\n"); + _err(" Unrecognized\n"); } #ifndef CONFIG_DISABLE_SIGNALS - err(" sigmask: %08x\n", attr->sigmask); + _err(" sigmask: %08x\n", attr->sigmask); #endif #endif /* CONFIG_DEBUG_ERROR */ } diff --git a/libc/spawn/lib_psfa_dump.c b/libc/spawn/lib_psfa_dump.c index b56564e2ec..e9371fec31 100644 --- a/libc/spawn/lib_psfa_dump.c +++ b/libc/spawn/lib_psfa_dump.c @@ -80,10 +80,10 @@ void posix_spawn_file_actions_dump(FAR posix_spawn_file_actions_t *file_actions) DEBUGASSERT(file_actions); - err("File Actions[%p->%p]:\n", file_actions, *file_actions); + _err("File Actions[%p->%p]:\n", file_actions, *file_actions); if (!*file_actions) { - err(" NONE\n"); + _err(" NONE\n"); return; } @@ -100,7 +100,7 @@ void posix_spawn_file_actions_dump(FAR posix_spawn_file_actions_t *file_actions) FAR struct spawn_close_file_action_s *action = (FAR struct spawn_close_file_action_s *)entry; - err(" CLOSE: fd=%d\n", action->fd); + _err(" CLOSE: fd=%d\n", action->fd); } break; @@ -109,7 +109,7 @@ void posix_spawn_file_actions_dump(FAR posix_spawn_file_actions_t *file_actions) FAR struct spawn_dup2_file_action_s *action = (FAR struct spawn_dup2_file_action_s *)entry; - err(" DUP2: %d->%d\n", action->fd1, action->fd2); + _err(" DUP2: %d->%d\n", action->fd1, action->fd2); } break; @@ -118,14 +118,14 @@ void posix_spawn_file_actions_dump(FAR posix_spawn_file_actions_t *file_actions) FAR struct spawn_open_file_action_s *action = (FAR struct spawn_open_file_action_s *)entry; - err(" OPEN: path=%s oflags=%04x mode=%04x fd=%d\n", + _err(" OPEN: path=%s oflags=%04x mode=%04x fd=%d\n", action->path, action->oflags, action->mode, action->fd); } break; case SPAWN_FILE_ACTION_NONE: default: - err(" ERROR: Unknown action: %d\n", entry->action); + _err(" ERROR: Unknown action: %d\n", entry->action); break; } } diff --git a/libxx/libxx_new.cxx b/libxx/libxx_new.cxx index 83d2b00009..423ab833b5 100644 --- a/libxx/libxx_new.cxx +++ b/libxx/libxx_new.cxx @@ -93,7 +93,7 @@ void *operator new(unsigned int nbytes) // Oh my.. we are required to return a valid pointer and // we cannot throw an exception! We are bad. - err("ERROR: Failed to allocate\n"); + _err("ERROR: Failed to allocate\n"); } #endif diff --git a/libxx/libxx_newa.cxx b/libxx/libxx_newa.cxx index 3dfb53dbd2..a3b327eb63 100644 --- a/libxx/libxx_newa.cxx +++ b/libxx/libxx_newa.cxx @@ -93,7 +93,7 @@ void *operator new[](unsigned int nbytes) // Oh my.. we are required to return a valid pointer and // we cannot throw an exception! We are bad. - err("ERROR: Failed to allocate\n"); + _err("ERROR: Failed to allocate\n"); } #endif diff --git a/libxx/libxx_stdthrow.cxx b/libxx/libxx_stdthrow.cxx index 18960a266f..20957e236b 100644 --- a/libxx/libxx_stdthrow.cxx +++ b/libxx/libxx_stdthrow.cxx @@ -56,25 +56,25 @@ namespace std { void __throw_out_of_range(const char*) { - err("ERROR: C++: Vector .at() with argument out of range\n"); + _err("ERROR: C++: Vector .at() with argument out of range\n"); abort(); } void __throw_length_error(const char*) { - err("ERROR: C++: Vector resize to excessive length\n"); + _err("ERROR: C++: Vector resize to excessive length\n"); abort(); } void __throw_bad_alloc() { - err("ERROR: C++: Bad allocation\n"); + _err("ERROR: C++: Bad allocation\n"); abort(); } void __throw_bad_function_call() { - err("ERROR: C++: Bad function call\n"); + _err("ERROR: C++: Bad function call\n"); abort(); } } diff --git a/mm/mm_gran/mm_gran.h b/mm/mm_gran/mm_gran.h index fb7378ac58..dcc04c7217 100644 --- a/mm/mm_gran/mm_gran.h +++ b/mm/mm_gran/mm_gran.h @@ -63,9 +63,9 @@ #ifdef CONFIG_CPP_HAVE_VARARGS # ifdef CONFIG_DEBUG_GRAM -# define granerr(format, ...) err(format, ##__VA_ARGS__) -# define granwarn(format, ...) warn(format, ##__VA_ARGS__) -# define graninfo(format, ...) info(format, ##__VA_ARGS__) +# define granerr(format, ...) _err(format, ##__VA_ARGS__) +# define granwarn(format, ...) _warn(format, ##__VA_ARGS__) +# define graninfo(format, ...) _info(format, ##__VA_ARGS__) # else # define granerr(format, ...) merr(format, ##__VA_ARGS__) # define granwarn(format, ...) mwarn(format, ##__VA_ARGS__) @@ -73,9 +73,9 @@ # endif #else # ifdef CONFIG_DEBUG_GRAM -# define granerr err -# define granwarn warn -# define graninfo info +# define granerr _err +# define granwarn _warn +# define graninfo _info # else # define granerr merr # define granwarn mwarn diff --git a/mm/mm_gran/mm_pgalloc.c b/mm/mm_gran/mm_pgalloc.c index f65e0b8982..2574e20912 100644 --- a/mm/mm_gran/mm_pgalloc.c +++ b/mm/mm_gran/mm_pgalloc.c @@ -66,9 +66,9 @@ #ifdef CONFIG_CPP_HAVE_VARARGS # ifdef CONFIG_DEBUG_PGALLOC -# define pgaerr(format, ...) err(format, ##__VA_ARGS__) -# define pgawarn(format, ...) warn(format, ##__VA_ARGS__) -# define pgainfo(format, ...) info(format, ##__VA_ARGS__) +# define pgaerr(format, ...) _err(format, ##__VA_ARGS__) +# define pgawarn(format, ...) _warn(format, ##__VA_ARGS__) +# define pgainfo(format, ...) _info(format, ##__VA_ARGS__) # else # define pgaerr(format, ...) merr(format, ##__VA_ARGS__) # define pgawarn(format, ...) mwarn(format, ##__VA_ARGS__) @@ -76,9 +76,9 @@ # endif #else # ifdef CONFIG_DEBUG_PGALLOC -# define pgaerr err -# define pgawarn warn -# define pgainfo info +# define pgaerr _err +# define pgawarn _warn +# define pgainfo _info # else # define pgaerr merr # define pgawarn mwarn diff --git a/mm/mm_heap/mm_sem.c b/mm/mm_heap/mm_sem.c index b34d61f8af..49083da213 100644 --- a/mm/mm_heap/mm_sem.c +++ b/mm/mm_heap/mm_sem.c @@ -54,16 +54,16 @@ #ifdef MONITOR_MM_SEMAPHORE # include -# define msemerr err -# define msemwarn warn -# define mseminfo info +# define msemerr _err +# define msemwarn _warn +# define mseminfo _info #else # ifdef CONFIG_CPP_HAVE_VARARGS # define msemerr(x...) # define msemwarn(x...) # define mseminfo(x...) # else -# define msemerr (void) +# define msemerr (void) # define msemwarn (void) # define mseminfo (void) # endif diff --git a/sched/group/group_childstatus.c b/sched/group/group_childstatus.c index 54d74bfee0..729fb23ef7 100644 --- a/sched/group/group_childstatus.c +++ b/sched/group/group_childstatus.c @@ -115,10 +115,10 @@ static void group_dumpchildren(FAR struct task_group_s *group, FAR struct child_status_s *child; int i; - info("Task group=%p: %s\n", group, msg); + _info("Task group=%p: %s\n", group, msg); for (i = 0, child = group->tg_children; child; i++, child = child->flink) { - info(" %d. ch_flags=%02x ch_pid=%d ch_status=%d\n", + _info(" %d. ch_flags=%02x ch_pid=%d ch_status=%d\n", i, child->ch_flags, child->ch_pid, child->ch_status); } } diff --git a/sched/irq/irq_unexpectedisr.c b/sched/irq/irq_unexpectedisr.c index c320b18563..136abf5791 100644 --- a/sched/irq/irq_unexpectedisr.c +++ b/sched/irq/irq_unexpectedisr.c @@ -61,7 +61,7 @@ int irq_unexpected_isr(int irq, FAR void *context) { (void)up_irq_save(); - llerr("ERROR irq: %d\n", irq); + _llerr("ERROR irq: %d\n", irq); PANIC(); return OK; /* Won't get here */ } diff --git a/sched/semaphore/sem_holder.c b/sched/semaphore/sem_holder.c index bb7a850511..f56eb1bc8d 100644 --- a/sched/semaphore/sem_holder.c +++ b/sched/semaphore/sem_holder.c @@ -402,10 +402,10 @@ static int sem_dumpholder(FAR struct semholder_s *pholder, FAR sem_t *sem, FAR void *arg) { #if CONFIG_SEM_PREALLOCHOLDERS > 0 - info(" %08x: %08x %08x %04x\n", + _info(" %08x: %08x %08x %04x\n", pholder, pholder->flink, pholder->htcb, pholder->counts); #else - info(" %08x: %08x %04x\n", pholder, pholder->htcb, pholder->counts); + _info(" %08x: %08x %04x\n", pholder, pholder->htcb, pholder->counts); #endif return 0; }