diff --git a/arch/arm/src/a1x/a1x_irq.c b/arch/arm/src/a1x/a1x_irq.c index 65e18ffd73..2508a23cf1 100644 --- a/arch/arm/src/a1x/a1x_irq.c +++ b/arch/arm/src/a1x/a1x_irq.c @@ -85,37 +85,37 @@ static void a1x_dumpintc(const char *msg, int irq) /* Dump some relevant ARMv7 register contents */ flags = enter_critical_section(); - lldbg("ARMv7 (%s, irq=%d):\n", msg, irq); - lldbg(" CPSR: %08x SCTLR: %08x\n", flags, cp15_rdsctlr()); + llerr("ARMv7 (%s, irq=%d):\n", msg, irq); + llerr(" CPSR: %08x SCTLR: %08x\n", flags, cp15_rdsctlr()); /* Dump all of the (readable) INTC register contents */ - lldbg("INTC (%s, irq=%d):\n", msg, irq); - lldbg(" VECTOR: %08x BASE: %08x PROTECT: %08x NMICTRL: %08x\n", + llerr("INTC (%s, irq=%d):\n", msg, irq); + llerr(" VECTOR: %08x BASE: %08x PROTECT: %08x NMICTRL: %08x\n", getreg32(A1X_INTC_VECTOR), getreg32(A1X_INTC_BASEADDR), getreg32(A1X_INTC_PROTECT), getreg32(A1X_INTC_NMICTRL)); - lldbg(" IRQ PEND: %08x %08x %08x\n", + llerr(" IRQ PEND: %08x %08x %08x\n", getreg32(A1X_INTC_IRQ_PEND0), getreg32(A1X_INTC_IRQ_PEND1), getreg32(A1X_INTC_IRQ_PEND2)); - lldbg(" FIQ PEND: %08x %08x %08x\n", + llerr(" FIQ PEND: %08x %08x %08x\n", getreg32(A1X_INTC_FIQ_PEND0), getreg32(A1X_INTC_FIQ_PEND1), getreg32(A1X_INTC_FIQ_PEND2)); - lldbg(" SEL: %08x %08x %08x\n", + llerr(" SEL: %08x %08x %08x\n", getreg32(A1X_INTC_IRQ_SEL0), getreg32(A1X_INTC_IRQ_SEL1), getreg32(A1X_INTC_IRQ_SEL2)); - lldbg(" EN: %08x %08x %08x\n", + llerr(" EN: %08x %08x %08x\n", getreg32(A1X_INTC_EN0), getreg32(A1X_INTC_EN1), getreg32(A1X_INTC_EN2)); - lldbg(" MASK: %08x %08x %08x\n", + llerr(" MASK: %08x %08x %08x\n", getreg32(A1X_INTC_MASK0), getreg32(A1X_INTC_MASK1), getreg32(A1X_INTC_MASK2)); - lldbg(" RESP: %08x %08x %08x\n", + llerr(" RESP: %08x %08x %08x\n", getreg32(A1X_INTC_RESP0), getreg32(A1X_INTC_RESP1), getreg32(A1X_INTC_RESP2)); - lldbg(" FF: %08x %08x %08x\n", + llerr(" FF: %08x %08x %08x\n", getreg32(A1X_INTC_FF0), getreg32(A1X_INTC_FF1), getreg32(A1X_INTC_FF2)); - lldbg(" PRIO: %08x %08x %08x %08x %08x\n", + llerr(" PRIO: %08x %08x %08x %08x %08x\n", getreg32(A1X_INTC_PRIO0), getreg32(A1X_INTC_PRIO1), getreg32(A1X_INTC_PRIO2), getreg32(A1X_INTC_PRIO3), getreg32(A1X_INTC_PRIO4)); diff --git a/arch/arm/src/a1x/a1x_serial.c b/arch/arm/src/a1x/a1x_serial.c index 00c484bab9..3ae955a99d 100644 --- a/arch/arm/src/a1x/a1x_serial.c +++ b/arch/arm/src/a1x/a1x_serial.c @@ -1192,7 +1192,7 @@ static int uart_interrupt(struct uart_dev_s *dev) default: { - lldbg("Unexpected IIR: %02x\n", status); + llerr("Unexpected IIR: %02x\n", status); break; } } diff --git a/arch/arm/src/arm/up_assert.c b/arch/arm/src/arm/up_assert.c index 5e2aa0810d..f5e34f941f 100644 --- a/arch/arm/src/arm/up_assert.c +++ b/arch/arm/src/arm/up_assert.c @@ -81,7 +81,7 @@ * code. We are going to print the task name if: * * CONFIG_TASK_NAME_SIZE > 0 && <-- The task has a name - * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (lldbg used) + * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (llerr used) * defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used */ @@ -127,7 +127,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; - lldbg("%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]); } @@ -154,12 +154,12 @@ static inline void up_registerdump(void) for (regs = REG_R0; regs <= REG_R15; regs += 8) { uint32_t *ptr = (uint32_t *)&CURRENT_REGS[regs]; - lldbg("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]); } - lldbg("CPSR: %08x\n", CURRENT_REGS[REG_CPSR]); + llerr("CPSR: %08x\n", CURRENT_REGS[REG_CPSR]); } } #else @@ -228,12 +228,12 @@ static void up_dumpstate(void) /* Show interrupt stack info */ - lldbg("sp: %08x\n", sp); - lldbg("IRQ stack:\n"); - lldbg(" base: %08x\n", istackbase); - lldbg(" size: %08x\n", istacksize); + llerr("sp: %08x\n", sp); + llerr("IRQ stack:\n"); + llerr(" base: %08x\n", istackbase); + llerr(" size: %08x\n", istacksize); #ifdef CONFIG_STACK_COLORATION - lldbg(" used: %08x\n", up_check_intstack()); + llerr(" used: %08x\n", up_check_intstack()); #endif /* Does the current stack pointer lie within the interrupt @@ -251,24 +251,24 @@ static void up_dumpstate(void) */ sp = g_intstackbase; - lldbg("sp: %08x\n", sp); + llerr("sp: %08x\n", sp); } /* Show user stack info */ - lldbg("User stack:\n"); - lldbg(" base: %08x\n", ustackbase); - lldbg(" size: %08x\n", ustacksize); + llerr("User stack:\n"); + llerr(" base: %08x\n", ustackbase); + llerr(" size: %08x\n", ustacksize); #ifdef CONFIG_STACK_COLORATION - lldbg(" used: %08x\n", up_check_tcbstack(rtcb)); + llerr(" used: %08x\n", up_check_tcbstack(rtcb)); #endif #else - lldbg("sp: %08x\n", sp); - lldbg("stack base: %08x\n", ustackbase); - lldbg("stack size: %08x\n", ustacksize); + llerr("sp: %08x\n", sp); + llerr("stack base: %08x\n", ustackbase); + llerr("stack size: %08x\n", ustacksize); #ifdef CONFIG_STACK_COLORATION - lldbg("stack used: %08x\n", up_check_tcbstack(rtcb)); + llerr("stack used: %08x\n", up_check_tcbstack(rtcb)); #endif #endif @@ -279,7 +279,7 @@ static void up_dumpstate(void) if (sp > ustackbase || sp <= ustackbase - ustacksize) { #if !defined(CONFIG_ARCH_INTERRUPTSTACK) || CONFIG_ARCH_INTERRUPTSTACK < 4 - lldbg("ERROR: Stack pointer is not within allocated stack\n"); + llerr("ERROR: Stack pointer is not within allocated stack\n"); #endif } else @@ -346,10 +346,10 @@ void up_assert(const uint8_t *filename, int lineno) board_autoled_on(LED_ASSERTION); #ifdef CONFIG_PRINT_TASKNAME - lldbg("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 - lldbg("Assertion failed at file:%s line: %d\n", + llerr("Assertion failed at file:%s line: %d\n", filename, lineno); #endif diff --git a/arch/arm/src/arm/up_dataabort.c b/arch/arm/src/arm/up_dataabort.c index 2306d80713..264eb5324d 100644 --- a/arch/arm/src/arm/up_dataabort.c +++ b/arch/arm/src/arm/up_dataabort.c @@ -131,7 +131,7 @@ void up_dataabort(uint32_t *regs, uint32_t far, uint32_t fsr) * fatal error. */ - pglldbg("FSR: %08x FAR: %08x\n", fsr, far); + pgllerr("FSR: %08x FAR: %08x\n", fsr, far); if ((fsr & FSR_MASK) != FSR_PAGE) { goto segfault; @@ -180,7 +180,7 @@ void up_dataabort(uint32_t *regs, uint32_t far, uint32_t fsr) segfault: #endif - lldbg("Data abort. PC: %08x FAR: %08x FSR: %08x\n", regs[REG_PC], far, fsr); + llerr("Data abort. PC: %08x FAR: %08x FSR: %08x\n", regs[REG_PC], far, fsr); PANIC(); } @@ -196,7 +196,7 @@ void up_dataabort(uint32_t *regs) /* Crash -- possibly showing diagnost debug information. */ - lldbg("Data abort. PC: %08x\n", regs[REG_PC]); + llerr("Data abort. PC: %08x\n", regs[REG_PC]); PANIC(); } diff --git a/arch/arm/src/arm/up_prefetchabort.c b/arch/arm/src/arm/up_prefetchabort.c index 995fedd1be..cbe91d130c 100644 --- a/arch/arm/src/arm/up_prefetchabort.c +++ b/arch/arm/src/arm/up_prefetchabort.c @@ -110,7 +110,7 @@ void up_prefetchabort(uint32_t *regs) * virtual addresses. */ - pglldbg("VADDR: %08x VBASE: %08x VEND: %08x\n", + pgllerr("VADDR: %08x VBASE: %08x VEND: %08x\n", regs[REG_PC], PG_PAGED_VBASE, PG_PAGED_VEND); if (regs[REG_R15] >= PG_PAGED_VBASE && regs[REG_R15] < PG_PAGED_VEND) @@ -148,7 +148,7 @@ void up_prefetchabort(uint32_t *regs) else #endif { - lldbg("Prefetch abort. PC: %08x\n", regs[REG_PC]); + llerr("Prefetch abort. PC: %08x\n", regs[REG_PC]); PANIC(); } } diff --git a/arch/arm/src/arm/up_releasepending.c b/arch/arm/src/arm/up_releasepending.c index 4defb895e0..99bf93f6f7 100644 --- a/arch/arm/src/arm/up_releasepending.c +++ b/arch/arm/src/arm/up_releasepending.c @@ -67,7 +67,7 @@ void up_release_pending(void) { struct tcb_s *rtcb = this_task(); - slldbg("From TCB=%p\n", rtcb); + sllerr("From TCB=%p\n", rtcb); /* Merge the g_pendingtasks list into the ready-to-run task list */ diff --git a/arch/arm/src/arm/up_reprioritizertr.c b/arch/arm/src/arm/up_reprioritizertr.c index 8f6b739d08..7d6015cccb 100644 --- a/arch/arm/src/arm/up_reprioritizertr.c +++ b/arch/arm/src/arm/up_reprioritizertr.c @@ -95,7 +95,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) struct tcb_s *rtcb = this_task(); bool switch_needed; - slldbg("TCB=%p PRI=%d\n", tcb, priority); + sllerr("TCB=%p PRI=%d\n", tcb, priority); /* Remove the tcb task from the ready-to-run list. * sched_removereadytorun will return true if we just diff --git a/arch/arm/src/arm/up_syscall.c b/arch/arm/src/arm/up_syscall.c index 498f702281..1493163120 100644 --- a/arch/arm/src/arm/up_syscall.c +++ b/arch/arm/src/arm/up_syscall.c @@ -93,7 +93,7 @@ void up_syscall(uint32_t *regs) { - lldbg("Syscall from 0x%x\n", regs[REG_PC]); + llerr("Syscall from 0x%x\n", regs[REG_PC]); CURRENT_REGS = regs; PANIC(); } diff --git a/arch/arm/src/arm/up_undefinedinsn.c b/arch/arm/src/arm/up_undefinedinsn.c index 4c242126bb..a51d972a2e 100644 --- a/arch/arm/src/arm/up_undefinedinsn.c +++ b/arch/arm/src/arm/up_undefinedinsn.c @@ -80,7 +80,7 @@ void up_undefinedinsn(uint32_t *regs) { - lldbg("Undefined instruction at 0x%x\n", regs[REG_PC]); + llerr("Undefined instruction at 0x%x\n", regs[REG_PC]); CURRENT_REGS = regs; PANIC(); } diff --git a/arch/arm/src/armv6-m/up_assert.c b/arch/arm/src/armv6-m/up_assert.c index 4c391ed848..c32628a302 100644 --- a/arch/arm/src/armv6-m/up_assert.c +++ b/arch/arm/src/armv6-m/up_assert.c @@ -80,7 +80,7 @@ * code. We are going to print the task name if: * * CONFIG_TASK_NAME_SIZE > 0 && <-- The task has a name - * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (lldbg used) + * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (llerr used) * defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used */ @@ -126,7 +126,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; - lldbg("%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]); } @@ -145,11 +145,11 @@ static void up_taskdump(FAR struct tcb_s *tcb, FAR void *arg) /* Dump interesting properties of this task */ #ifdef CONFIG_PRINT_TASKNAME - lldbg("%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 - lldbg("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 @@ -184,22 +184,22 @@ static inline void up_registerdump(void) { /* Yes.. dump the interrupt registers */ - lldbg("R0: %08x %08x %08x %08x %08x %08x %08x %08x\n", + llerr("R0: %08x %08x %08x %08x %08x %08x %08x %08x\n", CURRENT_REGS[REG_R0], CURRENT_REGS[REG_R1], CURRENT_REGS[REG_R2], CURRENT_REGS[REG_R3], CURRENT_REGS[REG_R4], CURRENT_REGS[REG_R5], CURRENT_REGS[REG_R6], CURRENT_REGS[REG_R7]); - lldbg("R8: %08x %08x %08x %08x %08x %08x %08x %08x\n", + llerr("R8: %08x %08x %08x %08x %08x %08x %08x %08x\n", CURRENT_REGS[REG_R8], CURRENT_REGS[REG_R9], CURRENT_REGS[REG_R10], CURRENT_REGS[REG_R11], CURRENT_REGS[REG_R12], CURRENT_REGS[REG_R13], CURRENT_REGS[REG_R14], CURRENT_REGS[REG_R15]); #ifdef CONFIG_BUILD_PROTECTED - lldbg("xPSR: %08x PRIMASK: %08x EXEC_RETURN: %08x\n", + llerr("xPSR: %08x PRIMASK: %08x EXEC_RETURN: %08x\n", CURRENT_REGS[REG_XPSR], CURRENT_REGS[REG_PRIMASK], CURRENT_REGS[REG_EXC_RETURN]); #else - lldbg("xPSR: %08x PRIMASK: %08x\n", + llerr("xPSR: %08x PRIMASK: %08x\n", CURRENT_REGS[REG_XPSR], CURRENT_REGS[REG_PRIMASK]); #endif } @@ -270,12 +270,12 @@ static void up_dumpstate(void) /* Show interrupt stack info */ - lldbg("sp: %08x\n", sp); - lldbg("IRQ stack:\n"); - lldbg(" base: %08x\n", istackbase); - lldbg(" size: %08x\n", istacksize); + llerr("sp: %08x\n", sp); + llerr("IRQ stack:\n"); + llerr(" base: %08x\n", istackbase); + llerr(" size: %08x\n", istacksize); #ifdef CONFIG_STACK_COLORATION - lldbg(" used: %08x\n", up_check_intstack()); + llerr(" used: %08x\n", up_check_intstack()); #endif /* Does the current stack pointer lie within the interrupt @@ -297,14 +297,14 @@ static void up_dumpstate(void) if (CURRENT_REGS) { sp = CURRENT_REGS[REG_R13]; - lldbg("sp: %08x\n", sp); + llerr("sp: %08x\n", sp); } - lldbg("User stack:\n"); - lldbg(" base: %08x\n", ustackbase); - lldbg(" size: %08x\n", ustacksize); + llerr("User stack:\n"); + llerr(" base: %08x\n", ustackbase); + llerr(" size: %08x\n", ustacksize); #ifdef CONFIG_STACK_COLORATION - lldbg(" used: %08x\n", up_check_tcbstack(rtcb)); + llerr(" used: %08x\n", up_check_tcbstack(rtcb)); #endif /* Dump the user stack if the stack pointer lies within the allocated user @@ -317,11 +317,11 @@ static void up_dumpstate(void) } #else - lldbg("sp: %08x\n", sp); - lldbg("stack base: %08x\n", ustackbase); - lldbg("stack size: %08x\n", ustacksize); + llerr("sp: %08x\n", sp); + llerr("stack base: %08x\n", ustackbase); + llerr("stack size: %08x\n", ustacksize); #ifdef CONFIG_STACK_COLORATION - lldbg("stack used: %08x\n", up_check_tcbstack(rtcb)); + llerr("stack used: %08x\n", up_check_tcbstack(rtcb)); #endif /* Dump the user stack if the stack pointer lies within the allocated user @@ -330,7 +330,7 @@ static void up_dumpstate(void) if (sp > ustackbase || sp <= ustackbase - ustacksize) { - lldbg("ERROR: Stack pointer is not within allocated stack\n"); + llerr("ERROR: Stack pointer is not within allocated stack\n"); } else { @@ -401,10 +401,10 @@ void up_assert(const uint8_t *filename, int lineno) board_autoled_on(LED_ASSERTION); #ifdef CONFIG_PRINT_TASKNAME - lldbg("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 - lldbg("Assertion failed at file:%s line: %d\n", + llerr("Assertion failed at file:%s line: %d\n", filename, lineno); #endif diff --git a/arch/arm/src/armv6-m/up_dumpnvic.c b/arch/arm/src/armv6-m/up_dumpnvic.c index 3e67f44372..a5746d5829 100644 --- a/arch/arm/src/armv6-m/up_dumpnvic.c +++ b/arch/arm/src/armv6-m/up_dumpnvic.c @@ -83,25 +83,25 @@ void up_dumpnvic(FAR const char *msg) flags = enter_critical_section(); - lldbg("NVIC: %s\n", msg); - lldbg(" ISER: %08x ICER: %08x ISPR: %08x ICPR: %08x\n", + llerr("NVIC: %s\n", msg); + llerr(" 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) { - lldbg(" IPR%d: %08x IPR%d: %08x IPR%d: %08x IPR%d: %08x\n", + llerr(" 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))); } - lldbg("SYSCON:\n"); - lldbg(" CPUID: %08x ICSR: %08x AIRCR: %08x SCR: %08x\n", + llerr("SYSCON:\n"); + llerr(" 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)); - lldbg(" CCR: %08x SHPR2: %08x SHPR3: %08x\n", + llerr(" 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 edd1bab6a2..6260d4ac2c 100644 --- a/arch/arm/src/armv6-m/up_hardfault.c +++ b/arch/arm/src/armv6-m/up_hardfault.c @@ -55,7 +55,7 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_HARDFAULT -# define hfdbg(format, ...) lldbg(format, ##__VA_ARGS__) +# define hfdbg(format, ...) llerr(format, ##__VA_ARGS__) #else # define hfdbg(x...) #endif @@ -149,7 +149,7 @@ int up_hardfault(int irq, FAR void *context) #endif (void)up_irq_save(); - lldbg("PANIC!!! Hard fault\n"); + llerr("PANIC!!! Hard fault\n"); PANIC(); return OK; /* Won't get here */ } diff --git a/arch/arm/src/armv6-m/up_releasepending.c b/arch/arm/src/armv6-m/up_releasepending.c index c3e2d02ea7..6ac07736b5 100644 --- a/arch/arm/src/armv6-m/up_releasepending.c +++ b/arch/arm/src/armv6-m/up_releasepending.c @@ -66,7 +66,7 @@ void up_release_pending(void) { struct tcb_s *rtcb = this_task(); - slldbg("From TCB=%p\n", rtcb); + sllerr("From TCB=%p\n", rtcb); /* Merge the g_pendingtasks list into the ready-to-run task list */ diff --git a/arch/arm/src/armv6-m/up_reprioritizertr.c b/arch/arm/src/armv6-m/up_reprioritizertr.c index bd50b88b70..ff30d6b590 100644 --- a/arch/arm/src/armv6-m/up_reprioritizertr.c +++ b/arch/arm/src/armv6-m/up_reprioritizertr.c @@ -94,7 +94,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) struct tcb_s *rtcb = this_task(); bool switch_needed; - slldbg("TCB=%p PRI=%d\n", tcb, priority); + sllerr("TCB=%p PRI=%d\n", tcb, priority); /* Remove the tcb task from the ready-to-run list. * sched_removereadytorun will return true if we just removed the head diff --git a/arch/arm/src/armv6-m/up_svcall.c b/arch/arm/src/armv6-m/up_svcall.c index 45610c5cc0..da66f30461 100644 --- a/arch/arm/src/armv6-m/up_svcall.c +++ b/arch/arm/src/armv6-m/up_svcall.c @@ -69,7 +69,7 @@ */ #if defined(CONFIG_DEBUG_SYSCALL) || defined(CONFIG_DEBUG_SVCALL) -# define svcdbg(format, ...) lldbg(format, ##__VA_ARGS__) +# define svcdbg(format, ...) llerr(format, ##__VA_ARGS__) #else # define svcdbg(x...) #endif @@ -471,7 +471,7 @@ int up_svcall(int irq, FAR void *context) regs[REG_R0] -= CONFIG_SYS_RESERVED; #else - slldbg("ERROR: Bad SYS call: %d\n", regs[REG_R0]); + sllerr("ERROR: Bad SYS call: %d\n", regs[REG_R0]); #endif } break; diff --git a/arch/arm/src/armv7-a/arm_assert.c b/arch/arm/src/armv7-a/arm_assert.c index 83191f510d..7132bf3ca5 100644 --- a/arch/arm/src/armv7-a/arm_assert.c +++ b/arch/arm/src/armv7-a/arm_assert.c @@ -79,7 +79,7 @@ * code. We are going to print the task name if: * * CONFIG_TASK_NAME_SIZE > 0 && <-- The task has a name - * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (lldbg used) + * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (llerr used) * defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used */ @@ -121,7 +121,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; - lldbg("%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]); } @@ -140,11 +140,11 @@ static void up_taskdump(FAR struct tcb_s *tcb, FAR void *arg) /* Dump interesting properties of this task */ #ifdef CONFIG_PRINT_TASKNAME - lldbg("%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 - lldbg("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 @@ -184,12 +184,12 @@ static inline void up_registerdump(void) for (regs = REG_R0; regs <= REG_R15; regs += 8) { uint32_t *ptr = (uint32_t *)&CURRENT_REGS[regs]; - lldbg("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]); } - lldbg("CPSR: %08x\n", CURRENT_REGS[REG_CPSR]); + llerr("CPSR: %08x\n", CURRENT_REGS[REG_CPSR]); } } #else @@ -253,7 +253,7 @@ static void up_dumpstate(void) ustacksize = (uint32_t)rtcb->adj_stack_size; } - lldbg("Current sp: %08x\n", sp); + llerr("Current sp: %08x\n", sp); #if CONFIG_ARCH_INTERRUPTSTACK > 3 /* Get the limits on the interrupt stack memory */ @@ -263,21 +263,21 @@ static void up_dumpstate(void) /* Show interrupt stack info */ - lldbg("Interrupt stack:\n"); - lldbg(" base: %08x\n", istackbase); - lldbg(" size: %08x\n", istacksize); + llerr("Interrupt stack:\n"); + llerr(" base: %08x\n", istackbase); + llerr(" size: %08x\n", istacksize); #ifdef CONFIG_STACK_COLORATION - lldbg(" used: %08x\n", up_check_intstack()); + llerr(" used: %08x\n", up_check_intstack()); #endif #endif /* Show user stack info */ - lldbg("User stack:\n"); - lldbg(" base: %08x\n", ustackbase); - lldbg(" size: %08x\n", ustacksize); + llerr("User stack:\n"); + llerr(" base: %08x\n", ustackbase); + llerr(" size: %08x\n", ustacksize); #ifdef CONFIG_STACK_COLORATION - lldbg(" used: %08x\n", up_check_tcbstack(rtcb)); + llerr(" used: %08x\n", up_check_tcbstack(rtcb)); #endif #ifdef CONFIG_ARCH_KERNEL_STACK @@ -287,9 +287,9 @@ static void up_dumpstate(void) { kstackbase = (uint32_t)rtcb->xcp.kstack + CONFIG_ARCH_KERNEL_STACKSIZE - 4; - lldbg("Kernel stack:\n"); - lldbg(" base: %08x\n", kstackbase); - lldbg(" 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 @@ -300,7 +300,7 @@ static void up_dumpstate(void) { /* Yes.. dump the interrupt stack */ - lldbg("Interrupt Stack\n", sp); + llerr("Interrupt Stack\n", sp); up_stackdump(sp, istackbase); /* Extract the user stack pointer which should lie @@ -308,7 +308,7 @@ static void up_dumpstate(void) */ sp = g_intstackbase; - lldbg("User sp: %08x\n", sp); + llerr("User sp: %08x\n", sp); } #endif @@ -318,7 +318,7 @@ static void up_dumpstate(void) if (sp > ustackbase - ustacksize && sp < ustackbase) { - lldbg("User Stack\n", sp); + llerr("User Stack\n", sp); up_stackdump(sp, ustackbase); } @@ -329,7 +329,7 @@ static void up_dumpstate(void) if (sp >= (uint32_t)rtcb->xcp.kstack && sp < kstackbase) { - lldbg("Kernel Stack\n", sp); + llerr("Kernel Stack\n", sp); up_stackdump(sp, kstackbase); } #endif @@ -337,7 +337,7 @@ static void up_dumpstate(void) #ifdef CONFIG_SMP /* Show the CPU number */ - lldbg("CPU%d:\n", up_cpu_index()); + llerr("CPU%d:\n", up_cpu_index()); #endif /* Then dump the CPU registers (if available) */ @@ -402,10 +402,10 @@ void up_assert(const uint8_t *filename, int lineno) board_autoled_on(LED_ASSERTION); #ifdef CONFIG_PRINT_TASKNAME - lldbg("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 - lldbg("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-a/arm_cpustart.c b/arch/arm/src/armv7-a/arm_cpustart.c index cec904e2df..30653ed197 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; - lldbg("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]; - lldbg("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]); } - lldbg("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_dataabort.c b/arch/arm/src/armv7-a/arm_dataabort.c index 927ace3360..033d0473c6 100644 --- a/arch/arm/src/armv7-a/arm_dataabort.c +++ b/arch/arm/src/armv7-a/arm_dataabort.c @@ -115,7 +115,7 @@ uint32_t *arm_dataabort(uint32_t *regs, uint32_t dfar, uint32_t dfsr) * fatal error. */ - pglldbg("DFSR: %08x DFAR: %08x\n", dfsr, dfar); + pgllerr("DFSR: %08x DFAR: %08x\n", dfsr, dfar); if ((dfsr & FSR_MASK) != FSR_PAGE) { goto segfault; @@ -163,7 +163,7 @@ uint32_t *arm_dataabort(uint32_t *regs, uint32_t dfar, uint32_t dfsr) return regs; segfault: - lldbg("Data abort. PC: %08x DFAR: %08x DFSR: %08x\n", + llerr("Data abort. PC: %08x DFAR: %08x DFSR: %08x\n", regs[REG_PC], dfar, dfsr); PANIC(); return regs; /* To keep the compiler happy */ @@ -181,7 +181,7 @@ uint32_t *arm_dataabort(uint32_t *regs, uint32_t dfar, uint32_t dfsr) /* Crash -- possibly showing diagnostic debug information. */ - lldbg("Data abort. PC: %08x DFAR: %08x DFSR: %08x\n", + llerr("Data abort. PC: %08x DFAR: %08x DFSR: %08x\n", regs[REG_PC], dfar, dfsr); PANIC(); return regs; /* To keep the compiler happy */ diff --git a/arch/arm/src/armv7-a/arm_l2cc_pl310.c b/arch/arm/src/armv7-a/arm_l2cc_pl310.c index 64aeaf3b8b..1b88cca350 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); } - lldbg("(%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-a/arm_prefetchabort.c b/arch/arm/src/armv7-a/arm_prefetchabort.c index 18f37557fb..f65286f2aa 100644 --- a/arch/arm/src/armv7-a/arm_prefetchabort.c +++ b/arch/arm/src/armv7-a/arm_prefetchabort.c @@ -97,7 +97,7 @@ uint32_t *arm_prefetchabort(uint32_t *regs, uint32_t ifar, uint32_t ifsr) * virtual addresses. */ - pglldbg("VADDR: %08x VBASE: %08x VEND: %08x\n", + pgllerr("VADDR: %08x VBASE: %08x VEND: %08x\n", regs[REG_PC], PG_PAGED_VBASE, PG_PAGED_VEND); if (regs[REG_R15] >= PG_PAGED_VBASE && regs[REG_R15] < PG_PAGED_VEND) @@ -134,7 +134,7 @@ uint32_t *arm_prefetchabort(uint32_t *regs, uint32_t ifar, uint32_t ifsr) } else { - lldbg("Prefetch abort. PC: %08x IFAR: %08x IFSR: %08x\n", + llerr("Prefetch abort. PC: %08x IFAR: %08x IFSR: %08x\n", regs[REG_PC], ifar, ifsr); PANIC(); } @@ -154,7 +154,7 @@ uint32_t *arm_prefetchabort(uint32_t *regs, uint32_t ifar, uint32_t ifsr) /* Crash -- possibly showing diagnostic debug information. */ - lldbg("Prefetch abort. PC: %08x IFAR: %08x IFSR: %08x\n", + llerr("Prefetch abort. PC: %08x IFAR: %08x IFSR: %08x\n", regs[REG_PC], ifar, ifsr); PANIC(); return regs; /* To keep the compiler happy */ diff --git a/arch/arm/src/armv7-a/arm_releasepending.c b/arch/arm/src/armv7-a/arm_releasepending.c index 9696e931c0..b2e36821b1 100644 --- a/arch/arm/src/armv7-a/arm_releasepending.c +++ b/arch/arm/src/armv7-a/arm_releasepending.c @@ -67,7 +67,7 @@ void up_release_pending(void) { struct tcb_s *rtcb = this_task(); - slldbg("From TCB=%p\n", rtcb); + sllerr("From TCB=%p\n", rtcb); /* Merge the g_pendingtasks list into the ready-to-run task list */ diff --git a/arch/arm/src/armv7-a/arm_reprioritizertr.c b/arch/arm/src/armv7-a/arm_reprioritizertr.c index d4b2699f6d..468e382779 100644 --- a/arch/arm/src/armv7-a/arm_reprioritizertr.c +++ b/arch/arm/src/armv7-a/arm_reprioritizertr.c @@ -95,7 +95,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) struct tcb_s *rtcb = this_task(); bool switch_needed; - slldbg("TCB=%p PRI=%d\n", tcb, priority); + sllerr("TCB=%p PRI=%d\n", tcb, priority); /* Remove the tcb task from the ready-to-run list. * sched_removereadytorun will return true if we just diff --git a/arch/arm/src/armv7-a/arm_syscall.c b/arch/arm/src/armv7-a/arm_syscall.c index fbaf5f5e18..d6845595f6 100644 --- a/arch/arm/src/armv7-a/arm_syscall.c +++ b/arch/arm/src/armv7-a/arm_syscall.c @@ -71,7 +71,7 @@ /* Debug ********************************************************************/ #if defined(CONFIG_DEBUG_SYSCALL) -# define svcdbg(format, ...) lldbg(format, ##__VA_ARGS__) +# define svcdbg(format, ...) llerr(format, ##__VA_ARGS__) #else # define svcdbg(x...) #endif @@ -526,7 +526,7 @@ uint32_t *arm_syscall(uint32_t *regs) uint32_t *arm_syscall(uint32_t *regs) { - lldbg("SYSCALL from 0x%x\n", regs[REG_PC]); + llerr("SYSCALL from 0x%x\n", regs[REG_PC]); CURRENT_REGS = regs; PANIC(); } diff --git a/arch/arm/src/armv7-a/arm_undefinedinsn.c b/arch/arm/src/armv7-a/arm_undefinedinsn.c index 5b93bbd6cd..34081e11a0 100644 --- a/arch/arm/src/armv7-a/arm_undefinedinsn.c +++ b/arch/arm/src/armv7-a/arm_undefinedinsn.c @@ -68,7 +68,7 @@ uint32_t *arm_undefinedinsn(uint32_t *regs) { - lldbg("Undefined instruction at 0x%x\n", regs[REG_PC]); + llerr("Undefined instruction at 0x%x\n", regs[REG_PC]); CURRENT_REGS = regs; PANIC(); return regs; /* To keep the compiler happy */ diff --git a/arch/arm/src/armv7-a/gic.h b/arch/arm/src/armv7-a/gic.h index 9bddaa06ae..0e0220e75b 100644 --- a/arch/arm/src/armv7-a/gic.h +++ b/arch/arm/src/armv7-a/gic.h @@ -595,12 +595,12 @@ #ifdef CONFIG_DEBUG_IRQ # define gicdbg(format, ...) dbg(format, ##__VA_ARGS__) -# define giclldbg(format, ...) lldbg(format, ##__VA_ARGS__) +# define gicllerr(format, ...) llerr(format, ##__VA_ARGS__) # define gicinfo(format, ...) info(format, ##__VA_ARGS__) # define gicllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define gicdbg(x...) -# define giclldbg(x...) +# define gicllerr(x...) # define gicinfo(x...) # define gicllinfo(x...) #endif diff --git a/arch/arm/src/armv7-m/up_assert.c b/arch/arm/src/armv7-m/up_assert.c index e7546d3d23..e94b64afb7 100644 --- a/arch/arm/src/armv7-m/up_assert.c +++ b/arch/arm/src/armv7-m/up_assert.c @@ -79,7 +79,7 @@ * code. We are going to print the task name if: * * CONFIG_TASK_NAME_SIZE > 0 && <-- The task has a name - * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (lldbg used) + * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (llerr used) * defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used */ @@ -125,7 +125,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; - lldbg("%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]); } @@ -144,11 +144,11 @@ static void up_taskdump(FAR struct tcb_s *tcb, FAR void *arg) /* Dump interesting properties of this task */ #ifdef CONFIG_PRINT_TASKNAME - lldbg("%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 - lldbg("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 @@ -183,29 +183,29 @@ static inline void up_registerdump(void) { /* Yes.. dump the interrupt registers */ - lldbg("R0: %08x %08x %08x %08x %08x %08x %08x %08x\n", + llerr("R0: %08x %08x %08x %08x %08x %08x %08x %08x\n", CURRENT_REGS[REG_R0], CURRENT_REGS[REG_R1], CURRENT_REGS[REG_R2], CURRENT_REGS[REG_R3], CURRENT_REGS[REG_R4], CURRENT_REGS[REG_R5], CURRENT_REGS[REG_R6], CURRENT_REGS[REG_R7]); - lldbg("R8: %08x %08x %08x %08x %08x %08x %08x %08x\n", + llerr("R8: %08x %08x %08x %08x %08x %08x %08x %08x\n", CURRENT_REGS[REG_R8], CURRENT_REGS[REG_R9], CURRENT_REGS[REG_R10], CURRENT_REGS[REG_R11], CURRENT_REGS[REG_R12], CURRENT_REGS[REG_R13], CURRENT_REGS[REG_R14], CURRENT_REGS[REG_R15]); #ifdef CONFIG_ARMV7M_USEBASEPRI - lldbg("xPSR: %08x BASEPRI: %08x CONTROL: %08x\n", + llerr("xPSR: %08x BASEPRI: %08x CONTROL: %08x\n", CURRENT_REGS[REG_XPSR], CURRENT_REGS[REG_BASEPRI], getcontrol()); #else - lldbg("xPSR: %08x PRIMASK: %08x CONTROL: %08x\n", + llerr("xPSR: %08x PRIMASK: %08x CONTROL: %08x\n", CURRENT_REGS[REG_XPSR], CURRENT_REGS[REG_PRIMASK], getcontrol()); #endif #ifdef REG_EXC_RETURN - lldbg("EXC_RETURN: %08x\n", CURRENT_REGS[REG_EXC_RETURN]); + llerr("EXC_RETURN: %08x\n", CURRENT_REGS[REG_EXC_RETURN]); #endif } } @@ -275,12 +275,12 @@ static void up_dumpstate(void) /* Show interrupt stack info */ - lldbg("sp: %08x\n", sp); - lldbg("IRQ stack:\n"); - lldbg(" base: %08x\n", istackbase); - lldbg(" size: %08x\n", istacksize); + llerr("sp: %08x\n", sp); + llerr("IRQ stack:\n"); + llerr(" base: %08x\n", istackbase); + llerr(" size: %08x\n", istacksize); #ifdef CONFIG_STACK_COLORATION - lldbg(" used: %08x\n", up_check_intstack()); + llerr(" used: %08x\n", up_check_intstack()); #endif /* Does the current stack pointer lie within the interrupt @@ -302,14 +302,14 @@ static void up_dumpstate(void) if (CURRENT_REGS) { sp = CURRENT_REGS[REG_R13]; - lldbg("sp: %08x\n", sp); + llerr("sp: %08x\n", sp); } - lldbg("User stack:\n"); - lldbg(" base: %08x\n", ustackbase); - lldbg(" size: %08x\n", ustacksize); + llerr("User stack:\n"); + llerr(" base: %08x\n", ustackbase); + llerr(" size: %08x\n", ustacksize); #ifdef CONFIG_STACK_COLORATION - lldbg(" used: %08x\n", up_check_tcbstack(rtcb)); + llerr(" used: %08x\n", up_check_tcbstack(rtcb)); #endif /* Dump the user stack if the stack pointer lies within the allocated user @@ -325,11 +325,11 @@ static void up_dumpstate(void) /* Show user stack info */ - lldbg("sp: %08x\n", sp); - lldbg("stack base: %08x\n", ustackbase); - lldbg("stack size: %08x\n", ustacksize); + llerr("sp: %08x\n", sp); + llerr("stack base: %08x\n", ustackbase); + llerr("stack size: %08x\n", ustacksize); #ifdef CONFIG_STACK_COLORATION - lldbg("stack used: %08x\n", up_check_tcbstack(rtcb)); + llerr("stack used: %08x\n", up_check_tcbstack(rtcb)); #endif /* Dump the user stack if the stack pointer lies within the allocated user @@ -338,7 +338,7 @@ static void up_dumpstate(void) if (sp > ustackbase || sp <= ustackbase - ustacksize) { - lldbg("ERROR: Stack pointer is not within the allocated stack\n"); + llerr("ERROR: Stack pointer is not within the allocated stack\n"); } else { @@ -410,10 +410,10 @@ void up_assert(const uint8_t *filename, int lineno) board_autoled_on(LED_ASSERTION); #ifdef CONFIG_PRINT_TASKNAME - lldbg("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 - lldbg("Assertion failed at file:%s line: %d\n", + llerr("Assertion failed at file:%s line: %d\n", filename, lineno); #endif diff --git a/arch/arm/src/armv7-m/up_hardfault.c b/arch/arm/src/armv7-m/up_hardfault.c index 807d45cc43..e65f08534f 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 hfdbg(format, ...) lldbg(format, ##__VA_ARGS__) +# define hfdbg(format, ...) llerr(format, ##__VA_ARGS__) #else # define hfdbg(x...) #endif @@ -179,7 +179,7 @@ int up_hardfault(int irq, FAR void *context) #endif (void)up_irq_save(); - lldbg("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 145dba531d..40881f722c 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 mfdbg(format, ...) lldbg(format, ##__VA_ARGS__) +# define mfdbg(format, ...) llerr(format, ##__VA_ARGS__) #else # define mfdbg(x...) #endif @@ -92,9 +92,9 @@ int up_memfault(int irq, FAR void *context) /* Dump some memory management fault info */ (void)up_irq_save(); - lldbg("PANIC!!! Memory Management Fault:\n"); + llerr("PANIC!!! Memory Management Fault:\n"); mfdbg(" IRQ: %d context: %p\n", irq, regs); - lldbg(" CFAULTS: %08x MMFAR: %08x\n", + llerr(" CFAULTS: %08x MMFAR: %08x\n", getreg32(NVIC_CFAULTS), getreg32(NVIC_MEMMANAGE_ADDR)); mfdbg(" BASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n", getbasepri(), getprimask(), getipsr(), getcontrol()); diff --git a/arch/arm/src/armv7-m/up_ramvec_attach.c b/arch/arm/src/armv7-m/up_ramvec_attach.c index 03314616b6..60ba6e8590 100644 --- a/arch/arm/src/armv7-m/up_ramvec_attach.c +++ b/arch/arm/src/armv7-m/up_ramvec_attach.c @@ -54,12 +54,12 @@ ****************************************************************************/ /* Debug ********************************************************************/ /* Non-standard debug that may be enabled just for testing the interrupt - * config. NOTE: that only lldbg types are used so that the output is + * config. NOTE: that only llerr types are used so that the output is * immediately available. */ #ifdef CONFIG_DEBUG_IRQ -# define intdbg lldbg +# define intdbg llerr # define intinfo llinfo #else # define intdbg(x...) diff --git a/arch/arm/src/armv7-m/up_ramvec_initialize.c b/arch/arm/src/armv7-m/up_ramvec_initialize.c index 7cc11cfb02..9ff31cc902 100644 --- a/arch/arm/src/armv7-m/up_ramvec_initialize.c +++ b/arch/arm/src/armv7-m/up_ramvec_initialize.c @@ -73,12 +73,12 @@ /* Debug ********************************************************************/ /* Non-standard debug that may be enabled just for testing the interrupt - * config. NOTE: that only lldbg types are used so that the output is + * config. NOTE: that only llerr types are used so that the output is * immediately available. */ #ifdef CONFIG_DEBUG_IRQ -# define intdbg lldbg +# define intdbg llerr # define intinfo llinfo #else # define intdbg(x...) diff --git a/arch/arm/src/armv7-m/up_releasepending.c b/arch/arm/src/armv7-m/up_releasepending.c index e9f4cceb33..489e3537e1 100644 --- a/arch/arm/src/armv7-m/up_releasepending.c +++ b/arch/arm/src/armv7-m/up_releasepending.c @@ -66,7 +66,7 @@ void up_release_pending(void) { struct tcb_s *rtcb = this_task(); - slldbg("From TCB=%p\n", rtcb); + sllerr("From TCB=%p\n", rtcb); /* Merge the g_pendingtasks list into the ready-to-run task list */ diff --git a/arch/arm/src/armv7-m/up_reprioritizertr.c b/arch/arm/src/armv7-m/up_reprioritizertr.c index d3415e7741..61b592be05 100644 --- a/arch/arm/src/armv7-m/up_reprioritizertr.c +++ b/arch/arm/src/armv7-m/up_reprioritizertr.c @@ -94,7 +94,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) struct tcb_s *rtcb = this_task(); bool switch_needed; - slldbg("TCB=%p PRI=%d\n", tcb, priority); + sllerr("TCB=%p PRI=%d\n", tcb, priority); /* Remove the tcb task from the ready-to-run list. * sched_removereadytorun will return true if we just removed the head diff --git a/arch/arm/src/armv7-m/up_svcall.c b/arch/arm/src/armv7-m/up_svcall.c index eb9f41b74f..d6f5cacdb8 100644 --- a/arch/arm/src/armv7-m/up_svcall.c +++ b/arch/arm/src/armv7-m/up_svcall.c @@ -70,7 +70,7 @@ */ #if defined(CONFIG_DEBUG_SYSCALL) || defined(CONFIG_DEBUG_SVCALL) -# define svcdbg(format, ...) lldbg(format, ##__VA_ARGS__) +# define svcdbg(format, ...) llerr(format, ##__VA_ARGS__) #else # define svcdbg(x...) #endif @@ -473,7 +473,7 @@ int up_svcall(int irq, FAR void *context) regs[REG_R0] -= CONFIG_SYS_RESERVED; #else - slldbg("ERROR: Bad SYS call: %d\n", regs[REG_R0]); + sllerr("ERROR: Bad SYS call: %d\n", regs[REG_R0]); #endif } break; diff --git a/arch/arm/src/armv7-r/arm_assert.c b/arch/arm/src/armv7-r/arm_assert.c index 8ec701d9ad..40dec555cd 100644 --- a/arch/arm/src/armv7-r/arm_assert.c +++ b/arch/arm/src/armv7-r/arm_assert.c @@ -79,7 +79,7 @@ * code. We are going to print the task name if: * * CONFIG_TASK_NAME_SIZE > 0 && <-- The task has a name - * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (lldbg used) + * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (llerr used) * defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used */ @@ -121,7 +121,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; - lldbg("%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]); } @@ -140,11 +140,11 @@ static void up_taskdump(FAR struct tcb_s *tcb, FAR void *arg) /* Dump interesting properties of this task */ #ifdef CONFIG_PRINT_TASKNAME - lldbg("%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 - lldbg("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 @@ -184,12 +184,12 @@ static inline void up_registerdump(void) for (regs = REG_R0; regs <= REG_R15; regs += 8) { uint32_t *ptr = (uint32_t *)&CURRENT_REGS[regs]; - lldbg("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]); } - lldbg("CPSR: %08x\n", CURRENT_REGS[REG_CPSR]); + llerr("CPSR: %08x\n", CURRENT_REGS[REG_CPSR]); } } #else @@ -253,7 +253,7 @@ static void up_dumpstate(void) ustacksize = (uint32_t)rtcb->adj_stack_size; } - lldbg("Current sp: %08x\n", sp); + llerr("Current sp: %08x\n", sp); #if CONFIG_ARCH_INTERRUPTSTACK > 3 /* Get the limits on the interrupt stack memory */ @@ -263,21 +263,21 @@ static void up_dumpstate(void) /* Show interrupt stack info */ - lldbg("Interrupt stack:\n"); - lldbg(" base: %08x\n", istackbase); - lldbg(" size: %08x\n", istacksize); + llerr("Interrupt stack:\n"); + llerr(" base: %08x\n", istackbase); + llerr(" size: %08x\n", istacksize); #ifdef CONFIG_STACK_COLORATION - lldbg(" used: %08x\n", up_check_intstack()); + llerr(" used: %08x\n", up_check_intstack()); #endif #endif /* Show user stack info */ - lldbg("User stack:\n"); - lldbg(" base: %08x\n", ustackbase); - lldbg(" size: %08x\n", ustacksize); + llerr("User stack:\n"); + llerr(" base: %08x\n", ustackbase); + llerr(" size: %08x\n", ustacksize); #ifdef CONFIG_STACK_COLORATION - lldbg(" used: %08x\n", up_check_tcbstack(rtcb)); + llerr(" used: %08x\n", up_check_tcbstack(rtcb)); #endif #ifdef CONFIG_ARCH_KERNEL_STACK @@ -287,9 +287,9 @@ static void up_dumpstate(void) { kstackbase = (uint32_t)rtcb->xcp.kstack + CONFIG_ARCH_KERNEL_STACKSIZE - 4; - lldbg("Kernel stack:\n"); - lldbg(" base: %08x\n", kstackbase); - lldbg(" 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 @@ -300,7 +300,7 @@ static void up_dumpstate(void) { /* Yes.. dump the interrupt stack */ - lldbg("Interrupt Stack\n", sp); + llerr("Interrupt Stack\n", sp); up_stackdump(sp, istackbase); /* Extract the user stack pointer which should lie @@ -308,7 +308,7 @@ static void up_dumpstate(void) */ sp = g_intstackbase; - lldbg("User sp: %08x\n", sp); + llerr("User sp: %08x\n", sp); } #endif @@ -318,7 +318,7 @@ static void up_dumpstate(void) if (sp > ustackbase - ustacksize && sp < ustackbase) { - lldbg("User Stack\n", sp); + llerr("User Stack\n", sp); up_stackdump(sp, ustackbase); } @@ -329,7 +329,7 @@ static void up_dumpstate(void) if (sp >= (uint32_t)rtcb->xcp.kstack && sp < kstackbase) { - lldbg("Kernel Stack\n", sp); + llerr("Kernel Stack\n", sp); up_stackdump(sp, kstackbase); } #endif @@ -396,10 +396,10 @@ void up_assert(const uint8_t *filename, int lineno) board_autoled_on(LED_ASSERTION); #ifdef CONFIG_PRINT_TASKNAME - lldbg("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 - lldbg("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_dataabort.c b/arch/arm/src/armv7-r/arm_dataabort.c index cf2d73d438..802a67984a 100644 --- a/arch/arm/src/armv7-r/arm_dataabort.c +++ b/arch/arm/src/armv7-r/arm_dataabort.c @@ -86,7 +86,7 @@ uint32_t *arm_dataabort(uint32_t *regs, uint32_t dfar, uint32_t dfsr) /* Crash -- possibly showing diagnostic debug information. */ - lldbg("Data abort. PC: %08x DFAR: %08x DFSR: %08x\n", + llerr("Data abort. PC: %08x DFAR: %08x DFSR: %08x\n", regs[REG_PC], dfar, dfsr); PANIC(); return regs; /* To keep the compiler happy */ diff --git a/arch/arm/src/armv7-r/arm_l2cc_pl310.c b/arch/arm/src/armv7-r/arm_l2cc_pl310.c index e019e70e95..e389c87e59 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); } - lldbg("(%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/arm_prefetchabort.c b/arch/arm/src/armv7-r/arm_prefetchabort.c index ab7228eac2..26c1c052fe 100644 --- a/arch/arm/src/armv7-r/arm_prefetchabort.c +++ b/arch/arm/src/armv7-r/arm_prefetchabort.c @@ -82,7 +82,7 @@ uint32_t *arm_prefetchabort(uint32_t *regs, uint32_t ifar, uint32_t ifsr) /* Crash -- possibly showing diagnostic debug information. */ - lldbg("Prefetch abort. PC: %08x IFAR: %08x IFSR: %08x\n", + llerr("Prefetch abort. PC: %08x IFAR: %08x IFSR: %08x\n", regs[REG_PC], ifar, ifsr); PANIC(); return regs; /* To keep the compiler happy */ diff --git a/arch/arm/src/armv7-r/arm_releasepending.c b/arch/arm/src/armv7-r/arm_releasepending.c index 8982708590..d65bc75be2 100644 --- a/arch/arm/src/armv7-r/arm_releasepending.c +++ b/arch/arm/src/armv7-r/arm_releasepending.c @@ -67,7 +67,7 @@ void up_release_pending(void) { struct tcb_s *rtcb = this_task(); - slldbg("From TCB=%p\n", rtcb); + sllerr("From TCB=%p\n", rtcb); /* Merge the g_pendingtasks list into the ready-to-run task list */ diff --git a/arch/arm/src/armv7-r/arm_reprioritizertr.c b/arch/arm/src/armv7-r/arm_reprioritizertr.c index 4fed13e8f2..192bff007d 100644 --- a/arch/arm/src/armv7-r/arm_reprioritizertr.c +++ b/arch/arm/src/armv7-r/arm_reprioritizertr.c @@ -95,7 +95,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) struct tcb_s *rtcb = this_task(); bool switch_needed; - slldbg("TCB=%p PRI=%d\n", tcb, priority); + sllerr("TCB=%p PRI=%d\n", tcb, priority); /* Remove the tcb task from the ready-to-run list. * sched_removereadytorun will return true if we just diff --git a/arch/arm/src/armv7-r/arm_syscall.c b/arch/arm/src/armv7-r/arm_syscall.c index c68ba0f798..ce4a60bb8b 100644 --- a/arch/arm/src/armv7-r/arm_syscall.c +++ b/arch/arm/src/armv7-r/arm_syscall.c @@ -69,7 +69,7 @@ /* Debug ********************************************************************/ #if defined(CONFIG_DEBUG_SYSCALL) -# define svcdbg(format, ...) lldbg(format, ##__VA_ARGS__) +# define svcdbg(format, ...) llerr(format, ##__VA_ARGS__) #else # define svcdbg(x...) #endif @@ -524,7 +524,7 @@ uint32_t *arm_syscall(uint32_t *regs) uint32_t *arm_syscall(uint32_t *regs) { - lldbg("SYSCALL from 0x%x\n", regs[REG_PC]); + llerr("SYSCALL from 0x%x\n", regs[REG_PC]); CURRENT_REGS = regs; PANIC(); } diff --git a/arch/arm/src/armv7-r/arm_undefinedinsn.c b/arch/arm/src/armv7-r/arm_undefinedinsn.c index 5ecee39ce8..0c61b5f19c 100644 --- a/arch/arm/src/armv7-r/arm_undefinedinsn.c +++ b/arch/arm/src/armv7-r/arm_undefinedinsn.c @@ -80,7 +80,7 @@ uint32_t *arm_undefinedinsn(uint32_t *regs) { - lldbg("Undefined instruction at 0x%x\n", regs[REG_PC]); + llerr("Undefined instruction at 0x%x\n", regs[REG_PC]); CURRENT_REGS = regs; PANIC(); return regs; /* To keep the compiler happy */ diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c index 0fc1cf1176..f59b028f21 100644 --- a/arch/arm/src/c5471/c5471_ethernet.c +++ b/arch/arm/src/c5471/c5471_ethernet.c @@ -2241,7 +2241,7 @@ void up_netinitialize(void) { /* We could not attach the ISR to the ISR */ - nlldbg("irq_attach() failed\n"); + nllerr("irq_attach() failed\n"); return; } diff --git a/arch/arm/src/common/up_exit.c b/arch/arm/src/common/up_exit.c index 1a41f52ad4..b58ba08a44 100644 --- a/arch/arm/src/common/up_exit.c +++ b/arch/arm/src/common/up_exit.c @@ -138,10 +138,10 @@ void _exit(int status) (void)up_irq_save(); - slldbg("TCB=%p exiting\n", this_task()); + sllerr("TCB=%p exiting\n", this_task()); #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES) - slldbg("Other tasks:\n"); + sllerr("Other tasks:\n"); sched_foreach(_up_dumponexit, NULL); #endif diff --git a/arch/arm/src/common/up_initialize.c b/arch/arm/src/common/up_initialize.c index da8db2d0b0..6482a5fce2 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; - lldbg("Beginning 100s delay\n"); + llerr("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } - lldbg("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 ed3812c698..7f3229b7fc 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) { - lldbg("...\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 */ - lldbg("[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 */ - lldbg("%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) { - lldbg("...\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 */ - lldbg("[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 */ - lldbg("%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) { - lldbg("...\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 */ - lldbg("[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 */ - lldbg("%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 */ - lldbg("%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 */ - lldbg("%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 */ - lldbg("%08x<-%08x\n", addr, val); + llerr("%08x<-%08x\n", addr, val); /* Write the value */ @@ -2417,7 +2417,7 @@ void up_usbinitialize(void) #ifdef CONFIG_DEBUG_USB chiprev = dm320_getreg16(DM320_BUSC_REVR); - ulldbg("DM320 revision : %d.%d\n", chiprev >> 4, chiprev & 0x0f); + ullerr("DM320 revision : %d.%d\n", chiprev >> 4, chiprev & 0x0f); #endif /* Enable USB clock & GIO clock */ diff --git a/arch/arm/src/efm32/efm32_adc.c b/arch/arm/src/efm32/efm32_adc.c index 29e01d9d0d..0053a874bd 100644 --- a/arch/arm/src/efm32/efm32_adc.c +++ b/arch/arm/src/efm32/efm32_adc.c @@ -1191,7 +1191,7 @@ static int adc_interrupt(FAR struct adc_dev_s *dev) adcsr = adc_getreg(priv, EFM32_ADC_SR_OFFSET); if ((adcsr & ADC_SR_AWD) != 0) { - alldbg("WARNING: Analog Watchdog, Value converted out of range!\n"); + allerr("WARNING: Analog Watchdog, Value converted out of range!\n"); } /* EOC: End of conversion */ diff --git a/arch/arm/src/efm32/efm32_irq.c b/arch/arm/src/efm32/efm32_irq.c index 078ec8e8a4..4ad702d4ab 100644 --- a/arch/arm/src/efm32/efm32_irq.c +++ b/arch/arm/src/efm32/efm32_irq.c @@ -115,34 +115,34 @@ static void efm32_dumpnvic(const char *msg, int irq) irqstate_t flags; flags = enter_critical_section(); - lldbg("NVIC (%s, irq=%d):\n", msg, irq); - lldbg(" INTCTRL: %08x VECTAB: %08x\n", + llerr("NVIC (%s, irq=%d):\n", msg, irq); + llerr(" INTCTRL: %08x VECTAB: %08x\n", getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB)); - lldbg(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n", + llerr(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n", getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA), getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE)); - lldbg(" IRQ ENABLE: %08x %08x %08x\n", + llerr(" IRQ ENABLE: %08x %08x %08x\n", getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE), getreg32(NVIC_IRQ64_95_ENABLE)); - lldbg(" SYSH_PRIO: %08x %08x %08x\n", + llerr(" SYSH_PRIO: %08x %08x %08x\n", getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY), getreg32(NVIC_SYSH12_15_PRIORITY)); - lldbg(" IRQ PRIO: %08x %08x %08x %08x\n", + llerr(" IRQ PRIO: %08x %08x %08x %08x\n", getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY), getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY)); - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY), getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY)); #if NR_VECTORS >= (EFM32_IRQ_INTERRUPTS + 32) - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY), getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY)); #if NR_VECTORS >= (EFM32_IRQ_INTERRUPTS + 48) - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ48_51_PRIORITY), getreg32(NVIC_IRQ52_55_PRIORITY), getreg32(NVIC_IRQ56_59_PRIORITY), getreg32(NVIC_IRQ60_63_PRIORITY)); #if NR_VECTORS >= (EFM32_IRQ_INTERRUPTS + 64) - lldbg(" %08x\n", + llerr(" %08x\n", getreg32(NVIC_IRQ64_67_PRIORITY)); #endif #endif diff --git a/arch/arm/src/efm32/efm32_leserial.c b/arch/arm/src/efm32/efm32_leserial.c index 4e0fc0f37d..63fbd5f8cd 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 */ - lldbg("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 */ - lldbg("RX ERROR: %08x\n", intflags); + llerr("RX ERROR: %08x\n", intflags); } #endif diff --git a/arch/arm/src/efm32/efm32_pwm.c b/arch/arm/src/efm32/efm32_pwm.c index 3f848de28a..3794c177c8 100644 --- a/arch/arm/src/efm32/efm32_pwm.c +++ b/arch/arm/src/efm32/efm32_pwm.c @@ -83,7 +83,7 @@ #ifdef CONFIG_DEBUG_PWM # define pwmdbg dbg -# define pwmlldbg lldbg +# define pwmllerr llerr # ifdef CONFIG_DEBUG_INFO # define pwminfo info # define pwmllinfo llinfo @@ -95,7 +95,7 @@ # endif #else # define pwmdbg(x...) -# define pwmlldbg(x...) +# define pwmllerr(x...) # define pwminfo(x...) # define pwmllinfo(x...) # define pwm_dumpgpio(p,m) diff --git a/arch/arm/src/efm32/efm32_rmu.h b/arch/arm/src/efm32/efm32_rmu.h index 0d108d4811..dec1a00464 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 rmudbg lldbg +# define rmudbg llerr # ifdef CONFIG_DEBUG_INFO -# define rmuinfo lldbg +# define rmuinfo llerr # else # define rmuinfo(x...) # endif diff --git a/arch/arm/src/efm32/efm32_rtc_burtc.c b/arch/arm/src/efm32/efm32_rtc_burtc.c index 1bc1c9f107..ed32518f7b 100644 --- a/arch/arm/src/efm32/efm32_rtc_burtc.c +++ b/arch/arm/src/efm32/efm32_rtc_burtc.c @@ -131,7 +131,7 @@ #define __CNT_ZERO_REG EFM32_BURTC_RET_REG(1) #if defined CONFIG_DEBUG_FEATURES && defined CONFIG_RTC_DEBUG -# define burtcdbg lldbg +# define burtcdbg llerr #else # define burtcdbg(x...) #endif diff --git a/arch/arm/src/efm32/efm32_serial.c b/arch/arm/src/efm32/efm32_serial.c index c0f3bd4a5f..762da175a9 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 */ - lldbg("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 */ - lldbg("RX ERROR: %08x\n", intflags); + llerr("RX ERROR: %08x\n", intflags); } #endif diff --git a/arch/arm/src/efm32/efm32_spi.c b/arch/arm/src/efm32/efm32_spi.c index 321de58d7d..5fce18d3ae 100644 --- a/arch/arm/src/efm32/efm32_spi.c +++ b/arch/arm/src/efm32/efm32_spi.c @@ -100,9 +100,9 @@ #endif #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/arch/arm/src/efm32/efm32_timer.c b/arch/arm/src/efm32/efm32_timer.c index b526376c87..e44121e411 100644 --- a/arch/arm/src/efm32/efm32_timer.c +++ b/arch/arm/src/efm32/efm32_timer.c @@ -69,19 +69,19 @@ #ifdef CONFIG_DEBUG_TIMER # define efm32_timerdbg dbg -# define efm32_timerlldbg lldbg +# define efm32_timerllerr llerr # ifdef CONFIG_DEBUG_INFO # define efm32_timerinfo info # define efm32_timerllinfo llinfo # define efm32_timer_dumpgpio(p,m) efm32_dumpgpio(p,m) # else -# define efm32_timerlldbg(x...) +# define efm32_timerllerr(x...) # define efm32_timerllinfo(x...) # define efm32_timer_dumpgpio(p,m) # endif #else # define efm32_timerdbg(x...) -# define efm32_timerlldbg(x...) +# define efm32_timerllerr(x...) # define efm32_timerinfo(x...) # define efm32_timerllinfo(x...) # define efm32_timer_dumpgpio(p,m) diff --git a/arch/arm/src/efm32/efm32_usbdev.c b/arch/arm/src/efm32/efm32_usbdev.c index fab4867207..fe0a85f15d 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) { - lldbg("...\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 */ - lldbg("[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 */ - lldbg("%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 */ - lldbg("%08x<-%08x\n", addr, val); + llerr("%08x<-%08x\n", addr, val); /* Write the value */ @@ -2629,7 +2629,7 @@ static inline void efm32_epout_interrupt(FAR struct efm32_usbdev_s *priv) if ((daint & 1) != 0) { regval = efm32_getreg(EFM32_USB_DOEPINT(epno)); - ulldbg("DOEPINT(%d) = %08x\n", epno, regval); + ullerr("DOEPINT(%d) = %08x\n", epno, regval); efm32_putreg(0xFF, EFM32_USB_DOEPINT(epno)); } @@ -2859,7 +2859,7 @@ static inline void efm32_epin_interrupt(FAR struct efm32_usbdev_s *priv) { if ((daint & 1) != 0) { - ulldbg("DIEPINT(%d) = %08x\n", + ullerr("DIEPINT(%d) = %08x\n", epno, efm32_getreg(EFM32_USB_DIEPINT(epno))); efm32_putreg(0xFF, EFM32_USB_DIEPINT(epno)); } diff --git a/arch/arm/src/efm32/efm32_usbhost.c b/arch/arm/src/efm32/efm32_usbhost.c index 0c3c12fbc7..8c18363062 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) { - lldbg("%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. */ - lldbg("[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 6fea252101..10abcf8e5f 100644 --- a/arch/arm/src/kinetis/kinetis_irq.c +++ b/arch/arm/src/kinetis/kinetis_irq.c @@ -111,43 +111,43 @@ static void kinetis_dumpnvic(const char *msg, int irq) irqstate_t flags; flags = enter_critical_section(); - lldbg("NVIC (%s, irq=%d):\n", msg, irq); - lldbg(" INTCTRL: %08x VECTAB: %08x\n", + llerr("NVIC (%s, irq=%d):\n", msg, irq); + llerr(" INTCTRL: %08x VECTAB: %08x\n", getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB)); #if 0 - lldbg(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n", + llerr(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n", getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA), getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE)); #endif - lldbg(" IRQ ENABLE: %08x %08x %08x %08x\n", + llerr(" IRQ ENABLE: %08x %08x %08x %08x\n", getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE), getreg32(NVIC_IRQ64_95_ENABLE), getreg32(NVIC_IRQ96_127_ENABLE)); - lldbg(" SYSH_PRIO: %08x %08x %08x\n", + llerr(" SYSH_PRIO: %08x %08x %08x\n", getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY), getreg32(NVIC_SYSH12_15_PRIORITY)); - lldbg(" IRQ PRIO: %08x %08x %08x %08x\n", + llerr(" IRQ PRIO: %08x %08x %08x %08x\n", getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY), getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY)); - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY), getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY)); - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY), getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY)); - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ48_51_PRIORITY), getreg32(NVIC_IRQ52_55_PRIORITY), getreg32(NVIC_IRQ56_59_PRIORITY), getreg32(NVIC_IRQ60_63_PRIORITY)); - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ64_67_PRIORITY), getreg32(NVIC_IRQ68_71_PRIORITY), getreg32(NVIC_IRQ72_75_PRIORITY), getreg32(NVIC_IRQ76_79_PRIORITY)); - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ80_83_PRIORITY), getreg32(NVIC_IRQ84_87_PRIORITY), getreg32(NVIC_IRQ88_91_PRIORITY), getreg32(NVIC_IRQ92_95_PRIORITY)); - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ96_99_PRIORITY), getreg32(NVIC_IRQ100_103_PRIORITY), getreg32(NVIC_IRQ104_107_PRIORITY), getreg32(NVIC_IRQ108_111_PRIORITY)); #if NR_VECTORS > 111 - lldbg(" %08x %08x\n", + llerr(" %08x %08x\n", getreg32(NVIC_IRQ112_115_PRIORITY), getreg32(NVIC_IRQ116_119_PRIORITY)); #endif diff --git a/arch/arm/src/kinetis/kinetis_pindump.c b/arch/arm/src/kinetis/kinetis_pindump.c index 1e1c2325eb..de750115e7 100644 --- a/arch/arm/src/kinetis/kinetis_pindump.c +++ b/arch/arm/src/kinetis/kinetis_pindump.c @@ -115,9 +115,9 @@ void kinetis_pindump(uint32_t pinset, const char *msg) flags = enter_critical_section(); - lldbg("GPIO%c pinset: %08x base: %08x -- %s\n", + llerr("GPIO%c pinset: %08x base: %08x -- %s\n", g_portchar[port], pinset, base, msg); - lldbg(" PDOR: %08x PDIR: %08x PDDR: %08x\n", + llerr(" PDOR: %08x PDIR: %08x PDDR: %08x\n", getreg32(base + KINETIS_GPIO_PDOR_OFFSET), getreg32(base + KINETIS_GPIO_PDIR_OFFSET), getreg32(base + KINETIS_GPIO_PDDR_OFFSET)); diff --git a/arch/arm/src/kinetis/kinetis_pwm.c b/arch/arm/src/kinetis/kinetis_pwm.c index 51604dd860..214b3249a3 100644 --- a/arch/arm/src/kinetis/kinetis_pwm.c +++ b/arch/arm/src/kinetis/kinetis_pwm.c @@ -84,19 +84,19 @@ #ifdef CONFIG_DEBUG_PWM # define pwmdbg dbg -# define pwmlldbg lldbg +# define pwmllerr llerr # ifdef CONFIG_DEBUG_INFO # define pwminfo info # define pwmllinfo llinfo # define pwm_dumpgpio(p,m) kinetis_pindump(p,m) # else -# define pwmlldbg(x...) +# define pwmllerr(x...) # define pwmllinfo(x...) # define pwm_dumpgpio(p,m) # endif #else # define pwmdbg(x...) -# define pwmlldbg(x...) +# define pwmllerr(x...) # define pwminfo(x...) # define pwmllinfo(x...) # define pwm_dumpgpio(p,m) diff --git a/arch/arm/src/kinetis/kinetis_sdhc.c b/arch/arm/src/kinetis/kinetis_sdhc.c index 38607d128b..7c6f2d421f 100644 --- a/arch/arm/src/kinetis/kinetis_sdhc.c +++ b/arch/arm/src/kinetis/kinetis_sdhc.c @@ -973,7 +973,7 @@ static void kinetis_eventtimeout(int argc, uint32_t arg) /* Wake up any waiting threads */ kinetis_endwait(priv, SDIOWAIT_TIMEOUT); - flldbg("Timeout: remaining: %d\n", priv->remaining); + fllerr("Timeout: remaining: %d\n", priv->remaining); } } @@ -1162,7 +1162,7 @@ static int kinetis_interrupt(int irq, void *context) { /* Terminate the transfer with an error */ - flldbg("ERROR: Data block CRC failure, remaining: %d\n", priv->remaining); + fllerr("ERROR: Data block CRC failure, remaining: %d\n", priv->remaining); kinetis_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR); } @@ -1172,7 +1172,7 @@ static int kinetis_interrupt(int irq, void *context) { /* Terminate the transfer with an error */ - flldbg("ERROR: Data timeout, remaining: %d\n", priv->remaining); + fllerr("ERROR: Data timeout, remaining: %d\n", priv->remaining); kinetis_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_TIMEOUT); } } diff --git a/arch/arm/src/kinetis/kinetis_serial.c b/arch/arm/src/kinetis/kinetis_serial.c index 1d5e6d4840..4b9f1641f0 100644 --- a/arch/arm/src/kinetis/kinetis_serial.c +++ b/arch/arm/src/kinetis/kinetis_serial.c @@ -804,7 +804,7 @@ static int up_interrupte(int irq, void *context) */ regval = up_serialin(priv, KINETIS_UART_S1_OFFSET); - lldbg("S1: %02x\n", regval); + llerr("S1: %02x\n", regval); regval = up_serialin(priv, KINETIS_UART_D_OFFSET); return OK; } diff --git a/arch/arm/src/kinetis/kinetis_usbdev.c b/arch/arm/src/kinetis/kinetis_usbdev.c index e92edd72a0..9a8d5c75ab 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 regdbg lldbg +# define regdbg llerr # ifdef CONFIG_DEBUG_INFO -# define reginfo lldbg +# 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 bdtdbg lldbg +# define bdtdbg llerr # ifdef CONFIG_DEBUG_INFO -# define bdtinfo lldbg +# define bdtinfo llerr # else # define bdtinfo(x...) # endif @@ -714,7 +714,7 @@ static uint16_t khci_getreg(uint32_t addr) { if (count == 4) { - lldbg("...\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 */ - lldbg("[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 */ - lldbg("%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 */ - lldbg("%08x<-%04x\n", addr, val); + llerr("%08x<-%04x\n", addr, val); /* Write the value */ @@ -2913,7 +2913,7 @@ x if ((usbir & USB_INT_ERROR) != 0) { usbtrace(TRACE_INTDECODE(KHCI_TRACEINTID_UERR), usbir); - ulldbg("Error: EIR=%04x\n", khci_getreg(KINETIS_USB0_ERRSTAT)); + ullerr("Error: EIR=%04x\n", khci_getreg(KINETIS_USB0_ERRSTAT)); /* Clear all pending USB error interrupts */ @@ -3241,7 +3241,7 @@ static int khci_epconfigure(struct usbdev_ep_s *ep, if (!ep || !desc) { usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0); - ulldbg("ERROR: ep=%p desc=%p\n"); + ullerr("ERROR: ep=%p desc=%p\n"); return -EINVAL; } #endif @@ -3368,7 +3368,7 @@ static int khci_epdisable(struct usbdev_ep_s *ep) if (!ep) { usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0); - ulldbg("ERROR: ep=%p\n", ep); + ullerr("ERROR: ep=%p\n", ep); return -EINVAL; } #endif @@ -3467,7 +3467,7 @@ static int khci_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req) if (!req || !req->callback || !req->buf || !ep) { usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0); - ulldbg("ERROR: req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); + ullerr("ERROR: req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); return -EINVAL; } #endif @@ -3479,7 +3479,7 @@ static int khci_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req) if (!priv->driver) { usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_NOTCONFIGURED), priv->usbdev.speed); - ulldbg("ERROR: driver=%p\n", priv->driver); + ullerr("ERROR: driver=%p\n", priv->driver); return -ESHUTDOWN; } #endif @@ -4248,10 +4248,10 @@ static void khci_hwreset(struct khci_usbdev_s *priv) khci_putreg((uint8_t)((uint32_t)g_bdt >> 16), KINETIS_USB0_BDTPAGE2); khci_putreg((uint8_t)(((uint32_t)g_bdt >> 8) & USB_BDTPAGE1_MASK), KINETIS_USB0_BDTPAGE1); - ulldbg("BDT Address %hhx \n" ,&g_bdt); - ulldbg("BDTPAGE3 %hhx\n",khci_getreg(KINETIS_USB0_BDTPAGE3)); - ulldbg("BDTPAGE2 %hhx\n",khci_getreg(KINETIS_USB0_BDTPAGE2)); - ulldbg("BDTPAGE1 %hhx\n",khci_getreg(KINETIS_USB0_BDTPAGE1)); + ullerr("BDT Address %hhx \n" ,&g_bdt); + ullerr("BDTPAGE3 %hhx\n",khci_getreg(KINETIS_USB0_BDTPAGE3)); + ullerr("BDTPAGE2 %hhx\n",khci_getreg(KINETIS_USB0_BDTPAGE2)); + ullerr("BDTPAGE1 %hhx\n",khci_getreg(KINETIS_USB0_BDTPAGE1)); /* Clear any pending interrupts */ diff --git a/arch/arm/src/kl/kl_dumpgpio.c b/arch/arm/src/kl/kl_dumpgpio.c index 961414b466..218b9ae0df 100644 --- a/arch/arm/src/kl/kl_dumpgpio.c +++ b/arch/arm/src/kl/kl_dumpgpio.c @@ -123,9 +123,9 @@ void kl_dumpgpio(gpio_cfgset_t pinset, const char *msg) flags = enter_critical_section(); - lldbg("GPIO%c pinset: %08x base: %08x -- %s\n", + llerr("GPIO%c pinset: %08x base: %08x -- %s\n", g_portchar[port], pinset, base, msg); - lldbg(" PDOR: %08x PDIR: %08x PDDR: %08x\n", + llerr(" 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_irq.c b/arch/arm/src/kl/kl_irq.c index 1f62d1a013..af104dd9c6 100644 --- a/arch/arm/src/kl/kl_irq.c +++ b/arch/arm/src/kl/kl_irq.c @@ -97,26 +97,26 @@ static void kl_dumpnvic(const char *msg, int irq) flags = enter_critical_section(); - lldbg("NVIC (%s, irq=%d):\n", msg, irq); - lldbg(" ISER: %08x ICER: %08x\n", + llerr("NVIC (%s, irq=%d):\n", msg, irq); + llerr(" ISER: %08x ICER: %08x\n", getreg32(ARMV6M_NVIC_ISER), getreg32(ARMV6M_NVIC_ICER)); - lldbg(" ISPR: %08x ICPR: %08x\n", + llerr(" ISPR: %08x ICPR: %08x\n", getreg32(ARMV6M_NVIC_ISPR), getreg32(ARMV6M_NVIC_ICPR)); - lldbg(" IRQ PRIO: %08x %08x %08x %08x\n", + llerr(" IRQ PRIO: %08x %08x %08x %08x\n", getreg32(ARMV6M_NVIC_IPR0), getreg32(ARMV6M_NVIC_IPR1), getreg32(ARMV6M_NVIC_IPR2), getreg32(ARMV6M_NVIC_IPR3)); - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(ARMV6M_NVIC_IPR4), getreg32(ARMV6M_NVIC_IPR5), getreg32(ARMV6M_NVIC_IPR6), getreg32(ARMV6M_NVIC_IPR7)); - lldbg("SYSCON:\n"); - lldbg(" CPUID: %08x\n", + llerr("SYSCON:\n"); + llerr(" CPUID: %08x\n", getreg32(ARMV6M_SYSCON_CPUID)); - lldbg(" ICSR: %08x AIRCR: %08x\n", + llerr(" ICSR: %08x AIRCR: %08x\n", getreg32(ARMV6M_SYSCON_ICSR), getreg32(ARMV6M_SYSCON_AIRCR)); - lldbg(" SCR: %08x CCR: %08x\n", + llerr(" SCR: %08x CCR: %08x\n", getreg32(ARMV6M_SYSCON_SCR), getreg32(ARMV6M_SYSCON_CCR)); - lldbg(" SHPR2: %08x SHPR3: %08x\n", + llerr(" SHPR2: %08x SHPR3: %08x\n", getreg32(ARMV6M_SYSCON_SHPR2), getreg32(ARMV6M_SYSCON_SHPR3)); leave_critical_section(flags); diff --git a/arch/arm/src/kl/kl_pwm.c b/arch/arm/src/kl/kl_pwm.c index 72f1705d21..7fef072a84 100644 --- a/arch/arm/src/kl/kl_pwm.c +++ b/arch/arm/src/kl/kl_pwm.c @@ -81,7 +81,7 @@ #ifdef CONFIG_DEBUG_PWM # define pwmdbg dbg -# define pwmlldbg lldbg +# define pwmllerr llerr # ifdef CONFIG_DEBUG_INFO # define pwminfo info # define pwmllinfo llinfo @@ -93,7 +93,7 @@ # endif #else # define pwmdbg(x...) -# define pwmlldbg(x...) +# define pwmllerr(x...) # define pwminfo(x...) # define pwmllinfo(x...) # define pwm_dumpgpio(p,m) diff --git a/arch/arm/src/kl/kl_spi.c b/arch/arm/src/kl/kl_spi.c index e80de128ad..b4fb53ac04 100644 --- a/arch/arm/src/kl/kl_spi.c +++ b/arch/arm/src/kl/kl_spi.c @@ -71,9 +71,9 @@ */ #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/arch/arm/src/lpc11xx/lpc11_gpiodbg.c b/arch/arm/src/lpc11xx/lpc11_gpiodbg.c index 5907c8df2c..c14e11a7b8 100644 --- a/arch/arm/src/lpc11xx/lpc11_gpiodbg.c +++ b/arch/arm/src/lpc11xx/lpc11_gpiodbg.c @@ -157,30 +157,30 @@ int lpc11_dumpgpio(lpc11_pinset_t pinset, const char *msg) /* The following requires exclusive access to the GPIO registers */ flags = enter_critical_section(); - lldbg("GPIO%c pin%d (pinset: %08x) -- %s\n", + llerr("GPIO%c pin%d (pinset: %08x) -- %s\n", port + '0', pin, pinset, msg); #if defined(LPC176x) - lldbg(" PINSEL[%08x]: %08x PINMODE[%08x]: %08x ODMODE[%08x]: %08x\n", + llerr(" PINSEL[%08x]: %08x PINMODE[%08x]: %08x ODMODE[%08x]: %08x\n", pinsel, pinsel ? getreg32(pinsel) : 0, pinmode, pinmode ? getreg32(pinmode) : 0, g_odmode[port], getreg32(g_odmode[port])); #elif defined(LPC178x) - lldbg(" IOCON[%08x]: %08x\n", iocon, getreg32(iocon)); + llerr(" IOCON[%08x]: %08x\n", iocon, getreg32(iocon)); #endif base = g_fiobase[port]; - lldbg(" FIODIR[%08x]: %08x FIOMASK[%08x]: %08x FIOPIN[%08x]: %08x\n", + llerr(" FIODIR[%08x]: %08x FIOMASK[%08x]: %08x FIOPIN[%08x]: %08x\n", base+LPC11_FIO_DIR_OFFSET, getreg32(base+LPC11_FIO_DIR_OFFSET), base+LPC11_FIO_MASK_OFFSET, getreg32(base+LPC11_FIO_MASK_OFFSET), base+LPC11_FIO_PIN_OFFSET, getreg32(base+LPC11_FIO_PIN_OFFSET)); base = g_intbase[port]; - lldbg(" IOINTSTATUS[%08x]: %08x INTSTATR[%08x]: %08x INSTATF[%08x]: %08x\n", + llerr(" IOINTSTATUS[%08x]: %08x INTSTATR[%08x]: %08x INSTATF[%08x]: %08x\n", LPC11_GPIOINT_IOINTSTATUS, getreg32(LPC11_GPIOINT_IOINTSTATUS), base+LPC11_GPIOINT_INTSTATR_OFFSET, getreg32(base+LPC11_GPIOINT_INTSTATR_OFFSET), base+LPC11_GPIOINT_INTSTATF_OFFSET, getreg32(base+LPC11_GPIOINT_INTSTATF_OFFSET)); - lldbg(" INTENR[%08x]: %08x INTENF[%08x]: %08x\n", + llerr(" INTENR[%08x]: %08x INTENF[%08x]: %08x\n", base+LPC11_GPIOINT_INTENR_OFFSET, getreg32(base+LPC11_GPIOINT_INTENR_OFFSET), base+LPC11_GPIOINT_INTENF_OFFSET, getreg32(base+LPC11_GPIOINT_INTENF_OFFSET)); leave_critical_section(flags); diff --git a/arch/arm/src/lpc11xx/lpc11_irq.c b/arch/arm/src/lpc11xx/lpc11_irq.c index 80a299926e..a5de46bc6e 100644 --- a/arch/arm/src/lpc11xx/lpc11_irq.c +++ b/arch/arm/src/lpc11xx/lpc11_irq.c @@ -93,26 +93,26 @@ static void lpc11_dumpnvic(const char *msg, int irq) flags = enter_critical_section(); - lldbg("NVIC (%s, irq=%d):\n", msg, irq); - lldbg(" ISER: %08x ICER: %08x\n", + llerr("NVIC (%s, irq=%d):\n", msg, irq); + llerr(" ISER: %08x ICER: %08x\n", getreg32(ARMV6M_NVIC_ISER), getreg32(ARMV6M_NVIC_ICER)); - lldbg(" ISPR: %08x ICPR: %08x\n", + llerr(" ISPR: %08x ICPR: %08x\n", getreg32(ARMV6M_NVIC_ISPR), getreg32(ARMV6M_NVIC_ICPR)); - lldbg(" IRQ PRIO: %08x %08x %08x %08x\n", + llerr(" IRQ PRIO: %08x %08x %08x %08x\n", getreg32(ARMV6M_NVIC_IPR0), getreg32(ARMV6M_NVIC_IPR1), getreg32(ARMV6M_NVIC_IPR2), getreg32(ARMV6M_NVIC_IPR3)); - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(ARMV6M_NVIC_IPR4), getreg32(ARMV6M_NVIC_IPR5), getreg32(ARMV6M_NVIC_IPR6), getreg32(ARMV6M_NVIC_IPR7)); - lldbg("SYSCON:\n"); - lldbg(" CPUID: %08x\n", + llerr("SYSCON:\n"); + llerr(" CPUID: %08x\n", getreg32(ARMV6M_SYSCON_CPUID)); - lldbg(" ICSR: %08x AIRCR: %08x\n", + llerr(" ICSR: %08x AIRCR: %08x\n", getreg32(ARMV6M_SYSCON_ICSR), getreg32(ARMV6M_SYSCON_AIRCR)); - lldbg(" SCR: %08x CCR: %08x\n", + llerr(" SCR: %08x CCR: %08x\n", getreg32(ARMV6M_SYSCON_SCR), getreg32(ARMV6M_SYSCON_CCR)); - lldbg(" SHPR2: %08x SHPR3: %08x\n", + llerr(" SHPR2: %08x SHPR3: %08x\n", getreg32(ARMV6M_SYSCON_SHPR2), getreg32(ARMV6M_SYSCON_SHPR3)); leave_critical_section(flags); diff --git a/arch/arm/src/lpc11xx/lpc11_spi.c b/arch/arm/src/lpc11xx/lpc11_spi.c index c065965111..7e9c7c0a20 100644 --- a/arch/arm/src/lpc11xx/lpc11_spi.c +++ b/arch/arm/src/lpc11xx/lpc11_spi.c @@ -80,9 +80,9 @@ */ #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/arch/arm/src/lpc11xx/lpc11_ssp.c b/arch/arm/src/lpc11xx/lpc11_ssp.c index a272f6f940..201227ae94 100644 --- a/arch/arm/src/lpc11xx/lpc11_ssp.c +++ b/arch/arm/src/lpc11xx/lpc11_ssp.c @@ -81,9 +81,9 @@ */ #ifdef CONFIG_DEBUG_SPI -# define sspdbg lldbg +# define sspdbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/arch/arm/src/lpc11xx/lpc11_timer.c b/arch/arm/src/lpc11xx/lpc11_timer.c index 0201e259f7..4791df3fc7 100644 --- a/arch/arm/src/lpc11xx/lpc11_timer.c +++ b/arch/arm/src/lpc11xx/lpc11_timer.c @@ -90,7 +90,7 @@ #ifdef CONFIG_DEBUG_PWM # define pwmdbg dbg -# define pwmlldbg lldbg +# define pwmllerr llerr # ifdef CONFIG_DEBUG_INFO # define pwminfo info # define pwmllinfo llinfo @@ -102,7 +102,7 @@ # endif #else # define pwmdbg(x...) -# define pwmlldbg(x...) +# define pwmllerr(x...) # define pwminfo(x...) # define pwmllinfo(x...) # define pwm_dumpgpio(p,m) diff --git a/arch/arm/src/lpc17xx/lpc176x_rtc.c b/arch/arm/src/lpc17xx/lpc176x_rtc.c index eb347ff4c8..a16030b48d 100644 --- a/arch/arm/src/lpc17xx/lpc176x_rtc.c +++ b/arch/arm/src/lpc17xx/lpc176x_rtc.c @@ -83,12 +83,12 @@ #ifdef CONFIG_DEBUG_RTC # define rtcdbg dbg # define rtcinfo info -# define rtclldbg lldbg +# define rtcllerr llerr # define rtcllinfo llinfo #else # define rtcdbg(x...) # define rtcinfo(x...) -# define rtclldbg(x...) +# define rtcllerr(x...) # define rtcllinfo(x...) #endif @@ -134,9 +134,9 @@ volatile bool g_rtc_enabled = false; #ifdef CONFIG_DEBUG_RTC static void rtc_dumpregs(FAR const char *msg) { - rtclldbg("%s:\n", msg); - rtclldbg(" DOM : %08x\n", (getreg32(LPC17_RTC_DOM) & RTC_DOM_MASK)); - rtclldbg(" DOW : %08x\n", (getreg32(LPC17_RTC_DOW) & RTC_DOW_MASK)); + rtcllerr("%s:\n", msg); + rtcllerr(" DOM : %08x\n", (getreg32(LPC17_RTC_DOM) & RTC_DOM_MASK)); + rtcllerr(" DOW : %08x\n", (getreg32(LPC17_RTC_DOW) & RTC_DOW_MASK)); } #else # define rtc_dumpregs(msg) @@ -159,13 +159,13 @@ static void rtc_dumpregs(FAR const char *msg) #ifdef CONFIG_DEBUG_RTC static void rtc_dumptime(FAR struct tm *tp, FAR const char *msg) { - rtclldbg("%s:\n", msg); - rtclldbg(" tm_sec: %08x\n", tp->tm_sec); - rtclldbg(" tm_min: %08x\n", tp->tm_min); - rtclldbg(" tm_hour: %08x\n", tp->tm_hour); - rtclldbg(" tm_mday: %08x\n", tp->tm_mday); - rtclldbg(" tm_mon: %08x\n", tp->tm_mon); - rtclldbg(" tm_year: %08x\n", tp->tm_year); + rtcllerr("%s:\n", msg); + rtcllerr(" tm_sec: %08x\n", tp->tm_sec); + rtcllerr(" tm_min: %08x\n", tp->tm_min); + rtcllerr(" tm_hour: %08x\n", tp->tm_hour); + rtcllerr(" tm_mday: %08x\n", tp->tm_mday); + rtcllerr(" tm_mon: %08x\n", tp->tm_mon); + rtcllerr(" tm_year: %08x\n", tp->tm_year); } #else # define rtc_dumptime(tp, msg) diff --git a/arch/arm/src/lpc17xx/lpc17_can.c b/arch/arm/src/lpc17xx/lpc17_can.c index d7d46afd3f..5678f41546 100644 --- a/arch/arm/src/lpc17xx/lpc17_can.c +++ b/arch/arm/src/lpc17xx/lpc17_can.c @@ -166,18 +166,18 @@ #ifdef CONFIG_DEBUG_CAN # ifdef CONFIG_CAN_REGDEBUG -# define candbg lldbg +# define candbg llerr # define caninfo llinfo # else # define candbg dbg # define caninfo info # endif -# define canlldbg lldbg +# define canllerr llerr # define canllinfo llinfo #else # define candbg(x...) # define caninfo(x...) -# define canlldbg(x...) +# define canllerr(x...) # define canllinfo(x...) #endif @@ -325,7 +325,7 @@ static void can_printreg(uint32_t addr, uint32_t value) { if (count == 4) { - lldbg("...\n"); + llerr("...\n"); } return; @@ -342,7 +342,7 @@ static void can_printreg(uint32_t addr, uint32_t value) { /* Yes.. then show how many times the value repeated */ - lldbg("[repeats %d more times]\n", count-3); + llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -354,7 +354,7 @@ static void can_printreg(uint32_t addr, uint32_t value) /* Show the register value read */ - lldbg("%08x->%08x\n", addr, value); + llerr("%08x->%08x\n", addr, value); } #endif @@ -415,7 +415,7 @@ static void can_putreg(struct up_dev_s *priv, int offset, uint32_t value) /* Show the register value being written */ - lldbg("%08x<-%08x\n", addr, value); + llerr("%08x<-%08x\n", addr, value); /* Write the value */ @@ -475,7 +475,7 @@ static void can_putcommon(uint32_t addr, uint32_t value) { /* Show the register value being written */ - lldbg("%08x<-%08x\n", addr, value); + llerr("%08x<-%08x\n", addr, value); /* Write the value */ @@ -988,7 +988,7 @@ static void can_interrupt(FAR struct can_dev_s *dev) if ((rfs & CAN_RFS_FF) != 0) { - canlldbg("ERROR: Received message with extended identifier. Dropped\n"); + canllerr("ERROR: Received message with extended identifier. Dropped\n"); } else #endif diff --git a/arch/arm/src/lpc17xx/lpc17_ethernet.c b/arch/arm/src/lpc17xx/lpc17_ethernet.c index c49b61ad5d..fbf3172687 100644 --- a/arch/arm/src/lpc17xx/lpc17_ethernet.c +++ b/arch/arm/src/lpc17xx/lpc17_ethernet.c @@ -837,7 +837,7 @@ static void lpc17_rxdone_process(struct lpc17_driver_s *priv) if ((*rxstat & RXSTAT_INFO_ERROR) != 0) { - nlldbg("Error. considx: %08x prodidx: %08x rxstat: %08x\n", + nllerr("Error. considx: %08x prodidx: %08x rxstat: %08x\n", considx, prodidx, *rxstat); NETDEV_RXERRORS(&priv->lp_dev); } @@ -850,20 +850,20 @@ static void lpc17_rxdone_process(struct lpc17_driver_s *priv) /* else */ if (pktlen > CONFIG_NET_ETH_MTU + CONFIG_NET_GUARDSIZE) { - nlldbg("Too big. considx: %08x prodidx: %08x pktlen: %d rxstat: %08x\n", + nllerr("Too big. considx: %08x prodidx: %08x pktlen: %d rxstat: %08x\n", considx, prodidx, pktlen, *rxstat); NETDEV_RXERRORS(&priv->lp_dev); } else if ((*rxstat & RXSTAT_INFO_LASTFLAG) == 0) { - nlldbg("Fragment. considx: %08x prodidx: %08x pktlen: %d rxstat: %08x\n", + nllerr("Fragment. considx: %08x prodidx: %08x pktlen: %d rxstat: %08x\n", considx, prodidx, pktlen, *rxstat); NETDEV_RXFRAGMENTS(&priv->lp_dev); fragment = true; } else if (fragment) { - nlldbg("Last fragment. considx: %08x prodidx: %08x pktlen: %d rxstat: %08x\n", + nllerr("Last fragment. considx: %08x prodidx: %08x pktlen: %d rxstat: %08x\n", considx, prodidx, pktlen, *rxstat); NETDEV_RXFRAGMENTS(&priv->lp_dev); fragment = false; @@ -1202,13 +1202,13 @@ static int lpc17_interrupt(int irq, void *context) { if ((status & ETH_INT_RXOVR) != 0) { - nlldbg("RX Overrun. status: %08x\n", status); + nllerr("RX Overrun. status: %08x\n", status); NETDEV_RXERRORS(&priv->lp_dev); } if ((status & ETH_INT_TXUNR) != 0) { - nlldbg("TX Underrun. status: %08x\n", status); + nllerr("TX Underrun. status: %08x\n", status); NETDEV_TXERRORS(&priv->lp_dev); } @@ -1229,7 +1229,7 @@ static int lpc17_interrupt(int irq, void *context) if ((status & ETH_INT_RXERR) != 0) { - nlldbg("RX Error. status: %08x\n", status); + nllerr("RX Error. status: %08x\n", status); NETDEV_RXERRORS(&priv->lp_dev); } @@ -1281,7 +1281,7 @@ static int lpc17_interrupt(int irq, void *context) if ((status & ETH_INT_TXERR) != 0) { - nlldbg("TX Error. status: %08x\n", status); + nllerr("TX Error. status: %08x\n", status); NETDEV_TXERRORS(&priv->lp_dev); } diff --git a/arch/arm/src/lpc17xx/lpc17_gpiodbg.c b/arch/arm/src/lpc17xx/lpc17_gpiodbg.c index 680e02a53d..70f8698ef0 100644 --- a/arch/arm/src/lpc17xx/lpc17_gpiodbg.c +++ b/arch/arm/src/lpc17xx/lpc17_gpiodbg.c @@ -157,30 +157,30 @@ int lpc17_dumpgpio(lpc17_pinset_t pinset, const char *msg) /* The following requires exclusive access to the GPIO registers */ flags = enter_critical_section(); - lldbg("GPIO%c pin%d (pinset: %08x) -- %s\n", + llerr("GPIO%c pin%d (pinset: %08x) -- %s\n", port + '0', pin, pinset, msg); #if defined(LPC176x) - lldbg(" PINSEL[%08x]: %08x PINMODE[%08x]: %08x ODMODE[%08x]: %08x\n", + llerr(" PINSEL[%08x]: %08x PINMODE[%08x]: %08x ODMODE[%08x]: %08x\n", pinsel, pinsel ? getreg32(pinsel) : 0, pinmode, pinmode ? getreg32(pinmode) : 0, g_odmode[port], getreg32(g_odmode[port])); #elif defined(LPC178x) - lldbg(" IOCON[%08x]: %08x\n", iocon, getreg32(iocon)); + llerr(" IOCON[%08x]: %08x\n", iocon, getreg32(iocon)); #endif base = g_fiobase[port]; - lldbg(" FIODIR[%08x]: %08x FIOMASK[%08x]: %08x FIOPIN[%08x]: %08x\n", + llerr(" FIODIR[%08x]: %08x FIOMASK[%08x]: %08x FIOPIN[%08x]: %08x\n", base+LPC17_FIO_DIR_OFFSET, getreg32(base+LPC17_FIO_DIR_OFFSET), base+LPC17_FIO_MASK_OFFSET, getreg32(base+LPC17_FIO_MASK_OFFSET), base+LPC17_FIO_PIN_OFFSET, getreg32(base+LPC17_FIO_PIN_OFFSET)); base = g_intbase[port]; - lldbg(" IOINTSTATUS[%08x]: %08x INTSTATR[%08x]: %08x INSTATF[%08x]: %08x\n", + llerr(" IOINTSTATUS[%08x]: %08x INTSTATR[%08x]: %08x INSTATF[%08x]: %08x\n", LPC17_GPIOINT_IOINTSTATUS, getreg32(LPC17_GPIOINT_IOINTSTATUS), base+LPC17_GPIOINT_INTSTATR_OFFSET, getreg32(base+LPC17_GPIOINT_INTSTATR_OFFSET), base+LPC17_GPIOINT_INTSTATF_OFFSET, getreg32(base+LPC17_GPIOINT_INTSTATF_OFFSET)); - lldbg(" INTENR[%08x]: %08x INTENF[%08x]: %08x\n", + llerr(" INTENR[%08x]: %08x INTENF[%08x]: %08x\n", base+LPC17_GPIOINT_INTENR_OFFSET, getreg32(base+LPC17_GPIOINT_INTENR_OFFSET), base+LPC17_GPIOINT_INTENF_OFFSET, getreg32(base+LPC17_GPIOINT_INTENF_OFFSET)); leave_critical_section(flags); diff --git a/arch/arm/src/lpc17xx/lpc17_irq.c b/arch/arm/src/lpc17xx/lpc17_irq.c index 734308952e..47467d32b6 100644 --- a/arch/arm/src/lpc17xx/lpc17_irq.c +++ b/arch/arm/src/lpc17xx/lpc17_irq.c @@ -108,25 +108,25 @@ static void lpc17_dumpnvic(const char *msg, int irq) irqstate_t flags; flags = enter_critical_section(); - lldbg("NVIC (%s, irq=%d):\n", msg, irq); - lldbg(" INTCTRL: %08x VECTAB: %08x\n", + llerr("NVIC (%s, irq=%d):\n", msg, irq); + llerr(" INTCTRL: %08x VECTAB: %08x\n", getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB)); #if 0 - lldbg(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n", + llerr(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n", getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA), getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE)); #endif - lldbg(" IRQ ENABLE: %08x\n", getreg32(NVIC_IRQ0_31_ENABLE)); - lldbg(" SYSH_PRIO: %08x %08x %08x\n", + llerr(" IRQ ENABLE: %08x\n", getreg32(NVIC_IRQ0_31_ENABLE)); + llerr(" SYSH_PRIO: %08x %08x %08x\n", getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY), getreg32(NVIC_SYSH12_15_PRIORITY)); - lldbg(" IRQ PRIO: %08x %08x %08x %08x\n", + llerr(" IRQ PRIO: %08x %08x %08x %08x\n", getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY), getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY)); - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY), getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY)); - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY), getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY)); leave_critical_section(flags); diff --git a/arch/arm/src/lpc17xx/lpc17_mcpwm.c b/arch/arm/src/lpc17xx/lpc17_mcpwm.c index 7fe1edee39..b882af8950 100644 --- a/arch/arm/src/lpc17xx/lpc17_mcpwm.c +++ b/arch/arm/src/lpc17xx/lpc17_mcpwm.c @@ -89,7 +89,7 @@ #ifdef CONFIG_DEBUG_PWM # define pwmdbg dbg -# define pwmlldbg lldbg +# define pwmllerr llerr # ifdef CONFIG_DEBUG_INFO # define pwminfo info # define pwmllinfo llinfo @@ -101,7 +101,7 @@ # endif #else # define pwmdbg(x...) -# define pwmlldbg(x...) +# define pwmllerr(x...) # define pwminfo(x...) # define pwmllinfo(x...) # define pwm_dumpgpio(p,m) diff --git a/arch/arm/src/lpc17xx/lpc17_pwm.c b/arch/arm/src/lpc17xx/lpc17_pwm.c index 756feb5f52..a2c9f6c39f 100644 --- a/arch/arm/src/lpc17xx/lpc17_pwm.c +++ b/arch/arm/src/lpc17xx/lpc17_pwm.c @@ -107,7 +107,7 @@ #ifdef CONFIG_DEBUG_PWM # define pwmdbg dbg -# define pwmlldbg lldbg +# define pwmllerr llerr # ifdef CONFIG_DEBUG_INFO # define pwminfo info # define pwmllinfo llinfo @@ -119,7 +119,7 @@ # endif #else # define pwmdbg(x...) -# define pwmlldbg(x...) +# define pwmllerr(x...) # define pwminfo(x...) # define pwmllinfo(x...) # define pwm_dumpgpio(p,m) diff --git a/arch/arm/src/lpc17xx/lpc17_sdcard.c b/arch/arm/src/lpc17xx/lpc17_sdcard.c index 4ba4d8bbd3..225bd5465a 100644 --- a/arch/arm/src/lpc17xx/lpc17_sdcard.c +++ b/arch/arm/src/lpc17xx/lpc17_sdcard.c @@ -813,7 +813,7 @@ static void lpc17_dmacallback(DMA_HANDLE handle, void *arg, int status) if (status < 0) { - flldbg("DMA error %d, remaining: %d\n", status, priv->remaining); + fllerr("DMA error %d, remaining: %d\n", status, priv->remaining); result = SDIOWAIT_ERROR; } else @@ -1080,7 +1080,7 @@ static void lpc17_eventtimeout(int argc, uint32_t arg) /* Yes.. wake up any waiting threads */ lpc17_endwait(priv, SDIOWAIT_TIMEOUT); - flldbg("Timeout: remaining: %d\n", priv->remaining); + fllerr("Timeout: remaining: %d\n", priv->remaining); } } @@ -1297,7 +1297,7 @@ static int lpc17_interrupt(int irq, void *context) { /* Terminate the transfer with an error */ - flldbg("ERROR: Data block CRC failure, remaining: %d\n", priv->remaining); + fllerr("ERROR: Data block CRC failure, remaining: %d\n", priv->remaining); lpc17_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR); } @@ -1307,7 +1307,7 @@ static int lpc17_interrupt(int irq, void *context) { /* Terminate the transfer with an error */ - flldbg("ERROR: Data timeout, remaining: %d\n", priv->remaining); + fllerr("ERROR: Data timeout, remaining: %d\n", priv->remaining); lpc17_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_TIMEOUT); } @@ -1317,7 +1317,7 @@ static int lpc17_interrupt(int irq, void *context) { /* Terminate the transfer with an error */ - flldbg("ERROR: RX FIFO overrun, remaining: %d\n", priv->remaining); + fllerr("ERROR: RX FIFO overrun, remaining: %d\n", priv->remaining); lpc17_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR); } @@ -1327,7 +1327,7 @@ static int lpc17_interrupt(int irq, void *context) { /* Terminate the transfer with an error */ - flldbg("ERROR: TX FIFO underrun, remaining: %d\n", priv->remaining); + fllerr("ERROR: TX FIFO underrun, remaining: %d\n", priv->remaining); lpc17_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR); } @@ -1337,7 +1337,7 @@ static int lpc17_interrupt(int irq, void *context) { /* Terminate the transfer with an error */ - flldbg("ERROR: Start bit, remaining: %d\n", priv->remaining); + fllerr("ERROR: Start bit, remaining: %d\n", priv->remaining); lpc17_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR); } } diff --git a/arch/arm/src/lpc17xx/lpc17_spi.c b/arch/arm/src/lpc17xx/lpc17_spi.c index 34f30a703e..a7ccc2b2f1 100644 --- a/arch/arm/src/lpc17xx/lpc17_spi.c +++ b/arch/arm/src/lpc17xx/lpc17_spi.c @@ -80,9 +80,9 @@ */ #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/arch/arm/src/lpc17xx/lpc17_ssp.c b/arch/arm/src/lpc17xx/lpc17_ssp.c index 6685cb0723..ad6fc44c87 100644 --- a/arch/arm/src/lpc17xx/lpc17_ssp.c +++ b/arch/arm/src/lpc17xx/lpc17_ssp.c @@ -81,9 +81,9 @@ */ #ifdef CONFIG_DEBUG_SPI -# define sspdbg lldbg +# define sspdbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/arch/arm/src/lpc17xx/lpc17_timer.c b/arch/arm/src/lpc17xx/lpc17_timer.c index 1138f6b38e..2fe7cc56cb 100644 --- a/arch/arm/src/lpc17xx/lpc17_timer.c +++ b/arch/arm/src/lpc17xx/lpc17_timer.c @@ -90,7 +90,7 @@ #ifdef CONFIG_DEBUG_PWM # define pwmdbg dbg -# define pwmlldbg lldbg +# define pwmllerr llerr # ifdef CONFIG_DEBUG_INFO # define pwminfo info # define pwmllinfo llinfo @@ -102,7 +102,7 @@ # endif #else # define pwmdbg(x...) -# define pwmlldbg(x...) +# define pwmllerr(x...) # define pwminfo(x...) # define pwmllinfo(x...) # define pwm_dumpgpio(p,m) diff --git a/arch/arm/src/lpc17xx/lpc17_usbdev.c b/arch/arm/src/lpc17xx/lpc17_usbdev.c index cb8f8366e8..300d1ca6ef 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) { - lldbg("%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. */ - lldbg("[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 e0cf06a037..d11c0eb4f9 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) { - lldbg("%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. */ - lldbg("[repeats %d more times]\n", count); + llerr("[repeats %d more times]\n", count); } } @@ -1694,7 +1694,7 @@ static int lpc17_usbinterrupt(int irq, void *context) } else { - ulldbg("Spurious status change (connected)\n"); + ullerr("Spurious status change (connected)\n"); } /* The LSDA (Low speed device attached) bit is valid @@ -1750,7 +1750,7 @@ static int lpc17_usbinterrupt(int irq, void *context) } else { - ulldbg("Spurious status change (disconnected)\n"); + ullerr("Spurious status change (disconnected)\n"); } } @@ -1830,7 +1830,7 @@ static int lpc17_usbinterrupt(int irq, void *context) { /* The transfer failed for some reason... dump some diagnostic info. */ - ulldbg("ERROR: ED xfrtype:%d TD CTRL:%08x/CC:%d RHPORTST1:%08x\n", + ullerr("ERROR: ED xfrtype:%d TD CTRL:%08x/CC:%d RHPORTST1:%08x\n", ed->xfrtype, td->hw.ctrl, xfrinfo->tdstatus, lpc17_getreg(LPC17_USBHOST_RHPORTST1)); } @@ -1894,7 +1894,7 @@ static int lpc17_usbinterrupt(int irq, void *context) #ifdef CONFIG_DEBUG_USB if ((pending & LPC17_DEBUG_INTS) != 0) { - ulldbg("ERROR: Unhandled interrupts INTST:%08x\n", intst); + ullerr("ERROR: Unhandled interrupts INTST:%08x\n", intst); } #endif diff --git a/arch/arm/src/lpc214x/lpc214x_usbdev.c b/arch/arm/src/lpc214x/lpc214x_usbdev.c index 926a7a1280..431b71655e 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) { - lldbg("...\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 */ - lldbg("[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 */ - lldbg("%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 */ - lldbg("%08x<-%08x\n", addr, val); + llerr("%08x<-%08x\n", addr, val); /* Write the value */ diff --git a/arch/arm/src/lpc2378/lpc23xx_spi.c b/arch/arm/src/lpc2378/lpc23xx_spi.c index 21aefa2f99..c1daf9f13c 100644 --- a/arch/arm/src/lpc2378/lpc23xx_spi.c +++ b/arch/arm/src/lpc2378/lpc23xx_spi.c @@ -79,9 +79,9 @@ /* CONFIG_DEBUG_SPI enables debug output from this file */ #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/arch/arm/src/lpc31xx/lpc31_ehci.c b/arch/arm/src/lpc31xx/lpc31_ehci.c index 498d848da3..0b161ac75c 100644 --- a/arch/arm/src/lpc31xx/lpc31_ehci.c +++ b/arch/arm/src/lpc31xx/lpc31_ehci.c @@ -833,7 +833,7 @@ static uint32_t lpc31_swap32(uint32_t value) static void lpc31_printreg(volatile uint32_t *regaddr, uint32_t regval, bool iswrite) { - lldbg("%08x%s%08x\n", (uintptr_t)regaddr, iswrite ? "<-" : "->", regval); + llerr("%08x%s%08x\n", (uintptr_t)regaddr, iswrite ? "<-" : "->", regval); } #endif @@ -884,7 +884,7 @@ static void lpc31_checkreg(volatile uint32_t *regaddr, uint32_t regval, bool isw { /* No.. More than one. */ - lldbg("[repeats %d more times]\n", count); + llerr("[repeats %d more times]\n", count); } } diff --git a/arch/arm/src/lpc31xx/lpc31_spi.c b/arch/arm/src/lpc31xx/lpc31_spi.c index fb4586e009..c72a0221c0 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) { - lldbg("...[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)) { - lldbg("%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)) { - lldbg("%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 - lldbg("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 bcf51dbbe7..3d56725cea 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) { - lldbg("...\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 */ - lldbg("[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 */ - lldbg("%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 */ - lldbg("%08x<-%08x\n", addr, val); + llerr("%08x<-%08x\n", addr, val); /* Write the value */ diff --git a/arch/arm/src/lpc43xx/lpc43_ehci.c b/arch/arm/src/lpc43xx/lpc43_ehci.c index 0c536fcb6c..d69b9a796d 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) { - lldbg("%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. */ - lldbg("[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 11da4b3d11..89d37cc88b 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) { - lldbg("...\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 */ - lldbg("[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 */ - lldbg("%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 */ - lldbg("%08x<-%08x\n", addr, val); + llerr("%08x<-%08x\n", addr, val); /* Write the value */ @@ -1440,7 +1440,7 @@ static int lpc43_recvframe(FAR struct lpc43_ethmac_s *priv) if (!lpc43_isfreebuffer(priv)) { - nlldbg("No free buffers\n"); + nllerr("No free buffers\n"); return -ENOMEM; } @@ -1547,7 +1547,7 @@ static int lpc43_recvframe(FAR struct lpc43_ethmac_s *priv) * scanning logic, and continue scanning with the next frame. */ - nlldbg("DROPPED: RX descriptor errors: %08x\n", rxdesc->rdes0); + nllerr("DROPPED: RX descriptor errors: %08x\n", rxdesc->rdes0); lpc43_freesegment(priv, rxcurr, priv->segments); } } @@ -1608,7 +1608,7 @@ static void lpc43_receive(FAR struct lpc43_ethmac_s *priv) if (dev->d_len > CONFIG_NET_ETH_MTU) { - nlldbg("DROPPED: Too big: %d\n", dev->d_len); + nllerr("DROPPED: Too big: %d\n", dev->d_len); /* Free dropped packet buffer */ if (dev->d_buf) @@ -1727,7 +1727,7 @@ static void lpc43_receive(FAR struct lpc43_ethmac_s *priv) else #endif { - nlldbg("DROPPED: Unknown type: %04x\n", BUF->type); + nllerr("DROPPED: Unknown type: %04x\n", BUF->type); } /* We are finished with the RX buffer. NOTE: If the buffer is @@ -1975,7 +1975,7 @@ static inline void lpc43_interrupt_process(FAR struct lpc43_ethmac_s *priv) { /* Just let the user know what happened */ - nlldbg("Abnormal event(s): %08x\n", dmasr); + nllerr("Abnormal event(s): %08x\n", dmasr); /* Clear all pending abnormal events */ @@ -2179,7 +2179,7 @@ static void lpc43_txtimeout_expiry(int argc, uint32_t arg, ...) { FAR struct lpc43_ethmac_s *priv = (FAR struct lpc43_ethmac_s *)arg; - nlldbg("Timeout!\n"); + nllerr("Timeout!\n"); #ifdef CONFIG_NET_NOINTS /* Disable further Ethernet interrupts. This will prevent some race diff --git a/arch/arm/src/lpc43xx/lpc43_gpdma.c b/arch/arm/src/lpc43xx/lpc43_gpdma.c index a84eba773a..c82de2a826 100644 --- a/arch/arm/src/lpc43xx/lpc43_gpdma.c +++ b/arch/arm/src/lpc43xx/lpc43_gpdma.c @@ -67,9 +67,9 @@ #undef DMA_VERBOSE /* Define to enable verbose debug */ #ifdef DMA_DEBUG -# define dmadbg lldbg +# define dmadbg llerr # ifdef DMA_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/arch/arm/src/lpc43xx/lpc43_irq.c b/arch/arm/src/lpc43xx/lpc43_irq.c index f45e9248c6..cb2d1c502a 100644 --- a/arch/arm/src/lpc43xx/lpc43_irq.c +++ b/arch/arm/src/lpc43xx/lpc43_irq.c @@ -113,29 +113,29 @@ static void lpc43_dumpnvic(const char *msg, int irq) irqstate_t flags; flags = enter_critical_section(); - lldbg("NVIC (%s, irq=%d):\n", msg, irq); - lldbg(" INTCTRL: %08x VECTAB: %08x\n", + llerr("NVIC (%s, irq=%d):\n", msg, irq); + llerr(" INTCTRL: %08x VECTAB: %08x\n", getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB)); #if 0 - lldbg(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n", + llerr(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n", getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA), getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE)); #endif - lldbg(" IRQ ENABLE: %08x %08x\n", + llerr(" IRQ ENABLE: %08x %08x\n", getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE)); - lldbg(" SYSH_PRIO: %08x %08x %08x\n", + llerr(" SYSH_PRIO: %08x %08x %08x\n", getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY), getreg32(NVIC_SYSH12_15_PRIORITY)); - lldbg(" IRQ PRIO: %08x %08x %08x %08x\n", + llerr(" IRQ PRIO: %08x %08x %08x %08x\n", getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY), getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY)); - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY), getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY)); - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY), getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY)); - lldbg(" %08x %08x %08x\n", + llerr(" %08x %08x %08x\n", getreg32(NVIC_IRQ48_51_PRIORITY), getreg32(NVIC_IRQ52_55_PRIORITY), getreg32(NVIC_IRQ56_59_PRIORITY)); leave_critical_section(flags); diff --git a/arch/arm/src/lpc43xx/lpc43_rit.c b/arch/arm/src/lpc43xx/lpc43_rit.c index f80cd550ac..2b153fb1b3 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++; } - lldbg("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_spi.c b/arch/arm/src/lpc43xx/lpc43_spi.c index 629f5654c9..a5e6254ce1 100644 --- a/arch/arm/src/lpc43xx/lpc43_spi.c +++ b/arch/arm/src/lpc43xx/lpc43_spi.c @@ -67,9 +67,9 @@ /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/arch/arm/src/lpc43xx/lpc43_ssp.c b/arch/arm/src/lpc43xx/lpc43_ssp.c index 141c7090f1..4767ac057f 100644 --- a/arch/arm/src/lpc43xx/lpc43_ssp.c +++ b/arch/arm/src/lpc43xx/lpc43_ssp.c @@ -76,9 +76,9 @@ */ #ifdef CONFIG_SSP_DEBUG -# define sspdbg lldbg +# define sspdbg llerr # ifdef CONFIG_SSP_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/arch/arm/src/lpc43xx/lpc43_usb0dev.c b/arch/arm/src/lpc43xx/lpc43_usb0dev.c index 6f0c36e855..035b1827b9 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) { - lldbg("...\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 */ - lldbg("[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 */ - lldbg("%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 */ - lldbg("%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 8d2b07cc22..71d9e68629 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)) - lldbg("\n=============================================================\n"); - lldbg("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)); - lldbg("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)); - lldbg("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)); - lldbg("=============================================================\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 7722349881..45db371a8b 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(); - lldbg("GPIO%c pinset: %08x base: %08x -- %s\n", + llerr("GPIO%c pinset: %08x base: %08x -- %s\n", g_portchar[port], pinset, base, msg); - lldbg(" 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)); - lldbg(" 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)); - lldbg(" 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_irq.c b/arch/arm/src/nuc1xx/nuc_irq.c index ee6f5f1824..961d7c8405 100644 --- a/arch/arm/src/nuc1xx/nuc_irq.c +++ b/arch/arm/src/nuc1xx/nuc_irq.c @@ -97,26 +97,26 @@ static void nuc_dumpnvic(const char *msg, int irq) flags = enter_critical_section(); - lldbg("NVIC (%s, irq=%d):\n", msg, irq); - lldbg(" ISER: %08x ICER: %08x\n", + llerr("NVIC (%s, irq=%d):\n", msg, irq); + llerr(" ISER: %08x ICER: %08x\n", getreg32(ARMV6M_NVIC_ISER), getreg32(ARMV6M_NVIC_ICER)); - lldbg(" ISPR: %08x ICPR: %08x\n", + llerr(" ISPR: %08x ICPR: %08x\n", getreg32(ARMV6M_NVIC_ISPR), getreg32(ARMV6M_NVIC_ICPR)); - lldbg(" IRQ PRIO: %08x %08x %08x %08x\n", + llerr(" IRQ PRIO: %08x %08x %08x %08x\n", getreg32(ARMV6M_NVIC_IPR0), getreg32(ARMV6M_NVIC_IPR1), getreg32(ARMV6M_NVIC_IPR2), getreg32(ARMV6M_NVIC_IPR3)); - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(ARMV6M_NVIC_IPR4), getreg32(ARMV6M_NVIC_IPR5), getreg32(ARMV6M_NVIC_IPR6), getreg32(ARMV6M_NVIC_IPR7)); - lldbg("SYSCON:\n"); - lldbg(" CPUID: %08x\n", + llerr("SYSCON:\n"); + llerr(" CPUID: %08x\n", getreg32(ARMV6M_SYSCON_CPUID)); - lldbg(" ICSR: %08x AIRCR: %08x\n", + llerr(" ICSR: %08x AIRCR: %08x\n", getreg32(ARMV6M_SYSCON_ICSR), getreg32(ARMV6M_SYSCON_AIRCR)); - lldbg(" SCR: %08x CCR: %08x\n", + llerr(" SCR: %08x CCR: %08x\n", getreg32(ARMV6M_SYSCON_SCR), getreg32(ARMV6M_SYSCON_CCR)); - lldbg(" SHPR2: %08x SHPR3: %08x\n", + llerr(" SHPR2: %08x SHPR3: %08x\n", getreg32(ARMV6M_SYSCON_SHPR2), getreg32(ARMV6M_SYSCON_SHPR3)); leave_critical_section(flags); diff --git a/arch/arm/src/sam34/sam4cm_tc.c b/arch/arm/src/sam34/sam4cm_tc.c index 22afa97928..9edcbe9d8c 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; - lldbg("TC%d [%08x]: %s\n", chan->chan, (int)base, msg); - lldbg(" 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; - lldbg("TC%d Channel %d [%08x]: %s\n", chan->chan, chan->chan, (int)base, msg); - lldbg(" 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)); - lldbg(" 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)); - lldbg(" 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 */ - lldbg("...[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)) { - lldbg("%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)) { - lldbg("%08x<-%08x\n", regaddr, regval); + llerr("%08x<-%08x\n", regaddr, regval); } #endif diff --git a/arch/arm/src/sam34/sam4cm_tc.h b/arch/arm/src/sam34/sam4cm_tc.h index 4da8e54a8b..8476619aef 100644 --- a/arch/arm/src/sam34/sam4cm_tc.h +++ b/arch/arm/src/sam34/sam4cm_tc.h @@ -85,12 +85,12 @@ #ifdef CONFIG_SAM34_TC_DEBUG # define tcdbg dbg # define tcinfo info -# define tclldbg lldbg +# define tcllerr llerr # define tcllinfo llinfo #else # define tcdbg(x...) # define tcinfo(x...) -# define tclldbg(x...) +# define tcllerr(x...) # define tcllinfo(x...) #endif diff --git a/arch/arm/src/sam34/sam4cm_tickless.c b/arch/arm/src/sam34/sam4cm_tickless.c index a942d429f3..048c42ffab 100644 --- a/arch/arm/src/sam34/sam4cm_tickless.c +++ b/arch/arm/src/sam34/sam4cm_tickless.c @@ -244,7 +244,7 @@ void up_timer_initialize(void) CONFIG_USEC_PER_TICK); if (ret < 0) { - tclldbg("ERROR: sam_oneshot_initialize failed\n"); + tcllerr("ERROR: sam_oneshot_initialize failed\n"); PANIC(); } @@ -256,7 +256,7 @@ void up_timer_initialize(void) ret = sam_oneshot_max_delay(&g_tickless.oneshot, &max_delay); if (ret < 0) { - tclldbg("ERROR: sam_oneshot_max_delay failed\n"); + tcllerr("ERROR: sam_oneshot_max_delay failed\n"); PANIC(); } @@ -280,7 +280,7 @@ void up_timer_initialize(void) CONFIG_USEC_PER_TICK); if (ret < 0) { - tclldbg("ERROR: sam_freerun_initialize failed\n"); + tcllerr("ERROR: sam_freerun_initialize failed\n"); PANIC(); } diff --git a/arch/arm/src/sam34/sam4l_gpio.c b/arch/arm/src/sam34/sam4l_gpio.c index 4dcefcef55..efd97ee1b7 100644 --- a/arch/arm/src/sam34/sam4l_gpio.c +++ b/arch/arm/src/sam34/sam4l_gpio.c @@ -539,21 +539,21 @@ int sam_dumpgpio(uint32_t pinset, const char *msg) /* The following requires exclusive access to the GPIO registers */ flags = enter_critical_section(); - lldbg("GPIO%c pinset: %08x base: %08x -- %s\n", + llerr("GPIO%c pinset: %08x base: %08x -- %s\n", g_portchar[port], pinset, base, msg); - lldbg(" GPER: %08x PMR0: %08x PMR1: %08x PMR2: %08x\n", + llerr(" GPER: %08x PMR0: %08x PMR1: %08x PMR2: %08x\n", getreg32(base + SAM_GPIO_GPER_OFFSET), getreg32(base + SAM_GPIO_PMR0_OFFSET), getreg32(base + SAM_GPIO_PMR1_OFFSET), getreg32(base + SAM_GPIO_PMR2_OFFSET)); - lldbg(" ODER: %08x OVR: %08x PVR: %08x PUER: %08x\n", + llerr(" ODER: %08x OVR: %08x PVR: %08x PUER: %08x\n", getreg32(base + SAM_GPIO_ODER_OFFSET), getreg32(base + SAM_GPIO_OVR_OFFSET), getreg32(base + SAM_GPIO_PVR_OFFSET), getreg32(base + SAM_GPIO_PUER_OFFSET)); - lldbg(" PDER: %08x IER: %08x IMR0: %08x IMR1: %08x\n", + llerr(" PDER: %08x IER: %08x IMR0: %08x IMR1: %08x\n", getreg32(base + SAM_GPIO_PDER_OFFSET), getreg32(base + SAM_GPIO_IER_OFFSET), getreg32(base + SAM_GPIO_IMR0_OFFSET), getreg32(base + SAM_GPIO_IMR1_OFFSET)); - lldbg(" GFER: %08x IFR: %08x ODCR0: %08x ODCR1: %08x\n", + llerr(" GFER: %08x IFR: %08x ODCR0: %08x ODCR1: %08x\n", getreg32(base + SAM_GPIO_GFER_OFFSET), getreg32(base + SAM_GPIO_IFR_OFFSET), getreg32(base + SAM_GPIO_ODCR0_OFFSET), getreg32(base + SAM_GPIO_ODCR1_OFFSET)); - lldbg(" OSRR0: %08x EVER: %08x PARAM: %08x VERS: %08x\n", + llerr(" OSRR0: %08x EVER: %08x PARAM: %08x VERS: %08x\n", getreg32(base + SAM_GPIO_OSRR0_OFFSET), getreg32(base + SAM_GPIO_EVER_OFFSET), getreg32(base + SAM_GPIO_PARAMETER_OFFSET), getreg32(base + SAM_GPIO_VERSION_OFFSET)); leave_critical_section(flags); diff --git a/arch/arm/src/sam34/sam_emac.c b/arch/arm/src/sam34/sam_emac.c index 8f6e5cec99..1c7d627677 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 */ - lldbg("...[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)) { - lldbg("%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)) { - lldbg("%08x<-%08x\n", address, regval); + llerr("%08x<-%08x\n", address, regval); } putreg32(regval, address); @@ -636,7 +636,7 @@ static int sam_buffer_initialize(struct sam_emac_s *priv) priv->txdesc = (struct emac_txdesc_s *)kmm_memalign(8, allocsize); if (!priv->txdesc) { - nlldbg("ERROR: Failed to allocate TX descriptors\n"); + nllerr("ERROR: Failed to allocate TX descriptors\n"); return -ENOMEM; } @@ -646,7 +646,7 @@ static int sam_buffer_initialize(struct sam_emac_s *priv) priv->rxdesc = (struct emac_rxdesc_s *)kmm_memalign(8, allocsize); if (!priv->rxdesc) { - nlldbg("ERROR: Failed to allocate RX descriptors\n"); + nllerr("ERROR: Failed to allocate RX descriptors\n"); sam_buffer_free(priv); return -ENOMEM; } @@ -657,7 +657,7 @@ static int sam_buffer_initialize(struct sam_emac_s *priv) priv->txbuffer = (uint8_t *)kmm_memalign(8, allocsize); if (!priv->txbuffer) { - nlldbg("ERROR: Failed to allocate TX buffer\n"); + nllerr("ERROR: Failed to allocate TX buffer\n"); sam_buffer_free(priv); return -ENOMEM; } @@ -666,7 +666,7 @@ static int sam_buffer_initialize(struct sam_emac_s *priv) priv->rxbuffer = (uint8_t *)kmm_memalign(8, allocsize); if (!priv->rxbuffer) { - nlldbg("ERROR: Failed to allocate RX buffer\n"); + nllerr("ERROR: Failed to allocate RX buffer\n"); sam_buffer_free(priv); return -ENOMEM; } @@ -760,7 +760,7 @@ static int sam_transmit(struct sam_emac_s *priv) if (dev->d_len > EMAC_TX_UNITSIZE) { - nlldbg("ERROR: Packet too big: %d\n", dev->d_len); + nllerr("ERROR: Packet too big: %d\n", dev->d_len); return -EINVAL; } @@ -772,7 +772,7 @@ static int sam_transmit(struct sam_emac_s *priv) if (sam_txfree(priv) < 1) { - nlldbg("ERROR: No free TX descriptors\n"); + nllerr("ERROR: No free TX descriptors\n"); return -EBUSY; } @@ -1136,7 +1136,7 @@ static int sam_recvframe(struct sam_emac_s *priv) if (pktlen < dev->d_len) { - nlldbg("ERROR: Buffer size %d; frame size %d\n", dev->d_len, pktlen); + nllerr("ERROR: Buffer size %d; frame size %d\n", dev->d_len, pktlen); return -E2BIG; } @@ -1207,7 +1207,7 @@ static void sam_receive(struct sam_emac_s *priv) if (dev->d_len > CONFIG_NET_ETH_MTU) { - nlldbg("DROPPED: Too big: %d\n", dev->d_len); + nllerr("DROPPED: Too big: %d\n", dev->d_len); continue; } @@ -1317,7 +1317,7 @@ static void sam_receive(struct sam_emac_s *priv) else #endif { - nlldbg("DROPPED: Unknown type: %04x\n", BUF->type); + nllerr("DROPPED: Unknown type: %04x\n", BUF->type); } } } @@ -1468,7 +1468,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv) clrbits = EMAC_TSR_RLE | sam_txinuse(priv); sam_txreset(priv); - nlldbg("ERROR: Retry Limit Exceeded TSR: %08x\n", tsr); + nllerr("ERROR: Retry Limit Exceeded TSR: %08x\n", tsr); regval = sam_getreg(priv, SAM_EMAC_NCR); regval |= EMAC_NCR_TXEN; @@ -1479,7 +1479,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv) if ((tsr & EMAC_TSR_COL) != 0) { - nlldbg("ERROR: Collision occurred TSR: %08x\n", tsr); + nllerr("ERROR: Collision occurred TSR: %08x\n", tsr); clrbits |= EMAC_TSR_COL; } @@ -1487,7 +1487,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv) if ((tsr & EMAC_TSR_TFC) != 0) { - nlldbg("ERROR: Transmit Frame Corruption due to AHB error: %08x\n", tsr); + nllerr("ERROR: Transmit Frame Corruption due to AHB error: %08x\n", tsr); clrbits |= EMAC_TSR_TFC; } @@ -1502,7 +1502,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv) if ((tsr & EMAC_TSR_UND) != 0) { - nlldbg("ERROR: Transmit Underrun TSR: %08x\n", tsr); + nllerr("ERROR: Transmit Underrun TSR: %08x\n", tsr); clrbits |= EMAC_TSR_UND; } @@ -1539,7 +1539,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv) if ((rsr & EMAC_RSR_RXOVR) != 0) { - nlldbg("ERROR: Receiver overrun RSR: %08x\n", rsr); + nllerr("ERROR: Receiver overrun RSR: %08x\n", rsr); clrbits |= EMAC_RSR_RXOVR; } @@ -1556,7 +1556,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv) if ((rsr & EMAC_RSR_BNA) != 0) { - nlldbg("ERROR: Buffer not available RSR: %08x\n", rsr); + nllerr("ERROR: Buffer not available RSR: %08x\n", rsr); clrbits |= EMAC_RSR_BNA; } @@ -1578,7 +1578,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv) if ((pending & EMAC_INT_PFNZ) != 0) { - nlldbg("Pause frame received\n"); + nllerr("Pause frame received\n"); } /* Check for Pause Time Zero (PTZ) @@ -1588,7 +1588,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv) if ((pending & EMAC_INT_PTZ) != 0) { - nlldbg("Pause TO!\n"); + nllerr("Pause TO!\n"); } #endif } @@ -1725,7 +1725,7 @@ static int sam_emac_interrupt(int irq, void *context) static inline void sam_txtimeout_process(FAR struct sam_emac_s *priv) { - nlldbg("Timeout!\n"); + nllerr("Timeout!\n"); /* Then reset the hardware. Just take the interface down, then back * up again. @@ -1956,7 +1956,7 @@ static int sam_ifup(struct net_driver_s *dev) struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private; int ret; - nlldbg("Bringing up: %d.%d.%d.%d\n", + nllerr("Bringing up: %d.%d.%d.%d\n", dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff, (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24); @@ -1980,7 +1980,7 @@ static int sam_ifup(struct net_driver_s *dev) ret = sam_phyinit(priv); if (ret < 0) { - nlldbg("ERROR: sam_phyinit failed: %d\n", ret); + nllerr("ERROR: sam_phyinit failed: %d\n", ret); return ret; } @@ -1989,7 +1989,7 @@ static int sam_ifup(struct net_driver_s *dev) ret = sam_autonegotiate(priv); if (ret < 0) { - nlldbg("ERROR: sam_autonegotiate failed: %d\n", ret); + nllerr("ERROR: sam_autonegotiate failed: %d\n", ret); return ret; } @@ -2032,7 +2032,7 @@ static int sam_ifdown(struct net_driver_s *dev) struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private; irqstate_t flags; - nlldbg("Taking the network down\n"); + nllerr("Taking the network down\n"); /* Disable the EMAC interrupt */ @@ -2751,7 +2751,7 @@ static int sam_phyreset(struct sam_emac_s *priv) ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, MII_MCR_RESET); if (ret < 0) { - nlldbg("ERROR: sam_phywrite failed: %d\n", ret); + nllerr("ERROR: sam_phywrite failed: %d\n", ret); } /* Wait for the PHY reset to complete */ @@ -2763,7 +2763,7 @@ static int sam_phyreset(struct sam_emac_s *priv) int result = sam_phyread(priv, priv->phyaddr, MII_MCR, &mcr); if (result < 0) { - nlldbg("ERROR: Failed to read the MCR register: %d\n", ret); + nllerr("ERROR: Failed to read the MCR register: %d\n", ret); ret = result; } else if ((mcr & MII_MCR_RESET) == 0) @@ -2828,7 +2828,7 @@ static int sam_phyfind(struct sam_emac_s *priv, uint8_t *phyaddr) else { - nlldbg("ERROR: sam_phyread failed for PHY address %02x: %d\n", + nllerr("ERROR: sam_phyread failed for PHY address %02x: %d\n", candidate, ret); for (offset = 0; offset < 32; offset++) @@ -2894,7 +2894,7 @@ static int sam_phyread(struct sam_emac_s *priv, uint8_t phyaddr, ret = sam_phywait(priv); if (ret < 0) { - nlldbg("ERROR: sam_phywait failed: %d\n", ret); + nllerr("ERROR: sam_phywait failed: %d\n", ret); return ret; } @@ -2918,7 +2918,7 @@ static int sam_phyread(struct sam_emac_s *priv, uint8_t phyaddr, ret = sam_phywait(priv); if (ret < 0) { - nlldbg("ERROR: sam_phywait failed: %d\n", ret); + nllerr("ERROR: sam_phywait failed: %d\n", ret); return ret; } @@ -2958,7 +2958,7 @@ static int sam_phywrite(struct sam_emac_s *priv, uint8_t phyaddr, ret = sam_phywait(priv); if (ret < 0) { - nlldbg("ERROR: sam_phywait failed: %d\n", ret); + nllerr("ERROR: sam_phywait failed: %d\n", ret); return ret; } @@ -2982,7 +2982,7 @@ static int sam_phywrite(struct sam_emac_s *priv, uint8_t phyaddr, ret = sam_phywait(priv); if (ret < 0) { - nlldbg("ERROR: sam_phywait failed: %d\n", ret); + nllerr("ERROR: sam_phywait failed: %d\n", ret); return ret; } @@ -3026,7 +3026,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_PHYID1, &phyid1); if (ret < 0) { - nlldbg("ERROR: Failed to read PHYID1\n"); + nllerr("ERROR: Failed to read PHYID1\n"); goto errout; } @@ -3035,7 +3035,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_PHYID2, &phyid2); if (ret < 0) { - nlldbg("ERROR: Failed to read PHYID2\n"); + nllerr("ERROR: Failed to read PHYID2\n"); goto errout; } @@ -3051,7 +3051,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) } else { - nlldbg("ERROR: PHY not recognized\n"); + nllerr("ERROR: PHY not recognized\n"); } /* Setup control register */ @@ -3059,7 +3059,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_MCR, &mcr); if (ret < 0) { - nlldbg("ERROR: Failed to read MCR\n"); + nllerr("ERROR: Failed to read MCR\n"); goto errout; } @@ -3070,7 +3070,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, mcr); if (ret < 0) { - nlldbg("ERROR: Failed to write MCR\n"); + nllerr("ERROR: Failed to write MCR\n"); goto errout; } @@ -3085,7 +3085,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phywrite(priv, priv->phyaddr, MII_ADVERTISE, advertise); if (ret < 0) { - nlldbg("ERROR: Failed to write ANAR\n"); + nllerr("ERROR: Failed to write ANAR\n"); goto errout; } @@ -3094,7 +3094,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_MCR, &mcr); if (ret < 0) { - nlldbg("ERROR: Failed to read MCR\n"); + nllerr("ERROR: Failed to read MCR\n"); goto errout; } @@ -3102,7 +3102,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, mcr); if (ret < 0) { - nlldbg("ERROR: Failed to write MCR\n"); + nllerr("ERROR: Failed to write MCR\n"); goto errout; } @@ -3114,7 +3114,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, mcr); if (ret < 0) { - nlldbg("ERROR: Failed to write MCR\n"); + nllerr("ERROR: Failed to write MCR\n"); goto errout; } @@ -3128,7 +3128,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_MSR, &msr); if (ret < 0) { - nlldbg("ERROR: Failed to read MSR\n"); + nllerr("ERROR: Failed to read MSR\n"); goto errout; } @@ -3146,7 +3146,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) if (++timeout >= PHY_RETRY_MAX) { - nlldbg("ERROR: TimeOut\n"); + nllerr("ERROR: TimeOut\n"); sam_phydump(priv); ret = -ETIMEDOUT; goto errout; @@ -3158,7 +3158,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_LPA, &lpa); if (ret < 0) { - nlldbg("ERROR: Failed to read ANLPAR\n"); + nllerr("ERROR: Failed to read ANLPAR\n"); goto errout; } @@ -3244,13 +3244,13 @@ static bool sam_linkup(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_MSR, &msr); if (ret < 0) { - nlldbg("ERROR: Failed to read MSR: %d\n", ret); + nllerr("ERROR: Failed to read MSR: %d\n", ret); goto errout; } if ((msr & MII_MSR_LINKSTATUS) == 0) { - nlldbg("ERROR: MSR LinkStatus: %04x\n", msr); + nllerr("ERROR: MSR LinkStatus: %04x\n", msr); goto errout; } @@ -3259,7 +3259,7 @@ static bool sam_linkup(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, CONFIG_SAM34_EMAC_PHYSR, &physr); if (ret < 0) { - nlldbg("ERROR: Failed to read PHYSR: %d\n", ret); + nllerr("ERROR: Failed to read PHYSR: %d\n", ret); goto errout; } @@ -3354,7 +3354,7 @@ static int sam_phyinit(struct sam_emac_s *priv) ret = sam_phyfind(priv, &priv->phyaddr); if (ret < 0) { - nlldbg("ERROR: sam_phyfind failed: %d\n", ret); + nllerr("ERROR: sam_phyfind failed: %d\n", ret); return ret; } @@ -3823,14 +3823,14 @@ void up_netinitialize(void) priv->txpoll = wd_create(); if (!priv->txpoll) { - nlldbg("ERROR: Failed to create periodic poll timer\n"); + nllerr("ERROR: Failed to create periodic poll timer\n"); return; } priv->txtimeout = wd_create(); /* Create TX timeout timer */ if (!priv->txtimeout) { - nlldbg("ERROR: Failed to create periodic poll timer\n"); + nllerr("ERROR: Failed to create periodic poll timer\n"); goto errout_with_txpoll; } @@ -3843,7 +3843,7 @@ void up_netinitialize(void) ret = sam_buffer_initialize(priv); if (ret < 0) { - nlldbg("ERROR: sam_buffer_initialize failed: %d\n", ret); + nllerr("ERROR: sam_buffer_initialize failed: %d\n", ret); goto errout_with_txtimeout; } @@ -3854,7 +3854,7 @@ void up_netinitialize(void) ret = irq_attach(SAM_IRQ_EMAC, sam_emac_interrupt); if (ret < 0) { - nlldbg("ERROR: Failed to attach the handler to the IRQ%d\n", SAM_IRQ_EMAC); + nllerr("ERROR: Failed to attach the handler to the IRQ%d\n", SAM_IRQ_EMAC); goto errout_with_buffers; } @@ -3867,7 +3867,7 @@ void up_netinitialize(void) ret = sam_ifdown(&priv->dev); if (ret < 0) { - nlldbg("ERROR: Failed to put the interface in the down state: %d\n", ret); + nllerr("ERROR: Failed to put the interface in the down state: %d\n", ret); goto errout_with_buffers; } @@ -3879,7 +3879,7 @@ void up_netinitialize(void) return; } - nlldbg("ERROR: netdev_register() failed: %d\n", ret); + nllerr("ERROR: netdev_register() failed: %d\n", ret); errout_with_buffers: sam_buffer_free(priv); diff --git a/arch/arm/src/sam34/sam_gpio.c b/arch/arm/src/sam34/sam_gpio.c index b0f45e89e7..78f5e1aff1 100644 --- a/arch/arm/src/sam34/sam_gpio.c +++ b/arch/arm/src/sam34/sam_gpio.c @@ -488,41 +488,41 @@ int sam_dumpgpio(uint32_t pinset, const char *msg) /* The following requires exclusive access to the GPIO registers */ flags = enter_critical_section(); - lldbg("PIO%c pinset: %08x base: %08x -- %s\n", + llerr("PIO%c pinset: %08x base: %08x -- %s\n", g_portchar[port], pinset, base, msg); - lldbg(" PSR: %08x OSR: %08x IFSR: %08x ODSR: %08x\n", + llerr(" PSR: %08x OSR: %08x IFSR: %08x ODSR: %08x\n", getreg32(base + SAM_PIO_PSR_OFFSET), getreg32(base + SAM_PIO_OSR_OFFSET), getreg32(base + SAM_PIO_IFSR_OFFSET), getreg32(base + SAM_PIO_ODSR_OFFSET)); - lldbg(" PDSR: %08x IMR: %08x ISR: %08x MDSR: %08x\n", + llerr(" PDSR: %08x IMR: %08x ISR: %08x MDSR: %08x\n", getreg32(base + SAM_PIO_PDSR_OFFSET), getreg32(base + SAM_PIO_IMR_OFFSET), getreg32(base + SAM_PIO_ISR_OFFSET), getreg32(base + SAM_PIO_MDSR_OFFSET)); #if defined(CONFIG_ARCH_CHIP_SAM3U) - lldbg(" ABSR: %08x SCIFSR: %08x DIFSR: %08x IFDGSR: %08x\n", + llerr(" ABSR: %08x SCIFSR: %08x DIFSR: %08x IFDGSR: %08x\n", getreg32(base + SAM_PIO_ABSR_OFFSET), getreg32(base + SAM_PIO_SCIFSR_OFFSET), getreg32(base + SAM_PIO_DIFSR_OFFSET), getreg32(base + SAM_PIO_IFDGSR_OFFSET)); #elif defined(CONFIG_ARCH_CHIP_SAM4S) || defined(CONFIG_ARCH_CHIP_SAM4E) - lldbg(" ABCDSR: %08x %08x IFSCSR: %08x PPDSR: %08x\n", + llerr(" ABCDSR: %08x %08x IFSCSR: %08x PPDSR: %08x\n", getreg32(base + SAM_PIO_ABCDSR1_OFFSET), getreg32(base + SAM_PIO_ABCDSR2_OFFSET), getreg32(base + SAM_PIO_IFSCSR_OFFSET), getreg32(base + SAM_PIO_PPDSR_OFFSET)); #endif - lldbg(" PUSR: %08x SCDR: %08x OWSR: %08x AIMMR: %08x\n", + llerr(" PUSR: %08x SCDR: %08x OWSR: %08x AIMMR: %08x\n", getreg32(base + SAM_PIO_PUSR_OFFSET), getreg32(base + SAM_PIO_SCDR_OFFSET), getreg32(base + SAM_PIO_OWSR_OFFSET), getreg32(base + SAM_PIO_AIMMR_OFFSET)); - lldbg(" ESR: %08x LSR: %08x ELSR: %08x FELLSR: %08x\n", + llerr(" ESR: %08x LSR: %08x ELSR: %08x FELLSR: %08x\n", getreg32(base + SAM_PIO_ESR_OFFSET), getreg32(base + SAM_PIO_LSR_OFFSET), getreg32(base + SAM_PIO_ELSR_OFFSET), getreg32(base + SAM_PIO_FELLSR_OFFSET)); - lldbg(" FRLHSR: %08x LOCKSR: %08x WPMR: %08x WPSR: %08x\n", + llerr(" FRLHSR: %08x LOCKSR: %08x WPMR: %08x WPSR: %08x\n", getreg32(base + SAM_PIO_FRLHSR_OFFSET), getreg32(base + SAM_PIO_LOCKSR_OFFSET), getreg32(base + SAM_PIO_WPMR_OFFSET), getreg32(base + SAM_PIO_WPSR_OFFSET)); #if defined(CONFIG_ARCH_CHIP_SAM4S) || defined(CONFIG_ARCH_CHIP_SAM4E) - lldbg(" PCMR: %08x PCIMR: %08x PCISR: %08x PCRHR: %08x\n", + llerr(" PCMR: %08x PCIMR: %08x PCISR: %08x PCRHR: %08x\n", getreg32(base + SAM_PIO_PCMR_OFFSET), getreg32(base + SAM_PIO_PCIMR_OFFSET), getreg32(base + SAM_PIO_PCISR_OFFSET), getreg32(base + SAM_PIO_PCRHR_OFFSET)); #ifdef CONFIG_ARCH_CHIP_SAM4E - lldbg("SCHMITT: %08x DELAYR:%08x\n", + llerr("SCHMITT: %08x DELAYR:%08x\n", getreg32(base + SAM_PIO_SCHMITT_OFFSET), getreg32(base + SAM_PIO_DELAYR_OFFSET)); #else - lldbg("SCHMITT: %08x\n", + llerr("SCHMITT: %08x\n", getreg32(base + SAM_PIO_SCHMITT_OFFSET)); #endif #endif diff --git a/arch/arm/src/sam34/sam_hsmci.c b/arch/arm/src/sam34/sam_hsmci.c index 8057785991..7b36cac7fb 100644 --- a/arch/arm/src/sam34/sam_hsmci.c +++ b/arch/arm/src/sam34/sam_hsmci.c @@ -1083,7 +1083,7 @@ static void sam_eventtimeout(int argc, uint32_t arg) /* Yes.. wake up any waiting threads */ sam_endwait(priv, SDIOWAIT_TIMEOUT); - flldbg("Timeout\n"); + fllerr("Timeout\n"); } } @@ -1278,7 +1278,7 @@ static int sam_interrupt(int irq, void *context) { /* Yes.. Was it some kind of timeout error? */ - flldbg("ERROR: enabled: %08x pending: %08x\n", enabled, pending); + fllerr("ERROR: enabled: %08x pending: %08x\n", enabled, pending); if ((pending & HSMCI_DATA_TIMEOUT_ERRORS) != 0) { /* Yes.. Terminate with a timeout. */ diff --git a/arch/arm/src/sam34/sam_irq.c b/arch/arm/src/sam34/sam_irq.c index d775907bd5..d1a1de2407 100644 --- a/arch/arm/src/sam34/sam_irq.c +++ b/arch/arm/src/sam34/sam_irq.c @@ -114,40 +114,40 @@ static void sam_dumpnvic(const char *msg, int irq) irqstate_t flags; flags = enter_critical_section(); - lldbg("NVIC (%s, irq=%d):\n", msg, irq); - lldbg(" INTCTRL: %08x VECTAB: %08x\n", + llerr("NVIC (%s, irq=%d):\n", msg, irq); + llerr(" INTCTRL: %08x VECTAB: %08x\n", getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB)); #if 0 - lldbg(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n", + llerr(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n", getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA), getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE)); #endif - lldbg(" IRQ ENABLE: %08x %08x %08x\n", + llerr(" IRQ ENABLE: %08x %08x %08x\n", getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE), getreg32(NVIC_IRQ64_95_ENABLE)); - lldbg(" SYSH_PRIO: %08x %08x %08x\n", + llerr(" SYSH_PRIO: %08x %08x %08x\n", getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY), getreg32(NVIC_SYSH12_15_PRIORITY)); - lldbg(" IRQ PRIO: %08x %08x %08x %08x\n", + llerr(" IRQ PRIO: %08x %08x %08x %08x\n", getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY), getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY)); #if SAM_IRQ_NEXTINT > 15 - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY), getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY)); #endif #if SAM_IRQ_NEXTINT > 31 - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY), getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY)); #endif #if SAM_IRQ_NEXTINT > 47 - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ48_51_PRIORITY), getreg32(NVIC_IRQ52_55_PRIORITY), getreg32(NVIC_IRQ56_59_PRIORITY), getreg32(NVIC_IRQ60_63_PRIORITY)); #endif #if SAM_IRQ_NEXTINT > 63 - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ64_67_PRIORITY), getreg32(NVIC_IRQ68_71_PRIORITY), getreg32(NVIC_IRQ72_75_PRIORITY), getreg32(NVIC_IRQ76_79_PRIORITY)); #endif diff --git a/arch/arm/src/sam34/sam_rtc.c b/arch/arm/src/sam34/sam_rtc.c index 98e06ad936..39a9c7b111 100644 --- a/arch/arm/src/sam34/sam_rtc.c +++ b/arch/arm/src/sam34/sam_rtc.c @@ -91,12 +91,12 @@ #ifdef CONFIG_DEBUG_RTC # define rtcdbg dbg # define rtcinfo info -# define rtclldbg lldbg +# define rtcllerr llerr # define rtcllinfo llinfo #else # define rtcdbg(x...) # define rtcinfo(x...) -# define rtclldbg(x...) +# define rtcllerr(x...) # define rtcllinfo(x...) #endif @@ -149,16 +149,16 @@ uint32_t g_rtt_offset = 0; #ifdef CONFIG_DEBUG_RTC static void rtc_dumpregs(FAR const char *msg) { - rtclldbg("%s:\n", msg); - rtclldbg(" CR: %08x\n", getreg32(SAM_RTC_CR)); - rtclldbg(" MR: %08x\n", getreg32(SAM_RTC_MR)); - rtclldbg(" TIMR: %08x\n", getreg32(SAM_RTC_TIMR)); - rtclldbg(" CALR: %08x\n", getreg32(SAM_RTC_CALR)); - rtclldbg(" TIMALR: %08x\n", getreg32(SAM_RTC_TIMALR)); - rtclldbg(" CALALR: %08x\n", getreg32(SAM_RTC_CALALR)); - rtclldbg(" SR: %08x\n", getreg32(SAM_RTC_SR)); - rtclldbg(" IMR: %08x\n", getreg32(SAM_RTC_IMR)); - rtclldbg(" VER: %08x\n", getreg32(SAM_RTC_VER)); + rtcllerr("%s:\n", msg); + rtcllerr(" CR: %08x\n", getreg32(SAM_RTC_CR)); + rtcllerr(" MR: %08x\n", getreg32(SAM_RTC_MR)); + rtcllerr(" TIMR: %08x\n", getreg32(SAM_RTC_TIMR)); + rtcllerr(" CALR: %08x\n", getreg32(SAM_RTC_CALR)); + rtcllerr(" TIMALR: %08x\n", getreg32(SAM_RTC_TIMALR)); + rtcllerr(" CALALR: %08x\n", getreg32(SAM_RTC_CALALR)); + rtcllerr(" SR: %08x\n", getreg32(SAM_RTC_SR)); + rtcllerr(" IMR: %08x\n", getreg32(SAM_RTC_IMR)); + rtcllerr(" VER: %08x\n", getreg32(SAM_RTC_VER)); } #else # define rtc_dumpregs(msg) @@ -181,13 +181,13 @@ static void rtc_dumpregs(FAR const char *msg) #ifdef CONFIG_DEBUG_RTC static void rtc_dumptime(FAR struct tm *tp, FAR const char *msg) { - rtclldbg("%s:\n", msg); - rtclldbg(" tm_sec: %08x\n", tp->tm_sec); - rtclldbg(" tm_min: %08x\n", tp->tm_min); - rtclldbg(" tm_hour: %08x\n", tp->tm_hour); - rtclldbg(" tm_mday: %08x\n", tp->tm_mday); - rtclldbg(" tm_mon: %08x\n", tp->tm_mon); - rtclldbg(" tm_year: %08x\n", tp->tm_year); + rtcllerr("%s:\n", msg); + rtcllerr(" tm_sec: %08x\n", tp->tm_sec); + rtcllerr(" tm_min: %08x\n", tp->tm_min); + rtcllerr(" tm_hour: %08x\n", tp->tm_hour); + rtcllerr(" tm_mday: %08x\n", tp->tm_mday); + rtcllerr(" tm_mon: %08x\n", tp->tm_mon); + rtcllerr(" tm_year: %08x\n", tp->tm_year); } #else # define rtc_dumptime(tp, msg) @@ -298,7 +298,7 @@ static int rtc_interrupt(int irq, void *context) ret = work_queue(LPWORK, &g_alarmwork, rtc_worker, NULL, 0); if (ret < 0) { - rtclldbg("ERRPR: work_queue failed: %d\n", ret); + rtcllerr("ERRPR: work_queue failed: %d\n", ret); } /* Disable any further alarm interrupts */ diff --git a/arch/arm/src/sam34/sam_rtt.c b/arch/arm/src/sam34/sam_rtt.c index 516153e191..f5f8b7e822 100644 --- a/arch/arm/src/sam34/sam_rtt.c +++ b/arch/arm/src/sam34/sam_rtt.c @@ -76,12 +76,12 @@ /* Debug ********************************************************************/ /* Non-standard debug that may be enabled just for testing the timer - * driver. NOTE: that only lldbg types are used so that the output is + * driver. NOTE: that only llerr types are used so that the output is * immediately available. */ #ifdef CONFIG_DEBUG_RTT -# define rttdbg lldbg +# define rttdbg llerr # define rttinfo llinfo #else # define rttdbg(x...) @@ -214,7 +214,7 @@ static uint32_t sam34_getreg(uint32_t addr) { if (count == 4) { - lldbg("...\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 */ - lldbg("[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 */ - lldbg("%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 */ - lldbg("%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 adf2842ae7..80c2b3dc2c 100644 --- a/arch/arm/src/sam34/sam_spi.c +++ b/arch/arm/src/sam34/sam_spi.c @@ -148,9 +148,9 @@ #endif #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif @@ -441,7 +441,7 @@ static bool spi_checkreg(struct sam_spidev_s *spi, bool wr, uint32_t value, { /* Yes... show how many times we did it */ - lldbg("...[Repeats %d times]...\n", spi->ntimes); + llerr("...[Repeats %d times]...\n", spi->ntimes); } /* Save information about the new access */ @@ -475,7 +475,7 @@ static inline uint32_t spi_getreg(struct sam_spidev_s *spi, #ifdef CONFIG_SAM34_SPI_REGDEBUG if (spi_checkreg(spi, false, value, address)) { - lldbg("%08x->%08x\n", address, value); + llerr("%08x->%08x\n", address, value); } #endif @@ -498,7 +498,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)) { - lldbg("%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 ed67d4b5ca..f16894f788 100644 --- a/arch/arm/src/sam34/sam_tc.c +++ b/arch/arm/src/sam34/sam_tc.c @@ -74,12 +74,12 @@ /* Debug ********************************************************************/ /* Non-standard debug that may be enabled just for testing the timer - * driver. NOTE: that only lldbg types are used so that the output is + * driver. NOTE: that only llerr types are used so that the output is * immediately available. */ #ifdef CONFIG_DEBUG_TIMER -# define tcdbg lldbg +# define tcdbg llerr # define tcinfo llinfo #else # define tcdbg(x...) @@ -195,7 +195,7 @@ static uint32_t sam34_getreg(uint32_t addr) { if (count == 4) { - lldbg("...\n"); + llerr("...\n"); } return val; @@ -212,7 +212,7 @@ static uint32_t sam34_getreg(uint32_t addr) { /* Yes.. then show how many times the value repeated */ - lldbg("[repeats %d more times]\n", count-3); + llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -224,7 +224,7 @@ static uint32_t sam34_getreg(uint32_t addr) /* Show the register value read */ - lldbg("%08lx->%08lx\n", addr, val); + llerr("%08lx->%08lx\n", addr, val); return val; } #endif @@ -242,7 +242,7 @@ static void sam34_putreg(uint32_t val, uint32_t addr) { /* Show the register value being written */ - lldbg("%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 1b2030237f..6a720f181c 100644 --- a/arch/arm/src/sam34/sam_twi.c +++ b/arch/arm/src/sam34/sam_twi.c @@ -101,12 +101,12 @@ #ifdef CONFIG_DEBUG_I2C # define i2cdbg dbg # define i2cinfo info -# define i2clldbg lldbg +# define i2cllerr llerr # define i2cllinfo llinfo #else # define i2cdbg(x...) # define i2cinfo(x...) -# define i2clldbg(x...) +# define i2cllerr(x...) # define i2cllinfo(x...) #endif @@ -288,7 +288,7 @@ static bool twi_checkreg(struct twi_dev_s *priv, bool wr, uint32_t value, { /* Yes... show how many times we did it */ - lldbg("...[Repeats %d times]...\n", priv->ntimes); + llerr("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -320,7 +320,7 @@ static uint32_t twi_getabs(struct twi_dev_s *priv, uintptr_t address) if (twi_checkreg(priv, false, value, address)) { - lldbg("%08x->%08x\n", address, value); + llerr("%08x->%08x\n", address, value); } return value; @@ -341,7 +341,7 @@ static void twi_putabs(struct twi_dev_s *priv, uintptr_t address, { if (twi_checkreg(priv, true, value, address)) { - lldbg("%08x<-%08x\n", address, value); + llerr("%08x<-%08x\n", address, value); } putreg32(value, address); @@ -401,9 +401,9 @@ static int twi_wait(struct twi_dev_s *priv) do { - i2clldbg("TWI%d Waiting...\n", priv->twi); + i2cllerr("TWI%d Waiting...\n", priv->twi); twi_takesem(&priv->waitsem); - i2clldbg("TWI%d Awakened with result: %d\n", priv->twi, priv->result); + i2cllerr("TWI%d Awakened with result: %d\n", priv->twi, priv->result); } while (priv->result == -EBUSY); @@ -470,7 +470,7 @@ static int twi_interrupt(struct twi_dev_s *priv) { /* Wake up the thread with an I/O error indication */ - i2clldbg("ERROR: TWI%d pending: %08x\n", priv->twi, pending); + i2cllerr("ERROR: TWI%d pending: %08x\n", priv->twi, pending); twi_wakeup(priv, -EIO); } @@ -593,7 +593,7 @@ static void twi_timeout(int argc, uint32_t arg, ...) { struct twi_dev_s *priv = (struct twi_dev_s *)arg; - i2clldbg("TWI%d Timeout!\n", priv->twi); + i2cllerr("TWI%d Timeout!\n", priv->twi); twi_wakeup(priv, -ETIMEDOUT); } diff --git a/arch/arm/src/sam34/sam_udp.c b/arch/arm/src/sam34/sam_udp.c index 976867c706..b1842e9d9f 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) { - lldbg("%p%s%08x\n", regaddr, iswrite ? "<-" : "->", regval); + llerr("%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. */ - lldbg("[repeats %d more times]\n", count); + llerr("[repeats %d more times]\n", count); } } @@ -737,15 +737,15 @@ static void sam_dumpep(struct sam_usbdev_s *priv, uint8_t epno) { /* Global Registers */ - lldbg("Global Registers:\n"); - lldbg(" FRMNUM: %08x\n", sam_getreg(SAM_UDP_FRMNUM)); - lldbg("GLBSTAT: %08x\n", sam_getreg(SAM_UDP_GLBSTAT)); - lldbg(" FADDR: %08x\n", sam_getreg(SAM_UDP_FADDR)); - lldbg(" IMR: %08x\n", sam_getreg(SAM_UDP_IMR)); - lldbg(" ISR: %08x\n", sam_getreg(SAM_UDP_ISR)); - lldbg(" RSTEP: %08x\n", sam_getreg(SAM_UDP_RSTEP)); - lldbg(" TXVC: %08x\n", sam_getreg(SAM_UDP_TXVC)); - lldbg(" CSR[%d]: %08x\n", epno, sam_getreg(SAM_UDPEP_CSR(epno))); + llerr("Global Registers:\n"); + llerr(" FRMNUM: %08x\n", sam_getreg(SAM_UDP_FRMNUM)); + llerr("GLBSTAT: %08x\n", sam_getreg(SAM_UDP_GLBSTAT)); + llerr(" FADDR: %08x\n", sam_getreg(SAM_UDP_FADDR)); + llerr(" IMR: %08x\n", sam_getreg(SAM_UDP_IMR)); + llerr(" ISR: %08x\n", sam_getreg(SAM_UDP_ISR)); + llerr(" RSTEP: %08x\n", sam_getreg(SAM_UDP_RSTEP)); + llerr(" TXVC: %08x\n", sam_getreg(SAM_UDP_TXVC)); + llerr(" CSR[%d]: %08x\n", epno, sam_getreg(SAM_UDPEP_CSR(epno))); } #endif @@ -2946,7 +2946,7 @@ static int sam_ep_disable(struct usbdev_ep_s *ep) if (!ep) { usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0); - ulldbg("ERROR: ep=%p\n", ep); + ullerr("ERROR: ep=%p\n", ep); return -EINVAL; } #endif @@ -3078,7 +3078,7 @@ static int sam_ep_submit(struct usbdev_ep_s *ep, struct usbdev_req_s *req) if (!req || !req->callback || !req->buf || !ep) { usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0); - ulldbg("ERROR: req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); + ullerr("ERROR: req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); return -EINVAL; } #endif @@ -3090,7 +3090,7 @@ static int sam_ep_submit(struct usbdev_ep_s *ep, struct usbdev_req_s *req) if (!priv->driver) { usbtrace(TRACE_DEVERROR(SAM_TRACEERR_NOTCONFIGURED), priv->usbdev.speed); - ulldbg("ERROR: driver=%p\n", priv->driver); + ullerr("ERROR: driver=%p\n", priv->driver); return -ESHUTDOWN; } #endif @@ -3118,7 +3118,7 @@ static int sam_ep_submit(struct usbdev_ep_s *ep, struct usbdev_req_s *req) * "pending" they will get queue until the stall is cleared. */ - ulldbg("Pending stall clear\n"); + ullerr("Pending stall clear\n"); sam_req_enqueue(&privep->pendq, privreq); usbtrace(TRACE_INREQQUEUED(epno), req->len); ret = OK; diff --git a/arch/arm/src/sam34/sam_wdt.c b/arch/arm/src/sam34/sam_wdt.c index be00925842..37ae65e5bf 100644 --- a/arch/arm/src/sam34/sam_wdt.c +++ b/arch/arm/src/sam34/sam_wdt.c @@ -83,12 +83,12 @@ /* Debug ********************************************************************/ /* Non-standard debug that may be enabled just for testing the watchdog - * driver. NOTE: that only lldbg types are used so that the output is + * driver. NOTE: that only llerr types are used so that the output is * immediately available. */ #ifdef CONFIG_DEBUG_WATCHDOG -# define wddbg lldbg +# define wddbg llerr # define wdinfo llinfo #else # define wddbg(x...) @@ -197,7 +197,7 @@ static uint32_t sam34_getreg(uint32_t addr) { if (count == 4) { - lldbg("...\n"); + llerr("...\n"); } return val; @@ -214,7 +214,7 @@ static uint32_t sam34_getreg(uint32_t addr) { /* Yes.. then show how many times the value repeated */ - lldbg("[repeats %d more times]\n", count-3); + llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -226,7 +226,7 @@ static uint32_t sam34_getreg(uint32_t addr) /* Show the register value read */ - lldbg("%08x->%08x\n", addr, val); + llerr("%08x->%08x\n", addr, val); return val; } #endif @@ -244,7 +244,7 @@ static void sam34_putreg(uint32_t val, uint32_t addr) { /* Show the register value being written */ - lldbg("%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 82208b0bdc..e92091db05 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 */ - lldbg("...[Repeats %d times]...\n", priv->ntimes); + llerr("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -751,7 +751,7 @@ static void sam_adc_dmacallback(DMA_HANDLE handle, void *arg, int result) ret = work_queue(HPWORK, &priv->work, sam_adc_dmadone, priv, 0); if (ret != 0) { - alldbg("ERROR: Failed to queue work: %d\n", ret); + allerr("ERROR: Failed to queue work: %d\n", ret); } } @@ -957,7 +957,7 @@ static int sam_adc_interrupt(int irq, void *context) ret = work_queue(HPWORK, &priv->work, sam_adc_endconversion, priv, 0); if (ret != 0) { - alldbg("ERROR: Failed to queue work: %d\n", ret); + allerr("ERROR: Failed to queue work: %d\n", ret); } pending &= ~ADC_INT_EOCALL; @@ -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)) { - lldbg("%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)) { - lldbg("%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 14388795f9..c666b09ce6 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 { - lldbg("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); - lldbg(" 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 { - lldbg("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); - lldbg(" 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 { - lldbg("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); - lldbg(" 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 { - lldbg("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); - lldbg(" 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 { - lldbg("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); - lldbg(" 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) { - lldbg("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); - lldbg(" 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 b9a3ee3892..bda4b8b4dc 100644 --- a/arch/arm/src/sama5/sam_can.c +++ b/arch/arm/src/sama5/sam_can.c @@ -129,12 +129,12 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg # define caninfo info -# define canlldbg lldbg +# define canllerr llerr # define canllinfo llinfo #else # define candbg(x...) # define caninfo(x...) -# define canlldbg(x...) +# define canllerr(x...) # define canllinfo(x...) #endif @@ -386,7 +386,7 @@ static uint32_t can_getreg(FAR struct sam_can_s *priv, int offset) { if (priv->count == 4) { - lldbg("...\n"); + llerr("...\n"); } return regval; @@ -403,7 +403,7 @@ static uint32_t can_getreg(FAR struct sam_can_s *priv, int offset) { /* Yes.. then show how many times the value repeated */ - lldbg("[repeats %d more times]\n", priv->count - 3); + llerr("[repeats %d more times]\n", priv->count - 3); } /* Save the new address, value, and count */ @@ -415,7 +415,7 @@ static uint32_t can_getreg(FAR struct sam_can_s *priv, int offset) /* Show the register value read */ - lldbg("%08x->%08x\n", regaddr, regval); + llerr("%08x->%08x\n", regaddr, regval); return regval; } @@ -452,7 +452,7 @@ static void can_putreg(FAR struct sam_can_s *priv, int offset, uint32_t regval) /* Show the register value being written */ - lldbg("%08x<-%08x\n", regaddr, regval); + llerr("%08x<-%08x\n", regaddr, regval); /* Write the value */ @@ -489,26 +489,26 @@ static void can_dumpctrlregs(FAR struct sam_can_s *priv, FAR const char *msg) if (msg) { - canlldbg("Control Registers: %s\n", msg); + canllerr("Control Registers: %s\n", msg); } else { - canlldbg("Control Registers:\n"); + canllerr("Control Registers:\n"); } /* CAN control and status registers */ - lldbg(" 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)); - lldbg(" 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)); - lldbg(" 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)); @@ -538,27 +538,27 @@ static void can_dumpmbregs(FAR struct sam_can_s *priv, FAR const char *msg) if (msg) { - canlldbg("Mailbox Registers: %s\n", msg); + canllerr("Mailbox Registers: %s\n", msg); } else { - canlldbg("Mailbox Registers:\n"); + canllerr("Mailbox Registers:\n"); } for (i = 0; i < SAM_CAN_NMAILBOXES; i++) { mbbase = config->base + SAM_CAN_MBn_OFFSET(i); - lldbg(" MB%d:\n", i); + llerr(" MB%d:\n", i); /* CAN mailbox registers */ - lldbg(" 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)); - lldbg(" 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)); @@ -866,7 +866,7 @@ static int can_setup(FAR struct can_dev_s *dev) ret = can_hwinitialize(priv); if (ret < 0) { - canlldbg("CAN%d H/W initialization failed: %d\n", config->port, ret); + canllerr("CAN%d H/W initialization failed: %d\n", config->port, ret); return ret; } @@ -878,7 +878,7 @@ static int can_setup(FAR struct can_dev_s *dev) ret = irq_attach(config->pid, config->handler); if (ret < 0) { - canlldbg("Failed to attach CAN%d IRQ (%d)", config->port, config->pid); + canllerr("Failed to attach CAN%d IRQ (%d)", config->port, config->pid); return ret; } @@ -887,7 +887,7 @@ static int can_setup(FAR struct can_dev_s *dev) ret = can_recvsetup(priv); if (ret < 0) { - canlldbg("CAN%d H/W initialization failed: %d\n", config->port, ret); + canllerr("CAN%d H/W initialization failed: %d\n", config->port, ret); return ret; } @@ -1342,7 +1342,7 @@ static inline void can_rxinterrupt(FAR struct can_dev_s *dev, int mbndx, ret = can_receive(dev, &hdr, (FAR uint8_t *)md); if (ret < 0) { - canlldbg("ERROR: can_receive failed: %d\n", ret); + canllerr("ERROR: can_receive failed: %d\n", ret); } /* Set the MTCR flag in the CAN_MCRx register. This clears the @@ -1437,9 +1437,9 @@ static inline void can_mbinterrupt(FAR struct can_dev_s *dev, int mbndx) case CAN_MMR_MOT_CONSUMER: /* Consumer Mailbox */ case CAN_MMR_MOT_PRODUCER: /* Producer Mailbox */ case CAN_MMR_MOT_DISABLED: /* Mailbox is disabled */ - canlldbg("ERROR: CAN%d MB%d: Unsupported or invalid mailbox type\n", + canllerr("ERROR: CAN%d MB%d: Unsupported or invalid mailbox type\n", priv->config->port, mbndx); - canlldbg(" MSR: %08x MMR: %08x\n", msr, mmr); + canllerr(" MSR: %08x MMR: %08x\n", msr, mmr); break; } } @@ -1530,7 +1530,7 @@ static void can_interrupt(FAR struct can_dev_s *dev) if ((pending & ~CAN_INT_MBALL) != 0) { - canlldbg("ERROR: CAN%d system interrupt, SR=%08x IMR=%08x\n", + canllerr("ERROR: CAN%d system interrupt, SR=%08x IMR=%08x\n", priv->config->port, sr, imr); } } diff --git a/arch/arm/src/sama5/sam_dmac.c b/arch/arm/src/sama5/sam_dmac.c index 8c305b5a9b..794cac2373 100644 --- a/arch/arm/src/sama5/sam_dmac.c +++ b/arch/arm/src/sama5/sam_dmac.c @@ -1818,7 +1818,7 @@ static int sam_dmac_interrupt(struct sam_dmac_s *dmac) { /* Yes... Terminate the transfer with an error? */ - dmalldbg("ERROR: DMA failed: %08x\n", regval); + dmallerr("ERROR: DMA failed: %08x\n", regval); sam_dmaterminate(dmach, -EIO); } diff --git a/arch/arm/src/sama5/sam_ehci.c b/arch/arm/src/sama5/sam_ehci.c index f5affbb515..7773652fc3 100644 --- a/arch/arm/src/sama5/sam_ehci.c +++ b/arch/arm/src/sama5/sam_ehci.c @@ -635,7 +635,7 @@ static uint32_t sam_swap32(uint32_t value) static void sam_printreg(volatile uint32_t *regaddr, uint32_t regval, bool iswrite) { - lldbg("%08x%s%08x\n", (uintptr_t)regaddr, iswrite ? "<-" : "->", regval); + llerr("%08x%s%08x\n", (uintptr_t)regaddr, iswrite ? "<-" : "->", regval); } #endif @@ -686,7 +686,7 @@ static void sam_checkreg(volatile uint32_t *regaddr, uint32_t regval, bool iswri { /* No.. More than one. */ - lldbg("[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 ff99f550f7..5f263b8b69 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 */ - lldbg("...[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)) { - lldbg("%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)) { - lldbg("%08x<-%08x\n", address, regval); + llerr("%08x<-%08x\n", address, regval); } putreg32(regval, address); @@ -607,7 +607,7 @@ static int sam_buffer_initialize(struct sam_emac_s *priv) priv->txdesc = (struct emac_txdesc_s *)kmm_memalign(8, allocsize); if (!priv->txdesc) { - nlldbg("ERROR: Failed to allocate TX descriptors\n"); + nllerr("ERROR: Failed to allocate TX descriptors\n"); return -ENOMEM; } @@ -617,7 +617,7 @@ static int sam_buffer_initialize(struct sam_emac_s *priv) priv->rxdesc = (struct emac_rxdesc_s *)kmm_memalign(8, allocsize); if (!priv->rxdesc) { - nlldbg("ERROR: Failed to allocate RX descriptors\n"); + nllerr("ERROR: Failed to allocate RX descriptors\n"); sam_buffer_free(priv); return -ENOMEM; } @@ -628,7 +628,7 @@ static int sam_buffer_initialize(struct sam_emac_s *priv) priv->txbuffer = (uint8_t *)kmm_memalign(8, allocsize); if (!priv->txbuffer) { - nlldbg("ERROR: Failed to allocate TX buffer\n"); + nllerr("ERROR: Failed to allocate TX buffer\n"); sam_buffer_free(priv); return -ENOMEM; } @@ -637,7 +637,7 @@ static int sam_buffer_initialize(struct sam_emac_s *priv) priv->rxbuffer = (uint8_t *)kmm_memalign(8, allocsize); if (!priv->rxbuffer) { - nlldbg("ERROR: Failed to allocate RX buffer\n"); + nllerr("ERROR: Failed to allocate RX buffer\n"); sam_buffer_free(priv); return -ENOMEM; } @@ -732,7 +732,7 @@ static int sam_transmit(struct sam_emac_s *priv) if (dev->d_len > EMAC_TX_UNITSIZE) { - nlldbg("ERROR: Packet too big: %d\n", dev->d_len); + nllerr("ERROR: Packet too big: %d\n", dev->d_len); return -EINVAL; } @@ -744,7 +744,7 @@ static int sam_transmit(struct sam_emac_s *priv) if (sam_txfree(priv) < 1) { - nlldbg("ERROR: No free TX descriptors\n"); + nllerr("ERROR: No free TX descriptors\n"); return -EBUSY; } @@ -1132,7 +1132,7 @@ static int sam_recvframe(struct sam_emac_s *priv) if (pktlen < dev->d_len) { - nlldbg("ERROR: Buffer size %d; frame size %d\n", dev->d_len, pktlen); + nllerr("ERROR: Buffer size %d; frame size %d\n", dev->d_len, pktlen); return -E2BIG; } @@ -1212,7 +1212,7 @@ static void sam_receive(struct sam_emac_s *priv) if (dev->d_len > CONFIG_NET_ETH_MTU) { - nlldbg("DROPPED: Too big: %d\n", dev->d_len); + nllerr("DROPPED: Too big: %d\n", dev->d_len); continue; } @@ -1322,7 +1322,7 @@ static void sam_receive(struct sam_emac_s *priv) else #endif { - nlldbg("DROPPED: Unknown type: %04x\n", BUF->type); + nllerr("DROPPED: Unknown type: %04x\n", BUF->type); } } } @@ -1475,7 +1475,7 @@ static int sam_emac_interrupt(int irq, void *context) clrbits = EMAC_TSR_RLES | sam_txinuse(priv); sam_txreset(priv); - nlldbg("ERROR: Retry Limit Exceeded TSR: %08x\n", tsr); + nllerr("ERROR: Retry Limit Exceeded TSR: %08x\n", tsr); regval = sam_getreg(priv, SAM_EMAC_NCR); regval |= EMAC_NCR_TE; @@ -1486,7 +1486,7 @@ static int sam_emac_interrupt(int irq, void *context) if ((tsr & EMAC_TSR_COL) != 0) { - nlldbg("ERROR: Collision occurred TSR: %08x\n", tsr); + nllerr("ERROR: Collision occurred TSR: %08x\n", tsr); clrbits |= EMAC_TSR_COL; } @@ -1494,7 +1494,7 @@ static int sam_emac_interrupt(int irq, void *context) if ((tsr & EMAC_TSR_BEX) != 0) { - nlldbg("ERROR: Buffers exhausted mid-frame TSR: %08x\n", tsr); + nllerr("ERROR: Buffers exhausted mid-frame TSR: %08x\n", tsr); clrbits |= EMAC_TSR_BEX; } @@ -1509,7 +1509,7 @@ static int sam_emac_interrupt(int irq, void *context) if ((tsr & EMAC_TSR_UND) != 0) { - nlldbg("ERROR: Transmit Underrun TSR: %08x\n", tsr); + nllerr("ERROR: Transmit Underrun TSR: %08x\n", tsr); clrbits |= EMAC_TSR_UND; } @@ -1546,7 +1546,7 @@ static int sam_emac_interrupt(int irq, void *context) if ((rsr & EMAC_RSR_OVR) != 0) { - nlldbg("ERROR: Receiver overrun RSR: %08x\n", rsr); + nllerr("ERROR: Receiver overrun RSR: %08x\n", rsr); clrbits |= EMAC_RSR_OVR; } @@ -1563,7 +1563,7 @@ static int sam_emac_interrupt(int irq, void *context) if ((rsr & EMAC_RSR_BNA) != 0) { - nlldbg("ERROR: Buffer not available RSR: %08x\n", rsr); + nllerr("ERROR: Buffer not available RSR: %08x\n", rsr); clrbits |= EMAC_RSR_BNA; } @@ -1584,7 +1584,7 @@ static int sam_emac_interrupt(int irq, void *context) if ((pending & EMAC_INT_PFR) != 0) { - nlldbg("Pause frame received\n"); + nllerr("Pause frame received\n"); } /* Check for Pause Time Zero (PTZ) @@ -1594,7 +1594,7 @@ static int sam_emac_interrupt(int irq, void *context) if ((pending & EMAC_INT_PTZ) != 0) { - nlldbg("Pause TO!\n"); + nllerr("Pause TO!\n"); } #endif @@ -1624,7 +1624,7 @@ static void sam_txtimeout(int argc, uint32_t arg, ...) { struct sam_emac_s *priv = (struct sam_emac_s *)arg; - nlldbg("Timeout!\n"); + nllerr("Timeout!\n"); /* Then reset the hardware. Just take the interface down, then back * up again. @@ -1699,7 +1699,7 @@ static int sam_ifup(struct net_driver_s *dev) struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private; int ret; - nlldbg("Bringing up: %d.%d.%d.%d\n", + nllerr("Bringing up: %d.%d.%d.%d\n", dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff, (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24); @@ -1723,7 +1723,7 @@ static int sam_ifup(struct net_driver_s *dev) ret = sam_phyinit(priv); if (ret < 0) { - nlldbg("ERROR: sam_phyinit failed: %d\n", ret); + nllerr("ERROR: sam_phyinit failed: %d\n", ret); return ret; } @@ -1732,7 +1732,7 @@ static int sam_ifup(struct net_driver_s *dev) ret = sam_autonegotiate(priv); if (ret < 0) { - nlldbg("ERROR: sam_autonegotiate failed: %d\n", ret); + nllerr("ERROR: sam_autonegotiate failed: %d\n", ret); return ret; } @@ -1775,7 +1775,7 @@ static int sam_ifdown(struct net_driver_s *dev) struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private; irqstate_t flags; - nlldbg("Taking the network down\n"); + nllerr("Taking the network down\n"); /* Disable the EMAC interrupt */ @@ -2423,7 +2423,7 @@ static int sam_phyreset(struct sam_emac_s *priv) ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, MII_MCR_RESET); if (ret < 0) { - nlldbg("ERROR: sam_phywrite failed: %d\n", ret); + nllerr("ERROR: sam_phywrite failed: %d\n", ret); } /* Wait for the PHY reset to complete */ @@ -2435,7 +2435,7 @@ static int sam_phyreset(struct sam_emac_s *priv) int result = sam_phyread(priv, priv->phyaddr, MII_MCR, &mcr); if (result < 0) { - nlldbg("ERROR: Failed to read the MCR register: %d\n", ret); + nllerr("ERROR: Failed to read the MCR register: %d\n", ret); ret = result; } else if ((mcr & MII_MCR_RESET) == 0) @@ -2500,7 +2500,7 @@ static int sam_phyfind(struct sam_emac_s *priv, uint8_t *phyaddr) else { - nlldbg("ERROR: sam_phyread failed for PHY address %02x: %d\n", + nllerr("ERROR: sam_phyread failed for PHY address %02x: %d\n", candidate, ret); for (offset = 0; offset < 32; offset++) @@ -2566,7 +2566,7 @@ static int sam_phyread(struct sam_emac_s *priv, uint8_t phyaddr, ret = sam_phywait(priv); if (ret < 0) { - nlldbg("ERROR: sam_phywait failed: %d\n", ret); + nllerr("ERROR: sam_phywait failed: %d\n", ret); return ret; } @@ -2581,7 +2581,7 @@ static int sam_phyread(struct sam_emac_s *priv, uint8_t phyaddr, ret = sam_phywait(priv); if (ret < 0) { - nlldbg("ERROR: sam_phywait failed: %d\n", ret); + nllerr("ERROR: sam_phywait failed: %d\n", ret); return ret; } @@ -2621,7 +2621,7 @@ static int sam_phywrite(struct sam_emac_s *priv, uint8_t phyaddr, ret = sam_phywait(priv); if (ret < 0) { - nlldbg("ERROR: sam_phywait failed: %d\n", ret); + nllerr("ERROR: sam_phywait failed: %d\n", ret); return ret; } @@ -2636,7 +2636,7 @@ static int sam_phywrite(struct sam_emac_s *priv, uint8_t phyaddr, ret = sam_phywait(priv); if (ret < 0) { - nlldbg("ERROR: sam_phywait failed: %d\n", ret); + nllerr("ERROR: sam_phywait failed: %d\n", ret); return ret; } @@ -2680,7 +2680,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_PHYID1, &phyid1); if (ret < 0) { - nlldbg("ERROR: Failed to read PHYID1\n"); + nllerr("ERROR: Failed to read PHYID1\n"); goto errout; } @@ -2689,7 +2689,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_PHYID2, &phyid2); if (ret < 0) { - nlldbg("ERROR: Failed to read PHYID2\n"); + nllerr("ERROR: Failed to read PHYID2\n"); goto errout; } @@ -2705,7 +2705,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) } else { - nlldbg("ERROR: PHY not recognized\n"); + nllerr("ERROR: PHY not recognized\n"); } /* Setup control register */ @@ -2713,7 +2713,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_MCR, &mcr); if (ret < 0) { - nlldbg("ERROR: Failed to read MCR\n"); + nllerr("ERROR: Failed to read MCR\n"); goto errout; } @@ -2724,7 +2724,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, mcr); if (ret < 0) { - nlldbg("ERROR: Failed to write MCR\n"); + nllerr("ERROR: Failed to write MCR\n"); goto errout; } @@ -2739,7 +2739,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phywrite(priv, priv->phyaddr, MII_ADVERTISE, advertise); if (ret < 0) { - nlldbg("ERROR: Failed to write ANAR\n"); + nllerr("ERROR: Failed to write ANAR\n"); goto errout; } @@ -2748,7 +2748,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_MCR, &mcr); if (ret < 0) { - nlldbg("ERROR: Failed to read MCR\n"); + nllerr("ERROR: Failed to read MCR\n"); goto errout; } @@ -2756,7 +2756,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, mcr); if (ret < 0) { - nlldbg("ERROR: Failed to write MCR\n"); + nllerr("ERROR: Failed to write MCR\n"); goto errout; } @@ -2768,7 +2768,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, mcr); if (ret < 0) { - nlldbg("ERROR: Failed to write MCR\n"); + nllerr("ERROR: Failed to write MCR\n"); goto errout; } @@ -2782,7 +2782,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_MSR, &msr); if (ret < 0) { - nlldbg("ERROR: Failed to read MSR\n"); + nllerr("ERROR: Failed to read MSR\n"); goto errout; } @@ -2800,7 +2800,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) if (++timeout >= PHY_RETRY_MAX) { - nlldbg("ERROR: TimeOut\n"); + nllerr("ERROR: TimeOut\n"); sam_phydump(priv); ret = -ETIMEDOUT; goto errout; @@ -2812,7 +2812,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_LPA, &lpa); if (ret < 0) { - nlldbg("ERROR: Failed to read ANLPAR\n"); + nllerr("ERROR: Failed to read ANLPAR\n"); goto errout; } @@ -2902,13 +2902,13 @@ static bool sam_linkup(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_MSR, &msr); if (ret < 0) { - nlldbg("ERROR: Failed to read MSR: %d\n", ret); + nllerr("ERROR: Failed to read MSR: %d\n", ret); goto errout; } if ((msr & MII_MSR_LINKSTATUS) == 0) { - nlldbg("ERROR: MSR LinkStatus: %04x\n", msr); + nllerr("ERROR: MSR LinkStatus: %04x\n", msr); goto errout; } @@ -2917,7 +2917,7 @@ static bool sam_linkup(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, CONFIG_SAMA5_EMAC_PHYSR, &physr); if (ret < 0) { - nlldbg("ERROR: Failed to read PHYSR: %d\n", ret); + nllerr("ERROR: Failed to read PHYSR: %d\n", ret); goto errout; } @@ -3024,7 +3024,7 @@ static int sam_phyinit(struct sam_emac_s *priv) ret = sam_phyfind(priv, &priv->phyaddr); if (ret < 0) { - nlldbg("ERROR: sam_phyfind failed: %d\n", ret); + nllerr("ERROR: sam_phyfind failed: %d\n", ret); return ret; } diff --git a/arch/arm/src/sama5/sam_emacb.c b/arch/arm/src/sama5/sam_emacb.c index b593a15181..5452e8d0f8 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 */ - lldbg("...[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)) { - lldbg("%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)) { - lldbg("%08x<-%08x\n", regaddr, regval); + llerr("%08x<-%08x\n", regaddr, regval); } #endif @@ -970,7 +970,7 @@ static int sam_buffer_initialize(struct sam_emac_s *priv) priv->txdesc = (struct emac_txdesc_s *)kmm_memalign(8, allocsize); if (!priv->txdesc) { - nlldbg("ERROR: Failed to allocate TX descriptors\n"); + nllerr("ERROR: Failed to allocate TX descriptors\n"); return -ENOMEM; } @@ -980,7 +980,7 @@ static int sam_buffer_initialize(struct sam_emac_s *priv) priv->rxdesc = (struct emac_rxdesc_s *)kmm_memalign(8, allocsize); if (!priv->rxdesc) { - nlldbg("ERROR: Failed to allocate RX descriptors\n"); + nllerr("ERROR: Failed to allocate RX descriptors\n"); sam_buffer_free(priv); return -ENOMEM; } @@ -991,7 +991,7 @@ static int sam_buffer_initialize(struct sam_emac_s *priv) priv->txbuffer = (uint8_t *)kmm_memalign(8, allocsize); if (!priv->txbuffer) { - nlldbg("ERROR: Failed to allocate TX buffer\n"); + nllerr("ERROR: Failed to allocate TX buffer\n"); sam_buffer_free(priv); return -ENOMEM; } @@ -1000,7 +1000,7 @@ static int sam_buffer_initialize(struct sam_emac_s *priv) priv->rxbuffer = (uint8_t *)kmm_memalign(8, allocsize); if (!priv->rxbuffer) { - nlldbg("ERROR: Failed to allocate RX buffer\n"); + nllerr("ERROR: Failed to allocate RX buffer\n"); sam_buffer_free(priv); return -ENOMEM; } @@ -1095,7 +1095,7 @@ static int sam_transmit(struct sam_emac_s *priv) if (dev->d_len > EMAC_TX_UNITSIZE) { - nlldbg("ERROR: Packet too big: %d\n", dev->d_len); + nllerr("ERROR: Packet too big: %d\n", dev->d_len); return -EINVAL; } @@ -1107,7 +1107,7 @@ static int sam_transmit(struct sam_emac_s *priv) if (sam_txfree(priv) < 1) { - nlldbg("ERROR: No free TX descriptors\n"); + nllerr("ERROR: No free TX descriptors\n"); return -EBUSY; } @@ -1494,7 +1494,7 @@ static int sam_recvframe(struct sam_emac_s *priv) nllinfo("rxndx: %d d_len: %d\n", priv->rxndx, dev->d_len); if (pktlen < dev->d_len) { - nlldbg("ERROR: Buffer size %d; frame size %d\n", + nllerr("ERROR: Buffer size %d; frame size %d\n", dev->d_len, pktlen); return -E2BIG; } @@ -1575,7 +1575,7 @@ static void sam_receive(struct sam_emac_s *priv) if (dev->d_len > CONFIG_NET_ETH_MTU) { - nlldbg("DROPPED: Too big: %d\n", dev->d_len); + nllerr("DROPPED: Too big: %d\n", dev->d_len); continue; } @@ -1685,7 +1685,7 @@ static void sam_receive(struct sam_emac_s *priv) else #endif { - nlldbg("DROPPED: Unknown type: %04x\n", BUF->type); + nllerr("DROPPED: Unknown type: %04x\n", BUF->type); } } } @@ -1862,7 +1862,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv) clrbits = EMAC_TSR_RLE | sam_txinuse(priv); sam_txreset(priv); - nlldbg("ERROR: Retry Limit Exceeded TSR: %08x\n", tsr); + nllerr("ERROR: Retry Limit Exceeded TSR: %08x\n", tsr); regval = sam_getreg(priv, SAM_EMAC_NCR_OFFSET); regval |= EMAC_NCR_TXEN; @@ -1873,7 +1873,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv) if ((tsr & EMAC_TSR_COL) != 0) { - nlldbg("ERROR: Collision occurred TSR: %08x\n", tsr); + nllerr("ERROR: Collision occurred TSR: %08x\n", tsr); clrbits |= EMAC_TSR_COL; } @@ -1881,7 +1881,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv) if ((tsr & EMAC_TSR_TFC) != 0) { - nlldbg("ERROR: Transmit Frame Corruption due to AHB error: %08x\n", tsr); + nllerr("ERROR: Transmit Frame Corruption due to AHB error: %08x\n", tsr); clrbits |= EMAC_TSR_TFC; } @@ -1896,7 +1896,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv) if ((tsr & EMAC_TSR_UND) != 0) { - nlldbg("ERROR: Transmit Underrun TSR: %08x\n", tsr); + nllerr("ERROR: Transmit Underrun TSR: %08x\n", tsr); clrbits |= EMAC_TSR_UND; } @@ -1933,7 +1933,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv) if ((rsr & EMAC_RSR_RXOVR) != 0) { - nlldbg("ERROR: Receiver overrun RSR: %08x\n", rsr); + nllerr("ERROR: Receiver overrun RSR: %08x\n", rsr); clrbits |= EMAC_RSR_RXOVR; } @@ -1950,7 +1950,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv) if ((rsr & EMAC_RSR_BNA) != 0) { - nlldbg("ERROR: Buffer not available RSR: %08x\n", rsr); + nllerr("ERROR: Buffer not available RSR: %08x\n", rsr); clrbits |= EMAC_RSR_BNA; } @@ -1972,7 +1972,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv) if ((pending & EMAC_INT_PFNZ) != 0) { - nlldbg("Pause frame received\n"); + nllerr("Pause frame received\n"); } /* Check for Pause Time Zero (PTZ) @@ -1982,7 +1982,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv) if ((pending & EMAC_INT_PTZ) != 0) { - nlldbg("Pause TO!\n"); + nllerr("Pause TO!\n"); } #endif } @@ -2147,7 +2147,7 @@ static int sam_emac1_interrupt(int irq, void *context) static inline void sam_txtimeout_process(FAR struct sam_emac_s *priv) { - nlldbg("Timeout!\n"); + nllerr("Timeout!\n"); /* Reset the hardware. Just take the interface down, then back up again. */ @@ -2408,7 +2408,7 @@ static int sam_ifup(struct net_driver_s *dev) ret = sam_phyinit(priv); if (ret < 0) { - nlldbg("ERROR: sam_phyinit failed: %d\n", ret); + nllerr("ERROR: sam_phyinit failed: %d\n", ret); return ret; } @@ -2417,7 +2417,7 @@ static int sam_ifup(struct net_driver_s *dev) ret = sam_autonegotiate(priv); if (ret < 0) { - nlldbg("ERROR: sam_autonegotiate failed: %d\n", ret); + nllerr("ERROR: sam_autonegotiate failed: %d\n", ret); return ret; } @@ -2460,7 +2460,7 @@ static int sam_ifdown(struct net_driver_s *dev) struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private; irqstate_t flags; - nlldbg("Taking the network down\n"); + nllerr("Taking the network down\n"); /* Disable the EMAC interrupt */ @@ -3275,7 +3275,7 @@ static int sam_phyreset(struct sam_emac_s *priv) ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, MII_MCR_RESET); if (ret < 0) { - nlldbg("ERROR: sam_phywrite failed: %d\n", ret); + nllerr("ERROR: sam_phywrite failed: %d\n", ret); } /* Wait for the PHY reset to complete */ @@ -3287,7 +3287,7 @@ static int sam_phyreset(struct sam_emac_s *priv) int result = sam_phyread(priv, priv->phyaddr, MII_MCR, &mcr); if (result < 0) { - nlldbg("ERROR: Failed to read the MCR register: %d\n", ret); + nllerr("ERROR: Failed to read the MCR register: %d\n", ret); ret = result; } else if ((mcr & MII_MCR_RESET) == 0) @@ -3352,7 +3352,7 @@ static int sam_phyfind(struct sam_emac_s *priv, uint8_t *phyaddr) else { - nlldbg("ERROR: sam_phyread failed for PHY address %02x: %d\n", + nllerr("ERROR: sam_phyread failed for PHY address %02x: %d\n", candidate, ret); for (offset = 0; offset < 32; offset++) @@ -3418,7 +3418,7 @@ static int sam_phyread(struct sam_emac_s *priv, uint8_t phyaddr, ret = sam_phywait(priv); if (ret < 0) { - nlldbg("ERROR: sam_phywait failed: %d\n", ret); + nllerr("ERROR: sam_phywait failed: %d\n", ret); return ret; } @@ -3443,7 +3443,7 @@ static int sam_phyread(struct sam_emac_s *priv, uint8_t phyaddr, ret = sam_phywait(priv); if (ret < 0) { - nlldbg("ERROR: sam_phywait failed: %d\n", ret); + nllerr("ERROR: sam_phywait failed: %d\n", ret); return ret; } @@ -3483,7 +3483,7 @@ static int sam_phywrite(struct sam_emac_s *priv, uint8_t phyaddr, ret = sam_phywait(priv); if (ret < 0) { - nlldbg("ERROR: sam_phywait failed: %d\n", ret); + nllerr("ERROR: sam_phywait failed: %d\n", ret); return ret; } @@ -3508,7 +3508,7 @@ static int sam_phywrite(struct sam_emac_s *priv, uint8_t phyaddr, ret = sam_phywait(priv); if (ret < 0) { - nlldbg("ERROR: sam_phywait failed: %d\n", ret); + nllerr("ERROR: sam_phywait failed: %d\n", ret); return ret; } @@ -3552,7 +3552,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_PHYID1, &phyid1); if (ret < 0) { - nlldbg("ERROR: Failed to read PHYID1\n"); + nllerr("ERROR: Failed to read PHYID1\n"); goto errout; } @@ -3561,7 +3561,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_PHYID2, &phyid2); if (ret < 0) { - nlldbg("ERROR: Failed to read PHYID2\n"); + nllerr("ERROR: Failed to read PHYID2\n"); goto errout; } @@ -3578,7 +3578,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) } else { - nlldbg("ERROR: PHY not recognized\n"); + nllerr("ERROR: PHY not recognized\n"); } /* Setup control register */ @@ -3586,7 +3586,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_MCR, &mcr); if (ret < 0) { - nlldbg("ERROR: Failed to read MCR\n"); + nllerr("ERROR: Failed to read MCR\n"); goto errout; } @@ -3597,7 +3597,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, mcr); if (ret < 0) { - nlldbg("ERROR: Failed to write MCR\n"); + nllerr("ERROR: Failed to write MCR\n"); goto errout; } @@ -3612,7 +3612,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phywrite(priv, priv->phyaddr, MII_ADVERTISE, advertise); if (ret < 0) { - nlldbg("ERROR: Failed to write ANAR\n"); + nllerr("ERROR: Failed to write ANAR\n"); goto errout; } @@ -3621,7 +3621,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_MCR, &mcr); if (ret < 0) { - nlldbg("ERROR: Failed to read MCR\n"); + nllerr("ERROR: Failed to read MCR\n"); goto errout; } @@ -3629,7 +3629,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, mcr); if (ret < 0) { - nlldbg("ERROR: Failed to write MCR\n"); + nllerr("ERROR: Failed to write MCR\n"); goto errout; } @@ -3641,7 +3641,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, mcr); if (ret < 0) { - nlldbg("ERROR: Failed to write MCR\n"); + nllerr("ERROR: Failed to write MCR\n"); goto errout; } @@ -3655,7 +3655,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_MSR, &msr); if (ret < 0) { - nlldbg("ERROR: Failed to read MSR\n"); + nllerr("ERROR: Failed to read MSR\n"); goto errout; } @@ -3673,7 +3673,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) if (++timeout >= PHY_RETRY_MAX) { - nlldbg("ERROR: TimeOut\n"); + nllerr("ERROR: TimeOut\n"); sam_phydump(priv); ret = -ETIMEDOUT; goto errout; @@ -3685,7 +3685,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_LPA, &lpa); if (ret < 0) { - nlldbg("ERROR: Failed to read ANLPAR\n"); + nllerr("ERROR: Failed to read ANLPAR\n"); goto errout; } @@ -3775,13 +3775,13 @@ static bool sam_linkup(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_MSR, &msr); if (ret < 0) { - nlldbg("ERROR: Failed to read MSR: %d\n", ret); + nllerr("ERROR: Failed to read MSR: %d\n", ret); goto errout; } if ((msr & MII_MSR_LINKSTATUS) == 0) { - nlldbg("ERROR: MSR LinkStatus: %04x\n", msr); + nllerr("ERROR: MSR LinkStatus: %04x\n", msr); goto errout; } @@ -3790,7 +3790,7 @@ static bool sam_linkup(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, priv->attr->physr, &physr); if (ret < 0) { - nlldbg("ERROR: Failed to read PHYSR: %d\n", ret); + nllerr("ERROR: Failed to read PHYSR: %d\n", ret); goto errout; } @@ -3897,7 +3897,7 @@ static int sam_phyinit(struct sam_emac_s *priv) ret = sam_phyfind(priv, &priv->phyaddr); if (ret < 0) { - nlldbg("ERROR: sam_phyfind failed: %d\n", ret); + nllerr("ERROR: sam_phyfind failed: %d\n", ret); return ret; } diff --git a/arch/arm/src/sama5/sam_ethernet.c b/arch/arm/src/sama5/sam_ethernet.c index 409db45535..d10f096d29 100644 --- a/arch/arm/src/sama5/sam_ethernet.c +++ b/arch/arm/src/sama5/sam_ethernet.c @@ -88,7 +88,7 @@ static inline void up_gmac_initialize(void) ret = sam_gmac_initialize(); if (ret < 0) { - nlldbg("ERROR: sam_gmac_initialize failed: %d\n", ret); + nllerr("ERROR: sam_gmac_initialize failed: %d\n", ret); } } #else @@ -119,7 +119,7 @@ static inline void up_emac_initialize(void) ret = sam_emac_initialize(); if (ret < 0) { - nlldbg("ERROR: up_emac_initialize failed: %d\n", ret); + nllerr("ERROR: up_emac_initialize failed: %d\n", ret); } } #elif defined(CONFIG_SAMA5_EMACB) @@ -133,7 +133,7 @@ static inline void up_emac_initialize(void) ret = sam_emac_initialize(EMAC0_INTF); if (ret < 0) { - nlldbg("ERROR: up_emac_initialize(EMAC0) failed: %d\n", ret); + nllerr("ERROR: up_emac_initialize(EMAC0) failed: %d\n", ret); } #endif @@ -143,7 +143,7 @@ static inline void up_emac_initialize(void) ret = sam_emac_initialize(EMAC1_INTF); if (ret < 0) { - nlldbg("ERROR: up_emac_initialize(EMAC1) failed: %d\n", ret); + nllerr("ERROR: up_emac_initialize(EMAC1) failed: %d\n", ret); } #endif } diff --git a/arch/arm/src/sama5/sam_gmac.c b/arch/arm/src/sama5/sam_gmac.c index 8ba0aed708..078841fbb1 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 */ - lldbg("...[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)) { - lldbg("%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)) { - lldbg("%08x<-%08x\n", address, regval); + llerr("%08x<-%08x\n", address, regval); } putreg32(regval, address); @@ -538,7 +538,7 @@ static int sam_buffer_initialize(struct sam_gmac_s *priv) priv->txdesc = (struct gmac_txdesc_s *)kmm_memalign(8, allocsize); if (!priv->txdesc) { - nlldbg("ERROR: Failed to allocate TX descriptors\n"); + nllerr("ERROR: Failed to allocate TX descriptors\n"); return -ENOMEM; } @@ -548,7 +548,7 @@ static int sam_buffer_initialize(struct sam_gmac_s *priv) priv->rxdesc = (struct gmac_rxdesc_s *)kmm_memalign(8, allocsize); if (!priv->rxdesc) { - nlldbg("ERROR: Failed to allocate RX descriptors\n"); + nllerr("ERROR: Failed to allocate RX descriptors\n"); sam_buffer_free(priv); return -ENOMEM; } @@ -559,7 +559,7 @@ static int sam_buffer_initialize(struct sam_gmac_s *priv) priv->txbuffer = (uint8_t *)kmm_memalign(8, allocsize); if (!priv->txbuffer) { - nlldbg("ERROR: Failed to allocate TX buffer\n"); + nllerr("ERROR: Failed to allocate TX buffer\n"); sam_buffer_free(priv); return -ENOMEM; } @@ -568,7 +568,7 @@ static int sam_buffer_initialize(struct sam_gmac_s *priv) priv->rxbuffer = (uint8_t *)kmm_memalign(8, allocsize); if (!priv->rxbuffer) { - nlldbg("ERROR: Failed to allocate RX buffer\n"); + nllerr("ERROR: Failed to allocate RX buffer\n"); sam_buffer_free(priv); return -ENOMEM; } @@ -664,7 +664,7 @@ static int sam_transmit(struct sam_gmac_s *priv) if (dev->d_len > GMAC_TX_UNITSIZE) { - nlldbg("ERROR: Packet too big: %d\n", dev->d_len); + nllerr("ERROR: Packet too big: %d\n", dev->d_len); return -EINVAL; } @@ -676,7 +676,7 @@ static int sam_transmit(struct sam_gmac_s *priv) if (sam_txfree(priv) < 1) { - nlldbg("ERROR: No free TX descriptors\n"); + nllerr("ERROR: No free TX descriptors\n"); return -EBUSY; } @@ -1064,7 +1064,7 @@ static int sam_recvframe(struct sam_gmac_s *priv) if (pktlen < dev->d_len) { - nlldbg("ERROR: Buffer size %d; frame size %d\n", dev->d_len, pktlen); + nllerr("ERROR: Buffer size %d; frame size %d\n", dev->d_len, pktlen); return -E2BIG; } @@ -1142,7 +1142,7 @@ static void sam_receive(struct sam_gmac_s *priv) if (dev->d_len > CONFIG_NET_ETH_MTU) { - nlldbg("DROPPED: Too big: %d\n", dev->d_len); + nllerr("DROPPED: Too big: %d\n", dev->d_len); continue; } @@ -1252,7 +1252,7 @@ static void sam_receive(struct sam_gmac_s *priv) else #endif { - nlldbg("DROPPED: Unknown type: %04x\n", BUF->type); + nllerr("DROPPED: Unknown type: %04x\n", BUF->type); } } } @@ -1403,7 +1403,7 @@ static int sam_gmac_interrupt(int irq, void *context) clrbits = GMAC_TSR_RLE | sam_txinuse(priv); sam_txreset(priv); - nlldbg("ERROR: Retry Limit Exceeded TSR: %08x\n", tsr); + nllerr("ERROR: Retry Limit Exceeded TSR: %08x\n", tsr); regval = sam_getreg(priv, SAM_GMAC_NCR); regval |= GMAC_NCR_TXEN; @@ -1414,7 +1414,7 @@ static int sam_gmac_interrupt(int irq, void *context) if ((tsr & GMAC_TSR_COL) != 0) { - nlldbg("ERROR: Collision occurred TSR: %08x\n", tsr); + nllerr("ERROR: Collision occurred TSR: %08x\n", tsr); clrbits |= GMAC_TSR_COL; } @@ -1422,7 +1422,7 @@ static int sam_gmac_interrupt(int irq, void *context) if ((tsr & GMAC_TSR_TFC) != 0) { - nlldbg("ERROR: Buffers exhausted mid-frame TSR: %08x\n", tsr); + nllerr("ERROR: Buffers exhausted mid-frame TSR: %08x\n", tsr); clrbits |= GMAC_TSR_TFC; } @@ -1437,7 +1437,7 @@ static int sam_gmac_interrupt(int irq, void *context) if ((tsr & GMAC_TSR_UND) != 0) { - nlldbg("ERROR: Transmit Underrun TSR: %08x\n", tsr); + nllerr("ERROR: Transmit Underrun TSR: %08x\n", tsr); clrbits |= GMAC_TSR_UND; } @@ -1445,7 +1445,7 @@ static int sam_gmac_interrupt(int irq, void *context) if ((tsr & GMAC_TSR_HRESP) != 0) { - nlldbg("ERROR: HRESP not OK: %08x\n", tsr); + nllerr("ERROR: HRESP not OK: %08x\n", tsr); clrbits |= GMAC_TSR_HRESP; } @@ -1453,7 +1453,7 @@ static int sam_gmac_interrupt(int irq, void *context) if ((tsr & GMAC_TSR_LCO) != 0) { - nlldbg("ERROR: Late collision: %08x\n", tsr); + nllerr("ERROR: Late collision: %08x\n", tsr); clrbits |= GMAC_TSR_LCO; } @@ -1490,7 +1490,7 @@ static int sam_gmac_interrupt(int irq, void *context) if ((rsr & GMAC_RSR_RXOVR) != 0) { - nlldbg("ERROR: Receiver overrun RSR: %08x\n", rsr); + nllerr("ERROR: Receiver overrun RSR: %08x\n", rsr); clrbits |= GMAC_RSR_RXOVR; } @@ -1507,7 +1507,7 @@ static int sam_gmac_interrupt(int irq, void *context) if ((rsr & GMAC_RSR_BNA) != 0) { - nlldbg("ERROR: Buffer not available RSR: %08x\n", rsr); + nllerr("ERROR: Buffer not available RSR: %08x\n", rsr); clrbits |= GMAC_RSR_BNA; } @@ -1515,7 +1515,7 @@ static int sam_gmac_interrupt(int irq, void *context) if ((rsr & GMAC_RSR_HNO) != 0) { - nlldbg("ERROR: HRESP not OK: %08x\n", rsr); + nllerr("ERROR: HRESP not OK: %08x\n", rsr); clrbits |= GMAC_RSR_HNO; } @@ -1536,7 +1536,7 @@ static int sam_gmac_interrupt(int irq, void *context) if ((pending & GMAC_INT_PFNZ) != 0) { - nlldbg("Pause frame received\n"); + nllerr("Pause frame received\n"); } /* Check for Pause Time Zero (PTZ) @@ -1546,7 +1546,7 @@ static int sam_gmac_interrupt(int irq, void *context) if ((pending & GMAC_INT_PTZ) != 0) { - nlldbg("Pause TO!\n"); + nllerr("Pause TO!\n"); } #endif @@ -1576,7 +1576,7 @@ static void sam_txtimeout(int argc, uint32_t arg, ...) { struct sam_gmac_s *priv = (struct sam_gmac_s *)arg; - nlldbg("Timeout!\n"); + nllerr("Timeout!\n"); /* Then reset the hardware. Just take the interface down, then back * up again. @@ -1651,7 +1651,7 @@ static int sam_ifup(struct net_driver_s *dev) struct sam_gmac_s *priv = (struct sam_gmac_s *)dev->d_private; int ret; - nlldbg("Bringing up: %d.%d.%d.%d\n", + nllerr("Bringing up: %d.%d.%d.%d\n", dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff, (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24); @@ -1675,7 +1675,7 @@ static int sam_ifup(struct net_driver_s *dev) ret = sam_phyinit(priv); if (ret < 0) { - nlldbg("ERROR: sam_phyinit failed: %d\n", ret); + nllerr("ERROR: sam_phyinit failed: %d\n", ret); return ret; } @@ -1685,7 +1685,7 @@ static int sam_ifup(struct net_driver_s *dev) ret = sam_autonegotiate(priv); if (ret < 0) { - nlldbg("ERROR: sam_autonegotiate failed: %d\n", ret); + nllerr("ERROR: sam_autonegotiate failed: %d\n", ret); return ret; } #else @@ -1730,7 +1730,7 @@ static int sam_ifdown(struct net_driver_s *dev) struct sam_gmac_s *priv = (struct sam_gmac_s *)dev->d_private; irqstate_t flags; - nlldbg("Taking the network down\n"); + nllerr("Taking the network down\n"); /* Disable the GMAC interrupt */ @@ -2429,7 +2429,7 @@ static int sam_phyreset(struct sam_gmac_s *priv) ret = sam_phywrite(priv, priv->phyaddr, GMII_MCR, GMII_MCR_RESET); if (ret < 0) { - nlldbg("ERROR: sam_phywrite failed: %d\n", ret); + nllerr("ERROR: sam_phywrite failed: %d\n", ret); } /* Wait for the PHY reset to complete */ @@ -2441,7 +2441,7 @@ static int sam_phyreset(struct sam_gmac_s *priv) int result = sam_phyread(priv, priv->phyaddr, GMII_MCR, &mcr); if (result < 0) { - nlldbg("ERROR: Failed to read the MCR register: %d\n", ret); + nllerr("ERROR: Failed to read the MCR register: %d\n", ret); ret = result; } else if ((mcr & GMII_MCR_RESET) == 0) @@ -2501,7 +2501,7 @@ static int sam_phyfind(struct sam_gmac_s *priv, uint8_t *phyaddr) else { - nlldbg("ERROR: sam_phyread failed for PHY address %02x: %d\n", + nllerr("ERROR: sam_phyread failed for PHY address %02x: %d\n", candidate, ret); for (offset = 0; offset < 32; offset++) @@ -2563,7 +2563,7 @@ static int sam_phyread(struct sam_gmac_s *priv, uint8_t phyaddr, ret = sam_phywait(priv); if (ret < 0) { - nlldbg("ERROR: sam_phywait failed: %d\n", ret); + nllerr("ERROR: sam_phywait failed: %d\n", ret); return ret; } @@ -2578,7 +2578,7 @@ static int sam_phyread(struct sam_gmac_s *priv, uint8_t phyaddr, ret = sam_phywait(priv); if (ret < 0) { - nlldbg("ERROR: sam_phywait failed: %d\n", ret); + nllerr("ERROR: sam_phywait failed: %d\n", ret); return ret; } @@ -2618,7 +2618,7 @@ static int sam_phywrite(struct sam_gmac_s *priv, uint8_t phyaddr, ret = sam_phywait(priv); if (ret < 0) { - nlldbg("ERROR: sam_phywait failed: %d\n", ret); + nllerr("ERROR: sam_phywait failed: %d\n", ret); return ret; } @@ -2633,7 +2633,7 @@ static int sam_phywrite(struct sam_gmac_s *priv, uint8_t phyaddr, ret = sam_phywait(priv); if (ret < 0) { - nlldbg("ERROR: sam_phywait failed: %d\n", ret); + nllerr("ERROR: sam_phywait failed: %d\n", ret); return ret; } @@ -2679,7 +2679,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv) ret = sam_phyread(priv, priv->phyaddr, GMII_PHYID1, &phyid1); if (ret < 0) { - nlldbg("ERROR: Failed to read PHYID1 register\n"); + nllerr("ERROR: Failed to read PHYID1 register\n"); goto errout; } @@ -2690,7 +2690,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv) ret = sam_phyread(priv, priv->phyaddr, GMII_PHYID2, &phyid2); if (ret < 0) { - nlldbg("ERROR: Failed to read PHYID2 register\n"); + nllerr("ERROR: Failed to read PHYID2 register\n"); goto errout; } @@ -2706,7 +2706,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv) } else { - nlldbg("ERROR: PHY not recognized: PHYID1=%04x PHYID2=%04x\n", + nllerr("ERROR: PHY not recognized: PHYID1=%04x PHYID2=%04x\n", phyid1, phyid2); } @@ -2735,7 +2735,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv) ret = sam_phywrite(priv, priv->phyaddr, GMII_ADVERTISE, advertise); if (ret < 0) { - nlldbg("ERROR: Failed to write ADVERTISE register\n"); + nllerr("ERROR: Failed to write ADVERTISE register\n"); goto errout; } @@ -2746,7 +2746,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv) ret = sam_phyread(priv, priv->phyaddr, GMII_1000BTCR, &btcr); if (ret < 0) { - nlldbg("ERROR: Failed to read 1000BTCR register: %d\n", ret); + nllerr("ERROR: Failed to read 1000BTCR register: %d\n", ret); goto errout; } @@ -2755,7 +2755,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv) ret = sam_phywrite(priv, priv->phyaddr, GMII_1000BTCR, btcr); if (ret < 0) { - nlldbg("ERROR: Failed to write 1000BTCR register: %d\n", ret); + nllerr("ERROR: Failed to write 1000BTCR register: %d\n", ret); goto errout; } @@ -2764,7 +2764,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv) ret = sam_phyread(priv, priv->phyaddr, GMII_MCR, &phyval); if (ret < 0) { - nlldbg("ERROR: Failed to read MCR register: %d\n", ret); + nllerr("ERROR: Failed to read MCR register: %d\n", ret); goto errout; } @@ -2773,7 +2773,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv) ret = sam_phywrite(priv, priv->phyaddr, GMII_MCR, phyval); if (ret < 0) { - nlldbg("ERROR: Failed to write MCR register: %d\n", ret); + nllerr("ERROR: Failed to write MCR register: %d\n", ret); goto errout; } @@ -2787,7 +2787,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv) ret = sam_phyread(priv, priv->phyaddr, GMII_MSR, &phyval); if (ret < 0) { - nlldbg("ERROR: Failed to read MSR register: %d\n", ret); + nllerr("ERROR: Failed to read MSR register: %d\n", ret); goto errout; } @@ -2805,7 +2805,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv) if (++timeout >= PHY_RETRY_MAX) { - nlldbg("ERROR: TimeOut\n"); + nllerr("ERROR: TimeOut\n"); sam_phydump(priv); ret = -ETIMEDOUT; goto errout; @@ -2822,7 +2822,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv) ret = sam_phyread(priv, priv->phyaddr, GMII_1000BTSR, &btsr); if (ret < 0) { - nlldbg("ERROR: Failed to read 1000BTSR register: %d\n", ret); + nllerr("ERROR: Failed to read 1000BTSR register: %d\n", ret); goto errout; } @@ -2850,7 +2850,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv) ret = sam_phyread(priv, priv->phyaddr, GMII_LPA, &lpa); if (ret < 0) { - nlldbg("ERROR: Failed to read LPA register: %d\n", ret); + nllerr("ERROR: Failed to read LPA register: %d\n", ret); goto errout; } @@ -2892,7 +2892,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv) if (++timeout >= PHY_RETRY_MAX) { - nlldbg("ERROR: TimeOut\n"); + nllerr("ERROR: TimeOut\n"); sam_phydump(priv); ret = -ETIMEDOUT; goto errout; @@ -3065,7 +3065,7 @@ static int sam_phyinit(struct sam_gmac_s *priv) ret = sam_phyfind(priv, &priv->phyaddr); if (ret < 0) { - nlldbg("ERROR: sam_phyfind failed: %d\n", ret); + nllerr("ERROR: sam_phyfind failed: %d\n", ret); return ret; } @@ -3573,7 +3573,7 @@ int sam_gmac_initialize(void) priv->txpoll = wd_create(); if (!priv->txpoll) { - nlldbg("ERROR: Failed to create periodic poll timer\n"); + nllerr("ERROR: Failed to create periodic poll timer\n"); ret = -EAGAIN; goto errout; } @@ -3581,7 +3581,7 @@ int sam_gmac_initialize(void) priv->txtimeout = wd_create(); /* Create TX timeout timer */ if (!priv->txtimeout) { - nlldbg("ERROR: Failed to create periodic poll timer\n"); + nllerr("ERROR: Failed to create periodic poll timer\n"); ret = -EAGAIN; goto errout_with_txpoll; } @@ -3595,7 +3595,7 @@ int sam_gmac_initialize(void) ret = sam_buffer_initialize(priv); if (ret < 0) { - nlldbg("ERROR: sam_buffer_initialize failed: %d\n", ret); + nllerr("ERROR: sam_buffer_initialize failed: %d\n", ret); goto errout_with_txtimeout; } @@ -3606,7 +3606,7 @@ int sam_gmac_initialize(void) ret = irq_attach(SAM_IRQ_GMAC, sam_gmac_interrupt); if (ret < 0) { - nlldbg("ERROR: Failed to attach the handler to the IRQ%d\n", SAM_IRQ_GMAC); + nllerr("ERROR: Failed to attach the handler to the IRQ%d\n", SAM_IRQ_GMAC); goto errout_with_buffers; } @@ -3619,7 +3619,7 @@ int sam_gmac_initialize(void) ret = sam_ifdown(&priv->dev); if (ret < 0) { - nlldbg("ERROR: Failed to put the interface in the down state: %d\n", ret); + nllerr("ERROR: Failed to put the interface in the down state: %d\n", ret); goto errout_with_buffers; } @@ -3631,7 +3631,7 @@ int sam_gmac_initialize(void) return ret; } - nlldbg("ERROR: netdev_register() failed: %d\n", ret); + nllerr("ERROR: netdev_register() failed: %d\n", ret); errout_with_buffers: sam_buffer_free(priv); diff --git a/arch/arm/src/sama5/sam_hsmci.c b/arch/arm/src/sama5/sam_hsmci.c index adbfa2bc04..b33eaa9c6a 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 */ - lldbg("...[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)) { - lldbg("%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)) { - lldbg("%08x<-%08x\n", address, value); + llerr("%08x<-%08x\n", address, value); } #endif @@ -1237,7 +1237,7 @@ static void sam_dmacallback(DMA_HANDLE handle, void *arg, int result) if (result < 0) { wkupevent = (result == -ETIMEDOUT ? SDIOWAIT_TIMEOUT : SDIOWAIT_ERROR); - flldbg("ERROR: DMA failed: result=%d wkupevent=%04x\n", result, wkupevent); + fllerr("ERROR: DMA failed: result=%d wkupevent=%04x\n", result, wkupevent); /* sam_endtransfer will terminate the transfer and wait up the waiting * client in this case. @@ -1337,7 +1337,7 @@ static void sam_eventtimeout(int argc, uint32_t arg) /* Yes.. wake up any waiting threads */ sam_endwait(priv, SDIOWAIT_TIMEOUT); - flldbg("ERROR: Timeout\n"); + fllerr("ERROR: Timeout\n"); } } @@ -1537,7 +1537,7 @@ static int sam_hsmci_interrupt(struct sam_dev_s *priv) { /* Yes.. Was it some kind of timeout error? */ - flldbg("ERROR: enabled: %08x pending: %08x\n", enabled, pending); + fllerr("ERROR: enabled: %08x pending: %08x\n", enabled, pending); if ((pending & HSMCI_DATA_TIMEOUT_ERRORS) != 0) { /* Yes.. Terminate with a timeout. */ diff --git a/arch/arm/src/sama5/sam_irq.c b/arch/arm/src/sama5/sam_irq.c index 21ce68ff23..e9824e2aa7 100644 --- a/arch/arm/src/sama5/sam_irq.c +++ b/arch/arm/src/sama5/sam_irq.c @@ -131,7 +131,7 @@ static void sam_dumpaic(const char *msg, uintptr_t base, int irq) irqstate_t flags; flags = enter_critical_section(); - lldbg("AIC (%s, base=%08x irq=%d):\n", msg, base, irq); + llerr("AIC (%s, base=%08x irq=%d):\n", msg, base, irq); /* Select the register set associated with this irq */ @@ -139,15 +139,15 @@ static void sam_dumpaic(const char *msg, uintptr_t base, int irq) /* Then dump all of the (readable) register contents */ - lldbg(" SSR: %08x SMR: %08x SVR: %08x IVR: %08x\n", + llerr(" SSR: %08x SMR: %08x SVR: %08x IVR: %08x\n", getreg32(base + SAM_AIC_SSR_OFFSET), getreg32(base + SAM_AIC_SMR_OFFSET), getreg32(base + SAM_AIC_SVR_OFFSET), getreg32(base + SAM_AIC_IVR_OFFSET)); - lldbg(" FVR: %08x ISR: %08x\n", + llerr(" FVR: %08x ISR: %08x\n", getreg32(base + SAM_AIC_FVR_OFFSET), getreg32(base + SAM_AIC_ISR_OFFSET)); - lldbg(" IPR: %08x %08x %08x %08x\n", + llerr(" IPR: %08x %08x %08x %08x\n", getreg32(base + SAM_AIC_IPR0_OFFSET), getreg32(base + SAM_AIC_IPR1_OFFSET), getreg32(base + SAM_AIC_IPR2_OFFSET), @@ -156,19 +156,19 @@ static void sam_dumpaic(const char *msg, uintptr_t base, int irq) /* SAMA5D4 does not have the FFSR register */ #if defined(SAM_AIC_FFSR) - lldbg(" IMR: %08x CISR: %08x SPU: %08x FFSR: %08x\n", + llerr(" IMR: %08x CISR: %08x SPU: %08x FFSR: %08x\n", getreg32(base + SAM_AIC_IMR_OFFSET), getreg32(base + SAM_AIC_CISR_OFFSET), getreg32(base + SAM_AIC_SPU_OFFSET), getreg32(base + SAM_AIC_FFSR_OFFSET)); #else - lldbg(" IMR: %08x CISR: %08x SPU: %08x\n", + llerr(" IMR: %08x CISR: %08x SPU: %08x\n", getreg32(base + SAM_AIC_IMR_OFFSET), getreg32(base + SAM_AIC_CISR_OFFSET), getreg32(base + SAM_AIC_SPU_OFFSET)); #endif - lldbg(" DCR: %08x WPMR: %08x WPSR: %08x\n", + llerr(" DCR: %08x WPMR: %08x WPSR: %08x\n", getreg32(base + SAM_AIC_DCR_OFFSET), getreg32(base + SAM_AIC_WPMR_OFFSET), getreg32(base + SAM_AIC_WPSR_OFFSET)); @@ -235,7 +235,7 @@ static uint32_t *sam_spurious(int irq, uint32_t *regs) */ #if defined(CONFIG_DEBUG_IRQ) - lldbg("Spurious interrupt: IRQ %d\n", irq); + llerr("Spurious interrupt: IRQ %d\n", irq); #endif return regs; } @@ -331,7 +331,7 @@ static void sam_aic_redirection(void) /* Check if redirection was successfully enabled */ regval = getreg32(SAM_SFR_AICREDIR); - lldbg("Interrupts %s redirected to the AIC\n", + llerr("Interrupts %s redirected to the AIC\n", (regval & SFR_AICREDIR_ENABLE) != 0 ? "ARE" : "NOT"); #endif } diff --git a/arch/arm/src/sama5/sam_lcd.c b/arch/arm/src/sama5/sam_lcd.c index 821a18ec61..fe5b77b568 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 */ - lldbg("...[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)) { - lldbg("%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)) { - lldbg("%08x<-%08x\n", address, regval); + llerr("%08x<-%08x\n", address, regval); } putreg32(regval, address); diff --git a/arch/arm/src/sama5/sam_nand.c b/arch/arm/src/sama5/sam_nand.c index 6e53471e40..bb8b63645a 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) { - lldbg("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 */ - lldbg("...[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 1467d29945..352b45b491 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)) { - lldbg("%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)) { - lldbg("%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 7aae6c7be1..1dd7dcb9eb 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) { - lldbg("%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. */ - lldbg("[repeats %d more times]\n", count); + llerr("[repeats %d more times]\n", count); } } diff --git a/arch/arm/src/sama5/sam_pwm.c b/arch/arm/src/sama5/sam_pwm.c index 5d07e57a62..aacfc21f6c 100644 --- a/arch/arm/src/sama5/sam_pwm.c +++ b/arch/arm/src/sama5/sam_pwm.c @@ -402,7 +402,7 @@ #ifdef CONFIG_DEBUG_PWM # define pwmdbg dbg -# define pwmlldbg lldbg +# define pwmllerr llerr # ifdef CONFIG_DEBUG_INFO # define pwminfo info # define pwmllinfo llinfo @@ -412,7 +412,7 @@ # endif #else # define pwmdbg(x...) -# define pwmlldbg(x...) +# define pwmllerr(x...) # define pwminfo(x...) # define pwmllinfo(x...) #endif @@ -713,7 +713,7 @@ static bool pwm_checkreg(FAR struct sam_pwm_s *pwm, bool wr, uint32_t regval, { /* Yes... show how many times we did it */ - lldbg("...[Repeats %d times]...\n", pwm->count); + llerr("...[Repeats %d times]...\n", pwm->count); } /* Save information about the new access */ @@ -757,7 +757,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)) { - lldbg("%08x->%08x\n", regaddr, regval); + llerr("%08x->%08x\n", regaddr, regval); } #endif @@ -774,7 +774,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)) { - lldbg("%08x->%08x\n", regaddr, regval); + llerr("%08x->%08x\n", regaddr, regval); } #endif @@ -813,7 +813,7 @@ static uint32_t pwm_chan_getreg(struct sam_pwm_chan_s *chan, int offset) if (pwm_checkreg(chan->pwm, false, regval, regaddr)) #endif { - lldbg("%08x->%08x\n", regaddr, regval); + llerr("%08x->%08x\n", regaddr, regval); } #endif @@ -844,7 +844,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)) { - lldbg("%08x<-%08x\n", regaddr, regval); + llerr("%08x<-%08x\n", regaddr, regval); } #endif @@ -857,7 +857,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)) { - lldbg("%08x<-%08x\n", regaddr, regval); + llerr("%08x<-%08x\n", regaddr, regval); } #endif @@ -893,7 +893,7 @@ static void pwm_chan_putreg(struct sam_pwm_chan_s *chan, int offset, if (pwm_checkreg(chan->pwm, true, regval, regaddr)) #endif { - lldbg("%08x<-%08x\n", regaddr, regval); + llerr("%08x<-%08x\n", regaddr, regval); } #endif diff --git a/arch/arm/src/sama5/sam_rtc.c b/arch/arm/src/sama5/sam_rtc.c index 0260a947b6..d195cbc329 100644 --- a/arch/arm/src/sama5/sam_rtc.c +++ b/arch/arm/src/sama5/sam_rtc.c @@ -88,12 +88,12 @@ #ifdef CONFIG_DEBUG_RTC # define rtcdbg dbg # define rtcinfo info -# define rtclldbg lldbg +# define rtcllerr llerr # define rtcllinfo llinfo #else # define rtcdbg(x...) # define rtcinfo(x...) -# define rtclldbg(x...) +# define rtcllerr(x...) # define rtcllinfo(x...) #endif @@ -140,16 +140,16 @@ volatile bool g_rtc_enabled = false; #ifdef CONFIG_DEBUG_RTC static void rtc_dumpregs(FAR const char *msg) { - rtclldbg("%s:\n", msg); - rtclldbg(" CR: %08x\n", getreg32(SAM_RTC_CR)); - rtclldbg(" MR: %08x\n", getreg32(SAM_RTC_MR)); - rtclldbg(" TIMR: %08x\n", getreg32(SAM_RTC_TIMR)); - rtclldbg(" CALR: %08x\n", getreg32(SAM_RTC_CALR)); - rtclldbg(" TIMALR: %08x\n", getreg32(SAM_RTC_TIMALR)); - rtclldbg(" CALALR: %08x\n", getreg32(SAM_RTC_CALALR)); - rtclldbg(" SR: %08x\n", getreg32(SAM_RTC_SR)); - rtclldbg(" IMR: %08x\n", getreg32(SAM_RTC_IMR)); - rtclldbg(" VER: %08x\n", getreg32(SAM_RTC_VER)); + rtcllerr("%s:\n", msg); + rtcllerr(" CR: %08x\n", getreg32(SAM_RTC_CR)); + rtcllerr(" MR: %08x\n", getreg32(SAM_RTC_MR)); + rtcllerr(" TIMR: %08x\n", getreg32(SAM_RTC_TIMR)); + rtcllerr(" CALR: %08x\n", getreg32(SAM_RTC_CALR)); + rtcllerr(" TIMALR: %08x\n", getreg32(SAM_RTC_TIMALR)); + rtcllerr(" CALALR: %08x\n", getreg32(SAM_RTC_CALALR)); + rtcllerr(" SR: %08x\n", getreg32(SAM_RTC_SR)); + rtcllerr(" IMR: %08x\n", getreg32(SAM_RTC_IMR)); + rtcllerr(" VER: %08x\n", getreg32(SAM_RTC_VER)); } #else # define rtc_dumpregs(msg) @@ -172,13 +172,13 @@ static void rtc_dumpregs(FAR const char *msg) #ifdef CONFIG_DEBUG_RTC static void rtc_dumptime(FAR struct tm *tp, FAR const char *msg) { - rtclldbg("%s:\n", msg); - rtclldbg(" tm_sec: %08x\n", tp->tm_sec); - rtclldbg(" tm_min: %08x\n", tp->tm_min); - rtclldbg(" tm_hour: %08x\n", tp->tm_hour); - rtclldbg(" tm_mday: %08x\n", tp->tm_mday); - rtclldbg(" tm_mon: %08x\n", tp->tm_mon); - rtclldbg(" tm_year: %08x\n", tp->tm_year); + rtcllerr("%s:\n", msg); + rtcllerr(" tm_sec: %08x\n", tp->tm_sec); + rtcllerr(" tm_min: %08x\n", tp->tm_min); + rtcllerr(" tm_hour: %08x\n", tp->tm_hour); + rtcllerr(" tm_mday: %08x\n", tp->tm_mday); + rtcllerr(" tm_mon: %08x\n", tp->tm_mon); + rtcllerr(" tm_year: %08x\n", tp->tm_year); } #else # define rtc_dumptime(tp, msg) @@ -289,7 +289,7 @@ static int rtc_interrupt(int irq, void *context) ret = work_queue(LPWORK, &g_alarmwork, rtc_worker, NULL, 0); if (ret < 0) { - rtclldbg("ERRPR: work_queue failed: %d\n", ret); + rtcllerr("ERRPR: work_queue failed: %d\n", ret); } /* Disable any further alarm interrupts */ diff --git a/arch/arm/src/sama5/sam_spi.c b/arch/arm/src/sama5/sam_spi.c index b681de8b29..e3cd70944d 100644 --- a/arch/arm/src/sama5/sam_spi.c +++ b/arch/arm/src/sama5/sam_spi.c @@ -141,9 +141,9 @@ #endif #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif @@ -430,7 +430,7 @@ static bool spi_checkreg(struct sam_spidev_s *spi, bool wr, uint32_t value, { /* Yes... show how many times we did it */ - lldbg("...[Repeats %d times]...\n", spi->ntimes); + llerr("...[Repeats %d times]...\n", spi->ntimes); } /* Save information about the new access */ @@ -464,7 +464,7 @@ static inline uint32_t spi_getreg(struct sam_spidev_s *spi, #ifdef CONFIG_SAMA5_SPI_REGDEBUG if (spi_checkreg(spi, false, value, address)) { - lldbg("%08x->%08x\n", address, value); + llerr("%08x->%08x\n", address, value); } #endif @@ -487,7 +487,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)) { - lldbg("%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 480d0e9d9f..8fdf222e04 100644 --- a/arch/arm/src/sama5/sam_ssc.c +++ b/arch/arm/src/sama5/sam_ssc.c @@ -415,16 +415,16 @@ #ifdef CONFIG_DEBUG_I2S # define i2sdbg dbg -# define i2slldbg lldbg +# define i2sllerr llerr # ifdef CONFIG_DEBUG_INFO # define i2sinfo dbg -# define i2sllinfo lldbg +# define i2sllinfo llerr # else # define i2sinfo(x...) # endif #else # define i2sdbg(x...) -# define i2slldbg(x...) +# define i2sllerr(x...) # define i2sinfo(x...) # define i2sllinfo(x...) #endif @@ -724,7 +724,7 @@ static bool ssc_checkreg(struct sam_ssc_s *priv, bool wr, uint32_t regval, { /* Yes... show how many times we did it */ - lldbg("...[Repeats %d times]...\n", priv->count); + llerr("...[Repeats %d times]...\n", priv->count); } /* Save information about the new access */ @@ -758,7 +758,7 @@ static inline uint32_t ssc_getreg(struct sam_ssc_s *priv, #ifdef CONFIG_SAMA5_SSC_REGDEBUG if (ssc_checkreg(priv, false, regval, regaddr)) { - lldbg("%08x->%08x\n", regaddr, regval); + llerr("%08x->%08x\n", regaddr, regval); } #endif @@ -781,7 +781,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)) { - lldbg("%08x<-%08x\n", regaddr, regval); + llerr("%08x<-%08x\n", regaddr, regval); } #endif @@ -1111,7 +1111,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) { - lldbg("result: %d\n", result); + llerr("result: %d\n", result); /* Sample the final registers */ @@ -1176,7 +1176,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) { - lldbg("result: %d\n", result); + llerr("result: %d\n", result); /* Sample the final registers */ @@ -1398,7 +1398,7 @@ static int ssc_rxdma_setup(struct sam_ssc_s *priv) if (ret < 0) { - i2slldbg("ERROR: wd_start failed: %d\n", errno); + i2sllerr("ERROR: wd_start failed: %d\n", errno); } } @@ -1586,7 +1586,7 @@ static void ssc_rx_schedule(struct sam_ssc_s *priv, int result) ret = work_queue(HPWORK, &priv->rx.work, ssc_rx_worker, priv, 0); if (ret != 0) { - i2slldbg("ERROR: Failed to queue RX work: %d\n", ret); + i2sllerr("ERROR: Failed to queue RX work: %d\n", ret); } } } @@ -1811,7 +1811,7 @@ static int ssc_txdma_setup(struct sam_ssc_s *priv) if (ret < 0) { - i2slldbg("ERROR: wd_start failed: %d\n", errno); + i2sllerr("ERROR: wd_start failed: %d\n", errno); } } @@ -1986,7 +1986,7 @@ static void ssc_tx_schedule(struct sam_ssc_s *priv, int result) ret = work_queue(HPWORK, &priv->tx.work, ssc_tx_worker, priv, 0); if (ret != 0) { - i2slldbg("ERROR: Failed to queue TX work: %d\n", ret); + i2sllerr("ERROR: Failed to queue TX work: %d\n", ret); } } } diff --git a/arch/arm/src/sama5/sam_tc.c b/arch/arm/src/sama5/sam_tc.c index af434004ef..9a6c091ede 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; - lldbg("TC%d [%08x]: %s\n", tc->tc, (int)base, msg); - lldbg(" 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; - lldbg("TC%d Channel %d [%08x]: %s\n", tc->tc, chan->chan, (int)base, msg); - lldbg(" 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)); - lldbg(" 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)); - lldbg(" 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 */ - lldbg("...[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)) { - lldbg("%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)) { - lldbg("%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)) { - lldbg("%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)) { - lldbg("%08x<-%08x\n", regaddr, regval); + llerr("%08x<-%08x\n", regaddr, regval); } #endif diff --git a/arch/arm/src/sama5/sam_tc.h b/arch/arm/src/sama5/sam_tc.h index 7a6f8dbba2..8d19b5566c 100644 --- a/arch/arm/src/sama5/sam_tc.h +++ b/arch/arm/src/sama5/sam_tc.h @@ -88,12 +88,12 @@ #ifdef CONFIG_SAMA5_TC_DEBUG # define tcdbg dbg # define tcinfo info -# define tclldbg lldbg +# define tcllerr llerr # define tcllinfo llinfo #else # define tcdbg(x...) # define tcinfo(x...) -# define tclldbg(x...) +# define tcllerr(x...) # define tcllinfo(x...) #endif diff --git a/arch/arm/src/sama5/sam_tickless.c b/arch/arm/src/sama5/sam_tickless.c index 190cdf19a5..42eeabf809 100644 --- a/arch/arm/src/sama5/sam_tickless.c +++ b/arch/arm/src/sama5/sam_tickless.c @@ -256,7 +256,7 @@ void up_timer_initialize(void) CONFIG_USEC_PER_TICK); if (ret < 0) { - tclldbg("ERROR: sam_oneshot_initialize failed\n"); + tcllerr("ERROR: sam_oneshot_initialize failed\n"); PANIC(); } @@ -268,7 +268,7 @@ void up_timer_initialize(void) ret = sam_oneshot_max_delay(&g_tickless.oneshot, &max_delay); if (ret < 0) { - tclldbg("ERROR: sam_oneshot_max_delay failed\n"); + tcllerr("ERROR: sam_oneshot_max_delay failed\n"); PANIC(); } @@ -292,7 +292,7 @@ void up_timer_initialize(void) CONFIG_USEC_PER_TICK); if (ret < 0) { - tclldbg("ERROR: sam_freerun_initialize failed\n"); + tcllerr("ERROR: sam_freerun_initialize failed\n"); PANIC(); } diff --git a/arch/arm/src/sama5/sam_tsd.c b/arch/arm/src/sama5/sam_tsd.c index 5159a34e7e..ce1e2f67be 100644 --- a/arch/arm/src/sama5/sam_tsd.c +++ b/arch/arm/src/sama5/sam_tsd.c @@ -799,7 +799,7 @@ static int sam_tsd_schedule(struct sam_tsd_s *priv) ret = work_queue(HPWORK, &priv->work, sam_tsd_bottomhalf, priv, 0); if (ret != 0) { - illdbg("Failed to queue work: %d\n", ret); + illerr("Failed to queue work: %d\n", ret); } return OK; diff --git a/arch/arm/src/sama5/sam_twi.c b/arch/arm/src/sama5/sam_twi.c index 5aa22b90a7..8f813afe4b 100644 --- a/arch/arm/src/sama5/sam_twi.c +++ b/arch/arm/src/sama5/sam_twi.c @@ -129,12 +129,12 @@ #ifdef CONFIG_DEBUG_I2C # define i2cdbg dbg # define i2cinfo info -# define i2clldbg lldbg +# define i2cllerr llerr # define i2cllinfo llinfo #else # define i2cdbg(x...) # define i2cinfo(x...) -# define i2clldbg(x...) +# define i2cllerr(x...) # define i2cllinfo(x...) #endif @@ -384,7 +384,7 @@ static bool twi_checkreg(struct twi_dev_s *priv, bool wr, uint32_t value, { /* Yes... show how many times we did it */ - lldbg("...[Repeats %d times]...\n", priv->ntimes); + llerr("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -416,7 +416,7 @@ static uint32_t twi_getabs(struct twi_dev_s *priv, uintptr_t address) if (twi_checkreg(priv, false, value, address)) { - lldbg("%08x->%08x\n", address, value); + llerr("%08x->%08x\n", address, value); } return value; @@ -437,7 +437,7 @@ static void twi_putabs(struct twi_dev_s *priv, uintptr_t address, { if (twi_checkreg(priv, true, value, address)) { - lldbg("%08x<-%08x\n", address, value); + llerr("%08x<-%08x\n", address, value); } putreg32(value, address); @@ -670,7 +670,7 @@ static int twi_interrupt(struct twi_dev_s *priv) { /* Wake up the thread with an I/O error indication */ - i2clldbg("ERROR: TWI%d pending: %08x\n", priv->attr->twi, pending); + i2cllerr("ERROR: TWI%d pending: %08x\n", priv->attr->twi, pending); twi_wakeup(priv, -EIO); } @@ -720,7 +720,7 @@ static void twi_timeout(int argc, uint32_t arg, ...) { struct twi_dev_s *priv = (struct twi_dev_s *)arg; - i2clldbg("ERROR: TWI%d Timeout!\n", priv->attr->twi); + i2cllerr("ERROR: TWI%d Timeout!\n", priv->attr->twi); twi_wakeup(priv, -ETIMEDOUT); } diff --git a/arch/arm/src/sama5/sam_udphs.c b/arch/arm/src/sama5/sam_udphs.c index a73cb0e420..baf24cdb58 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) { - lldbg("%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. */ - lldbg("[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 */ - lldbg("Global Register:\n"); - lldbg(" CTRL: %04x\n", sam_getreg(SAM_UDPHS_CTRL)); - lldbg(" FNUM: %04x\n", sam_getreg(SAM_UDPHS_FNUM)); - lldbg(" IEN: %04x\n", sam_getreg(SAM_UDPHS_IEN)); - lldbg(" INSTA: %04x\n", sam_getreg(SAM_UDPHS_INTSTA)); - lldbg(" 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 */ - lldbg("Endpoint %d Register:\n", epno); - lldbg(" CFG: %04x\n", sam_getreg(SAM_UDPHS_EPTCFG(epno))); - lldbg(" CTL: %04x\n", sam_getreg(SAM_UDPHS_EPTCTL(epno))); - lldbg(" 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))); - lldbg("DMA %d Register:\n", epno); + llerr("DMA %d Register:\n", epno); if ((SAM_EPSET_DMA & SAM_EP_BIT(epno)) != 0) { - lldbg(" NXTDSC: %04x\n", sam_getreg(SAM_UDPHS_DMANXTDSC(epno))); - lldbg(" ADDRESS: %04x\n", sam_getreg(SAM_UDPHS_DMAADDRESS(epno))); - lldbg(" CONTROL: %04x\n", sam_getreg(SAM_UDPHS_DMACONTROL(epno))); - lldbg(" 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 { - lldbg(" None\n"); + llerr(" None\n"); } } #endif @@ -3440,7 +3440,7 @@ static int sam_ep_disable(struct usbdev_ep_s *ep) if (!ep) { usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0); - ulldbg("ERROR: ep=%p\n", ep); + ullerr("ERROR: ep=%p\n", ep); return -EINVAL; } #endif @@ -3572,7 +3572,7 @@ static int sam_ep_submit(struct usbdev_ep_s *ep, struct usbdev_req_s *req) if (!req || !req->callback || !req->buf || !ep) { usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0); - ulldbg("ERROR: req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); + ullerr("ERROR: req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); return -EINVAL; } #endif @@ -3584,7 +3584,7 @@ static int sam_ep_submit(struct usbdev_ep_s *ep, struct usbdev_req_s *req) if (!priv->driver) { usbtrace(TRACE_DEVERROR(SAM_TRACEERR_NOTCONFIGURED), priv->usbdev.speed); - ulldbg("ERROR: driver=%p\n", priv->driver); + ullerr("ERROR: driver=%p\n", priv->driver); return -ESHUTDOWN; } #endif @@ -3611,7 +3611,7 @@ static int sam_ep_submit(struct usbdev_ep_s *ep, struct usbdev_req_s *req) if (privep->stalled) { sam_req_abort(privep, privreq, -EBUSY); - ulldbg("ERROR: stalled\n"); + ullerr("ERROR: stalled\n"); ret = -EPERM; } else diff --git a/arch/arm/src/sama5/sam_wdt.c b/arch/arm/src/sama5/sam_wdt.c index e5507a3949..88546618d9 100644 --- a/arch/arm/src/sama5/sam_wdt.c +++ b/arch/arm/src/sama5/sam_wdt.c @@ -82,12 +82,12 @@ /* Debug ********************************************************************/ /* Non-standard debug that may be enabled just for testing the watchdog - * driver. NOTE: that only lldbg types are used so that the output is + * driver. NOTE: that only llerr types are used so that the output is * immediately available. */ #ifdef CONFIG_DEBUG_WATCHDOG -# define wddbg lldbg +# define wddbg llerr # define wdinfo llinfo #else # define wddbg(x...) @@ -199,7 +199,7 @@ static uint32_t sam_getreg(uintptr_t regaddr) { if (count == 4) { - lldbg("...\n"); + llerr("...\n"); } return regval; @@ -216,7 +216,7 @@ static uint32_t sam_getreg(uintptr_t regaddr) { /* Yes.. then show how many times the value repeated */ - lldbg("[repeats %d more times]\n", count-3); + llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -228,7 +228,7 @@ static uint32_t sam_getreg(uintptr_t regaddr) /* Show the register value read */ - lldbg("%08x->%048\n", regaddr, regval); + llerr("%08x->%048\n", regaddr, regval); return regval; } #endif @@ -246,7 +246,7 @@ static void sam_putreg(uint32_t regval, uintptr_t regaddr) { /* Show the register value being written */ - lldbg("%08x<-%08x\n", regaddr, regval); + llerr("%08x<-%08x\n", regaddr, regval); /* Write the value */ diff --git a/arch/arm/src/sama5/sam_xdmac.c b/arch/arm/src/sama5/sam_xdmac.c index 609823acb6..74105e6147 100644 --- a/arch/arm/src/sama5/sam_xdmac.c +++ b/arch/arm/src/sama5/sam_xdmac.c @@ -1860,7 +1860,7 @@ static int sam_xdmac_interrupt(struct sam_xdmac_s *xdmac) { /* Yes... Terminate the transfer with an error? */ - dmalldbg("ERROR: DMA failed: %08x\n", chpending); + dmallerr("ERROR: DMA failed: %08x\n", chpending); sam_dmaterminate(xdmach, -EIO); } @@ -1877,7 +1877,7 @@ static int sam_xdmac_interrupt(struct sam_xdmac_s *xdmac) else { - dmalldbg("ERROR: Unexpected interrupt: %08x\n", chpending); + dmallerr("ERROR: Unexpected interrupt: %08x\n", chpending); DEBUGPANIC(); } diff --git a/arch/arm/src/sama5/sama5d2x_pio.c b/arch/arm/src/sama5/sama5d2x_pio.c index d6daf15a82..1ca67e45bd 100644 --- a/arch/arm/src/sama5/sama5d2x_pio.c +++ b/arch/arm/src/sama5/sama5d2x_pio.c @@ -630,31 +630,31 @@ int sam_dumppio(uint32_t pinset, const char *msg) if (secure) { - lldbg("SPIO%c pinset: %08x base: %08x -- %s\n", + llerr("SPIO%c pinset: %08x base: %08x -- %s\n", g_portchar[port], pinset, base, msg); } else { - lldbg("PIO%c pinset: %08x base: %08x -- %s\n", + llerr("PIO%c pinset: %08x base: %08x -- %s\n", g_portchar[port], pinset, base, msg); } - lldbg(" MSKR: %08x CFGR: %08x PDSR: %08x LOCKSR: %08x\n", + llerr(" MSKR: %08x CFGR: %08x PDSR: %08x LOCKSR: %08x\n", getreg32(base + SAM_PIO_MSKR_OFFSET), getreg32(base + SAM_PIO_CFGR_OFFSET), getreg32(base + SAM_PIO_PDSR_OFFSET), getreg32(base + SAM_PIO_LOCKSR_OFFSET)); - lldbg(" ODSR: %08x IMR: %08x ISR: %08x\n", + llerr(" ODSR: %08x IMR: %08x ISR: %08x\n", getreg32(base + SAM_PIO_ODSR_OFFSET), getreg32(base + SAM_PIO_IMR_OFFSET), getreg32(base + SAM_PIO_ISR_OFFSET)); if (secure) { - lldbg(" SCDR: %08x WPMR: %08x WPSR: %08x IOSSR: %08x\n", + llerr(" SCDR: %08x WPMR: %08x WPSR: %08x IOSSR: %08x\n", getreg32(SAM_SPIO_SCDR), getreg32(SAM_SPIO_WPMR), getreg32(SAM_SPIO_WPSR), getreg32(base + SAM_SPIO_IOSSR_OFFSET)); } else { - lldbg(" WPMR: %08x WPSR: %08x\n", + llerr(" WPMR: %08x WPSR: %08x\n", getreg32(SAM_PIO_WPMR), getreg32(SAM_PIO_WPSR)); } diff --git a/arch/arm/src/sama5/sama5d3x4x_pio.c b/arch/arm/src/sama5/sama5d3x4x_pio.c index b9379ad868..c054625ac8 100644 --- a/arch/arm/src/sama5/sama5d3x4x_pio.c +++ b/arch/arm/src/sama5/sama5d3x4x_pio.c @@ -869,40 +869,40 @@ int sam_dumppio(uint32_t pinset, const char *msg) /* The following requires exclusive access to the PIO registers */ flags = enter_critical_section(); - lldbg("PIO%c pinset: %08x base: %08x -- %s\n", + llerr("PIO%c pinset: %08x base: %08x -- %s\n", g_portchar[port], pinset, base, msg); #ifdef SAM_PIO_ISLR_OFFSET - lldbg(" PSR: %08x ISLR: %08x OSR: %08x IFSR: %08x\n", + llerr(" PSR: %08x ISLR: %08x OSR: %08x IFSR: %08x\n", getreg32(base + SAM_PIO_PSR_OFFSET), getreg32(base + SAM_PIO_ISLR_OFFSET), getreg32(base + SAM_PIO_OSR_OFFSET), getreg32(base + SAM_PIO_IFSR_OFFSET)); #else - lldbg(" PSR: %08x OSR: %08x IFSR: %08x\n", + llerr(" PSR: %08x OSR: %08x IFSR: %08x\n", getreg32(base + SAM_PIO_PSR_OFFSET), getreg32(base + SAM_PIO_OSR_OFFSET), getreg32(base + SAM_PIO_IFSR_OFFSET)); #endif - lldbg(" ODSR: %08x PDSR: %08x IMR: %08x ISR: %08x\n", + llerr(" ODSR: %08x PDSR: %08x IMR: %08x ISR: %08x\n", getreg32(base + SAM_PIO_ODSR_OFFSET), getreg32(base + SAM_PIO_PDSR_OFFSET), getreg32(base + SAM_PIO_IMR_OFFSET), getreg32(base + SAM_PIO_ISR_OFFSET)); - lldbg(" MDSR: %08x PUSR: %08x ABDCSR: %08x %08x\n", + llerr(" MDSR: %08x PUSR: %08x ABDCSR: %08x %08x\n", getreg32(base + SAM_PIO_MDSR_OFFSET), getreg32(base + SAM_PIO_PUSR_OFFSET), getreg32(base + SAM_PIO_ABCDSR1_OFFSET), getreg32(base + SAM_PIO_ABCDSR2_OFFSET)); - lldbg(" IFSCSR: %08x SCDR: %08x PPDSR: %08x OWSR: %08x\n", + llerr(" IFSCSR: %08x SCDR: %08x PPDSR: %08x OWSR: %08x\n", getreg32(base + SAM_PIO_IFSCSR_OFFSET), getreg32(base + SAM_PIO_SCDR_OFFSET), getreg32(base + SAM_PIO_PPDSR_OFFSET), getreg32(base + SAM_PIO_OWSR_OFFSET)); #ifdef SAM_PIO_LOCKSR_OFFSET - lldbg(" AIMMR: %08x ELSR: %08x FRLHSR: %08x LOCKSR: %08x\n", + llerr(" AIMMR: %08x ELSR: %08x FRLHSR: %08x LOCKSR: %08x\n", getreg32(base + SAM_PIO_AIMMR_OFFSET), getreg32(base + SAM_PIO_ELSR_OFFSET), getreg32(base + SAM_PIO_FRLHSR_OFFSET), getreg32(base + SAM_PIO_LOCKSR_OFFSET)); #else - lldbg(" AIMMR: %08x ELSR: %08x FRLHSR: %08x\n", + llerr(" AIMMR: %08x ELSR: %08x FRLHSR: %08x\n", getreg32(base + SAM_PIO_AIMMR_OFFSET), getreg32(base + SAM_PIO_ELSR_OFFSET), getreg32(base + SAM_PIO_FRLHSR_OFFSET)); #endif - lldbg("SCHMITT: %08x DRIVER: %08x %08x\n", + llerr("SCHMITT: %08x DRIVER: %08x %08x\n", getreg32(base + SAM_PIO_SCHMITT_OFFSET), getreg32(base + SAM_PIO_DRIVER1_OFFSET), getreg32(base + SAM_PIO_DRIVER2_OFFSET)); - lldbg(" WPMR: %08x WPSR: %08x\n", + llerr(" WPMR: %08x WPSR: %08x\n", getreg32(base + SAM_PIO_WPMR_OFFSET), getreg32(base + SAM_PIO_WPSR_OFFSET)); leave_critical_section(flags); diff --git a/arch/arm/src/samdl/sam_irq.c b/arch/arm/src/samdl/sam_irq.c index 42b65d814f..a67f403b53 100644 --- a/arch/arm/src/samdl/sam_irq.c +++ b/arch/arm/src/samdl/sam_irq.c @@ -306,26 +306,26 @@ void sam_dumpnvic(const char *msg, int irq) flags = enter_critical_section(); - lldbg("NVIC (%s, irq=%d):\n", msg, irq); - lldbg(" ISER: %08x ICER: %08x\n", + llerr("NVIC (%s, irq=%d):\n", msg, irq); + llerr(" ISER: %08x ICER: %08x\n", getreg32(ARMV6M_NVIC_ISER), getreg32(ARMV6M_NVIC_ICER)); - lldbg(" ISPR: %08x ICPR: %08x\n", + llerr(" ISPR: %08x ICPR: %08x\n", getreg32(ARMV6M_NVIC_ISPR), getreg32(ARMV6M_NVIC_ICPR)); - lldbg(" IRQ PRIO: %08x %08x %08x %08x\n", + llerr(" IRQ PRIO: %08x %08x %08x %08x\n", getreg32(ARMV6M_NVIC_IPR0), getreg32(ARMV6M_NVIC_IPR1), getreg32(ARMV6M_NVIC_IPR2), getreg32(ARMV6M_NVIC_IPR3)); - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(ARMV6M_NVIC_IPR4), getreg32(ARMV6M_NVIC_IPR5), getreg32(ARMV6M_NVIC_IPR6), getreg32(ARMV6M_NVIC_IPR7)); - lldbg("SYSCON:\n"); - lldbg(" CPUID: %08x\n", + llerr("SYSCON:\n"); + llerr(" CPUID: %08x\n", getreg32(ARMV6M_SYSCON_CPUID)); - lldbg(" ICSR: %08x AIRCR: %08x\n", + llerr(" ICSR: %08x AIRCR: %08x\n", getreg32(ARMV6M_SYSCON_ICSR), getreg32(ARMV6M_SYSCON_AIRCR)); - lldbg(" SCR: %08x CCR: %08x\n", + llerr(" SCR: %08x CCR: %08x\n", getreg32(ARMV6M_SYSCON_SCR), getreg32(ARMV6M_SYSCON_CCR)); - lldbg(" SHPR2: %08x SHPR3: %08x\n", + llerr(" SHPR2: %08x SHPR3: %08x\n", getreg32(ARMV6M_SYSCON_SHPR2), getreg32(ARMV6M_SYSCON_SHPR3)); leave_critical_section(flags); diff --git a/arch/arm/src/samdl/sam_port.c b/arch/arm/src/samdl/sam_port.c index 53c8664efd..58d0550df3 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(); - lldbg("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); - lldbg(" 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)); - lldbg(" CTRL: %08x WRCONFIG: %08x\n", + llerr(" CTRL: %08x WRCONFIG: %08x\n", getreg32(base + SAM_PORT_CTRL_OFFSET), getreg32(base + SAM_PORT_WRCONFIG_OFFSET)); - lldbg(" 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 b78ef8c548..e16f4cd730 100644 --- a/arch/arm/src/samdl/sam_spi.c +++ b/arch/arm/src/samdl/sam_spi.c @@ -91,9 +91,9 @@ #endif #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif @@ -569,7 +569,7 @@ static bool spi_checkreg(struct sam_spidev_s *priv, bool wr, uint32_t regval, { /* Yes... show how many times we did it */ - lldbg("...[Repeats %d times]...\n", priv->ntimes); + llerr("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -602,7 +602,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)) { - lldbg("%08x->%02x\n", regaddr, regval); + llerr("%08x->%02x\n", regaddr, regval); } #endif @@ -625,7 +625,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)) { - lldbg("%08x<-%02x\n", regaddr, regval); + llerr("%08x<-%02x\n", regaddr, regval); } #endif @@ -648,7 +648,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)) { - lldbg("%08x->%04x\n", regaddr, regval); + llerr("%08x->%04x\n", regaddr, regval); } #endif @@ -671,7 +671,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)) { - lldbg("%08x<-%04x\n", regaddr, regval); + llerr("%08x<-%04x\n", regaddr, regval); } #endif @@ -694,7 +694,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)) { - lldbg("%08x->%08x\n", regaddr, regval); + llerr("%08x->%08x\n", regaddr, regval); } #endif @@ -717,7 +717,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)) { - lldbg("%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 ff39b0c659..1e5e80a840 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 */ - lldbg("...[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)) { - lldbg("%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)) { - lldbg("%08x<-%08x\n", regaddr, regval); + llerr("%08x<-%08x\n", regaddr, regval); } #endif @@ -1147,7 +1147,7 @@ static int sam_buffer_allocate(struct sam_emac_s *priv) priv->xfrq[0].txdesc = (struct emac_txdesc_s *)kmm_memalign(EMAC_ALIGN, allocsize); if (!priv->xfrq[0].txdesc) { - nlldbg("ERROR: Failed to allocate TX descriptors\n"); + nllerr("ERROR: Failed to allocate TX descriptors\n"); return -ENOMEM; } @@ -1158,7 +1158,7 @@ static int sam_buffer_allocate(struct sam_emac_s *priv) priv->xfrq[0].rxdesc = (struct emac_rxdesc_s *)kmm_memalign(EMAC_ALIGN, allocsize); if (!priv->xfrq[0].rxdesc) { - nlldbg("ERROR: Failed to allocate RX descriptors\n"); + nllerr("ERROR: Failed to allocate RX descriptors\n"); sam_buffer_free(priv); return -ENOMEM; } @@ -1170,7 +1170,7 @@ static int sam_buffer_allocate(struct sam_emac_s *priv) priv->xfrq[0].txbuffer = (uint8_t *)kmm_memalign(EMAC_ALIGN, allocsize); if (!priv->xfrq[0].txbuffer) { - nlldbg("ERROR: Failed to allocate TX buffer\n"); + nllerr("ERROR: Failed to allocate TX buffer\n"); sam_buffer_free(priv); return -ENOMEM; } @@ -1181,7 +1181,7 @@ static int sam_buffer_allocate(struct sam_emac_s *priv) priv->xfrq[0].rxbuffer = (uint8_t *)kmm_memalign(EMAC_ALIGN, allocsize); if (!priv->xfrq[0].rxbuffer) { - nlldbg("ERROR: Failed to allocate RX buffer\n"); + nllerr("ERROR: Failed to allocate RX buffer\n"); sam_buffer_free(priv); return -ENOMEM; } @@ -1194,7 +1194,7 @@ static int sam_buffer_allocate(struct sam_emac_s *priv) priv->xfrq[1].txdesc = (struct emac_txdesc_s *)kmm_memalign(EMAC_ALIGN, allocsize); if (!priv->xfrq[1].txdesc) { - nlldbg("ERROR: Failed to allocate TX descriptors\n"); + nllerr("ERROR: Failed to allocate TX descriptors\n"); return -ENOMEM; } @@ -1205,7 +1205,7 @@ static int sam_buffer_allocate(struct sam_emac_s *priv) priv->xfrq[1].rxdesc = (struct emac_rxdesc_s *)kmm_memalign(EMAC_ALIGN, allocsize); if (!priv->xfrq[1].rxdesc) { - nlldbg("ERROR: Failed to allocate RX descriptors\n"); + nllerr("ERROR: Failed to allocate RX descriptors\n"); sam_buffer_free(priv); return -ENOMEM; } @@ -1217,7 +1217,7 @@ static int sam_buffer_allocate(struct sam_emac_s *priv) priv->xfrq[1].txbuffer = (uint8_t *)kmm_memalign(EMAC_ALIGN, allocsize); if (!priv->xfrq[1].txbuffer) { - nlldbg("ERROR: Failed to allocate TX buffer\n"); + nllerr("ERROR: Failed to allocate TX buffer\n"); sam_buffer_free(priv); return -ENOMEM; } @@ -1228,7 +1228,7 @@ static int sam_buffer_allocate(struct sam_emac_s *priv) priv->xfrq[1].rxbuffer = (uint8_t *)kmm_memalign(EMAC_ALIGN, allocsize); if (!priv->xfrq[1].rxbuffer) { - nlldbg("ERROR: Failed to allocate RX buffer\n"); + nllerr("ERROR: Failed to allocate RX buffer\n"); sam_buffer_free(priv); return -ENOMEM; } @@ -1369,7 +1369,7 @@ static int sam_transmit(struct sam_emac_s *priv, int qid) if (dev->d_len > EMAC_TX_UNITSIZE) { - nlldbg("ERROR: Packet too big: %d\n", dev->d_len); + nllerr("ERROR: Packet too big: %d\n", dev->d_len); return -EINVAL; } @@ -1386,7 +1386,7 @@ static int sam_transmit(struct sam_emac_s *priv, int qid) if (sam_txfree(priv, qid) < 1) { - nlldbg("ERROR: No free TX descriptors\n"); + nllerr("ERROR: No free TX descriptors\n"); return -EBUSY; } @@ -1805,7 +1805,7 @@ static int sam_recvframe(struct sam_emac_s *priv, int qid) xfrq->rxndx, dev->d_len); if (pktlen < dev->d_len) { - nlldbg("ERROR: Buffer size %d; frame size %d\n", + nllerr("ERROR: Buffer size %d; frame size %d\n", dev->d_len, pktlen); NETDEV_RXERRORS(&priv->dev); return -E2BIG; @@ -1896,7 +1896,7 @@ static void sam_receive(struct sam_emac_s *priv, int qid) if (dev->d_len > CONFIG_NET_ETH_MTU) { - nlldbg("DROPPED: Too big: %d\n", dev->d_len); + nllerr("DROPPED: Too big: %d\n", dev->d_len); NETDEV_RXERRORS(&priv->dev); continue; } @@ -2010,7 +2010,7 @@ static void sam_receive(struct sam_emac_s *priv, int qid) else #endif { - nlldbg("DROPPED: Unknown type: %04x\n", BUF->type); + nllerr("DROPPED: Unknown type: %04x\n", BUF->type); NETDEV_RXDROPPED(&priv->dev); } } @@ -2312,7 +2312,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv, int qid) if ((rsr & EMAC_RSR_RXOVR) != 0) { - nlldbg("ERROR: Receiver overrun RSR: %08x\n", rsr); + nllerr("ERROR: Receiver overrun RSR: %08x\n", rsr); clrbits |= EMAC_RSR_RXOVR; } @@ -2329,7 +2329,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv, int qid) if ((rsr & EMAC_RSR_BNA) != 0) { - nlldbg("ERROR: Buffer not available RSR: %08x\n", rsr); + nllerr("ERROR: Buffer not available RSR: %08x\n", rsr); clrbits |= EMAC_RSR_BNA; } @@ -2370,7 +2370,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv, int qid) clrbits = EMAC_TSR_RLE | sam_txinuse(priv, qid); sam_txreset(priv, qid); - nlldbg("ERROR: Retry Limit Exceeded TSR: %08x\n", tsr); + nllerr("ERROR: Retry Limit Exceeded TSR: %08x\n", tsr); regval = sam_getreg(priv, SAM_EMAC_NCR_OFFSET); regval |= EMAC_NCR_TXEN; @@ -2381,7 +2381,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv, int qid) if ((tsr & EMAC_TSR_COL) != 0) { - nlldbg("ERROR: Collision occurred TSR: %08x\n", tsr); + nllerr("ERROR: Collision occurred TSR: %08x\n", tsr); NETDEV_TXERRORS(&priv->dev); } @@ -2389,7 +2389,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv, int qid) if ((tsr & EMAC_TSR_TFC) != 0) { - nlldbg("ERROR: Transmit Frame Corruption due to AHB error: %08x\n", tsr); + nllerr("ERROR: Transmit Frame Corruption due to AHB error: %08x\n", tsr); NETDEV_TXERRORS(&priv->dev); } @@ -2407,7 +2407,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv, int qid) if ((pending & EMAC_INT_HRESP) != 0) { - nlldbg("ERROR: Hresp not OK\n"); + nllerr("ERROR: Hresp not OK\n"); } /* Check for PAUSE Frame received (PFRE). @@ -2418,7 +2418,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv, int qid) if ((pending & EMAC_INT_PFNZ) != 0) { - nlldbg("Pause frame received\n"); + nllerr("Pause frame received\n"); } /* Check for Pause Time Zero (PTZ) @@ -2428,7 +2428,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv, int qid) if ((pending & EMAC_INT_PTZ) != 0) { - nlldbg("Pause TO!\n"); + nllerr("Pause TO!\n"); } #endif } @@ -2593,7 +2593,7 @@ static int sam_emac1_interrupt(int irq, void *context) static inline void sam_txtimeout_process(FAR struct sam_emac_s *priv) { - nlldbg("Timeout!\n"); + nllerr("Timeout!\n"); NETDEV_TXTIMEOUTS(&priv->dev); /* Reset the hardware. Just take the interface down, then back up again. */ @@ -2858,7 +2858,7 @@ static int sam_ifup(struct net_driver_s *dev) ret = sam_phyinit(priv); if (ret < 0) { - nlldbg("ERROR: sam_phyinit failed: %d\n", ret); + nllerr("ERROR: sam_phyinit failed: %d\n", ret); return ret; } @@ -2867,7 +2867,7 @@ static int sam_ifup(struct net_driver_s *dev) ret = sam_autonegotiate(priv); if (ret < 0) { - nlldbg("ERROR: sam_autonegotiate failed: %d\n", ret); + nllerr("ERROR: sam_autonegotiate failed: %d\n", ret); return ret; } @@ -2910,7 +2910,7 @@ static int sam_ifdown(struct net_driver_s *dev) struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private; irqstate_t flags; - nlldbg("Taking the network down\n"); + nllerr("Taking the network down\n"); /* Disable the EMAC interrupt */ @@ -3729,7 +3729,7 @@ static int sam_phyreset(struct sam_emac_s *priv) ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, MII_MCR_RESET); if (ret < 0) { - nlldbg("ERROR: sam_phywrite failed: %d\n", ret); + nllerr("ERROR: sam_phywrite failed: %d\n", ret); } /* Wait for the PHY reset to complete */ @@ -3741,7 +3741,7 @@ static int sam_phyreset(struct sam_emac_s *priv) int result = sam_phyread(priv, priv->phyaddr, MII_MCR, &mcr); if (result < 0) { - nlldbg("ERROR: Failed to read the MCR register: %d\n", ret); + nllerr("ERROR: Failed to read the MCR register: %d\n", ret); ret = result; } else if ((mcr & MII_MCR_RESET) == 0) @@ -3806,7 +3806,7 @@ static int sam_phyfind(struct sam_emac_s *priv, uint8_t *phyaddr) else { - nlldbg("ERROR: sam_phyread failed for PHY address %02x: %d\n", + nllerr("ERROR: sam_phyread failed for PHY address %02x: %d\n", candidate, ret); for (offset = 0; offset < 32; offset++) @@ -3872,7 +3872,7 @@ static int sam_phyread(struct sam_emac_s *priv, uint8_t phyaddr, ret = sam_phywait(priv); if (ret < 0) { - nlldbg("ERROR: sam_phywait failed: %d\n", ret); + nllerr("ERROR: sam_phywait failed: %d\n", ret); return ret; } @@ -3897,7 +3897,7 @@ static int sam_phyread(struct sam_emac_s *priv, uint8_t phyaddr, ret = sam_phywait(priv); if (ret < 0) { - nlldbg("ERROR: sam_phywait failed: %d\n", ret); + nllerr("ERROR: sam_phywait failed: %d\n", ret); return ret; } @@ -3937,7 +3937,7 @@ static int sam_phywrite(struct sam_emac_s *priv, uint8_t phyaddr, ret = sam_phywait(priv); if (ret < 0) { - nlldbg("ERROR: sam_phywait failed: %d\n", ret); + nllerr("ERROR: sam_phywait failed: %d\n", ret); return ret; } @@ -3962,7 +3962,7 @@ static int sam_phywrite(struct sam_emac_s *priv, uint8_t phyaddr, ret = sam_phywait(priv); if (ret < 0) { - nlldbg("ERROR: sam_phywait failed: %d\n", ret); + nllerr("ERROR: sam_phywait failed: %d\n", ret); return ret; } @@ -4007,7 +4007,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_PHYID1, &phyid1); if (ret < 0) { - nlldbg("ERROR: Failed to read PHYID1\n"); + nllerr("ERROR: Failed to read PHYID1\n"); goto errout; } @@ -4016,7 +4016,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_PHYID2, &phyid2); if (ret < 0) { - nlldbg("ERROR: Failed to read PHYID2\n"); + nllerr("ERROR: Failed to read PHYID2\n"); goto errout; } @@ -4033,7 +4033,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) } else { - nlldbg("ERROR: PHY not recognized\n"); + nllerr("ERROR: PHY not recognized\n"); } /* Setup control register */ @@ -4041,7 +4041,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_MCR, &mcr); if (ret < 0) { - nlldbg("ERROR: Failed to read MCR\n"); + nllerr("ERROR: Failed to read MCR\n"); goto errout; } @@ -4052,7 +4052,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, mcr); if (ret < 0) { - nlldbg("ERROR: Failed to write MCR\n"); + nllerr("ERROR: Failed to write MCR\n"); goto errout; } @@ -4067,7 +4067,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phywrite(priv, priv->phyaddr, MII_ADVERTISE, advertise); if (ret < 0) { - nlldbg("ERROR: Failed to write ANAR\n"); + nllerr("ERROR: Failed to write ANAR\n"); goto errout; } @@ -4076,7 +4076,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_MCR, &mcr); if (ret < 0) { - nlldbg("ERROR: Failed to read MCR\n"); + nllerr("ERROR: Failed to read MCR\n"); goto errout; } @@ -4084,7 +4084,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, mcr); if (ret < 0) { - nlldbg("ERROR: Failed to write MCR\n"); + nllerr("ERROR: Failed to write MCR\n"); goto errout; } @@ -4096,7 +4096,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, mcr); if (ret < 0) { - nlldbg("ERROR: Failed to write MCR\n"); + nllerr("ERROR: Failed to write MCR\n"); goto errout; } @@ -4110,7 +4110,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_MSR, &msr); if (ret < 0) { - nlldbg("ERROR: Failed to read MSR\n"); + nllerr("ERROR: Failed to read MSR\n"); goto errout; } @@ -4128,7 +4128,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) if (++timeout >= PHY_RETRY_MAX) { - nlldbg("ERROR: TimeOut\n"); + nllerr("ERROR: TimeOut\n"); sam_phydump(priv); ret = -ETIMEDOUT; goto errout; @@ -4140,7 +4140,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_LPA, &lpa); if (ret < 0) { - nlldbg("ERROR: Failed to read ANLPAR\n"); + nllerr("ERROR: Failed to read ANLPAR\n"); goto errout; } @@ -4235,13 +4235,13 @@ static bool sam_linkup(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, MII_MSR, &msr); if (ret < 0) { - nlldbg("ERROR: Failed to read MSR: %d\n", ret); + nllerr("ERROR: Failed to read MSR: %d\n", ret); goto errout; } if ((msr & MII_MSR_LINKSTATUS) == 0) { - nlldbg("ERROR: MSR LinkStatus: %04x\n", msr); + nllerr("ERROR: MSR LinkStatus: %04x\n", msr); goto errout; } @@ -4250,7 +4250,7 @@ static bool sam_linkup(struct sam_emac_s *priv) ret = sam_phyread(priv, priv->phyaddr, priv->attr->physr, &physr); if (ret < 0) { - nlldbg("ERROR: Failed to read PHYSR: %d\n", ret); + nllerr("ERROR: Failed to read PHYSR: %d\n", ret); goto errout; } @@ -4365,7 +4365,7 @@ static int sam_phyinit(struct sam_emac_s *priv) ret = sam_phyfind(priv, &priv->phyaddr); if (ret < 0) { - nlldbg("ERROR: sam_phyfind failed: %d\n", ret); + nllerr("ERROR: sam_phyfind failed: %d\n", ret); return ret; } diff --git a/arch/arm/src/samv7/sam_ethernet.c b/arch/arm/src/samv7/sam_ethernet.c index 3e19d95873..84a883bfcb 100644 --- a/arch/arm/src/samv7/sam_ethernet.c +++ b/arch/arm/src/samv7/sam_ethernet.c @@ -99,7 +99,7 @@ void up_netinitialize(void) ret = sam_emac_initialize(EMAC0_INTF); if (ret < 0) { - nlldbg("ERROR: up_emac_initialize(EMAC0) failed: %d\n", ret); + nllerr("ERROR: up_emac_initialize(EMAC0) failed: %d\n", ret); } #endif @@ -109,7 +109,7 @@ void up_netinitialize(void) ret = sam_emac_initialize(EMAC1_INTF); if (ret < 0) { - nlldbg("ERROR: up_emac_initialize(EMAC1) failed: %d\n", ret); + nllerr("ERROR: up_emac_initialize(EMAC1) failed: %d\n", ret); } #endif #endif diff --git a/arch/arm/src/samv7/sam_gpio.c b/arch/arm/src/samv7/sam_gpio.c index 32547ff1a3..eeb716686e 100644 --- a/arch/arm/src/samv7/sam_gpio.c +++ b/arch/arm/src/samv7/sam_gpio.c @@ -578,38 +578,38 @@ int sam_dumpgpio(uint32_t pinset, const char *msg) /* The following requires exclusive access to the GPIO registers */ flags = enter_critical_section(); - lldbg("PIO%c pinset: %08x base: %08x -- %s\n", + llerr("PIO%c pinset: %08x base: %08x -- %s\n", g_portchar[port], pinset, base, msg); - lldbg(" PSR: %08x OSR: %08x IFSR: %08x ODSR: %08x\n", + llerr(" PSR: %08x OSR: %08x IFSR: %08x ODSR: %08x\n", getreg32(base + SAM_PIO_PSR_OFFSET), getreg32(base + SAM_PIO_OSR_OFFSET), getreg32(base + SAM_PIO_IFSR_OFFSET), getreg32(base + SAM_PIO_ODSR_OFFSET)); - lldbg(" PDSR: %08x IMR: %08x ISR: %08x MDSR: %08x\n", + llerr(" PDSR: %08x IMR: %08x ISR: %08x MDSR: %08x\n", getreg32(base + SAM_PIO_PDSR_OFFSET), getreg32(base + SAM_PIO_IMR_OFFSET), getreg32(base + SAM_PIO_ISR_OFFSET), getreg32(base + SAM_PIO_MDSR_OFFSET)); - lldbg(" ABCDSR: %08x %08x IFSCSR: %08x PPDSR: %08x\n", + llerr(" ABCDSR: %08x %08x IFSCSR: %08x PPDSR: %08x\n", getreg32(base + SAM_PIO_ABCDSR1_OFFSET), getreg32(base + SAM_PIO_ABCDSR2_OFFSET), getreg32(base + SAM_PIO_IFSCSR_OFFSET), getreg32(base + SAM_PIO_PPDSR_OFFSET)); - lldbg(" PUSR: %08x SCDR: %08x OWSR: %08x AIMMR: %08x\n", + llerr(" PUSR: %08x SCDR: %08x OWSR: %08x AIMMR: %08x\n", getreg32(base + SAM_PIO_PUSR_OFFSET), getreg32(base + SAM_PIO_SCDR_OFFSET), getreg32(base + SAM_PIO_OWSR_OFFSET), getreg32(base + SAM_PIO_AIMMR_OFFSET)); - lldbg(" ESR: %08x LSR: %08x ELSR: %08x FELLSR: %08x\n", + llerr(" ESR: %08x LSR: %08x ELSR: %08x FELLSR: %08x\n", getreg32(base + SAM_PIO_ESR_OFFSET), getreg32(base + SAM_PIO_LSR_OFFSET), getreg32(base + SAM_PIO_ELSR_OFFSET), getreg32(base + SAM_PIO_FELLSR_OFFSET)); - lldbg(" FRLHSR: %08x LOCKSR: %08x WPMR: %08x WPSR: %08x\n", + llerr(" FRLHSR: %08x LOCKSR: %08x WPMR: %08x WPSR: %08x\n", getreg32(base + SAM_PIO_FRLHSR_OFFSET), getreg32(base + SAM_PIO_LOCKSR_OFFSET), getreg32(base + SAM_PIO_WPMR_OFFSET), getreg32(base + SAM_PIO_WPSR_OFFSET)); - lldbg(" PCMR: %08x PCIMR: %08x PCISR: %08x PCRHR: %08x\n", + llerr(" PCMR: %08x PCIMR: %08x PCISR: %08x PCRHR: %08x\n", getreg32(base + SAM_PIO_PCMR_OFFSET), getreg32(base + SAM_PIO_PCIMR_OFFSET), getreg32(base + SAM_PIO_PCISR_OFFSET), getreg32(base + SAM_PIO_PCRHR_OFFSET)); - lldbg("SCHMITT: %08x DRIVER:%08x\n", + llerr("SCHMITT: %08x DRIVER:%08x\n", getreg32(base + SAM_PIO_SCHMITT_OFFSET), getreg32(base + SAM_PIO_DRIVER_OFFSET)); - lldbg(" KER: %08x KRCR: %08x KDR: %08x KIMR: %08x\n", + llerr(" KER: %08x KRCR: %08x KDR: %08x KIMR: %08x\n", getreg32(base + SAM_PIO_KER_OFFSET), getreg32(base + SAM_PIO_KRCR_OFFSET), getreg32(base + SAM_PIO_KDR_OFFSET), getreg32(base + SAM_PIO_KIMR_OFFSET)); - lldbg(" KSR: %08x KKPR: %08x KKRR: %08x\n", + llerr(" KSR: %08x KKPR: %08x KKRR: %08x\n", getreg32(base + SAM_PIO_KSR_OFFSET), getreg32(base + SAM_PIO_KKPR_OFFSET), getreg32(base + SAM_PIO_KKRR_OFFSET)); - lldbg(" PCMR: %08x PCIMR: %08x PCISR: %08x PCRHR: %08x\n", + llerr(" PCMR: %08x PCIMR: %08x PCISR: %08x PCRHR: %08x\n", getreg32(base + SAM_PIO_PCMR_OFFSET), getreg32(base + SAM_PIO_PCIMR_OFFSET), getreg32(base + SAM_PIO_PCISR_OFFSET), getreg32(base + SAM_PIO_PCRHR_OFFSET)); leave_critical_section(flags); diff --git a/arch/arm/src/samv7/sam_hsmci.c b/arch/arm/src/samv7/sam_hsmci.c index 0bc9daf919..836af1f394 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 */ - lldbg("...[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)) { - lldbg("%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)) { - lldbg("%08x<-%08x\n", address, value); + llerr("%08x<-%08x\n", address, value); } #endif @@ -1169,7 +1169,7 @@ static void sam_dmacallback(DMA_HANDLE handle, void *arg, int result) if (result < 0) { wkupevent = (result == -ETIMEDOUT ? SDIOWAIT_TIMEOUT : SDIOWAIT_ERROR); - flldbg("ERROR: DMA failed: result=%d wkupevent=%04x\n", result, wkupevent); + fllerr("ERROR: DMA failed: result=%d wkupevent=%04x\n", result, wkupevent); /* sam_endtransfer will terminate the transfer and wait up the waiting * client in this case. @@ -1269,7 +1269,7 @@ static void sam_eventtimeout(int argc, uint32_t arg) /* Yes.. wake up any waiting threads */ sam_endwait(priv, SDIOWAIT_TIMEOUT); - flldbg("ERROR: Timeout\n"); + fllerr("ERROR: Timeout\n"); } } @@ -1469,7 +1469,7 @@ static int sam_hsmci_interrupt(struct sam_dev_s *priv) { /* Yes.. Was it some kind of timeout error? */ - flldbg("ERROR: enabled: %08x pending: %08x\n", enabled, pending); + fllerr("ERROR: enabled: %08x pending: %08x\n", enabled, pending); if ((pending & HSMCI_DATA_TIMEOUT_ERRORS) != 0) { /* Yes.. Terminate with a timeout. */ diff --git a/arch/arm/src/samv7/sam_irq.c b/arch/arm/src/samv7/sam_irq.c index 3f7c5eeabb..2c0a1a54c5 100644 --- a/arch/arm/src/samv7/sam_irq.c +++ b/arch/arm/src/samv7/sam_irq.c @@ -114,40 +114,40 @@ static void sam_dumpnvic(const char *msg, int irq) irqstate_t flags; flags = enter_critical_section(); - lldbg("NVIC (%s, irq=%d):\n", msg, irq); - lldbg(" INTCTRL: %08x VECTAB: %08x\n", + llerr("NVIC (%s, irq=%d):\n", msg, irq); + llerr(" INTCTRL: %08x VECTAB: %08x\n", getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB)); #if 0 - lldbg(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n", + llerr(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n", getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA), getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE)); #endif - lldbg(" IRQ ENABLE: %08x %08x %08x\n", + llerr(" IRQ ENABLE: %08x %08x %08x\n", getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE), getreg32(NVIC_IRQ64_95_ENABLE)); - lldbg(" SYSH_PRIO: %08x %08x %08x\n", + llerr(" SYSH_PRIO: %08x %08x %08x\n", getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY), getreg32(NVIC_SYSH12_15_PRIORITY)); - lldbg(" IRQ PRIO: %08x %08x %08x %08x\n", + llerr(" IRQ PRIO: %08x %08x %08x %08x\n", getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY), getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY)); #if SAM_IRQ_NEXTINT > 15 - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY), getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY)); #endif #if SAM_IRQ_NEXTINT > 31 - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY), getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY)); #endif #if SAM_IRQ_NEXTINT > 47 - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ48_51_PRIORITY), getreg32(NVIC_IRQ52_55_PRIORITY), getreg32(NVIC_IRQ56_59_PRIORITY), getreg32(NVIC_IRQ60_63_PRIORITY)); #endif #if SAM_IRQ_NEXTINT > 63 - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ64_67_PRIORITY), getreg32(NVIC_IRQ68_71_PRIORITY), getreg32(NVIC_IRQ72_75_PRIORITY), getreg32(NVIC_IRQ76_79_PRIORITY)); #endif diff --git a/arch/arm/src/samv7/sam_mcan.c b/arch/arm/src/samv7/sam_mcan.c index 6e31dcac6d..fe2dfb2c41 100644 --- a/arch/arm/src/samv7/sam_mcan.c +++ b/arch/arm/src/samv7/sam_mcan.c @@ -796,11 +796,11 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg # define caninfo info -# define canlldbg lldbg +# define canllerr llerr # define canllinfo llinfo # ifdef CONFIG_SAMV7_MCAN_REGDEBUG -# define canregdbg lldbg +# define canregdbg llerr # else # define canregdbg(x...) # endif @@ -808,7 +808,7 @@ #else # define candbg(x...) # define caninfo(x...) -# define canlldbg(x...) +# define canllerr(x...) # define canllinfo(x...) # define canregdbg(x...) #endif @@ -1209,7 +1209,7 @@ static uint32_t mcan_getreg(FAR struct sam_mcan_s *priv, int offset) { if (priv->count == 4) { - lldbg("...\n"); + llerr("...\n"); } return regval; @@ -1226,7 +1226,7 @@ static uint32_t mcan_getreg(FAR struct sam_mcan_s *priv, int offset) { /* Yes.. then show how many times the value repeated */ - lldbg("[repeats %d more times]\n", priv->count - 3); + llerr("[repeats %d more times]\n", priv->count - 3); } /* Save the new address, value, and count */ @@ -1238,7 +1238,7 @@ static uint32_t mcan_getreg(FAR struct sam_mcan_s *priv, int offset) /* Show the register value read */ - lldbg("%08x->%08x\n", regaddr, regval); + llerr("%08x->%08x\n", regaddr, regval); return regval; } @@ -1275,7 +1275,7 @@ static void mcan_putreg(FAR struct sam_mcan_s *priv, int offset, uint32_t regval /* Show the register value being written */ - lldbg("%08x<-%08x\n", regaddr, regval); + llerr("%08x<-%08x\n", regaddr, regval); /* Write the value */ @@ -1310,70 +1310,70 @@ static void mcan_dumpregs(FAR struct sam_mcan_s *priv, FAR const char *msg) { FAR const struct sam_config_s *config = priv->config; - lldbg("MCAN%d Registers: %s\n", config->port, msg); - lldbg(" Base: %08x\n", config->base); + llerr("MCAN%d Registers: %s\n", config->port, msg); + llerr(" Base: %08x\n", config->base); - lldbg(" 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)); - lldbg(" 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)); - lldbg(" 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)); - lldbg(" 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)); - lldbg(" 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)); - lldbg(" 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)); - lldbg(" 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)); - lldbg(" 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)); - lldbg(" 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)); - lldbg(" 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)); - lldbg("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), @@ -2219,7 +2219,7 @@ static int mcan_setup(FAR struct can_dev_s *dev) ret = mcan_hw_initialize(priv); if (ret < 0) { - canlldbg("MCAN%d H/W initialization failed: %d\n", config->port, ret); + canllerr("MCAN%d H/W initialization failed: %d\n", config->port, ret); return ret; } @@ -2230,7 +2230,7 @@ static int mcan_setup(FAR struct can_dev_s *dev) ret = irq_attach(config->irq0, config->handler); if (ret < 0) { - canlldbg("Failed to attach MCAN%d line 0 IRQ (%d)", + canllerr("Failed to attach MCAN%d line 0 IRQ (%d)", config->port, config->irq0); return ret; } @@ -2238,7 +2238,7 @@ static int mcan_setup(FAR struct can_dev_s *dev) ret = irq_attach(config->irq1, config->handler); if (ret < 0) { - canlldbg("Failed to attach MCAN%d line 1 IRQ (%d)", + canllerr("Failed to attach MCAN%d line 1 IRQ (%d)", config->port, config->irq1); return ret; } @@ -3155,7 +3155,7 @@ static void mcan_error(FAR struct can_dev_s *dev, uint32_t status, ret = can_receive(dev, &hdr, data); if (ret < 0) { - canlldbg("ERROR: can_receive failed: %d\n", ret); + canllerr("ERROR: can_receive failed: %d\n", ret); } } } @@ -3249,7 +3249,7 @@ static void mcan_receive(FAR struct can_dev_s *dev, FAR uint32_t *rxbuffer, ret = can_receive(dev, &hdr, (FAR uint8_t *)rxbuffer); if (ret < 0) { - canlldbg("ERROR: can_receive failed: %d\n", ret); + canllerr("ERROR: can_receive failed: %d\n", ret); } } @@ -3302,7 +3302,7 @@ static void mcan_interrupt(FAR struct can_dev_s *dev) if ((pending & MCAN_CMNERR_INTS) != 0) { - canlldbg("ERROR: Common %08x\n", pending & MCAN_CMNERR_INTS); + canllerr("ERROR: Common %08x\n", pending & MCAN_CMNERR_INTS); /* Clear the error indications */ @@ -3313,7 +3313,7 @@ static void mcan_interrupt(FAR struct can_dev_s *dev) if ((pending & MCAN_TXERR_INTS) != 0) { - canlldbg("ERROR: TX %08x\n", pending & MCAN_TXERR_INTS); + canllerr("ERROR: TX %08x\n", pending & MCAN_TXERR_INTS); /* Clear the error indications */ @@ -3334,7 +3334,7 @@ static void mcan_interrupt(FAR struct can_dev_s *dev) if ((pending & MCAN_RXERR_INTS) != 0) { - canlldbg("ERROR: RX %08x\n", pending & MCAN_RXERR_INTS); + canllerr("ERROR: RX %08x\n", pending & MCAN_RXERR_INTS); /* Clear the error indications */ @@ -3355,7 +3355,7 @@ static void mcan_interrupt(FAR struct can_dev_s *dev) { /* All (old) errors cleared */ - canlldbg("ERROR: CLEARED\n"); + canllerr("ERROR: CLEARED\n"); mcan_error(dev, 0, priv->olderrors); @@ -3480,7 +3480,7 @@ static void mcan_interrupt(FAR struct can_dev_s *dev) if ((regval & MCAN_RXF0S_RF0L) != 0) { - canlldbg("ERROR: Message lost: %08x\n", regval); + canllerr("ERROR: Message lost: %08x\n", regval); } else { @@ -3514,7 +3514,7 @@ static void mcan_interrupt(FAR struct can_dev_s *dev) if ((regval & MCAN_RXF0S_RF0L) != 0) { - canlldbg("ERROR: Message lost: %08x\n", regval); + canllerr("ERROR: Message lost: %08x\n", regval); } else { diff --git a/arch/arm/src/samv7/sam_qspi.c b/arch/arm/src/samv7/sam_qspi.c index cee4d5110f..6a19f5e83d 100644 --- a/arch/arm/src/samv7/sam_qspi.c +++ b/arch/arm/src/samv7/sam_qspi.c @@ -154,9 +154,9 @@ #endif #ifdef CONFIG_DEBUG_SPI -# define qspidbg lldbg +# define qspidbg llerr # ifdef CONFIG_DEBUG_INFO -# define qspiinfo lldbg +# define qspiinfo llerr # else # define qspiinfo(x...) # endif @@ -395,7 +395,7 @@ static bool qspi_checkreg(struct sam_qspidev_s *priv, bool wr, uint32_t value, { /* Yes... show how many times we did it */ - lldbg("...[Repeats %d times]...\n", priv->ntimes); + llerr("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -429,7 +429,7 @@ static inline uint32_t qspi_getreg(struct sam_qspidev_s *priv, #ifdef CONFIG_SAMV7_QSPI_REGDEBUG if (qspi_checkreg(priv, false, value, address)) { - lldbg("%08x->%08x\n", address, value); + llerr("%08x->%08x\n", address, value); } #endif @@ -452,7 +452,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)) { - lldbg("%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 b188c3dfd6..c241027a19 100644 --- a/arch/arm/src/samv7/sam_rswdt.c +++ b/arch/arm/src/samv7/sam_rswdt.c @@ -82,12 +82,12 @@ /* Debug ********************************************************************/ /* Non-standard debug that may be enabled just for testing the watchdog - * driver. NOTE: that only lldbg types are used so that the output is + * driver. NOTE: that only llerr types are used so that the output is * immediately available. */ #ifdef CONFIG_DEBUG_WATCHDOG -# define wddbg lldbg +# define wddbg llerr # define wdinfo llinfo #else # define wddbg(x...) @@ -199,7 +199,7 @@ static uint32_t sam_getreg(uintptr_t regaddr) { if (count == 4) { - lldbg("...\n"); + llerr("...\n"); } return regval; @@ -216,7 +216,7 @@ static uint32_t sam_getreg(uintptr_t regaddr) { /* Yes.. then show how many times the value repeated */ - lldbg("[repeats %d more times]\n", count-3); + llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -228,7 +228,7 @@ static uint32_t sam_getreg(uintptr_t regaddr) /* Show the register value read */ - lldbg("%08x->%048\n", regaddr, regval); + llerr("%08x->%048\n", regaddr, regval); return regval; } #endif @@ -246,7 +246,7 @@ static void sam_putreg(uint32_t regval, uintptr_t regaddr) { /* Show the register value being written */ - lldbg("%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 3c264eb4e6..68d997440d 100644 --- a/arch/arm/src/samv7/sam_spi.c +++ b/arch/arm/src/samv7/sam_spi.c @@ -136,9 +136,9 @@ #endif #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif @@ -436,7 +436,7 @@ static bool spi_checkreg(struct sam_spidev_s *spi, bool wr, uint32_t value, { /* Yes... show how many times we did it */ - lldbg("...[Repeats %d times]...\n", spi->ntimes); + llerr("...[Repeats %d times]...\n", spi->ntimes); } /* Save information about the new access */ @@ -470,7 +470,7 @@ static inline uint32_t spi_getreg(struct sam_spidev_s *spi, #ifdef CONFIG_SAMV7_SPI_REGDEBUG if (spi_checkreg(spi, false, value, address)) { - lldbg("%08x->%08x\n", address, value); + llerr("%08x->%08x\n", address, value); } #endif @@ -493,7 +493,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)) { - lldbg("%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 4b1ee3bb60..5d8d4987e6 100644 --- a/arch/arm/src/samv7/sam_spi_slave.c +++ b/arch/arm/src/samv7/sam_spi_slave.c @@ -85,9 +85,9 @@ #endif #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif @@ -270,7 +270,7 @@ static bool spi_checkreg(struct sam_spidev_s *priv, bool wr, uint32_t value, { /* Yes... show how many times we did it */ - lldbg("...[Repeats %d times]...\n", priv->ntimes); + llerr("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -303,7 +303,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)) { - lldbg("%08x->%08x\n", address, value); + llerr("%08x->%08x\n", address, value); } #endif @@ -326,7 +326,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)) { - lldbg("%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 7c1b45a557..bc3d7644e4 100644 --- a/arch/arm/src/samv7/sam_ssc.c +++ b/arch/arm/src/samv7/sam_ssc.c @@ -388,16 +388,16 @@ #ifdef CONFIG_DEBUG_I2S # define i2sdbg dbg -# define i2slldbg lldbg +# define i2sllerr llerr # ifdef CONFIG_DEBUG_INFO # define i2sinfo dbg -# define i2sllinfo lldbg +# define i2sllinfo llerr # else # define i2sinfo(x...) # endif #else # define i2sdbg(x...) -# define i2slldbg(x...) +# define i2sllerr(x...) # define i2sinfo(x...) # define i2sllinfo(x...) #endif @@ -697,7 +697,7 @@ static bool ssc_checkreg(struct sam_ssc_s *priv, bool wr, uint32_t regval, { /* Yes... show how many times we did it */ - lldbg("...[Repeats %d times]...\n", priv->count); + llerr("...[Repeats %d times]...\n", priv->count); } /* Save information about the new access */ @@ -731,7 +731,7 @@ static inline uint32_t ssc_getreg(struct sam_ssc_s *priv, #ifdef CONFIG_SAMV7_SSC_REGDEBUG if (ssc_checkreg(priv, false, regval, regaddr)) { - lldbg("%08x->%08x\n", regaddr, regval); + llerr("%08x->%08x\n", regaddr, regval); } #endif @@ -754,7 +754,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)) { - lldbg("%08x<-%08x\n", regaddr, regval); + llerr("%08x<-%08x\n", regaddr, regval); } #endif @@ -1083,7 +1083,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) { - lldbg("result: %d\n", result); + llerr("result: %d\n", result); /* Sample the final registers */ @@ -1148,7 +1148,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) { - lldbg("result: %d\n", result); + llerr("result: %d\n", result); /* Sample the final registers */ @@ -1371,7 +1371,7 @@ static int ssc_rxdma_setup(struct sam_ssc_s *priv) if (ret < 0) { - i2slldbg("ERROR: wd_start failed: %d\n", errno); + i2sllerr("ERROR: wd_start failed: %d\n", errno); } } @@ -1559,7 +1559,7 @@ static void ssc_rx_schedule(struct sam_ssc_s *priv, int result) ret = work_queue(HPWORK, &priv->rx.work, ssc_rx_worker, priv, 0); if (ret != 0) { - i2slldbg("ERROR: Failed to queue RX work: %d\n", ret); + i2sllerr("ERROR: Failed to queue RX work: %d\n", ret); } } } @@ -1788,7 +1788,7 @@ static int ssc_txdma_setup(struct sam_ssc_s *priv) if (ret < 0) { - i2slldbg("ERROR: wd_start failed: %d\n", errno); + i2sllerr("ERROR: wd_start failed: %d\n", errno); } } @@ -1963,7 +1963,7 @@ static void ssc_tx_schedule(struct sam_ssc_s *priv, int result) ret = work_queue(HPWORK, &priv->tx.work, ssc_tx_worker, priv, 0); if (ret != 0) { - i2slldbg("ERROR: Failed to queue TX work: %d\n", ret); + i2sllerr("ERROR: Failed to queue TX work: %d\n", ret); } } } diff --git a/arch/arm/src/samv7/sam_tc.c b/arch/arm/src/samv7/sam_tc.c index d50ea984d2..30ac1a8fb6 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; - lldbg("TC%d [%08x]: %s\n", tc->tc, (int)base, msg); - lldbg(" 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; - lldbg("TC%d Channel %d [%08x]: %s\n", tc->tc, chan->chan, (int)base, msg); - lldbg(" 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)); - lldbg(" 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 */ - lldbg("...[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)) { - lldbg("%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)) { - lldbg("%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)) { - lldbg("%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)) { - lldbg("%08x<-%08x\n", regaddr, regval); + llerr("%08x<-%08x\n", regaddr, regval); } #endif diff --git a/arch/arm/src/samv7/sam_tc.h b/arch/arm/src/samv7/sam_tc.h index 9efd00d607..bf6f279703 100644 --- a/arch/arm/src/samv7/sam_tc.h +++ b/arch/arm/src/samv7/sam_tc.h @@ -89,12 +89,12 @@ #ifdef CONFIG_SAMV7_TC_DEBUG # define tcdbg dbg # define tcinfo info -# define tclldbg lldbg +# define tcllerr llerr # define tcllinfo llinfo #else # define tcdbg(x...) # define tcinfo(x...) -# define tclldbg(x...) +# define tcllerr(x...) # define tcllinfo(x...) #endif diff --git a/arch/arm/src/samv7/sam_tickless.c b/arch/arm/src/samv7/sam_tickless.c index 899d464609..6b610642ea 100644 --- a/arch/arm/src/samv7/sam_tickless.c +++ b/arch/arm/src/samv7/sam_tickless.c @@ -265,7 +265,7 @@ void up_timer_initialize(void) CONFIG_USEC_PER_TICK); if (ret < 0) { - tclldbg("ERROR: sam_oneshot_initialize failed\n"); + tcllerr("ERROR: sam_oneshot_initialize failed\n"); PANIC(); } @@ -278,7 +278,7 @@ void up_timer_initialize(void) CONFIG_USEC_PER_TICK); if (ret < 0) { - tclldbg("ERROR: sam_freerun_initialize failed\n"); + tcllerr("ERROR: sam_freerun_initialize failed\n"); PANIC(); } diff --git a/arch/arm/src/samv7/sam_twihs.c b/arch/arm/src/samv7/sam_twihs.c index 87123462aa..9319b2b65f 100644 --- a/arch/arm/src/samv7/sam_twihs.c +++ b/arch/arm/src/samv7/sam_twihs.c @@ -126,12 +126,12 @@ #ifdef CONFIG_DEBUG_I2C # define i2cdbg dbg # define i2cinfo info -# define i2clldbg lldbg +# define i2cllerr llerr # define i2cllinfo llinfo #else # define i2cdbg(x...) # define i2cinfo(x...) -# define i2clldbg(x...) +# define i2cllerr(x...) # define i2cllinfo(x...) #endif @@ -364,7 +364,7 @@ static bool twi_checkreg(struct twi_dev_s *priv, bool wr, uint32_t value, { /* Yes... show how many times we did it */ - lldbg("...[Repeats %d times]...\n", priv->ntimes); + llerr("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -396,7 +396,7 @@ static uint32_t twi_getabs(struct twi_dev_s *priv, uintptr_t address) if (twi_checkreg(priv, false, value, address)) { - lldbg("%08x->%08x\n", address, value); + llerr("%08x->%08x\n", address, value); } return value; @@ -417,7 +417,7 @@ static void twi_putabs(struct twi_dev_s *priv, uintptr_t address, { if (twi_checkreg(priv, true, value, address)) { - lldbg("%08x<-%08x\n", address, value); + llerr("%08x<-%08x\n", address, value); } putreg32(value, address); @@ -627,7 +627,7 @@ static int twi_interrupt(struct twi_dev_s *priv) { /* Wake up the thread with an I/O error indication */ - i2clldbg("ERROR: TWIHS%d pending: %08x\n", priv->attr->twi, pending); + i2cllerr("ERROR: TWIHS%d pending: %08x\n", priv->attr->twi, pending); twi_wakeup(priv, -EIO); } @@ -750,7 +750,7 @@ static void twi_timeout(int argc, uint32_t arg, ...) { struct twi_dev_s *priv = (struct twi_dev_s *)arg; - i2clldbg("ERROR: TWIHS%d Timeout!\n", priv->attr->twi); + i2cllerr("ERROR: TWIHS%d Timeout!\n", priv->attr->twi); twi_wakeup(priv, -ETIMEDOUT); } diff --git a/arch/arm/src/samv7/sam_usbdevhs.c b/arch/arm/src/samv7/sam_usbdevhs.c index a2f0774079..cb58f3bff1 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) { - lldbg("%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. */ - lldbg("[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 */ - lldbg("Global Register:\n"); - lldbg(" CTRL: %08x\n", sam_getreg(SAM_USBHS_DEVCTRL)); - lldbg(" ISR: %08x\n", sam_getreg(SAM_USBHS_DEVISR)); - lldbg(" IMR: %08x\n", sam_getreg(SAM_USBHS_DEVIMR)); - lldbg(" EPT: %08x\n", sam_getreg(SAM_USBHS_DEVEPT)); - lldbg(" 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 */ - lldbg("Endpoint %d Register:\n", epno); - lldbg(" CFG: %08x\n", sam_getreg(SAM_USBHS_DEVEPTCFG(epno))); - lldbg(" ISR: %08x\n", sam_getreg(SAM_USBHS_DEVEPTISR(epno))); - lldbg(" 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))); - lldbg("DMA %d Register:\n", epno); + llerr("DMA %d Register:\n", epno); if ((SAM_EPSET_DMA & SAM_EP_BIT(epno)) != 0) { - lldbg(" NXTDSC: %08x\n", sam_getreg(SAM_USBHS_DEVDMANXTDSC(epno))); - lldbg(" ADDRESS: %08x\n", sam_getreg(SAM_USBHS_DEVDMAADDR(epno))); - lldbg(" CONTROL: %08x\n", sam_getreg(SAM_USBHS_DEVDMACTRL(epno))); - lldbg(" 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 { - lldbg(" None\n"); + llerr(" None\n"); } } #endif @@ -3909,7 +3909,7 @@ static int sam_ep_submit(struct usbdev_ep_s *ep, struct usbdev_req_s *req) if (privep->stalled) { sam_req_abort(privep, privreq, -EBUSY); - ulldbg("ERROR: stalled\n"); + ullerr("ERROR: stalled\n"); ret = -EPERM; } else diff --git a/arch/arm/src/samv7/sam_wdt.c b/arch/arm/src/samv7/sam_wdt.c index efcb01b92e..b8d59b9363 100644 --- a/arch/arm/src/samv7/sam_wdt.c +++ b/arch/arm/src/samv7/sam_wdt.c @@ -82,12 +82,12 @@ /* Debug ********************************************************************/ /* Non-standard debug that may be enabled just for testing the watchdog - * driver. NOTE: that only lldbg types are used so that the output is + * driver. NOTE: that only llerr types are used so that the output is * immediately available. */ #ifdef CONFIG_DEBUG_WATCHDOG -# define wddbg lldbg +# define wddbg llerr # define wdinfo llinfo #else # define wddbg(x...) @@ -199,7 +199,7 @@ static uint32_t sam_getreg(uintptr_t regaddr) { if (count == 4) { - lldbg("...\n"); + llerr("...\n"); } return regval; @@ -216,7 +216,7 @@ static uint32_t sam_getreg(uintptr_t regaddr) { /* Yes.. then show how many times the value repeated */ - lldbg("[repeats %d more times]\n", count-3); + llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -228,7 +228,7 @@ static uint32_t sam_getreg(uintptr_t regaddr) /* Show the register value read */ - lldbg("%08x->%048\n", regaddr, regval); + llerr("%08x->%048\n", regaddr, regval); return regval; } #endif @@ -246,7 +246,7 @@ static void sam_putreg(uint32_t regval, uintptr_t regaddr) { /* Show the register value being written */ - lldbg("%08x<-%08x\n", regaddr, regval); + llerr("%08x<-%08x\n", regaddr, regval); /* Write the value */ diff --git a/arch/arm/src/samv7/sam_xdmac.c b/arch/arm/src/samv7/sam_xdmac.c index f04782980f..c9a2591f37 100644 --- a/arch/arm/src/samv7/sam_xdmac.c +++ b/arch/arm/src/samv7/sam_xdmac.c @@ -1542,7 +1542,7 @@ static int sam_xdmac_interrupt(int irq, void *context) { /* Yes... Terminate the transfer with an error? */ - dmalldbg("ERROR: DMA failed: %08x\n", chpending); + dmallerr("ERROR: DMA failed: %08x\n", chpending); sam_dmaterminate(xdmach, -EIO); } @@ -1559,7 +1559,7 @@ static int sam_xdmac_interrupt(int irq, void *context) else { - dmalldbg("ERROR: Unexpected interrupt: %08x\n", chpending); + dmallerr("ERROR: Unexpected interrupt: %08x\n", chpending); DEBUGPANIC(); } diff --git a/arch/arm/src/stm32/stm32_adc.c b/arch/arm/src/stm32/stm32_adc.c index f3970f3d31..ac8d4636c2 100644 --- a/arch/arm/src/stm32/stm32_adc.c +++ b/arch/arm/src/stm32/stm32_adc.c @@ -2718,12 +2718,12 @@ static int adc_interrupt(FAR struct adc_dev_s *dev) if ((regval & ADC_ISR_AWD) != 0) { - alldbg("WARNING: Analog Watchdog, Value converted out of range!\n"); + allerr("WARNING: Analog Watchdog, Value converted out of range!\n"); } if ((regval & ADC_ISR_OVR) != 0) { - alldbg("WARNING: Overrun has occurred!\n"); + allerr("WARNING: Overrun has occurred!\n"); } /* EOC: End of conversion */ diff --git a/arch/arm/src/stm32/stm32_bbsram.c b/arch/arm/src/stm32/stm32_bbsram.c index 507f5a4d4a..0266f6bedd 100644 --- a/arch/arm/src/stm32/stm32_bbsram.c +++ b/arch/arm/src/stm32/stm32_bbsram.c @@ -183,14 +183,14 @@ static void stm32_bbsram_rd(void) static void stm32_bbsram_dump(FAR struct bbsramfh_s *bbf, char *op) { BBSRAM_DEBUG_READ(); - lldbg("%s:\n", op); - lldbg(" File Address:0x%8x\n", bbf); - lldbg(" crc:0x%8x\n", bbf->crc); - lldbg(" fileno:%d\n", (int) bbf->fileno); - lldbg(" dirty:%d\n", (int) bbf->dirty); - lldbg(" length:%d\n", (int) bbf->len); - lldbg(" time:%ld:%ld\n", bbf->lastwrite.tv_sec, bbf->lastwrite.tv_nsec); - lldbg(" data: 0x%2x 0x%2x 0x%2x 0x%2x 0x%2x\n", + llerr("%s:\n", op); + llerr(" File Address:0x%8x\n", bbf); + llerr(" crc:0x%8x\n", bbf->crc); + llerr(" fileno:%d\n", (int) bbf->fileno); + llerr(" dirty:%d\n", (int) bbf->dirty); + llerr(" length:%d\n", (int) bbf->len); + llerr(" time:%ld:%ld\n", bbf->lastwrite.tv_sec, bbf->lastwrite.tv_nsec); + llerr(" 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_can.c b/arch/arm/src/stm32/stm32_can.c index b361133f1f..73feb048c7 100644 --- a/arch/arm/src/stm32/stm32_can.c +++ b/arch/arm/src/stm32/stm32_can.c @@ -87,12 +87,12 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg # define caninfo info -# define canlldbg lldbg +# define canllerr llerr # define canllinfo llinfo #else # define candbg(x...) # define caninfo(x...) -# define canlldbg(x...) +# define canllerr(x...) # define canllinfo(x...) #endif @@ -270,7 +270,7 @@ static uint32_t can_vgetreg(uint32_t addr) { if (count == 4) { - lldbg("...\n"); + llerr("...\n"); } return val; @@ -287,7 +287,7 @@ static uint32_t can_vgetreg(uint32_t addr) { /* Yes.. then show how many times the value repeated */ - lldbg("[repeats %d more times]\n", count-3); + llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -299,7 +299,7 @@ static uint32_t can_vgetreg(uint32_t addr) /* Show the register value read */ - lldbg("%08x->%08x\n", addr, val); + llerr("%08x->%08x\n", addr, val); return val; } @@ -349,7 +349,7 @@ static void can_vputreg(uint32_t addr, uint32_t value) /* Show the register value being written */ - lldbg("%08x<-%08x\n", addr, value); + llerr("%08x<-%08x\n", addr, value); /* Write the value */ @@ -402,25 +402,25 @@ static void can_dumpctrlregs(FAR struct stm32_can_s *priv, { if (msg) { - canlldbg("Control Registers: %s\n", msg); + canllerr("Control Registers: %s\n", msg); } else { - canlldbg("Control Registers:\n"); + canllerr("Control Registers:\n"); } /* CAN control and status registers */ - lldbg(" MCR: %08x MSR: %08x TSR: %08x\n", + llerr(" MCR: %08x MSR: %08x TSR: %08x\n", getreg32(priv->base + STM32_CAN_MCR_OFFSET), getreg32(priv->base + STM32_CAN_MSR_OFFSET), getreg32(priv->base + STM32_CAN_TSR_OFFSET)); - lldbg(" RF0R: %08x RF1R: %08x\n", + llerr(" RF0R: %08x RF1R: %08x\n", getreg32(priv->base + STM32_CAN_RF0R_OFFSET), getreg32(priv->base + STM32_CAN_RF1R_OFFSET)); - lldbg(" IER: %08x ESR: %08x BTR: %08x\n", + llerr(" IER: %08x ESR: %08x BTR: %08x\n", getreg32(priv->base + STM32_CAN_IER_OFFSET), getreg32(priv->base + STM32_CAN_ESR_OFFSET), getreg32(priv->base + STM32_CAN_BTR_OFFSET)); @@ -447,40 +447,40 @@ static void can_dumpmbregs(FAR struct stm32_can_s *priv, { if (msg) { - canlldbg("Mailbox Registers: %s\n", msg); + canllerr("Mailbox Registers: %s\n", msg); } else { - canlldbg("Mailbox Registers:\n"); + canllerr("Mailbox Registers:\n"); } /* CAN mailbox registers (3 TX and 2 RX) */ - lldbg(" TI0R: %08x TDT0R: %08x TDL0R: %08x TDH0R: %08x\n", + llerr(" TI0R: %08x TDT0R: %08x TDL0R: %08x TDH0R: %08x\n", getreg32(priv->base + STM32_CAN_TI0R_OFFSET), getreg32(priv->base + STM32_CAN_TDT0R_OFFSET), getreg32(priv->base + STM32_CAN_TDL0R_OFFSET), getreg32(priv->base + STM32_CAN_TDH0R_OFFSET)); - lldbg(" TI1R: %08x TDT1R: %08x TDL1R: %08x TDH1R: %08x\n", + llerr(" TI1R: %08x TDT1R: %08x TDL1R: %08x TDH1R: %08x\n", getreg32(priv->base + STM32_CAN_TI1R_OFFSET), getreg32(priv->base + STM32_CAN_TDT1R_OFFSET), getreg32(priv->base + STM32_CAN_TDL1R_OFFSET), getreg32(priv->base + STM32_CAN_TDH1R_OFFSET)); - lldbg(" TI2R: %08x TDT2R: %08x TDL2R: %08x TDH2R: %08x\n", + llerr(" TI2R: %08x TDT2R: %08x TDL2R: %08x TDH2R: %08x\n", getreg32(priv->base + STM32_CAN_TI2R_OFFSET), getreg32(priv->base + STM32_CAN_TDT2R_OFFSET), getreg32(priv->base + STM32_CAN_TDL2R_OFFSET), getreg32(priv->base + STM32_CAN_TDH2R_OFFSET)); - lldbg(" RI0R: %08x RDT0R: %08x RDL0R: %08x RDH0R: %08x\n", + llerr(" RI0R: %08x RDT0R: %08x RDL0R: %08x RDH0R: %08x\n", getreg32(priv->base + STM32_CAN_RI0R_OFFSET), getreg32(priv->base + STM32_CAN_RDT0R_OFFSET), getreg32(priv->base + STM32_CAN_RDL0R_OFFSET), getreg32(priv->base + STM32_CAN_RDH0R_OFFSET)); - lldbg(" RI1R: %08x RDT1R: %08x RDL1R: %08x RDH1R: %08x\n", + llerr(" RI1R: %08x RDT1R: %08x RDL1R: %08x RDH1R: %08x\n", getreg32(priv->base + STM32_CAN_RI1R_OFFSET), getreg32(priv->base + STM32_CAN_RDT1R_OFFSET), getreg32(priv->base + STM32_CAN_RDL1R_OFFSET), @@ -510,14 +510,14 @@ static void can_dumpfiltregs(FAR struct stm32_can_s *priv, if (msg) { - canlldbg("Filter Registers: %s\n", msg); + canllerr("Filter Registers: %s\n", msg); } else { - canlldbg("Filter Registers:\n"); + canllerr("Filter Registers:\n"); } - lldbg(" FMR: %08x FM1R: %08x FS1R: %08x FFA1R: %08x FA1R: %08x\n", + llerr(" FMR: %08x FM1R: %08x FS1R: %08x FFA1R: %08x FA1R: %08x\n", getreg32(priv->base + STM32_CAN_FMR_OFFSET), getreg32(priv->base + STM32_CAN_FM1R_OFFSET), getreg32(priv->base + STM32_CAN_FS1R_OFFSET), @@ -526,7 +526,7 @@ static void can_dumpfiltregs(FAR struct stm32_can_s *priv, for (i = 0; i < CAN_NFILTERS; i++) { - lldbg(" F%dR1: %08x F%dR2: %08x\n", + llerr(" F%dR1: %08x F%dR2: %08x\n", i, getreg32(priv->base + STM32_CAN_FIR_OFFSET(i, 1)), i, getreg32(priv->base + STM32_CAN_FIR_OFFSET(i, 2))); } @@ -574,7 +574,7 @@ static void can_reset(FAR struct can_dev_s *dev) else #endif { - canlldbg("Unsupported port %d\n", priv->port); + canllerr("Unsupported port %d\n", priv->port); return; } @@ -625,7 +625,7 @@ static int can_setup(FAR struct can_dev_s *dev) ret = can_cellinit(priv); if (ret < 0) { - canlldbg("CAN%d cell initialization failed: %d\n", priv->port, ret); + canllerr("CAN%d cell initialization failed: %d\n", priv->port, ret); return ret; } @@ -637,7 +637,7 @@ static int can_setup(FAR struct can_dev_s *dev) ret = can_filterinit(priv); if (ret < 0) { - canlldbg("CAN%d filter initialization failed: %d\n", priv->port, ret); + canllerr("CAN%d filter initialization failed: %d\n", priv->port, ret); return ret; } can_dumpfiltregs(priv, "After filter initialization"); @@ -649,7 +649,7 @@ static int can_setup(FAR struct can_dev_s *dev) ret = irq_attach(priv->canrx[0], can_rx0interrupt); if (ret < 0) { - canlldbg("Failed to attach CAN%d RX0 IRQ (%d)", + canllerr("Failed to attach CAN%d RX0 IRQ (%d)", priv->port, priv->canrx[0]); return ret; } @@ -657,7 +657,7 @@ static int can_setup(FAR struct can_dev_s *dev) ret = irq_attach(priv->canrx[1], can_rx1interrupt); if (ret < 0) { - canlldbg("Failed to attach CAN%d RX1 IRQ (%d)", + canllerr("Failed to attach CAN%d RX1 IRQ (%d)", priv->port, priv->canrx[1]); return ret; } @@ -665,7 +665,7 @@ static int can_setup(FAR struct can_dev_s *dev) ret = irq_attach(priv->cantx, can_txinterrupt); if (ret < 0) { - canlldbg("Failed to attach CAN%d TX IRQ (%d)", + canllerr("Failed to attach CAN%d TX IRQ (%d)", priv->port, priv->cantx); return ret; } @@ -878,7 +878,7 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg) } else { - canlldbg("ERROR: No available mailbox\n"); + canllerr("ERROR: No available mailbox\n"); return -EBUSY; } @@ -1099,7 +1099,7 @@ static int can_rxinterrupt(int irq, FAR void *context, int rxmb) npending = (regval & CAN_RFR_FMP_MASK) >> CAN_RFR_FMP_SHIFT; if (npending < 1) { - canlldbg("WARNING: No messages pending\n"); + canllerr("WARNING: No messages pending\n"); return OK; } @@ -1130,7 +1130,7 @@ static int can_rxinterrupt(int irq, FAR void *context, int rxmb) #else if ((regval & CAN_RIR_IDE) != 0) { - canlldbg("ERROR: Received message with extended identifier. Dropped\n"); + canllerr("ERROR: Received message with extended identifier. Dropped\n"); ret = -ENOSYS; goto errout; } @@ -1520,7 +1520,7 @@ static int can_cellinit(FAR struct stm32_can_s *priv) if (timeout < 1) { - canlldbg("ERROR: Timed out waiting to enter initialization mode\n"); + canllerr("ERROR: Timed out waiting to enter initialization mode\n"); return -ETIMEDOUT; } @@ -1544,7 +1544,7 @@ static int can_cellinit(FAR struct stm32_can_s *priv) ret = can_bittiming(priv); if (ret < 0) { - canlldbg("ERROR: Failed to set bit timing: %d\n", ret); + canllerr("ERROR: Failed to set bit timing: %d\n", ret); return ret; } @@ -1571,7 +1571,7 @@ static int can_cellinit(FAR struct stm32_can_s *priv) if (timeout < 1) { - canlldbg("ERROR: Timed out waiting to exit initialization mode: %08x\n", + canllerr("ERROR: Timed out waiting to exit initialization mode: %08x\n", regval); return -ETIMEDOUT; } diff --git a/arch/arm/src/stm32/stm32_dumpgpio.c b/arch/arm/src/stm32/stm32_dumpgpio.c index 4e4f4327c5..c3023c21a8 100644 --- a/arch/arm/src/stm32/stm32_dumpgpio.c +++ b/arch/arm/src/stm32/stm32_dumpgpio.c @@ -126,18 +126,18 @@ int stm32_dumpgpio(uint32_t pinset, const char *msg) #if defined(CONFIG_STM32_STM32F10XX) - lldbg("GPIO%c pinset: %08x base: %08x -- %s\n", + llerr("GPIO%c pinset: %08x base: %08x -- %s\n", g_portchar[port], pinset, base, msg); if ((getreg32(STM32_RCC_APB2ENR) & RCC_APB2ENR_IOPEN(port)) != 0) { - lldbg(" CR: %08x %08x IDR: %04x ODR: %04x LCKR: %04x\n", + llerr(" 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)); - lldbg(" EVCR: %02x MAPR: %08x CR: %04x %04x %04x %04x\n", + llerr(" 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), @@ -146,7 +146,7 @@ int stm32_dumpgpio(uint32_t pinset, const char *msg) } else { - lldbg(" GPIO%c not enabled: APB2ENR: %08x\n", + llerr(" GPIO%c not enabled: APB2ENR: %08x\n", g_portchar[port], getreg32(STM32_RCC_APB2ENR)); } @@ -154,28 +154,28 @@ int stm32_dumpgpio(uint32_t pinset, const char *msg) DEBUGASSERT(port < STM32_NGPIO_PORTS); - lldbg("GPIO%c pinset: %08x base: %08x -- %s\n", + llerr("GPIO%c pinset: %08x base: %08x -- %s\n", g_portchar[port], pinset, base, msg); if ((getreg32(STM32_RCC_AHBENR) & RCC_AHBENR_GPIOEN(port)) != 0) { - lldbg(" MODE: %08x OTYPE: %04x OSPEED: %08x PUPDR: %08x\n", + llerr(" 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)); - lldbg(" IDR: %04x ODR: %04x BSRR: %08x LCKR: %04x\n", + llerr(" 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)); - lldbg(" AFRH: %08x AFRL: %08x\n", + llerr(" AFRH: %08x AFRL: %08x\n", getreg32(base + STM32_GPIO_AFRH_OFFSET), getreg32(base + STM32_GPIO_AFRL_OFFSET)); } else { - lldbg(" GPIO%c not enabled: AHBENR: %08x\n", + llerr(" GPIO%c not enabled: AHBENR: %08x\n", g_portchar[port], getreg32(STM32_RCC_AHBENR)); } @@ -183,22 +183,22 @@ int stm32_dumpgpio(uint32_t pinset, const char *msg) DEBUGASSERT(port < STM32_NGPIO_PORTS); - lldbg("GPIO%c pinset: %08x base: %08x -- %s\n", + llerr("GPIO%c pinset: %08x base: %08x -- %s\n", g_portchar[port], pinset, base, msg); /* GPIOs are always enabled */ - lldbg(" MODE: %08x OTYPE: %04x OSPEED: %08x PUPDR: %08x\n", + llerr(" 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)); - lldbg(" IDR: %04x ODR: %04x BSRR: %08x LCKR: %04x\n", + llerr(" 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)); - lldbg(" AFRH: %08x AFRL: %08x BRR: %04x\n", + llerr(" 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)); @@ -207,28 +207,28 @@ int stm32_dumpgpio(uint32_t pinset, const char *msg) DEBUGASSERT(port < STM32_NGPIO_PORTS); - lldbg("GPIO%c pinset: %08x base: %08x -- %s\n", + llerr("GPIO%c pinset: %08x base: %08x -- %s\n", g_portchar[port], pinset, base, msg); if ((getreg32(STM32_RCC_AHB1ENR) & RCC_AHB1ENR_GPIOEN(port)) != 0) { - lldbg(" MODE: %08x OTYPE: %04x OSPEED: %08x PUPDR: %08x\n", + llerr(" 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)); - lldbg(" IDR: %04x ODR: %04x BSRR: %08x LCKR: %04x\n", + llerr(" 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)); - lldbg(" AFRH: %08x AFRL: %08x\n", + llerr(" AFRH: %08x AFRL: %08x\n", getreg32(base + STM32_GPIO_AFRH_OFFSET), getreg32(base + STM32_GPIO_AFRL_OFFSET)); } else { - lldbg(" GPIO%c not enabled: AHB1ENR: %08x\n", + llerr(" GPIO%c not enabled: AHB1ENR: %08x\n", g_portchar[port], getreg32(STM32_RCC_AHB1ENR)); } #else diff --git a/arch/arm/src/stm32/stm32_eth.c b/arch/arm/src/stm32/stm32_eth.c index 19c5e3aee1..837289db1e 100644 --- a/arch/arm/src/stm32/stm32_eth.c +++ b/arch/arm/src/stm32/stm32_eth.c @@ -769,7 +769,7 @@ static uint32_t stm32_getreg(uint32_t addr) { if (count == 4) { - lldbg("...\n"); + llerr("...\n"); } return val; @@ -786,7 +786,7 @@ static uint32_t stm32_getreg(uint32_t addr) { /* Yes.. then show how many times the value repeated */ - lldbg("[repeats %d more times]\n", count-3); + llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -798,7 +798,7 @@ static uint32_t stm32_getreg(uint32_t addr) /* Show the register value read */ - lldbg("%08x->%08x\n", addr, val); + llerr("%08x->%08x\n", addr, val); return val; } #endif @@ -825,7 +825,7 @@ static void stm32_putreg(uint32_t val, uint32_t addr) { /* Show the register value being written */ - lldbg("%08x<-%08x\n", addr, val); + llerr("%08x<-%08x\n", addr, val); /* Write the value */ @@ -1505,7 +1505,7 @@ static int stm32_recvframe(FAR struct stm32_ethmac_s *priv) if (!stm32_isfreebuffer(priv)) { - nlldbg("No free buffers\n"); + nllerr("No free buffers\n"); return -ENOMEM; } @@ -1612,7 +1612,7 @@ static int stm32_recvframe(FAR struct stm32_ethmac_s *priv) * scanning logic, and continue scanning with the next frame. */ - nlldbg("DROPPED: RX descriptor errors: %08x\n", rxdesc->rdes0); + nllerr("DROPPED: RX descriptor errors: %08x\n", rxdesc->rdes0); stm32_freesegment(priv, rxcurr, priv->segments); } } @@ -1673,7 +1673,7 @@ static void stm32_receive(FAR struct stm32_ethmac_s *priv) if (dev->d_len > CONFIG_NET_ETH_MTU) { - nlldbg("DROPPED: Too big: %d\n", dev->d_len); + nllerr("DROPPED: Too big: %d\n", dev->d_len); /* Free dropped packet buffer */ @@ -1793,7 +1793,7 @@ static void stm32_receive(FAR struct stm32_ethmac_s *priv) else #endif { - nlldbg("DROPPED: Unknown type: %04x\n", BUF->type); + nllerr("DROPPED: Unknown type: %04x\n", BUF->type); } /* We are finished with the RX buffer. NOTE: If the buffer is @@ -2042,7 +2042,7 @@ static inline void stm32_interrupt_process(FAR struct stm32_ethmac_s *priv) { /* Just let the user know what happened */ - nlldbg("Abormal event(s): %08x\n", dmasr); + nllerr("Abormal event(s): %08x\n", dmasr); /* Clear all pending abnormal events */ @@ -2246,7 +2246,7 @@ static void stm32_txtimeout_expiry(int argc, uint32_t arg, ...) { FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)arg; - nlldbg("Timeout!\n"); + nllerr("Timeout!\n"); #ifdef CONFIG_NET_NOINTS /* Disable further Ethernet interrupts. This will prevent some race diff --git a/arch/arm/src/stm32/stm32_irq.c b/arch/arm/src/stm32/stm32_irq.c index 803345b381..f79a045b5c 100644 --- a/arch/arm/src/stm32/stm32_irq.c +++ b/arch/arm/src/stm32/stm32_irq.c @@ -113,33 +113,33 @@ static void stm32_dumpnvic(const char *msg, int irq) irqstate_t flags; flags = enter_critical_section(); - lldbg("NVIC (%s, irq=%d):\n", msg, irq); - lldbg(" INTCTRL: %08x VECTAB: %08x\n", + llerr("NVIC (%s, irq=%d):\n", msg, irq); + llerr(" INTCTRL: %08x VECTAB: %08x\n", getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB)); #if 0 - lldbg(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n", + llerr(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n", getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA), getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE)); #endif - lldbg(" IRQ ENABLE: %08x %08x %08x\n", + llerr(" IRQ ENABLE: %08x %08x %08x\n", getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE), getreg32(NVIC_IRQ64_95_ENABLE)); - lldbg(" SYSH_PRIO: %08x %08x %08x\n", + llerr(" SYSH_PRIO: %08x %08x %08x\n", getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY), getreg32(NVIC_SYSH12_15_PRIORITY)); - lldbg(" IRQ PRIO: %08x %08x %08x %08x\n", + llerr(" IRQ PRIO: %08x %08x %08x %08x\n", getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY), getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY)); - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY), getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY)); - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY), getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY)); - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ48_51_PRIORITY), getreg32(NVIC_IRQ52_55_PRIORITY), getreg32(NVIC_IRQ56_59_PRIORITY), getreg32(NVIC_IRQ60_63_PRIORITY)); - lldbg(" %08x\n", + llerr(" %08x\n", getreg32(NVIC_IRQ64_67_PRIORITY)); leave_critical_section(flags); } diff --git a/arch/arm/src/stm32/stm32_iwdg.c b/arch/arm/src/stm32/stm32_iwdg.c index 1e52b26a01..72489e6002 100644 --- a/arch/arm/src/stm32/stm32_iwdg.c +++ b/arch/arm/src/stm32/stm32_iwdg.c @@ -107,12 +107,12 @@ /* Debug ********************************************************************/ /* Non-standard debug that may be enabled just for testing the watchdog - * driver. NOTE: that only lldbg types are used so that the output is + * driver. NOTE: that only llerr types are used so that the output is * immediately available. */ #ifdef CONFIG_DEBUG_WATCHDOG -# define wddbg lldbg +# define wddbg llerr # define wdinfo llinfo #else # define wddbg(x...) @@ -216,7 +216,7 @@ static uint16_t stm32_getreg(uint32_t addr) { if (count == 4) { - lldbg("...\n"); + llerr("...\n"); } return val; @@ -233,7 +233,7 @@ static uint16_t stm32_getreg(uint32_t addr) { /* Yes.. then show how many times the value repeated */ - lldbg("[repeats %d more times]\n", count-3); + llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -245,7 +245,7 @@ static uint16_t stm32_getreg(uint32_t addr) /* Show the register value read */ - lldbg("%08x->%04x\n", addr, val); + llerr("%08x->%04x\n", addr, val); return val; } #endif @@ -263,7 +263,7 @@ static void stm32_putreg(uint16_t val, uint32_t addr) { /* Show the register value being written */ - lldbg("%08x<-%04x\n", addr, val); + llerr("%08x<-%04x\n", addr, val); /* Write the value */ diff --git a/arch/arm/src/stm32/stm32_otgfsdev.c b/arch/arm/src/stm32/stm32_otgfsdev.c index 05325986a6..82b6a9fb83 100644 --- a/arch/arm/src/stm32/stm32_otgfsdev.c +++ b/arch/arm/src/stm32/stm32_otgfsdev.c @@ -813,7 +813,7 @@ static uint32_t stm32_getreg(uint32_t addr) { if (count == 4) { - lldbg("...\n"); + llerr("...\n"); } return val; @@ -830,7 +830,7 @@ static uint32_t stm32_getreg(uint32_t addr) { /* Yes.. then show how many times the value repeated */ - lldbg("[repeats %d more times]\n", count-3); + llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -842,7 +842,7 @@ static uint32_t stm32_getreg(uint32_t addr) /* Show the register value read */ - lldbg("%08x->%08x\n", addr, val); + llerr("%08x->%08x\n", addr, val); return val; } #endif @@ -860,7 +860,7 @@ static void stm32_putreg(uint32_t val, uint32_t addr) { /* Show the register value being written */ - lldbg("%08x<-%08x\n", addr, val); + llerr("%08x<-%08x\n", addr, val); /* Write the value */ @@ -2625,7 +2625,7 @@ static inline void stm32_epout_interrupt(FAR struct stm32_usbdev_s *priv) if ((daint & 1) != 0) { regval = stm32_getreg(STM32_OTGFS_DOEPINT(epno)); - ulldbg("DOEPINT(%d) = %08x\n", epno, regval); + ullerr("DOEPINT(%d) = %08x\n", epno, regval); stm32_putreg(0xFF, STM32_OTGFS_DOEPINT(epno)); } @@ -2855,7 +2855,7 @@ static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv) { if ((daint & 1) != 0) { - ulldbg("DIEPINT(%d) = %08x\n", + ullerr("DIEPINT(%d) = %08x\n", epno, stm32_getreg(STM32_OTGFS_DIEPINT(epno))); stm32_putreg(0xFF, STM32_OTGFS_DIEPINT(epno)); } diff --git a/arch/arm/src/stm32/stm32_otgfshost.c b/arch/arm/src/stm32/stm32_otgfshost.c index f2ce8e2abd..113c7c2551 100644 --- a/arch/arm/src/stm32/stm32_otgfshost.c +++ b/arch/arm/src/stm32/stm32_otgfshost.c @@ -506,7 +506,7 @@ static struct usbhost_connection_s g_usbconn = #ifdef CONFIG_STM32_USBHOST_REGDEBUG static void stm32_printreg(uint32_t addr, uint32_t val, bool iswrite) { - lldbg("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val); + llerr("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val); } #endif @@ -556,7 +556,7 @@ static void stm32_checkreg(uint32_t addr, uint32_t val, bool iswrite) { /* No.. More than one. */ - lldbg("[repeats %d more times]\n", count); + llerr("[repeats %d more times]\n", count); } } diff --git a/arch/arm/src/stm32/stm32_otghsdev.c b/arch/arm/src/stm32/stm32_otghsdev.c index 6d14771b6d..b63831a8ce 100644 --- a/arch/arm/src/stm32/stm32_otghsdev.c +++ b/arch/arm/src/stm32/stm32_otghsdev.c @@ -813,7 +813,7 @@ static uint32_t stm32_getreg(uint32_t addr) { if (count == 4) { - lldbg("...\n"); + llerr("...\n"); } return val; @@ -830,7 +830,7 @@ static uint32_t stm32_getreg(uint32_t addr) { /* Yes.. then show how many times the value repeated */ - lldbg("[repeats %d more times]\n", count-3); + llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -842,7 +842,7 @@ static uint32_t stm32_getreg(uint32_t addr) /* Show the register value read */ - lldbg("%08x->%08x\n", addr, val); + llerr("%08x->%08x\n", addr, val); return val; } #endif @@ -860,7 +860,7 @@ static void stm32_putreg(uint32_t val, uint32_t addr) { /* Show the register value being written */ - lldbg("%08x<-%08x\n", addr, val); + llerr("%08x<-%08x\n", addr, val); /* Write the value */ @@ -2625,7 +2625,7 @@ static inline void stm32_epout_interrupt(FAR struct stm32_usbdev_s *priv) if ((daint & 1) != 0) { regval = stm32_getreg(STM32_OTGHS_DOEPINT(epno)); - ulldbg("DOEPINT(%d) = %08x\n", epno, regval); + ullerr("DOEPINT(%d) = %08x\n", epno, regval); stm32_putreg(0xFF, STM32_OTGHS_DOEPINT(epno)); } @@ -2855,7 +2855,7 @@ static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv) { if ((daint & 1) != 0) { - ulldbg("DIEPINT(%d) = %08x\n", + ullerr("DIEPINT(%d) = %08x\n", epno, stm32_getreg(STM32_OTGHS_DIEPINT(epno))); stm32_putreg(0xFF, STM32_OTGHS_DIEPINT(epno)); } diff --git a/arch/arm/src/stm32/stm32_otghshost.c b/arch/arm/src/stm32/stm32_otghshost.c index 66f8214783..6ae9aa788c 100644 --- a/arch/arm/src/stm32/stm32_otghshost.c +++ b/arch/arm/src/stm32/stm32_otghshost.c @@ -506,7 +506,7 @@ static struct usbhost_connection_s g_usbconn = #ifdef CONFIG_STM32_USBHOST_REGDEBUG static void stm32_printreg(uint32_t addr, uint32_t val, bool iswrite) { - lldbg("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val); + llerr("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val); } #endif @@ -556,7 +556,7 @@ static void stm32_checkreg(uint32_t addr, uint32_t val, bool iswrite) { /* No.. More than one. */ - lldbg("[repeats %d more times]\n", count); + llerr("[repeats %d more times]\n", count); } } diff --git a/arch/arm/src/stm32/stm32_pwm.c b/arch/arm/src/stm32/stm32_pwm.c index 549edeae6d..d43461d661 100644 --- a/arch/arm/src/stm32/stm32_pwm.c +++ b/arch/arm/src/stm32/stm32_pwm.c @@ -123,7 +123,7 @@ #ifdef CONFIG_DEBUG_PWM # define pwmdbg dbg -# define pwmlldbg lldbg +# define pwmllerr llerr # ifdef CONFIG_DEBUG_INFO # define pwminfo info # define pwmllinfo llinfo @@ -135,7 +135,7 @@ # endif #else # define pwmdbg(x...) -# define pwmlldbg(x...) +# define pwmllerr(x...) # define pwminfo(x...) # define pwmllinfo(x...) # define pwm_dumpgpio(p,m) diff --git a/arch/arm/src/stm32/stm32_rtcc.c b/arch/arm/src/stm32/stm32_rtcc.c index 1f1cbcaae7..72ffc26fe3 100644 --- a/arch/arm/src/stm32/stm32_rtcc.c +++ b/arch/arm/src/stm32/stm32_rtcc.c @@ -128,12 +128,12 @@ #ifdef CONFIG_DEBUG_RTC # define rtcdbg dbg # define rtcinfo info -# define rtclldbg lldbg +# define rtcllerr llerr # define rtcllinfo llinfo #else # define rtcdbg(x...) # define rtcinfo(x...) -# define rtclldbg(x...) +# define rtcllerr(x...) # define rtcllinfo(x...) #endif @@ -179,27 +179,27 @@ volatile bool g_rtc_enabled = false; #ifdef CONFIG_DEBUG_RTC static void rtc_dumpregs(FAR const char *msg) { - rtclldbg("%s:\n", msg); - rtclldbg(" TR: %08x\n", getreg32(STM32_RTC_TR)); - rtclldbg(" DR: %08x\n", getreg32(STM32_RTC_DR)); - rtclldbg(" CR: %08x\n", getreg32(STM32_RTC_CR)); - rtclldbg(" ISR: %08x\n", getreg32(STM32_RTC_ISR)); - rtclldbg(" PRER: %08x\n", getreg32(STM32_RTC_PRER)); - rtclldbg(" WUTR: %08x\n", getreg32(STM32_RTC_WUTR)); + rtcllerr("%s:\n", msg); + rtcllerr(" TR: %08x\n", getreg32(STM32_RTC_TR)); + rtcllerr(" DR: %08x\n", getreg32(STM32_RTC_DR)); + rtcllerr(" CR: %08x\n", getreg32(STM32_RTC_CR)); + rtcllerr(" ISR: %08x\n", getreg32(STM32_RTC_ISR)); + rtcllerr(" PRER: %08x\n", getreg32(STM32_RTC_PRER)); + rtcllerr(" WUTR: %08x\n", getreg32(STM32_RTC_WUTR)); #ifndef CONFIG_STM32_STM32F30XX - rtclldbg(" CALIBR: %08x\n", getreg32(STM32_RTC_CALIBR)); + rtcllerr(" CALIBR: %08x\n", getreg32(STM32_RTC_CALIBR)); #endif - rtclldbg(" ALRMAR: %08x\n", getreg32(STM32_RTC_ALRMAR)); - rtclldbg(" ALRMBR: %08x\n", getreg32(STM32_RTC_ALRMBR)); - rtclldbg(" SHIFTR: %08x\n", getreg32(STM32_RTC_SHIFTR)); - rtclldbg(" TSTR: %08x\n", getreg32(STM32_RTC_TSTR)); - rtclldbg(" TSDR: %08x\n", getreg32(STM32_RTC_TSDR)); - rtclldbg(" TSSSR: %08x\n", getreg32(STM32_RTC_TSSSR)); - rtclldbg(" CALR: %08x\n", getreg32(STM32_RTC_CALR)); - rtclldbg(" TAFCR: %08x\n", getreg32(STM32_RTC_TAFCR)); - rtclldbg("ALRMASSR: %08x\n", getreg32(STM32_RTC_ALRMASSR)); - rtclldbg("ALRMBSSR: %08x\n", getreg32(STM32_RTC_ALRMBSSR)); - rtclldbg("MAGICREG: %08x\n", getreg32(RTC_MAGIC_REG)); + rtcllerr(" ALRMAR: %08x\n", getreg32(STM32_RTC_ALRMAR)); + rtcllerr(" ALRMBR: %08x\n", getreg32(STM32_RTC_ALRMBR)); + rtcllerr(" SHIFTR: %08x\n", getreg32(STM32_RTC_SHIFTR)); + rtcllerr(" TSTR: %08x\n", getreg32(STM32_RTC_TSTR)); + rtcllerr(" TSDR: %08x\n", getreg32(STM32_RTC_TSDR)); + rtcllerr(" TSSSR: %08x\n", getreg32(STM32_RTC_TSSSR)); + rtcllerr(" CALR: %08x\n", getreg32(STM32_RTC_CALR)); + rtcllerr(" TAFCR: %08x\n", getreg32(STM32_RTC_TAFCR)); + rtcllerr("ALRMASSR: %08x\n", getreg32(STM32_RTC_ALRMASSR)); + rtcllerr("ALRMBSSR: %08x\n", getreg32(STM32_RTC_ALRMBSSR)); + rtcllerr("MAGICREG: %08x\n", getreg32(RTC_MAGIC_REG)); } #else # define rtc_dumpregs(msg) @@ -222,13 +222,13 @@ static void rtc_dumpregs(FAR const char *msg) #ifdef CONFIG_DEBUG_RTC static void rtc_dumptime(FAR struct tm *tp, FAR const char *msg) { - rtclldbg("%s:\n", msg); - rtclldbg(" tm_sec: %08x\n", tp->tm_sec); - rtclldbg(" tm_min: %08x\n", tp->tm_min); - rtclldbg(" tm_hour: %08x\n", tp->tm_hour); - rtclldbg(" tm_mday: %08x\n", tp->tm_mday); - rtclldbg(" tm_mon: %08x\n", tp->tm_mon); - rtclldbg(" tm_year: %08x\n", tp->tm_year); + rtcllerr("%s:\n", msg); + rtcllerr(" tm_sec: %08x\n", tp->tm_sec); + rtcllerr(" tm_min: %08x\n", tp->tm_min); + rtcllerr(" tm_hour: %08x\n", tp->tm_hour); + rtcllerr(" tm_mday: %08x\n", tp->tm_mday); + rtcllerr(" tm_mon: %08x\n", tp->tm_mon); + rtcllerr(" tm_year: %08x\n", tp->tm_year); } #else # define rtc_dumptime(tp, msg) @@ -733,13 +733,13 @@ int up_rtc_initialize(void) { case OK: { - rtclldbg("rtc_syncwait() okay\n"); + rtcllerr("rtc_syncwait() okay\n"); break; } default: { - rtclldbg("rtc_syncwait() failed (%d)\n", ret); + rtcllerr("rtc_syncwait() failed (%d)\n", ret); break; } } @@ -753,7 +753,7 @@ int up_rtc_initialize(void) if (regval != RTC_MAGIC) { - rtclldbg("Do setup\n"); + rtcllerr("Do setup\n"); /* Perform the one-time setup of the LSE clocking to the RTC */ @@ -771,7 +771,7 @@ int up_rtc_initialize(void) } else { - rtclldbg("Do resume\n"); + rtcllerr("Do resume\n"); /* RTC already set-up, just resume normal operation */ @@ -787,7 +787,7 @@ int up_rtc_initialize(void) if (ret != OK && nretry > 0) { - rtclldbg("setup/resume ran %d times and failed with %d\n", + rtcllerr("setup/resume ran %d times and failed with %d\n", nretry, ret); return -ETIMEDOUT; } diff --git a/arch/arm/src/stm32/stm32_sdio.c b/arch/arm/src/stm32/stm32_sdio.c index ae31eb5ccd..c9686a4b75 100644 --- a/arch/arm/src/stm32/stm32_sdio.c +++ b/arch/arm/src/stm32/stm32_sdio.c @@ -901,7 +901,7 @@ static void stm32_dmacallback(DMA_HANDLE handle, uint8_t status, void *arg) if ((status & DMA_STATUS_ERROR) != 0) { - flldbg("DMA error %02x, remaining: %d\n", status, priv->remaining); + fllerr("DMA error %02x, remaining: %d\n", status, priv->remaining); result = SDIOWAIT_ERROR; } else @@ -1166,7 +1166,7 @@ static void stm32_eventtimeout(int argc, uint32_t arg) /* Yes.. wake up any waiting threads */ stm32_endwait(priv, SDIOWAIT_TIMEOUT); - flldbg("Timeout: remaining: %d\n", priv->remaining); + fllerr("Timeout: remaining: %d\n", priv->remaining); } } @@ -1406,7 +1406,7 @@ static int stm32_interrupt(int irq, void *context) { /* Terminate the transfer with an error */ - flldbg("ERROR: Data block CRC failure, remaining: %d\n", priv->remaining); + fllerr("ERROR: Data block CRC failure, remaining: %d\n", priv->remaining); stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR); } @@ -1416,7 +1416,7 @@ static int stm32_interrupt(int irq, void *context) { /* Terminate the transfer with an error */ - flldbg("ERROR: Data timeout, remaining: %d\n", priv->remaining); + fllerr("ERROR: Data timeout, remaining: %d\n", priv->remaining); stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_TIMEOUT); } @@ -1426,7 +1426,7 @@ static int stm32_interrupt(int irq, void *context) { /* Terminate the transfer with an error */ - flldbg("ERROR: RX FIFO overrun, remaining: %d\n", priv->remaining); + fllerr("ERROR: RX FIFO overrun, remaining: %d\n", priv->remaining); stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR); } @@ -1436,7 +1436,7 @@ static int stm32_interrupt(int irq, void *context) { /* Terminate the transfer with an error */ - flldbg("ERROR: TX FIFO underrun, remaining: %d\n", priv->remaining); + fllerr("ERROR: TX FIFO underrun, remaining: %d\n", priv->remaining); stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR); } @@ -1446,7 +1446,7 @@ static int stm32_interrupt(int irq, void *context) { /* Terminate the transfer with an error */ - flldbg("ERROR: Start bit, remaining: %d\n", priv->remaining); + fllerr("ERROR: Start bit, remaining: %d\n", priv->remaining); stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR); } } diff --git a/arch/arm/src/stm32/stm32_spi.c b/arch/arm/src/stm32/stm32_spi.c index f589b83efa..803935fea5 100644 --- a/arch/arm/src/stm32/stm32_spi.c +++ b/arch/arm/src/stm32/stm32_spi.c @@ -165,9 +165,9 @@ #endif #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/arch/arm/src/stm32/stm32_usbdev.c b/arch/arm/src/stm32/stm32_usbdev.c index 631c936d74..b219a93e6c 100644 --- a/arch/arm/src/stm32/stm32_usbdev.c +++ b/arch/arm/src/stm32/stm32_usbdev.c @@ -673,7 +673,7 @@ static uint16_t stm32_getreg(uint32_t addr) { if (count == 4) { - lldbg("...\n"); + llerr("...\n"); } return val; } @@ -689,7 +689,7 @@ static uint16_t stm32_getreg(uint32_t addr) { /* Yes.. then show how many times the value repeated */ - lldbg("[repeats %d more times]\n", count-3); + llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -701,7 +701,7 @@ static uint16_t stm32_getreg(uint32_t addr) /* Show the register value read */ - lldbg("%08x->%04x\n", addr, val); + llerr("%08x->%04x\n", addr, val); return val; } #endif @@ -715,7 +715,7 @@ static void stm32_putreg(uint16_t val, uint32_t addr) { /* Show the register value being written */ - lldbg("%08x<-%04x\n", addr, val); + llerr("%08x<-%04x\n", addr, val); /* Write the value */ @@ -734,35 +734,35 @@ static void stm32_dumpep(int epno) /* Common registers */ - lldbg("CNTR: %04x\n", getreg16(STM32_USB_CNTR)); - lldbg("ISTR: %04x\n", getreg16(STM32_USB_ISTR)); - lldbg("FNR: %04x\n", getreg16(STM32_USB_FNR)); - lldbg("DADDR: %04x\n", getreg16(STM32_USB_DADDR)); - lldbg("BTABLE: %04x\n", getreg16(STM32_USB_BTABLE)); + llerr("CNTR: %04x\n", getreg16(STM32_USB_CNTR)); + llerr("ISTR: %04x\n", getreg16(STM32_USB_ISTR)); + llerr("FNR: %04x\n", getreg16(STM32_USB_FNR)); + llerr("DADDR: %04x\n", getreg16(STM32_USB_DADDR)); + llerr("BTABLE: %04x\n", getreg16(STM32_USB_BTABLE)); /* Endpoint register */ addr = STM32_USB_EPR(epno); - lldbg("EPR%d: [%08x] %04x\n", epno, addr, getreg16(addr)); + llerr("EPR%d: [%08x] %04x\n", epno, addr, getreg16(addr)); /* Endpoint descriptor */ addr = STM32_USB_BTABLE_ADDR(epno, 0); - lldbg("DESC: %08x\n", addr); + llerr("DESC: %08x\n", addr); /* Endpoint buffer descriptor */ addr = STM32_USB_ADDR_TX(epno); - lldbg(" TX ADDR: [%08x] %04x\n", addr, getreg16(addr)); + llerr(" TX ADDR: [%08x] %04x\n", addr, getreg16(addr)); addr = STM32_USB_COUNT_TX(epno); - lldbg(" COUNT: [%08x] %04x\n", addr, getreg16(addr)); + llerr(" COUNT: [%08x] %04x\n", addr, getreg16(addr)); addr = STM32_USB_ADDR_RX(epno); - lldbg(" RX ADDR: [%08x] %04x\n", addr, getreg16(addr)); + llerr(" RX ADDR: [%08x] %04x\n", addr, getreg16(addr)); addr = STM32_USB_COUNT_RX(epno); - lldbg(" COUNT: [%08x] %04x\n", addr, getreg16(addr)); + llerr(" COUNT: [%08x] %04x\n", addr, getreg16(addr)); } #endif @@ -777,12 +777,12 @@ static void stm32_checksetup(void) uint32_t apb1rstr = getreg32(STM32_RCC_APB1RSTR); uint32_t apb1enr = getreg32(STM32_RCC_APB1ENR); - lldbg("CFGR: %08x APB1RSTR: %08x APB1ENR: %08x\n", cfgr, apb1rstr, apb1enr); + llerr("CFGR: %08x APB1RSTR: %08x APB1ENR: %08x\n", cfgr, apb1rstr, apb1enr); if ((apb1rstr & RCC_APB1RSTR_USBRST) != 0 || (apb1enr & RCC_APB1ENR_USBEN) == 0) { - lldbg("ERROR: USB is NOT setup correctly\n"); + llerr("ERROR: USB is NOT setup correctly\n"); } } #endif @@ -2844,7 +2844,7 @@ static int stm32_epconfigure(struct usbdev_ep_s *ep, if (!ep || !desc) { usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0); - ulldbg("ERROR: ep=%p desc=%p\n"); + ullerr("ERROR: ep=%p desc=%p\n"); return -EINVAL; } #endif @@ -2940,7 +2940,7 @@ static int stm32_epdisable(struct usbdev_ep_s *ep) if (!ep) { usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0); - ulldbg("ERROR: ep=%p\n", ep); + ullerr("ERROR: ep=%p\n", ep); return -EINVAL; } #endif @@ -3028,7 +3028,7 @@ static int stm32_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req) if (!req || !req->callback || !req->buf || !ep) { usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0); - ulldbg("ERROR: req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); + ullerr("ERROR: req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); return -EINVAL; } #endif @@ -3040,7 +3040,7 @@ static int stm32_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req) if (!priv->driver) { usbtrace(TRACE_DEVERROR(STM32_TRACEERR_NOTCONFIGURED), priv->usbdev.speed); - ulldbg("ERROR: driver=%p\n", priv->driver); + ullerr("ERROR: driver=%p\n", priv->driver); return -ESHUTDOWN; } #endif @@ -3057,7 +3057,7 @@ static int stm32_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req) if (privep->stalled) { stm32_abortrequest(privep, privreq, -EBUSY); - ulldbg("ERROR: stalled\n"); + ullerr("ERROR: stalled\n"); ret = -EBUSY; } diff --git a/arch/arm/src/stm32/stm32_wwdg.c b/arch/arm/src/stm32/stm32_wwdg.c index a65bfadf96..2f9074867d 100644 --- a/arch/arm/src/stm32/stm32_wwdg.c +++ b/arch/arm/src/stm32/stm32_wwdg.c @@ -83,12 +83,12 @@ /* Debug ********************************************************************/ /* Non-standard debug that may be enabled just for testing the watchdog - * driver. NOTE: that only lldbg types are used so that the output is + * driver. NOTE: that only llerr types are used so that the output is * immediately available. */ #ifdef CONFIG_DEBUG_WATCHDOG -# define wddbg lldbg +# define wddbg llerr # define wdinfo llinfo #else # define wddbg(x...) @@ -200,7 +200,7 @@ static uint16_t stm32_getreg(uint32_t addr) { if (count == 4) { - lldbg("...\n"); + llerr("...\n"); } return val; @@ -217,7 +217,7 @@ static uint16_t stm32_getreg(uint32_t addr) { /* Yes.. then show how many times the value repeated */ - lldbg("[repeats %d more times]\n", count-3); + llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -229,7 +229,7 @@ static uint16_t stm32_getreg(uint32_t addr) /* Show the register value read */ - lldbg("%08x->%04x\n", addr, val); + llerr("%08x->%04x\n", addr, val); return val; } #endif @@ -247,7 +247,7 @@ static void stm32_putreg(uint16_t val, uint32_t addr) { /* Show the register value being written */ - lldbg("%08x<-%04x\n", addr, val); + llerr("%08x<-%04x\n", addr, val); /* Write the value */ diff --git a/arch/arm/src/stm32/stm32f40xxx_rtcc.c b/arch/arm/src/stm32/stm32f40xxx_rtcc.c index e513066a6a..d016e20559 100644 --- a/arch/arm/src/stm32/stm32f40xxx_rtcc.c +++ b/arch/arm/src/stm32/stm32f40xxx_rtcc.c @@ -136,12 +136,12 @@ #ifdef CONFIG_DEBUG_RTC # define rtcdbg dbg # define rtcinfo info -# define rtclldbg lldbg +# define rtcllerr llerr # define rtcllinfo llinfo #else # define rtcdbg(x...) # define rtcinfo(x...) -# define rtclldbg(x...) +# define rtcllerr(x...) # define rtcllinfo(x...) #endif @@ -213,31 +213,31 @@ static void rtc_dumpregs(FAR const char *msg) { int rtc_state; - rtclldbg("%s:\n", msg); - rtclldbg(" TR: %08x\n", getreg32(STM32_RTC_TR)); - rtclldbg(" DR: %08x\n", getreg32(STM32_RTC_DR)); - rtclldbg(" CR: %08x\n", getreg32(STM32_RTC_CR)); - rtclldbg(" ISR: %08x\n", getreg32(STM32_RTC_ISR)); - rtclldbg(" PRER: %08x\n", getreg32(STM32_RTC_PRER)); - rtclldbg(" WUTR: %08x\n", getreg32(STM32_RTC_WUTR)); - rtclldbg(" ALRMAR: %08x\n", getreg32(STM32_RTC_ALRMAR)); - rtclldbg(" ALRMBR: %08x\n", getreg32(STM32_RTC_ALRMBR)); - rtclldbg(" SHIFTR: %08x\n", getreg32(STM32_RTC_SHIFTR)); - rtclldbg(" TSTR: %08x\n", getreg32(STM32_RTC_TSTR)); - rtclldbg(" TSDR: %08x\n", getreg32(STM32_RTC_TSDR)); - rtclldbg(" TSSSR: %08x\n", getreg32(STM32_RTC_TSSSR)); - rtclldbg(" CALR: %08x\n", getreg32(STM32_RTC_CALR)); - rtclldbg(" TAFCR: %08x\n", getreg32(STM32_RTC_TAFCR)); - rtclldbg("ALRMASSR: %08x\n", getreg32(STM32_RTC_ALRMASSR)); - rtclldbg("ALRMBSSR: %08x\n", getreg32(STM32_RTC_ALRMBSSR)); - rtclldbg("MAGICREG: %08x\n", getreg32(RTC_MAGIC_REG)); + rtcllerr("%s:\n", msg); + rtcllerr(" TR: %08x\n", getreg32(STM32_RTC_TR)); + rtcllerr(" DR: %08x\n", getreg32(STM32_RTC_DR)); + rtcllerr(" CR: %08x\n", getreg32(STM32_RTC_CR)); + rtcllerr(" ISR: %08x\n", getreg32(STM32_RTC_ISR)); + rtcllerr(" PRER: %08x\n", getreg32(STM32_RTC_PRER)); + rtcllerr(" WUTR: %08x\n", getreg32(STM32_RTC_WUTR)); + rtcllerr(" ALRMAR: %08x\n", getreg32(STM32_RTC_ALRMAR)); + rtcllerr(" ALRMBR: %08x\n", getreg32(STM32_RTC_ALRMBR)); + rtcllerr(" SHIFTR: %08x\n", getreg32(STM32_RTC_SHIFTR)); + rtcllerr(" TSTR: %08x\n", getreg32(STM32_RTC_TSTR)); + rtcllerr(" TSDR: %08x\n", getreg32(STM32_RTC_TSDR)); + rtcllerr(" TSSSR: %08x\n", getreg32(STM32_RTC_TSSSR)); + rtcllerr(" CALR: %08x\n", getreg32(STM32_RTC_CALR)); + rtcllerr(" TAFCR: %08x\n", getreg32(STM32_RTC_TAFCR)); + rtcllerr("ALRMASSR: %08x\n", getreg32(STM32_RTC_ALRMASSR)); + rtcllerr("ALRMBSSR: %08x\n", getreg32(STM32_RTC_ALRMBSSR)); + rtcllerr("MAGICREG: %08x\n", getreg32(RTC_MAGIC_REG)); rtc_state = ((getreg32(STM32_EXTI_RTSR) & EXTI_RTC_ALARM) ? 0x1000 : 0) | ((getreg32(STM32_EXTI_FTSR) & EXTI_RTC_ALARM) ? 0x0100 : 0) | ((getreg32(STM32_EXTI_IMR) & EXTI_RTC_ALARM) ? 0x0010 : 0) | ((getreg32(STM32_EXTI_EMR) & EXTI_RTC_ALARM) ? 0x0001 : 0); - rtclldbg("EXTI (RTSR FTSR ISR EVT): %01x\n",rtc_state); + rtcllerr("EXTI (RTSR FTSR ISR EVT): %01x\n",rtc_state); } #else # define rtc_dumpregs(msg) @@ -260,13 +260,13 @@ static void rtc_dumpregs(FAR const char *msg) #ifdef CONFIG_DEBUG_RTC static void rtc_dumptime(FAR const struct tm *tp, FAR const char *msg) { - rtclldbg("%s:\n", msg); - rtclldbg(" tm_sec: %08x\n", tp->tm_sec); - rtclldbg(" tm_min: %08x\n", tp->tm_min); - rtclldbg(" tm_hour: %08x\n", tp->tm_hour); - rtclldbg(" tm_mday: %08x\n", tp->tm_mday); - rtclldbg(" tm_mon: %08x\n", tp->tm_mon); - rtclldbg(" tm_year: %08x\n", tp->tm_year); + rtcllerr("%s:\n", msg); + rtcllerr(" tm_sec: %08x\n", tp->tm_sec); + rtcllerr(" tm_min: %08x\n", tp->tm_min); + rtcllerr(" tm_hour: %08x\n", tp->tm_hour); + rtcllerr(" tm_mday: %08x\n", tp->tm_mday); + rtcllerr(" tm_mon: %08x\n", tp->tm_mon); + rtcllerr(" tm_year: %08x\n", tp->tm_year); } #else # define rtc_dumptime(tp, msg) @@ -989,13 +989,13 @@ int up_rtc_initialize(void) { case OK: { - rtclldbg("rtc_syncwait() okay\n"); + rtcllerr("rtc_syncwait() okay\n"); break; } default: { - rtclldbg("rtc_syncwait() failed (%d)\n", ret); + rtcllerr("rtc_syncwait() failed (%d)\n", ret); break; } } @@ -1009,7 +1009,7 @@ int up_rtc_initialize(void) if (regval != RTC_MAGIC) { - rtclldbg("Do setup\n"); + rtcllerr("Do setup\n"); /* Perform the one-time setup of the LSE clocking to the RTC */ @@ -1027,7 +1027,7 @@ int up_rtc_initialize(void) } else { - rtclldbg("Do resume\n"); + rtcllerr("Do resume\n"); /* RTC already set-up, just resume normal operation */ @@ -1043,7 +1043,7 @@ int up_rtc_initialize(void) if (ret != OK && nretry > 0) { - rtclldbg("setup/resume ran %d times and failed with %d\n", + rtcllerr("setup/resume ran %d times and failed with %d\n", nretry, ret); return -ETIMEDOUT; } diff --git a/arch/arm/src/stm32f7/stm32_dumpgpio.c b/arch/arm/src/stm32f7/stm32_dumpgpio.c index fcd3357efe..a826720bbc 100644 --- a/arch/arm/src/stm32f7/stm32_dumpgpio.c +++ b/arch/arm/src/stm32f7/stm32_dumpgpio.c @@ -127,27 +127,27 @@ int stm32_dumpgpio(uint32_t pinset, const char *msg) DEBUGASSERT(port < STM32F7_NGPIO); - lldbg("GPIO%c pinset: %08x base: %08x -- %s\n", + llerr("GPIO%c pinset: %08x base: %08x -- %s\n", g_portchar[port], pinset, base, msg); if ((getreg32(STM32_RCC_AHB1ENR) & RCC_AHB1ENR_GPIOEN(port)) != 0) { - lldbg(" MODE: %08x OTYPE: %04x OSPEED: %08x PUPDR: %08x\n", + llerr(" 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)); - lldbg(" IDR: %04x ODR: %04x LCKR: %05x\n", + llerr(" IDR: %04x ODR: %04x LCKR: %05x\n", getreg32(base + STM32_GPIO_IDR_OFFSET), getreg32(base + STM32_GPIO_ODR_OFFSET), getreg32(base + STM32_GPIO_LCKR_OFFSET)); - lldbg(" AFRH: %08x AFRL: %08x\n", + llerr(" AFRH: %08x AFRL: %08x\n", getreg32(base + STM32_GPIO_AFRH_OFFSET), getreg32(base + STM32_GPIO_AFRL_OFFSET)); } else { - lldbg(" GPIO%c not enabled: AHB1ENR: %08x\n", + llerr(" GPIO%c not enabled: AHB1ENR: %08x\n", g_portchar[port], getreg32(STM32_RCC_AHB1ENR)); } diff --git a/arch/arm/src/stm32f7/stm32_ethernet.c b/arch/arm/src/stm32f7/stm32_ethernet.c index af0e461446..d2aae9bfa2 100644 --- a/arch/arm/src/stm32f7/stm32_ethernet.c +++ b/arch/arm/src/stm32f7/stm32_ethernet.c @@ -816,7 +816,7 @@ static uint32_t stm32_getreg(uint32_t addr) { if (count == 4) { - lldbg("...\n"); + llerr("...\n"); } return val; @@ -833,7 +833,7 @@ static uint32_t stm32_getreg(uint32_t addr) { /* Yes.. then show how many times the value repeated */ - lldbg("[repeats %d more times]\n", count-3); + llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -845,7 +845,7 @@ static uint32_t stm32_getreg(uint32_t addr) /* Show the register value read */ - lldbg("%08x->%08x\n", addr, val); + llerr("%08x->%08x\n", addr, val); return val; } #endif @@ -872,7 +872,7 @@ static void stm32_putreg(uint32_t val, uint32_t addr) { /* Show the register value being written */ - lldbg("%08x<-%08x\n", addr, val); + llerr("%08x<-%08x\n", addr, val); /* Write the value */ @@ -1589,7 +1589,7 @@ static int stm32_recvframe(struct stm32_ethmac_s *priv) if (!stm32_isfreebuffer(priv)) { - nlldbg("No free buffers\n"); + nllerr("No free buffers\n"); return -ENOMEM; } @@ -1718,7 +1718,7 @@ static int stm32_recvframe(struct stm32_ethmac_s *priv) * scanning logic, and continue scanning with the next frame. */ - nlldbg("DROPPED: RX descriptor errors: %08x\n", rxdesc->rdes0); + nllerr("DROPPED: RX descriptor errors: %08x\n", rxdesc->rdes0); stm32_freesegment(priv, rxcurr, priv->segments); } } @@ -1784,7 +1784,7 @@ static void stm32_receive(struct stm32_ethmac_s *priv) if (dev->d_len > CONFIG_NET_ETH_MTU) { - nlldbg("DROPPED: Too big: %d\n", dev->d_len); + nllerr("DROPPED: Too big: %d\n", dev->d_len); continue; } @@ -1894,7 +1894,7 @@ static void stm32_receive(struct stm32_ethmac_s *priv) else #endif { - nlldbg("DROPPED: Unknown type: %04x\n", BUF->type); + nllerr("DROPPED: Unknown type: %04x\n", BUF->type); } /* We are finished with the RX buffer. NOTE: If the buffer is @@ -2158,7 +2158,7 @@ static inline void stm32_interrupt_process(struct stm32_ethmac_s *priv) { /* Just let the user know what happened */ - nlldbg("Abormal event(s): %08x\n", dmasr); + nllerr("Abormal event(s): %08x\n", dmasr); /* Clear all pending abnormal events */ @@ -2362,7 +2362,7 @@ static void stm32_txtimeout_expiry(int argc, uint32_t arg, ...) { struct stm32_ethmac_s *priv = (struct stm32_ethmac_s *)arg; - nlldbg("Timeout!\n"); + nllerr("Timeout!\n"); #ifdef CONFIG_NET_NOINTS /* Disable further Ethernet interrupts. This will prevent some race diff --git a/arch/arm/src/stm32f7/stm32_irq.c b/arch/arm/src/stm32f7/stm32_irq.c index ca3c5f64fb..125555cbcb 100644 --- a/arch/arm/src/stm32f7/stm32_irq.c +++ b/arch/arm/src/stm32f7/stm32_irq.c @@ -116,50 +116,50 @@ static void stm32_dumpnvic(const char *msg, int irq) irqstate_t flags; flags = enter_critical_section(); - lldbg("NVIC (%s, irq=%d):\n", msg, irq); - lldbg(" INTCTRL: %08x VECTAB: %08x\n", + llerr("NVIC (%s, irq=%d):\n", msg, irq); + llerr(" INTCTRL: %08x VECTAB: %08x\n", getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB)); #if 0 - lldbg(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n", + llerr(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n", getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA), getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE)); #endif - lldbg(" IRQ ENABLE: %08x %08x %08x\n", + llerr(" IRQ ENABLE: %08x %08x %08x\n", getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE), getreg32(NVIC_IRQ64_95_ENABLE)); - lldbg(" SYSH_PRIO: %08x %08x %08x\n", + llerr(" SYSH_PRIO: %08x %08x %08x\n", getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY), getreg32(NVIC_SYSH12_15_PRIORITY)); - lldbg(" IRQ PRIO: %08x %08x %08x %08x\n", + llerr(" IRQ PRIO: %08x %08x %08x %08x\n", getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY), getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY)); #if NR_INTERRUPTS > 15 - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY), getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY)); #endif #if NR_INTERRUPTS > 31 - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY), getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY)); #endif #if NR_INTERRUPTS > 47 - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ48_51_PRIORITY), getreg32(NVIC_IRQ52_55_PRIORITY), getreg32(NVIC_IRQ56_59_PRIORITY), getreg32(NVIC_IRQ60_63_PRIORITY)); #endif #if NR_INTERRUPTS > 63 - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ64_67_PRIORITY), getreg32(NVIC_IRQ68_71_PRIORITY), getreg32(NVIC_IRQ72_75_PRIORITY), getreg32(NVIC_IRQ76_79_PRIORITY)); #endif #if NR_INTERRUPTS > 79 - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ80_83_PRIORITY), getreg32(NVIC_IRQ84_87_PRIORITY), getreg32(NVIC_IRQ88_91_PRIORITY), getreg32(NVIC_IRQ92_95_PRIORITY)); #endif #if NR_INTERRUPTS > 95 - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ96_99_PRIORITY), getreg32(NVIC_IRQ100_103_PRIORITY), getreg32(NVIC_IRQ104_107_PRIORITY), getreg32(NVIC_IRQ108_111_PRIORITY)); #endif diff --git a/arch/arm/src/stm32l4/stm32l4_can.c b/arch/arm/src/stm32l4/stm32l4_can.c index 00789f419b..bb4e049312 100644 --- a/arch/arm/src/stm32l4/stm32l4_can.c +++ b/arch/arm/src/stm32l4/stm32l4_can.c @@ -88,12 +88,12 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg # define caninfo info -# define canlldbg lldbg +# define canllerr llerr # define canllinfo llinfo #else # define candbg(x...) # define caninfo(x...) -# define canlldbg(x...) +# define canllerr(x...) # define canllinfo(x...) #endif @@ -237,7 +237,7 @@ static uint32_t can_vgetreg(uint32_t addr) { if (count == 4) { - lldbg("...\n"); + llerr("...\n"); } return val; @@ -254,7 +254,7 @@ static uint32_t can_vgetreg(uint32_t addr) { /* Yes.. then show how many times the value repeated */ - lldbg("[repeats %d more times]\n", count-3); + llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -266,7 +266,7 @@ static uint32_t can_vgetreg(uint32_t addr) /* Show the register value read */ - lldbg("%08x->%08x\n", addr, val); + llerr("%08x->%08x\n", addr, val); return val; } @@ -315,7 +315,7 @@ static void can_vputreg(uint32_t addr, uint32_t value) { /* Show the register value being written */ - lldbg("%08x<-%08x\n", addr, value); + llerr("%08x<-%08x\n", addr, value); /* Write the value */ @@ -363,25 +363,25 @@ static void can_dumpctrlregs(struct stm32l4_can_s *priv, FAR const char *msg) { if (msg) { - canlldbg("Control Registers: %s\n", msg); + canllerr("Control Registers: %s\n", msg); } else { - canlldbg("Control Registers:\n"); + canllerr("Control Registers:\n"); } /* CAN control and status registers */ - lldbg(" MCR: %08x MSR: %08x TSR: %08x\n", + llerr(" MCR: %08x MSR: %08x TSR: %08x\n", getreg32(priv->base + STM32L4_CAN_MCR_OFFSET), getreg32(priv->base + STM32L4_CAN_MSR_OFFSET), getreg32(priv->base + STM32L4_CAN_TSR_OFFSET)); - lldbg(" RF0R: %08x RF1R: %08x\n", + llerr(" RF0R: %08x RF1R: %08x\n", getreg32(priv->base + STM32L4_CAN_RF0R_OFFSET), getreg32(priv->base + STM32L4_CAN_RF1R_OFFSET)); - lldbg(" IER: %08x ESR: %08x BTR: %08x\n", + llerr(" IER: %08x ESR: %08x BTR: %08x\n", getreg32(priv->base + STM32L4_CAN_IER_OFFSET), getreg32(priv->base + STM32L4_CAN_ESR_OFFSET), getreg32(priv->base + STM32L4_CAN_BTR_OFFSET)); @@ -407,40 +407,40 @@ static void can_dumpmbregs(struct stm32l4_can_s *priv, FAR const char *msg) { if (msg) { - canlldbg("Mailbox Registers: %s\n", msg); + canllerr("Mailbox Registers: %s\n", msg); } else { - canlldbg("Mailbox Registers:\n"); + canllerr("Mailbox Registers:\n"); } /* CAN mailbox registers (3 TX and 2 RX) */ - lldbg(" TI0R: %08x TDT0R: %08x TDL0R: %08x TDH0R: %08x\n", + llerr(" TI0R: %08x TDT0R: %08x TDL0R: %08x TDH0R: %08x\n", getreg32(priv->base + STM32L4_CAN_TI0R_OFFSET), getreg32(priv->base + STM32L4_CAN_TDT0R_OFFSET), getreg32(priv->base + STM32L4_CAN_TDL0R_OFFSET), getreg32(priv->base + STM32L4_CAN_TDH0R_OFFSET)); - lldbg(" TI1R: %08x TDT1R: %08x TDL1R: %08x TDH1R: %08x\n", + llerr(" TI1R: %08x TDT1R: %08x TDL1R: %08x TDH1R: %08x\n", getreg32(priv->base + STM32L4_CAN_TI1R_OFFSET), getreg32(priv->base + STM32L4_CAN_TDT1R_OFFSET), getreg32(priv->base + STM32L4_CAN_TDL1R_OFFSET), getreg32(priv->base + STM32L4_CAN_TDH1R_OFFSET)); - lldbg(" TI2R: %08x TDT2R: %08x TDL2R: %08x TDH2R: %08x\n", + llerr(" TI2R: %08x TDT2R: %08x TDL2R: %08x TDH2R: %08x\n", getreg32(priv->base + STM32L4_CAN_TI2R_OFFSET), getreg32(priv->base + STM32L4_CAN_TDT2R_OFFSET), getreg32(priv->base + STM32L4_CAN_TDL2R_OFFSET), getreg32(priv->base + STM32L4_CAN_TDH2R_OFFSET)); - lldbg(" RI0R: %08x RDT0R: %08x RDL0R: %08x RDH0R: %08x\n", + llerr(" RI0R: %08x RDT0R: %08x RDL0R: %08x RDH0R: %08x\n", getreg32(priv->base + STM32L4_CAN_RI0R_OFFSET), getreg32(priv->base + STM32L4_CAN_RDT0R_OFFSET), getreg32(priv->base + STM32L4_CAN_RDL0R_OFFSET), getreg32(priv->base + STM32L4_CAN_RDH0R_OFFSET)); - lldbg(" RI1R: %08x RDT1R: %08x RDL1R: %08x RDH1R: %08x\n", + llerr(" RI1R: %08x RDT1R: %08x RDL1R: %08x RDH1R: %08x\n", getreg32(priv->base + STM32L4_CAN_RI1R_OFFSET), getreg32(priv->base + STM32L4_CAN_RDT1R_OFFSET), getreg32(priv->base + STM32L4_CAN_RDL1R_OFFSET), @@ -469,14 +469,14 @@ static void can_dumpfiltregs(struct stm32l4_can_s *priv, FAR const char *msg) if (msg) { - canlldbg("Filter Registers: %s\n", msg); + canllerr("Filter Registers: %s\n", msg); } else { - canlldbg("Filter Registers:\n"); + canllerr("Filter Registers:\n"); } - lldbg(" FMR: %08x FM1R: %08x FS1R: %08x FFA1R: %08x FA1R: %08x\n", + llerr(" FMR: %08x FM1R: %08x FS1R: %08x FFA1R: %08x FA1R: %08x\n", getreg32(priv->base + STM32L4_CAN_FMR_OFFSET), getreg32(priv->base + STM32L4_CAN_FM1R_OFFSET), getreg32(priv->base + STM32L4_CAN_FS1R_OFFSET), @@ -485,7 +485,7 @@ static void can_dumpfiltregs(struct stm32l4_can_s *priv, FAR const char *msg) for (i = 0; i < CAN_NFILTERS; i++) { - lldbg(" F%dR1: %08x F%dR2: %08x\n", + llerr(" F%dR1: %08x F%dR2: %08x\n", i, getreg32(priv->base + STM32L4_CAN_FIR_OFFSET(i, 1)), i, getreg32(priv->base + STM32L4_CAN_FIR_OFFSET(i, 2))); } @@ -526,7 +526,7 @@ static void can_reset(FAR struct can_dev_s *dev) else #endif { - canlldbg("Unsupported port %d\n", priv->port); + canllerr("Unsupported port %d\n", priv->port); return; } @@ -576,7 +576,7 @@ static int can_setup(FAR struct can_dev_s *dev) ret = can_cellinit(priv); if (ret < 0) { - canlldbg("CAN%d cell initialization failed: %d\n", priv->port, ret); + canllerr("CAN%d cell initialization failed: %d\n", priv->port, ret); return ret; } @@ -588,7 +588,7 @@ static int can_setup(FAR struct can_dev_s *dev) ret = can_filterinit(priv); if (ret < 0) { - canlldbg("CAN%d filter initialization failed: %d\n", priv->port, ret); + canllerr("CAN%d filter initialization failed: %d\n", priv->port, ret); return ret; } @@ -599,14 +599,14 @@ static int can_setup(FAR struct can_dev_s *dev) ret = irq_attach(priv->canrx0, can_rx0interrupt); if (ret < 0) { - canlldbg("Failed to attach CAN%d RX0 IRQ (%d)", priv->port, priv->canrx0); + canllerr("Failed to attach CAN%d RX0 IRQ (%d)", priv->port, priv->canrx0); return ret; } ret = irq_attach(priv->cantx, can_txinterrupt); if (ret < 0) { - canlldbg("Failed to attach CAN%d TX IRQ (%d)", priv->port, priv->cantx); + canllerr("Failed to attach CAN%d TX IRQ (%d)", priv->port, priv->cantx); return ret; } @@ -815,7 +815,7 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg) } else { - canlldbg("ERROR: No available mailbox\n"); + canllerr("ERROR: No available mailbox\n"); return -EBUSY; } @@ -1029,7 +1029,7 @@ static int can_rx0interrupt(int irq, void *context) npending = (regval & CAN_RFR_FMP_MASK) >> CAN_RFR_FMP_SHIFT; if (npending < 1) { - canlldbg("WARNING: No messages pending\n"); + canllerr("WARNING: No messages pending\n"); return OK; } @@ -1053,7 +1053,7 @@ static int can_rx0interrupt(int irq, void *context) #else if ((regval & CAN_RIR_IDE) != 0) { - canlldbg("ERROR: Received message with extended identifier. Dropped\n"); + canllerr("ERROR: Received message with extended identifier. Dropped\n"); ret = -ENOSYS; goto errout; } @@ -1392,7 +1392,7 @@ static int can_cellinit(struct stm32l4_can_s *priv) if (timeout < 1) { - canlldbg("ERROR: Timed out waiting to enter initialization mode\n"); + canllerr("ERROR: Timed out waiting to enter initialization mode\n"); return -ETIMEDOUT; } @@ -1415,7 +1415,7 @@ static int can_cellinit(struct stm32l4_can_s *priv) ret = can_bittiming(priv); if (ret < 0) { - canlldbg("ERROR: Failed to set bit timing: %d\n", ret); + canllerr("ERROR: Failed to set bit timing: %d\n", ret); return ret; } @@ -1442,7 +1442,7 @@ static int can_cellinit(struct stm32l4_can_s *priv) if (timeout < 1) { - canlldbg("ERROR: Timed out waiting to exit initialization mode: %08x\n", regval); + canllerr("ERROR: Timed out waiting to exit initialization mode: %08x\n", regval); return -ETIMEDOUT; } diff --git a/arch/arm/src/stm32l4/stm32l4_irq.c b/arch/arm/src/stm32l4/stm32l4_irq.c index ebf76d7fd2..2a11ef105f 100644 --- a/arch/arm/src/stm32l4/stm32l4_irq.c +++ b/arch/arm/src/stm32l4/stm32l4_irq.c @@ -112,33 +112,33 @@ static void stm32l4_dumpnvic(const char *msg, int irq) irqstate_t flags; flags = enter_critical_section(); - lldbg("NVIC (%s, irq=%d):\n", msg, irq); - lldbg(" INTCTRL: %08x VECTAB: %08x\n", + llerr("NVIC (%s, irq=%d):\n", msg, irq); + llerr(" INTCTRL: %08x VECTAB: %08x\n", getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB)); #if 0 - lldbg(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n", + llerr(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n", getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA), getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE)); #endif - lldbg(" IRQ ENABLE: %08x %08x %08x\n", + llerr(" IRQ ENABLE: %08x %08x %08x\n", getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE), getreg32(NVIC_IRQ64_95_ENABLE)); - lldbg(" SYSH_PRIO: %08x %08x %08x\n", + llerr(" SYSH_PRIO: %08x %08x %08x\n", getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY), getreg32(NVIC_SYSH12_15_PRIORITY)); - lldbg(" IRQ PRIO: %08x %08x %08x %08x\n", + llerr(" IRQ PRIO: %08x %08x %08x %08x\n", getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY), getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY)); - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY), getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY)); - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY), getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY)); - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ48_51_PRIORITY), getreg32(NVIC_IRQ52_55_PRIORITY), getreg32(NVIC_IRQ56_59_PRIORITY), getreg32(NVIC_IRQ60_63_PRIORITY)); - lldbg(" %08x\n", + llerr(" %08x\n", getreg32(NVIC_IRQ64_67_PRIORITY)); leave_critical_section(flags); } diff --git a/arch/arm/src/stm32l4/stm32l4_qspi.c b/arch/arm/src/stm32l4/stm32l4_qspi.c index 7a932930eb..459b921ab6 100644 --- a/arch/arm/src/stm32l4/stm32l4_qspi.c +++ b/arch/arm/src/stm32l4/stm32l4_qspi.c @@ -101,9 +101,9 @@ #endif #ifdef CONFIG_DEBUG_SPI -# define qspidbg lldbg +# define qspidbg llerr # ifdef CONFIG_DEBUG_INFO -# define qspiinfo lldbg +# define qspiinfo llerr # else # define qspiinfo(x...) # endif @@ -426,7 +426,7 @@ static bool qspi_checkreg(struct stm32l4_qspidev_s *priv, bool wr, uint32_t valu { /* Yes... show how many times we did it */ - lldbg("...[Repeats %d times]...\n", priv->ntimes); + llerr("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -460,7 +460,7 @@ static inline uint32_t qspi_getreg(struct stm32l4_qspidev_s *priv, #ifdef CONFIG_STM32L4_QSPI_REGDEBUG if (qspi_checkreg(priv, false, value, address)) { - lldbg("%08x->%08x\n", address, value); + llerr("%08x->%08x\n", address, value); } #endif @@ -483,7 +483,7 @@ static inline void qspi_putreg(struct stm32l4_qspidev_s *priv, uint32_t value, #ifdef CONFIG_STM32L4_QSPI_REGDEBUG if (qspi_checkreg(priv, true, value, address)) { - lldbg("%08x<-%08x\n", address, value); + llerr("%08x<-%08x\n", address, value); } #endif diff --git a/arch/arm/src/stm32l4/stm32l4_rtcc.c b/arch/arm/src/stm32l4/stm32l4_rtcc.c index c13ddf1442..1d959e688a 100644 --- a/arch/arm/src/stm32l4/stm32l4_rtcc.c +++ b/arch/arm/src/stm32l4/stm32l4_rtcc.c @@ -121,12 +121,12 @@ #ifdef CONFIG_DEBUG_RTC # define rtcdbg dbg # define rtcinfo info -# define rtclldbg lldbg +# define rtcllerr llerr # define rtcllinfo llinfo #else # define rtcdbg(x...) # define rtcinfo(x...) -# define rtclldbg(x...) +# define rtcllerr(x...) # define rtcllinfo(x...) #endif @@ -194,24 +194,24 @@ static int rtchw_set_alrmbr(rtc_alarmreg_t alarmreg); #ifdef CONFIG_DEBUG_RTC static void rtc_dumpregs(FAR const char *msg) { - rtclldbg("%s:\n", msg); - rtclldbg(" TR: %08x\n", getreg32(STM32L4_RTC_TR)); - rtclldbg(" DR: %08x\n", getreg32(STM32L4_RTC_DR)); - rtclldbg(" CR: %08x\n", getreg32(STM32L4_RTC_CR)); - rtclldbg(" ISR: %08x\n", getreg32(STM32L4_RTC_ISR)); - rtclldbg(" PRER: %08x\n", getreg32(STM32L4_RTC_PRER)); - rtclldbg(" WUTR: %08x\n", getreg32(STM32L4_RTC_WUTR)); + rtcllerr("%s:\n", msg); + rtcllerr(" TR: %08x\n", getreg32(STM32L4_RTC_TR)); + rtcllerr(" DR: %08x\n", getreg32(STM32L4_RTC_DR)); + rtcllerr(" CR: %08x\n", getreg32(STM32L4_RTC_CR)); + rtcllerr(" ISR: %08x\n", getreg32(STM32L4_RTC_ISR)); + rtcllerr(" PRER: %08x\n", getreg32(STM32L4_RTC_PRER)); + rtcllerr(" WUTR: %08x\n", getreg32(STM32L4_RTC_WUTR)); - rtclldbg(" ALRMAR: %08x\n", getreg32(STM32L4_RTC_ALRMAR)); - rtclldbg(" ALRMBR: %08x\n", getreg32(STM32L4_RTC_ALRMBR)); - rtclldbg(" SHIFTR: %08x\n", getreg32(STM32L4_RTC_SHIFTR)); - rtclldbg(" TSTR: %08x\n", getreg32(STM32L4_RTC_TSTR)); - rtclldbg(" TSDR: %08x\n", getreg32(STM32L4_RTC_TSDR)); - rtclldbg(" TSSSR: %08x\n", getreg32(STM32L4_RTC_TSSSR)); - rtclldbg(" CALR: %08x\n", getreg32(STM32L4_RTC_CALR)); - rtclldbg(" TAMPCR: %08x\n", getreg32(STM32L4_RTC_TAMPCR)); - rtclldbg("ALRMASSR: %08x\n", getreg32(STM32L4_RTC_ALRMASSR)); - rtclldbg("ALRMBSSR: %08x\n", getreg32(STM32L4_RTC_ALRMBSSR)); + rtcllerr(" ALRMAR: %08x\n", getreg32(STM32L4_RTC_ALRMAR)); + rtcllerr(" ALRMBR: %08x\n", getreg32(STM32L4_RTC_ALRMBR)); + rtcllerr(" SHIFTR: %08x\n", getreg32(STM32L4_RTC_SHIFTR)); + rtcllerr(" TSTR: %08x\n", getreg32(STM32L4_RTC_TSTR)); + rtcllerr(" TSDR: %08x\n", getreg32(STM32L4_RTC_TSDR)); + rtcllerr(" TSSSR: %08x\n", getreg32(STM32L4_RTC_TSSSR)); + rtcllerr(" CALR: %08x\n", getreg32(STM32L4_RTC_CALR)); + rtcllerr(" TAMPCR: %08x\n", getreg32(STM32L4_RTC_TAMPCR)); + rtcllerr("ALRMASSR: %08x\n", getreg32(STM32L4_RTC_ALRMASSR)); + rtcllerr("ALRMBSSR: %08x\n", getreg32(STM32L4_RTC_ALRMBSSR)); } #else # define rtc_dumpregs(msg) @@ -234,16 +234,16 @@ static void rtc_dumpregs(FAR const char *msg) #ifdef CONFIG_DEBUG_RTC static void rtc_dumptime(FAR const struct tm *tp, FAR const char *msg) { - rtclldbg("%s:\n", msg); + rtcllerr("%s:\n", msg); #if 0 - rtclldbg(" tm_sec: %08x\n", tp->tm_sec); - rtclldbg(" tm_min: %08x\n", tp->tm_min); - rtclldbg(" tm_hour: %08x\n", tp->tm_hour); - rtclldbg(" tm_mday: %08x\n", tp->tm_mday); - rtclldbg(" tm_mon: %08x\n", tp->tm_mon); - rtclldbg(" tm_year: %08x\n", tp->tm_year); + rtcllerr(" tm_sec: %08x\n", tp->tm_sec); + rtcllerr(" tm_min: %08x\n", tp->tm_min); + rtcllerr(" tm_hour: %08x\n", tp->tm_hour); + rtcllerr(" tm_mday: %08x\n", tp->tm_mday); + rtcllerr(" tm_mon: %08x\n", tp->tm_mon); + rtcllerr(" tm_year: %08x\n", tp->tm_year); #else - rtclldbg(" tm: %04d-%02d-%02d %02d:%02d:%02d\n", + rtcllerr(" tm: %04d-%02d-%02d %02d:%02d:%02d\n", tp->tm_year+1900, tp->tm_mon+1, tp->tm_mday, tp->tm_hour, tp->tm_min, tp->tm_sec); #endif diff --git a/arch/arm/src/stm32l4/stm32l4_spi.c b/arch/arm/src/stm32l4/stm32l4_spi.c index b3f9b0db17..05d6409035 100644 --- a/arch/arm/src/stm32l4/stm32l4_spi.c +++ b/arch/arm/src/stm32l4/stm32l4_spi.c @@ -146,9 +146,9 @@ #endif #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/arch/arm/src/tiva/lm3s_ethernet.c b/arch/arm/src/tiva/lm3s_ethernet.c index 4776e39e71..9a9f72e97b 100644 --- a/arch/arm/src/tiva/lm3s_ethernet.c +++ b/arch/arm/src/tiva/lm3s_ethernet.c @@ -686,7 +686,7 @@ static void tiva_receive(struct tiva_driver_s *priv) /* We will have to drop this packet */ - nlldbg("Bad packet size dropped (%d)\n", pktlen); + nllerr("Bad packet size dropped (%d)\n", pktlen); NETDEV_RXERRORS(&priv->ld_dev); /* The number of bytes and words left to read is pktlen - 4 (including, @@ -867,7 +867,7 @@ static void tiva_receive(struct tiva_driver_s *priv) else #endif { - nlldbg("Unsupported packet type dropped (%02x)\n", htons(ETHBUF->type)); + nllerr("Unsupported packet type dropped (%02x)\n", htons(ETHBUF->type)); NETDEV_RXDROPPED(&priv->ld_dev); } } @@ -1024,7 +1024,7 @@ static void tiva_txtimeout(int argc, uint32_t arg, ...) /* Increment statistics */ - nlldbg("Tx timeout\n"); + nllerr("Tx timeout\n"); NETDEV_TXTIMEOUTS(&priv->ld_dev); /* Then reset the hardware */ @@ -1104,7 +1104,7 @@ static int tiva_ifup(struct net_driver_s *dev) uint32_t div; uint16_t phyreg; - nlldbg("Bringing up: %d.%d.%d.%d\n", + nllerr("Bringing up: %d.%d.%d.%d\n", dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff, (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24); @@ -1168,13 +1168,13 @@ static int tiva_ifup(struct net_driver_s *dev) * set */ - nlldbg("Waiting for link\n"); + nllerr("Waiting for link\n"); do { phyreg = tiva_phyread(priv, MII_MSR); } while ((phyreg & MII_MSR_LINKSTATUS) == 0); - nlldbg("Link established\n"); + nllerr("Link established\n"); /* Reset the receive FIFO */ @@ -1258,7 +1258,7 @@ static int tiva_ifdown(struct net_driver_s *dev) irqstate_t flags; uint32_t regval; - nlldbg("Taking down: %d.%d.%d.%d\n", + nllerr("Taking down: %d.%d.%d.%d\n", dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff, (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24); diff --git a/arch/arm/src/tiva/tiva_adclow.c b/arch/arm/src/tiva/tiva_adclow.c index 6b9273dc68..9e4ecd59b0 100644 --- a/arch/arm/src/tiva/tiva_adclow.c +++ b/arch/arm/src/tiva/tiva_adclow.c @@ -686,7 +686,7 @@ static void tiva_adc_read(void *arg) * and should cause a full system stop. */ - alldbg("PANIC!!! Invalid ADC device number given %d\n", sse->adc); + allerr("PANIC!!! Invalid ADC device number given %d\n", sse->adc); PANIC(); return; } diff --git a/arch/arm/src/tiva/tiva_dumpgpio.c b/arch/arm/src/tiva/tiva_dumpgpio.c index c40c432920..ba58e92297 100644 --- a/arch/arm/src/tiva/tiva_dumpgpio.c +++ b/arch/arm/src/tiva/tiva_dumpgpio.c @@ -163,13 +163,13 @@ int tiva_dumpgpio(uint32_t pinset, const char *msg) enabled = ((rcgc2 & SYSCON_RCGC2_GPIO(port)) != 0); #endif - lldbg("GPIO%c pinset: %08x base: %08x -- %s\n", + llerr("GPIO%c pinset: %08x base: %08x -- %s\n", tiva_gpioport(port), pinset, base, msg); #ifdef TIVA_SYSCON_RCGCGPIO - lldbg("RCGCGPIO: %08x (%s)\n", + llerr("RCGCGPIO: %08x (%s)\n", rcgcgpio, enabled ? "enabled" : "disabled"); #else - lldbg(" RCGC2: %08x (%s)\n", + llerr(" RCGC2: %08x (%s)\n", rcgc2, enabled ? "enabled" : "disabled"); #endif @@ -177,13 +177,13 @@ int tiva_dumpgpio(uint32_t pinset, const char *msg) if (enabled) { - lldbg(" AFSEL: %02x DEN: %02x DIR: %02x DATA: %02x\n", + llerr(" AFSEL: %02x DEN: %02x DIR: %02x DATA: %02x\n", getreg32(base + TIVA_GPIO_AFSEL_OFFSET), getreg32(base + TIVA_GPIO_DEN_OFFSET), getreg32(base + TIVA_GPIO_DIR_OFFSET), getreg32(base + TIVA_GPIO_DATA_OFFSET + 0x3fc)); - lldbg(" IS: %02x IBE: %02x IEV: %02x IM: %02x RIS: %08x MIS: %08x\n", + llerr(" IS: %02x IBE: %02x IEV: %02x IM: %02x RIS: %08x MIS: %08x\n", getreg32(base + TIVA_GPIO_IEV_OFFSET), getreg32(base + TIVA_GPIO_IM_OFFSET), getreg32(base + TIVA_GPIO_RIS_OFFSET), getreg32(base + TIVA_GPIO_MIS_OFFSET)); - lldbg(" 2MA: %02x 4MA: %02x 8MA: %02x ODR: %02x PUR %02x PDR: %02x SLR: %02x\n", + llerr(" 2MA: %02x 4MA: %02x 8MA: %02x ODR: %02x PUR %02x PDR: %02x SLR: %02x\n", getreg32(base + TIVA_GPIO_DR2R_OFFSET), getreg32(base + TIVA_GPIO_DR4R_OFFSET), getreg32(base + TIVA_GPIO_DR8R_OFFSET), getreg32(base + TIVA_GPIO_ODR_OFFSET), getreg32(base + TIVA_GPIO_PUR_OFFSET), getreg32(base + TIVA_GPIO_PDR_OFFSET), diff --git a/arch/arm/src/tiva/tiva_gpio.h b/arch/arm/src/tiva/tiva_gpio.h index 86fda2d4f2..2d8f12e2c3 100644 --- a/arch/arm/src/tiva/tiva_gpio.h +++ b/arch/arm/src/tiva/tiva_gpio.h @@ -327,12 +327,12 @@ #ifdef CONFIG_DEBUG_GPIO # define gpiodbg(format, ...) dbg(format, ##__VA_ARGS__) -# define gpiolldbg(format, ...) lldbg(format, ##__VA_ARGS__) +# define gpiollerr(format, ...) llerr(format, ##__VA_ARGS__) # define gpioinfo(format, ...) info(format, ##__VA_ARGS__) # define gpiollinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define gpiodbg(x...) -# define gpiolldbg(x...) +# define gpiollerr(x...) # define gpioinfo(x...) # define gpiollinfo(x...) #endif diff --git a/arch/arm/src/tiva/tiva_i2c.c b/arch/arm/src/tiva/tiva_i2c.c index 2977263607..0c83dc1b15 100644 --- a/arch/arm/src/tiva/tiva_i2c.c +++ b/arch/arm/src/tiva/tiva_i2c.c @@ -609,7 +609,7 @@ static bool tiva_i2c_checkreg(struct tiva_i2c_priv_s *priv, bool wr, { /* Yes... show how many times we did it */ - lldbg("...[Repeats %d times]...\n", priv->ntimes); + llerr("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -642,7 +642,7 @@ static uint32_t tiva_i2c_getreg(struct tiva_i2c_priv_s *priv, unsigned int offse if (tiva_i2c_checkreg(priv, false, regval, regaddr)) { - lldbg("%08x->%08x\n", regaddr, regval); + llerr("%08x->%08x\n", regaddr, regval); } return regval; @@ -671,7 +671,7 @@ static void tiva_i2c_putreg(struct tiva_i2c_priv_s *priv, unsigned int offset, if (tiva_i2c_checkreg(priv, true, regval, regaddr)) { - lldbg("%08x<-%08x\n", regaddr, regval); + llerr("%08x<-%08x\n", regaddr, regval); } putreg32(regval, regaddr); diff --git a/arch/arm/src/tiva/tiva_irq.c b/arch/arm/src/tiva/tiva_irq.c index b934efdf05..121d93bdfb 100644 --- a/arch/arm/src/tiva/tiva_irq.c +++ b/arch/arm/src/tiva/tiva_irq.c @@ -113,24 +113,24 @@ static void tiva_dumpnvic(const char *msg, int irq) irqstate_t flags; flags = enter_critical_section(); - lldbg("NVIC (%s, irq=%d):\n", msg, irq); - lldbg(" INTCTRL: %08x VECTAB: %08x\n", + llerr("NVIC (%s, irq=%d):\n", msg, irq); + llerr(" INTCTRL: %08x VECTAB: %08x\n", getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB)); #if 0 - lldbg(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n", + llerr(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n", getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA), getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE)); #endif #if NR_VECTORS < 64 - lldbg(" IRQ ENABLE: %08x %08x\n", + llerr(" IRQ ENABLE: %08x %08x\n", getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE)); #elif NR_VECTORS < 96 - lldbg(" IRQ ENABLE: %08x %08x %08x\n", + llerr(" IRQ ENABLE: %08x %08x %08x\n", getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE), getreg32(NVIC_IRQ64_95_ENABLE)); #elif NR_VECTORS < 128 - lldbg(" IRQ ENABLE: %08x %08x %08x %08x\n", + llerr(" IRQ ENABLE: %08x %08x %08x %08x\n", getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE), getreg32(NVIC_IRQ64_95_ENABLE), getreg32(NVIC_IRQ96_127_ENABLE)); #endif @@ -138,40 +138,40 @@ static void tiva_dumpnvic(const char *msg, int irq) # warning Missing output #endif - lldbg(" SYSH_PRIO: %08x %08x %08x\n", + llerr(" SYSH_PRIO: %08x %08x %08x\n", getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY), getreg32(NVIC_SYSH12_15_PRIORITY)); - lldbg(" IRQ PRIO: %08x %08x %08x %08x\n", + llerr(" IRQ PRIO: %08x %08x %08x %08x\n", getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY), getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY)); - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY), getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY)); - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY), getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY)); #if NR_VECTORS > 47 - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ48_51_PRIORITY), getreg32(NVIC_IRQ52_55_PRIORITY), getreg32(NVIC_IRQ56_59_PRIORITY), getreg32(NVIC_IRQ60_63_PRIORITY)); #endif #if NR_VECTORS > 63 - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ64_67_PRIORITY), getreg32(NVIC_IRQ68_71_PRIORITY), getreg32(NVIC_IRQ72_75_PRIORITY), getreg32(NVIC_IRQ76_79_PRIORITY)); #endif #if NR_VECTORS > 79 - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ80_83_PRIORITY), getreg32(NVIC_IRQ84_87_PRIORITY), getreg32(NVIC_IRQ88_91_PRIORITY), getreg32(NVIC_IRQ92_95_PRIORITY)); #endif #if NR_VECTORS > 95 - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ96_99_PRIORITY), getreg32(NVIC_IRQ100_103_PRIORITY), getreg32(NVIC_IRQ104_107_PRIORITY), getreg32(NVIC_IRQ108_111_PRIORITY)); #endif #if NR_VECTORS > 111 - lldbg(" %08x %08x %08x %08x\n", + llerr(" %08x %08x %08x %08x\n", getreg32(NVIC_IRQ112_115_PRIORITY), getreg32(NVIC_IRQ116_119_PRIORITY), getreg32(NVIC_IRQ120_123_PRIORITY), getreg32(NVIC_IRQ124_127_PRIORITY)); #endif diff --git a/arch/arm/src/tiva/tiva_ssi.c b/arch/arm/src/tiva/tiva_ssi.c index a70b06198c..a49ed5b023 100644 --- a/arch/arm/src/tiva/tiva_ssi.c +++ b/arch/arm/src/tiva/tiva_ssi.c @@ -73,7 +73,7 @@ #undef SSI_DEBUG /* Define to enable debug */ #ifdef SSI_DEBUG -# define ssidbg lldbg +# define ssidbg llerr # define ssiinfo llinfo #else # define ssidbg(x...) diff --git a/arch/arm/src/tiva/tiva_timer.h b/arch/arm/src/tiva/tiva_timer.h index 6ae90d8292..3b8135247b 100644 --- a/arch/arm/src/tiva/tiva_timer.h +++ b/arch/arm/src/tiva/tiva_timer.h @@ -129,12 +129,12 @@ /* Debug ********************************************************************/ /* Non-standard debug that may be enabled just for testing the timer - * driver. NOTE: that only lldbg types are used so that the output is + * driver. NOTE: that only llerr types are used so that the output is * immediately available. */ #ifdef CONFIG_DEBUG_TIMER -# define timdbg lldbg +# define timdbg llerr # define timinfo llinfo #else # define timdbg(x...) diff --git a/arch/arm/src/tiva/tiva_timerlib.c b/arch/arm/src/tiva/tiva_timerlib.c index b71fc1f35b..8f91e391d9 100644 --- a/arch/arm/src/tiva/tiva_timerlib.c +++ b/arch/arm/src/tiva/tiva_timerlib.c @@ -393,7 +393,7 @@ static bool tiva_timer_checkreg(struct tiva_gptmstate_s *priv, bool wr, { /* Yes... show how many times we did it */ - lldbg("...[Repeats %d times]...\n", priv->ntimes); + llerr("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -426,7 +426,7 @@ static uint32_t tiva_getreg(struct tiva_gptmstate_s *priv, unsigned int offset) #ifdef CONFIG_TIVA_TIMER_REGDEBUG if (tiva_timer_checkreg(priv, false, regval, regaddr)) { - lldbg("%08x->%08x\n", regaddr, regval); + llerr("%08x->%08x\n", regaddr, regval); } #endif @@ -449,7 +449,7 @@ static void tiva_putreg(struct tiva_gptmstate_s *priv, unsigned int offset, #ifdef CONFIG_TIVA_TIMER_REGDEBUG if (tiva_timer_checkreg(priv, true, regval, regaddr)) { - lldbg("%08x<-%08x\n", regaddr, regval); + llerr("%08x<-%08x\n", regaddr, regval); } #endif @@ -2378,14 +2378,14 @@ void tiva_timer32_setinterval(TIMER_HANDLE handle, uint32_t interval) #ifdef CONFIG_TIVA_TIMER_REGDEBUG /* Generate low-level debug output outside of the critical section */ - lldbg("%08x<-%08x\n", loadr, interval); + llerr("%08x<-%08x\n", loadr, interval); if (toints) { # ifdef CONFIG_ARCH_CHIP_TM4C129 - lldbg("%08x->%08x\n", moder, modev1); - lldbg("%08x<-%08x\n", moder, modev2); + llerr("%08x->%08x\n", moder, modev1); + llerr("%08x<-%08x\n", moder, modev2); # endif /* CONFIG_ARCH_CHIP_TM4C129 */ - lldbg("%08x<-%08x\n", imrr, priv->imr); + llerr("%08x<-%08x\n", imrr, priv->imr); } #endif } @@ -2525,14 +2525,14 @@ void tiva_timer16_setinterval(TIMER_HANDLE handle, uint16_t interval, int tmndx) #ifdef CONFIG_TIVA_TIMER_REGDEBUG /* Generate low-level debug output outside of the critical section */ - lldbg("%08x<-%08x\n", loadr, interval); + llerr("%08x<-%08x\n", loadr, interval); if (toints) { #ifdef CONFIG_ARCH_CHIP_TM4C129 - lldbg("%08x->%08x\n", moder, modev1); - lldbg("%08x<-%08x\n", moder, modev2); + llerr("%08x->%08x\n", moder, modev1); + llerr("%08x<-%08x\n", moder, modev2); #endif - lldbg("%08x<-%08x\n", imrr, priv->imr); + llerr("%08x<-%08x\n", imrr, priv->imr); } #endif } @@ -2730,13 +2730,13 @@ void tiva_rtc_setalarm(TIMER_HANDLE handle, uint32_t delay) #ifdef CONFIG_TIVA_TIMER_REGDEBUG /* Generate low-level debug output outside of the critical section */ - lldbg("%08x->%08x\n", base + TIVA_TIMER_TAR_OFFSET, counter); - lldbg("%08x<-%08x\n", base + TIVA_TIMER_TAMATCHR_OFFSET, match); + llerr("%08x->%08x\n", base + TIVA_TIMER_TAR_OFFSET, counter); + llerr("%08x<-%08x\n", base + TIVA_TIMER_TAMATCHR_OFFSET, match); #ifdef CONFIG_ARCH_CHIP_TM4C129 - lldbg("%08x->%08x\n", base + TIVA_TIMER_ADCEV_OFFSET, adcev); - lldbg("%08x<-%08x\n", base + TIVA_TIMER_ADCEV_OFFSET, adcev | adcbits); + llerr("%08x->%08x\n", base + TIVA_TIMER_ADCEV_OFFSET, adcev); + llerr("%08x<-%08x\n", base + TIVA_TIMER_ADCEV_OFFSET, adcev | adcbits); #endif /* CONFIG_ARCH_CHIP_TM4C129 */ - lldbg("%08x<-%08x\n", base + TIVA_TIMER_IMR_OFFSET, priv->imr); + llerr("%08x<-%08x\n", base + TIVA_TIMER_IMR_OFFSET, priv->imr); #endif } #endif @@ -2834,13 +2834,13 @@ void tiva_timer32_relmatch(TIMER_HANDLE handle, uint32_t relmatch) #ifdef CONFIG_TIVA_TIMER_REGDEBUG /* Generate low-level debug output outside of the critical section */ - lldbg("%08x->%08x\n", base + TIVA_TIMER_TAR_OFFSET, counter); - lldbg("%08x<-%08x\n", base + TIVA_TIMER_TAMATCHR_OFFSET, match); + llerr("%08x->%08x\n", base + TIVA_TIMER_TAR_OFFSET, counter); + llerr("%08x<-%08x\n", base + TIVA_TIMER_TAMATCHR_OFFSET, match); #ifdef CONFIG_ARCH_CHIP_TM4C129 - lldbg("%08x->%08x\n", base + TIVA_TIMER_ADCEV_OFFSET, adcev); - lldbg("%08x<-%08x\n", base + TIVA_TIMER_ADCEV_OFFSET, adcev | adcbits); + llerr("%08x->%08x\n", base + TIVA_TIMER_ADCEV_OFFSET, adcev); + llerr("%08x<-%08x\n", base + TIVA_TIMER_ADCEV_OFFSET, adcev | adcbits); #endif /* CONFIG_ARCH_CHIP_TM4C129 */ - lldbg("%08x<-%08x\n", base + TIVA_TIMER_IMR_OFFSET, priv->imr); + llerr("%08x<-%08x\n", base + TIVA_TIMER_IMR_OFFSET, priv->imr); #endif /* CONFIG_TIVA_TIMER_REGDEBUG */ } @@ -3036,15 +3036,15 @@ void tiva_timer16_relmatch(TIMER_HANDLE handle, uint32_t relmatch, int tmndx) #ifdef CONFIG_TIVA_TIMER_REGDEBUG /* Generate low-level debug output outside of the critical section */ - lldbg("%08x->%08x\n", timerr, timerv); - lldbg("%08x->%08x\n", prescr, prescv); - lldbg("%08x<-%08x\n", matchr, matchv); - lldbg("%08x<-%08x\n", prematchr, prematchv); + llerr("%08x->%08x\n", timerr, timerv); + llerr("%08x->%08x\n", prescr, prescv); + llerr("%08x<-%08x\n", matchr, matchv); + llerr("%08x<-%08x\n", prematchr, prematchv); #ifdef CONFIG_ARCH_CHIP_TM4C129 - lldbg("%08x->%08x\n", adcevr, adcevv); - lldbg("%08x<-%08x\n", adcevr, adcevv | adcbits); + llerr("%08x->%08x\n", adcevr, adcevv); + llerr("%08x<-%08x\n", adcevr, adcevv | adcbits); #endif - lldbg("%08x<-%08x\n", imr, priv->imr); + llerr("%08x<-%08x\n", imr, priv->imr); #endif } #endif diff --git a/arch/arm/src/tiva/tm4c_ethernet.c b/arch/arm/src/tiva/tm4c_ethernet.c index 395949471f..dfff51354b 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) { - lldbg("...\n"); + llerr("...\n"); } return val; @@ -825,7 +825,7 @@ static uint32_t tiva_getreg(uint32_t addr) { /* Yes.. then show how many times the value repeated */ - lldbg("[repeats %d more times]\n", count-3); + llerr("[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 */ - lldbg("%08x->%08x\n", addr, val); + llerr("%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 */ - lldbg("%08x<-%08x\n", addr, val); + llerr("%08x<-%08x\n", addr, val); /* Write the value */ @@ -1544,7 +1544,7 @@ static int tiva_recvframe(FAR struct tiva_ethmac_s *priv) if (!tiva_isfreebuffer(priv)) { - nlldbg("No free buffers\n"); + nllerr("No free buffers\n"); return -ENOMEM; } @@ -1651,7 +1651,7 @@ static int tiva_recvframe(FAR struct tiva_ethmac_s *priv) * scanning logic, and continue scanning with the next frame. */ - nlldbg("DROPPED: RX descriptor errors: %08x\n", rxdesc->rdes0); + nllerr("DROPPED: RX descriptor errors: %08x\n", rxdesc->rdes0); tiva_freesegment(priv, rxcurr, priv->segments); } } @@ -1712,7 +1712,7 @@ static void tiva_receive(FAR struct tiva_ethmac_s *priv) if (dev->d_len > CONFIG_NET_ETH_MTU) { - nlldbg("DROPPED: Too big: %d\n", dev->d_len); + nllerr("DROPPED: Too big: %d\n", dev->d_len); } else @@ -1815,7 +1815,7 @@ static void tiva_receive(FAR struct tiva_ethmac_s *priv) else #endif { - nlldbg("DROPPED: Unknown type: %04x\n", BUF->type); + nllerr("DROPPED: Unknown type: %04x\n", BUF->type); } /* We are finished with the RX buffer. NOTE: If the buffer is @@ -2067,7 +2067,7 @@ static inline void tiva_interrupt_process(FAR struct tiva_ethmac_s *priv) { /* Just let the user know what happened */ - nlldbg("Abnormal event(s): %08x\n", dmaris); + nllerr("Abnormal event(s): %08x\n", dmaris); /* Clear all pending abnormal events */ @@ -2287,7 +2287,7 @@ static void tiva_txtimeout_expiry(int argc, uint32_t arg, ...) { FAR struct tiva_ethmac_s *priv = (FAR struct tiva_ethmac_s *)arg; - nlldbg("Timeout!\n"); + nllerr("Timeout!\n"); #ifdef CONFIG_NET_NOINTS /* Disable further Ethernet interrupts. This will prevent some race diff --git a/arch/arm/src/tms570/tms570_esm.c b/arch/arm/src/tms570/tms570_esm.c index a3259e4050..58b761335d 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. */ - lldbg("ESM Interrupt. PC: %08x\n", CURRENT_REGS[REG_PC]); + llerr("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 159ee05e4f..2164207b12 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; - lldbg("GIO%c pinset: %08x base: %08x -- %s\n", + llerr("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 */ - lldbg(" GCR0: %08x INTDET: %08x POL: %08x ENA: %08x\n", + llerr(" 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)); - lldbg(" LVL: %08x FLG: %08x EMU1: %08x EMU2: %08x\n", + llerr(" 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 */ - lldbg(" DIR: %08x DIN: %08x DOUT: %08x PDR: %08x\n", + llerr(" 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)); - lldbg(" PULDIS: %08x PSL: %08x\n", + llerr(" 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 231af1026d..57ab58aec4 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 { - lldbg("No handler: pin=%d ifr=%08x irqset=%08x", + llerr("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; - lldbg("IRQ on unconfigured pin: pin=%d ifr=%08x irqset=%08x", + llerr("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 6df9cdf4a6..5e72f9a37e 100644 --- a/arch/avr/src/at32uc3/at32uc3_irq.c +++ b/arch/avr/src/at32uc3/at32uc3_irq.c @@ -177,7 +177,7 @@ static int up_getgrp(unsigned int irq) static int avr32_xcptn(int irq, FAR void *context) { (void)up_irq_save(); - lldbg("PANIC!!! Exception IRQ: %d\n", irq); + llerr("PANIC!!! Exception IRQ: %d\n", irq); PANIC(); return 0; } @@ -321,11 +321,11 @@ unsigned int avr32_intirqno(unsigned int level) mask <<= 1; } - lldbg("Spurious interrupt: group=%d IRR=%08x\n", group, irr); + llerr("Spurious interrupt: group=%d IRR=%08x\n", group, irr); return -ENODEV; } - lldbg("Bad group: %d\n", group); + llerr("Bad group: %d\n", group); return AVR32_IRQ_BADVECTOR; } diff --git a/arch/avr/src/avr/up_dumpstate.c b/arch/avr/src/avr/up_dumpstate.c index d529b33509..2a33bff5a5 100644 --- a/arch/avr/src/avr/up_dumpstate.c +++ b/arch/avr/src/avr/up_dumpstate.c @@ -97,7 +97,7 @@ static void up_stackdump(uint16_t sp, uint16_t stack_base) for (stack = sp & ~3; stack < stack_base; stack += 12) { uint8_t *ptr = (uint8_t *)stack; - lldbg("%04x: %02x %02x %02x %02x %02x %02x %02x %02x" + llerr("%04x: %02x %02x %02x %02x %02x %02x %02x %02x" " %02x %02x %02x %02x\n", stack, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7], @@ -115,28 +115,28 @@ static inline void up_registerdump(void) if (g_current_regs) { - lldbg("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n", + llerr("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n", 0, g_current_regs[REG_R0], g_current_regs[REG_R1], g_current_regs[REG_R2], g_current_regs[REG_R3], g_current_regs[REG_R4], g_current_regs[REG_R5], g_current_regs[REG_R6], g_current_regs[REG_R7]); - lldbg("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n", + llerr("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n", 8, g_current_regs[REG_R8], g_current_regs[REG_R9], g_current_regs[REG_R10], g_current_regs[REG_R11], g_current_regs[REG_R12], g_current_regs[REG_R13], g_current_regs[REG_R14], g_current_regs[REG_R15]); - lldbg("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n", + llerr("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n", 16, g_current_regs[REG_R16], g_current_regs[REG_R17], g_current_regs[REG_R18], g_current_regs[REG_R19], g_current_regs[REG_R20], g_current_regs[REG_R21], g_current_regs[REG_R22], g_current_regs[REG_R23]); - lldbg("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n", + llerr("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n", 24, g_current_regs[REG_R24], g_current_regs[REG_R25], g_current_regs[REG_R26], g_current_regs[REG_R27], @@ -144,12 +144,12 @@ static inline void up_registerdump(void) g_current_regs[REG_R30], g_current_regs[REG_R31]); #if !defined(REG_PC2) - lldbg("PC: %02x%02x SP: %02x%02x SREG: %02x\n", + llerr("PC: %02x%02x SP: %02x%02x SREG: %02x\n", g_current_regs[REG_PC0], g_current_regs[REG_PC1], g_current_regs[REG_SPH], g_current_regs[REG_SPL], g_current_regs[REG_SREG]); #else - lldbg("PC: %02x%02x%02x SP: %02x%02x SREG: %02x\n", + llerr("PC: %02x%02x%02x SP: %02x%02x SREG: %02x\n", g_current_regs[REG_PC0], g_current_regs[REG_PC1], g_current_regs[REG_PC2], g_current_regs[REG_SPH], g_current_regs[REG_SPL], g_current_regs[REG_SREG]); @@ -197,12 +197,12 @@ void up_dumpstate(void) /* Show interrupt stack info */ - lldbg("sp: %04x\n", sp); - lldbg("IRQ stack:\n"); - lldbg(" base: %04x\n", istackbase); - lldbg(" size: %04x\n", istacksize); + llerr("sp: %04x\n", sp); + llerr("IRQ stack:\n"); + llerr(" base: %04x\n", istackbase); + llerr(" size: %04x\n", istacksize); #ifdef CONFIG_STACK_COLORATION - lldbg(" used: %08x\n", up_check_intstack()); + llerr(" used: %08x\n", up_check_intstack()); #endif /* Does the current stack pointer lie within the interrupt @@ -224,14 +224,14 @@ void up_dumpstate(void) if (g_current_regs) { sp = g_current_regs[REG_R13]; - lldbg("sp: %04x\n", sp); + llerr("sp: %04x\n", sp); } - lldbg("User stack:\n"); - lldbg(" base: %04x\n", ustackbase); - lldbg(" size: %04x\n", ustacksize); + llerr("User stack:\n"); + llerr(" base: %04x\n", ustackbase); + llerr(" size: %04x\n", ustacksize); #ifdef CONFIG_STACK_COLORATION - lldbg(" used: %08x\n", up_check_tcbstack(rtcb)); + llerr(" used: %08x\n", up_check_tcbstack(rtcb)); #endif /* Dump the user stack if the stack pointer lies within the allocated user @@ -243,11 +243,11 @@ void up_dumpstate(void) up_stackdump(sp, ustackbase); } #else - lldbg("sp: %04x\n", sp); - lldbg("stack base: %04x\n", ustackbase); - lldbg("stack size: %04x\n", ustacksize); + llerr("sp: %04x\n", sp); + llerr("stack base: %04x\n", ustackbase); + llerr("stack size: %04x\n", ustacksize); #ifdef CONFIG_STACK_COLORATION - lldbg("stack used: %08x\n", up_check_tcbstack(rtcb)); + llerr("stack used: %08x\n", up_check_tcbstack(rtcb)); #endif /* Dump the user stack if the stack pointer lies within the allocated user @@ -256,7 +256,7 @@ void up_dumpstate(void) if (sp > ustackbase || sp <= ustackbase - ustacksize) { - lldbg("ERROR: Stack pointer is not within allocated stack\n"); + llerr("ERROR: Stack pointer is not within allocated stack\n"); } else { diff --git a/arch/avr/src/avr/up_releasepending.c b/arch/avr/src/avr/up_releasepending.c index 80789fee51..5bd675f10b 100644 --- a/arch/avr/src/avr/up_releasepending.c +++ b/arch/avr/src/avr/up_releasepending.c @@ -66,7 +66,7 @@ void up_release_pending(void) { struct tcb_s *rtcb = this_task(); - slldbg("From TCB=%p\n", rtcb); + sllerr("From TCB=%p\n", rtcb); /* Merge the g_pendingtasks list into the ready-to-run task list */ diff --git a/arch/avr/src/avr/up_reprioritizertr.c b/arch/avr/src/avr/up_reprioritizertr.c index 28978a19da..e2e8cb45c2 100644 --- a/arch/avr/src/avr/up_reprioritizertr.c +++ b/arch/avr/src/avr/up_reprioritizertr.c @@ -94,7 +94,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) struct tcb_s *rtcb = this_task(); bool switch_needed; - slldbg("TCB=%p PRI=%d\n", tcb, priority); + sllerr("TCB=%p PRI=%d\n", tcb, priority); /* Remove the tcb task from the ready-to-run list. * sched_removereadytorun will return true if we just diff --git a/arch/avr/src/avr/up_spi.c b/arch/avr/src/avr/up_spi.c index f04fe9844c..d3c0c56eed 100644 --- a/arch/avr/src/avr/up_spi.c +++ b/arch/avr/src/avr/up_spi.c @@ -72,9 +72,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/arch/avr/src/avr32/up_dumpstate.c b/arch/avr/src/avr32/up_dumpstate.c index a57893c831..8cdcdb91b0 100644 --- a/arch/avr/src/avr32/up_dumpstate.c +++ b/arch/avr/src/avr32/up_dumpstate.c @@ -93,7 +93,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; - lldbg("%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]); } @@ -109,21 +109,21 @@ static inline void up_registerdump(void) if (g_current_regs) { - lldbg("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", + llerr("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", 0, g_current_regs[REG_R0], g_current_regs[REG_R1], g_current_regs[REG_R2], g_current_regs[REG_R3], g_current_regs[REG_R4], g_current_regs[REG_R5], g_current_regs[REG_R6], g_current_regs[REG_R7]); - lldbg("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", + llerr("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", 8, g_current_regs[REG_R8], g_current_regs[REG_R9], g_current_regs[REG_R10], g_current_regs[REG_R11], g_current_regs[REG_R12], g_current_regs[REG_R13], g_current_regs[REG_R14], g_current_regs[REG_R15]); - lldbg("SR: %08x\n", g_current_regs[REG_SR]); + llerr("SR: %08x\n", g_current_regs[REG_SR]); } } @@ -163,12 +163,12 @@ void up_dumpstate(void) /* Show interrupt stack info */ - lldbg("sp: %08x\n", sp); - lldbg("IRQ stack:\n"); - lldbg(" base: %08x\n", istackbase); - lldbg(" size: %08x\n", istacksize); + llerr("sp: %08x\n", sp); + llerr("IRQ stack:\n"); + llerr(" base: %08x\n", istackbase); + llerr(" size: %08x\n", istacksize); #ifdef CONFIG_STACK_COLORATION - lldbg(" used: %08x\n", up_check_intstack()); + llerr(" used: %08x\n", up_check_intstack()); #endif /* Does the current stack pointer lie within the interrupt @@ -190,14 +190,14 @@ void up_dumpstate(void) if (g_current_regs) { sp = g_current_regs[REG_R13]; - lldbg("sp: %08x\n", sp); + llerr("sp: %08x\n", sp); } - lldbg("User stack:\n"); - lldbg(" base: %08x\n", ustackbase); - lldbg(" size: %08x\n", ustacksize); + llerr("User stack:\n"); + llerr(" base: %08x\n", ustackbase); + llerr(" size: %08x\n", ustacksize); #ifdef CONFIG_STACK_COLORATION - lldbg(" used: %08x\n", up_check_tcbstack(rtcb)); + llerr(" used: %08x\n", up_check_tcbstack(rtcb)); #endif /* Dump the user stack if the stack pointer lies within the allocated user @@ -209,11 +209,11 @@ void up_dumpstate(void) up_stackdump(sp, ustackbase); } #else - lldbg("sp: %08x\n", sp); - lldbg("stack base: %08x\n", ustackbase); - lldbg("stack size: %08x\n", ustacksize); + llerr("sp: %08x\n", sp); + llerr("stack base: %08x\n", ustackbase); + llerr("stack size: %08x\n", ustacksize); #ifdef CONFIG_STACK_COLORATION - lldbg("stack used: %08x\n", up_check_tcbstack(rtcb)); + llerr("stack used: %08x\n", up_check_tcbstack(rtcb)); #endif /* Dump the user stack if the stack pointer lies within the allocated user @@ -222,7 +222,7 @@ void up_dumpstate(void) if (sp > ustackbase || sp <= ustackbase - ustacksize) { - lldbg("ERROR: Stack pointer is not within allocated stack\n"); + llerr("ERROR: Stack pointer is not within allocated stack\n"); } else { diff --git a/arch/avr/src/avr32/up_releasepending.c b/arch/avr/src/avr32/up_releasepending.c index aaae06b59e..9640d7d844 100644 --- a/arch/avr/src/avr32/up_releasepending.c +++ b/arch/avr/src/avr32/up_releasepending.c @@ -67,7 +67,7 @@ void up_release_pending(void) { struct tcb_s *rtcb = this_task(); - slldbg("From TCB=%p\n", rtcb); + sllerr("From TCB=%p\n", rtcb); /* Merge the g_pendingtasks list into the ready-to-run task list */ diff --git a/arch/avr/src/avr32/up_reprioritizertr.c b/arch/avr/src/avr32/up_reprioritizertr.c index 88732c2b06..6a39f52646 100644 --- a/arch/avr/src/avr32/up_reprioritizertr.c +++ b/arch/avr/src/avr32/up_reprioritizertr.c @@ -95,7 +95,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) struct tcb_s *rtcb = this_task(); bool switch_needed; - slldbg("TCB=%p PRI=%d\n", tcb, priority); + sllerr("TCB=%p PRI=%d\n", tcb, priority); /* Remove the tcb task from the ready-to-run list. * sched_removereadytorun will return true if we just diff --git a/arch/avr/src/common/up_assert.c b/arch/avr/src/common/up_assert.c index 44be077339..664417fe03 100644 --- a/arch/avr/src/common/up_assert.c +++ b/arch/avr/src/common/up_assert.c @@ -79,7 +79,7 @@ * code. We are going to print the task name if: * * CONFIG_TASK_NAME_SIZE > 0 && <-- The task has a name - * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (lldbg used) + * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (llerr used) * defined(CONFIG_ARCH_STACKDUMP)) <-- Or lowsyslog() is used */ @@ -166,10 +166,10 @@ void up_assert(const uint8_t *filename, int lineno) board_autoled_on(LED_ASSERTION); #ifdef CONFIG_PRINT_TASKNAME - lldbg("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 - lldbg("Assertion failed at file:%s line: %d\n", + llerr("Assertion failed at file:%s line: %d\n", filename, lineno); #endif diff --git a/arch/avr/src/common/up_exit.c b/arch/avr/src/common/up_exit.c index 521aa25945..7002118a7f 100644 --- a/arch/avr/src/common/up_exit.c +++ b/arch/avr/src/common/up_exit.c @@ -138,10 +138,10 @@ void _exit(int status) (void)up_irq_save(); - slldbg("TCB=%p exiting\n", this_task()); + sllerr("TCB=%p exiting\n", this_task()); #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES) - slldbg("Other tasks:\n"); + sllerr("Other tasks:\n"); sched_foreach(_up_dumponexit, NULL); #endif diff --git a/arch/avr/src/common/up_initialize.c b/arch/avr/src/common/up_initialize.c index 9677304647..6171403c03 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; - lldbg("Beginning 100s delay\n"); + llerr("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } - lldbg("End 100s delay\n"); + llerr("End 100s delay\n"); } #else # define up_calibratedelay() diff --git a/arch/hc/src/common/up_exit.c b/arch/hc/src/common/up_exit.c index f20932ba61..47a23f7d9e 100644 --- a/arch/hc/src/common/up_exit.c +++ b/arch/hc/src/common/up_exit.c @@ -146,10 +146,10 @@ void _exit(int status) (void)up_irq_save(); - slldbg("TCB=%p exiting\n", this_task()); + sllerr("TCB=%p exiting\n", this_task()); #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES) - slldbg("Other tasks:\n"); + sllerr("Other tasks:\n"); sched_foreach(_up_dumponexit, NULL); #endif diff --git a/arch/hc/src/common/up_initialize.c b/arch/hc/src/common/up_initialize.c index e6728f0ea8..b7b6b19d77 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; - lldbg("Beginning 100s delay\n"); + llerr("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } - lldbg("End 100s delay\n"); + llerr("End 100s delay\n"); } #else # define up_calibratedelay() diff --git a/arch/hc/src/common/up_releasepending.c b/arch/hc/src/common/up_releasepending.c index d9a209c343..27f7fa868d 100644 --- a/arch/hc/src/common/up_releasepending.c +++ b/arch/hc/src/common/up_releasepending.c @@ -66,7 +66,7 @@ void up_release_pending(void) { struct tcb_s *rtcb = this_task(); - slldbg("From TCB=%p\n", rtcb); + sllerr("From TCB=%p\n", rtcb); /* Merge the g_pendingtasks list into the ready-to-run task list */ diff --git a/arch/hc/src/common/up_reprioritizertr.c b/arch/hc/src/common/up_reprioritizertr.c index efdde66738..6155f4e200 100644 --- a/arch/hc/src/common/up_reprioritizertr.c +++ b/arch/hc/src/common/up_reprioritizertr.c @@ -95,7 +95,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) struct tcb_s *rtcb = this_task(); bool switch_needed; - slldbg("TCB=%p PRI=%d\n", tcb, priority); + sllerr("TCB=%p PRI=%d\n", tcb, priority); /* Remove the tcb task from the ready-to-run list. * sched_removereadytorun will return true if we just diff --git a/arch/hc/src/m9s12/m9s12_assert.c b/arch/hc/src/m9s12/m9s12_assert.c index 0241009fc6..2805650bcf 100644 --- a/arch/hc/src/m9s12/m9s12_assert.c +++ b/arch/hc/src/m9s12/m9s12_assert.c @@ -79,7 +79,7 @@ * code. We are going to print the task name if: * * CONFIG_TASK_NAME_SIZE > 0 && <-- The task has a name - * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (lldbg used) + * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (llerr used) * defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used */ @@ -108,7 +108,7 @@ static void up_stackdump(uint16_t sp, uint16_t stack_base) for (stack = sp; stack < stack_base; stack += 16) { uint8_t *ptr = (uint8_t*)stack; - lldbg("%04x: %02x %02x %02x %02x %02x %02x %02x %02x" + llerr("%04x: %02x %02x %02x %02x %02x %02x %02x %02x" " %02x %02x %02x %02x %02x %02x %02x %02x\n", stack, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7], ptr[8], ptr[9], ptr[10], ptr[11], ptr[12], ptr[13], ptr[14], ptr[15]); @@ -129,11 +129,11 @@ static inline void up_registerdump(void) if (g_current_regs) { - lldbg("A:%02x B:%02x X:%02x%02x Y:%02x%02x PC:%02x%02x CCR:%02x\n", + llerr("A:%02x B:%02x X:%02x%02x Y:%02x%02x PC:%02x%02x CCR:%02x\n", g_current_regs[REG_A], g_current_regs[REG_B], g_current_regs[REG_XH], g_current_regs[REG_XL], g_current_regs[REG_YH], g_current_regs[REG_YL], g_current_regs[REG_PCH], g_current_regs[REG_PCL], g_current_regs[REG_CCR]); - lldbg("SP:%02x%02x FRAME:%02x%02x TMP:%02x%02x Z:%02x%02x XY:%02x\n", + llerr("SP:%02x%02x FRAME:%02x%02x TMP:%02x%02x Z:%02x%02x XY:%02x\n", g_current_regs[REG_SPH], g_current_regs[REG_SPL], g_current_regs[REG_FRAMEH], g_current_regs[REG_FRAMEL], g_current_regs[REG_TMPL], g_current_regs[REG_TMPH], g_current_regs[REG_ZL], @@ -142,16 +142,16 @@ static inline void up_registerdump(void) #if CONFIG_HCS12_MSOFTREGS > 2 # error "Need to save more registers" #elif CONFIG_HCS12_MSOFTREGS == 2 - lldbg("SOFTREGS: %02x%02x :%02x%02x\n", + llerr("SOFTREGS: %02x%02x :%02x%02x\n", g_current_regs[REG_SOFTREG1], g_current_regs[REG_SOFTREG1+1], g_current_regs[REG_SOFTREG2], g_current_regs[REG_SOFTREG2+1]); #elif CONFIG_HCS12_MSOFTREGS == 1 - lldbg("SOFTREGS: %02x%02x\n", g_current_regs[REG_SOFTREG1], + llerr("SOFTREGS: %02x%02x\n", g_current_regs[REG_SOFTREG1], g_current_regs[REG_SOFTREG1+1]); #endif #ifndef CONFIG_HCS12_NONBANKED - lldbg("PPAGE: %02x\n", g_current_regs[REG_PPAGE],); + llerr("PPAGE: %02x\n", g_current_regs[REG_PPAGE],); #endif } } @@ -221,10 +221,10 @@ static void up_dumpstate(void) /* Show interrupt stack info */ - lldbg("sp: %04x\n", sp); - lldbg("IRQ stack:\n"); - lldbg(" base: %04x\n", istackbase); - lldbg(" size: %04x\n", istacksize); + llerr("sp: %04x\n", sp); + llerr("IRQ stack:\n"); + llerr(" base: %04x\n", istackbase); + llerr(" size: %04x\n", istacksize); /* Does the current stack pointer lie within the interrupt * stack? @@ -241,18 +241,18 @@ static void up_dumpstate(void) */ sp = g_intstackbase; - lldbg("sp: %04x\n", sp); + llerr("sp: %04x\n", sp); } /* Show user stack info */ - lldbg("User stack:\n"); - lldbg(" base: %04x\n", ustackbase); - lldbg(" size: %04x\n", ustacksize); + llerr("User stack:\n"); + llerr(" base: %04x\n", ustackbase); + llerr(" size: %04x\n", ustacksize); #else - lldbg("sp: %04x\n", sp); - lldbg("stack base: %04x\n", ustackbase); - lldbg("stack size: %04x\n", ustacksize); + llerr("sp: %04x\n", sp); + llerr("stack base: %04x\n", ustackbase); + llerr("stack size: %04x\n", ustacksize); #endif /* Dump the user stack if the stack pointer lies within the allocated user @@ -262,7 +262,7 @@ static void up_dumpstate(void) if (sp > ustackbase || sp <= ustackbase - ustacksize) { #if !defined(CONFIG_ARCH_INTERRUPTSTACK) || CONFIG_ARCH_INTERRUPTSTACK < 4 - lldbg("ERROR: Stack pointer is not within allocated stack\n"); + llerr("ERROR: Stack pointer is not within allocated stack\n"); #endif } else @@ -329,10 +329,10 @@ void up_assert(const uint8_t *filename, int lineno) board_autoled_on(LED_ASSERTION); #ifdef CONFIG_PRINT_TASKNAME - lldbg("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 - lldbg("Assertion failed at file:%s line: %d\n", + llerr("Assertion failed at file:%s line: %d\n", filename, lineno); #endif diff --git a/arch/hc/src/m9s12/m9s12_dumpgpio.c b/arch/hc/src/m9s12/m9s12_dumpgpio.c index db4261256b..42313c0e3e 100644 --- a/arch/hc/src/m9s12/m9s12_dumpgpio.c +++ b/arch/hc/src/m9s12/m9s12_dumpgpio.c @@ -166,13 +166,13 @@ static inline void hcs12_pimdump(uint8_t portndx) if (portndx >= HCS12_PIM_NPORTS) { - lldbg(" Illegal PIM port index: %d\n", portndx); + llerr(" Illegal PIM port index: %d\n", portndx); return; } ptr = &piminfo[portndx]; - lldbg(" PIM Port%c:\n", ptr->name); - lldbg(" IO:%02x INP:%02x DDR:%02x RDR:%02x\n", + llerr(" PIM Port%c:\n", ptr->name); + llerr(" IO:%02x INP:%02x DDR:%02x RDR:%02x\n", getreg8(ptr->base+HCS12_PIM_IO_OFFSET), getreg8(ptr->base+HCS12_PIM_INPUT_OFFSET), getreg8(ptr->base+HCS12_PIM_DDR_OFFSET), @@ -181,20 +181,20 @@ static inline void hcs12_pimdump(uint8_t portndx) switch (ptr->form) { case PIMPORT_FORM1: - lldbg(" PER:%02x PS:%02x\n", + llerr(" PER:%02x PS:%02x\n", getreg8(ptr->base+HCS12_PIM_PER_OFFSET), getreg8(ptr->base+HCS12_PIM_PS_OFFSET)); break; case PIMPORT_FORM2: - lldbg(" PER:%02x PS:%02x WOM:%02x\n", + llerr(" PER:%02x PS:%02x WOM:%02x\n", getreg8(ptr->base+HCS12_PIM_PER_OFFSET), getreg8(ptr->base+HCS12_PIM_PS_OFFSET), getreg8(ptr->base+HCS12_PIM_WOM_OFFSET)); break; case PIMPORT_FORM3: - lldbg(" PER:%02x PS:%02x IE:%02x IF:%02x\n", + llerr(" PER:%02x PS:%02x IE:%02x IF:%02x\n", getreg8(ptr->base+HCS12_PIM_PER_OFFSET), getreg8(ptr->base+HCS12_PIM_PS_OFFSET), getreg8(ptr->base+HCS12_PIM_IE_OFFSET), @@ -220,28 +220,28 @@ static inline void hcs12_mebidump(uint8_t portndx) if (portndx >= HCS12_MEBI_NPORTS) { - lldbg(" Illegal MEBI port index: %d\n", portndx); + llerr(" Illegal MEBI port index: %d\n", portndx); return; } ptr = &mebiinfo[portndx]; - lldbg(" MEBI Port%c:\n", ptr->name); + llerr(" MEBI Port%c:\n", ptr->name); switch (ptr->form) { case MEBIPORT_AB: - lldbg(" DATA:%02x DDR:%02x\n", + llerr(" DATA:%02x DDR:%02x\n", getreg8(ptr->data), getreg8(ptr->ddr)); break; case MEBIPORT_E: - lldbg(" DATA:%02x DDR:%02x MODE:%02x PEAR:%02x\n", + llerr(" DATA:%02x DDR:%02x MODE:%02x PEAR:%02x\n", getreg8(ptr->data), getreg8(ptr->ddr), getreg8(HCS12_MEBI_MODE), getreg8(HCS12_MEBI_PEAR)); break; case MEBIPORT_K: - lldbg(" DATA:%02x DDR:%02x MODE:%02x\n", + llerr(" DATA:%02x DDR:%02x MODE:%02x\n", getreg8(ptr->data), getreg8(ptr->ddr), getreg8(HCS12_MEBI_MODE)); break; @@ -268,7 +268,7 @@ int hcs12_dumpgpio(uint16_t pinset, const char *msg) uint8_t portndx = HCS12_PORTNDX(pinset); irqstate_t flags = enter_critical_section(); - lldbg("pinset: %08x -- %s\n", pinset, msg); + llerr("pinset: %08x -- %s\n", pinset, msg); if (HCS12_PIMPORT(pinset)) { diff --git a/arch/mips/src/common/up_exit.c b/arch/mips/src/common/up_exit.c index 5f167488cc..00c23ba782 100644 --- a/arch/mips/src/common/up_exit.c +++ b/arch/mips/src/common/up_exit.c @@ -148,10 +148,10 @@ void _exit(int status) (void)up_irq_save(); - slldbg("TCB=%p exiting\n", this_task()); + sllerr("TCB=%p exiting\n", this_task()); #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES) - slldbg("Other tasks:\n"); + sllerr("Other tasks:\n"); sched_foreach(_up_dumponexit, NULL); #endif diff --git a/arch/mips/src/common/up_initialize.c b/arch/mips/src/common/up_initialize.c index e9ebdbbf98..f87882685b 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; - lldbg("Beginning 100s delay\n"); + llerr("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } - lldbg("End 100s delay\n"); + llerr("End 100s delay\n"); } #else # define up_calibratedelay() diff --git a/arch/mips/src/mips32/up_assert.c b/arch/mips/src/mips32/up_assert.c index c10048a4cf..8742eb468a 100644 --- a/arch/mips/src/mips32/up_assert.c +++ b/arch/mips/src/mips32/up_assert.c @@ -79,7 +79,7 @@ * code. We are going to print the task name if: * * CONFIG_TASK_NAME_SIZE > 0 && <-- The task has a name - * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (lldbg used) + * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (llerr used) * defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used */ @@ -166,10 +166,10 @@ void up_assert(const uint8_t *filename, int lineno) board_autoled_on(LED_ASSERTION); #ifdef CONFIG_PRINT_TASKNAME - lldbg("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 - lldbg("Assertion failed at file:%s line: %d\n", + llerr("Assertion failed at file:%s line: %d\n", filename, lineno); #endif diff --git a/arch/mips/src/mips32/up_dumpstate.c b/arch/mips/src/mips32/up_dumpstate.c index bf507e5e4a..efcf44103d 100644 --- a/arch/mips/src/mips32/up_dumpstate.c +++ b/arch/mips/src/mips32/up_dumpstate.c @@ -101,7 +101,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; - lldbg("%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,27 +117,27 @@ static inline void up_registerdump(void) if (g_current_regs) { - lldbg("MFLO:%08x MFHI:%08x EPC:%08x STATUS:%08x\n", + llerr("MFLO:%08x MFHI:%08x EPC:%08x STATUS:%08x\n", g_current_regs[REG_MFLO], g_current_regs[REG_MFHI], g_current_regs[REG_EPC], g_current_regs[REG_STATUS]); - lldbg("AT:%08x V0:%08x V1:%08x A0:%08x A1:%08x A2:%08x A3:%08x\n", + llerr("AT:%08x V0:%08x V1:%08x A0:%08x A1:%08x A2:%08x A3:%08x\n", g_current_regs[REG_AT], g_current_regs[REG_V0], g_current_regs[REG_V1], g_current_regs[REG_A0], g_current_regs[REG_A1], g_current_regs[REG_A2], g_current_regs[REG_A3]); - lldbg("T0:%08x T1:%08x T2:%08x T3:%08x T4:%08x T5:%08x T6:%08x T7:%08x\n", + llerr("T0:%08x T1:%08x T2:%08x T3:%08x T4:%08x T5:%08x T6:%08x T7:%08x\n", g_current_regs[REG_T0], g_current_regs[REG_T1], g_current_regs[REG_T2], g_current_regs[REG_T3], g_current_regs[REG_T4], g_current_regs[REG_T5], g_current_regs[REG_T6], g_current_regs[REG_T7]); - lldbg("S0:%08x S1:%08x S2:%08x S3:%08x S4:%08x S5:%08x S6:%08x S7:%08x\n", + llerr("S0:%08x S1:%08x S2:%08x S3:%08x S4:%08x S5:%08x S6:%08x S7:%08x\n", g_current_regs[REG_S0], g_current_regs[REG_S1], g_current_regs[REG_S2], g_current_regs[REG_S3], g_current_regs[REG_S4], g_current_regs[REG_S5], g_current_regs[REG_S6], g_current_regs[REG_S7]); #ifdef MIPS32_SAVE_GP - lldbg("T8:%08x T9:%08x GP:%08x SP:%08x FP:%08x RA:%08x\n", + llerr("T8:%08x T9:%08x GP:%08x SP:%08x FP:%08x RA:%08x\n", g_current_regs[REG_T8], g_current_regs[REG_T9], g_current_regs[REG_GP], g_current_regs[REG_SP], g_current_regs[REG_FP], g_current_regs[REG_RA]); #else - lldbg("T8:%08x T9:%08x SP:%08x FP:%08x RA:%08x\n", + llerr("T8:%08x T9:%08x SP:%08x FP:%08x RA:%08x\n", g_current_regs[REG_T8], g_current_regs[REG_T9], g_current_regs[REG_SP], g_current_regs[REG_FP], g_current_regs[REG_RA]); #endif @@ -184,10 +184,10 @@ void up_dumpstate(void) /* Show interrupt stack info */ - lldbg("sp: %08x\n", sp); - lldbg("IRQ stack:\n"); - lldbg(" base: %08x\n", istackbase); - lldbg(" size: %08x\n", istacksize); + llerr("sp: %08x\n", sp); + llerr("IRQ stack:\n"); + llerr(" base: %08x\n", istackbase); + llerr(" size: %08x\n", istacksize); /* Does the current stack pointer lie within the interrupt * stack? @@ -204,18 +204,18 @@ void up_dumpstate(void) */ sp = g_intstackbase; - lldbg("sp: %08x\n", sp); + llerr("sp: %08x\n", sp); } /* Show user stack info */ - lldbg("User stack:\n"); - lldbg(" base: %08x\n", ustackbase); - lldbg(" size: %08x\n", ustacksize); + llerr("User stack:\n"); + llerr(" base: %08x\n", ustackbase); + llerr(" size: %08x\n", ustacksize); #else - lldbg("sp: %08x\n", sp); - lldbg("stack base: %08x\n", ustackbase); - lldbg("stack size: %08x\n", ustacksize); + llerr("sp: %08x\n", sp); + llerr("stack base: %08x\n", ustackbase); + llerr("stack size: %08x\n", ustacksize); #endif /* Dump the user stack if the stack pointer lies within the allocated user @@ -225,7 +225,7 @@ void up_dumpstate(void) if (sp > ustackbase || sp <= ustackbase - ustacksize) { #if !defined(CONFIG_ARCH_INTERRUPTSTACK) || CONFIG_ARCH_INTERRUPTSTACK < 4 - lldbg("ERROR: Stack pointer is not within allocated stack\n"); + llerr("ERROR: Stack pointer is not within allocated stack\n"); #endif } else diff --git a/arch/mips/src/mips32/up_releasepending.c b/arch/mips/src/mips32/up_releasepending.c index 0d4522ba8d..57310e30d1 100644 --- a/arch/mips/src/mips32/up_releasepending.c +++ b/arch/mips/src/mips32/up_releasepending.c @@ -69,7 +69,7 @@ void up_release_pending(void) { struct tcb_s *rtcb = this_task(); - slldbg("From TCB=%p\n", rtcb); + sllerr("From TCB=%p\n", rtcb); /* Merge the g_pendingtasks list into the ready-to-run task list */ diff --git a/arch/mips/src/mips32/up_reprioritizertr.c b/arch/mips/src/mips32/up_reprioritizertr.c index 3365f8862e..0f34c13894 100644 --- a/arch/mips/src/mips32/up_reprioritizertr.c +++ b/arch/mips/src/mips32/up_reprioritizertr.c @@ -97,7 +97,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) struct tcb_s *rtcb = this_task(); bool switch_needed; - slldbg("TCB=%p PRI=%d\n", tcb, priority); + sllerr("TCB=%p PRI=%d\n", tcb, priority); /* Remove the tcb task from the ready-to-run list. * sched_removereadytorun will return true if we just diff --git a/arch/mips/src/mips32/up_swint0.c b/arch/mips/src/mips32/up_swint0.c index bf394921d0..12c79b0f15 100644 --- a/arch/mips/src/mips32/up_swint0.c +++ b/arch/mips/src/mips32/up_swint0.c @@ -65,7 +65,7 @@ */ #ifdef CONFIG_DEBUG_SYSCALL -# define swidbg(format, ...) lldbg(format, ##__VA_ARGS__) +# define swidbg(format, ...) llerr(format, ##__VA_ARGS__) #else # define swidbg(x...) #endif @@ -289,7 +289,7 @@ int up_swint0(int irq, FAR void *context) g_current_regs[REG_R0] -= CONFIG_SYS_RESERVED; #else - slldbg("ERROR: Bad SYS call: %d\n", regs[REG_A0]); + sllerr("ERROR: Bad SYS call: %d\n", regs[REG_A0]); #endif } break; diff --git a/arch/mips/src/pic32mx/pic32mx-ethernet.c b/arch/mips/src/pic32mx/pic32mx-ethernet.c index 9004af4be5..ceb1c98906 100644 --- a/arch/mips/src/pic32mx/pic32mx-ethernet.c +++ b/arch/mips/src/pic32mx/pic32mx-ethernet.c @@ -447,7 +447,7 @@ static void pic32mx_ethreset(struct pic32mx_driver_s *priv); #ifdef CONFIG_NET_REGDEBUG static void pic32mx_printreg(uint32_t addr, uint32_t val, bool iswrite) { - lldbg("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val); + llerr("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val); } #endif @@ -497,7 +497,7 @@ static void pic32mx_checkreg(uint32_t addr, uint32_t val, bool iswrite) { /* No.. More than one. */ - lldbg("[repeats %d more times]\n", count); + llerr("[repeats %d more times]\n", count); } } @@ -576,12 +576,12 @@ static void pic32mx_putreg(uint32_t val, uint32_t addr) #ifdef CONFIG_NET_DESCDEBUG static void pic32mx_dumptxdesc(struct pic32mx_txdesc_s *txdesc, const char *msg) { - lldbg("TX Descriptor [%p]: %s\n", txdesc, msg); - lldbg(" status: %08x\n", txdesc->status); - lldbg(" address: %08x [%08x]\n", txdesc->address, VIRT_ADDR(txdesc->address)); - lldbg(" tsv1: %08x\n", txdesc->tsv1); - lldbg(" tsv2: %08x\n", txdesc->tsv2); - lldbg(" nexted: %08x [%08x]\n", txdesc->nexted, VIRT_ADDR(txdesc->nexted)); + llerr("TX Descriptor [%p]: %s\n", txdesc, msg); + llerr(" status: %08x\n", txdesc->status); + llerr(" address: %08x [%08x]\n", txdesc->address, VIRT_ADDR(txdesc->address)); + llerr(" tsv1: %08x\n", txdesc->tsv1); + llerr(" tsv2: %08x\n", txdesc->tsv2); + llerr(" nexted: %08x [%08x]\n", txdesc->nexted, VIRT_ADDR(txdesc->nexted)); } #endif @@ -603,12 +603,12 @@ static void pic32mx_dumptxdesc(struct pic32mx_txdesc_s *txdesc, const char *msg) #ifdef CONFIG_NET_DESCDEBUG static void pic32mx_dumprxdesc(struct pic32mx_rxdesc_s *rxdesc, const char *msg) { - lldbg("RX Descriptor [%p]: %s\n", rxdesc, msg); - lldbg(" status: %08x\n", rxdesc->status); - lldbg(" address: %08x [%08x]\n", rxdesc->address, VIRT_ADDR(rxdesc->address)); - lldbg(" rsv1: %08x\n", rxdesc->rsv1); - lldbg(" rsv2: %08x\n", rxdesc->rsv2); - lldbg(" nexted: %08x [%08x]\n", rxdesc->nexted, VIRT_ADDR(rxdesc->nexted)); + llerr("RX Descriptor [%p]: %s\n", rxdesc, msg); + llerr(" status: %08x\n", rxdesc->status); + llerr(" address: %08x [%08x]\n", rxdesc->address, VIRT_ADDR(rxdesc->address)); + llerr(" rsv1: %08x\n", rxdesc->rsv1); + llerr(" rsv2: %08x\n", rxdesc->rsv2); + llerr(" nexted: %08x [%08x]\n", rxdesc->nexted, VIRT_ADDR(rxdesc->nexted)); } #endif @@ -1366,7 +1366,7 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv) if ((rxdesc->rsv2 & RXDESC_RSV2_OK) == 0) { - nlldbg("ERROR. rsv1: %08x rsv2: %08x\n", rxdesc->rsv1, rxdesc->rsv2); + nllerr("ERROR. rsv1: %08x rsv2: %08x\n", rxdesc->rsv1, rxdesc->rsv2); NETDEV_RXERRORS(&priv->pd_dev); pic32mx_rxreturn(rxdesc); } @@ -1379,7 +1379,7 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv) else if (priv->pd_dev.d_len > CONFIG_NET_ETH_MTU) { - nlldbg("Too big. packet length: %d rxdesc: %08x\n", + nllerr("Too big. packet length: %d rxdesc: %08x\n", priv->pd_dev.d_len, rxdesc->status); NETDEV_RXERRORS(&priv->pd_dev); pic32mx_rxreturn(rxdesc); @@ -1390,7 +1390,7 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv) else if ((rxdesc->status & (RXDESC_STATUS_EOP | RXDESC_STATUS_SOP)) != (RXDESC_STATUS_EOP | RXDESC_STATUS_SOP)) { - nlldbg("Fragment. packet length: %d rxdesc: %08x\n", priv->pd_dev.d_len, rxdesc->status); + nllerr("Fragment. packet length: %d rxdesc: %08x\n", priv->pd_dev.d_len, rxdesc->status); NETDEV_RXFRAGMENTS(&priv->pd_dev); pic32mx_rxreturn(rxdesc); } @@ -1529,7 +1529,7 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv) { /* Unrecognized... drop it. */ - nlldbg("Unrecognized packet type dropped: %04x\n", ntohs(BUF->type)); + nllerr("Unrecognized packet type dropped: %04x\n", ntohs(BUF->type)); NETDEV_RXDROPPED(&priv->pd_dev); } @@ -1691,7 +1691,7 @@ static int pic32mx_interrupt(int irq, void *context) if ((status & ETH_INT_RXOVFLW) != 0) { - nlldbg("RX Overrun. status: %08x\n", status); + nllerr("RX Overrun. status: %08x\n", status); NETDEV_RXERRORS(&priv->pd_dev); } @@ -1702,7 +1702,7 @@ static int pic32mx_interrupt(int irq, void *context) if ((status & ETH_INT_RXBUFNA) != 0) { - nlldbg("RX buffer descriptor overrun. status: %08x\n", status); + nllerr("RX buffer descriptor overrun. status: %08x\n", status); NETDEV_RXERRORS(&priv->pd_dev); } @@ -1713,7 +1713,7 @@ static int pic32mx_interrupt(int irq, void *context) if ((status & ETH_INT_RXBUSE) != 0) { - nlldbg("RX BVCI bus error. status: %08x\n", status); + nllerr("RX BVCI bus error. status: %08x\n", status); NETDEV_RXERRORS(&priv->pd_dev); } @@ -1756,7 +1756,7 @@ static int pic32mx_interrupt(int irq, void *context) if ((status & ETH_INT_TXABORT) != 0) { - nlldbg("TX abort. status: %08x\n", status); + nllerr("TX abort. status: %08x\n", status); NETDEV_TXERRORS(&priv->pd_dev); } @@ -1767,7 +1767,7 @@ static int pic32mx_interrupt(int irq, void *context) if ((status & ETH_INT_TXBUSE) != 0) { - nlldbg("TX BVCI bus error. status: %08x\n", status); + nllerr("TX BVCI bus error. status: %08x\n", status); NETDEV_TXERRORS(&priv->pd_dev); } diff --git a/arch/mips/src/pic32mx/pic32mx-exception.c b/arch/mips/src/pic32mx/pic32mx-exception.c index 756ebbe80d..66feb977f9 100644 --- a/arch/mips/src/pic32mx/pic32mx-exception.c +++ b/arch/mips/src/pic32mx/pic32mx-exception.c @@ -187,7 +187,7 @@ uint32_t *pic32mx_exception(uint32_t *regs) break; } #else - lldbg("EXCEPTION: CAUSE: %08x EPC: %08x\n", cause, epc); + llerr("EXCEPTION: CAUSE: %08x EPC: %08x\n", cause, epc); #endif #endif diff --git a/arch/mips/src/pic32mx/pic32mx-gpio.c b/arch/mips/src/pic32mx/pic32mx-gpio.c index 928ce85d9f..355d152477 100644 --- a/arch/mips/src/pic32mx/pic32mx-gpio.c +++ b/arch/mips/src/pic32mx/pic32mx-gpio.c @@ -321,14 +321,14 @@ void pic32mx_dumpgpio(uint32_t pinset, const char *msg) /* The following requires exclusive access to the GPIO registers */ sched_lock(); - lldbg("IOPORT%c pinset: %04x base: %08x -- %s\n", + llerr("IOPORT%c pinset: %04x base: %08x -- %s\n", 'A'+port, pinset, base, msg); - lldbg(" TRIS: %08x PORT: %08x LAT: %08x ODC: %08x\n", + llerr(" TRIS: %08x PORT: %08x LAT: %08x ODC: %08x\n", getreg32(base + PIC32MX_IOPORT_TRIS_OFFSET), getreg32(base + PIC32MX_IOPORT_PORT_OFFSET), getreg32(base + PIC32MX_IOPORT_LAT_OFFSET), getreg32(base + PIC32MX_IOPORT_ODC_OFFSET)); - lldbg(" CNCON: %08x CNEN: %08x CNPUE: %08x\n", + llerr(" CNCON: %08x CNEN: %08x CNPUE: %08x\n", getreg32(PIC32MX_IOPORT_CNCON), getreg32(PIC32MX_IOPORT_CNEN), getreg32(PIC32MX_IOPORT_CNPUE)); diff --git a/arch/mips/src/pic32mx/pic32mx-serial.c b/arch/mips/src/pic32mx/pic32mx-serial.c index f36679aaa5..20a50bf2bb 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); - lldbg("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 2477936dfd..02a43d3eab 100644 --- a/arch/mips/src/pic32mx/pic32mx-spi.c +++ b/arch/mips/src/pic32mx/pic32mx-spi.c @@ -75,9 +75,9 @@ /* Debug */ #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif @@ -329,7 +329,7 @@ static uint32_t spi_getreg(FAR struct pic32mx_dev_s *priv, unsigned int offset) { if (count == 4) { - lldbg("...\n"); + llerr("...\n"); } return value; } @@ -345,7 +345,7 @@ static uint32_t spi_getreg(FAR struct pic32mx_dev_s *priv, unsigned int offset) { /* Yes.. then show how many times the value repeated */ - lldbg("[repeats %d more times]\n", count-3); + llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -357,7 +357,7 @@ static uint32_t spi_getreg(FAR struct pic32mx_dev_s *priv, unsigned int offset) /* Show the register value read */ - lldbg("%08x->%08x\n", addr, value); + llerr("%08x->%08x\n", addr, value); return value; } #else @@ -395,7 +395,7 @@ static void spi_putreg(FAR struct pic32mx_dev_s *priv, unsigned int offset, /* Show the register value being written */ - lldbg("%08x<-%08x\n", addr, value); + llerr("%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 613e7eccfa..e6099bfb80 100644 --- a/arch/mips/src/pic32mx/pic32mx-usbdev.c +++ b/arch/mips/src/pic32mx/pic32mx-usbdev.c @@ -289,9 +289,9 @@ # undef CONFIG_PIC32MX_USBDEV_BDTDEBUG # define CONFIG_PIC32MX_USBDEV_BDTDEBUG 1 -# define regdbg lldbg +# define regdbg llerr # ifdef CONFIG_DEBUG_INFO -# define reginfo lldbg +# define reginfo llerr # else # define reginfo(x...) # endif @@ -309,9 +309,9 @@ #ifdef CONFIG_PIC32MX_USBDEV_BDTDEBUG -# define bdtdbg lldbg +# define bdtdbg llerr # ifdef CONFIG_DEBUG_INFO -# define bdtinfo lldbg +# define bdtinfo llerr # else # define bdtinfo(x...) # endif @@ -637,7 +637,7 @@ static uint16_t pic32mx_getreg(uint32_t addr) { if (count == 4) { - lldbg("...\n"); + llerr("...\n"); } return val; } @@ -653,7 +653,7 @@ static uint16_t pic32mx_getreg(uint32_t addr) { /* Yes.. then show how many times the value repeated */ - lldbg("[repeats %d more times]\n", count-3); + llerr("[repeats %d more times]\n", count-3); } /* Save the new address, value, and count */ @@ -665,7 +665,7 @@ static uint16_t pic32mx_getreg(uint32_t addr) /* Show the register value read */ - lldbg("%08x->%04x\n", addr, val); + llerr("%08x->%04x\n", addr, val); return val; } #endif @@ -679,7 +679,7 @@ static void pic32mx_putreg(uint16_t val, uint32_t addr) { /* Show the register value being written */ - lldbg("%08x<-%04x\n", addr, val); + llerr("%08x<-%04x\n", addr, val); /* Write the value */ @@ -2832,7 +2832,7 @@ static int pic32mx_interrupt(int irq, void *context) if ((usbir & USB_INT_UERR) != 0) { usbtrace(TRACE_INTDECODE(PIC32MX_TRACEINTID_UERR), usbir); - ulldbg("Error: EIR=%04x\n", pic32mx_getreg(PIC32MX_USB_EIR)); + ullerr("Error: EIR=%04x\n", pic32mx_getreg(PIC32MX_USB_EIR)); /* Clear all pending USB error interrupts */ @@ -3152,7 +3152,7 @@ static int pic32mx_epconfigure(struct usbdev_ep_s *ep, if (!ep || !desc) { usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0); - ulldbg("ERROR: ep=%p desc=%p\n"); + ullerr("ERROR: ep=%p desc=%p\n"); return -EINVAL; } #endif @@ -3279,7 +3279,7 @@ static int pic32mx_epdisable(struct usbdev_ep_s *ep) if (!ep) { usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0); - ulldbg("ERROR: ep=%p\n", ep); + ullerr("ERROR: ep=%p\n", ep); return -EINVAL; } #endif @@ -3376,7 +3376,7 @@ static int pic32mx_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req) if (!req || !req->callback || !req->buf || !ep) { usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0); - ulldbg("ERROR: req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); + ullerr("ERROR: req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); return -EINVAL; } #endif @@ -3388,7 +3388,7 @@ static int pic32mx_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req) if (!priv->driver) { usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_NOTCONFIGURED), priv->usbdev.speed); - ulldbg("ERROR: driver=%p\n", priv->driver); + ullerr("ERROR: driver=%p\n", priv->driver); return -ESHUTDOWN; } #endif diff --git a/arch/mips/src/pic32mz/pic32mz-ethernet.c b/arch/mips/src/pic32mz/pic32mz-ethernet.c index 2d60888a37..5c1ae7aa78 100644 --- a/arch/mips/src/pic32mz/pic32mz-ethernet.c +++ b/arch/mips/src/pic32mz/pic32mz-ethernet.c @@ -465,7 +465,7 @@ static void pic32mz_ethreset(struct pic32mz_driver_s *priv); #ifdef CONFIG_NET_REGDEBUG static void pic32mz_printreg(uint32_t addr, uint32_t val, bool iswrite) { - lldbg("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val); + llerr("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val); } #endif @@ -515,7 +515,7 @@ static void pic32mz_checkreg(uint32_t addr, uint32_t val, bool iswrite) { /* No.. More than one. */ - lldbg("[repeats %d more times]\n", count); + llerr("[repeats %d more times]\n", count); } } @@ -594,12 +594,12 @@ static void pic32mz_putreg(uint32_t val, uint32_t addr) #ifdef CONFIG_NET_DESCDEBUG static void pic32mz_dumptxdesc(struct pic32mz_txdesc_s *txdesc, const char *msg) { - lldbg("TX Descriptor [%p]: %s\n", txdesc, msg); - lldbg(" status: %08x\n", txdesc->status); - lldbg(" address: %08x [%08x]\n", txdesc->address, VIRT_ADDR(txdesc->address)); - lldbg(" tsv1: %08x\n", txdesc->tsv1); - lldbg(" tsv2: %08x\n", txdesc->tsv2); - lldbg(" nexted: %08x [%08x]\n", txdesc->nexted, VIRT_ADDR(txdesc->nexted)); + llerr("TX Descriptor [%p]: %s\n", txdesc, msg); + llerr(" status: %08x\n", txdesc->status); + llerr(" address: %08x [%08x]\n", txdesc->address, VIRT_ADDR(txdesc->address)); + llerr(" tsv1: %08x\n", txdesc->tsv1); + llerr(" tsv2: %08x\n", txdesc->tsv2); + llerr(" nexted: %08x [%08x]\n", txdesc->nexted, VIRT_ADDR(txdesc->nexted)); } #endif @@ -621,12 +621,12 @@ static void pic32mz_dumptxdesc(struct pic32mz_txdesc_s *txdesc, const char *msg) #ifdef CONFIG_NET_DESCDEBUG static void pic32mz_dumprxdesc(struct pic32mz_rxdesc_s *rxdesc, const char *msg) { - lldbg("RX Descriptor [%p]: %s\n", rxdesc, msg); - lldbg(" status: %08x\n", rxdesc->status); - lldbg(" address: %08x [%08x]\n", rxdesc->address, VIRT_ADDR(rxdesc->address)); - lldbg(" rsv1: %08x\n", rxdesc->rsv1); - lldbg(" rsv2: %08x\n", rxdesc->rsv2); - lldbg(" nexted: %08x [%08x]\n", rxdesc->nexted, VIRT_ADDR(rxdesc->nexted)); + llerr("RX Descriptor [%p]: %s\n", rxdesc, msg); + llerr(" status: %08x\n", rxdesc->status); + llerr(" address: %08x [%08x]\n", rxdesc->address, VIRT_ADDR(rxdesc->address)); + llerr(" rsv1: %08x\n", rxdesc->rsv1); + llerr(" rsv2: %08x\n", rxdesc->rsv2); + llerr(" nexted: %08x [%08x]\n", rxdesc->nexted, VIRT_ADDR(rxdesc->nexted)); } #endif @@ -1384,7 +1384,7 @@ static void pic32mz_rxdone(struct pic32mz_driver_s *priv) if ((rxdesc->rsv2 & RXDESC_RSV2_OK) == 0) { - nlldbg("ERROR. rsv1: %08x rsv2: %08x\n", rxdesc->rsv1, rxdesc->rsv2); + nllerr("ERROR. rsv1: %08x rsv2: %08x\n", rxdesc->rsv1, rxdesc->rsv2); NETDEV_RXERRORS(&priv->pd_dev); pic32mz_rxreturn(rxdesc); } @@ -1397,7 +1397,7 @@ static void pic32mz_rxdone(struct pic32mz_driver_s *priv) else if (priv->pd_dev.d_len > CONFIG_NET_ETH_MTU) { - nlldbg("Too big. packet length: %d rxdesc: %08x\n", priv->pd_dev.d_len, rxdesc->status); + nllerr("Too big. packet length: %d rxdesc: %08x\n", priv->pd_dev.d_len, rxdesc->status); NETDEV_RXERRORS(&priv->pd_dev); pic32mz_rxreturn(rxdesc); } @@ -1407,7 +1407,7 @@ static void pic32mz_rxdone(struct pic32mz_driver_s *priv) else if ((rxdesc->status & (RXDESC_STATUS_EOP | RXDESC_STATUS_SOP)) != (RXDESC_STATUS_EOP | RXDESC_STATUS_SOP)) { - nlldbg("Fragment. packet length: %d rxdesc: %08x\n", priv->pd_dev.d_len, rxdesc->status); + nllerr("Fragment. packet length: %d rxdesc: %08x\n", priv->pd_dev.d_len, rxdesc->status); NETDEV_RXFRAGMENTS(&priv->pd_dev); pic32mz_rxreturn(rxdesc); } @@ -1546,7 +1546,7 @@ static void pic32mz_rxdone(struct pic32mz_driver_s *priv) { /* Unrecognized... drop it. */ - nlldbg("Unrecognized packet type dropped: %04x\n", ntohs(BUF->type)); + nllerr("Unrecognized packet type dropped: %04x\n", ntohs(BUF->type)); NETDEV_RXDROPPED(&priv->pd_dev); } @@ -1708,7 +1708,7 @@ static int pic32mz_interrupt(int irq, void *context) if ((status & ETH_INT_RXOVFLW) != 0) { - nlldbg("RX Overrun. status: %08x\n", status); + nllerr("RX Overrun. status: %08x\n", status); NETDEV_RXERRORS(&priv->pd_dev); } @@ -1719,7 +1719,7 @@ static int pic32mz_interrupt(int irq, void *context) if ((status & ETH_INT_RXBUFNA) != 0) { - nlldbg("RX buffer descriptor overrun. status: %08x\n", status); + nllerr("RX buffer descriptor overrun. status: %08x\n", status); NETDEV_RXERRORS(&priv->pd_dev); } @@ -1730,7 +1730,7 @@ static int pic32mz_interrupt(int irq, void *context) if ((status & ETH_INT_RXBUSE) != 0) { - nlldbg("RX BVCI bus error. status: %08x\n", status); + nllerr("RX BVCI bus error. status: %08x\n", status); NETDEV_RXERRORS(&priv->pd_dev); } @@ -1773,7 +1773,7 @@ static int pic32mz_interrupt(int irq, void *context) if ((status & ETH_INT_TXABORT) != 0) { - nlldbg("TX abort. status: %08x\n", status); + nllerr("TX abort. status: %08x\n", status); NETDEV_TXERRORS(&priv->pd_dev); } @@ -1784,7 +1784,7 @@ static int pic32mz_interrupt(int irq, void *context) if ((status & ETH_INT_TXBUSE) != 0) { - nlldbg("TX BVCI bus error. status: %08x\n", status); + nllerr("TX BVCI bus error. status: %08x\n", status); NETDEV_TXERRORS(&priv->pd_dev); } diff --git a/arch/mips/src/pic32mz/pic32mz-exception.c b/arch/mips/src/pic32mz/pic32mz-exception.c index a370ca4c4b..e9cda39ba8 100644 --- a/arch/mips/src/pic32mz/pic32mz-exception.c +++ b/arch/mips/src/pic32mz/pic32mz-exception.c @@ -187,7 +187,7 @@ uint32_t *pic32mz_exception(uint32_t *regs) break; } #else - lldbg("EXCEPTION: CAUSE: %08x EPC: %08x\n", cause, epc); + llerr("EXCEPTION: CAUSE: %08x EPC: %08x\n", cause, epc); #endif #endif diff --git a/arch/mips/src/pic32mz/pic32mz-gpio.c b/arch/mips/src/pic32mz/pic32mz-gpio.c index a8707ca107..db8c6e5df8 100644 --- a/arch/mips/src/pic32mz/pic32mz-gpio.c +++ b/arch/mips/src/pic32mz/pic32mz-gpio.c @@ -325,14 +325,14 @@ void pic32mz_dumpgpio(uint32_t pinset, const char *msg) /* The following requires exclusive access to the GPIO registers */ sched_lock(); - lldbg("IOPORT%c pinset: %04x base: %08x -- %s\n", + llerr("IOPORT%c pinset: %04x base: %08x -- %s\n", 'A'+port, pinset, base, msg); - lldbg(" TRIS: %08x PORT: %08x LAT: %08x ODC: %08x\n", + llerr(" TRIS: %08x PORT: %08x LAT: %08x ODC: %08x\n", getreg32(base + PIC32MZ_IOPORT_TRIS_OFFSET), getreg32(base + PIC32MZ_IOPORT_PORT_OFFSET), getreg32(base + PIC32MZ_IOPORT_LAT_OFFSET), getreg32(base + PIC32MZ_IOPORT_ODC_OFFSET)); - lldbg(" CNCON: %08x CNEN: %08x CNPUE: %08x\n", + llerr(" CNCON: %08x CNEN: %08x CNPUE: %08x\n", getreg32(PIC32MZ_IOPORT_CNCON), getreg32(PIC32MZ_IOPORT_CNEN), getreg32(PIC32MZ_IOPORT_CNPUE)); diff --git a/arch/mips/src/pic32mz/pic32mz-serial.c b/arch/mips/src/pic32mz/pic32mz-serial.c index 0679bf95ff..c9b56f3ff4 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); - lldbg("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 344a1d3e71..504fe2ca95 100644 --- a/arch/mips/src/pic32mz/pic32mz-spi.c +++ b/arch/mips/src/pic32mz/pic32mz-spi.c @@ -70,9 +70,9 @@ /* Debug */ #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif @@ -496,7 +496,7 @@ static bool spi_checkreg(struct pic32mz_dev_s *priv, uintptr_t regaddr, { /* Yes... show how many times we did it */ - lldbg("...[Repeats %d times]...\n", priv->ntimes); + llerr("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -546,7 +546,7 @@ static uint32_t spi_getreg(FAR struct pic32mz_dev_s *priv, { /* Yes.. */ - lldbg("%08lx->%08lx\n", + llerr("%08lx->%08lx\n", (unsigned long)regaddr, (unsigned long)regval); } @@ -588,7 +588,7 @@ static void spi_putaddr(FAR struct pic32mz_dev_s *priv, uintptr_t regaddr, { /* Yes.. */ - lldbg("%08lx<-%08lx\n", + llerr("%08lx<-%08lx\n", (unsigned long)regaddr, (unsigned long)regval); } diff --git a/arch/sh/src/common/up_assert.c b/arch/sh/src/common/up_assert.c index 47879c3240..ec63c54098 100644 --- a/arch/sh/src/common/up_assert.c +++ b/arch/sh/src/common/up_assert.c @@ -154,10 +154,10 @@ void up_assert(const uint8_t *filename, int lineno) board_autoled_on(LED_ASSERTION); #if CONFIG_TASK_NAME_SIZE > 0 - lldbg("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 - lldbg("Assertion failed at file:%s line: %d\n", + llerr("Assertion failed at file:%s line: %d\n", filename, lineno); #endif diff --git a/arch/sh/src/common/up_exit.c b/arch/sh/src/common/up_exit.c index c2c41763c8..e62462cec3 100644 --- a/arch/sh/src/common/up_exit.c +++ b/arch/sh/src/common/up_exit.c @@ -147,10 +147,10 @@ void _exit(int status) (void)up_irq_save(); - slldbg("TCB=%p exiting\n", this_task()); + sllerr("TCB=%p exiting\n", this_task()); #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES) - slldbg("Other tasks:\n"); + sllerr("Other tasks:\n"); sched_foreach(_up_dumponexit, NULL); #endif diff --git a/arch/sh/src/common/up_initialize.c b/arch/sh/src/common/up_initialize.c index 579b15fe7f..98c38fe504 100644 --- a/arch/sh/src/common/up_initialize.c +++ b/arch/sh/src/common/up_initialize.c @@ -82,13 +82,13 @@ static void up_calibratedelay(void) { int i; - slldbg("Beginning 100s delay\n"); + sllerr("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } - slldbg("End 100s delay\n"); + sllerr("End 100s delay\n"); } #else # define up_calibratedelay() diff --git a/arch/sh/src/common/up_releasepending.c b/arch/sh/src/common/up_releasepending.c index b91503cbe6..3112f52532 100644 --- a/arch/sh/src/common/up_releasepending.c +++ b/arch/sh/src/common/up_releasepending.c @@ -67,7 +67,7 @@ void up_release_pending(void) { struct tcb_s *rtcb = this_task(); - slldbg("From TCB=%p\n", rtcb); + sllerr("From TCB=%p\n", rtcb); /* Merge the g_pendingtasks list into the ready-to-run task list */ diff --git a/arch/sh/src/common/up_reprioritizertr.c b/arch/sh/src/common/up_reprioritizertr.c index e838cff0bb..8578dfef47 100644 --- a/arch/sh/src/common/up_reprioritizertr.c +++ b/arch/sh/src/common/up_reprioritizertr.c @@ -95,7 +95,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) struct tcb_s *rtcb = this_task(); bool switch_needed; - slldbg("TCB=%p PRI=%d\n", tcb, priority); + sllerr("TCB=%p PRI=%d\n", tcb, priority); /* Remove the tcb task from the ready-to-run list. * sched_removereadytorun will return true if we just diff --git a/arch/sh/src/m16c/m16c_dumpstate.c b/arch/sh/src/m16c/m16c_dumpstate.c index 4e29d7127c..39a19252ff 100644 --- a/arch/sh/src/m16c/m16c_dumpstate.c +++ b/arch/sh/src/m16c/m16c_dumpstate.c @@ -112,7 +112,7 @@ static void m16c_stackdump(uint16_t sp, uint16_t stack_base) for (stack = sp & ~7; stack < stack_base; stack += 8) { uint8_t *ptr = (uint8_t*)stack; - lldbg("%04x: %02x %02x %02x %02x %02x %02x %02x %02x\n", + llerr("%04x: %02x %02x %02x %02x %02x %02x %02x %02x\n", stack, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7]); } } @@ -131,14 +131,14 @@ static inline void m16c_registerdump(void) { /* Yes.. dump the interrupt registers */ - lldbg("PC: %02x%02x%02x FLG: %02x00%02x FB: %02x%02x SB: %02x%02x SP: %02x%02x\n", + llerr("PC: %02x%02x%02x FLG: %02x00%02x FB: %02x%02x SB: %02x%02x SP: %02x%02x\n", ptr[REG_FLGPCHI] & 0xff, ptr[REG_PC], ptr[REG_PC+1], ptr[REG_FLGPCHI] >> 8, ptr[REG_FLG], ptr[REG_FB], ptr[REG_FB+1], ptr[REG_SB], ptr[REG_SB+1], ptr[REG_SP], ptr[REG_SP+1]); - lldbg("R0: %02x%02x R1: %02x%02x R2: %02x%02x A0: %02x%02x A1: %02x%02x\n", + llerr("R0: %02x%02x R1: %02x%02x R2: %02x%02x A0: %02x%02x A1: %02x%02x\n", ptr[REG_R0], ptr[REG_R0+1], ptr[REG_R1], ptr[REG_R1+1], ptr[REG_R2], ptr[REG_R2+1], ptr[REG_R3], ptr[REG_R3+1], ptr[REG_A0], ptr[REG_A0+1], ptr[REG_A1], ptr[REG_A1+1]); @@ -194,10 +194,10 @@ void up_dumpstate(void) /* Show interrupt stack info */ - lldbg("sp: %04x\n", sp); - lldbg("IRQ stack:\n"); - lldbg(" base: %04x\n", istackbase); - lldbg(" size: %04x\n", istacksize); + llerr("sp: %04x\n", sp); + llerr("IRQ stack:\n"); + llerr(" base: %04x\n", istackbase); + llerr(" size: %04x\n", istacksize); /* Does the current stack pointer lie within the interrupt * stack? @@ -212,18 +212,18 @@ void up_dumpstate(void) /* Extract the user stack pointer from the register area */ sp = m16c_getusersp(); - lldbg("sp: %04x\n", sp); + llerr("sp: %04x\n", sp); } /* Show user stack info */ - lldbg("User stack:\n"); - lldbg(" base: %04x\n", ustackbase); - lldbg(" size: %04x\n", ustacksize); + llerr("User stack:\n"); + llerr(" base: %04x\n", ustackbase); + llerr(" size: %04x\n", ustacksize); #else - lldbg("sp: %04x\n", sp); - lldbg("stack base: %04x\n", ustackbase); - lldbg("stack size: %04x\n", ustacksize); + llerr("sp: %04x\n", sp); + llerr("stack base: %04x\n", ustackbase); + llerr("stack size: %04x\n", ustacksize); #endif /* Dump the user stack if the stack pointer lies within the allocated user @@ -233,7 +233,7 @@ void up_dumpstate(void) if (sp > ustackbase || sp <= ustackbase - ustacksize) { #if !defined(CONFIG_ARCH_INTERRUPTSTACK) || CONFIG_ARCH_INTERRUPTSTACK < 4 - lldbg("ERROR: Stack pointer is not within allocated stack\n"); + llerr("ERROR: Stack pointer is not within allocated stack\n"); #endif } else diff --git a/arch/sh/src/sh1/sh1_dumpstate.c b/arch/sh/src/sh1/sh1_dumpstate.c index ed5edee427..1d36a6e058 100644 --- a/arch/sh/src/sh1/sh1_dumpstate.c +++ b/arch/sh/src/sh1/sh1_dumpstate.c @@ -99,7 +99,7 @@ static void sh1_stackdump(uint32_t sp, uint32_t stack_base) for (stack = sp & ~0x1f; stack < stack_base; stack += 32) { uint32_t *ptr = (uint32_t*)stack; - lldbg("%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]); } @@ -119,17 +119,17 @@ static inline void sh1_registerdump(void) { /* Yes.. dump the interrupt registers */ - lldbg("PC: %08x SR=%08x\n", + llerr("PC: %08x SR=%08x\n", ptr[REG_PC], ptr[REG_SR]); - lldbg("PR: %08x GBR: %08x MACH: %08x MACL: %08x\n", + llerr("PR: %08x GBR: %08x MACH: %08x MACL: %08x\n", ptr[REG_PR], ptr[REG_GBR], ptr[REG_MACH], ptr[REG_MACL]); - lldbg("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", 0, + llerr("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", 0, ptr[REG_R0], ptr[REG_R1], ptr[REG_R2], ptr[REG_R3], ptr[REG_R4], ptr[REG_R5], ptr[REG_R6], ptr[REG_R7]); - lldbg("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", 8, + llerr("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", 8, ptr[REG_R8], ptr[REG_R9], ptr[REG_R10], ptr[REG_R11], ptr[REG_R12], ptr[REG_R13], ptr[REG_R14], ptr[REG_R15]); } @@ -175,10 +175,10 @@ void up_dumpstate(void) /* Show interrupt stack info */ - lldbg("sp: %08x\n", sp); - lldbg("IRQ stack:\n"); - lldbg(" base: %08x\n", istackbase); - lldbg(" size: %08x\n", istacksize); + llerr("sp: %08x\n", sp); + llerr("IRQ stack:\n"); + llerr(" base: %08x\n", istackbase); + llerr(" size: %08x\n", istacksize); /* Does the current stack pointer lie within the interrupt * stack? @@ -195,18 +195,18 @@ void up_dumpstate(void) */ sp = g_intstackbase; - lldbg("sp: %08x\n", sp); + llerr("sp: %08x\n", sp); } /* Show user stack info */ - lldbg("User stack:\n"); - lldbg(" base: %08x\n", ustackbase); - lldbg(" size: %08x\n", ustacksize); + llerr("User stack:\n"); + llerr(" base: %08x\n", ustackbase); + llerr(" size: %08x\n", ustacksize); #else - lldbg("sp: %08x\n", sp); - lldbg("stack base: %08x\n", ustackbase); - lldbg("stack size: %08x\n", ustacksize); + llerr("sp: %08x\n", sp); + llerr("stack base: %08x\n", ustackbase); + llerr("stack size: %08x\n", ustacksize); #endif /* Dump the user stack if the stack pointer lies within the allocated user @@ -216,7 +216,7 @@ void up_dumpstate(void) if (sp > ustackbase || sp <= ustackbase - ustacksize) { #if !defined(CONFIG_ARCH_INTERRUPTSTACK) || CONFIG_ARCH_INTERRUPTSTACK < 4 - lldbg("ERROR: Stack pointer is not within allocated stack\n"); + llerr("ERROR: Stack pointer is not within allocated stack\n"); #endif } else diff --git a/arch/sim/src/up_spiflash.c b/arch/sim/src/up_spiflash.c index 4bab7d5fd0..c7f4a076d0 100644 --- a/arch/sim/src/up_spiflash.c +++ b/arch/sim/src/up_spiflash.c @@ -69,9 +69,9 @@ #endif #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/arch/x86/src/common/up_assert.c b/arch/x86/src/common/up_assert.c index 5039955757..1732b8d824 100644 --- a/arch/x86/src/common/up_assert.c +++ b/arch/x86/src/common/up_assert.c @@ -80,7 +80,7 @@ * code. We are going to print the task name if: * * CONFIG_TASK_NAME_SIZE > 0 && <-- The task has a name - * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (lldbg used) + * (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (llerr used) * defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used */ @@ -105,7 +105,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; - lldbg("%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]); } @@ -176,10 +176,10 @@ static void up_dumpstate(void) /* Show interrupt stack info */ - lldbg("sp: %08x\n", sp); - lldbg("IRQ stack:\n"); - lldbg(" base: %08x\n", istackbase); - lldbg(" size: %08x\n", istacksize); + llerr("sp: %08x\n", sp); + llerr("IRQ stack:\n"); + llerr(" base: %08x\n", istackbase); + llerr(" size: %08x\n", istacksize); /* Does the current stack pointer lie within the interrupt * stack? @@ -196,18 +196,18 @@ static void up_dumpstate(void) */ sp = g_intstackbase; - lldbg("sp: %08x\n", sp); + llerr("sp: %08x\n", sp); } /* Show user stack info */ - lldbg("User stack:\n"); - lldbg(" base: %08x\n", ustackbase); - lldbg(" size: %08x\n", ustacksize); + llerr("User stack:\n"); + llerr(" base: %08x\n", ustackbase); + llerr(" size: %08x\n", ustacksize); #else - lldbg("sp: %08x\n", sp); - lldbg("stack base: %08x\n", ustackbase); - lldbg("stack size: %08x\n", ustacksize); + llerr("sp: %08x\n", sp); + llerr("stack base: %08x\n", ustackbase); + llerr("stack size: %08x\n", ustacksize); #endif /* Dump the user stack if the stack pointer lies within the allocated user @@ -217,7 +217,7 @@ static void up_dumpstate(void) if (sp > ustackbase || sp <= ustackbase - ustacksize) { #if !defined(CONFIG_ARCH_INTERRUPTSTACK) || CONFIG_ARCH_INTERRUPTSTACK < 4 - lldbg("ERROR: Stack pointer is not within allocated stack\n"); + llerr("ERROR: Stack pointer is not within allocated stack\n"); #endif } else @@ -287,10 +287,10 @@ void up_assert(const uint8_t *filename, int lineno) board_autoled_on(LED_ASSERTION); #ifdef CONFIG_PRINT_TASKNAME - lldbg("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 - lldbg("Assertion failed at file:%s line: %d\n", + llerr("Assertion failed at file:%s line: %d\n", filename, lineno); #endif diff --git a/arch/x86/src/common/up_exit.c b/arch/x86/src/common/up_exit.c index a776bd5b1b..350e65dec3 100644 --- a/arch/x86/src/common/up_exit.c +++ b/arch/x86/src/common/up_exit.c @@ -146,10 +146,10 @@ void _exit(int status) (void)up_irq_save(); - slldbg("TCB=%p exiting\n", this_task()); + sllerr("TCB=%p exiting\n", this_task()); #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES) - slldbg("Other tasks:\n"); + sllerr("Other tasks:\n"); sched_foreach(_up_dumponexit, NULL); #endif diff --git a/arch/x86/src/common/up_initialize.c b/arch/x86/src/common/up_initialize.c index 502aca2338..0c7baed29c 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; - lldbg("Beginning 100s delay\n"); + llerr("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } - lldbg("End 100s delay\n"); + llerr("End 100s delay\n"); } #else # define up_calibratedelay() diff --git a/arch/x86/src/common/up_releasepending.c b/arch/x86/src/common/up_releasepending.c index 76137604bb..6b22f7b2d0 100644 --- a/arch/x86/src/common/up_releasepending.c +++ b/arch/x86/src/common/up_releasepending.c @@ -67,7 +67,7 @@ void up_release_pending(void) { struct tcb_s *rtcb = this_task(); - slldbg("From TCB=%p\n", rtcb); + sllerr("From TCB=%p\n", rtcb); /* Merge the g_pendingtasks list into the ready-to-run task list */ diff --git a/arch/x86/src/common/up_reprioritizertr.c b/arch/x86/src/common/up_reprioritizertr.c index 398199261d..7400fb1fce 100644 --- a/arch/x86/src/common/up_reprioritizertr.c +++ b/arch/x86/src/common/up_reprioritizertr.c @@ -95,7 +95,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) struct tcb_s *rtcb = this_task(); bool switch_needed; - slldbg("TCB=%p PRI=%d\n", tcb, priority); + sllerr("TCB=%p PRI=%d\n", tcb, priority); /* Remove the tcb task from the ready-to-run list. * sched_removereadytorun will return true if we just diff --git a/arch/x86/src/i486/up_regdump.c b/arch/x86/src/i486/up_regdump.c index dbf0599dda..52c74b1600 100644 --- a/arch/x86/src/i486/up_regdump.c +++ b/arch/x86/src/i486/up_regdump.c @@ -72,13 +72,13 @@ void up_registerdump(uint32_t *regs) { - lldbg(" ds:%08x irq:%08x err:%08x\n", + llerr(" ds:%08x irq:%08x err:%08x\n", regs[REG_DS], regs[REG_IRQNO], regs[REG_ERRCODE]); - lldbg("edi:%08x esi:%08x ebp:%08x esp:%08x\n", + llerr("edi:%08x esi:%08x ebp:%08x esp:%08x\n", regs[REG_EDI], regs[REG_ESI], regs[REG_EBP], regs[REG_ESP]); - lldbg("ebx:%08x edx:%08x ecx:%08x eax:%08x\n", + llerr("ebx:%08x edx:%08x ecx:%08x eax:%08x\n", regs[REG_EBX], regs[REG_EDX], regs[REG_ECX], regs[REG_EAX]); - lldbg("eip:%08x cs:%08x flg:%08x sp:%08x ss:%08x\n", + llerr("eip:%08x cs:%08x flg:%08x sp:%08x ss:%08x\n", regs[REG_EIP], regs[REG_CS], regs[REG_EFLAGS], regs[REG_SP], regs[REG_SS]); } diff --git a/arch/z16/src/common/up_assert.c b/arch/z16/src/common/up_assert.c index bcefc234ae..ea941b805b 100644 --- a/arch/z16/src/common/up_assert.c +++ b/arch/z16/src/common/up_assert.c @@ -154,17 +154,17 @@ void up_assert(void) #ifdef CONFIG_HAVE_FILENAME #if CONFIG_TASK_NAME_SIZE > 0 - lldbg("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 - lldbg("Assertion failed at file:%s line: %d\n", + llerr("Assertion failed at file:%s line: %d\n", filename, lineno); #endif #else #if CONFIG_TASK_NAME_SIZE > 0 - lldbg("Assertion failed: task: %s\n", rtcb->name); + llerr("Assertion failed: task: %s\n", rtcb->name); #else - lldbg("Assertion failed\n"); + llerr("Assertion failed\n"); #endif #endif diff --git a/arch/z16/src/common/up_exit.c b/arch/z16/src/common/up_exit.c index bb98e7f357..ba2aefb418 100644 --- a/arch/z16/src/common/up_exit.c +++ b/arch/z16/src/common/up_exit.c @@ -78,8 +78,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg) int i; #endif - lldbg(" TCB=%p name=%s\n", tcb, tcb->argv[0]); - lldbg(" priority=%d state=%d\n", tcb->sched_priority, tcb->task_state); + llerr(" TCB=%p name=%s\n", tcb, tcb->argv[0]); + llerr(" priority=%d state=%d\n", tcb->sched_priority, tcb->task_state); #if CONFIG_NFILE_DESCRIPTORS > 0 filelist = tcb->group->tg_filelist; @@ -88,7 +88,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg) struct inode *inode = filelist->fl_files[i].f_inode; if (inode) { - lldbg(" fd=%d refcount=%d\n", + llerr(" fd=%d refcount=%d\n", i, inode->i_crefs); } } @@ -102,11 +102,11 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg) if (filep->fs_fd >= 0) { #if CONFIG_STDIO_BUFFER_SIZE > 0 - lldbg(" fd=%d nbytes=%d\n", + llerr(" fd=%d nbytes=%d\n", filep->fs_fd, filep->fs_bufpos - filep->fs_bufstart); #else - lldbg(" fd=%d\n", filep->fs_fd); + llerr(" fd=%d\n", filep->fs_fd); #endif } } @@ -139,10 +139,10 @@ void _exit(int status) (void)up_irq_save(); - slldbg("TCB=%p exiting\n", tcb); + sllerr("TCB=%p exiting\n", tcb); #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES) - lldbg("Other tasks:\n"); + llerr("Other tasks:\n"); sched_foreach(_up_dumponexit, NULL); #endif @@ -155,7 +155,7 @@ void _exit(int status) */ tcb = this_task(); - slldbg("New Active Task TCB=%p\n", tcb); + sllerr("New Active Task TCB=%p\n", tcb); /* Then switch contexts */ diff --git a/arch/z16/src/common/up_initialize.c b/arch/z16/src/common/up_initialize.c index c7fc43bfbc..6251b2a41f 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; - lldbg("Beginning 100s delay\n"); + llerr("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } - lldbg("End 100s delay\n"); + llerr("End 100s delay\n"); } #else # define up_calibratedelay() diff --git a/arch/z16/src/common/up_registerdump.c b/arch/z16/src/common/up_registerdump.c index 76cdff2481..9c7993da51 100644 --- a/arch/z16/src/common/up_registerdump.c +++ b/arch/z16/src/common/up_registerdump.c @@ -79,14 +79,14 @@ static void up_registerdump(void) { FAR uint32_t *regs32 = (FAR uint32_t*)g_current_regs; - lldbg("R0 :%08x R1 :%08x R2 :%08x R3 :%08x " + llerr("R0 :%08x R1 :%08x R2 :%08x R3 :%08x " "R4 :%08x R5 :%08x R6 :%08x R7 :%08x\n" regs32[REG_R0/2], regs32[REG_R1/2], regs32[REG_R2/2], regs32[REG_R3/2], regs32[REG_R4/2], regs32[REG_R5/2], regs32[REG_R6/2], regs32[REG_R7/2]); - lldbg("R8 :%08x R9 :%08x R10:%08x R11:%08x R12:%08x R13:%08x\n" + llerr("R8 :%08x R9 :%08x R10:%08x R11:%08x R12:%08x R13:%08x\n" regs32[REG_R8/2], regs32[REG_R9/2], regs32[REG_R10/2], regs3[REG_R11/2], regs32[REG_R12/2], regs32[REG_R13/2]); - lldbg("FP :%08x SP :%08x FLG:%04x\n" + llerr("FP :%08x SP :%08x FLG:%04x\n" regs32[REG_R14/2], regs32[REG_R15/2], g_current_regs[REG_FLAGS]); } diff --git a/arch/z16/src/common/up_releasepending.c b/arch/z16/src/common/up_releasepending.c index 2d0e09b5ac..90cae6fbb3 100644 --- a/arch/z16/src/common/up_releasepending.c +++ b/arch/z16/src/common/up_releasepending.c @@ -68,7 +68,7 @@ void up_release_pending(void) { FAR struct tcb_s *rtcb = this_task(); - slldbg("From TCB=%p\n", rtcb); + sllerr("From TCB=%p\n", rtcb); /* Merge the g_pendingtasks list into the ready-to-run task list */ diff --git a/arch/z16/src/common/up_reprioritizertr.c b/arch/z16/src/common/up_reprioritizertr.c index 4872db37f2..0083f855bd 100644 --- a/arch/z16/src/common/up_reprioritizertr.c +++ b/arch/z16/src/common/up_reprioritizertr.c @@ -96,7 +96,7 @@ void up_reprioritize_rtr(FAR struct tcb_s *tcb, uint8_t priority) FAR struct tcb_s *rtcb = this_task(); bool switch_needed; - slldbg("TCB=%p PRI=%d\n", tcb, priority); + sllerr("TCB=%p PRI=%d\n", tcb, priority); /* Remove the tcb task from the ready-to-run list. * sched_removereadytorun will return true if we just diff --git a/arch/z16/src/common/up_stackdump.c b/arch/z16/src/common/up_stackdump.c index 9f95debe31..48f63bef37 100644 --- a/arch/z16/src/common/up_stackdump.c +++ b/arch/z16/src/common/up_stackdump.c @@ -74,13 +74,13 @@ static void up_stackdump(void) chipreg_t stack_base = (chipreg_t)rtcb->adj_stack_ptr; chipreg_t stack_size = (chipreg_t)rtcb->adj_stack_size; - lldbg("stack_base: %08x\n", stack_base); - lldbg("stack_size: %08x\n", stack_size); - lldbg("sp: %08x\n", sp); + llerr("stack_base: %08x\n", stack_base); + llerr("stack_size: %08x\n", stack_size); + llerr("sp: %08x\n", sp); if (sp >= stack_base || sp < stack_base - stack_size) { - lldbg("ERROR: Stack pointer is not within allocated stack\n"); + llerr("ERROR: Stack pointer is not within allocated stack\n"); return; } else @@ -90,7 +90,7 @@ static void up_stackdump(void) for (stack = sp & ~0x0f; stack < stack_base; stack += 8*sizeof(chipreg_t)) { chipreg_t *ptr = (chipreg_t*)stack; - lldbg("%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]); } diff --git a/arch/z16/src/z16f/z16f_espi.c b/arch/z16/src/z16f/z16f_espi.c index af357444a9..16676a280e 100644 --- a/arch/z16/src/z16f/z16f_espi.c +++ b/arch/z16/src/z16f/z16f_espi.c @@ -70,9 +70,9 @@ #endif #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo (void) # endif @@ -231,7 +231,7 @@ static bool spi_checkreg(FAR struct z16f_spi_s *priv, bool wr, uint16_t regval, { /* Yes... show how many times we did it */ - lldbg("...[Repeats %d times]...\n", priv->ntimes); + llerr("...[Repeats %d times]...\n", priv->ntimes); } /* Save information about the new access */ @@ -263,7 +263,7 @@ static uint8_t spi_getreg8(FAR struct z16f_spi_s *priv, uintptr_t regaddr) if (spi_checkreg(priv, false, (uint16_t)regval, regaddr)) { - lldbg("%06x->%02x\n", regaddr, regval); + llerr("%06x->%02x\n", regaddr, regval); } return regval; @@ -284,7 +284,7 @@ static void spi_putreg8(FAR struct z16f_spi_s *priv, uint8_t regval, { if (spi_checkreg(priv, true, (uint16_t)regval, regaddr)) { - lldbg("%06x<-%02x\n", regaddr, regval); + llerr("%06x<-%02x\n", regaddr, regval); } putreg8(regval, regaddr); @@ -305,7 +305,7 @@ static void spi_putreg16(FAR struct z16f_spi_s *priv, uint16_t regval, { if (spi_checkreg(priv, true, regval, regaddr)) { - lldbg("%06x<-%04x\n", regaddr, regval); + llerr("%06x<-%04x\n", regaddr, regval); } putreg8(regval, regaddr); diff --git a/arch/z80/src/common/up_assert.c b/arch/z80/src/common/up_assert.c index a7b4733934..b459aa00af 100644 --- a/arch/z80/src/common/up_assert.c +++ b/arch/z80/src/common/up_assert.c @@ -157,17 +157,17 @@ void up_assert(void) #ifdef CONFIG_HAVE_FILENAME #if CONFIG_TASK_NAME_SIZE > 0 - lldbg("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 - lldbg("Assertion failed at file:%s line: %d\n", + llerr("Assertion failed at file:%s line: %d\n", filename, lineno); #endif #else #if CONFIG_TASK_NAME_SIZE > 0 - lldbg("Assertion failed: task: %s\n", rtcb->name); + llerr("Assertion failed: task: %s\n", rtcb->name); #else - lldbg("Assertion failed\n"); + llerr("Assertion failed\n"); #endif #endif diff --git a/arch/z80/src/common/up_exit.c b/arch/z80/src/common/up_exit.c index 45efedd881..ddbf062f59 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 - lldbg(" TCB=%p name=%s\n", tcb, tcb->argv[0]); - lldbg(" priority=%d state=%d\n", tcb->sched_priority, tcb->task_state); + llerr(" TCB=%p name=%s\n", tcb, tcb->argv[0]); + llerr(" 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) { - lldbg(" fd=%d refcount=%d\n", + llerr(" 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 - lldbg(" fd=%d nbytes=%d\n", + llerr(" fd=%d nbytes=%d\n", filep->fs_fd, filep->fs_bufpos - filep->fs_bufstart); #else - lldbg(" fd=%d\n", filep->fs_fd); + llerr(" fd=%d\n", filep->fs_fd); #endif } } @@ -149,10 +149,10 @@ void _exit(int status) (void)up_irq_save(); - slldbg("TCB=%p exiting\n", tcb); + sllerr("TCB=%p exiting\n", tcb); #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES) - lldbg("Other tasks:\n"); + llerr("Other tasks:\n"); sched_foreach(_up_dumponexit, NULL); #endif @@ -165,7 +165,7 @@ void _exit(int status) */ tcb = this_task(); - slldbg("New Active Task TCB=%p\n", tcb); + sllerr("New Active Task TCB=%p\n", tcb); #ifdef CONFIG_ARCH_ADDRENV /* Make sure that the address environment for the previously running diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c index 17a1c037a9..585db52c62 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; - lldbg("Beginning 100s delay\n"); + llerr("Beginning 100s delay\n"); for (i = 0; i < 100; i++) { up_mdelay(1000); } - lldbg("End 100s delay\n"); + llerr("End 100s delay\n"); } #else # define up_calibratedelay() diff --git a/arch/z80/src/common/up_releasepending.c b/arch/z80/src/common/up_releasepending.c index e4bc07a78f..411559b194 100644 --- a/arch/z80/src/common/up_releasepending.c +++ b/arch/z80/src/common/up_releasepending.c @@ -70,7 +70,7 @@ void up_release_pending(void) { FAR struct tcb_s *rtcb = this_task(); - slldbg("From TCB=%p\n", rtcb); + sllerr("From TCB=%p\n", rtcb); /* Merge the g_pendingtasks list into the ready-to-run task list */ diff --git a/arch/z80/src/common/up_reprioritizertr.c b/arch/z80/src/common/up_reprioritizertr.c index d710277563..ad6de96fbf 100644 --- a/arch/z80/src/common/up_reprioritizertr.c +++ b/arch/z80/src/common/up_reprioritizertr.c @@ -98,7 +98,7 @@ void up_reprioritize_rtr(FAR struct tcb_s *tcb, uint8_t priority) FAR struct tcb_s *rtcb = this_task(); bool switch_needed; - slldbg("TCB=%p PRI=%d\n", tcb, priority); + sllerr("TCB=%p PRI=%d\n", tcb, priority); /* Remove the tcb task from the ready-to-run list. * sched_removereadytorun will return true if we just diff --git a/arch/z80/src/common/up_stackdump.c b/arch/z80/src/common/up_stackdump.c index b9a1bf1508..ee2d5ee31f 100644 --- a/arch/z80/src/common/up_stackdump.c +++ b/arch/z80/src/common/up_stackdump.c @@ -83,13 +83,13 @@ static void up_stackdump(void) uint16_t stack_base = (uint16_t)rtcb->adj_stack_ptr; uint16_t stack_size = (uint16_t)rtcb->adj_stack_size; - lldbg("stack_base: %04x\n", stack_base); - lldbg("stack_size: %04x\n", stack_size); - lldbg("sp: %04x\n", sp); + llerr("stack_base: %04x\n", stack_base); + llerr("stack_size: %04x\n", stack_size); + llerr("sp: %04x\n", sp); if (sp >= stack_base || sp < stack_base - stack_size) { - lldbg("ERROR: Stack pointer is not within allocated stack\n"); + llerr("ERROR: Stack pointer is not within allocated stack\n"); return; } else @@ -99,7 +99,7 @@ static void up_stackdump(void) for (stack = sp & ~0x0f; stack < stack_base; stack += 8*sizeof(uint16_t)) { uint16_t *ptr = (uint16_t*)stack; - lldbg("%04x: %04x %04x %04x %04x %04x %04x %04x %04x\n", + llerr("%04x: %04x %04x %04x %04x %04x %04x %04x %04x\n", stack, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7]); } diff --git a/arch/z80/src/ez80/ez80_emac.c b/arch/z80/src/ez80/ez80_emac.c index 308f8231b2..f715cfcac2 100644 --- a/arch/z80/src/ez80/ez80_emac.c +++ b/arch/z80/src/ez80/ez80_emac.c @@ -2200,7 +2200,7 @@ int up_netinitialize(void) ret = irq_attach(EZ80_EMACSYS_IRQ, ez80emac_sysinterrupt); if (ret < 0) { - nlldbg("Unable to attach IRQ %d\n", EZ80_EMACSYS_IRQ); + nllerr("Unable to attach IRQ %d\n", EZ80_EMACSYS_IRQ); ret = -EAGAIN; goto errout; } @@ -2208,7 +2208,7 @@ int up_netinitialize(void) ret = irq_attach(EZ80_EMACRX_IRQ, ez80emac_rxinterrupt); if (ret < 0) { - nlldbg("Unable to attach IRQ %d\n", EZ80_EMACRX_IRQ); + nllerr("Unable to attach IRQ %d\n", EZ80_EMACRX_IRQ); ret = -EAGAIN; goto errout; } @@ -2216,7 +2216,7 @@ int up_netinitialize(void) ret = irq_attach(EZ80_EMACTX_IRQ, ez80emac_txinterrupt); if (ret < 0) { - nlldbg("Unable to attach IRQ %d\n", EZ80_EMACTX_IRQ); + nllerr("Unable to attach IRQ %d\n", EZ80_EMACTX_IRQ); ret = -EAGAIN; goto errout; } diff --git a/arch/z80/src/ez80/ez80_registerdump.c b/arch/z80/src/ez80/ez80_registerdump.c index c6025165d3..350af5a697 100644 --- a/arch/z80/src/ez80/ez80_registerdump.c +++ b/arch/z80/src/ez80/ez80_registerdump.c @@ -77,22 +77,22 @@ static void ez80_registerdump(void) if (g_current_regs) { #ifdef CONFIG_EZ80_Z80MODE - lldbg("AF: %04x I: %04x\n", + llerr("AF: %04x I: %04x\n", g_current_regs[XCPT_AF], g_current_regs[XCPT_I]); - lldbg("BC: %04x DE: %04x HL: %04x\n", + llerr("BC: %04x DE: %04x HL: %04x\n", g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]); - lldbg("IX: %04x IY: %04x\n", + llerr("IX: %04x IY: %04x\n", g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]); - lldbg("SP: %04x PC: %04x\n" + llerr("SP: %04x PC: %04x\n" g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]); #else - lldbg("AF: %06x I: %06x\n", + llerr("AF: %06x I: %06x\n", g_current_regs[XCPT_AF], g_current_regs[XCPT_I]); - lldbg("BC: %06x DE: %06x HL: %06x\n", + llerr("BC: %06x DE: %06x HL: %06x\n", g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]); - lldbg("IX: %06x IY: %06x\n", + llerr("IX: %06x IY: %06x\n", g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]); - lldbg("SP: %06x PC: %06x\n" + llerr("SP: %06x PC: %06x\n" g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]); #endif } diff --git a/arch/z80/src/z180/z180_registerdump.c b/arch/z80/src/z180/z180_registerdump.c index bf8713d6a2..322b0fc7c0 100644 --- a/arch/z80/src/z180/z180_registerdump.c +++ b/arch/z80/src/z180/z180_registerdump.c @@ -76,15 +76,15 @@ static void z180_registerdump(void) { if (g_current_regs) { - lldbg("AF: %04x I: %04x\n", + llerr("AF: %04x I: %04x\n", g_current_regs[XCPT_AF], g_current_regs[XCPT_I]); - lldbg("BC: %04x DE: %04x HL: %04x\n", + llerr("BC: %04x DE: %04x HL: %04x\n", g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]); - lldbg("IX: %04x IY: %04x\n", + llerr("IX: %04x IY: %04x\n", g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]); - lldbg("SP: %04x PC: %04x\n" + llerr("SP: %04x PC: %04x\n" g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]); - lldbg("CBAR: %02x BBR: %02x CBR: %02x\n" + llerr("CBAR: %02x BBR: %02x CBR: %02x\n" inp(Z180_MMU_CBAR), inp(Z180_MMU_BBR), inp(Z180_MMU_CBR)); } } diff --git a/arch/z80/src/z8/z8_registerdump.c b/arch/z80/src/z8/z8_registerdump.c index f85273d27f..ffe393b068 100644 --- a/arch/z80/src/z8/z8_registerdump.c +++ b/arch/z80/src/z8/z8_registerdump.c @@ -71,7 +71,7 @@ static inline void z8_dumpregs(FAR chipret_t *regs) { - lldbg("REGS: %04x %04x %04x %04x %04x %04x %04x %04x\n", + llerr("REGS: %04x %04x %04x %04x %04x %04x %04x %04x\n", regs[XCPT_RR0], regs[XCPT_RR2], regs[XCPT_RR4], regs[XCPT_RR6], regs[XCPT_RR8], regs[XCPT_RR10], regs[XCPT_RR12], regs[XCPT_RR14]); } @@ -79,7 +79,7 @@ static inline void z8_dumpregs(FAR chipret_t *regs) static inline void z8_dumpstate(chipreg_t sp, chipreg_t pc, uint8_t irqctl, chipreg_t rpflags) { - lldbg("SP: %04x PC: %04x IRQCTL: %02x RP: %02x FLAGS: %02x\n", + llerr("SP: %04x PC: %04x IRQCTL: %02x RP: %02x FLAGS: %02x\n", sp, pc, irqctl & 0xff, rpflags >> 8, rpflags & 0xff); } diff --git a/arch/z80/src/z80/z80_registerdump.c b/arch/z80/src/z80/z80_registerdump.c index eaea63c7b4..b32b3cc7b0 100644 --- a/arch/z80/src/z80/z80_registerdump.c +++ b/arch/z80/src/z80/z80_registerdump.c @@ -76,13 +76,13 @@ static void z80_registerdump(void) { if (g_current_regs) { - lldbg("AF: %04x I: %04x\n", + llerr("AF: %04x I: %04x\n", g_current_regs[XCPT_AF], g_current_regs[XCPT_I]); - lldbg("BC: %04x DE: %04x HL: %04x\n", + llerr("BC: %04x DE: %04x HL: %04x\n", g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]); - lldbg("IX: %04x IY: %04x\n", + llerr("IX: %04x IY: %04x\n", g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]); - lldbg("SP: %04x PC: %04x\n" + llerr("SP: %04x PC: %04x\n" g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]); } } diff --git a/binfmt/binfmt_schedunload.c b/binfmt/binfmt_schedunload.c index 5a459d79ae..1347262ff4 100644 --- a/binfmt/binfmt_schedunload.c +++ b/binfmt/binfmt_schedunload.c @@ -209,7 +209,7 @@ static void unload_callback(int signo, siginfo_t *info, void *ucontext) if (!info || signo != SIGCHLD) { - blldbg("ERROR:Bad signal callback: signo=%d info=%p\n", signo, info); + bllerr("ERROR:Bad signal callback: signo=%d info=%p\n", signo, info); return; } @@ -218,7 +218,7 @@ static void unload_callback(int signo, siginfo_t *info, void *ucontext) bin = unload_list_remove(info->si_pid); if (!bin) { - blldbg("ERROR: Could not find load info for PID=%d\n", info->si_pid); + bllerr("ERROR: Could not find load info for PID=%d\n", info->si_pid); return; } @@ -227,7 +227,7 @@ static void unload_callback(int signo, siginfo_t *info, void *ucontext) ret = unload_module(bin); if (ret < 0) { - blldbg("ERROR: unload_module failed: %d\n", get_errno()); + bllerr("ERROR: unload_module failed: %d\n", get_errno()); } /* Free the load structure */ @@ -317,7 +317,7 @@ int schedule_unload(pid_t pid, FAR struct binary_s *bin) flags = enter_critical_section(); if (unload_list_remove(pid) != bin) { - blldbg("ERROR: Failed to remove structure\n"); + bllerr("ERROR: Failed to remove structure\n"); } leave_critical_section(flags); diff --git a/configs/arduino-due/src/sam_autoleds.c b/configs/arduino-due/src/sam_autoleds.c index b84f34f1a5..f407e86cdd 100644 --- a/configs/arduino-due/src/sam_autoleds.c +++ b/configs/arduino-due/src/sam_autoleds.c @@ -100,7 +100,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/arduino-due/src/sam_userleds.c b/configs/arduino-due/src/sam_userleds.c index 4279a4ab1e..e41418bf7b 100644 --- a/configs/arduino-due/src/sam_userleds.c +++ b/configs/arduino-due/src/sam_userleds.c @@ -60,7 +60,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/cc3200-launchpad/src/cc3200_autoleds.c b/configs/cc3200-launchpad/src/cc3200_autoleds.c index f3cded9e76..6853edc88c 100644 --- a/configs/cc3200-launchpad/src/cc3200_autoleds.c +++ b/configs/cc3200-launchpad/src/cc3200_autoleds.c @@ -92,7 +92,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/cloudctrl/src/stm32_autoleds.c b/configs/cloudctrl/src/stm32_autoleds.c index ef237c0652..11de1e7f21 100644 --- a/configs/cloudctrl/src/stm32_autoleds.c +++ b/configs/cloudctrl/src/stm32_autoleds.c @@ -63,7 +63,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/cloudctrl/src/stm32_spi.c b/configs/cloudctrl/src/stm32_spi.c index d1eba035c1..cae199dd0e 100644 --- a/configs/cloudctrl/src/stm32_spi.c +++ b/configs/cloudctrl/src/stm32_spi.c @@ -65,9 +65,9 @@ #endif #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/cloudctrl/src/stm32_usb.c b/configs/cloudctrl/src/stm32_usb.c index 49f25d4330..e711536e91 100644 --- a/configs/cloudctrl/src/stm32_usb.c +++ b/configs/cloudctrl/src/stm32_usb.c @@ -301,7 +301,7 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler) #ifdef CONFIG_USBDEV void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } #endif diff --git a/configs/cloudctrl/src/stm32_userleds.c b/configs/cloudctrl/src/stm32_userleds.c index 79316352ac..4f48929edf 100644 --- a/configs/cloudctrl/src/stm32_userleds.c +++ b/configs/cloudctrl/src/stm32_userleds.c @@ -63,7 +63,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/demo9s12ne64/src/m9s12_leds.c b/configs/demo9s12ne64/src/m9s12_leds.c index a5b357b803..167a365bb7 100644 --- a/configs/demo9s12ne64/src/m9s12_leds.c +++ b/configs/demo9s12ne64/src/m9s12_leds.c @@ -55,7 +55,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/demo9s12ne64/src/m9s12_spi.c b/configs/demo9s12ne64/src/m9s12_spi.c index 329609850d..7348e30f14 100644 --- a/configs/demo9s12ne64/src/m9s12_spi.c +++ b/configs/demo9s12ne64/src/m9s12_spi.c @@ -60,9 +60,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/dk-tm4c129x/src/tm4c_ethernet.c b/configs/dk-tm4c129x/src/tm4c_ethernet.c index 8594d75559..abe1dbb53d 100644 --- a/configs/dk-tm4c129x/src/tm4c_ethernet.c +++ b/configs/dk-tm4c129x/src/tm4c_ethernet.c @@ -84,7 +84,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr) user0 = getreg32(TIVA_FLASH_USERREG0); user1 = getreg32(TIVA_FLASH_USERREG1); - nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); + nllerr("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff); /* Re-format that MAC address the way that the network expects to see it */ diff --git a/configs/dk-tm4c129x/src/tm4c_ssi.c b/configs/dk-tm4c129x/src/tm4c_ssi.c index 35122c8bf5..8164b61e20 100644 --- a/configs/dk-tm4c129x/src/tm4c_ssi.c +++ b/configs/dk-tm4c129x/src/tm4c_ssi.c @@ -62,7 +62,7 @@ /* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ #ifdef CONFIG_DEBUG_SPI -# define ssidbg lldbg +# define ssidbg llerr #else # define ssidbg(x...) #endif @@ -70,7 +70,7 @@ /* Dump GPIO registers */ #if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO) -# define ssiinfo lldbg +# define ssiinfo llerr # define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m) #else # define ssiinfo(x...) diff --git a/configs/dk-tm4c129x/src/tm4c_userleds.c b/configs/dk-tm4c129x/src/tm4c_userleds.c index 6d708ad1cc..f1d0cc8f59 100644 --- a/configs/dk-tm4c129x/src/tm4c_userleds.c +++ b/configs/dk-tm4c129x/src/tm4c_userleds.c @@ -71,7 +71,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/ea3131/src/lpc31_fillpage.c b/configs/ea3131/src/lpc31_fillpage.c index 51c57f06a9..7f1b62b70a 100644 --- a/configs/ea3131/src/lpc31_fillpage.c +++ b/configs/ea3131/src/lpc31_fillpage.c @@ -412,7 +412,7 @@ int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage) off_t offset; #endif - pglldbg("TCB: %p vpage: %p far: %08x\n", tcb, vpage, tcb->xcp.far); + pgllerr("TCB: %p vpage: %p far: %08x\n", tcb, vpage, tcb->xcp.far); DEBUGASSERT(tcb->xcp.far >= PG_PAGED_VBASE && tcb->xcp.far < PG_PAGED_VEND); /* If BINPATH is defined, then it is the full path to a file on a mounted file @@ -475,7 +475,7 @@ int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage) int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage, up_pgcallback_t pg_callback) { - pglldbg("TCB: %p vpage: %d far: %08x\n", tcb, vpage, tcb->xcp.far); + pgllerr("TCB: %p vpage: %d far: %08x\n", tcb, vpage, tcb->xcp.far); DEBUGASSERT(tcb->xcp.far >= PG_PAGED_VBASE && tcb->xcp.far < PG_PAGED_VEND); #if defined(CONFIG_PAGING_BINPATH) diff --git a/configs/ea3131/src/lpc31_leds.c b/configs/ea3131/src/lpc31_leds.c index 396f014bd9..82a1c34a61 100644 --- a/configs/ea3131/src/lpc31_leds.c +++ b/configs/ea3131/src/lpc31_leds.c @@ -60,7 +60,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/ea3131/src/lpc31_spi.c b/configs/ea3131/src/lpc31_spi.c index 2a71d33c27..c66f53b9ff 100644 --- a/configs/ea3131/src/lpc31_spi.c +++ b/configs/ea3131/src/lpc31_spi.c @@ -65,9 +65,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/ea3152/src/lpc31_fillpage.c b/configs/ea3152/src/lpc31_fillpage.c index 09cb59c000..62745695cb 100644 --- a/configs/ea3152/src/lpc31_fillpage.c +++ b/configs/ea3152/src/lpc31_fillpage.c @@ -412,7 +412,7 @@ int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage) off_t offset; #endif - pglldbg("TCB: %p vpage: %p far: %08x\n", tcb, vpage, tcb->xcp.far); + pgllerr("TCB: %p vpage: %p far: %08x\n", tcb, vpage, tcb->xcp.far); DEBUGASSERT(tcb->xcp.far >= PG_PAGED_VBASE && tcb->xcp.far < PG_PAGED_VEND); /* If BINPATH is defined, then it is the full path to a file on a mounted file @@ -475,7 +475,7 @@ int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage) int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage, up_pgcallback_t pg_callback) { - pglldbg("TCB: %p vpage: %d far: %08x\n", tcb, vpage, tcb->xcp.far); + pgllerr("TCB: %p vpage: %d far: %08x\n", tcb, vpage, tcb->xcp.far); DEBUGASSERT(tcb->xcp.far >= PG_PAGED_VBASE && tcb->xcp.far < PG_PAGED_VEND); #if defined(CONFIG_PAGING_BINPATH) diff --git a/configs/ea3152/src/lpc31_leds.c b/configs/ea3152/src/lpc31_leds.c index 7810e06e1e..986c77af5e 100644 --- a/configs/ea3152/src/lpc31_leds.c +++ b/configs/ea3152/src/lpc31_leds.c @@ -60,7 +60,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/ea3152/src/lpc31_spi.c b/configs/ea3152/src/lpc31_spi.c index 6347edf502..1436e65748 100644 --- a/configs/ea3152/src/lpc31_spi.c +++ b/configs/ea3152/src/lpc31_spi.c @@ -65,9 +65,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/eagle100/src/lm_ethernet.c b/configs/eagle100/src/lm_ethernet.c index 7a33e1af6c..b556e1d7cd 100644 --- a/configs/eagle100/src/lm_ethernet.c +++ b/configs/eagle100/src/lm_ethernet.c @@ -83,7 +83,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr) user0 = getreg32(TIVA_FLASH_USERREG0); user1 = getreg32(TIVA_FLASH_USERREG1); - nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); + nllerr("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff); /* Re-format that MAC address the way that the network expects to see it */ diff --git a/configs/eagle100/src/lm_leds.c b/configs/eagle100/src/lm_leds.c index 53282481ad..03f0b3e510 100644 --- a/configs/eagle100/src/lm_leds.c +++ b/configs/eagle100/src/lm_leds.c @@ -60,7 +60,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/eagle100/src/lm_ssi.c b/configs/eagle100/src/lm_ssi.c index 09cfcb4451..f106382d05 100644 --- a/configs/eagle100/src/lm_ssi.c +++ b/configs/eagle100/src/lm_ssi.c @@ -65,9 +65,9 @@ #undef SSI_VERBOSE /* Define to enable verbose debug */ #ifdef SSI_DEBUG -# define ssidbg lldbg +# define ssidbg llerr # ifdef SSI_VERBOSE -# define ssiinfo lldbg +# define ssiinfo llerr # else # define ssiinfo(x...) # endif diff --git a/configs/efm32-g8xx-stk/src/efm32_autoleds.c b/configs/efm32-g8xx-stk/src/efm32_autoleds.c index d1d73ada95..ae7176c7a2 100644 --- a/configs/efm32-g8xx-stk/src/efm32_autoleds.c +++ b/configs/efm32-g8xx-stk/src/efm32_autoleds.c @@ -64,7 +64,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/efm32-g8xx-stk/src/efm32_userleds.c b/configs/efm32-g8xx-stk/src/efm32_userleds.c index ce42e08b69..c09254f323 100644 --- a/configs/efm32-g8xx-stk/src/efm32_userleds.c +++ b/configs/efm32-g8xx-stk/src/efm32_userleds.c @@ -64,7 +64,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/efm32gg-stk3700/src/efm32_autoleds.c b/configs/efm32gg-stk3700/src/efm32_autoleds.c index 598f7c04b8..c1f2c8b110 100644 --- a/configs/efm32gg-stk3700/src/efm32_autoleds.c +++ b/configs/efm32gg-stk3700/src/efm32_autoleds.c @@ -98,7 +98,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/efm32gg-stk3700/src/efm32_userleds.c b/configs/efm32gg-stk3700/src/efm32_userleds.c index 093a151f97..53bbf90685 100644 --- a/configs/efm32gg-stk3700/src/efm32_userleds.c +++ b/configs/efm32gg-stk3700/src/efm32_userleds.c @@ -75,7 +75,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/ekk-lm3s9b96/src/lm_ethernet.c b/configs/ekk-lm3s9b96/src/lm_ethernet.c index c3627e4a16..db8a560be5 100644 --- a/configs/ekk-lm3s9b96/src/lm_ethernet.c +++ b/configs/ekk-lm3s9b96/src/lm_ethernet.c @@ -84,7 +84,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr) user0 = getreg32(TIVA_FLASH_USERREG0); user1 = getreg32(TIVA_FLASH_USERREG1); - nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); + nllerr("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff); /* Re-format that MAC address the way that the network expects to see it */ diff --git a/configs/ekk-lm3s9b96/src/lm_leds.c b/configs/ekk-lm3s9b96/src/lm_leds.c index 7abff4bbcc..0b188a81be 100644 --- a/configs/ekk-lm3s9b96/src/lm_leds.c +++ b/configs/ekk-lm3s9b96/src/lm_leds.c @@ -61,7 +61,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/ekk-lm3s9b96/src/lm_ssi.c b/configs/ekk-lm3s9b96/src/lm_ssi.c index bef242e500..fc402edc1f 100644 --- a/configs/ekk-lm3s9b96/src/lm_ssi.c +++ b/configs/ekk-lm3s9b96/src/lm_ssi.c @@ -64,9 +64,9 @@ #undef SSI_VERBOSE /* Define to enable verbose debug */ #ifdef SSI_DEBUG -# define ssidbg lldbg +# define ssidbg llerr # ifdef SSI_VERBOSE -# define ssiinfo lldbg +# define ssiinfo llerr # else # define ssiinfo(x...) # endif diff --git a/configs/fire-stm32v2/src/stm32_autoleds.c b/configs/fire-stm32v2/src/stm32_autoleds.c index e70905831f..2d6b80528e 100644 --- a/configs/fire-stm32v2/src/stm32_autoleds.c +++ b/configs/fire-stm32v2/src/stm32_autoleds.c @@ -62,7 +62,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/fire-stm32v2/src/stm32_enc28j60.c b/configs/fire-stm32v2/src/stm32_enc28j60.c index 2094f35aab..ac1e82381a 100644 --- a/configs/fire-stm32v2/src/stm32_enc28j60.c +++ b/configs/fire-stm32v2/src/stm32_enc28j60.c @@ -188,7 +188,7 @@ void up_netinitialize(void) spi = stm32_spibus_initialize(ENC28J60_SPI_PORTNO); if (!spi) { - nlldbg("Failed to initialize SPI port %d\n", ENC28J60_SPI_PORTNO); + nllerr("Failed to initialize SPI port %d\n", ENC28J60_SPI_PORTNO); return; } @@ -201,7 +201,7 @@ void up_netinitialize(void) ret = enc_initialize(spi, &g_enclower.lower, ENC28J60_DEVNO); if (ret < 0) { - nlldbg("Failed to bind SPI port %d ENC28J60 device %d: %d\n", + nllerr("Failed to bind SPI port %d ENC28J60 device %d: %d\n", ENC28J60_SPI_PORTNO, ENC28J60_DEVNO, ret); return; } diff --git a/configs/fire-stm32v2/src/stm32_spi.c b/configs/fire-stm32v2/src/stm32_spi.c index 6f2bcb4177..2b7216e05b 100644 --- a/configs/fire-stm32v2/src/stm32_spi.c +++ b/configs/fire-stm32v2/src/stm32_spi.c @@ -63,9 +63,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/fire-stm32v2/src/stm32_usbdev.c b/configs/fire-stm32v2/src/stm32_usbdev.c index 5beea44b78..5ba1c8cbfd 100644 --- a/configs/fire-stm32v2/src/stm32_usbdev.c +++ b/configs/fire-stm32v2/src/stm32_usbdev.c @@ -114,6 +114,6 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable) void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } diff --git a/configs/fire-stm32v2/src/stm32_userleds.c b/configs/fire-stm32v2/src/stm32_userleds.c index f4968c2974..3f2d1ff650 100644 --- a/configs/fire-stm32v2/src/stm32_userleds.c +++ b/configs/fire-stm32v2/src/stm32_userleds.c @@ -62,7 +62,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/freedom-kl25z/src/kl_led.c b/configs/freedom-kl25z/src/kl_led.c index c5fe8d3831..3a0a75d690 100644 --- a/configs/freedom-kl25z/src/kl_led.c +++ b/configs/freedom-kl25z/src/kl_led.c @@ -86,9 +86,9 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO -# define ledinfo lldbg +# define ledinfo llerr # else # define ledinfo(x...) # endif diff --git a/configs/freedom-kl25z/src/kl_spi.c b/configs/freedom-kl25z/src/kl_spi.c index 0a41ea3371..d5c3d56edc 100644 --- a/configs/freedom-kl25z/src/kl_spi.c +++ b/configs/freedom-kl25z/src/kl_spi.c @@ -58,9 +58,9 @@ /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/freedom-kl26z/src/kl_led.c b/configs/freedom-kl26z/src/kl_led.c index a6bc7f048f..53b328d158 100644 --- a/configs/freedom-kl26z/src/kl_led.c +++ b/configs/freedom-kl26z/src/kl_led.c @@ -86,9 +86,9 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO -# define ledinfo lldbg +# define ledinfo llerr # else # define ledinfo(x...) # endif diff --git a/configs/freedom-kl26z/src/kl_spi.c b/configs/freedom-kl26z/src/kl_spi.c index 2c7151a7b4..c5d25a96a7 100644 --- a/configs/freedom-kl26z/src/kl_spi.c +++ b/configs/freedom-kl26z/src/kl_spi.c @@ -58,9 +58,9 @@ /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/hymini-stm32v/src/stm32_leds.c b/configs/hymini-stm32v/src/stm32_leds.c index 4b1b1e4684..e669700696 100644 --- a/configs/hymini-stm32v/src/stm32_leds.c +++ b/configs/hymini-stm32v/src/stm32_leds.c @@ -62,7 +62,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/hymini-stm32v/src/stm32_spi.c b/configs/hymini-stm32v/src/stm32_spi.c index 2150e1833f..7983b3496a 100644 --- a/configs/hymini-stm32v/src/stm32_spi.c +++ b/configs/hymini-stm32v/src/stm32_spi.c @@ -64,9 +64,9 @@ #define SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/hymini-stm32v/src/stm32_usbdev.c b/configs/hymini-stm32v/src/stm32_usbdev.c index d7e868c903..49f7f83339 100644 --- a/configs/hymini-stm32v/src/stm32_usbdev.c +++ b/configs/hymini-stm32v/src/stm32_usbdev.c @@ -73,7 +73,7 @@ void stm32_usbinitialize(void) { - ulldbg("called\n"); + ullerr("called\n"); /* USB Soft Connect Pullup */ stm32_configgpio(GPIO_USB_PULLUP); @@ -111,6 +111,6 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable) void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } diff --git a/configs/kwikstik-k40/src/k40_leds.c b/configs/kwikstik-k40/src/k40_leds.c index ee458ef185..334a038b9d 100644 --- a/configs/kwikstik-k40/src/k40_leds.c +++ b/configs/kwikstik-k40/src/k40_leds.c @@ -52,7 +52,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/kwikstik-k40/src/k40_spi.c b/configs/kwikstik-k40/src/k40_spi.c index 710e9e56b2..4e55111754 100644 --- a/configs/kwikstik-k40/src/k40_spi.c +++ b/configs/kwikstik-k40/src/k40_spi.c @@ -60,9 +60,9 @@ /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/kwikstik-k40/src/k40_usbdev.c b/configs/kwikstik-k40/src/k40_usbdev.c index cfd9f071e8..da038aa0a8 100644 --- a/configs/kwikstik-k40/src/k40_usbdev.c +++ b/configs/kwikstik-k40/src/k40_usbdev.c @@ -108,6 +108,6 @@ int kinetis_usbpullup(FAR struct usbdev_s *dev, bool enable) void kinetis_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); #warning "Missing logic" } diff --git a/configs/launchxl-tms57004/src/tms570_autoleds.c b/configs/launchxl-tms57004/src/tms570_autoleds.c index a92cf59ebb..b51afadfd7 100644 --- a/configs/launchxl-tms57004/src/tms570_autoleds.c +++ b/configs/launchxl-tms57004/src/tms570_autoleds.c @@ -98,7 +98,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/lincoln60/src/lpc17_leds.c b/configs/lincoln60/src/lpc17_leds.c index 5b8ab87951..1baafaafa8 100644 --- a/configs/lincoln60/src/lpc17_leds.c +++ b/configs/lincoln60/src/lpc17_leds.c @@ -65,9 +65,9 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO -# define ledinfo lldbg +# define ledinfo llerr # else # define ledinfo(x...) # endif diff --git a/configs/lm3s6432-s2e/src/lm_ethernet.c b/configs/lm3s6432-s2e/src/lm_ethernet.c index c10d261adc..befbdd7c0c 100644 --- a/configs/lm3s6432-s2e/src/lm_ethernet.c +++ b/configs/lm3s6432-s2e/src/lm_ethernet.c @@ -83,7 +83,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr) user0 = getreg32(TIVA_FLASH_USERREG0); user1 = getreg32(TIVA_FLASH_USERREG1); - nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); + nllerr("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff); /* Re-format that MAC address the way that the network expects to see it */ diff --git a/configs/lm3s6432-s2e/src/lm_leds.c b/configs/lm3s6432-s2e/src/lm_leds.c index dc97dbe180..360a75e1a5 100644 --- a/configs/lm3s6432-s2e/src/lm_leds.c +++ b/configs/lm3s6432-s2e/src/lm_leds.c @@ -60,7 +60,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/lm3s6432-s2e/src/lm_ssi.c b/configs/lm3s6432-s2e/src/lm_ssi.c index 4b7ddac4e8..9f2c4818c1 100644 --- a/configs/lm3s6432-s2e/src/lm_ssi.c +++ b/configs/lm3s6432-s2e/src/lm_ssi.c @@ -63,9 +63,9 @@ #undef SSI_VERBOSE /* Define to enable verbose debug */ #ifdef SSI_DEBUG -# define ssidbg lldbg +# define ssidbg llerr # ifdef SSI_VERBOSE -# define ssiinfo lldbg +# define ssiinfo llerr # else # define ssiinfo(x...) # endif diff --git a/configs/lm3s6965-ek/src/lm_ethernet.c b/configs/lm3s6965-ek/src/lm_ethernet.c index 4a467dd459..d6e8725de3 100644 --- a/configs/lm3s6965-ek/src/lm_ethernet.c +++ b/configs/lm3s6965-ek/src/lm_ethernet.c @@ -83,7 +83,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr) user0 = getreg32(TIVA_FLASH_USERREG0); user1 = getreg32(TIVA_FLASH_USERREG1); - nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); + nllerr("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff); /* Re-format that MAC address the way that the network expects to see it */ diff --git a/configs/lm3s6965-ek/src/lm_leds.c b/configs/lm3s6965-ek/src/lm_leds.c index 1f38fe65ae..7bd3bdea2e 100644 --- a/configs/lm3s6965-ek/src/lm_leds.c +++ b/configs/lm3s6965-ek/src/lm_leds.c @@ -60,7 +60,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/lm3s6965-ek/src/lm_oled.c b/configs/lm3s6965-ek/src/lm_oled.c index f289c65bad..0d4f1fb2ba 100644 --- a/configs/lm3s6965-ek/src/lm_oled.c +++ b/configs/lm3s6965-ek/src/lm_oled.c @@ -114,7 +114,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) spi = tiva_ssibus_initialize(0); if (!spi) { - glldbg("Failed to initialize SSI port 0\n"); + gllerr("Failed to initialize SSI port 0\n"); } else { @@ -123,7 +123,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) dev = rit_initialize(spi, devno); if (!dev) { - glldbg("Failed to bind SSI port 0 to OLED %d: %d\n", devno); + gllerr("Failed to bind SSI port 0 to OLED %d: %d\n", devno); } else { diff --git a/configs/lm3s6965-ek/src/lm_ssi.c b/configs/lm3s6965-ek/src/lm_ssi.c index 9e18cbe60e..12126e6940 100644 --- a/configs/lm3s6965-ek/src/lm_ssi.c +++ b/configs/lm3s6965-ek/src/lm_ssi.c @@ -65,9 +65,9 @@ #undef SSI_VERBOSE /* Define to enable verbose debug */ #ifdef SSI_DEBUG -# define ssidbg lldbg +# define ssidbg llerr # ifdef SSI_VERBOSE -# define ssiinfo lldbg +# define ssiinfo llerr # else # define ssiinfo(x...) # endif diff --git a/configs/lm3s8962-ek/src/lm_ethernet.c b/configs/lm3s8962-ek/src/lm_ethernet.c index a6d4da70e9..319e0fac59 100644 --- a/configs/lm3s8962-ek/src/lm_ethernet.c +++ b/configs/lm3s8962-ek/src/lm_ethernet.c @@ -83,7 +83,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr) user0 = getreg32(TIVA_FLASH_USERREG0); user1 = getreg32(TIVA_FLASH_USERREG1); - nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); + nllerr("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff); /* Re-format that MAC address the way that the network expects to see it */ diff --git a/configs/lm3s8962-ek/src/lm_leds.c b/configs/lm3s8962-ek/src/lm_leds.c index 0274ddc1fd..b1fa2421d0 100644 --- a/configs/lm3s8962-ek/src/lm_leds.c +++ b/configs/lm3s8962-ek/src/lm_leds.c @@ -60,7 +60,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/lm3s8962-ek/src/lm_oled.c b/configs/lm3s8962-ek/src/lm_oled.c index 74e5cd9164..93f5344286 100644 --- a/configs/lm3s8962-ek/src/lm_oled.c +++ b/configs/lm3s8962-ek/src/lm_oled.c @@ -113,7 +113,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) spi = tiva_ssibus_initialize(0); if (!spi) { - glldbg("Failed to initialize SSI port 0\n"); + gllerr("Failed to initialize SSI port 0\n"); } else { @@ -122,7 +122,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) dev = rit_initialize(spi, devno); if (!dev) { - glldbg("Failed to bind SSI port 0 to OLED %d: %d\n", devno); + gllerr("Failed to bind SSI port 0 to OLED %d: %d\n", devno); } else { diff --git a/configs/lm3s8962-ek/src/lm_ssi.c b/configs/lm3s8962-ek/src/lm_ssi.c index a0a32472ac..3a068665cb 100644 --- a/configs/lm3s8962-ek/src/lm_ssi.c +++ b/configs/lm3s8962-ek/src/lm_ssi.c @@ -65,9 +65,9 @@ #undef SSI_VERBOSE /* Define to enable verbose debug */ #ifdef SSI_DEBUG -# define ssidbg lldbg +# define ssidbg llerr # ifdef SSI_VERBOSE -# define ssiinfo lldbg +# define ssiinfo llerr # else # define ssiinfo(x...) # endif diff --git a/configs/lm4f120-launchpad/src/lm4f_autoleds.c b/configs/lm4f120-launchpad/src/lm4f_autoleds.c index 0fcb45ffa8..b55efa7b95 100644 --- a/configs/lm4f120-launchpad/src/lm4f_autoleds.c +++ b/configs/lm4f120-launchpad/src/lm4f_autoleds.c @@ -102,7 +102,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/lm4f120-launchpad/src/lm4f_ssi.c b/configs/lm4f120-launchpad/src/lm4f_ssi.c index 0acbe8f4d1..a11a168108 100644 --- a/configs/lm4f120-launchpad/src/lm4f_ssi.c +++ b/configs/lm4f120-launchpad/src/lm4f_ssi.c @@ -63,7 +63,7 @@ /* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ #ifdef CONFIG_DEBUG_SPI -# define ssidbg lldbg +# define ssidbg llerr #else # define ssidbg(x...) #endif @@ -71,7 +71,7 @@ /* Dump GPIO registers */ #if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO) -# define ssiinfo lldbg +# define ssiinfo llerr # define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m) #else # define ssiinfo(x...) diff --git a/configs/lpc4330-xplorer/src/lpc43_autoleds.c b/configs/lpc4330-xplorer/src/lpc43_autoleds.c index 2d67cde475..c12d1ba62e 100644 --- a/configs/lpc4330-xplorer/src/lpc43_autoleds.c +++ b/configs/lpc4330-xplorer/src/lpc43_autoleds.c @@ -95,10 +95,10 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO # define LED_VERBOSE 1 -# define ledinfo lldbg +# define ledinfo llerr # else # undef LED_VERBOSE # define ledinfo(x...) diff --git a/configs/lpc4330-xplorer/src/lpc43_userleds.c b/configs/lpc4330-xplorer/src/lpc43_userleds.c index 0de6d63063..07735ddec1 100644 --- a/configs/lpc4330-xplorer/src/lpc43_userleds.c +++ b/configs/lpc4330-xplorer/src/lpc43_userleds.c @@ -72,10 +72,10 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO # define LED_VERBOSE 1 -# define ledinfo lldbg +# define ledinfo llerr # else # undef LED_VERBOSE # define ledinfo(x...) diff --git a/configs/lpc4357-evb/src/lpc43_autoleds.c b/configs/lpc4357-evb/src/lpc43_autoleds.c index 31589a84da..dd589c240e 100644 --- a/configs/lpc4357-evb/src/lpc43_autoleds.c +++ b/configs/lpc4357-evb/src/lpc43_autoleds.c @@ -92,10 +92,10 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO # define LED_VERBOSE 1 -# define ledinfo lldbg +# define ledinfo llerr # else # undef LED_VERBOSE # define ledinfo(x...) diff --git a/configs/lpc4357-evb/src/lpc43_userleds.c b/configs/lpc4357-evb/src/lpc43_userleds.c index 29086a86d0..5ac10a9db0 100644 --- a/configs/lpc4357-evb/src/lpc43_userleds.c +++ b/configs/lpc4357-evb/src/lpc43_userleds.c @@ -83,10 +83,10 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO # define LED_VERBOSE 1 -# define ledinfo lldbg +# define ledinfo llerr # else # undef LED_VERBOSE # define ledinfo(x...) diff --git a/configs/lpc4370-link2/src/lpc43_autoleds.c b/configs/lpc4370-link2/src/lpc43_autoleds.c index 8e9edbf141..ac30ba5842 100644 --- a/configs/lpc4370-link2/src/lpc43_autoleds.c +++ b/configs/lpc4370-link2/src/lpc43_autoleds.c @@ -64,10 +64,10 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO # define LED_VERBOSE 1 -# define ledinfo lldbg +# define ledinfo llerr # else # undef LED_VERBOSE # define ledinfo(x...) diff --git a/configs/lpc4370-link2/src/lpc43_userleds.c b/configs/lpc4370-link2/src/lpc43_userleds.c index 294bf48078..da911674f0 100644 --- a/configs/lpc4370-link2/src/lpc43_userleds.c +++ b/configs/lpc4370-link2/src/lpc43_userleds.c @@ -65,10 +65,10 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO # define LED_VERBOSE 1 -# define ledinfo lldbg +# define ledinfo llerr # else # undef LED_VERBOSE # define ledinfo(x...) diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_leds.c b/configs/lpcxpresso-lpc1115/src/lpc11_leds.c index 06bb3e57c5..8154cfa283 100644 --- a/configs/lpcxpresso-lpc1115/src/lpc11_leds.c +++ b/configs/lpcxpresso-lpc1115/src/lpc11_leds.c @@ -61,9 +61,9 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO -# define ledinfo lldbg +# define ledinfo llerr # else # define ledinfo(x...) # endif diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c b/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c index 08847387ca..22e07f92f3 100644 --- a/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c +++ b/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c @@ -64,9 +64,9 @@ #undef SSP_VERBOSE /* Define to enable verbose debug */ #ifdef SSP_DEBUG -# define sspdbg lldbg +# define sspdbg llerr # ifdef SSP_VERBOSE -# define sspinfo lldbg +# define sspinfo llerr # else # define sspinfo(x...) # endif diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_leds.c b/configs/lpcxpresso-lpc1768/src/lpc17_leds.c index cd18e6846e..b6d77696b3 100644 --- a/configs/lpcxpresso-lpc1768/src/lpc17_leds.c +++ b/configs/lpcxpresso-lpc1768/src/lpc17_leds.c @@ -61,9 +61,9 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO -# define ledinfo lldbg +# define ledinfo llerr # else # define ledinfo(x...) # endif diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_oled.c b/configs/lpcxpresso-lpc1768/src/lpc17_oled.c index 5610c90c9c..9b93b6e48b 100644 --- a/configs/lpcxpresso-lpc1768/src/lpc17_oled.c +++ b/configs/lpcxpresso-lpc1768/src/lpc17_oled.c @@ -128,7 +128,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) spi = lpc17_sspbus_initialize(1); if (!spi) { - glldbg("Failed to initialize SPI port 1\n"); + gllerr("Failed to initialize SPI port 1\n"); } else { @@ -137,7 +137,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) dev = ug_initialize(spi, devno); if (!dev) { - glldbg("Failed to bind SPI port 1 to OLED %d: %d\n", devno); + gllerr("Failed to bind SPI port 1 to OLED %d: %d\n", devno); } else { diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c b/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c index f3239e42a8..4de4225e13 100644 --- a/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c +++ b/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c @@ -64,9 +64,9 @@ #undef SSP_VERBOSE /* Define to enable verbose debug */ #ifdef SSP_DEBUG -# define sspdbg lldbg +# define sspdbg llerr # ifdef SSP_VERBOSE -# define sspinfo lldbg +# define sspinfo llerr # else # define sspinfo(x...) # endif diff --git a/configs/maple/src/stm32_leds.c b/configs/maple/src/stm32_leds.c index 22f1d4e55a..21ebcd63e7 100644 --- a/configs/maple/src/stm32_leds.c +++ b/configs/maple/src/stm32_leds.c @@ -62,7 +62,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/maple/src/stm32_spi.c b/configs/maple/src/stm32_spi.c index 9100c5632a..367c3923af 100644 --- a/configs/maple/src/stm32_spi.c +++ b/configs/maple/src/stm32_spi.c @@ -67,9 +67,9 @@ #endif #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/maple/src/stm32_usbdev.c b/configs/maple/src/stm32_usbdev.c index 5c00747708..6fdb963ec8 100644 --- a/configs/maple/src/stm32_usbdev.c +++ b/configs/maple/src/stm32_usbdev.c @@ -74,7 +74,7 @@ void stm32_usbinitialize(void) { - ulldbg("called\n"); + ullerr("called\n"); /* USB Soft Connect Pullup */ @@ -113,5 +113,5 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable) void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } diff --git a/configs/mbed/src/lpc17_leds.c b/configs/mbed/src/lpc17_leds.c index c303cc33b9..ad5d98ad04 100644 --- a/configs/mbed/src/lpc17_leds.c +++ b/configs/mbed/src/lpc17_leds.c @@ -65,9 +65,9 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO -# define ledinfo lldbg +# define ledinfo llerr # else # define ledinfo(x...) # endif diff --git a/configs/mcu123-lpc214x/src/lpc2148_spi1.c b/configs/mcu123-lpc214x/src/lpc2148_spi1.c index 3c1b5eca6e..1a550e1aaa 100644 --- a/configs/mcu123-lpc214x/src/lpc2148_spi1.c +++ b/configs/mcu123-lpc214x/src/lpc2148_spi1.c @@ -89,9 +89,9 @@ /* Enables debug output from this file */ #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/mikroe-stm32f4/src/stm32_idle.c b/configs/mikroe-stm32f4/src/stm32_idle.c index 12c855b497..4af462bb6b 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) { - lldbg("newstate= %d oldstate=%d\n", newstate, oldstate); + llerr("newstate= %d oldstate=%d\n", newstate, oldstate); flags = enter_critical_section(); diff --git a/configs/mikroe-stm32f4/src/stm32_spi.c b/configs/mikroe-stm32f4/src/stm32_spi.c index e35b332c6a..1df1b6ee2f 100644 --- a/configs/mikroe-stm32f4/src/stm32_spi.c +++ b/configs/mikroe-stm32f4/src/stm32_spi.c @@ -69,9 +69,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/mikroe-stm32f4/src/stm32_usb.c b/configs/mikroe-stm32f4/src/stm32_usb.c index 81e25dd12b..360dc363ba 100644 --- a/configs/mikroe-stm32f4/src/stm32_usb.c +++ b/configs/mikroe-stm32f4/src/stm32_usb.c @@ -300,7 +300,7 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler) #ifdef CONFIG_USBDEV void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } #endif diff --git a/configs/mikroe-stm32f4/src/stm32_vs1053.c b/configs/mikroe-stm32f4/src/stm32_vs1053.c index 7311ae07ed..d8506e34a6 100644 --- a/configs/mikroe-stm32f4/src/stm32_vs1053.c +++ b/configs/mikroe-stm32f4/src/stm32_vs1053.c @@ -187,7 +187,7 @@ void up_vs1053initialize(FAR struct spi_dev_s* spi) pVs1053 = vs1053_initialize(spi, &g_vs1053lower.lower, VS1053_DEVNO); if (pVs1053 == NULL) { - audlldbg("Failed to bind SPI port %d VS1053 device\n", VS1053_DEVNO); + audllerr("Failed to bind SPI port %d VS1053 device\n", VS1053_DEVNO); return; } diff --git a/configs/mirtoo/src/pic32_leds.c b/configs/mirtoo/src/pic32_leds.c index 99b3f8195b..bd5a9cbc3f 100644 --- a/configs/mirtoo/src/pic32_leds.c +++ b/configs/mirtoo/src/pic32_leds.c @@ -94,9 +94,9 @@ /* Debug ********************************************************************/ #if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS) -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO -# define ledinfo lldbg +# define ledinfo llerr # else # define ledinfo(x...) # endif diff --git a/configs/mirtoo/src/pic32_spi2.c b/configs/mirtoo/src/pic32_spi2.c index bd3446a1d8..127c01b833 100644 --- a/configs/mirtoo/src/pic32_spi2.c +++ b/configs/mirtoo/src/pic32_spi2.c @@ -98,7 +98,7 @@ */ #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # define spiinfo llinfo #else # define spidbg(x...) diff --git a/configs/moteino-mega/src/avr_leds.c b/configs/moteino-mega/src/avr_leds.c index 3770e8e927..8920ebbe40 100644 --- a/configs/moteino-mega/src/avr_leds.c +++ b/configs/moteino-mega/src/avr_leds.c @@ -62,9 +62,9 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO -# define ledinfo lldbg +# define ledinfo llerr # else # define ledinfo(x...) # endif diff --git a/configs/ne64badge/src/m9s12_buttons.c b/configs/ne64badge/src/m9s12_buttons.c index e35663b075..b4de029b42 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 btndbg lldbg +# define btndbg llerr # ifdef BUTTON_VERBOSE -# define btninfo lldbg +# define btninfo llerr # else # define btninfo(x...) # endif diff --git a/configs/ne64badge/src/m9s12_leds.c b/configs/ne64badge/src/m9s12_leds.c index 414b243000..6d82d0283d 100644 --- a/configs/ne64badge/src/m9s12_leds.c +++ b/configs/ne64badge/src/m9s12_leds.c @@ -57,9 +57,9 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO -# define ledinfo lldbg +# define ledinfo llerr # else # define ledinfo(x...) # endif diff --git a/configs/ne64badge/src/m9s12_spi.c b/configs/ne64badge/src/m9s12_spi.c index 4e69581a86..c1586210f2 100644 --- a/configs/ne64badge/src/m9s12_spi.c +++ b/configs/ne64badge/src/m9s12_spi.c @@ -60,9 +60,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/ntosd-dm320/src/dm320_network.c b/configs/ntosd-dm320/src/dm320_network.c index 5edeb32f39..a08f4a4e3f 100644 --- a/configs/ntosd-dm320/src/dm320_network.c +++ b/configs/ntosd-dm320/src/dm320_network.c @@ -79,7 +79,7 @@ void up_netinitialize(void) * width is 16-bits. */ - nlldbg("CS4CTRL1=%04x CS4CTRL2=%04x\n", + nllerr("CS4CTRL1=%04x CS4CTRL2=%04x\n", getreg16(DM320_EMIF_CS4CTRL1), getreg16(DM320_EMIF_CS4CTRL2)); /* It is assumed that bootloader has already configured CS4. Here, @@ -91,7 +91,7 @@ void up_netinitialize(void) GIO_INTERRUPT(GIO_DM9000A_INT); GIO_RISINGEDGE(GIO_DM9000A_INT); - nlldbg("GIO DIR0=%04x INV0=%04x IRQPORT=%04x IRQEDGE=%04x\n", + nllerr("GIO DIR0=%04x INV0=%04x IRQPORT=%04x IRQEDGE=%04x\n", getreg16(DM320_GIO_DIR0), getreg16(DM320_GIO_INV0), getreg16(DM320_GIO_IRQPORT), getreg16(DM320_GIO_IRQEDGE)); diff --git a/configs/nucleo-144/src/stm32_autoleds.c b/configs/nucleo-144/src/stm32_autoleds.c index 5003ea4384..d09ca0114d 100644 --- a/configs/nucleo-144/src/stm32_autoleds.c +++ b/configs/nucleo-144/src/stm32_autoleds.c @@ -59,7 +59,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/nucleo-144/src/stm32_spi.c b/configs/nucleo-144/src/stm32_spi.c index 498a664539..4b3dd05560 100644 --- a/configs/nucleo-144/src/stm32_spi.c +++ b/configs/nucleo-144/src/stm32_spi.c @@ -62,9 +62,9 @@ ************************************************************************************/ #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/nucleo-144/src/stm32_userleds.c b/configs/nucleo-144/src/stm32_userleds.c index 1794a2845b..9325e07d19 100644 --- a/configs/nucleo-144/src/stm32_userleds.c +++ b/configs/nucleo-144/src/stm32_userleds.c @@ -61,7 +61,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/nucleo-f303re/src/stm32_autoleds.c b/configs/nucleo-f303re/src/stm32_autoleds.c index 098fe24563..cd20b4eea7 100644 --- a/configs/nucleo-f303re/src/stm32_autoleds.c +++ b/configs/nucleo-f303re/src/stm32_autoleds.c @@ -62,7 +62,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/nucleo-f303re/src/stm32_can.c b/configs/nucleo-f303re/src/stm32_can.c index c99a6773d5..96d5351f7e 100644 --- a/configs/nucleo-f303re/src/stm32_can.c +++ b/configs/nucleo-f303re/src/stm32_can.c @@ -62,12 +62,12 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg # define caninfo info -# define canlldbg lldbg +# define canllerr llerr # define canllinfo llinfo #else # define candbg(x...) # define caninfo(x...) -# define canlldbg(x...) +# define canllerr(x...) # define canllinfo(x...) #endif diff --git a/configs/nucleo-f303re/src/stm32_pwm.c b/configs/nucleo-f303re/src/stm32_pwm.c index 58c8942f46..fd7bf916e3 100644 --- a/configs/nucleo-f303re/src/stm32_pwm.c +++ b/configs/nucleo-f303re/src/stm32_pwm.c @@ -63,12 +63,12 @@ #ifdef CONFIG_DEBUG_PWM # define pwmdbg dbg # define pwminfo info -# define pwmlldbg lldbg +# define pwmllerr llerr # define pwmllinfo llinfo #else # define pwmdbg(x...) # define pwminfo(x...) -# define pwmlldbg(x...) +# define pwmllerr(x...) # define pwmllinfo(x...) #endif diff --git a/configs/nucleo-f303re/src/stm32_spi.c b/configs/nucleo-f303re/src/stm32_spi.c index 28f4403518..8bf3a5a270 100644 --- a/configs/nucleo-f303re/src/stm32_spi.c +++ b/configs/nucleo-f303re/src/stm32_spi.c @@ -66,9 +66,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/nucleo-f303re/src/stm32_userleds.c b/configs/nucleo-f303re/src/stm32_userleds.c index bda0055d12..cd23d08ba5 100644 --- a/configs/nucleo-f303re/src/stm32_userleds.c +++ b/configs/nucleo-f303re/src/stm32_userleds.c @@ -61,7 +61,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/nucleo-f4x1re/src/stm32_autoleds.c b/configs/nucleo-f4x1re/src/stm32_autoleds.c index 20882df345..306787b1a9 100644 --- a/configs/nucleo-f4x1re/src/stm32_autoleds.c +++ b/configs/nucleo-f4x1re/src/stm32_autoleds.c @@ -63,7 +63,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/nucleo-f4x1re/src/stm32_spi.c b/configs/nucleo-f4x1re/src/stm32_spi.c index 91a3fcfc56..172998ff55 100644 --- a/configs/nucleo-f4x1re/src/stm32_spi.c +++ b/configs/nucleo-f4x1re/src/stm32_spi.c @@ -67,9 +67,9 @@ #endif #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/nucleo-f4x1re/src/stm32_userleds.c b/configs/nucleo-f4x1re/src/stm32_userleds.c index ad45a69390..951b2b7cfe 100644 --- a/configs/nucleo-f4x1re/src/stm32_userleds.c +++ b/configs/nucleo-f4x1re/src/stm32_userleds.c @@ -63,7 +63,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/nucleo-l476rg/src/stm32_autoleds.c b/configs/nucleo-l476rg/src/stm32_autoleds.c index 667fd024a0..c94472e74e 100644 --- a/configs/nucleo-l476rg/src/stm32_autoleds.c +++ b/configs/nucleo-l476rg/src/stm32_autoleds.c @@ -63,7 +63,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/nucleo-l476rg/src/stm32_spi.c b/configs/nucleo-l476rg/src/stm32_spi.c index a98a19c963..e359670b47 100644 --- a/configs/nucleo-l476rg/src/stm32_spi.c +++ b/configs/nucleo-l476rg/src/stm32_spi.c @@ -67,9 +67,9 @@ #endif #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/nucleo-l476rg/src/stm32_userleds.c b/configs/nucleo-l476rg/src/stm32_userleds.c index 0521655dc4..1745510298 100644 --- a/configs/nucleo-l476rg/src/stm32_userleds.c +++ b/configs/nucleo-l476rg/src/stm32_userleds.c @@ -63,7 +63,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/nutiny-nuc120/src/nuc_led.c b/configs/nutiny-nuc120/src/nuc_led.c index 712fec27c5..8d8596c2f9 100644 --- a/configs/nutiny-nuc120/src/nuc_led.c +++ b/configs/nutiny-nuc120/src/nuc_led.c @@ -81,9 +81,9 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO -# define ledinfo lldbg +# define ledinfo llerr # else # define ledinfo(x...) # endif diff --git a/configs/olimex-lpc-h3131/src/lpc31_leds.c b/configs/olimex-lpc-h3131/src/lpc31_leds.c index 6817a1d3f3..398afab3d3 100644 --- a/configs/olimex-lpc-h3131/src/lpc31_leds.c +++ b/configs/olimex-lpc-h3131/src/lpc31_leds.c @@ -62,7 +62,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/olimex-lpc-h3131/src/lpc31_spi.c b/configs/olimex-lpc-h3131/src/lpc31_spi.c index f8a13297c0..3da8396047 100644 --- a/configs/olimex-lpc-h3131/src/lpc31_spi.c +++ b/configs/olimex-lpc-h3131/src/lpc31_spi.c @@ -65,9 +65,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/olimex-lpc1766stk/src/lpc17_can.c b/configs/olimex-lpc1766stk/src/lpc17_can.c index 7a5e6f7941..43bddd81a9 100644 --- a/configs/olimex-lpc1766stk/src/lpc17_can.c +++ b/configs/olimex-lpc1766stk/src/lpc17_can.c @@ -79,12 +79,12 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg # define caninfo info -# define canlldbg lldbg +# define canllerr llerr # define canllinfo llinfo #else # define candbg(x...) # define caninfo(x...) -# define canlldbg(x...) +# define canllerr(x...) # define canllinfo(x...) #endif diff --git a/configs/olimex-lpc1766stk/src/lpc17_hidmouse.c b/configs/olimex-lpc1766stk/src/lpc17_hidmouse.c index 4bbd85984d..cda2a94a9c 100644 --- a/configs/olimex-lpc1766stk/src/lpc17_hidmouse.c +++ b/configs/olimex-lpc1766stk/src/lpc17_hidmouse.c @@ -62,8 +62,8 @@ #ifndef CONFIG_DEBUG_INPUT # undef idbg # define idbg udbg -# undef illdbg -# define illdbg ulldbg +# undef illerr +# define illerr ullerr # undef iinfo # define iinfo uinfo # undef illinfo diff --git a/configs/olimex-lpc1766stk/src/lpc17_lcd.c b/configs/olimex-lpc1766stk/src/lpc17_lcd.c index 7861edf614..5443ad2e50 100644 --- a/configs/olimex-lpc1766stk/src/lpc17_lcd.c +++ b/configs/olimex-lpc1766stk/src/lpc17_lcd.c @@ -214,7 +214,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) spi = lpc17_sspbus_initialize(0); if (!spi) { - glldbg("Failed to initialize SSP port 0\n"); + gllerr("Failed to initialize SSP port 0\n"); } else { @@ -223,7 +223,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) dev = nokia_lcdinitialize(spi, devno); if (!dev) { - glldbg("Failed to bind SSP port 0 to LCD %d: %d\n", devno); + gllerr("Failed to bind SSP port 0 to LCD %d: %d\n", devno); } else { diff --git a/configs/olimex-lpc1766stk/src/lpc17_leds.c b/configs/olimex-lpc1766stk/src/lpc17_leds.c index 7299f508fc..c26cd776d2 100644 --- a/configs/olimex-lpc1766stk/src/lpc17_leds.c +++ b/configs/olimex-lpc1766stk/src/lpc17_leds.c @@ -63,9 +63,9 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO -# define ledinfo lldbg +# define ledinfo llerr # else # define ledinfo(x...) # endif diff --git a/configs/olimex-lpc1766stk/src/lpc17_ssp.c b/configs/olimex-lpc1766stk/src/lpc17_ssp.c index db562cc984..a993baafd6 100644 --- a/configs/olimex-lpc1766stk/src/lpc17_ssp.c +++ b/configs/olimex-lpc1766stk/src/lpc17_ssp.c @@ -81,9 +81,9 @@ */ #ifdef CONFIG_SSP_DEBUG -# define sspdbg lldbg +# define sspdbg llerr # ifdef CONFIG_SSP_VERBOSE -# define sspinfo lldbg +# define sspinfo llerr # else # define sspinfo(x...) # endif diff --git a/configs/olimex-stm32-h405/src/stm32_autoleds.c b/configs/olimex-stm32-h405/src/stm32_autoleds.c index 8003b79621..c3ce8056ec 100644 --- a/configs/olimex-stm32-h405/src/stm32_autoleds.c +++ b/configs/olimex-stm32-h405/src/stm32_autoleds.c @@ -60,7 +60,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/olimex-stm32-h405/src/stm32_can.c b/configs/olimex-stm32-h405/src/stm32_can.c index 4cc0324e6b..695179d017 100644 --- a/configs/olimex-stm32-h405/src/stm32_can.c +++ b/configs/olimex-stm32-h405/src/stm32_can.c @@ -71,12 +71,12 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg # define caninfo info -# define canlldbg lldbg +# define canllerr llerr # define canllinfo llinfo #else # define candbg(x...) # define caninfo(x...) -# define canlldbg(x...) +# define canllerr(x...) # define canllinfo(x...) #endif diff --git a/configs/olimex-stm32-h405/src/stm32_usb.c b/configs/olimex-stm32-h405/src/stm32_usb.c index 438821fec2..d825f90752 100644 --- a/configs/olimex-stm32-h405/src/stm32_usb.c +++ b/configs/olimex-stm32-h405/src/stm32_usb.c @@ -110,7 +110,7 @@ void stm32_usbinitialize(void) #ifdef CONFIG_USBDEV void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } #endif diff --git a/configs/olimex-stm32-h405/src/stm32_userleds.c b/configs/olimex-stm32-h405/src/stm32_userleds.c index 00bb661f4e..34057f150d 100644 --- a/configs/olimex-stm32-h405/src/stm32_userleds.c +++ b/configs/olimex-stm32-h405/src/stm32_userleds.c @@ -57,7 +57,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/olimex-stm32-h407/src/stm32_autoleds.c b/configs/olimex-stm32-h407/src/stm32_autoleds.c index 6f19d4a630..f1c65cafbc 100644 --- a/configs/olimex-stm32-h407/src/stm32_autoleds.c +++ b/configs/olimex-stm32-h407/src/stm32_autoleds.c @@ -63,7 +63,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/olimex-stm32-h407/src/stm32_can.c b/configs/olimex-stm32-h407/src/stm32_can.c index d00cf068c8..3056d80a27 100644 --- a/configs/olimex-stm32-h407/src/stm32_can.c +++ b/configs/olimex-stm32-h407/src/stm32_can.c @@ -71,12 +71,12 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg # define caninfo info -# define canlldbg lldbg +# define canllerr llerr # define canllinfo llinfo #else # define candbg(x...) # define caninfo(x...) -# define canlldbg(x...) +# define canllerr(x...) # define canllinfo(x...) #endif diff --git a/configs/olimex-stm32-h407/src/stm32_usb.c b/configs/olimex-stm32-h407/src/stm32_usb.c index adee4357b4..2f925d437a 100644 --- a/configs/olimex-stm32-h407/src/stm32_usb.c +++ b/configs/olimex-stm32-h407/src/stm32_usb.c @@ -307,7 +307,7 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler) #ifdef CONFIG_USBDEV void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } #endif diff --git a/configs/olimex-stm32-h407/src/stm32_userleds.c b/configs/olimex-stm32-h407/src/stm32_userleds.c index a4dd9aa31f..7a5a58049c 100644 --- a/configs/olimex-stm32-h407/src/stm32_userleds.c +++ b/configs/olimex-stm32-h407/src/stm32_userleds.c @@ -62,7 +62,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/olimex-stm32-p107/src/stm32_can.c b/configs/olimex-stm32-p107/src/stm32_can.c index 635d3ad5ff..dc48f06ae0 100644 --- a/configs/olimex-stm32-p107/src/stm32_can.c +++ b/configs/olimex-stm32-p107/src/stm32_can.c @@ -67,12 +67,12 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg # define caninfo info -# define canlldbg lldbg +# define canllerr llerr # define canllinfo llinfo #else # define candbg(x...) # define caninfo(x...) -# define canlldbg(x...) +# define canllerr(x...) # define canllinfo(x...) #endif diff --git a/configs/olimex-stm32-p107/src/stm32_encx24j600.c b/configs/olimex-stm32-p107/src/stm32_encx24j600.c index 39f3d012f0..daa818e2af 100644 --- a/configs/olimex-stm32-p107/src/stm32_encx24j600.c +++ b/configs/olimex-stm32-p107/src/stm32_encx24j600.c @@ -180,7 +180,7 @@ void up_netinitialize(void) spi = stm32_spibus_initialize(ENCX24J600_SPI_PORTNO); if (!spi) { - nlldbg("Failed to initialize SPI port %d\n", ENCX24J600_SPI_PORTNO); + nllerr("Failed to initialize SPI port %d\n", ENCX24J600_SPI_PORTNO); return; } @@ -190,7 +190,7 @@ void up_netinitialize(void) if (ret < 0) { - nlldbg("Failed to bind SPI port %d ENCX24J600 device %d: %d\n", + nllerr("Failed to bind SPI port %d ENCX24J600 device %d: %d\n", ENCX24J600_SPI_PORTNO, ENCX24J600_DEVNO, ret); return; } diff --git a/configs/olimex-stm32-p107/src/stm32_spi.c b/configs/olimex-stm32-p107/src/stm32_spi.c index b45af59735..befcd373a3 100644 --- a/configs/olimex-stm32-p107/src/stm32_spi.c +++ b/configs/olimex-stm32-p107/src/stm32_spi.c @@ -64,9 +64,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/olimex-stm32-p207/src/stm32_autoleds.c b/configs/olimex-stm32-p207/src/stm32_autoleds.c index 334b123e1c..d4c70ea380 100644 --- a/configs/olimex-stm32-p207/src/stm32_autoleds.c +++ b/configs/olimex-stm32-p207/src/stm32_autoleds.c @@ -60,7 +60,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/olimex-stm32-p207/src/stm32_can.c b/configs/olimex-stm32-p207/src/stm32_can.c index 49fe8e8128..a6441e5513 100644 --- a/configs/olimex-stm32-p207/src/stm32_can.c +++ b/configs/olimex-stm32-p207/src/stm32_can.c @@ -71,12 +71,12 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg # define caninfo info -# define canlldbg lldbg +# define canllerr llerr # define canllinfo llinfo #else # define candbg(x...) # define caninfo(x...) -# define canlldbg(x...) +# define canllerr(x...) # define canllinfo(x...) #endif diff --git a/configs/olimex-stm32-p207/src/stm32_usb.c b/configs/olimex-stm32-p207/src/stm32_usb.c index 3f00e5a991..15358557b1 100644 --- a/configs/olimex-stm32-p207/src/stm32_usb.c +++ b/configs/olimex-stm32-p207/src/stm32_usb.c @@ -311,7 +311,7 @@ void stm32_usbhost_vbusdrive(int iface, bool enable) #ifdef CONFIG_USBDEV void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } #endif diff --git a/configs/olimex-stm32-p207/src/stm32_userleds.c b/configs/olimex-stm32-p207/src/stm32_userleds.c index b11a576508..b1656100f7 100644 --- a/configs/olimex-stm32-p207/src/stm32_userleds.c +++ b/configs/olimex-stm32-p207/src/stm32_userleds.c @@ -57,7 +57,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/olimex-strp711/src/str71_enc28j60.c b/configs/olimex-strp711/src/str71_enc28j60.c index bd98539b2e..3e93da0fe6 100644 --- a/configs/olimex-strp711/src/str71_enc28j60.c +++ b/configs/olimex-strp711/src/str71_enc28j60.c @@ -216,7 +216,7 @@ void up_netinitialize(void) spi = str71_spibus_initialize(ENC28J60_SPI_PORTNO); if (!spi) { - nlldbg("Failed to initialize SPI port %d\n", ENC28J60_SPI_PORTNO); + nllerr("Failed to initialize SPI port %d\n", ENC28J60_SPI_PORTNO); return; } @@ -225,7 +225,7 @@ void up_netinitialize(void) ret = str71x_xticonfig(ENC28J60_IRQ, false); if (ret < 0) { - nlldbg("Failed configure interrupt for IRQ %d: %d\n", ENC28J60_IRQ, ret); + nllerr("Failed configure interrupt for IRQ %d: %d\n", ENC28J60_IRQ, ret); return; } @@ -240,7 +240,7 @@ void up_netinitialize(void) ret = enc_initialize(spi, &g_enclower, ENC28J60_DEVNO); if (ret < 0) { - nlldbg("Failed to bind SPI port %d ENC28J60 device %d: %d\n", + nllerr("Failed to bind SPI port %d ENC28J60 device %d: %d\n", ENC28J60_SPI_PORTNO, ENC28J60_DEVNO, ret); return; } diff --git a/configs/olimexino-stm32/src/stm32_can.c b/configs/olimexino-stm32/src/stm32_can.c index ebec02cda0..8197ca1a3f 100644 --- a/configs/olimexino-stm32/src/stm32_can.c +++ b/configs/olimexino-stm32/src/stm32_can.c @@ -70,12 +70,12 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg # define caninfo info -# define canlldbg lldbg +# define canllerr llerr # define canllinfo llinfo #else # define candbg(x...) # define caninfo(x...) -# define canlldbg(x...) +# define canllerr(x...) # define canllinfo(x...) #endif diff --git a/configs/olimexino-stm32/src/stm32_leds.c b/configs/olimexino-stm32/src/stm32_leds.c index f51b89e165..9a972d7983 100644 --- a/configs/olimexino-stm32/src/stm32_leds.c +++ b/configs/olimexino-stm32/src/stm32_leds.c @@ -59,9 +59,9 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO -# define ledinfo lldbg +# define ledinfo llerr # else # define ledinfo(x...) # endif diff --git a/configs/olimexino-stm32/src/stm32_spi.c b/configs/olimexino-stm32/src/stm32_spi.c index e71ab183c0..9fab4ec2e7 100644 --- a/configs/olimexino-stm32/src/stm32_spi.c +++ b/configs/olimexino-stm32/src/stm32_spi.c @@ -65,9 +65,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/olimexino-stm32/src/stm32_usbdev.c b/configs/olimexino-stm32/src/stm32_usbdev.c index 8e600c508f..30ea651457 100644 --- a/configs/olimexino-stm32/src/stm32_usbdev.c +++ b/configs/olimexino-stm32/src/stm32_usbdev.c @@ -90,7 +90,7 @@ void stm32_usb_set_pwr_callback(xcpt_t pwr_changed_handler) void stm32_usbinitialize(void) { - ulldbg("called\n"); + ullerr("called\n"); /* USB Soft Connect Pullup */ @@ -129,5 +129,5 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable) void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } diff --git a/configs/open1788/src/lpc17_autoleds.c b/configs/open1788/src/lpc17_autoleds.c index 30b44682a6..c004063ea0 100644 --- a/configs/open1788/src/lpc17_autoleds.c +++ b/configs/open1788/src/lpc17_autoleds.c @@ -139,9 +139,9 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO -# define ledinfo lldbg +# define ledinfo llerr # else # define ledinfo(x...) # endif diff --git a/configs/open1788/src/lpc17_ssp.c b/configs/open1788/src/lpc17_ssp.c index c957a2442f..0cc9039aeb 100644 --- a/configs/open1788/src/lpc17_ssp.c +++ b/configs/open1788/src/lpc17_ssp.c @@ -64,9 +64,9 @@ /* Debug ********************************************************************/ #ifdef CONFIG_DEBUG_SPI -# define sspdbg lldbg +# define sspdbg llerr # ifdef CONFIG_DEBUG_INFO -# define sspinfo lldbg +# define sspinfo llerr # else # define sspinfo(x...) # endif diff --git a/configs/open1788/src/lpc17_userleds.c b/configs/open1788/src/lpc17_userleds.c index 2f75e67847..8a3f1fef4f 100644 --- a/configs/open1788/src/lpc17_userleds.c +++ b/configs/open1788/src/lpc17_userleds.c @@ -65,9 +65,9 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO -# define ledinfo lldbg +# define ledinfo llerr # else # define ledinfo(x...) # endif diff --git a/configs/pcduino-a10/src/a1x_leds.c b/configs/pcduino-a10/src/a1x_leds.c index 69b00d196b..9e2c6f2f4b 100644 --- a/configs/pcduino-a10/src/a1x_leds.c +++ b/configs/pcduino-a10/src/a1x_leds.c @@ -95,7 +95,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/pic32mx-starterkit/src/pic32mx_leds.c b/configs/pic32mx-starterkit/src/pic32mx_leds.c index 705de956ad..a349698987 100644 --- a/configs/pic32mx-starterkit/src/pic32mx_leds.c +++ b/configs/pic32mx-starterkit/src/pic32mx_leds.c @@ -98,9 +98,9 @@ /* Debug ********************************************************************/ #if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS) -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO -# define ledinfo lldbg +# define ledinfo llerr # else # define ledinfo(x...) # endif diff --git a/configs/pic32mx-starterkit/src/pic32mx_spi.c b/configs/pic32mx-starterkit/src/pic32mx_spi.c index 4b18174c1c..65374d648e 100644 --- a/configs/pic32mx-starterkit/src/pic32mx_spi.c +++ b/configs/pic32mx-starterkit/src/pic32mx_spi.c @@ -65,9 +65,9 @@ */ #ifdef CONFIG_SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/pic32mx7mmb/src/pic32_leds.c b/configs/pic32mx7mmb/src/pic32_leds.c index 88cbbd164a..1cb9a6082f 100644 --- a/configs/pic32mx7mmb/src/pic32_leds.c +++ b/configs/pic32mx7mmb/src/pic32_leds.c @@ -101,9 +101,9 @@ /* Debug ********************************************************************/ #if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS) -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO -# define ledinfo lldbg +# define ledinfo llerr # else # define ledinfo(x...) # endif diff --git a/configs/pic32mx7mmb/src/pic32_spi.c b/configs/pic32mx7mmb/src/pic32_spi.c index 1768e5ddd6..58ea77bfa8 100644 --- a/configs/pic32mx7mmb/src/pic32_spi.c +++ b/configs/pic32mx7mmb/src/pic32_spi.c @@ -81,7 +81,7 @@ */ #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # define spiinfo llinfo #else # define spidbg(x...) diff --git a/configs/pic32mz-starterkit/src/pic32mz_autoleds.c b/configs/pic32mz-starterkit/src/pic32mz_autoleds.c index db41f99420..e4f93f0ecd 100644 --- a/configs/pic32mz-starterkit/src/pic32mz_autoleds.c +++ b/configs/pic32mz-starterkit/src/pic32mz_autoleds.c @@ -94,9 +94,9 @@ /* Debug ********************************************************************/ #if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS) -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO -# define ledinfo lldbg +# define ledinfo llerr # else # define ledinfo(x...) # endif diff --git a/configs/pic32mz-starterkit/src/pic32mz_spi.c b/configs/pic32mz-starterkit/src/pic32mz_spi.c index 04020e78d9..7cac4d15c8 100644 --- a/configs/pic32mz-starterkit/src/pic32mz_spi.c +++ b/configs/pic32mz-starterkit/src/pic32mz_spi.c @@ -59,9 +59,9 @@ /* Debug */ #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/pic32mz-starterkit/src/pic32mz_userleds.c b/configs/pic32mz-starterkit/src/pic32mz_userleds.c index 57849364c3..f70c99c721 100644 --- a/configs/pic32mz-starterkit/src/pic32mz_userleds.c +++ b/configs/pic32mz-starterkit/src/pic32mz_userleds.c @@ -74,9 +74,9 @@ /* Debug ********************************************************************/ #if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS) -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO -# define ledinfo lldbg +# define ledinfo llerr # else # define ledinfo(x...) # endif diff --git a/configs/sabre-6quad/src/imx_autoleds.c b/configs/sabre-6quad/src/imx_autoleds.c index 487f3d69cb..2c4f5e8fb0 100644 --- a/configs/sabre-6quad/src/imx_autoleds.c +++ b/configs/sabre-6quad/src/imx_autoleds.c @@ -87,7 +87,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/sabre-6quad/src/imx_bringup.c b/configs/sabre-6quad/src/imx_bringup.c index d4ace48cd4..2d39dbcfc2 100644 --- a/configs/sabre-6quad/src/imx_bringup.c +++ b/configs/sabre-6quad/src/imx_bringup.c @@ -51,7 +51,7 @@ /* Debug ********************************************************************/ #ifdef CONFIG_BOARD_INITIALIZE -# define SYSLOG lldbg +# define SYSLOG llerr #else # define SYSLOG dbg #endif diff --git a/configs/sam3u-ek/src/sam_leds.c b/configs/sam3u-ek/src/sam_leds.c index e2cc82a99f..abfbe76dba 100644 --- a/configs/sam3u-ek/src/sam_leds.c +++ b/configs/sam3u-ek/src/sam_leds.c @@ -63,7 +63,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/sam3u-ek/src/sam_spi.c b/configs/sam3u-ek/src/sam_spi.c index 1b7768057e..95ec69e2ce 100644 --- a/configs/sam3u-ek/src/sam_spi.c +++ b/configs/sam3u-ek/src/sam_spi.c @@ -65,9 +65,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/sam3u-ek/src/sam_usbdev.c b/configs/sam3u-ek/src/sam_usbdev.c index 6d189cee42..da36afc2da 100644 --- a/configs/sam3u-ek/src/sam_usbdev.c +++ b/configs/sam3u-ek/src/sam_usbdev.c @@ -75,5 +75,5 @@ void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } diff --git a/configs/sam4e-ek/src/sam_ethernet.c b/configs/sam4e-ek/src/sam_ethernet.c index 301cd94c37..69650ec0c9 100644 --- a/configs/sam4e-ek/src/sam_ethernet.c +++ b/configs/sam4e-ek/src/sam_ethernet.c @@ -75,10 +75,10 @@ #ifdef CONFIG_NETDEV_PHY_DEBUG # define phydbg dbg -# define phylldbg lldbg +# define phyllerr llerr #else # define phydbg(x...) -# define phylldbg(x...) +# define phyllerr(x...) #endif /************************************************************************************ diff --git a/configs/sam4e-ek/src/sam_leds.c b/configs/sam4e-ek/src/sam_leds.c index 329ff4078d..cc405266d5 100644 --- a/configs/sam4e-ek/src/sam_leds.c +++ b/configs/sam4e-ek/src/sam_leds.c @@ -103,7 +103,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/sam4e-ek/src/sam_spi.c b/configs/sam4e-ek/src/sam_spi.c index e94fbd6308..68b7469d20 100644 --- a/configs/sam4e-ek/src/sam_spi.c +++ b/configs/sam4e-ek/src/sam_spi.c @@ -65,9 +65,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/sam4e-ek/src/sam_udp.c b/configs/sam4e-ek/src/sam_udp.c index 8c271ba90a..7ed32cb291 100644 --- a/configs/sam4e-ek/src/sam_udp.c +++ b/configs/sam4e-ek/src/sam_udp.c @@ -83,5 +83,5 @@ void sam_udp_suspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } diff --git a/configs/sam4l-xplained/src/sam_autoleds.c b/configs/sam4l-xplained/src/sam_autoleds.c index 1a695ca3d3..fca3a16fb0 100644 --- a/configs/sam4l-xplained/src/sam_autoleds.c +++ b/configs/sam4l-xplained/src/sam_autoleds.c @@ -86,7 +86,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/sam4l-xplained/src/sam_spi.c b/configs/sam4l-xplained/src/sam_spi.c index 9135e6dfb4..effc159407 100644 --- a/configs/sam4l-xplained/src/sam_spi.c +++ b/configs/sam4l-xplained/src/sam_spi.c @@ -60,9 +60,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/sam4l-xplained/src/sam_userleds.c b/configs/sam4l-xplained/src/sam_userleds.c index d3849f6768..3d0c33fa96 100644 --- a/configs/sam4l-xplained/src/sam_userleds.c +++ b/configs/sam4l-xplained/src/sam_userleds.c @@ -71,7 +71,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/sam4s-xplained-pro/src/sam_autoleds.c b/configs/sam4s-xplained-pro/src/sam_autoleds.c index 22b6688d0e..31af4fa757 100644 --- a/configs/sam4s-xplained-pro/src/sam_autoleds.c +++ b/configs/sam4s-xplained-pro/src/sam_autoleds.c @@ -79,7 +79,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/sam4s-xplained-pro/src/sam_tc.c b/configs/sam4s-xplained-pro/src/sam_tc.c index a6e9fc7854..42c2e014fa 100644 --- a/configs/sam4s-xplained-pro/src/sam_tc.c +++ b/configs/sam4s-xplained-pro/src/sam_tc.c @@ -108,7 +108,7 @@ #ifdef CONFIG_DEBUG_TIMER # define tcdbg dbg -# define tclldbg lldbg +# define tcllerr llerr # ifdef CONFIG_DEBUG_INFO # define tcinfo info # define tcllinfo llinfo @@ -118,7 +118,7 @@ # endif #else # define tcdbg(x...) -# define tclldbg(x...) +# define tcllerr(x...) # define tcinfo(x...) # define tcllinfo(x...) #endif diff --git a/configs/sam4s-xplained-pro/src/sam_udp.c b/configs/sam4s-xplained-pro/src/sam_udp.c index e47c37a9fb..6ea2507bec 100644 --- a/configs/sam4s-xplained-pro/src/sam_udp.c +++ b/configs/sam4s-xplained-pro/src/sam_udp.c @@ -84,5 +84,5 @@ void sam_udp_suspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } diff --git a/configs/sam4s-xplained-pro/src/sam_userleds.c b/configs/sam4s-xplained-pro/src/sam_userleds.c index e7b604e529..bec9332670 100644 --- a/configs/sam4s-xplained-pro/src/sam_userleds.c +++ b/configs/sam4s-xplained-pro/src/sam_userleds.c @@ -61,7 +61,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/sam4s-xplained-pro/src/sam_wdt.c b/configs/sam4s-xplained-pro/src/sam_wdt.c index f9ebfb46c6..a71115560d 100644 --- a/configs/sam4s-xplained-pro/src/sam_wdt.c +++ b/configs/sam4s-xplained-pro/src/sam_wdt.c @@ -91,7 +91,7 @@ #ifdef CONFIG_DEBUG_WATCHDOG # define wdgdbg dbg -# define wdglldbg lldbg +# define wdgllerr llerr # ifdef CONFIG_DEBUG_INFO # define wdginfo info # define wdgllinfo llinfo @@ -101,7 +101,7 @@ # endif #else # define wdgdbg(x...) -# define wdglldbg(x...) +# define wdgllerr(x...) # define wdginfo(x...) # define wdgllinfo(x...) #endif diff --git a/configs/sam4s-xplained/src/sam_autoleds.c b/configs/sam4s-xplained/src/sam_autoleds.c index 289b3e01dd..238510c7c3 100644 --- a/configs/sam4s-xplained/src/sam_autoleds.c +++ b/configs/sam4s-xplained/src/sam_autoleds.c @@ -78,7 +78,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/sam4s-xplained/src/sam_userleds.c b/configs/sam4s-xplained/src/sam_userleds.c index bd1411c800..06b3f83097 100644 --- a/configs/sam4s-xplained/src/sam_userleds.c +++ b/configs/sam4s-xplained/src/sam_userleds.c @@ -60,7 +60,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/sama5d2-xult/src/sam_autoleds.c b/configs/sama5d2-xult/src/sam_autoleds.c index f7875f73a0..c18908e056 100644 --- a/configs/sama5d2-xult/src/sam_autoleds.c +++ b/configs/sama5d2-xult/src/sam_autoleds.c @@ -94,7 +94,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/sama5d2-xult/src/sam_bringup.c b/configs/sama5d2-xult/src/sam_bringup.c index 3603c51d9a..e332c2d4e8 100644 --- a/configs/sama5d2-xult/src/sam_bringup.c +++ b/configs/sama5d2-xult/src/sam_bringup.c @@ -50,7 +50,7 @@ ****************************************************************************/ #ifdef CONFIG_BOARD_INITIALIZE -# define SYSLOG lldbg +# define SYSLOG llerr #else # define SYSLOG dbg #endif diff --git a/configs/sama5d2-xult/src/sam_userleds.c b/configs/sama5d2-xult/src/sam_userleds.c index 03299f8d40..11f191b3a1 100644 --- a/configs/sama5d2-xult/src/sam_userleds.c +++ b/configs/sama5d2-xult/src/sam_userleds.c @@ -70,7 +70,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/sama5d3-xplained/src/sam_autoleds.c b/configs/sama5d3-xplained/src/sam_autoleds.c index 468f74c33c..b9f84bb074 100644 --- a/configs/sama5d3-xplained/src/sam_autoleds.c +++ b/configs/sama5d3-xplained/src/sam_autoleds.c @@ -96,7 +96,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/sama5d3-xplained/src/sam_can.c b/configs/sama5d3-xplained/src/sam_can.c index 390bd02e74..a8c59ecbb5 100644 --- a/configs/sama5d3-xplained/src/sam_can.c +++ b/configs/sama5d3-xplained/src/sam_can.c @@ -75,12 +75,12 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg # define caninfo info -# define canlldbg lldbg +# define canllerr llerr # define canllinfo llinfo #else # define candbg(x...) # define caninfo(x...) -# define canlldbg(x...) +# define canllerr(x...) # define canllinfo(x...) #endif diff --git a/configs/sama5d3-xplained/src/sam_ethernet.c b/configs/sama5d3-xplained/src/sam_ethernet.c index bcab38459f..75c9a7f0fc 100644 --- a/configs/sama5d3-xplained/src/sam_ethernet.c +++ b/configs/sama5d3-xplained/src/sam_ethernet.c @@ -85,10 +85,10 @@ #ifdef CONFIG_NETDEV_PHY_DEBUG # define phydbg dbg -# define phylldbg lldbg +# define phyllerr llerr #else # define phydbg(x...) -# define phylldbg(x...) +# define phyllerr(x...) #endif /************************************************************************************ diff --git a/configs/sama5d3-xplained/src/sam_spi.c b/configs/sama5d3-xplained/src/sam_spi.c index 588e24a834..4806c9c61c 100644 --- a/configs/sama5d3-xplained/src/sam_spi.c +++ b/configs/sama5d3-xplained/src/sam_spi.c @@ -65,9 +65,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/sama5d3-xplained/src/sam_usb.c b/configs/sama5d3-xplained/src/sam_usb.c index 2b1a7267f9..d071064d09 100644 --- a/configs/sama5d3-xplained/src/sam_usb.c +++ b/configs/sama5d3-xplained/src/sam_usb.c @@ -546,7 +546,7 @@ xcpt_t sam_setup_overcurrent(xcpt_t handler) #ifdef CONFIG_USBDEV void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } #endif diff --git a/configs/sama5d3-xplained/src/sam_userleds.c b/configs/sama5d3-xplained/src/sam_userleds.c index 3b31c71813..2d85d2ef83 100644 --- a/configs/sama5d3-xplained/src/sam_userleds.c +++ b/configs/sama5d3-xplained/src/sam_userleds.c @@ -72,7 +72,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/sama5d3x-ek/src/sam_autoleds.c b/configs/sama5d3x-ek/src/sam_autoleds.c index 03932ae879..79188d84f7 100644 --- a/configs/sama5d3x-ek/src/sam_autoleds.c +++ b/configs/sama5d3x-ek/src/sam_autoleds.c @@ -96,7 +96,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/sama5d3x-ek/src/sam_can.c b/configs/sama5d3x-ek/src/sam_can.c index e6cc5093e3..176be69ce6 100644 --- a/configs/sama5d3x-ek/src/sam_can.c +++ b/configs/sama5d3x-ek/src/sam_can.c @@ -75,12 +75,12 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg # define caninfo info -# define canlldbg lldbg +# define canllerr llerr # define canllinfo llinfo #else # define candbg(x...) # define caninfo(x...) -# define canlldbg(x...) +# define canllerr(x...) # define canllinfo(x...) #endif diff --git a/configs/sama5d3x-ek/src/sam_ethernet.c b/configs/sama5d3x-ek/src/sam_ethernet.c index 57e304d75d..7a70518fe9 100644 --- a/configs/sama5d3x-ek/src/sam_ethernet.c +++ b/configs/sama5d3x-ek/src/sam_ethernet.c @@ -85,10 +85,10 @@ #ifdef CONFIG_NETDEV_PHY_DEBUG # define phydbg dbg -# define phylldbg lldbg +# define phyllerr llerr #else # define phydbg(x...) -# define phylldbg(x...) +# define phyllerr(x...) #endif /************************************************************************************ diff --git a/configs/sama5d3x-ek/src/sam_spi.c b/configs/sama5d3x-ek/src/sam_spi.c index ef1c1d0b87..eb0287e72c 100644 --- a/configs/sama5d3x-ek/src/sam_spi.c +++ b/configs/sama5d3x-ek/src/sam_spi.c @@ -65,9 +65,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/sama5d3x-ek/src/sam_usb.c b/configs/sama5d3x-ek/src/sam_usb.c index a3a774f036..73d6ab4766 100644 --- a/configs/sama5d3x-ek/src/sam_usb.c +++ b/configs/sama5d3x-ek/src/sam_usb.c @@ -538,7 +538,7 @@ xcpt_t sam_setup_overcurrent(xcpt_t handler) #ifdef CONFIG_USBDEV void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } #endif diff --git a/configs/sama5d3x-ek/src/sam_userleds.c b/configs/sama5d3x-ek/src/sam_userleds.c index 4b623515ac..381d1be064 100644 --- a/configs/sama5d3x-ek/src/sam_userleds.c +++ b/configs/sama5d3x-ek/src/sam_userleds.c @@ -72,7 +72,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/sama5d4-ek/src/sam_autoleds.c b/configs/sama5d4-ek/src/sam_autoleds.c index 41184e4a17..0d23aa40db 100644 --- a/configs/sama5d4-ek/src/sam_autoleds.c +++ b/configs/sama5d4-ek/src/sam_autoleds.c @@ -101,7 +101,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/sama5d4-ek/src/sam_bringup.c b/configs/sama5d4-ek/src/sam_bringup.c index 2c0ca5cc8d..34b7e3dd43 100644 --- a/configs/sama5d4-ek/src/sam_bringup.c +++ b/configs/sama5d4-ek/src/sam_bringup.c @@ -72,7 +72,7 @@ /* Debug ********************************************************************/ #ifdef CONFIG_BOARD_INITIALIZE -# define SYSLOG lldbg +# define SYSLOG llerr #else # define SYSLOG dbg #endif diff --git a/configs/sama5d4-ek/src/sam_ethernet.c b/configs/sama5d4-ek/src/sam_ethernet.c index 87b2a91dc8..25a73b375c 100644 --- a/configs/sama5d4-ek/src/sam_ethernet.c +++ b/configs/sama5d4-ek/src/sam_ethernet.c @@ -85,10 +85,10 @@ #ifdef CONFIG_NETDEV_PHY_DEBUG # define phydbg dbg -# define phylldbg lldbg +# define phyllerr llerr #else # define phydbg(x...) -# define phylldbg(x...) +# define phyllerr(x...) #endif /************************************************************************************ diff --git a/configs/sama5d4-ek/src/sam_spi.c b/configs/sama5d4-ek/src/sam_spi.c index 9d62139275..1f60c27684 100644 --- a/configs/sama5d4-ek/src/sam_spi.c +++ b/configs/sama5d4-ek/src/sam_spi.c @@ -65,9 +65,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/sama5d4-ek/src/sam_usb.c b/configs/sama5d4-ek/src/sam_usb.c index c0cf5af788..9540206bbb 100644 --- a/configs/sama5d4-ek/src/sam_usb.c +++ b/configs/sama5d4-ek/src/sam_usb.c @@ -539,7 +539,7 @@ xcpt_t sam_setup_overcurrent(xcpt_t handler) #ifdef CONFIG_USBDEV void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } #endif diff --git a/configs/sama5d4-ek/src/sam_userleds.c b/configs/sama5d4-ek/src/sam_userleds.c index eab759d679..93ecf08241 100644 --- a/configs/sama5d4-ek/src/sam_userleds.c +++ b/configs/sama5d4-ek/src/sam_userleds.c @@ -76,7 +76,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/samd20-xplained/src/sam_autoleds.c b/configs/samd20-xplained/src/sam_autoleds.c index eb032116e9..8cfd2e49f7 100644 --- a/configs/samd20-xplained/src/sam_autoleds.c +++ b/configs/samd20-xplained/src/sam_autoleds.c @@ -86,7 +86,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/samd20-xplained/src/sam_spi.c b/configs/samd20-xplained/src/sam_spi.c index 6417b980b6..c9d6b6aaea 100644 --- a/configs/samd20-xplained/src/sam_spi.c +++ b/configs/samd20-xplained/src/sam_spi.c @@ -63,9 +63,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/samd20-xplained/src/sam_userleds.c b/configs/samd20-xplained/src/sam_userleds.c index ca90196d01..18978a2974 100644 --- a/configs/samd20-xplained/src/sam_userleds.c +++ b/configs/samd20-xplained/src/sam_userleds.c @@ -71,7 +71,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/samd21-xplained/src/sam_autoleds.c b/configs/samd21-xplained/src/sam_autoleds.c index bb06a515d7..2c5f018024 100644 --- a/configs/samd21-xplained/src/sam_autoleds.c +++ b/configs/samd21-xplained/src/sam_autoleds.c @@ -86,7 +86,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/samd21-xplained/src/sam_spi.c b/configs/samd21-xplained/src/sam_spi.c index b44bf35b47..4905e3d4e5 100644 --- a/configs/samd21-xplained/src/sam_spi.c +++ b/configs/samd21-xplained/src/sam_spi.c @@ -63,9 +63,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/samd21-xplained/src/sam_userleds.c b/configs/samd21-xplained/src/sam_userleds.c index b424805f75..037641bb5b 100644 --- a/configs/samd21-xplained/src/sam_userleds.c +++ b/configs/samd21-xplained/src/sam_userleds.c @@ -71,7 +71,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/same70-xplained/src/sam_autoleds.c b/configs/same70-xplained/src/sam_autoleds.c index 9a68e179cd..bb07aa6e2f 100644 --- a/configs/same70-xplained/src/sam_autoleds.c +++ b/configs/same70-xplained/src/sam_autoleds.c @@ -86,7 +86,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/same70-xplained/src/sam_bringup.c b/configs/same70-xplained/src/sam_bringup.c index e5631b8930..227899e750 100644 --- a/configs/same70-xplained/src/sam_bringup.c +++ b/configs/same70-xplained/src/sam_bringup.c @@ -79,7 +79,7 @@ /* Debug ********************************************************************/ #ifdef CONFIG_BOARD_INITIALIZE -# define SYSLOG lldbg +# define SYSLOG llerr #else # define SYSLOG dbg #endif diff --git a/configs/same70-xplained/src/sam_ethernet.c b/configs/same70-xplained/src/sam_ethernet.c index 12c5846344..aeb40bac36 100644 --- a/configs/same70-xplained/src/sam_ethernet.c +++ b/configs/same70-xplained/src/sam_ethernet.c @@ -81,10 +81,10 @@ #ifdef CONFIG_NETDEV_PHY_DEBUG # define phydbg dbg -# define phylldbg lldbg +# define phyllerr llerr #else # define phydbg(x...) -# define phylldbg(x...) +# define phyllerr(x...) #endif /************************************************************************************ diff --git a/configs/same70-xplained/src/sam_mcan.c b/configs/same70-xplained/src/sam_mcan.c index 1b0d2ef011..2ee8c62b1d 100644 --- a/configs/same70-xplained/src/sam_mcan.c +++ b/configs/same70-xplained/src/sam_mcan.c @@ -73,12 +73,12 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg # define caninfo info -# define canlldbg lldbg +# define canllerr llerr # define canllinfo llinfo #else # define candbg(x...) # define caninfo(x...) -# define canlldbg(x...) +# define canllerr(x...) # define canllinfo(x...) #endif diff --git a/configs/same70-xplained/src/sam_spi.c b/configs/same70-xplained/src/sam_spi.c index d1a090e332..ffb8c06079 100644 --- a/configs/same70-xplained/src/sam_spi.c +++ b/configs/same70-xplained/src/sam_spi.c @@ -65,9 +65,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/same70-xplained/src/sam_usbdev.c b/configs/same70-xplained/src/sam_usbdev.c index e75322a37d..444cf8bbb2 100644 --- a/configs/same70-xplained/src/sam_usbdev.c +++ b/configs/same70-xplained/src/sam_usbdev.c @@ -94,5 +94,5 @@ void sam_usbinitialize(void) void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } diff --git a/configs/saml21-xplained/src/sam_autoleds.c b/configs/saml21-xplained/src/sam_autoleds.c index 6a3f4a8505..2e60573f18 100644 --- a/configs/saml21-xplained/src/sam_autoleds.c +++ b/configs/saml21-xplained/src/sam_autoleds.c @@ -86,7 +86,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/saml21-xplained/src/sam_spi.c b/configs/saml21-xplained/src/sam_spi.c index da3e2d67ec..6092ef8405 100644 --- a/configs/saml21-xplained/src/sam_spi.c +++ b/configs/saml21-xplained/src/sam_spi.c @@ -63,9 +63,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/saml21-xplained/src/sam_userleds.c b/configs/saml21-xplained/src/sam_userleds.c index a21714d9b8..9710c1a7a1 100644 --- a/configs/saml21-xplained/src/sam_userleds.c +++ b/configs/saml21-xplained/src/sam_userleds.c @@ -71,7 +71,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/samv71-xult/src/sam_autoleds.c b/configs/samv71-xult/src/sam_autoleds.c index d302980a64..a08b357467 100644 --- a/configs/samv71-xult/src/sam_autoleds.c +++ b/configs/samv71-xult/src/sam_autoleds.c @@ -102,7 +102,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/samv71-xult/src/sam_bringup.c b/configs/samv71-xult/src/sam_bringup.c index dce34997e5..18565d424f 100644 --- a/configs/samv71-xult/src/sam_bringup.c +++ b/configs/samv71-xult/src/sam_bringup.c @@ -102,7 +102,7 @@ /* Debug ********************************************************************/ #ifdef CONFIG_BOARD_INITIALIZE -# define SYSLOG lldbg +# define SYSLOG llerr #else # define SYSLOG dbg #endif diff --git a/configs/samv71-xult/src/sam_ethernet.c b/configs/samv71-xult/src/sam_ethernet.c index 86639b2894..88c486a428 100644 --- a/configs/samv71-xult/src/sam_ethernet.c +++ b/configs/samv71-xult/src/sam_ethernet.c @@ -81,10 +81,10 @@ #ifdef CONFIG_NETDEV_PHY_DEBUG # define phydbg dbg -# define phylldbg lldbg +# define phyllerr llerr #else # define phydbg(x...) -# define phylldbg(x...) +# define phyllerr(x...) #endif /************************************************************************************ diff --git a/configs/samv71-xult/src/sam_mcan.c b/configs/samv71-xult/src/sam_mcan.c index 3a46d55d9f..c3d4f8bf8d 100644 --- a/configs/samv71-xult/src/sam_mcan.c +++ b/configs/samv71-xult/src/sam_mcan.c @@ -73,12 +73,12 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg # define caninfo info -# define canlldbg lldbg +# define canllerr llerr # define canllinfo llinfo #else # define candbg(x...) # define caninfo(x...) -# define canlldbg(x...) +# define canllerr(x...) # define canllinfo(x...) #endif diff --git a/configs/samv71-xult/src/sam_spi.c b/configs/samv71-xult/src/sam_spi.c index 82172a6041..35877918bc 100644 --- a/configs/samv71-xult/src/sam_spi.c +++ b/configs/samv71-xult/src/sam_spi.c @@ -65,9 +65,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/samv71-xult/src/sam_usbdev.c b/configs/samv71-xult/src/sam_usbdev.c index 1e8173790c..cc718cf7ed 100644 --- a/configs/samv71-xult/src/sam_usbdev.c +++ b/configs/samv71-xult/src/sam_usbdev.c @@ -94,5 +94,5 @@ void sam_usbinitialize(void) void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } diff --git a/configs/shenzhou/src/stm32_autoleds.c b/configs/shenzhou/src/stm32_autoleds.c index 9e22924ed7..507caa71f7 100644 --- a/configs/shenzhou/src/stm32_autoleds.c +++ b/configs/shenzhou/src/stm32_autoleds.c @@ -62,7 +62,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/shenzhou/src/stm32_can.c b/configs/shenzhou/src/stm32_can.c index b1e6120512..0e70944eb7 100644 --- a/configs/shenzhou/src/stm32_can.c +++ b/configs/shenzhou/src/stm32_can.c @@ -68,12 +68,12 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg # define caninfo info -# define canlldbg lldbg +# define canllerr llerr # define canllinfo llinfo #else # define candbg(x...) # define caninfo(x...) -# define canlldbg(x...) +# define canllerr(x...) # define canllinfo(x...) #endif diff --git a/configs/shenzhou/src/stm32_spi.c b/configs/shenzhou/src/stm32_spi.c index e83eb0c62f..c0975d6b73 100644 --- a/configs/shenzhou/src/stm32_spi.c +++ b/configs/shenzhou/src/stm32_spi.c @@ -64,9 +64,9 @@ #endif #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/shenzhou/src/stm32_usb.c b/configs/shenzhou/src/stm32_usb.c index c63e80cda0..631e87c94f 100644 --- a/configs/shenzhou/src/stm32_usb.c +++ b/configs/shenzhou/src/stm32_usb.c @@ -300,7 +300,7 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler) #ifdef CONFIG_USBDEV void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } #endif diff --git a/configs/shenzhou/src/stm32_userleds.c b/configs/shenzhou/src/stm32_userleds.c index 66b9de9ea6..7fc3976970 100644 --- a/configs/shenzhou/src/stm32_userleds.c +++ b/configs/shenzhou/src/stm32_userleds.c @@ -62,7 +62,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/sim/src/sim_bringup.c b/configs/sim/src/sim_bringup.c index c22cd81381..11489bace7 100644 --- a/configs/sim/src/sim_bringup.c +++ b/configs/sim/src/sim_bringup.c @@ -60,7 +60,7 @@ int trv_mount_world(int minor, FAR const char *mountpoint); /* Debug ********************************************************************/ #ifdef CONFIG_BOARD_INITIALIZE -# define SYSLOG lldbg +# define SYSLOG llerr #else # define SYSLOG dbg #endif diff --git a/configs/spark/src/stm32_autoleds.c b/configs/spark/src/stm32_autoleds.c index c39b53d312..f085b71a7b 100644 --- a/configs/spark/src/stm32_autoleds.c +++ b/configs/spark/src/stm32_autoleds.c @@ -64,7 +64,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/spark/src/stm32_spi.c b/configs/spark/src/stm32_spi.c index a74a434d37..92015ce1ef 100644 --- a/configs/spark/src/stm32_spi.c +++ b/configs/spark/src/stm32_spi.c @@ -69,9 +69,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/spark/src/stm32_usbdev.c b/configs/spark/src/stm32_usbdev.c index 87af0a3bc7..9b801a670a 100644 --- a/configs/spark/src/stm32_usbdev.c +++ b/configs/spark/src/stm32_usbdev.c @@ -74,7 +74,7 @@ void stm32_usbinitialize(void) { - ulldbg("called\n"); + ullerr("called\n"); /* USB Soft Connect Pullup */ @@ -113,5 +113,5 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable) void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } diff --git a/configs/spark/src/stm32_userleds.c b/configs/spark/src/stm32_userleds.c index db66130c71..63fb4df0e2 100644 --- a/configs/spark/src/stm32_userleds.c +++ b/configs/spark/src/stm32_userleds.c @@ -63,7 +63,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/stm3210e-eval/src/stm32_can.c b/configs/stm3210e-eval/src/stm32_can.c index c29c5b2a17..4b2f506538 100644 --- a/configs/stm3210e-eval/src/stm32_can.c +++ b/configs/stm3210e-eval/src/stm32_can.c @@ -68,12 +68,12 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg # define caninfo info -# define canlldbg lldbg +# define canllerr llerr # define canllinfo llinfo #else # define candbg(x...) # define caninfo(x...) -# define canlldbg(x...) +# define canllerr(x...) # define canllinfo(x...) #endif diff --git a/configs/stm3210e-eval/src/stm32_idle.c b/configs/stm3210e-eval/src/stm32_idle.c index c6352c221b..24bdfde3d1 100644 --- a/configs/stm3210e-eval/src/stm32_idle.c +++ b/configs/stm3210e-eval/src/stm32_idle.c @@ -229,7 +229,7 @@ static int stm32_rtc_alarm(time_t tv_sec, time_t tv_nsec, bool exti) ret = stm32_rtc_setalarm(&alarmtime, stm32_alarmcb); if (ret < 0) { - lldbg("Warning: The alarm is already set\n"); + llerr("Warning: The alarm is already set\n"); } return ret; @@ -366,7 +366,7 @@ static void stm32_idlepm(void) ret = stm32_rtc_cancelalarm(); if (ret < 0) { - lldbg("Warning: Cancel alarm failed\n"); + llerr("Warning: Cancel alarm failed\n"); } #endif /* Note: See the additional PM_STANDBY related logic at the diff --git a/configs/stm3210e-eval/src/stm32_leds.c b/configs/stm3210e-eval/src/stm32_leds.c index fd61c85ce9..ba5876f4ff 100644 --- a/configs/stm3210e-eval/src/stm32_leds.c +++ b/configs/stm3210e-eval/src/stm32_leds.c @@ -62,7 +62,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/stm3210e-eval/src/stm32_spi.c b/configs/stm3210e-eval/src/stm32_spi.c index efa7305b61..833bce97fe 100644 --- a/configs/stm3210e-eval/src/stm32_spi.c +++ b/configs/stm3210e-eval/src/stm32_spi.c @@ -63,9 +63,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/stm3210e-eval/src/stm32_usbdev.c b/configs/stm3210e-eval/src/stm32_usbdev.c index 9864798835..58676d1dca 100644 --- a/configs/stm3210e-eval/src/stm32_usbdev.c +++ b/configs/stm3210e-eval/src/stm32_usbdev.c @@ -110,6 +110,6 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable) void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } diff --git a/configs/stm3220g-eval/src/stm32_autoleds.c b/configs/stm3220g-eval/src/stm32_autoleds.c index d2d428d868..688e1aa1ee 100644 --- a/configs/stm3220g-eval/src/stm32_autoleds.c +++ b/configs/stm3220g-eval/src/stm32_autoleds.c @@ -63,7 +63,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/stm3220g-eval/src/stm32_can.c b/configs/stm3220g-eval/src/stm32_can.c index 192ccfa228..9e32e3c27b 100644 --- a/configs/stm3220g-eval/src/stm32_can.c +++ b/configs/stm3220g-eval/src/stm32_can.c @@ -76,12 +76,12 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg # define caninfo info -# define canlldbg lldbg +# define canllerr llerr # define canllinfo llinfo #else # define candbg(x...) # define caninfo(x...) -# define canlldbg(x...) +# define canllerr(x...) # define canllinfo(x...) #endif diff --git a/configs/stm3220g-eval/src/stm32_spi.c b/configs/stm3220g-eval/src/stm32_spi.c index ca42244f98..3980b6e7d5 100644 --- a/configs/stm3220g-eval/src/stm32_spi.c +++ b/configs/stm3220g-eval/src/stm32_spi.c @@ -63,9 +63,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/stm3220g-eval/src/stm32_usb.c b/configs/stm3220g-eval/src/stm32_usb.c index e4ecae395d..db13541bb6 100644 --- a/configs/stm3220g-eval/src/stm32_usb.c +++ b/configs/stm3220g-eval/src/stm32_usb.c @@ -300,7 +300,7 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler) #ifdef CONFIG_USBDEV void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } #endif diff --git a/configs/stm3220g-eval/src/stm32_userleds.c b/configs/stm3220g-eval/src/stm32_userleds.c index 301ea4bdda..0fc42a3da1 100644 --- a/configs/stm3220g-eval/src/stm32_userleds.c +++ b/configs/stm3220g-eval/src/stm32_userleds.c @@ -62,7 +62,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/stm3240g-eval/src/stm32_autoleds.c b/configs/stm3240g-eval/src/stm32_autoleds.c index fbfffffec1..500b834af8 100644 --- a/configs/stm3240g-eval/src/stm32_autoleds.c +++ b/configs/stm3240g-eval/src/stm32_autoleds.c @@ -63,7 +63,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/stm3240g-eval/src/stm32_can.c b/configs/stm3240g-eval/src/stm32_can.c index e4071bf0d6..2af6a8add7 100644 --- a/configs/stm3240g-eval/src/stm32_can.c +++ b/configs/stm3240g-eval/src/stm32_can.c @@ -76,12 +76,12 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg # define caninfo info -# define canlldbg lldbg +# define canllerr llerr # define canllinfo llinfo #else # define candbg(x...) # define caninfo(x...) -# define canlldbg(x...) +# define canllerr(x...) # define canllinfo(x...) #endif diff --git a/configs/stm3240g-eval/src/stm32_spi.c b/configs/stm3240g-eval/src/stm32_spi.c index 3d77a12175..6a88d07937 100644 --- a/configs/stm3240g-eval/src/stm32_spi.c +++ b/configs/stm3240g-eval/src/stm32_spi.c @@ -63,9 +63,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/stm3240g-eval/src/stm32_usb.c b/configs/stm3240g-eval/src/stm32_usb.c index d4943f02ce..6d65e66750 100644 --- a/configs/stm3240g-eval/src/stm32_usb.c +++ b/configs/stm3240g-eval/src/stm32_usb.c @@ -300,7 +300,7 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler) #ifdef CONFIG_USBDEV void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } #endif diff --git a/configs/stm3240g-eval/src/stm32_userleds.c b/configs/stm3240g-eval/src/stm32_userleds.c index 303eebdc81..781c36d6fc 100644 --- a/configs/stm3240g-eval/src/stm32_userleds.c +++ b/configs/stm3240g-eval/src/stm32_userleds.c @@ -62,7 +62,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/stm32_tiny/src/stm32_leds.c b/configs/stm32_tiny/src/stm32_leds.c index 54767e6b5b..a57f77513a 100644 --- a/configs/stm32_tiny/src/stm32_leds.c +++ b/configs/stm32_tiny/src/stm32_leds.c @@ -61,7 +61,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/stm32_tiny/src/stm32_spi.c b/configs/stm32_tiny/src/stm32_spi.c index 6ecb45feb8..41c30adfbe 100644 --- a/configs/stm32_tiny/src/stm32_spi.c +++ b/configs/stm32_tiny/src/stm32_spi.c @@ -66,9 +66,9 @@ #endif #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/stm32_tiny/src/stm32_usbdev.c b/configs/stm32_tiny/src/stm32_usbdev.c index 80e3671e3b..d27594b65a 100644 --- a/configs/stm32_tiny/src/stm32_usbdev.c +++ b/configs/stm32_tiny/src/stm32_usbdev.c @@ -74,7 +74,7 @@ void stm32_usbinitialize(void) { - ulldbg("called\n"); + ullerr("called\n"); /* USB Soft Connect Pullup */ stm32_configgpio(GPIO_USB_PULLUP); @@ -112,6 +112,6 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable) void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } diff --git a/configs/stm32f103-minimum/src/stm32_autoleds.c b/configs/stm32f103-minimum/src/stm32_autoleds.c index 3ab744afd3..4c4c6e9707 100644 --- a/configs/stm32f103-minimum/src/stm32_autoleds.c +++ b/configs/stm32f103-minimum/src/stm32_autoleds.c @@ -61,7 +61,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/stm32f103-minimum/src/stm32_spi.c b/configs/stm32f103-minimum/src/stm32_spi.c index 8866451219..0463578cc7 100644 --- a/configs/stm32f103-minimum/src/stm32_spi.c +++ b/configs/stm32f103-minimum/src/stm32_spi.c @@ -66,9 +66,9 @@ #endif #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/stm32f103-minimum/src/stm32_usbdev.c b/configs/stm32f103-minimum/src/stm32_usbdev.c index cc1d00df73..092196cd32 100644 --- a/configs/stm32f103-minimum/src/stm32_usbdev.c +++ b/configs/stm32f103-minimum/src/stm32_usbdev.c @@ -103,5 +103,5 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable) void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } diff --git a/configs/stm32f3discovery/src/stm32_autoleds.c b/configs/stm32f3discovery/src/stm32_autoleds.c index 7b74fdbeaf..de7c528095 100644 --- a/configs/stm32f3discovery/src/stm32_autoleds.c +++ b/configs/stm32f3discovery/src/stm32_autoleds.c @@ -61,7 +61,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/stm32f3discovery/src/stm32_spi.c b/configs/stm32f3discovery/src/stm32_spi.c index 8a5b992773..29cdb076a4 100644 --- a/configs/stm32f3discovery/src/stm32_spi.c +++ b/configs/stm32f3discovery/src/stm32_spi.c @@ -64,9 +64,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/stm32f3discovery/src/stm32_usb.c b/configs/stm32f3discovery/src/stm32_usb.c index bdeef5886d..7c071b91b9 100644 --- a/configs/stm32f3discovery/src/stm32_usb.c +++ b/configs/stm32f3discovery/src/stm32_usb.c @@ -121,7 +121,7 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable) void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } #endif /* CONFIG_STM32_USB */ diff --git a/configs/stm32f3discovery/src/stm32_userleds.c b/configs/stm32f3discovery/src/stm32_userleds.c index 89eb1e6492..ed7e2dacdd 100644 --- a/configs/stm32f3discovery/src/stm32_userleds.c +++ b/configs/stm32f3discovery/src/stm32_userleds.c @@ -60,7 +60,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/stm32f429i-disco/src/stm32_autoleds.c b/configs/stm32f429i-disco/src/stm32_autoleds.c index 1f11012077..4bec7993f2 100644 --- a/configs/stm32f429i-disco/src/stm32_autoleds.c +++ b/configs/stm32f429i-disco/src/stm32_autoleds.c @@ -63,7 +63,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/stm32f429i-disco/src/stm32_idle.c b/configs/stm32f429i-disco/src/stm32_idle.c index 1654e0fed2..c71eaa61f0 100644 --- a/configs/stm32f429i-disco/src/stm32_idle.c +++ b/configs/stm32f429i-disco/src/stm32_idle.c @@ -125,7 +125,7 @@ static void stm32_idlepm(void) if (newstate != oldstate) { - lldbg("newstate= %d oldstate=%d\n", newstate, oldstate); + llerr("newstate= %d oldstate=%d\n", newstate, oldstate); flags = enter_critical_section(); diff --git a/configs/stm32f429i-disco/src/stm32_spi.c b/configs/stm32f429i-disco/src/stm32_spi.c index 97d2de76ca..0b6fd21307 100644 --- a/configs/stm32f429i-disco/src/stm32_spi.c +++ b/configs/stm32f429i-disco/src/stm32_spi.c @@ -66,9 +66,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/stm32f429i-disco/src/stm32_usb.c b/configs/stm32f429i-disco/src/stm32_usb.c index 0295efd903..d9fb2412b6 100644 --- a/configs/stm32f429i-disco/src/stm32_usb.c +++ b/configs/stm32f429i-disco/src/stm32_usb.c @@ -306,7 +306,7 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler) #ifdef CONFIG_USBDEV void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } #endif diff --git a/configs/stm32f429i-disco/src/stm32_userleds.c b/configs/stm32f429i-disco/src/stm32_userleds.c index 60176c905b..25856d939f 100644 --- a/configs/stm32f429i-disco/src/stm32_userleds.c +++ b/configs/stm32f429i-disco/src/stm32_userleds.c @@ -63,7 +63,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/stm32f4discovery/src/stm32_autoleds.c b/configs/stm32f4discovery/src/stm32_autoleds.c index 36255cb24e..e500fd9a89 100644 --- a/configs/stm32f4discovery/src/stm32_autoleds.c +++ b/configs/stm32f4discovery/src/stm32_autoleds.c @@ -63,7 +63,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/stm32f4discovery/src/stm32_ethernet.c b/configs/stm32f4discovery/src/stm32_ethernet.c index e9d53a9a49..9c3928e182 100644 --- a/configs/stm32f4discovery/src/stm32_ethernet.c +++ b/configs/stm32f4discovery/src/stm32_ethernet.c @@ -80,10 +80,10 @@ #ifdef CONFIG_NETDEV_PHY_DEBUG # define phydbg dbg -# define phylldbg lldbg +# define phyllerr llerr #else # define phydbg(x...) -# define phylldbg(x...) +# define phyllerr(x...) #endif /************************************************************************************ diff --git a/configs/stm32f4discovery/src/stm32_idle.c b/configs/stm32f4discovery/src/stm32_idle.c index 0e0ead8360..6dc0f27b0b 100644 --- a/configs/stm32f4discovery/src/stm32_idle.c +++ b/configs/stm32f4discovery/src/stm32_idle.c @@ -122,7 +122,7 @@ static void stm32_idlepm(void) if (newstate != oldstate) { - lldbg("newstate= %d oldstate=%d\n", newstate, oldstate); + llerr("newstate= %d oldstate=%d\n", newstate, oldstate); flags = enter_critical_section(); diff --git a/configs/stm32f4discovery/src/stm32_spi.c b/configs/stm32f4discovery/src/stm32_spi.c index 846db5a8e8..809da6a947 100644 --- a/configs/stm32f4discovery/src/stm32_spi.c +++ b/configs/stm32f4discovery/src/stm32_spi.c @@ -65,9 +65,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/stm32f4discovery/src/stm32_usb.c b/configs/stm32f4discovery/src/stm32_usb.c index 11a722aa13..16028715b2 100644 --- a/configs/stm32f4discovery/src/stm32_usb.c +++ b/configs/stm32f4discovery/src/stm32_usb.c @@ -329,7 +329,7 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler) #ifdef CONFIG_USBDEV void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } #endif diff --git a/configs/stm32f4discovery/src/stm32_userleds.c b/configs/stm32f4discovery/src/stm32_userleds.c index fbfa7c5b16..2b5007e2d5 100644 --- a/configs/stm32f4discovery/src/stm32_userleds.c +++ b/configs/stm32f4discovery/src/stm32_userleds.c @@ -64,7 +64,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/stm32f746g-disco/src/stm32_autoleds.c b/configs/stm32f746g-disco/src/stm32_autoleds.c index 59db81ec16..6873f3ad42 100644 --- a/configs/stm32f746g-disco/src/stm32_autoleds.c +++ b/configs/stm32f746g-disco/src/stm32_autoleds.c @@ -58,7 +58,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/stm32f746g-disco/src/stm32_spi.c b/configs/stm32f746g-disco/src/stm32_spi.c index 3530c3c5d7..e7ba37dfcb 100644 --- a/configs/stm32f746g-disco/src/stm32_spi.c +++ b/configs/stm32f746g-disco/src/stm32_spi.c @@ -62,9 +62,9 @@ ************************************************************************************/ #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/stm32f746g-disco/src/stm32_userleds.c b/configs/stm32f746g-disco/src/stm32_userleds.c index e59ba51693..90eae2c78a 100644 --- a/configs/stm32f746g-disco/src/stm32_userleds.c +++ b/configs/stm32f746g-disco/src/stm32_userleds.c @@ -56,7 +56,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/stm32l476vg-disco/src/stm32_appinit.c b/configs/stm32l476vg-disco/src/stm32_appinit.c index 0c5591dcfa..f3ead2d0a9 100644 --- a/configs/stm32l476vg-disco/src/stm32_appinit.c +++ b/configs/stm32l476vg-disco/src/stm32_appinit.c @@ -93,7 +93,7 @@ /* Debug ********************************************************************/ #ifdef CONFIG_BOARD_INITIALIZE -# define SYSLOG lldbg +# define SYSLOG llerr #else # define SYSLOG dbg #endif diff --git a/configs/stm32l476vg-disco/src/stm32_autoleds.c b/configs/stm32l476vg-disco/src/stm32_autoleds.c index fe53243641..8e1c7fe79a 100644 --- a/configs/stm32l476vg-disco/src/stm32_autoleds.c +++ b/configs/stm32l476vg-disco/src/stm32_autoleds.c @@ -63,7 +63,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/stm32l476vg-disco/src/stm32_spi.c b/configs/stm32l476vg-disco/src/stm32_spi.c index 186f0f8f38..b27086cac3 100644 --- a/configs/stm32l476vg-disco/src/stm32_spi.c +++ b/configs/stm32l476vg-disco/src/stm32_spi.c @@ -67,9 +67,9 @@ #endif #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/stm32l476vg-disco/src/stm32_userleds.c b/configs/stm32l476vg-disco/src/stm32_userleds.c index eafb33b6d4..6bccba72e6 100644 --- a/configs/stm32l476vg-disco/src/stm32_userleds.c +++ b/configs/stm32l476vg-disco/src/stm32_userleds.c @@ -63,7 +63,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/stm32ldiscovery/src/stm32_autoleds.c b/configs/stm32ldiscovery/src/stm32_autoleds.c index b903cb81a1..384bb91fef 100644 --- a/configs/stm32ldiscovery/src/stm32_autoleds.c +++ b/configs/stm32ldiscovery/src/stm32_autoleds.c @@ -78,7 +78,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/stm32ldiscovery/src/stm32_spi.c b/configs/stm32ldiscovery/src/stm32_spi.c index e0a0638c70..d07d769133 100644 --- a/configs/stm32ldiscovery/src/stm32_spi.c +++ b/configs/stm32ldiscovery/src/stm32_spi.c @@ -65,9 +65,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/stm32ldiscovery/src/stm32_userleds.c b/configs/stm32ldiscovery/src/stm32_userleds.c index 3e2fa4dbe9..7cef39eba0 100644 --- a/configs/stm32ldiscovery/src/stm32_userleds.c +++ b/configs/stm32ldiscovery/src/stm32_userleds.c @@ -60,7 +60,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/stm32vldiscovery/src/stm32_leds.c b/configs/stm32vldiscovery/src/stm32_leds.c index 9c0a052e5c..a8ce8ec1b3 100644 --- a/configs/stm32vldiscovery/src/stm32_leds.c +++ b/configs/stm32vldiscovery/src/stm32_leds.c @@ -63,7 +63,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/sure-pic32mx/src/pic32mx_autoleds.c b/configs/sure-pic32mx/src/pic32mx_autoleds.c index 7c9ef99b00..0a8f1b940b 100644 --- a/configs/sure-pic32mx/src/pic32mx_autoleds.c +++ b/configs/sure-pic32mx/src/pic32mx_autoleds.c @@ -89,9 +89,9 @@ /* Debug ********************************************************************/ #if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS) -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO -# define ledinfo lldbg +# define ledinfo llerr # else # define ledinfo(x...) # endif diff --git a/configs/sure-pic32mx/src/pic32mx_spi.c b/configs/sure-pic32mx/src/pic32mx_spi.c index 6e2a0fa3d7..5104cbe4ec 100644 --- a/configs/sure-pic32mx/src/pic32mx_spi.c +++ b/configs/sure-pic32mx/src/pic32mx_spi.c @@ -130,9 +130,9 @@ #endif #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/teensy-2.0/src/at90usb_leds.c b/configs/teensy-2.0/src/at90usb_leds.c index a192722123..d3e194c401 100644 --- a/configs/teensy-2.0/src/at90usb_leds.c +++ b/configs/teensy-2.0/src/at90usb_leds.c @@ -62,9 +62,9 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO -# define ledinfo lldbg +# define ledinfo llerr # else # define ledinfo(x...) # endif diff --git a/configs/teensy-2.0/src/at90usb_spi.c b/configs/teensy-2.0/src/at90usb_spi.c index cd67ae6ac2..2d14517ab8 100644 --- a/configs/teensy-2.0/src/at90usb_spi.c +++ b/configs/teensy-2.0/src/at90usb_spi.c @@ -87,9 +87,9 @@ */ #ifdef CONFIG_SPI_DEBUG -# define sspdbg lldbg +# define sspdbg llerr # ifdef CONFIG_SPI_VERBOSE -# define sspinfo lldbg +# define sspinfo llerr # else # define sspinfo(x...) # endif diff --git a/configs/teensy-3.x/src/k20_spi.c b/configs/teensy-3.x/src/k20_spi.c index d220304539..64e9072116 100644 --- a/configs/teensy-3.x/src/k20_spi.c +++ b/configs/teensy-3.x/src/k20_spi.c @@ -60,9 +60,9 @@ /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/teensy-3.x/src/k20_usbdev.c b/configs/teensy-3.x/src/k20_usbdev.c index ca0ed25800..7df3d8d990 100644 --- a/configs/teensy-3.x/src/k20_usbdev.c +++ b/configs/teensy-3.x/src/k20_usbdev.c @@ -136,6 +136,6 @@ int kinetis_usbpullup(FAR struct usbdev_s *dev, bool enable) void kinetis_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); #warning "Missing logic" } diff --git a/configs/teensy-lc/src/kl_led.c b/configs/teensy-lc/src/kl_led.c index daf26ed5c2..611174f222 100644 --- a/configs/teensy-lc/src/kl_led.c +++ b/configs/teensy-lc/src/kl_led.c @@ -61,9 +61,9 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO -# define ledinfo lldbg +# define ledinfo llerr # else # define ledinfo(x...) # endif diff --git a/configs/teensy-lc/src/kl_spi.c b/configs/teensy-lc/src/kl_spi.c index 111900225e..073764252a 100644 --- a/configs/teensy-lc/src/kl_spi.c +++ b/configs/teensy-lc/src/kl_spi.c @@ -58,9 +58,9 @@ /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/tm4c123g-launchpad/src/tm4c_autoleds.c b/configs/tm4c123g-launchpad/src/tm4c_autoleds.c index f2cbb2ab61..b78c5fbcf2 100644 --- a/configs/tm4c123g-launchpad/src/tm4c_autoleds.c +++ b/configs/tm4c123g-launchpad/src/tm4c_autoleds.c @@ -102,7 +102,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/tm4c123g-launchpad/src/tm4c_ssi.c b/configs/tm4c123g-launchpad/src/tm4c_ssi.c index 2cf79f11f9..ee306c0624 100644 --- a/configs/tm4c123g-launchpad/src/tm4c_ssi.c +++ b/configs/tm4c123g-launchpad/src/tm4c_ssi.c @@ -62,7 +62,7 @@ /* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ #ifdef CONFIG_DEBUG_SPI -# define ssidbg lldbg +# define ssidbg llerr #else # define ssidbg(x...) #endif @@ -70,7 +70,7 @@ /* Dump GPIO registers */ #if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO) -# define ssiinfo lldbg +# define ssiinfo llerr # define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m) #else # define ssiinfo(x...) diff --git a/configs/tm4c1294-launchpad/src/tm4c_ethernet.c b/configs/tm4c1294-launchpad/src/tm4c_ethernet.c index 3b70b23853..642b8ac0e6 100644 --- a/configs/tm4c1294-launchpad/src/tm4c_ethernet.c +++ b/configs/tm4c1294-launchpad/src/tm4c_ethernet.c @@ -84,7 +84,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr) user0 = getreg32(TIVA_FLASH_USERREG0); user1 = getreg32(TIVA_FLASH_USERREG1); - nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); + nllerr("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff); /* Re-format that MAC address the way that the network expects to see it */ diff --git a/configs/tm4c1294-launchpad/src/tm4c_userleds.c b/configs/tm4c1294-launchpad/src/tm4c_userleds.c index 6e8d287652..443ee91bfd 100644 --- a/configs/tm4c1294-launchpad/src/tm4c_userleds.c +++ b/configs/tm4c1294-launchpad/src/tm4c_userleds.c @@ -72,7 +72,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/twr-k60n512/src/k60_leds.c b/configs/twr-k60n512/src/k60_leds.c index a7130f7e62..d7b13fa413 100644 --- a/configs/twr-k60n512/src/k60_leds.c +++ b/configs/twr-k60n512/src/k60_leds.c @@ -124,7 +124,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/twr-k60n512/src/k60_spi.c b/configs/twr-k60n512/src/k60_spi.c index 8f7b8145f4..42aad3c58b 100644 --- a/configs/twr-k60n512/src/k60_spi.c +++ b/configs/twr-k60n512/src/k60_spi.c @@ -60,9 +60,9 @@ /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/twr-k60n512/src/k60_usbdev.c b/configs/twr-k60n512/src/k60_usbdev.c index b542834768..c9a7514ad9 100644 --- a/configs/twr-k60n512/src/k60_usbdev.c +++ b/configs/twr-k60n512/src/k60_usbdev.c @@ -108,7 +108,7 @@ int kinetis_usbpullup(FAR struct usbdev_s *dev, bool enable) void kinetis_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); #warning "Missing logic" } diff --git a/configs/u-blox-c027/src/lpc17_leds.c b/configs/u-blox-c027/src/lpc17_leds.c index f7299b1c66..ba72d2cc81 100644 --- a/configs/u-blox-c027/src/lpc17_leds.c +++ b/configs/u-blox-c027/src/lpc17_leds.c @@ -61,9 +61,9 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO -# define ledinfo lldbg +# define ledinfo llerr # else # define ledinfo(x...) # endif diff --git a/configs/u-blox-c027/src/lpc17_ssp.c b/configs/u-blox-c027/src/lpc17_ssp.c index 85d58d5564..cbec4fc42e 100644 --- a/configs/u-blox-c027/src/lpc17_ssp.c +++ b/configs/u-blox-c027/src/lpc17_ssp.c @@ -64,9 +64,9 @@ #undef SSP_VERBOSE /* Define to enable verbose debug */ #ifdef SSP_DEBUG -# define sspdbg lldbg +# define sspdbg llerr # ifdef SSP_VERBOSE -# define sspinfo lldbg +# define sspinfo llerr # else # define sspinfo(x...) # endif diff --git a/configs/u-blox-c027/src/lpc17_ubxmdm.c b/configs/u-blox-c027/src/lpc17_ubxmdm.c index 0bcd837b4a..294593ffde 100644 --- a/configs/u-blox-c027/src/lpc17_ubxmdm.c +++ b/configs/u-blox-c027/src/lpc17_ubxmdm.c @@ -64,12 +64,12 @@ #ifdef CONFIG_MODEM_U_BLOX_DEBUG # define m_dbg dbg # define m_info info -# define m_vlldbg lldbg +# define m_vllerr llerr # define m_vllinfo llinfo #else # define m_dbg(x...) # define m_info(x...) -# define m_lldbg(x...) +# define m_llerr(x...) # define m_llinfo(x...) #endif diff --git a/configs/ubw32/src/pic32_leds.c b/configs/ubw32/src/pic32_leds.c index db51c2dba8..a99f633e53 100644 --- a/configs/ubw32/src/pic32_leds.c +++ b/configs/ubw32/src/pic32_leds.c @@ -98,9 +98,9 @@ /* Debug ********************************************************************/ #if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS) -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO -# define ledinfo lldbg +# define ledinfo llerr # else # define ledinfo(x...) # endif diff --git a/configs/viewtool-stm32f107/src/stm32_can.c b/configs/viewtool-stm32f107/src/stm32_can.c index 8e3a6b38a0..c667032a9f 100644 --- a/configs/viewtool-stm32f107/src/stm32_can.c +++ b/configs/viewtool-stm32f107/src/stm32_can.c @@ -67,12 +67,12 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg # define caninfo info -# define canlldbg lldbg +# define canllerr llerr # define canllinfo llinfo #else # define candbg(x...) # define caninfo(x...) -# define canlldbg(x...) +# define canllerr(x...) # define canllinfo(x...) #endif diff --git a/configs/viewtool-stm32f107/src/stm32_leds.c b/configs/viewtool-stm32f107/src/stm32_leds.c index fa65507488..5a7308d0e3 100644 --- a/configs/viewtool-stm32f107/src/stm32_leds.c +++ b/configs/viewtool-stm32f107/src/stm32_leds.c @@ -58,7 +58,7 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # define ledinfo llinfo #else # define leddbg(x...) diff --git a/configs/viewtool-stm32f107/src/stm32_spi.c b/configs/viewtool-stm32f107/src/stm32_spi.c index 3b957acc52..645564fda4 100644 --- a/configs/viewtool-stm32f107/src/stm32_spi.c +++ b/configs/viewtool-stm32f107/src/stm32_spi.c @@ -63,9 +63,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/viewtool-stm32f107/src/stm32_usbdev.c b/configs/viewtool-stm32f107/src/stm32_usbdev.c index 1c35e9bb50..54235c462a 100644 --- a/configs/viewtool-stm32f107/src/stm32_usbdev.c +++ b/configs/viewtool-stm32f107/src/stm32_usbdev.c @@ -118,7 +118,7 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable) void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) { - ulldbg("resume: %d\n", resume); + ullerr("resume: %d\n", resume); } #endif /* CONFIG_STM32_OTGFS || CONFIG_STM32_USB*/ diff --git a/configs/zkit-arm-1769/src/lpc17_can.c b/configs/zkit-arm-1769/src/lpc17_can.c index 89e5550973..dc866bd640 100644 --- a/configs/zkit-arm-1769/src/lpc17_can.c +++ b/configs/zkit-arm-1769/src/lpc17_can.c @@ -72,12 +72,12 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg # define caninfo info -# define canlldbg lldbg +# define canllerr llerr # define canllinfo llinfo #else # define candbg(x...) # define caninfo(x...) -# define canlldbg(x...) +# define canllerr(x...) # define canllinfo(x...) #endif diff --git a/configs/zkit-arm-1769/src/lpc17_lcd.c b/configs/zkit-arm-1769/src/lpc17_lcd.c index b58e46b853..43e8778a6a 100644 --- a/configs/zkit-arm-1769/src/lpc17_lcd.c +++ b/configs/zkit-arm-1769/src/lpc17_lcd.c @@ -76,9 +76,9 @@ #undef LCD_VERBOSE /* Define to enable verbose debug */ #ifdef LCD_DEBUG -# define leddbg lldbg +# define leddbg llerr # ifdef LCD_VERBOSE -# define ledinfo lldbg +# define ledinfo llerr # else # define ledinfo(x...) # endif @@ -118,7 +118,7 @@ int board_lcd_initialize(void) g_spidev = lpc17_sspbus_initialize(0); if (!g_spidev) { - glldbg("Failed to initialize SSP port 0\n"); + gllerr("Failed to initialize SSP port 0\n"); return 0; } @@ -137,7 +137,7 @@ FAR struct lcd_dev_s *board_lcd_getdev(int lcddev) g_lcddev = st7567_initialize(g_spidev, lcddev); if (!g_lcddev) { - glldbg("Failed to bind SSI port 0 to OLCD %d: %d\n", lcddev); + gllerr("Failed to bind SSI port 0 to OLCD %d: %d\n", lcddev); } else { diff --git a/configs/zkit-arm-1769/src/lpc17_leds.c b/configs/zkit-arm-1769/src/lpc17_leds.c index 02d4b03cfe..a62b58f4d4 100644 --- a/configs/zkit-arm-1769/src/lpc17_leds.c +++ b/configs/zkit-arm-1769/src/lpc17_leds.c @@ -67,9 +67,9 @@ */ #ifdef CONFIG_DEBUG_LEDS -# define leddbg lldbg +# define leddbg llerr # ifdef CONFIG_DEBUG_INFO -# define ledinfo lldbg +# define ledinfo llerr # else # define ledinfo(x...) # endif diff --git a/configs/zkit-arm-1769/src/lpc17_spi.c b/configs/zkit-arm-1769/src/lpc17_spi.c index d28347c723..45c04fb456 100644 --- a/configs/zkit-arm-1769/src/lpc17_spi.c +++ b/configs/zkit-arm-1769/src/lpc17_spi.c @@ -66,9 +66,9 @@ /* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/configs/zkit-arm-1769/src/lpc17_ssp.c b/configs/zkit-arm-1769/src/lpc17_ssp.c index f0667b4bba..633e9107e5 100644 --- a/configs/zkit-arm-1769/src/lpc17_ssp.c +++ b/configs/zkit-arm-1769/src/lpc17_ssp.c @@ -66,9 +66,9 @@ /* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */ #ifdef CONFIG_DEBUG_SPI -# define sspdbg lldbg +# define sspdbg llerr # ifdef CONFIG_DEBUG_INFO -# define sspinfo lldbg +# define sspinfo llerr # else # define sspinfo(x...) # endif diff --git a/configs/zp214xpa/src/lpc2148_spi1.c b/configs/zp214xpa/src/lpc2148_spi1.c index c0336cef05..b07db4d85f 100644 --- a/configs/zp214xpa/src/lpc2148_spi1.c +++ b/configs/zp214xpa/src/lpc2148_spi1.c @@ -90,9 +90,9 @@ /* Enables debug output from this file */ #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/crypto/crypto.c b/crypto/crypto.c index e7c5594eb1..e0095ef6d1 100644 --- a/crypto/crypto.c +++ b/crypto/crypto.c @@ -81,7 +81,7 @@ int up_cryptoinitialize(void) res = crypto_test(); if (res) { - cryptlldbg("crypto test failed\n"); + cryptllerr("crypto test failed\n"); } else { diff --git a/crypto/testmngr.c b/crypto/testmngr.c index c7fe86e78a..f95628f4a9 100644 --- a/crypto/testmngr.c +++ b/crypto/testmngr.c @@ -86,7 +86,7 @@ static int do_test_aes(FAR struct cipher_testvec *test, int mode, int encrypt) #define AES_CYPHER_TEST_ENCRYPT(mode, mode_str, count, template) \ for (i = 0; i < count; i++) { \ if (do_test_aes(template + i, mode, CYPHER_ENCRYPT)) { \ - cryptlldbg("Failed " mode_str " encrypt test #%i\n", i); \ + cryptllerr("Failed " mode_str " encrypt test #%i\n", i); \ return -1; \ } \ } @@ -94,7 +94,7 @@ static int do_test_aes(FAR struct cipher_testvec *test, int mode, int encrypt) #define AES_CYPHER_TEST_DECRYPT(mode, mode_str, count, template) \ for (i = 0; i < count; i++) { \ if (do_test_aes(template + i, mode, CYPHER_DECRYPT)) { \ - cryptlldbg("Failed " mode_str " decrypt test #%i\n", i); \ + cryptllerr("Failed " mode_str " decrypt test #%i\n", i); \ return -1; \ } \ } diff --git a/drivers/audio/i2schar.c b/drivers/audio/i2schar.c index 27072548b5..95ebbb73ae 100644 --- a/drivers/audio/i2schar.c +++ b/drivers/audio/i2schar.c @@ -87,16 +87,16 @@ #ifdef CONFIG_DEBUG_I2S # define i2sdbg dbg -# define i2slldbg lldbg +# define i2sllerr llerr # ifdef CONFIG_DEBUG_INFO # define i2sinfo dbg -# define i2sllinfo lldbg +# define i2sllinfo llerr # else # define i2sinfo(x...) # endif #else # define i2sdbg(x...) -# define i2slldbg(x...) +# define i2sllerr(x...) # define i2sinfo(x...) # define i2sllinfo(x...) #endif diff --git a/drivers/audio/wm8904.c b/drivers/audio/wm8904.c index de116ac9b9..dcbce3c506 100644 --- a/drivers/audio/wm8904.c +++ b/drivers/audio/wm8904.c @@ -1345,7 +1345,7 @@ static void wm8904_senddone(FAR struct i2s_dev_s *i2s, CONFIG_WM8904_MSG_PRIO); if (ret < 0) { - audlldbg("ERROR: mq_send failed: %d\n", errno); + audllerr("ERROR: mq_send failed: %d\n", errno); } } @@ -1971,7 +1971,7 @@ static int wm8904_interrupt(FAR const struct wm8904_lower_s *lower, ret = work_queue(LPWORK, &priv->work, wm8904_interrupt_work, priv, 0); if (ret < 0) { - audlldbg("ERROR: Failed to schedule work\n"); + audllerr("ERROR: Failed to schedule work\n"); } return OK; diff --git a/drivers/can.c b/drivers/can.c index bd5cd96220..fcdd4e2425 100644 --- a/drivers/can.c +++ b/drivers/can.c @@ -102,12 +102,12 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg # define caninfo info -# define canlldbg lldbg +# define canllerr llerr # define canllinfo llinfo #else # define candbg(x...) # define caninfo(x...) -# define canlldbg(x...) +# define canllerr(x...) # define canllinfo(x...) #endif diff --git a/drivers/input/ads7843e.c b/drivers/input/ads7843e.c index 2097c0774c..4626217afb 100644 --- a/drivers/input/ads7843e.c +++ b/drivers/input/ads7843e.c @@ -498,7 +498,7 @@ static int ads7843e_schedule(FAR struct ads7843e_dev_s *priv) ret = work_queue(HPWORK, &priv->work, ads7843e_worker, priv, 0); if (ret != 0) { - illdbg("Failed to queue work: %d\n", ret); + illerr("Failed to queue work: %d\n", ret); } return OK; diff --git a/drivers/input/max11802.c b/drivers/input/max11802.c index 1acee40807..97c9a6cc3f 100644 --- a/drivers/input/max11802.c +++ b/drivers/input/max11802.c @@ -463,7 +463,7 @@ static int max11802_schedule(FAR struct max11802_dev_s *priv) ret = work_queue(HPWORK, &priv->work, max11802_worker, priv, 0); if (ret != 0) { - illdbg("Failed to queue work: %d\n", ret); + illerr("Failed to queue work: %d\n", ret); } return OK; diff --git a/drivers/input/mxt.c b/drivers/input/mxt.c index f09455b4c9..6f09edade1 100644 --- a/drivers/input/mxt.c +++ b/drivers/input/mxt.c @@ -1097,7 +1097,7 @@ static int mxt_interrupt(FAR const struct mxt_lower_s *lower, FAR void *arg) ret = work_queue(HPWORK, &priv->work, mxt_worker, priv, 0); if (ret != 0) { - illdbg("Failed to queue work: %d\n", ret); + illerr("Failed to queue work: %d\n", ret); } /* Clear any pending interrupts and return success */ diff --git a/drivers/input/stmpe811_base.c b/drivers/input/stmpe811_base.c index b491fe5b2e..863daf61f5 100644 --- a/drivers/input/stmpe811_base.c +++ b/drivers/input/stmpe811_base.c @@ -199,7 +199,7 @@ static int stmpe811_interrupt(int irq, FAR void *context) ret = work_queue(HPWORK, &priv->work, stmpe811_worker, priv, 0); if (ret != 0) { - illdbg("Failed to queue work: %d\n", ret); + illerr("Failed to queue work: %d\n", ret); } } diff --git a/drivers/input/stmpe811_gpio.c b/drivers/input/stmpe811_gpio.c index 267f26cf48..7d4fc5edb8 100644 --- a/drivers/input/stmpe811_gpio.c +++ b/drivers/input/stmpe811_gpio.c @@ -438,7 +438,7 @@ void stmpe811_gpioworker(FAR struct stmpe811_dev_s *priv) } else { - illdbg("No handler for PIN%d, GPIO_INTSTA: %02x\n", pin, regval); + illerr("No handler for PIN%d, GPIO_INTSTA: %02x\n", pin, regval); } /* Clear the pending GPIO interrupt by writing a '1' to the diff --git a/drivers/input/stmpe811_tsc.c b/drivers/input/stmpe811_tsc.c index 21ad19c2c7..d1cfa04bdc 100644 --- a/drivers/input/stmpe811_tsc.c +++ b/drivers/input/stmpe811_tsc.c @@ -786,7 +786,7 @@ static void stmpe811_timeout(int argc, uint32_t arg1, ...) ret = work_queue(HPWORK, &priv->timeout, stmpe811_timeoutworker, priv, 0); if (ret != 0) { - illdbg("Failed to queue work: %d\n", ret); + illerr("Failed to queue work: %d\n", ret); } } } diff --git a/drivers/input/tsc2007.c b/drivers/input/tsc2007.c index 8ab76b8e7e..5d478551c7 100644 --- a/drivers/input/tsc2007.c +++ b/drivers/input/tsc2007.c @@ -783,7 +783,7 @@ static int tsc2007_interrupt(int irq, FAR void *context) ret = work_queue(HPWORK, &priv->work, tsc2007_worker, priv, 0); if (ret != 0) { - illdbg("Failed to queue work: %d\n", ret); + illerr("Failed to queue work: %d\n", ret); } /* Clear any pending interrupts and return success */ diff --git a/drivers/lcd/ssd1306_i2c.c b/drivers/lcd/ssd1306_i2c.c index 1a5edaa6d1..30ca9a664f 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 - lldbg("-> 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 f40a59cdf8..dfa7acfc02 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 - lldbg("->0x%02x\n", regval); + llerr("->0x%02x\n", regval); #endif /* Send byte value to display */ diff --git a/drivers/leds/rgbled.c b/drivers/leds/rgbled.c index 4760abf207..8a457a391c 100644 --- a/drivers/leds/rgbled.c +++ b/drivers/leds/rgbled.c @@ -75,12 +75,12 @@ #ifdef CONFIG_DEBUG_RGBLED # define pwmdbg dbg # define pwminfo info -# define pwmlldbg lldbg +# define pwmllerr llerr # define pwmllinfo llinfo #else # define pwmdbg(x...) # define pwminfo(x...) -# define pwmlldbg(x...) +# define pwmllerr(x...) # define pwmllinfo(x...) #endif diff --git a/drivers/leds/userled_upper.c b/drivers/leds/userled_upper.c index dd074db27a..397f9aab8b 100644 --- a/drivers/leds/userled_upper.c +++ b/drivers/leds/userled_upper.c @@ -67,9 +67,9 @@ #endif #ifdef CONFIG_DEBUG_LEDS -# define ddbg lldbg +# define ddbg llerr # ifdef CONFIG_DEBUG_INFO -# define dinfo lldbg +# define dinfo llerr # else # define dinfo(x...) # endif diff --git a/drivers/modem/u-blox.c b/drivers/modem/u-blox.c index 6fedc5645a..fac7ec1ce2 100644 --- a/drivers/modem/u-blox.c +++ b/drivers/modem/u-blox.c @@ -60,12 +60,12 @@ #ifdef CONFIG_MODEM_U_BLOX_DEBUG # define m_dbg dbg # define m_info info -# define m_vlldbg lldbg +# define m_vllerr llerr # define m_vllinfo llinfo #else # define m_dbg(x...) # define m_info(x...) -# define m_lldbg(x...) +# define m_llerr(x...) # define m_llinfo(x...) #endif diff --git a/drivers/mtd/sst26.c b/drivers/mtd/sst26.c index 16d867c0ab..c92b90bd17 100644 --- a/drivers/mtd/sst26.c +++ b/drivers/mtd/sst26.c @@ -209,12 +209,12 @@ #ifdef CONFIG_SST26_DEBUG # define sstdbg(format, ...) dbg(format, ##__VA_ARGS__) -# define sstlldbg(format, ...) lldbg(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 sstdbg(x...) -# define sstlldbg(x...) +# define sstllerr(x...) # define sstinfo(x...) # define sstllinfo(x...) #endif @@ -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); - lldbg("manufacturer: %02x memory: %02x capacity: %02x\n", + llerr("manufacturer: %02x memory: %02x capacity: %02x\n", manufacturer, memory, capacity); /* Check for a valid manufacturer and memory type */ diff --git a/drivers/net/dm90x0.c b/drivers/net/dm90x0.c index 798bb3e38f..26b29c2904 100644 --- a/drivers/net/dm90x0.c +++ b/drivers/net/dm90x0.c @@ -1722,13 +1722,13 @@ int dm9x_initialize(void) vid = (((uint16_t)getreg(DM9X_VIDH)) << 8) | (uint16_t)getreg(DM9X_VIDL); pid = (((uint16_t)getreg(DM9X_PIDH)) << 8) | (uint16_t)getreg(DM9X_PIDL); - nlldbg("I/O base: %08x VID: %04x PID: %04x\n", CONFIG_DM9X_BASE, vid, pid); + nllerr("I/O base: %08x VID: %04x PID: %04x\n", CONFIG_DM9X_BASE, vid, pid); /* Check if a DM90x0 chip is recognized at this I/O base */ if (vid != DM9X_DAVICOMVID || (pid != DM9X_DM9000PID && pid != DM9X_DM9010PID)) { - nlldbg("DM90x0 vendor/product ID not found at this base address\n"); + nllerr("DM90x0 vendor/product ID not found at this base address\n"); return -ENODEV; } @@ -1738,7 +1738,7 @@ int dm9x_initialize(void) { /* We could not attach the ISR to the ISR */ - nlldbg("irq_attach() failed\n"); + nllerr("irq_attach() failed\n"); return -EAGAIN; } @@ -1767,7 +1767,7 @@ int dm9x_initialize(void) mptr[i] = getreg(j); } - nlldbg("MAC: %0x:%0x:%0x:%0x:%0x:%0x\n", + nllerr("MAC: %0x:%0x:%0x:%0x:%0x:%0x\n", mptr[0], mptr[1], mptr[2], mptr[3], mptr[4], mptr[5]); /* Register the device with the OS so that socket IOCTLs can be performed */ diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c index ecc2d4a2e1..3f3e64c92c 100644 --- a/drivers/net/enc28j60.c +++ b/drivers/net/enc28j60.c @@ -1484,7 +1484,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv) else #endif { - nlldbg("Unsupported packet type dropped (%02x)\n", htons(BUF->type)); + nllerr("Unsupported packet type dropped (%02x)\n", htons(BUF->type)); NETDEV_RXDROPPED(&priv->dev); } } @@ -1550,7 +1550,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv) if ((rxstat & RXSTAT_OK) == 0) { - nlldbg("ERROR: RXSTAT: %04x\n", rxstat); + nllerr("ERROR: RXSTAT: %04x\n", rxstat); NETDEV_RXERRORS(&priv->dev); } @@ -1558,7 +1558,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv) else if (pktlen > (CONFIG_NET_ETH_MTU + 4) || pktlen <= (ETH_HDRLEN + 4)) { - nlldbg("Bad packet size dropped (%d)\n", pktlen); + nllerr("Bad packet size dropped (%d)\n", pktlen); NETDEV_RXERRORS(&priv->dev); } @@ -1878,7 +1878,7 @@ static void enc_toworker(FAR void *arg) net_lock_t lock; int ret; - nlldbg("Tx timeout\n"); + nllerr("Tx timeout\n"); DEBUGASSERT(priv); /* Get exclusive access to the network */ @@ -2067,7 +2067,7 @@ static int enc_ifup(struct net_driver_s *dev) FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)dev->d_private; int ret; - nlldbg("Bringing up: %d.%d.%d.%d\n", + nllerr("Bringing up: %d.%d.%d.%d\n", dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff, (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24); @@ -2139,7 +2139,7 @@ static int enc_ifdown(struct net_driver_s *dev) irqstate_t flags; int ret; - nlldbg("Taking down: %d.%d.%d.%d\n", + nllerr("Taking down: %d.%d.%d.%d\n", dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff, (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24); @@ -2473,7 +2473,7 @@ static int enc_reset(FAR struct enc_driver_s *priv) { uint8_t regval; - nlldbg("Reset\n"); + nllerr("Reset\n"); /* Configure SPI for the ENC28J60 */ @@ -2524,7 +2524,7 @@ static int enc_reset(FAR struct enc_driver_s *priv) regval = enc_rdbreg(priv, ENC_EREVID); if (regval == 0x00 || regval == 0xff) { - nlldbg("Bad Rev ID: %02x\n", regval); + nllerr("Bad Rev ID: %02x\n", regval); return -ENODEV; } diff --git a/drivers/net/encx24j600.c b/drivers/net/encx24j600.c index 67582d5c2d..1ce5a53f25 100644 --- a/drivers/net/encx24j600.c +++ b/drivers/net/encx24j600.c @@ -1127,7 +1127,7 @@ static int enc_txenqueue(FAR struct enc_driver_s *priv) } else { - nlldbg("no free descriptors\n"); + nllerr("no free descriptors\n"); ret = -ENOMEM; } @@ -1612,7 +1612,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv) enc_rxrmpkt(priv, descr); - nlldbg("Unsupported packet type dropped (%02x)\n", htons(BUF->type)); + nllerr("Unsupported packet type dropped (%02x)\n", htons(BUF->type)); NETDEV_RXDROPPED(&priv->dev); } @@ -1707,7 +1707,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv) if ((rxstat & RXSTAT_OK) == 0) { - nlldbg("ERROR: RXSTAT: %08x\n", rxstat); + nllerr("ERROR: RXSTAT: %08x\n", rxstat); /* Discard packet */ @@ -1719,7 +1719,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv) else if (pktlen > (CONFIG_NET_ETH_MTU + 4) || pktlen <= (ETH_HDRLEN + 4)) { - nlldbg("Bad packet size dropped (%d)\n", pktlen); + nllerr("Bad packet size dropped (%d)\n", pktlen); /* Discard packet */ @@ -1774,17 +1774,17 @@ static void enc_rxabtif(FAR struct enc_driver_s *priv) #if 0 /* Free the last received packet from the RX queue */ - nlldbg("rx abort\n"); - nlldbg("ESTAT: %04x\n", enc_rdreg(priv, ENC_ESTAT)); - nlldbg("EIR: %04x\n", enc_rdreg(priv, ENC_EIR)); - nlldbg("ERXTAIL: %04x\n", enc_rdreg(priv, ENC_ERXTAIL)); - nlldbg("ERXHAED: %04x\n", enc_rdreg(priv, ENC_ERXHEAD)); + nllerr("rx abort\n"); + nllerr("ESTAT: %04x\n", enc_rdreg(priv, ENC_ESTAT)); + nllerr("EIR: %04x\n", enc_rdreg(priv, ENC_EIR)); + nllerr("ERXTAIL: %04x\n", enc_rdreg(priv, ENC_ERXTAIL)); + nllerr("ERXHAED: %04x\n", enc_rdreg(priv, ENC_ERXHEAD)); descr = (FAR struct enc_descr_s *)sq_peek(&priv->rxqueue); while (descr != NULL) { - nlldbg("addr: %04x len: %d\n", descr->addr, descr->len); + nllerr("addr: %04x len: %d\n", descr->addr, descr->len); descr = (FAR struct enc_descr_s *)sq_next(descr); } @@ -1797,7 +1797,7 @@ static void enc_rxabtif(FAR struct enc_driver_s *priv) { enc_rxrmpkt(priv, descr); - nlldbg("pending packet freed\n"); + nllerr("pending packet freed\n"); } else { @@ -2043,7 +2043,7 @@ static void enc_toworker(FAR void *arg) net_lock_t lock; int ret; - nlldbg("Tx timeout\n"); + nllerr("Tx timeout\n"); DEBUGASSERT(priv); /* Get exclusive access to the network. */ @@ -2231,7 +2231,7 @@ static int enc_ifup(struct net_driver_s *dev) FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)dev->d_private; int ret; - nlldbg("Bringing up: %d.%d.%d.%d\n", + nllerr("Bringing up: %d.%d.%d.%d\n", dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff, (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24); @@ -2307,7 +2307,7 @@ static int enc_ifdown(struct net_driver_s *dev) irqstate_t flags; int ret; - nlldbg("Taking down: %d.%d.%d.%d\n", + nllerr("Taking down: %d.%d.%d.%d\n", dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff, (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24); @@ -2742,7 +2742,7 @@ static int enc_reset(FAR struct enc_driver_s *priv) if (ret != OK) { - nlldbg("ERROR: encx24j600 clock failed to become ready\n"); + nllerr("ERROR: encx24j600 clock failed to become ready\n"); return -ENODEV; } @@ -2756,7 +2756,7 @@ static int enc_reset(FAR struct enc_driver_s *priv) if (regval != 0x0000) { - nlldbg("ERROR: encx24j600 seems not to be reset properly\n"); + nllerr("ERROR: encx24j600 seems not to be reset properly\n"); return -ENODEV; } @@ -2813,7 +2813,7 @@ static int enc_reset(FAR struct enc_driver_s *priv) #if 0 if (ret != OK) { - nlldbg("ERROR: encx24j600 failed to establish link\n"); + nllerr("ERROR: encx24j600 failed to establish link\n"); return -ENODEV; } #endif diff --git a/drivers/net/phy_notify.c b/drivers/net/phy_notify.c index 73cf2af033..b78cc65810 100644 --- a/drivers/net/phy_notify.c +++ b/drivers/net/phy_notify.c @@ -83,10 +83,10 @@ #ifdef CONFIG_NETDEV_PHY_DEBUG # define phydbg dbg -# define phylldbg lldbg +# define phyllerr llerr #else # define phydbg(x...) -# define phylldbg(x...) +# define phyllerr(x...) #endif /**************************************************************************** @@ -266,7 +266,7 @@ static int phy_handler(FAR struct phy_notify_s *client) int ret; DEBUGASSERT(client && client->assigned && client->enable); - phylldbg("Entry client %d, signalling PID=%d with signal %d\n", + phyllerr("Entry client %d, signalling PID=%d with signal %d\n", client->index, client->pid, client->signo); /* Disable further interrupts */ @@ -287,7 +287,7 @@ static int phy_handler(FAR struct phy_notify_s *client) int errcode = errno; DEBUGASSERT(errcode > 0); - nlldbg("ERROR: sigqueue failed: %d\n", errcode); + nllerr("ERROR: sigqueue failed: %d\n", errcode); UNUSED(errcode); } diff --git a/drivers/net/telnet.c b/drivers/net/telnet.c index c2ddfc44c9..903921f09f 100644 --- a/drivers/net/telnet.c +++ b/drivers/net/telnet.c @@ -447,7 +447,7 @@ static void telnet_sendopt(FAR struct telnet_dev_s *priv, uint8_t option, telnet_dumpbuffer("Send optbuf", optbuf, 4); if (psock_send(&priv->td_psock, optbuf, 4, 0) < 0) { - nlldbg("Failed to send TELNET_IAC\n"); + nllerr("Failed to send TELNET_IAC\n"); } } @@ -548,7 +548,7 @@ static int telnet_close(FAR struct file *filep) ret = asprintf(&devpath, TELNETD_DEVFMT, priv->td_minor); if (ret < 0) { - nlldbg("ERROR: Failed to allocate the driver path\n"); + nllerr("ERROR: Failed to allocate the driver path\n"); } else { @@ -566,7 +566,7 @@ static int telnet_close(FAR struct file *filep) if (ret != -EBUSY) { - nlldbg("Failed to unregister the driver %s: %d\n", + nllerr("Failed to unregister the driver %s: %d\n", devpath, ret); } } @@ -706,7 +706,7 @@ static ssize_t telnet_write(FAR struct file *filep, FAR const char *buffer, size ret = psock_send(&priv->td_psock, priv->td_txbuffer, ncopied, 0); if (ret < 0) { - nlldbg("psock_send failed '%s': %d\n", priv->td_txbuffer, ret); + nllerr("psock_send failed '%s': %d\n", priv->td_txbuffer, ret); return ret; } @@ -723,7 +723,7 @@ static ssize_t telnet_write(FAR struct file *filep, FAR const char *buffer, size ret = psock_send(&priv->td_psock, priv->td_txbuffer, ncopied, 0); if (ret < 0) { - nlldbg("psock_send failed '%s': %d\n", priv->td_txbuffer, ret); + nllerr("psock_send failed '%s': %d\n", priv->td_txbuffer, ret); return ret; } } @@ -767,7 +767,7 @@ static int telnet_session(FAR struct telnet_session_s *session) priv = (FAR struct telnet_dev_s*)malloc(sizeof(struct telnet_dev_s)); if (!priv) { - nlldbg("Failed to allocate the driver data structure\n"); + nllerr("Failed to allocate the driver data structure\n"); return -ENOMEM; } @@ -788,7 +788,7 @@ static int telnet_session(FAR struct telnet_session_s *session) psock = sockfd_socket(session->ts_sd); if (!psock) { - nlldbg("Failed to convert sd=%d to a socket structure\n", session->ts_sd); + nllerr("Failed to convert sd=%d to a socket structure\n", session->ts_sd); ret = -EINVAL; goto errout_with_dev; } @@ -796,7 +796,7 @@ static int telnet_session(FAR struct telnet_session_s *session) ret = net_clone(psock, &priv->td_psock); if (ret < 0) { - nlldbg("net_clone failed: %d\n", ret); + nllerr("net_clone failed: %d\n", ret); goto errout_with_dev; } @@ -834,7 +834,7 @@ static int telnet_session(FAR struct telnet_session_s *session) if (ret >= 0) { - nlldbg("ERROR: Too many sessions\n"); + nllerr("ERROR: Too many sessions\n"); ret = -ENFILE; goto errout_with_semaphore; } @@ -844,7 +844,7 @@ static int telnet_session(FAR struct telnet_session_s *session) ret = register_driver(session->ts_devpath, &g_telnet_fops, 0666, priv); if (ret < 0) { - nlldbg("ERROR: Failed to register the driver %s: %d\n", + nllerr("ERROR: Failed to register the driver %s: %d\n", session->ts_devpath, ret); goto errout_with_semaphore; } diff --git a/drivers/pipes/pipe_common.c b/drivers/pipes/pipe_common.c index 3d45b8fdac..fe728c2f35 100644 --- a/drivers/pipes/pipe_common.c +++ b/drivers/pipes/pipe_common.c @@ -521,7 +521,7 @@ ssize_t pipecommon_write(FAR struct file *filep, FAR const char *buffer, * be called from interrupt level. This actually happens fairly commonly * IF dbg() 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 lldbg() 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/pwm.c b/drivers/pwm.c index 103b78755a..0b0e173d4e 100644 --- a/drivers/pwm.c +++ b/drivers/pwm.c @@ -73,12 +73,12 @@ #ifdef CONFIG_DEBUG_PWM # define pwmdbg dbg # define pwminfo info -# define pwmlldbg lldbg +# define pwmllerr llerr # define pwmllinfo llinfo #else # define pwmdbg(x...) # define pwminfo(x...) -# define pwmlldbg(x...) +# define pwmllerr(x...) # define pwmllinfo(x...) #endif diff --git a/drivers/sensors/adxl345_base.c b/drivers/sensors/adxl345_base.c index a1cdeeecdb..e96aff0838 100644 --- a/drivers/sensors/adxl345_base.c +++ b/drivers/sensors/adxl345_base.c @@ -305,7 +305,7 @@ static void adxl345_interrupt(FAR struct adxl345_config_s *config, FAR void *arg ret = work_queue(HPWORK, &priv->work, adxl345_worker, priv, 0); if (ret != 0) { - snlldbg("Failed to queue work: %d\n", ret); + snllerr("Failed to queue work: %d\n", ret); } } diff --git a/drivers/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c index ec3a1512e1..75667fd135 100644 --- a/drivers/spi/spi_bitbang.c +++ b/drivers/spi/spi_bitbang.c @@ -89,9 +89,9 @@ #endif #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/drivers/timers/ds3231.c b/drivers/timers/ds3231.c index 630ba72259..8dbed20dec 100644 --- a/drivers/timers/ds3231.c +++ b/drivers/timers/ds3231.c @@ -86,12 +86,12 @@ #ifdef CONFIG_DEBUG_RTC # define rtcdbg dbg # define rtcinfo info -# define rtclldbg lldbg +# define rtcllerr llerr # define rtcllinfo llinfo #else # define rtcdbg(x...) # define rtcinfo(x...) -# define rtclldbg(x...) +# define rtcllerr(x...) # define rtcllinfo(x...) #endif @@ -143,17 +143,17 @@ static struct ds3231_dev_s g_ds3231; #ifdef CONFIG_DEBUG_RTC static void rtc_dumptime(FAR struct tm *tp, FAR const char *msg) { - rtclldbg("%s:\n", msg); - rtclldbg(" tm_sec: %08x\n", tp->tm_sec); - rtclldbg(" tm_min: %08x\n", tp->tm_min); - rtclldbg(" tm_hour: %08x\n", tp->tm_hour); - rtclldbg(" tm_mday: %08x\n", tp->tm_mday); - rtclldbg(" tm_mon: %08x\n", tp->tm_mon); - rtclldbg(" tm_year: %08x\n", tp->tm_year); + rtcllerr("%s:\n", msg); + rtcllerr(" tm_sec: %08x\n", tp->tm_sec); + rtcllerr(" tm_min: %08x\n", tp->tm_min); + rtcllerr(" tm_hour: %08x\n", tp->tm_hour); + rtcllerr(" tm_mday: %08x\n", tp->tm_mday); + rtcllerr(" tm_mon: %08x\n", tp->tm_mon); + rtcllerr(" tm_year: %08x\n", tp->tm_year); #if defined(CONFIG_LIBC_LOCALTIME) || defined(CONFIG_TIME_EXTENDED) - rtclldbg(" tm_wday: %08x\n", tp->tm_wday); - rtclldbg(" tm_yday: %08x\n", tp->tm_yday); - rtclldbg(" tm_isdst: %08x\n", tp->tm_isdst); + rtcllerr(" tm_wday: %08x\n", tp->tm_wday); + rtcllerr(" tm_yday: %08x\n", tp->tm_yday); + rtcllerr(" tm_isdst: %08x\n", tp->tm_isdst); #endif } #else diff --git a/drivers/timers/pcf85263.c b/drivers/timers/pcf85263.c index 93619f2d93..7a9f22145f 100644 --- a/drivers/timers/pcf85263.c +++ b/drivers/timers/pcf85263.c @@ -86,12 +86,12 @@ #ifdef CONFIG_DEBUG_RTC # define rtcdbg dbg # define rtcinfo info -# define rtclldbg lldbg +# define rtcllerr llerr # define rtcllinfo llinfo #else # define rtcdbg(x...) # define rtcinfo(x...) -# define rtclldbg(x...) +# define rtcllerr(x...) # define rtcllinfo(x...) #endif @@ -143,17 +143,17 @@ static struct pcf85263_dev_s g_pcf85263; #ifdef CONFIG_DEBUG_RTC static void rtc_dumptime(FAR struct tm *tp, FAR const char *msg) { - rtclldbg("%s:\n", msg); - rtclldbg(" tm_sec: %08x\n", tp->tm_sec); - rtclldbg(" tm_min: %08x\n", tp->tm_min); - rtclldbg(" tm_hour: %08x\n", tp->tm_hour); - rtclldbg(" tm_mday: %08x\n", tp->tm_mday); - rtclldbg(" tm_mon: %08x\n", tp->tm_mon); - rtclldbg(" tm_year: %08x\n", tp->tm_year); + rtcllerr("%s:\n", msg); + rtcllerr(" tm_sec: %08x\n", tp->tm_sec); + rtcllerr(" tm_min: %08x\n", tp->tm_min); + rtcllerr(" tm_hour: %08x\n", tp->tm_hour); + rtcllerr(" tm_mday: %08x\n", tp->tm_mday); + rtcllerr(" tm_mon: %08x\n", tp->tm_mon); + rtcllerr(" tm_year: %08x\n", tp->tm_year); #if defined(CONFIG_LIBC_LOCALTIME) || defined(CONFIG_TIME_EXTENDED) - rtclldbg(" tm_wday: %08x\n", tp->tm_wday); - rtclldbg(" tm_yday: %08x\n", tp->tm_yday); - rtclldbg(" tm_isdst: %08x\n", tp->tm_isdst); + rtcllerr(" tm_wday: %08x\n", tp->tm_wday); + rtcllerr(" tm_yday: %08x\n", tp->tm_yday); + rtcllerr(" tm_isdst: %08x\n", tp->tm_isdst); #endif } #else diff --git a/drivers/timers/timer.c b/drivers/timers/timer.c index 2a976cc22c..ead1d4d905 100644 --- a/drivers/timers/timer.c +++ b/drivers/timers/timer.c @@ -66,12 +66,12 @@ #ifdef CONFIG_DEBUG_TIMER # define tmrdbg dbg # define tmrinfo info -# define tmrlldbg lldbg +# define tmrllerr llerr # define tmrllinfo llinfo #else # define tmrdbg(x...) # define tmrinfo(x...) -# define tmrlldbg(x...) +# define tmrllerr(x...) # define tmrllinfo(x...) #endif diff --git a/drivers/timers/watchdog.c b/drivers/timers/watchdog.c index b538d1c55b..3f73efd2fe 100644 --- a/drivers/timers/watchdog.c +++ b/drivers/timers/watchdog.c @@ -65,12 +65,12 @@ #ifdef CONFIG_DEBUG_WATCHDOG # define wddbg dbg # define wdinfo info -# define wdlldbg lldbg +# define wdllerr llerr # define wdllinfo llinfo #else # define wddbg(x...) # define wdinfo(x...) -# define wdlldbg(x...) +# define wdllerr(x...) # define wdllinfo(x...) #endif diff --git a/drivers/usbhost/usbhost_hidkbd.c b/drivers/usbhost/usbhost_hidkbd.c index 5df339962d..5d2a54e48a 100644 --- a/drivers/usbhost/usbhost_hidkbd.c +++ b/drivers/usbhost/usbhost_hidkbd.c @@ -178,8 +178,8 @@ #ifndef CONFIG_DEBUG_INPUT # undef idbg # define idbg udbg -# undef illdbg -# define illdbg ulldbg +# undef illerr +# define illerr ullerr # undef iinfo # define iinfo uinfo # undef illinfo @@ -1524,7 +1524,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, if ((found & USBHOST_RQDFOUND) != USBHOST_RQDFOUND) { - ulldbg("ERROR: Found IF:%s EPIN:%s\n", + ullerr("ERROR: Found IF:%s EPIN:%s\n", (found & USBHOST_IFFOUND) != 0 ? "YES" : "NO", (found & USBHOST_EPINFOUND) != 0 ? "YES" : "NO"); return -EINVAL; diff --git a/drivers/usbhost/usbhost_hidmouse.c b/drivers/usbhost/usbhost_hidmouse.c index b655ee689b..86536dba22 100644 --- a/drivers/usbhost/usbhost_hidmouse.c +++ b/drivers/usbhost/usbhost_hidmouse.c @@ -199,8 +199,8 @@ #ifndef CONFIG_DEBUG_INPUT # undef idbg # define idbg udbg -# undef illdbg -# define illdbg ulldbg +# undef illerr +# define illerr ullerr # undef iinfo # define iinfo uinfo # undef illinfo @@ -1613,7 +1613,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, if ((found & USBHOST_ALLFOUND) != USBHOST_ALLFOUND) { - ulldbg("ERROR: Found IF:%s EPIN:%s\n", + ullerr("ERROR: Found IF:%s EPIN:%s\n", (found & USBHOST_IFFOUND) != 0 ? "YES" : "NO", (found & USBHOST_EPINFOUND) != 0 ? "YES" : "NO"); return -EINVAL; diff --git a/drivers/usbhost/usbhost_hub.c b/drivers/usbhost/usbhost_hub.c index bc6ce5dac0..4bec1b4973 100644 --- a/drivers/usbhost/usbhost_hub.c +++ b/drivers/usbhost/usbhost_hub.c @@ -463,7 +463,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_class_s *hubclass, if (found != USBHOST_ALLFOUND) { - ulldbg("ERROR: Found IF=%s EPIN=%s\n", + ullerr("ERROR: Found IF=%s EPIN=%s\n", (found & USBHOST_IFFOUND) != 0 ? "YES" : "NO", (found & USBHOST_EPINFOUND) != 0 ? "YES" : "NO"); return -EINVAL; @@ -1190,7 +1190,7 @@ static void usbhost_callback(FAR void *arg, ssize_t nbytes) if (nbytes != -EAGAIN) #endif { - ulldbg("ERROR: Transfer failed: %d\n", (int)nbytes); + ullerr("ERROR: Transfer failed: %d\n", (int)nbytes); } /* Indicate there there is nothing to do. So when the work is diff --git a/drivers/usbhost/usbhost_skeleton.c b/drivers/usbhost/usbhost_skeleton.c index a4250031aa..ae03f341af 100644 --- a/drivers/usbhost/usbhost_skeleton.c +++ b/drivers/usbhost/usbhost_skeleton.c @@ -576,7 +576,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, if (found != USBHOST_ALLFOUND) { - ulldbg("ERROR: Found IF:%s BIN:%s BOUT:%s\n", + ullerr("ERROR: Found IF:%s BIN:%s BOUT:%s\n", (found & USBHOST_IFFOUND) != 0 ? "YES" : "NO", (found & USBHOST_BINFOUND) != 0 ? "YES" : "NO", (found & USBHOST_BOUTFOUND) != 0 ? "YES" : "NO"); diff --git a/drivers/usbhost/usbhost_storage.c b/drivers/usbhost/usbhost_storage.c index e3f6a8769a..e8075c77a6 100644 --- a/drivers/usbhost/usbhost_storage.c +++ b/drivers/usbhost/usbhost_storage.c @@ -1161,7 +1161,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, if (found != USBHOST_ALLFOUND) { - ulldbg("ERROR: Found IF:%s BIN:%s BOUT:%s\n", + ullerr("ERROR: Found IF:%s BIN:%s BOUT:%s\n", (found & USBHOST_IFFOUND) != 0 ? "YES" : "NO", (found & USBHOST_BINFOUND) != 0 ? "YES" : "NO", (found & USBHOST_BOUTFOUND) != 0 ? "YES" : "NO"); diff --git a/drivers/wireless/cc3000/cc3000.c b/drivers/wireless/cc3000/cc3000.c index 12413070df..dd7cc44bd0 100644 --- a/drivers/wireless/cc3000/cc3000.c +++ b/drivers/wireless/cc3000/cc3000.c @@ -124,7 +124,7 @@ CCASSERT(sizeof(cc3000_buffer_desc) <= CONFIG_MQ_MAXMSGSIZE); # define PROBE(pin,state) #endif -#define waitlldbg(x,...) +#define waitllerr(x,...) /**************************************************************************** * Private Types @@ -500,7 +500,7 @@ static void * select_thread_func(FAR void *arg) if (priv->sockets[s].sd == CLOSE_SLOT) { priv->sockets[s].sd = FREE_SLOT; - waitlldbg("Close\n"); + waitllerr("Close\n"); int count; do { @@ -509,7 +509,7 @@ static void * select_thread_func(FAR void *arg) { /* Release the waiting threads */ - waitlldbg("Closed Signaled %d\n", count); + waitllerr("Closed Signaled %d\n", count); sem_post(&priv->sockets[s].semwait); } } @@ -556,17 +556,17 @@ static void * select_thread_func(FAR void *arg) { if (ret > 0 && CC3000_FD_ISSET(priv->sockets[s].sd, &readsds)) /* and has pending data */ { - waitlldbg("Signaled %d\n", priv->sockets[s].sd); + waitllerr("Signaled %d\n", priv->sockets[s].sd); sem_post(&priv->sockets[s].semwait); /* release the waiting thread */ } else if (ret > 0 && CC3000_FD_ISSET(priv->sockets[s].sd, &exceptsds)) /* or has pending exception */ { - waitlldbg("Signaled %d (exception)\n", priv->sockets[s].sd); + waitllerr("Signaled %d (exception)\n", priv->sockets[s].sd); sem_post(&priv->sockets[s].semwait); /* release the waiting thread */ } else if (priv->sockets[s].received_closed_event) /* or remote has closed connection and we have now read all of HW buffer. */ { - waitlldbg("Signaled %d (closed & empty)\n", priv->sockets[s].sd); + waitllerr("Signaled %d (closed & empty)\n", priv->sockets[s].sd); priv->sockets[s].emptied_and_remotely_closed = true; sem_post(&priv->sockets[s].semwait); /* release the waiting thread */ } diff --git a/drivers/wireless/cc3000/cc3000drv.c b/drivers/wireless/cc3000/cc3000drv.c index d56e66af8a..3b5cac58d5 100644 --- a/drivers/wireless/cc3000/cc3000drv.c +++ b/drivers/wireless/cc3000/cc3000drv.c @@ -65,9 +65,9 @@ #undef SPI_VERBOSE /* Define to enable verbose debug */ #ifdef SPI_DEBUG -# define spidbg lldbg +# define spidbg llerr # ifdef SPI_VERBOSE -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif @@ -223,7 +223,7 @@ static void *unsoliced_thread_func(void *parameter) sizeof(spiconf.rx_buffer), 0); if (nbytes > 0) { - nlldbg("%d Processed\n", nbytes); + nllerr("%d Processed\n", nbytes); spiconf.pfRxHandler(spiconf.rx_buffer.pbuffer); } } diff --git a/drivers/wireless/cc3000/socket.c b/drivers/wireless/cc3000/socket.c index 9653d06ed7..a44b9b0bdb 100644 --- a/drivers/wireless/cc3000/socket.c +++ b/drivers/wireless/cc3000/socket.c @@ -62,7 +62,7 @@ # define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #endif -#define waitlldbg(x,...) // lldbg +#define waitllerr(x,...) // llerr /**************************************************************************** * Private Types @@ -194,13 +194,13 @@ int cc3000_closesocket(int sockfd) int ret; #ifdef CONFIG_CC3000_MT - waitlldbg("remove\n"); + waitllerr("remove\n"); cc3000_remove_socket(sockfd); #endif cc3000_lib_lock(); - waitlldbg("Call closesocketl\n"); + waitllerr("Call closesocketl\n"); ret = cc3000_closesocket_impl(sockfd); - waitlldbg("return closesocket\n"); + waitllerr("return closesocket\n"); cc3000_lib_unlock(); return ret; } @@ -596,9 +596,9 @@ ssize_t cc3000_recv(int sockfd, FAR void *buf, size_t len, int flags) ssize_t ret; #ifdef CONFIG_CC3000_MT - waitlldbg("wait\n"); + waitllerr("wait\n"); ret = cc3000_wait_data(sockfd); - waitlldbg("wait %d\n", ret); + waitllerr("wait %d\n", ret); if (ret == -ECONNABORTED) { @@ -612,9 +612,9 @@ ssize_t cc3000_recv(int sockfd, FAR void *buf, size_t len, int flags) #endif cc3000_lib_lock(); - waitlldbg("recv\n"); + waitllerr("recv\n"); ret = cc3000_recv_impl(sockfd, buf, len, flags); - waitlldbg("recv %d\n", ret); + waitllerr("recv %d\n", ret); cc3000_lib_unlock(); return ret; } diff --git a/drivers/wireless/ieee802154/mrf24j40.c b/drivers/wireless/ieee802154/mrf24j40.c index fa7cfd815d..35a7ecbbe8 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; } - lldbg("remaining attenuation: %d mBm\n",txpwr); + llerr("remaining attenuation: %d mBm\n",txpwr); switch(txpwr/100) { diff --git a/graphics/vnc/server/vnc_server.h b/graphics/vnc/server/vnc_server.h index 07863fbf5b..182e7d038b 100644 --- a/graphics/vnc/server/vnc_server.h +++ b/graphics/vnc/server/vnc_server.h @@ -187,24 +187,24 @@ #ifdef CONFIG_VNCSERVER_UPDATE_DEBUG # ifdef CONFIG_CPP_HAVE_VARARGS # define upddbg(format, ...) dbg(format, ##__VA_ARGS__) -# define updlldbg(format, ...) lldbg(format, ##__VA_ARGS__) +# define updllerr(format, ...) llerr(format, ##__VA_ARGS__) # define updinfo(format, ...) info(format, ##__VA_ARGS__) # define updllinfo(format, ...) llinfo(format, ##__VA_ARGS__) # else # define upddbg dbg -# define updlldbg lldbg +# define updllerr llerr # define updinfo info # define updllinfo llinfo # endif #else # ifdef CONFIG_CPP_HAVE_VARARGS # define upddbg(x...) -# define updlldbg(x...) +# define updllerr(x...) # define updinfo(x...) # define updllinfo(x...) # else # define upddbg (void) -# define updlldbg (void) +# define updllerr (void) # define updinfo (void) # define updllinfo (void) # endif diff --git a/include/debug.h b/include/debug.h index b2810cdc56..bc825b35af 100644 --- a/include/debug.h +++ b/include/debug.h @@ -101,7 +101,7 @@ * conditions that are potential errors (or perhaps real errors with non- * fatal consequences). * - * [a-z]lldbg() -- Identical to [a-z]llinfo() except that it also requires that + * [a-z]llerr() -- Identical to [a-z]llinfo() except that it also requires that * CONFIG_DEBUG_FEATURES be defined. This is intended for important error-related * information that you probably not want to suppress during normal debug * general debugging. @@ -137,15 +137,15 @@ __arch_syslog(LOG_ERR, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__) # ifdef CONFIG_ARCH_LOWPUTC -# define lldbg(format, ...) \ +# define llerr(format, ...) \ __arch_lowsyslog(LOG_ERR, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__) # else -# define lldbg(x...) +# define llerr(x...) # endif #else /* CONFIG_DEBUG_FEATURES */ # define dbg(x...) -# define lldbg(x...) +# define llerr(x...) #endif #ifdef CONFIG_DEBUG_WARN @@ -182,14 +182,14 @@ #ifdef CONFIG_DEBUG_MM # define mdbg(format, ...) dbg(format, ##__VA_ARGS__) -# define mlldbg(format, ...) lldbg(format, ##__VA_ARGS__) +# define mllerr(format, ...) llerr(format, ##__VA_ARGS__) # define mwarn(format, ...) warn(format, ##__VA_ARGS__) # define mllwarn(format, ...) llwarn(format, ##__VA_ARGS__) # define minfo(format, ...) info(format, ##__VA_ARGS__) # define mllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define mdbg(x...) -# define mlldbg(x...) +# define mllerr(x...) # define mwarn(x...) # define mllwarn(x...) # define minfo(x...) @@ -198,14 +198,14 @@ #ifdef CONFIG_DEBUG_SCHED # define sdbg(format, ...) dbg(format, ##__VA_ARGS__) -# define slldbg(format, ...) lldbg(format, ##__VA_ARGS__) +# define sllerr(format, ...) llerr(format, ##__VA_ARGS__) # define swarn(format, ...) warn(format, ##__VA_ARGS__) # define sllwarn(format, ...) llwarn(format, ##__VA_ARGS__) # define sinfo(format, ...) info(format, ##__VA_ARGS__) # define sllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define sdbg(x...) -# define slldbg(x...) +# define sllerr(x...) # define swarn(x...) # define sllwarn(x...) # define sinfo(x...) @@ -214,14 +214,14 @@ #ifdef CONFIG_DEBUG_PAGING # define pgdbg(format, ...) dbg(format, ##__VA_ARGS__) -# define pglldbg(format, ...) lldbg(format, ##__VA_ARGS__) +# define pgllerr(format, ...) llerr(format, ##__VA_ARGS__) # define pgwarn(format, ...) warn(format, ##__VA_ARGS__) # define pgllwarn(format, ...) llwarn(format, ##__VA_ARGS__) # define pginfo(format, ...) info(format, ##__VA_ARGS__) # define pgllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define pgdbg(x...) -# define pglldbg(x...) +# define pgllerr(x...) # define pgwarn(x...) # define pgllwarn(x...) # define pginfo(x...) @@ -230,14 +230,14 @@ #ifdef CONFIG_DEBUG_DMA # define dmadbg(format, ...) dbg(format, ##__VA_ARGS__) -# define dmalldbg(format, ...) lldbg(format, ##__VA_ARGS__) +# define dmallerr(format, ...) llerr(format, ##__VA_ARGS__) # define dmawarn(format, ...) warn(format, ##__VA_ARGS__) # define dmallwarn(format, ...) llwarn(format, ##__VA_ARGS__) # define dmainfo(format, ...) info(format, ##__VA_ARGS__) # define dmallinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define dmadbg(x...) -# define dmalldbg(x...) +# define dmallerr(x...) # define dmawarn(x...) # define dmallwarn(x...) # define dmainfo(x...) @@ -246,14 +246,14 @@ #ifdef CONFIG_DEBUG_NET # define ndbg(format, ...) dbg(format, ##__VA_ARGS__) -# define nlldbg(format, ...) lldbg(format, ##__VA_ARGS__) +# define nllerr(format, ...) llerr(format, ##__VA_ARGS__) # define nwarn(format, ...) warn(format, ##__VA_ARGS__) # define nllwarn(format, ...) llwarn(format, ##__VA_ARGS__) # define ninfo(format, ...) info(format, ##__VA_ARGS__) # define nllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define ndbg(x...) -# define nlldbg(x...) +# define nllerr(x...) # define nwarn(x...) # define nllwarn(x...) # define ninfo(x...) @@ -262,14 +262,14 @@ #ifdef CONFIG_DEBUG_USB # define udbg(format, ...) dbg(format, ##__VA_ARGS__) -# define ulldbg(format, ...) lldbg(format, ##__VA_ARGS__) +# define ullerr(format, ...) llerr(format, ##__VA_ARGS__) # define uwarn(format, ...) warn(format, ##__VA_ARGS__) # define ullwarn(format, ...) llwarn(format, ##__VA_ARGS__) # define uinfo(format, ...) info(format, ##__VA_ARGS__) # define ullinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define udbg(x...) -# define ulldbg(x...) +# define ullerr(x...) # define uwarn(x...) # define ullwarn(x...) # define uinfo(x...) @@ -278,14 +278,14 @@ #ifdef CONFIG_DEBUG_FS # define fdbg(format, ...) dbg(format, ##__VA_ARGS__) -# define flldbg(format, ...) lldbg(format, ##__VA_ARGS__) +# define fllerr(format, ...) llerr(format, ##__VA_ARGS__) # define fwarn(format, ...) warn(format, ##__VA_ARGS__) # define fllwarn(format, ...) llwarn(format, ##__VA_ARGS__) # define finfo(format, ...) info(format, ##__VA_ARGS__) # define fllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define fdbg(x...) -# define flldbg(x...) +# define fllerr(x...) # define fwarn(x...) # define fllwarn(x...) # define finfo(x...) @@ -294,14 +294,14 @@ #ifdef CONFIG_DEBUG_CRYPTO # define cryptdbg(format, ...) dbg(format, ##__VA_ARGS__) -# define cryptlldbg(format, ...) lldbg(format, ##__VA_ARGS__) +# define cryptllerr(format, ...) llerr(format, ##__VA_ARGS__) # define cryptwarn(format, ...) warn(format, ##__VA_ARGS__) # define cryptllwarn(format, ...) llwarn(format, ##__VA_ARGS__) # define cryptinfo(format, ...) info(format, ##__VA_ARGS__) # define cryptllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define cryptdbg(x...) -# define cryptlldbg(x...) +# define cryptllerr(x...) # define cryptwarn(x...) # define cryptllwarn(x...) # define cryptinfo(x...) @@ -310,14 +310,14 @@ #ifdef CONFIG_DEBUG_INPUT # define idbg(format, ...) dbg(format, ##__VA_ARGS__) -# define illdbg(format, ...) lldbg(format, ##__VA_ARGS__) +# define illerr(format, ...) llerr(format, ##__VA_ARGS__) # define iwarn(format, ...) warn(format, ##__VA_ARGS__) # define illwarn(format, ...) llwarn(format, ##__VA_ARGS__) # define iinfo(format, ...) info(format, ##__VA_ARGS__) # define illinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define idbg(x...) -# define illdbg(x...) +# define illerr(x...) # define iwarn(x...) # define illwarn(x...) # define iinfo(x...) @@ -326,14 +326,14 @@ #ifdef CONFIG_DEBUG_SENSORS # define sndbg(format, ...) dbg(format, ##__VA_ARGS__) -# define snlldbg(format, ...) lldbg(format, ##__VA_ARGS__) +# define snllerr(format, ...) llerr(format, ##__VA_ARGS__) # define snwarn(format, ...) warn(format, ##__VA_ARGS__) # define snllwarn(format, ...) llwarn(format, ##__VA_ARGS__) # define sninfo(format, ...) info(format, ##__VA_ARGS__) # define snllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define sndbg(x...) -# define snlldbg(x...) +# define snllerr(x...) # define snwarn(x...) # define snllwarn(x...) # define sninfo(x...) @@ -342,14 +342,14 @@ #ifdef CONFIG_DEBUG_ANALOG # define adbg(format, ...) dbg(format, ##__VA_ARGS__) -# define alldbg(format, ...) lldbg(format, ##__VA_ARGS__) +# define allerr(format, ...) llerr(format, ##__VA_ARGS__) # define awarn(format, ...) warn(format, ##__VA_ARGS__) # define allwarn(format, ...) llwarn(format, ##__VA_ARGS__) # define ainfo(format, ...) info(format, ##__VA_ARGS__) # define allinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define adbg(x...) -# define alldbg(x...) +# define allerr(x...) # define awarn(x...) # define allwarn(x...) # define ainfo(x...) @@ -358,14 +358,14 @@ #ifdef CONFIG_DEBUG_GRAPHICS # define gdbg(format, ...) dbg(format, ##__VA_ARGS__) -# define glldbg(format, ...) lldbg(format, ##__VA_ARGS__) +# define gllerr(format, ...) llerr(format, ##__VA_ARGS__) # define gwarn(format, ...) warn(format, ##__VA_ARGS__) # define gllwarn(format, ...) llwarn(format, ##__VA_ARGS__) # define ginfo(format, ...) info(format, ##__VA_ARGS__) # define gllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define gdbg(x...) -# define glldbg(x...) +# define gllerr(x...) # define gwarn(x...) # define gllwarn(x...) # define ginfo(x...) @@ -374,14 +374,14 @@ #ifdef CONFIG_DEBUG_BINFMT # define bdbg(format, ...) dbg(format, ##__VA_ARGS__) -# define blldbg(format, ...) lldbg(format, ##__VA_ARGS__) +# define bllerr(format, ...) llerr(format, ##__VA_ARGS__) # define bwarn(format, ...) warn(format, ##__VA_ARGS__) # define bllwarn(format, ...) llwarn(format, ##__VA_ARGS__) # define binfo(format, ...) info(format, ##__VA_ARGS__) # define bllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define bdbg(x...) -# define blldbg(x...) +# define bllerr(x...) # define bwarn(x...) # define bllwarn(x...) # define binfo(x...) @@ -390,14 +390,14 @@ #ifdef CONFIG_DEBUG_LIB # define ldbg(format, ...) dbg(format, ##__VA_ARGS__) -# define llldbg(format, ...) lldbg(format, ##__VA_ARGS__) +# define lllerr(format, ...) llerr(format, ##__VA_ARGS__) # define lwarn(format, ...) warn(format, ##__VA_ARGS__) # define lllwarn(format, ...) llwarn(format, ##__VA_ARGS__) # define linfo(format, ...) info(format, ##__VA_ARGS__) # define lllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define ldbg(x...) -# define llldbg(x...) +# define lllerr(x...) # define lwarn(x...) # define lllwarn(x...) # define linfo(x...) @@ -406,14 +406,14 @@ #ifdef CONFIG_DEBUG_AUDIO # define auddbg(format, ...) dbg(format, ##__VA_ARGS__) -# define audlldbg(format, ...) lldbg(format, ##__VA_ARGS__) +# define audllerr(format, ...) llerr(format, ##__VA_ARGS__) # define audwarn(format, ...) warn(format, ##__VA_ARGS__) # define audllwarn(format, ...) llwarn(format, ##__VA_ARGS__) # define audinfo(format, ...) info(format, ##__VA_ARGS__) # define audllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define auddbg(x...) -# define audlldbg(x...) +# define audllerr(x...) # define audwarn(x...) # define audllwarn(x...) # define audinfo(x...) @@ -426,11 +426,11 @@ #ifdef CONFIG_DEBUG_FEATURES # ifndef CONFIG_ARCH_LOWPUTC -# define lldbg (void) +# define llerr (void) # endif #else # define dbg (void) -# define lldbg (void) +# define llerr (void) #endif #ifdef CONFIG_DEBUG_WARN @@ -455,14 +455,14 @@ #ifdef CONFIG_DEBUG_MM # define mdbg dbg -# define mlldbg lldbg +# define mllerr llerr # define mwarn warn # define mllwarn llwarn # define minfo info # define mllinfo llinfo #else # define mdbg (void) -# define mlldbg (void) +# define mllerr (void) # define mwarn (void) # define mllwarn (void) # define minfo (void) @@ -471,14 +471,14 @@ #ifdef CONFIG_DEBUG_SCHED # define sdbg dbg -# define slldbg lldbg +# define sllerr llerr # define swarn warn # define sllwarn llwarn # define sinfo info # define sllinfo llinfo #else # define sdbg (void) -# define slldbg (void) +# define sllerr (void) # define swarn (void) # define sllwarn (void) # define sinfo (void) @@ -487,14 +487,14 @@ #ifdef CONFIG_DEBUG_PAGING # define pgdbg dbg -# define pglldbg lldbg +# define pgllerr llerr # define pgwarn warn # define pgllwarn llwarn # define pginfo info # define pgllinfo llinfo #else # define pgdbg (void) -# define pglldbg (void) +# define pgllerr (void) # define pgwarn (void) # define pgllwarn (void) # define pginfo (void) @@ -503,14 +503,14 @@ #ifdef CONFIG_DEBUG_DMA # define dmadbg dbg -# define dmalldbg lldbg +# define dmallerr llerr # define dmawarn warn # define dmallwarn llwarn # define dmainfo info # define dmallinfo llinfo #else # define dmadbg (void) -# define dmalldbg (void) +# define dmallerr (void) # define dmawarn (void) # define dmallwarn (void) # define dmainfo (void) @@ -519,14 +519,14 @@ #ifdef CONFIG_DEBUG_NET # define ndbg dbg -# define nlldbg lldbg +# define nllerr llerr # define nwarn warn # define nllwarn llwarn # define ninfo info # define nllinfo llinfo #else # define ndbg (void) -# define nlldbg (void) +# define nllerr (void) # define nwarn (void) # define nllwarn (void) # define ninfo (void) @@ -535,14 +535,14 @@ #ifdef CONFIG_DEBUG_USB # define udbg dbg -# define ulldbg lldbg +# define ullerr llerr # define uwarn warn # define ullwarn llwarn # define uinfo info # define ullinfo llinfo #else # define udbg (void) -# define ulldbg (void) +# define ullerr (void) # define uwarn (void) # define ullwarn (void) # define uinfo (void) @@ -551,14 +551,14 @@ #ifdef CONFIG_DEBUG_FS # define fdbg dbg -# define flldbg lldbg +# define fllerr llerr # define fwarn warn # define fllwarn llwarn # define finfo info # define fllinfo llinfo #else # define fdbg (void) -# define flldbg (void) +# define fllerr (void) # define fwarn (void) # define fllwarn (void) # define finfo (void) @@ -567,14 +567,14 @@ #ifdef CONFIG_DEBUG_CRYPTO # define cryptdbg dbg -# define cryptlldbg lldbg +# define cryptllerr llerr # define cryptwarn warn # define cryptllwarn llwarn # define cryptinfo info # define cryptllinfo llinfo #else # define cryptdbg (void) -# define cryptlldbg (void) +# define cryptllerr (void) # define cryptwarn (void) # define cryptllwarn (void) # define cryptinfo (void) @@ -583,14 +583,14 @@ #ifdef CONFIG_DEBUG_INPUT # define idbg dbg -# define illdbg lldbg +# define illerr llerr # define iwarn warn # define illwarn llwarn # define iinfo info # define illinfo llinfo #else # define idbg (void) -# define illdbg (void) +# define illerr (void) # define iwarn (void) # define illwarn (void) # define iinfo (void) @@ -599,14 +599,14 @@ #ifdef CONFIG_DEBUG_SENSORS # define sndbg dbg -# define snlldbg lldbg +# define snllerr llerr # define snwarn warn # define snllwarn llwarn # define sninfo info # define snllinfo llinfo #else # define sndbg (void) -# define snlldbg (void) +# define snllerr (void) # define snwarn (void) # define snllwarn (void) # define sninfo (void) @@ -615,14 +615,14 @@ #ifdef CONFIG_DEBUG_ANALOG # define adbg dbg -# define alldbg lldbg +# define allerr llerr # define awarn warn # define allwarn llwarn # define ainfo info # define allinfo llinfo #else # define adbg (void) -# define alldbg (void) +# define allerr (void) # define awarn (void) # define allwarn (void) # define ainfo (void) @@ -631,14 +631,14 @@ #ifdef CONFIG_DEBUG_GRAPHICS # define gdbg dbg -# define glldbg lldbg +# define gllerr llerr # define gwarn warn # define gllwarn llwarn # define ginfo info # define gllinfo llinfo #else # define gdbg (void) -# define glldbg (void) +# define gllerr (void) # define gwarn (void) # define gllwarn (void) # define ginfo (void) @@ -647,14 +647,14 @@ #ifdef CONFIG_DEBUG_BINFMT # define bdbg dbg -# define blldbg lldbg +# define bllerr llerr # define bwarn warn # define bllwarn llwarn # define binfo info # define bllinfo llinfo #else # define bdbg (void) -# define blldbg (void) +# define bllerr (void) # define bwarn (void) # define bllwarn (void) # define binfo (void) @@ -663,14 +663,14 @@ #ifdef CONFIG_DEBUG_LIB # define ldbg dbg -# define llldbg lldbg +# define lllerr llerr # define lwarn warn # define lllwarn llwarn # define linfo info # define lllinfo llinfo #else # define ldbg (void) -# define llldbg (void) +# define lllerr (void) # define lwarn (void) # define lllwarn (void) # define linfo (void) @@ -679,14 +679,14 @@ #ifdef CONFIG_DEBUG_AUDIO # define auddbg dbg -# define audlldbg lldbg +# define audllerr llerr # define audwarn warn # define audllwarn llwarn # define audinfo info # define audllinfo llinfo #else # define auddbg (void) -# define audlldbg (void) +# define audllerr (void) # define audwarn (void) # define audllwarn (void) # define audinfo (void) @@ -843,7 +843,7 @@ void lib_dumpbuffer(FAR const char *msg, FAR const uint8_t *buffer, int dbg(const char *format, ...); # ifdef CONFIG_ARCH_LOWPUTC -int lldbg(const char *format, ...); +int llerr(const char *format, ...); # endif #endif /* CONFIG_DEBUG_FEATURES */ diff --git a/include/nuttx/spi/spi_bitbang.c b/include/nuttx/spi/spi_bitbang.c index 0c5f852376..5876d3d8ce 100644 --- a/include/nuttx/spi/spi_bitbang.c +++ b/include/nuttx/spi/spi_bitbang.c @@ -75,9 +75,9 @@ #endif #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/include/nuttx/spi/spi_bitbang.h b/include/nuttx/spi/spi_bitbang.h index 8debf10211..33571b1bf2 100644 --- a/include/nuttx/spi/spi_bitbang.h +++ b/include/nuttx/spi/spi_bitbang.h @@ -62,9 +62,9 @@ #endif #ifdef CONFIG_DEBUG_SPI -# define spidbg lldbg +# define spidbg llerr # ifdef CONFIG_DEBUG_INFO -# define spiinfo lldbg +# define spiinfo llerr # else # define spiinfo(x...) # endif diff --git a/include/nuttx/wireless/nrf24l01.h b/include/nuttx/wireless/nrf24l01.h index 32dc20db02..94f7f8383b 100644 --- a/include/nuttx/wireless/nrf24l01.h +++ b/include/nuttx/wireless/nrf24l01.h @@ -92,12 +92,12 @@ #ifdef NRF24L01_DEBUG # define wdbg(format, ...) dbg(format, ##__VA_ARGS__) -# define wlldbg(format, ...) lldbg(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 wdbg(x...) -# define wlldbg(x...) +# define wllerr(x...) # define winfo(x...) # define wllinfo(x...) #endif diff --git a/libc/misc/lib_dbg.c b/libc/misc/lib_dbg.c index 219b1ec79c..d04c719b1a 100644 --- a/libc/misc/lib_dbg.c +++ b/libc/misc/lib_dbg.c @@ -51,7 +51,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: dbg, lldbg, info + * Name: dbg, llerr, info * * Description: * If the cross-compiler's pre-processor does not support variable @@ -73,7 +73,7 @@ int dbg(const char *format, ...) } #ifdef CONFIG_ARCH_LOWPUTC -int lldbg(const char *format, ...) +int llerr(const char *format, ...) { va_list ap; int ret; diff --git a/mm/mm_heap/mm_initialize.c b/mm/mm_heap/mm_initialize.c index bd9d4f524a..bb76d76544 100644 --- a/mm/mm_heap/mm_initialize.c +++ b/mm/mm_heap/mm_initialize.c @@ -96,7 +96,7 @@ void mm_addregion(FAR struct mm_heap_s *heap, FAR void *heapstart, heapend = MM_ALIGN_DOWN((uintptr_t)heapstart + (uintptr_t)heapsize); heapsize = heapend - heapbase; - mlldbg("Region %d: base=%p size=%u\n", IDX+1, heapstart, heapsize); + mllerr("Region %d: base=%p size=%u\n", IDX+1, heapstart, heapsize); /* Add the size of this region to the total size of the heap */ @@ -157,7 +157,7 @@ void mm_initialize(FAR struct mm_heap_s *heap, FAR void *heapstart, { int i; - mlldbg("Heap: start=%p size=%u\n", heapstart, heapsize); + mllerr("Heap: start=%p size=%u\n", heapstart, heapsize); /* The following two lines have cause problems for some older ZiLog * compilers in the past (but not the more recent). Life is easier if we diff --git a/net/arp/arp_arpin.c b/net/arp/arp_arpin.c index c84f4bfa81..438125f7bd 100644 --- a/net/arp/arp_arpin.c +++ b/net/arp/arp_arpin.c @@ -96,7 +96,7 @@ void arp_arpin(FAR struct net_driver_s *dev) if (dev->d_len < (sizeof(struct arp_hdr_s) + ETH_HDRLEN)) { - nlldbg("Too small\n"); + nllerr("Too small\n"); dev->d_len = 0; return; } diff --git a/net/arp/arp_dump.c b/net/arp/arp_dump.c index 50ea5a27e5..ba916db2f2 100644 --- a/net/arp/arp_dump.c +++ b/net/arp/arp_dump.c @@ -69,16 +69,16 @@ void arp_dump(FAR struct arp_hdr_s *arp) { - nlldbg(" HW type: %04x Protocol: %04x\n", + nllerr(" HW type: %04x Protocol: %04x\n", arp->ah_hwtype, arp->ah_protocol); - nlldbg(" HW len: %02x Proto len: %02x Operation: %04x\n", + nllerr(" HW len: %02x Proto len: %02x Operation: %04x\n", arp->ah_hwlen, arp->ah_protolen, arp->ah_opcode); - nlldbg(" Sender MAC: %02x:%02x:%02x:%02x:%02x:%02x IP: %d.%d.%d.%d\n", + nllerr(" Sender MAC: %02x:%02x:%02x:%02x:%02x:%02x IP: %d.%d.%d.%d\n", arp->ah_shwaddr[0], arp->ah_shwaddr[1], arp->ah_shwaddr[2], arp->ah_shwaddr[3], arp->ah_shwaddr[4], arp->ah_shwaddr[5], arp->ah_sipaddr[0] & 0xff, arp->ah_sipaddr[0] >> 8, arp->ah_sipaddr[1] & 0xff, arp->ah_sipaddr[1] >> 8); - nlldbg(" Dest MAC: %02x:%02x:%02x:%02x:%02x:%02x IP: %d.%d.%d.%d\n", + nllerr(" Dest MAC: %02x:%02x:%02x:%02x:%02x:%02x IP: %d.%d.%d.%d\n", arp->ah_dhwaddr[0], arp->ah_dhwaddr[1], arp->ah_dhwaddr[2], arp->ah_dhwaddr[3], arp->ah_dhwaddr[4], arp->ah_dhwaddr[5], arp->ah_dipaddr[0] & 0xff, arp->ah_dipaddr[0] >> 8, diff --git a/net/arp/arp_send.c b/net/arp/arp_send.c index f9ec518d41..1807ed1ee0 100644 --- a/net/arp/arp_send.c +++ b/net/arp/arp_send.c @@ -110,7 +110,7 @@ static uint16_t arp_send_interrupt(FAR struct net_driver_s *dev, if ((flags & NETDEV_DOWN) != 0) { - nlldbg("ERROR: Interface is down\n"); + nllerr("ERROR: Interface is down\n"); arp_send_terminate(state, -ENETUNREACH); return flags; } diff --git a/net/devif/devif_callback.c b/net/devif/devif_callback.c index 6923bd6b1c..2508f2d0f0 100644 --- a/net/devif/devif_callback.c +++ b/net/devif/devif_callback.c @@ -260,7 +260,7 @@ FAR struct devif_callback_s * #ifdef CONFIG_DEBUG_FEATURES else { - nlldbg("Failed to allocate callback\n"); + nllerr("Failed to allocate callback\n"); } #endif diff --git a/net/devif/ipv4_input.c b/net/devif/ipv4_input.c index bd00690833..9b02f2ac3f 100644 --- a/net/devif/ipv4_input.c +++ b/net/devif/ipv4_input.c @@ -339,7 +339,7 @@ int ipv4_input(FAR struct net_driver_s *dev) g_netstats.ipv4.drop++; g_netstats.ipv4.vhlerr++; #endif - nlldbg("Invalid IP version or header length: %02x\n", pbuf->vhl); + nllerr("Invalid IP version or header length: %02x\n", pbuf->vhl); goto drop; } @@ -348,7 +348,7 @@ int ipv4_input(FAR struct net_driver_s *dev) hdrlen = NET_LL_HDRLEN(dev); if ((hdrlen + IPv4_HDRLEN) > dev->d_len) { - nlldbg("Packet shorter than IPv4 header\n"); + nllerr("Packet shorter than IPv4 header\n"); goto drop; } @@ -368,7 +368,7 @@ int ipv4_input(FAR struct net_driver_s *dev) } else { - nlldbg("IP packet shorter than length in IP header\n"); + nllerr("IP packet shorter than length in IP header\n"); goto drop; } @@ -387,7 +387,7 @@ int ipv4_input(FAR struct net_driver_s *dev) g_netstats.ipv4.drop++; g_netstats.ipv4.fragerr++; #endif - nlldbg("IP fragment dropped\n"); + nllerr("IP fragment dropped\n"); goto drop; #endif /* CONFIG_NET_TCP_REASSEMBLY */ } @@ -413,7 +413,7 @@ int ipv4_input(FAR struct net_driver_s *dev) #ifdef CONFIG_NET_ICMP if (net_ipv4addr_cmp(dev->d_ipaddr, INADDR_ANY)) { - nlldbg("No IP address assigned\n"); + nllerr("No IP address assigned\n"); goto drop; } @@ -446,7 +446,7 @@ int ipv4_input(FAR struct net_driver_s *dev) g_netstats.ipv4.drop++; g_netstats.ipv4.chkerr++; #endif - nlldbg("Bad IP checksum\n"); + nllerr("Bad IP checksum\n"); goto drop; } @@ -494,7 +494,7 @@ int ipv4_input(FAR struct net_driver_s *dev) g_netstats.ipv4.protoerr++; #endif - nlldbg("Unrecognized IP protocol\n"); + nllerr("Unrecognized IP protocol\n"); goto drop; } diff --git a/net/devif/ipv6_input.c b/net/devif/ipv6_input.c index dcb2610626..0378b2c270 100644 --- a/net/devif/ipv6_input.c +++ b/net/devif/ipv6_input.c @@ -151,7 +151,7 @@ int ipv6_input(FAR struct net_driver_s *dev) g_netstats.ipv6.vhlerr++; #endif - nlldbg("ERROR: Invalid IPv6 version: %d\n", ipv6->vtc >> 4); + nllerr("ERROR: Invalid IPv6 version: %d\n", ipv6->vtc >> 4); goto drop; } @@ -160,7 +160,7 @@ int ipv6_input(FAR struct net_driver_s *dev) hdrlen = NET_LL_HDRLEN(dev); if ((hdrlen + IPv6_HDRLEN) > dev->d_len) { - nlldbg("Packet shorter than IPv6 header\n"); + nllerr("Packet shorter than IPv6 header\n"); goto drop; } @@ -187,7 +187,7 @@ int ipv6_input(FAR struct net_driver_s *dev) } else { - nlldbg("ERROR: IP packet shorter than length in IP header\n"); + nllerr("ERROR: IP packet shorter than length in IP header\n"); goto drop; } @@ -216,7 +216,7 @@ int ipv6_input(FAR struct net_driver_s *dev) * packets. */ - nlldbg("ERROR: No IP address assigned\n"); + nllerr("ERROR: No IP address assigned\n"); goto drop; } @@ -279,7 +279,7 @@ int ipv6_input(FAR struct net_driver_s *dev) g_netstats.ipv6.protoerr++; #endif - nlldbg("ERROR: Unrecognized IP protocol: %04x\n", ipv6->proto); + nllerr("ERROR: Unrecognized IP protocol: %04x\n", ipv6->proto); goto drop; } diff --git a/net/icmp/icmp_input.c b/net/icmp/icmp_input.c index 36b0e02e55..befda6bf04 100644 --- a/net/icmp/icmp_input.c +++ b/net/icmp/icmp_input.c @@ -164,7 +164,7 @@ void icmp_input(FAR struct net_driver_s *dev) else { - nlldbg("Unknown ICMP cmd: %d\n", picmp->type); + nllerr("Unknown ICMP cmd: %d\n", picmp->type); goto typeerr; } diff --git a/net/icmp/icmp_ping.c b/net/icmp/icmp_ping.c index a155d8d2f6..b674ce440d 100644 --- a/net/icmp/icmp_ping.c +++ b/net/icmp/icmp_ping.c @@ -162,7 +162,7 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn, if ((flags & NETDEV_DOWN) != 0) { - nlldbg("ERROR: Interface is down\n"); + nllerr("ERROR: Interface is down\n"); pstate->png_result = -ENETUNREACH; goto end_wait; } @@ -262,12 +262,12 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn, * that the destination address is not reachable. */ - nlldbg("Not reachable\n"); + nllerr("Not reachable\n"); failcode = -ENETUNREACH; } else { - nlldbg("Ping timeout\n"); + nllerr("Ping timeout\n"); failcode = -ETIMEDOUT; } @@ -416,7 +416,7 @@ int icmp_ping(in_addr_t addr, uint16_t id, uint16_t seqno, uint16_t datalen, } else { - nlldbg("Return error=%d\n", -state.png_result); + nllerr("Return error=%d\n", -state.png_result); return state.png_result; } } diff --git a/net/icmpv6/icmpv6_autoconfig.c b/net/icmpv6/icmpv6_autoconfig.c index d7f7b2fbb7..3465931658 100644 --- a/net/icmpv6/icmpv6_autoconfig.c +++ b/net/icmpv6/icmpv6_autoconfig.c @@ -127,7 +127,7 @@ static uint16_t icmpv6_router_interrupt(FAR struct net_driver_s *dev, if ((flags & NETDEV_DOWN) != 0) { - nlldbg("ERROR: Interface is down\n"); + nllerr("ERROR: Interface is down\n"); icmpv6_router_terminate(state, -ENETUNREACH); return flags; } diff --git a/net/icmpv6/icmpv6_input.c b/net/icmpv6/icmpv6_input.c index 95fdece263..a0ef963589 100644 --- a/net/icmpv6/icmpv6_input.c +++ b/net/icmpv6/icmpv6_input.c @@ -307,7 +307,7 @@ void icmpv6_input(FAR struct net_driver_s *dev) default: { - nlldbg("Unknown ICMPv6 type: %d\n", icmp->type); + nllerr("Unknown ICMPv6 type: %d\n", icmp->type); goto icmpv6_type_error; } } diff --git a/net/icmpv6/icmpv6_ping.c b/net/icmpv6/icmpv6_ping.c index 0ed83ec956..9a959a0177 100644 --- a/net/icmpv6/icmpv6_ping.c +++ b/net/icmpv6/icmpv6_ping.c @@ -261,7 +261,7 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn, if ((flags & NETDEV_DOWN) != 0) { - nlldbg("ERROR: Interface is down\n"); + nllerr("ERROR: Interface is down\n"); pstate->png_result = -ENETUNREACH; goto end_wait; } @@ -336,12 +336,12 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn, * reason is that the destination address is not reachable. */ - nlldbg("Not reachable\n"); + nllerr("Not reachable\n"); failcode = -ENETUNREACH; } else { - nlldbg("Ping timeout\n"); + nllerr("Ping timeout\n"); failcode = -ETIMEDOUT; } @@ -490,7 +490,7 @@ int icmpv6_ping(net_ipv6addr_t addr, uint16_t id, uint16_t seqno, } else { - nlldbg("Return error=%d\n", -state.png_result); + nllerr("Return error=%d\n", -state.png_result); return state.png_result; } } diff --git a/net/igmp/igmp_group.c b/net/igmp/igmp_group.c index b95fe66f7f..9a1af28807 100644 --- a/net/igmp/igmp_group.c +++ b/net/igmp/igmp_group.c @@ -89,24 +89,24 @@ #ifdef CONFIG_CPP_HAVE_VARARGS # ifdef IGMP_GRPDEBUG # define grpdbg(format, ...) ndbg(format, ##__VA_ARGS__) -# define grplldbg(format, ...) nlldbg(format, ##__VA_ARGS__) +# define grpllerr(format, ...) nllerr(format, ##__VA_ARGS__) # define grpinfo(format, ...) ninfo(format, ##__VA_ARGS__) # define grpllinfo(format, ...) nllinfo(format, ##__VA_ARGS__) # else # define grpdbg(x...) -# define grplldbg(x...) +# define grpllerr(x...) # define grpinfo(x...) # define grpllinfo(x...) # endif #else # ifdef IGMP_GRPDEBUG # define grpdbg ndbg -# define grplldbg nlldbg +# define grpllerr nllerr # define grpinfo ninfo # define grpllinfo nllinfo # else # define grpdbg (void) -# define grplldbg (void) +# define grpllerr (void) # define grpinfo (void) # define grpllinfo (void) # endif @@ -194,7 +194,7 @@ void igmp_grpinit(void) FAR struct igmp_group_s *group; int i; - grplldbg("Initializing\n"); + grpllerr("Initializing\n"); #if CONFIG_PREALLOC_IGMPGROUPS > 0 for (i = 0; i < CONFIG_PREALLOC_IGMPGROUPS; i++) @@ -226,20 +226,20 @@ FAR struct igmp_group_s *igmp_grpalloc(FAR struct net_driver_s *dev, if (up_interrupt_context()) { #if CONFIG_PREALLOC_IGMPGROUPS > 0 - grplldbg("Use a pre-allocated group entry\n"); + grpllerr("Use a pre-allocated group entry\n"); group = igmp_grpprealloc(); #else - grplldbg("Cannot allocate from interrupt handler\n"); + grpllerr("Cannot allocate from interrupt handler\n"); group = NULL; #endif } else { - grplldbg("Allocate from the heap\n"); + grpllerr("Allocate from the heap\n"); group = igmp_grpheapalloc(); } - grplldbg("group: %p\n", group); + grpllerr("group: %p\n", group); /* Check if we successfully allocated a group structure */ @@ -285,7 +285,7 @@ FAR struct igmp_group_s *igmp_grpfind(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group; net_lock_t flags; - grplldbg("Searching for addr %08x\n", (int)*addr); + grpllerr("Searching for addr %08x\n", (int)*addr); /* We must disable interrupts because we don't which context we were * called from. @@ -296,10 +296,10 @@ FAR struct igmp_group_s *igmp_grpfind(FAR struct net_driver_s *dev, group; group = group->next) { - grplldbg("Compare: %08x vs. %08x\n", group->grpaddr, *addr); + grpllerr("Compare: %08x vs. %08x\n", group->grpaddr, *addr); if (net_ipv4addr_cmp(group->grpaddr, *addr)) { - grplldbg("Match!\n"); + grpllerr("Match!\n"); break; } } @@ -325,13 +325,13 @@ FAR struct igmp_group_s *igmp_grpallocfind(FAR struct net_driver_s *dev, { FAR struct igmp_group_s *group = igmp_grpfind(dev, addr); - grplldbg("group: %p addr: %08x\n", group, (int)*addr); + grpllerr("group: %p addr: %08x\n", group, (int)*addr); if (!group) { group = igmp_grpalloc(dev, addr); } - grplldbg("group: %p\n", group); + grpllerr("group: %p\n", group); return group; } @@ -350,7 +350,7 @@ void igmp_grpfree(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group) { net_lock_t flags; - grplldbg("Free: %p flags: %02x\n", group, group->flags); + grpllerr("Free: %p flags: %02x\n", group, group->flags); /* Cancel the wdog */ @@ -376,7 +376,7 @@ void igmp_grpfree(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group) #if CONFIG_PREALLOC_IGMPGROUPS > 0 if (IS_PREALLOCATED(group->flags)) { - grplldbg("Put back on free list\n"); + grpllerr("Put back on free list\n"); sq_addlast((FAR sq_entry_t *)group, &g_freelist); net_unlock(flags); } @@ -388,7 +388,7 @@ void igmp_grpfree(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group) */ net_unlock(flags); - grplldbg("Call sched_kfree()\n"); + grpllerr("Call sched_kfree()\n"); sched_kfree(group); } } diff --git a/net/igmp/igmp_input.c b/net/igmp/igmp_input.c index 66b1601bbe..d8bba1d153 100644 --- a/net/igmp/igmp_input.c +++ b/net/igmp/igmp_input.c @@ -124,7 +124,7 @@ void igmp_input(struct net_driver_s *dev) if (dev->d_len < NET_LL_HDRLEN(dev) + IPIGMP_HDRLEN) { IGMP_STATINCR(g_netstats.igmp.length_errors); - nlldbg("Length error\n"); + nllerr("Length error\n"); return; } @@ -133,7 +133,7 @@ void igmp_input(struct net_driver_s *dev) if (net_chksum((FAR uint16_t *)&IGMPBUF->type, IGMP_HDRLEN) != 0) { IGMP_STATINCR(g_netstats.igmp.chksum_errors); - nlldbg("Checksum error\n"); + nllerr("Checksum error\n"); return; } @@ -143,7 +143,7 @@ void igmp_input(struct net_driver_s *dev) group = igmp_grpallocfind(dev, &destipaddr); if (!group) { - nlldbg("Failed to allocate/find group: %08x\n", destipaddr); + nllerr("Failed to allocate/find group: %08x\n", destipaddr); return; } @@ -192,7 +192,7 @@ void igmp_input(struct net_driver_s *dev) IGMP_STATINCR(g_netstats.igmp.v1_received); IGMPBUF->maxresp = 10; - nlldbg("V1 not implemented\n"); + nllerr("V1 not implemented\n"); } IGMP_STATINCR(g_netstats.igmp.query_received); @@ -241,7 +241,7 @@ void igmp_input(struct net_driver_s *dev) nllinfo("Unicast query\n"); IGMP_STATINCR(g_netstats.igmp.ucast_query); - nlldbg("Query to a specific group with the group address as destination\n"); + nllerr("Query to a specific group with the group address as destination\n"); ticks = net_dsec2tick((int)IGMPBUF->maxresp); if (IS_IDLEMEMBER(group->flags) || igmp_cmptimer(group, ticks)) @@ -270,7 +270,7 @@ void igmp_input(struct net_driver_s *dev) default: { - nlldbg("Unexpected msg %02x\n", IGMPBUF->type); + nllerr("Unexpected msg %02x\n", IGMPBUF->type); } break; } diff --git a/net/igmp/igmp_timer.c b/net/igmp/igmp_timer.c index ef6d75cef0..78dd618601 100644 --- a/net/igmp/igmp_timer.c +++ b/net/igmp/igmp_timer.c @@ -74,24 +74,24 @@ #ifdef CONFIG_CPP_HAVE_VARARGS # ifdef IGMP_GTMRDEBUG # define gtmrdbg(format, ...) ndbg(format, ##__VA_ARGS__) -# define gtmrlldbg(format, ...) nlldbg(format, ##__VA_ARGS__) +# define gtmrllerr(format, ...) nllerr(format, ##__VA_ARGS__) # define gtmrinfo(format, ...) ninfo(format, ##__VA_ARGS__) # define gtmrllinfo(format, ...) nllinfo(format, ##__VA_ARGS__) # else # define gtmrdbg(x...) -# define gtmrlldbg(x...) +# define gtmrllerr(x...) # define gtmrinfo(x...) # define gtmrllinfo(x...) # endif #else # ifdef IGMP_GTMRDEBUG # define gtmrdbg ndbg -# define gtmrlldbg nlldbg +# define gtmrllerr nllerr # define gtmrinfo ninfo # define gtmrllinfo nllinfo # else # define gtmrdbg (void) -# define gtmrlldbg (void) +# define gtmrllerr (void) # define gtmrinfo (void) # define gtmrllinfo (void) # endif @@ -170,7 +170,7 @@ void igmp_startticks(FAR struct igmp_group_s *group, unsigned int ticks) /* Start the timer */ - gtmrlldbg("ticks: %d\n", ticks); + gtmrllerr("ticks: %d\n", ticks); ret = wd_start(group->wdog, ticks, igmp_timeout, 1, (uint32_t)group); diff --git a/net/iob/iob_add_queue.c b/net/iob/iob_add_queue.c index d749c56276..c6df88ef0a 100644 --- a/net/iob/iob_add_queue.c +++ b/net/iob/iob_add_queue.c @@ -150,7 +150,7 @@ int iob_tryadd_queue(FAR struct iob_s *iob, FAR struct iob_queue_s *iobq) qentry = iob_tryalloc_qentry(); if (!qentry) { - nlldbg("ERROR: Failed to allocate a container\n"); + nllerr("ERROR: Failed to allocate a container\n"); return -ENOMEM; } diff --git a/net/iob/iob_trimtail.c b/net/iob/iob_trimtail.c index f89cdeee22..6ab2add71e 100644 --- a/net/iob/iob_trimtail.c +++ b/net/iob/iob_trimtail.c @@ -72,7 +72,7 @@ FAR struct iob_s *iob_trimtail(FAR struct iob_s *iob, unsigned int trimlen) FAR struct iob_s *last; int len; - nlldbg("iob=%p pktlen=%d trimlen=%d\n", iob, iob->io_pktlen, trimlen); + nllerr("iob=%p pktlen=%d trimlen=%d\n", iob, iob->io_pktlen, trimlen); if (iob && trimlen > 0) { diff --git a/net/netdev/netdev_register.c b/net/netdev/netdev_register.c index 11982d9eeb..dfa0b6710d 100644 --- a/net/netdev/netdev_register.c +++ b/net/netdev/netdev_register.c @@ -248,7 +248,7 @@ int netdev_register(FAR struct net_driver_s *dev, enum net_lltype_e lltype) #endif default: - nlldbg("ERROR: Unrecognized link type: %d\n", lltype); + nllerr("ERROR: Unrecognized link type: %d\n", lltype); return -EINVAL; } @@ -319,13 +319,13 @@ int netdev_register(FAR struct net_driver_s *dev, enum net_lltype_e lltype) net_unlock(save); #ifdef CONFIG_NET_ETHERNET - nlldbg("Registered MAC: %02x:%02x:%02x:%02x:%02x:%02x as dev: %s\n", + nllerr("Registered MAC: %02x:%02x:%02x:%02x:%02x:%02x as dev: %s\n", dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1], dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3], dev->d_mac.ether_addr_octet[4], dev->d_mac.ether_addr_octet[5], dev->d_ifname); #else - nlldbg("Registered dev: %s\n", dev->d_ifname); + nllerr("Registered dev: %s\n", dev->d_ifname); #endif return OK; } diff --git a/net/netdev/netdev_unregister.c b/net/netdev/netdev_unregister.c index fc326dcf31..f8861c7fad 100644 --- a/net/netdev/netdev_unregister.c +++ b/net/netdev/netdev_unregister.c @@ -128,13 +128,13 @@ int netdev_unregister(FAR struct net_driver_s *dev) net_unlock(save); #ifdef CONFIG_NET_ETHERNET - nlldbg("Unregistered MAC: %02x:%02x:%02x:%02x:%02x:%02x as dev: %s\n", + nllerr("Unregistered MAC: %02x:%02x:%02x:%02x:%02x:%02x as dev: %s\n", dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1], dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3], dev->d_mac.ether_addr_octet[4], dev->d_mac.ether_addr_octet[5], dev->d_ifname); #else - nlldbg("Registered dev: %s\n", dev->d_ifname); + nllerr("Registered dev: %s\n", dev->d_ifname); #endif return OK; } diff --git a/net/pkt/pkt_input.c b/net/pkt/pkt_input.c index 27b3af4d25..102ef81ae3 100644 --- a/net/pkt/pkt_input.c +++ b/net/pkt/pkt_input.c @@ -118,7 +118,7 @@ int pkt_input(struct net_driver_s *dev) } else { - nlldbg("No listener\n"); + nllerr("No listener\n"); } return ret; diff --git a/net/pkt/pkt_poll.c b/net/pkt/pkt_poll.c index dc4f5a92d0..697377d401 100644 --- a/net/pkt/pkt_poll.c +++ b/net/pkt/pkt_poll.c @@ -78,7 +78,7 @@ void pkt_poll(FAR struct net_driver_s *dev, FAR struct pkt_conn_s *conn) { - nlldbg("IN\n"); + nllerr("IN\n"); /* Verify that the packet connection is valid */ diff --git a/net/socket/net_close.c b/net/socket/net_close.c index f400e21e4e..f994cf6609 100644 --- a/net/socket/net_close.c +++ b/net/socket/net_close.c @@ -209,7 +209,7 @@ static uint16_t netclose_interrupt(FAR struct net_driver_s *dev, { /* Yes.. Wake up the waiting thread and report the timeout */ - nlldbg("CLOSE timeout\n"); + nllerr("CLOSE timeout\n"); pstate->cl_result = -ETIMEDOUT; goto end_wait; } diff --git a/net/socket/net_sendfile.c b/net/socket/net_sendfile.c index 53a76349ad..b310943ea1 100644 --- a/net/socket/net_sendfile.c +++ b/net/socket/net_sendfile.c @@ -206,7 +206,7 @@ static uint16_t ack_interrupt(FAR struct net_driver_s *dev, FAR void *pvconn, } else if ((flags & TCP_REXMIT) != 0) { - nlldbg("REXMIT\n"); + nllerr("REXMIT\n"); /* Yes.. in this case, reset the number of bytes that have been sent * to the number of bytes that have been ACKed. @@ -221,7 +221,7 @@ static uint16_t ack_interrupt(FAR struct net_driver_s *dev, FAR void *pvconn, { /* Report not connected */ - nlldbg("Lost connection\n"); + nllerr("Lost connection\n"); net_lostconnection(pstate->snd_sock, flags); pstate->snd_sent = -ENOTCONN; @@ -345,7 +345,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon { /* Report not connected */ - nlldbg("Lost connection\n"); + nllerr("Lost connection\n"); net_lostconnection(pstate->snd_sock, flags); pstate->snd_sent = -ENOTCONN; @@ -386,7 +386,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon if (ret < 0) { int errcode = get_errno(); - nlldbg("failed to lseek: %d\n", errcode); + nllerr("failed to lseek: %d\n", errcode); pstate->snd_sent = -errcode; goto end_wait; } @@ -395,7 +395,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon if (ret < 0) { int errcode = get_errno(); - nlldbg("failed to read from input file: %d\n", errcode); + nllerr("failed to read from input file: %d\n", errcode); pstate->snd_sent = -errcode; goto end_wait; } @@ -430,7 +430,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon } else { - nlldbg("Window full, wait for ack\n"); + nllerr("Window full, wait for ack\n"); goto wait; } } @@ -444,7 +444,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon { /* Yes.. report the timeout */ - nlldbg("SEND timeout\n"); + nllerr("SEND timeout\n"); pstate->snd_sent = -ETIMEDOUT; goto end_wait; } @@ -687,7 +687,7 @@ ssize_t net_sendfile(int outfd, struct file *infile, off_t *offset, if (state.snd_datacb == NULL) { - nlldbg("Failed to allocate data callback\n"); + nllerr("Failed to allocate data callback\n"); errcode = ENOMEM; goto errout_locked; } @@ -696,7 +696,7 @@ ssize_t net_sendfile(int outfd, struct file *infile, off_t *offset, if (state.snd_ackcb == NULL) { - nlldbg("Failed to allocate ack callback\n"); + nllerr("Failed to allocate ack callback\n"); errcode = ENOMEM; goto errout_datacb; } diff --git a/net/socket/recvfrom.c b/net/socket/recvfrom.c index 50b45bee9f..470296475c 100644 --- a/net/socket/recvfrom.c +++ b/net/socket/recvfrom.c @@ -1136,7 +1136,7 @@ static uint16_t recvfrom_udp_interrupt(FAR struct net_driver_s *dev, { /* Terminate the transfer with an error. */ - nlldbg("ERROR: Network is down\n"); + nllerr("ERROR: Network is down\n"); recvfrom_udp_terminate(pstate, -ENETUNREACH); } diff --git a/net/tcp/tcp_backlog.c b/net/tcp/tcp_backlog.c index 1a7d73b833..0e85141c58 100644 --- a/net/tcp/tcp_backlog.c +++ b/net/tcp/tcp_backlog.c @@ -109,7 +109,7 @@ int tcp_backlogcreate(FAR struct tcp_conn_s *conn, int nblg) bls = (FAR struct tcp_backlog_s *)kmm_zalloc(size); if (!bls) { - nlldbg("Failed to allocate backlog\n"); + nllerr("Failed to allocate backlog\n"); return -ENOMEM; } @@ -239,7 +239,7 @@ int tcp_backlogadd(FAR struct tcp_conn_s *conn, FAR struct tcp_conn_s *blconn) blc = (FAR struct tcp_blcontainer_s *)sq_remfirst(&bls->bl_free); if (!blc) { - nlldbg("Failed to allocate container\n"); + nllerr("Failed to allocate container\n"); ret = -ENOMEM; } else @@ -390,7 +390,7 @@ int tcp_backlogdelete(FAR struct tcp_conn_s *conn, } } - nlldbg("Failed to find pending connection\n"); + nllerr("Failed to find pending connection\n"); return -EINVAL; } diff --git a/net/tcp/tcp_callback.c b/net/tcp/tcp_callback.c index 7571821842..e5df8f1fe3 100644 --- a/net/tcp/tcp_callback.c +++ b/net/tcp/tcp_callback.c @@ -245,7 +245,7 @@ uint16_t tcp_datahandler(FAR struct tcp_conn_s *conn, FAR uint8_t *buffer, iob = iob_tryalloc(true); if (iob == NULL) { - nlldbg("ERROR: Failed to create new I/O buffer chain\n"); + nllerr("ERROR: Failed to create new I/O buffer chain\n"); return 0; } @@ -258,7 +258,7 @@ uint16_t tcp_datahandler(FAR struct tcp_conn_s *conn, FAR uint8_t *buffer, * not free any I/O buffers. */ - nlldbg("ERROR: Failed to add data to the I/O buffer chain: %d\n", ret); + nllerr("ERROR: Failed to add data to the I/O buffer chain: %d\n", ret); (void)iob_free_chain(iob); return 0; } @@ -270,7 +270,7 @@ uint16_t tcp_datahandler(FAR struct tcp_conn_s *conn, FAR uint8_t *buffer, ret = iob_tryadd_queue(iob, &conn->readahead); if (ret < 0) { - nlldbg("ERROR: Failed to queue the I/O buffer chain: %d\n", ret); + nllerr("ERROR: Failed to queue the I/O buffer chain: %d\n", ret); (void)iob_free_chain(iob); return 0; } diff --git a/net/tcp/tcp_conn.c b/net/tcp/tcp_conn.c index d4ff81e8ff..57b477af90 100644 --- a/net/tcp/tcp_conn.c +++ b/net/tcp/tcp_conn.c @@ -760,7 +760,7 @@ FAR struct tcp_conn_s *tcp_alloc(uint8_t domain) if (conn != NULL) { - nlldbg("Closing unestablished connection: %p\n", conn); + nllerr("Closing unestablished connection: %p\n", conn); /* Yes... free it. This will remove the connection from the list * of active connections and release all resources held by the diff --git a/net/tcp/tcp_input.c b/net/tcp/tcp_input.c index 88286266b2..3a4cc55674 100644 --- a/net/tcp/tcp_input.c +++ b/net/tcp/tcp_input.c @@ -126,7 +126,7 @@ static void tcp_input(FAR struct net_driver_s *dev, unsigned int iplen) g_netstats.tcp.drop++; g_netstats.tcp.chkerr++; #endif - nlldbg("Bad TCP checksum\n"); + nllerr("Bad TCP checksum\n"); goto drop; } @@ -206,7 +206,7 @@ static void tcp_input(FAR struct net_driver_s *dev, unsigned int iplen) #ifdef CONFIG_NET_STATISTICS g_netstats.tcp.syndrop++; #endif - nlldbg("No free TCP connections\n"); + nllerr("No free TCP connections\n"); goto drop; } @@ -308,7 +308,7 @@ found: if ((tcp->flags & TCP_RST) != 0) { conn->tcpstateflags = TCP_CLOSED; - nlldbg("RESET - TCP state: TCP_CLOSED\n"); + nllerr("RESET - TCP state: TCP_CLOSED\n"); (void)tcp_callback(dev, conn, TCP_ABORT); goto drop; @@ -398,7 +398,7 @@ found: if ((conn->tcpstateflags & TCP_STATE_MASK) == TCP_ESTABLISHED) { - nlldbg("ERROR: conn->sndseq %d, conn->unacked %d\n", + nllerr("ERROR: conn->sndseq %d, conn->unacked %d\n", tcp_getsequence(conn->sndseq), conn->unacked); goto reset; } diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c index f5a70176f2..5d1b163b8b 100644 --- a/net/tcp/tcp_send_buffered.c +++ b/net/tcp/tcp_send_buffered.c @@ -566,7 +566,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, if (++WRB_NRTX(wrb) >= TCP_MAXRTX) { - nlldbg("Expiring wrb=%p nrtx=%u\n", wrb, WRB_NRTX(wrb)); + nllerr("Expiring wrb=%p nrtx=%u\n", wrb, WRB_NRTX(wrb)); /* The maximum retry count as been exhausted. Remove the write * buffer at the head of the queue. @@ -631,7 +631,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, if (++WRB_NRTX(wrb) >= TCP_MAXRTX) { - nlldbg("Expiring wrb=%p nrtx=%u\n", wrb, WRB_NRTX(wrb)); + nllerr("Expiring wrb=%p nrtx=%u\n", wrb, WRB_NRTX(wrb)); /* Return the write buffer to the free list */ diff --git a/net/tcp/tcp_send_unbuffered.c b/net/tcp/tcp_send_unbuffered.c index 53b8941499..ea3c5c42cb 100644 --- a/net/tcp/tcp_send_unbuffered.c +++ b/net/tcp/tcp_send_unbuffered.c @@ -570,7 +570,7 @@ static uint16_t tcpsend_interrupt(FAR struct net_driver_s *dev, { /* Yes.. report the timeout */ - nlldbg("SEND timeout\n"); + nllerr("SEND timeout\n"); pstate->snd_sent = -ETIMEDOUT; goto end_wait; } diff --git a/net/udp/udp_callback.c b/net/udp/udp_callback.c index e53e806c51..be6f59d5cb 100644 --- a/net/udp/udp_callback.c +++ b/net/udp/udp_callback.c @@ -98,7 +98,7 @@ static uint16_t udp_datahandler(FAR struct net_driver_s *dev, FAR struct udp_con iob = iob_tryalloc(true); if (iob == NULL) { - nlldbg("ERROR: Failed to create new I/O buffer chain\n"); + nllerr("ERROR: Failed to create new I/O buffer chain\n"); return 0; } @@ -178,7 +178,7 @@ static uint16_t udp_datahandler(FAR struct net_driver_s *dev, FAR struct udp_con * not free any I/O buffers. */ - nlldbg("ERROR: Failed to add data to the I/O buffer chain: %d\n", ret); + nllerr("ERROR: Failed to add data to the I/O buffer chain: %d\n", ret); (void)iob_free_chain(iob); return 0; } @@ -191,7 +191,7 @@ static uint16_t udp_datahandler(FAR struct net_driver_s *dev, FAR struct udp_con * not free any I/O buffers. */ - nlldbg("ERROR: Failed to add data to the I/O buffer chain: %d\n", ret); + nllerr("ERROR: Failed to add data to the I/O buffer chain: %d\n", ret); (void)iob_free_chain(iob); return 0; } @@ -208,7 +208,7 @@ static uint16_t udp_datahandler(FAR struct net_driver_s *dev, FAR struct udp_con * does not free any I/O buffers. */ - nlldbg("ERROR: Failed to add data to the I/O buffer chain: %d\n", + nllerr("ERROR: Failed to add data to the I/O buffer chain: %d\n", ret); (void)iob_free_chain(iob); return 0; @@ -220,7 +220,7 @@ static uint16_t udp_datahandler(FAR struct net_driver_s *dev, FAR struct udp_con ret = iob_tryadd_queue(iob, &conn->readahead); if (ret < 0) { - nlldbg("ERROR: Failed to queue the I/O buffer chain: %d\n", ret); + nllerr("ERROR: Failed to queue the I/O buffer chain: %d\n", ret); (void)iob_free_chain(iob); return 0; } diff --git a/net/udp/udp_input.c b/net/udp/udp_input.c index 75d0ff40a8..e1f1b19c5c 100644 --- a/net/udp/udp_input.c +++ b/net/udp/udp_input.c @@ -149,7 +149,7 @@ static int udp_input(FAR struct net_driver_s *dev, unsigned int iplen) g_netstats.udp.drop++; g_netstats.udp.chkerr++; #endif - nlldbg("Bad UDP checksum\n"); + nllerr("Bad UDP checksum\n"); dev->d_len = 0; } else @@ -207,7 +207,7 @@ static int udp_input(FAR struct net_driver_s *dev, unsigned int iplen) } else { - nlldbg("No listener on UDP port\n"); + nllerr("No listener on UDP port\n"); dev->d_len = 0; } } diff --git a/net/udp/udp_psock_sendto.c b/net/udp/udp_psock_sendto.c index 0b001e153b..40136453e1 100644 --- a/net/udp/udp_psock_sendto.c +++ b/net/udp/udp_psock_sendto.c @@ -235,7 +235,7 @@ static uint16_t sendto_interrupt(FAR struct net_driver_s *dev, FAR void *conn, { /* Terminate the transfer with an error. */ - nlldbg("ERROR: Network is down\n"); + nllerr("ERROR: Network is down\n"); pstate->st_sndlen = -ENETUNREACH; } @@ -257,7 +257,7 @@ static uint16_t sendto_interrupt(FAR struct net_driver_s *dev, FAR void *conn, { /* Yes.. report the timeout */ - nlldbg("ERROR: SEND timeout\n"); + nllerr("ERROR: SEND timeout\n"); pstate->st_sndlen = -ETIMEDOUT; } else diff --git a/sched/group/group_setupidlefiles.c b/sched/group/group_setupidlefiles.c index c5ed320f5e..622244859d 100644 --- a/sched/group/group_setupidlefiles.c +++ b/sched/group/group_setupidlefiles.c @@ -120,12 +120,12 @@ int group_setupidlefiles(FAR struct task_tcb_s *tcb) if (fd > 0) { - slldbg("Open /dev/console fd: %d\n", fd); + sllerr("Open /dev/console fd: %d\n", fd); (void)close(fd); } else { - slldbg("Failed to open /dev/console: %d\n", errno); + sllerr("Failed to open /dev/console: %d\n", errno); } return -ENFILE; } diff --git a/sched/init/os_start.c b/sched/init/os_start.c index 5a50c1b2fc..be4a26f265 100644 --- a/sched/init/os_start.c +++ b/sched/init/os_start.c @@ -372,7 +372,7 @@ void os_start(void) #endif int i; - slldbg("Entry\n"); + sllerr("Entry\n"); /* Boot up is complete */ diff --git a/sched/irq/irq_unexpectedisr.c b/sched/irq/irq_unexpectedisr.c index 191d0a2194..2b3249a8f9 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(); - lldbg("irq: %d\n", irq); + llerr("irq: %d\n", irq); PANIC(); return OK; /* Won't get here */ } diff --git a/sched/paging/pg_miss.c b/sched/paging/pg_miss.c index ebc10c2953..cdc709dc17 100644 --- a/sched/paging/pg_miss.c +++ b/sched/paging/pg_miss.c @@ -132,7 +132,7 @@ void pg_miss(void) * always present in memory. */ - pglldbg("Blocking TCB: %p PID: %d\n", ftcb, ftcb->pid); + pgllerr("Blocking TCB: %p PID: %d\n", ftcb, ftcb->pid); DEBUGASSERT(g_pgworker != ftcb->pid); /* Block the currently executing task @@ -171,7 +171,7 @@ void pg_miss(void) if (!g_pftcb) { - pglldbg("Signaling worker. PID: %d\n", g_pgworker); + pgllerr("Signaling worker. PID: %d\n", g_pgworker); kill(g_pgworker, SIGWORK); } } diff --git a/sched/paging/pg_worker.c b/sched/paging/pg_worker.c index 914ab604ed..cfefb9f233 100644 --- a/sched/paging/pg_worker.c +++ b/sched/paging/pg_worker.c @@ -198,7 +198,7 @@ static void pg_callback(FAR struct tcb_s *tcb, int result) /* Signal the page fill worker thread (in any event) */ - pglldbg("Signaling worker. PID: %d\n", g_pgworker); + pgllerr("Signaling worker. PID: %d\n", g_pgworker); kill(g_pgworker, SIGWORK); } #endif @@ -308,7 +308,7 @@ static inline bool pg_dequeue(void) * virtual address space -- just restart it. */ - pglldbg("Restarting TCB: %p\n", g_pftcb); + pgllerr("Restarting TCB: %p\n", g_pftcb); up_unblock_task(g_pftcb); } } @@ -422,7 +422,7 @@ static inline bool pg_startfill(void) return true; } - pglldbg("Queue empty\n"); + pgllerr("Queue empty\n"); return false; } @@ -490,7 +490,7 @@ static inline void pg_fillcomplete(void) * received the fill ready-to-run. */ - pglldbg("Restarting TCB: %p\n", g_pftcb); + pgllerr("Restarting TCB: %p\n", g_pftcb); up_unblock_task(g_pftcb); } @@ -532,7 +532,7 @@ int pg_worker(int argc, char *argv[]) * fill completions should occur while this thread sleeps. */ - pglldbg("Started\n"); + pgllerr("Started\n"); (void)up_irq_save(); for (; ; ) { @@ -580,7 +580,7 @@ int pg_worker(int argc, char *argv[]) * task that was blocked waiting for this page fill. */ - pglldbg("Restarting TCB: %p\n", g_pftcb); + pgllerr("Restarting TCB: %p\n", g_pftcb); up_unblock_task(g_pftcb); /* Yes .. Start the next asynchronous fill. Check the return @@ -608,7 +608,7 @@ int pg_worker(int argc, char *argv[]) #ifdef CONFIG_PAGING_TIMEOUT_TICKS else { - lldbg("Timeout!\n"); + llerr("Timeout!\n"); ASSERT(clock_systimer() - g_starttime < CONFIG_PAGING_TIMEOUT_TICKS); } #endif diff --git a/sched/sched/sched_sporadic.c b/sched/sched/sched_sporadic.c index d31837d3f1..8969df7875 100644 --- a/sched/sched/sched_sporadic.c +++ b/sched/sched/sched_sporadic.c @@ -150,7 +150,7 @@ static int sporadic_set_lowpriority(FAR struct tcb_s *tcb) if (ret < 0) { int errcode = get_errno(); - slldbg("ERROR: sched_reprioritize failed: %d\n", errcode); + sllerr("ERROR: sched_reprioritize failed: %d\n", errcode); return -errcode; } @@ -218,7 +218,7 @@ static int sporadic_set_hipriority(FAR struct tcb_s *tcb) if (ret < 0) { int errcode = get_errno(); - slldbg("ERROR: sched_reprioritize failed: %d\n", errcode); + sllerr("ERROR: sched_reprioritize failed: %d\n", errcode); return -errcode; } @@ -771,7 +771,7 @@ int sched_sporadic_initialize(FAR struct tcb_s *tcb) sporadic = (FAR struct sporadic_s *)kmm_zalloc(sizeof(struct sporadic_s)); if (sporadic == NULL) { - slldbg("ERROR: Failed to allocate sporadic data structure\n"); + sllerr("ERROR: Failed to allocate sporadic data structure\n"); return -ENOMEM; } @@ -1078,7 +1078,7 @@ int sched_sporadic_resume(FAR struct tcb_s *tcb) * failure from the standpoint of higher level logic. */ - slldbg("Failed to allocate timer, nrepls=%d\n", + sllerr("Failed to allocate timer, nrepls=%d\n", sporadic->nrepls); } } diff --git a/sched/sched/sched_timerexpiration.c b/sched/sched/sched_timerexpiration.c index ee34099687..7889b2e8e9 100644 --- a/sched/sched/sched_timerexpiration.c +++ b/sched/sched/sched_timerexpiration.c @@ -362,7 +362,7 @@ static void sched_timer_start(unsigned int ticks) if (ret < 0) { - slldbg("ERROR: up_timer_start/up_alarm_start failed: %d\n"); + sllerr("ERROR: up_timer_start/up_alarm_start failed: %d\n"); UNUSED(ret); } } diff --git a/sched/wqueue/kwork_hpthread.c b/sched/wqueue/kwork_hpthread.c index e09e825cee..22217b66fa 100644 --- a/sched/wqueue/kwork_hpthread.c +++ b/sched/wqueue/kwork_hpthread.c @@ -165,7 +165,7 @@ int work_hpstart(void) int errcode = errno; DEBUGASSERT(errcode > 0); - slldbg("kernel_thread failed: %d\n", errcode); + sllerr("kernel_thread failed: %d\n", errcode); return -errcode; } diff --git a/sched/wqueue/kwork_lpthread.c b/sched/wqueue/kwork_lpthread.c index 1e5ffb47e9..8c8958cbf8 100644 --- a/sched/wqueue/kwork_lpthread.c +++ b/sched/wqueue/kwork_lpthread.c @@ -212,7 +212,7 @@ int work_lpstart(void) int errcode = errno; DEBUGASSERT(errcode > 0); - slldbg("kernel_thread %d failed: %d\n", wndx, errcode); + sllerr("kernel_thread %d failed: %d\n", wndx, errcode); sched_unlock(); return -errcode; }