diff --git a/arch/arm/src/a1x/a1x_serial.c b/arch/arm/src/a1x/a1x_serial.c index b6e536fdc6..00c484bab9 100644 --- a/arch/arm/src/a1x/a1x_serial.c +++ b/arch/arm/src/a1x/a1x_serial.c @@ -1156,7 +1156,7 @@ static int uart_interrupt(struct uart_dev_s *dev) /* Read the modem status register (MSR) to clear */ status = up_serialin(priv, A1X_UART_MSR_OFFSET); - vdbg("MSR: %02x\n", status); + info("MSR: %02x\n", status); break; } @@ -1167,7 +1167,7 @@ static int uart_interrupt(struct uart_dev_s *dev) /* Read the line status register (LSR) to clear */ status = up_serialin(priv, A1X_UART_LSR_OFFSET); - vdbg("LSR: %02x\n", status); + info("LSR: %02x\n", status); break; } diff --git a/arch/arm/src/arm/up_dataabort.c b/arch/arm/src/arm/up_dataabort.c index c6586832cf..676928c7cd 100644 --- a/arch/arm/src/arm/up_dataabort.c +++ b/arch/arm/src/arm/up_dataabort.c @@ -142,7 +142,7 @@ void up_dataabort(uint32_t *regs, uint32_t far, uint32_t fsr) * (It has not yet been saved in the register context save area). */ - pgllvdbg("VBASE: %08x VEND: %08x\n", PG_PAGED_VBASE, PG_PAGED_VEND); + pgllinfo("VBASE: %08x VEND: %08x\n", PG_PAGED_VBASE, PG_PAGED_VEND); if (far < PG_PAGED_VBASE || far >= PG_PAGED_VEND) { goto segfault; diff --git a/arch/arm/src/arm/up_elf.c b/arch/arm/src/arm/up_elf.c index 07eba7341d..bb6a09d7cc 100644 --- a/arch/arm/src/arm/up_elf.c +++ b/arch/arm/src/arm/up_elf.c @@ -172,7 +172,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, case R_ARM_CALL: case R_ARM_JUMP24: { - bvdbg("Performing PC24 [%d] link at addr %08lx [%08lx] to sym '%s' st_value=%08lx\n", + binfo("Performing PC24 [%d] link at addr %08lx [%08lx] to sym '%s' st_value=%08lx\n", ELF32_R_TYPE(rel->r_info), (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value); @@ -201,7 +201,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, case R_ARM_ABS32: case R_ARM_TARGET1: /* New ABI: TARGET1 always treated as ABS32 */ { - bvdbg("Performing ABS32 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", + binfo("Performing ABS32 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value); *(uint32_t *)addr += sym->st_value; @@ -210,7 +210,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, case R_ARM_V4BX: { - bvdbg("Performing V4BX link at addr=%08lx [%08lx]\n", + binfo("Performing V4BX link at addr=%08lx [%08lx]\n", (long)addr, (long)(*(uint32_t *)addr)); /* Preserve only Rm and the condition code */ @@ -225,7 +225,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, case R_ARM_PREL31: { - bvdbg("Performing PREL31 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", + binfo("Performing PREL31 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value); offset = *(uint32_t *)addr + sym->st_value - addr; @@ -236,7 +236,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, case R_ARM_MOVW_ABS_NC: case R_ARM_MOVT_ABS: { - bvdbg("Performing MOVx_ABS [%d] link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", + binfo("Performing MOVx_ABS [%d] link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", ELF32_R_TYPE(rel->r_info), (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value); diff --git a/arch/arm/src/armv6-m/up_elf.c b/arch/arm/src/armv6-m/up_elf.c index dbe002cbb1..6e101ffe60 100644 --- a/arch/arm/src/armv6-m/up_elf.c +++ b/arch/arm/src/armv6-m/up_elf.c @@ -168,7 +168,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, case R_ARM_CALL: case R_ARM_JUMP24: { - bvdbg("Performing PC24 [%d] link at addr %08lx [%08lx] to sym '%s' st_value=%08lx\n", + binfo("Performing PC24 [%d] link at addr %08lx [%08lx] to sym '%s' st_value=%08lx\n", ELF32_R_TYPE(rel->r_info), (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value); @@ -197,7 +197,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, case R_ARM_ABS32: case R_ARM_TARGET1: /* New ABI: TARGET1 always treated as ABS32 */ { - bvdbg("Performing ABS32 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", + binfo("Performing ABS32 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value); *(uint32_t *)addr += sym->st_value; @@ -245,7 +245,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, upper_insn = (uint32_t)(*(uint16_t *)addr); lower_insn = (uint32_t)(*(uint16_t *)(addr + 2)); - bvdbg("Performing THM_JUMP24 [%d] link at addr=%08lx [%04x %04x] to sym=%p st_value=%08lx\n", + binfo("Performing THM_JUMP24 [%d] link at addr=%08lx [%04x %04x] to sym=%p st_value=%08lx\n", ELF32_R_TYPE(rel->r_info), (long)addr, (int)upper_insn, (int)lower_insn, sym, (long)sym->st_value); @@ -279,7 +279,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, /* And perform the relocation */ - bvdbg(" S=%d J1=%d J2=%d offset=%08lx branch target=%08lx\n", + binfo(" S=%d J1=%d J2=%d offset=%08lx branch target=%08lx\n", S, J1, J2, (long)offset, offset + sym->st_value - addr); offset += sym->st_value - addr; @@ -320,14 +320,14 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, lower_insn = ((lower_insn & 0xd000) | (J1 << 13) | (J2 << 11) | ((offset >> 1) & 0x07ff)); *(uint16_t *)(addr + 2) = (uint16_t)lower_insn; - bvdbg(" S=%d J1=%d J2=%d insn [%04x %04x]\n", + binfo(" S=%d J1=%d J2=%d insn [%04x %04x]\n", S, J1, J2, (int)upper_insn, (int)lower_insn); } break; case R_ARM_V4BX: { - bvdbg("Performing V4BX link at addr=%08lx [%08lx]\n", + binfo("Performing V4BX link at addr=%08lx [%08lx]\n", (long)addr, (long)(*(uint32_t *)addr)); /* Preserve only Rm and the condition code */ @@ -342,7 +342,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, case R_ARM_PREL31: { - bvdbg("Performing PREL31 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", + binfo("Performing PREL31 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value); offset = *(uint32_t *)addr + sym->st_value - addr; @@ -353,7 +353,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, case R_ARM_MOVW_ABS_NC: case R_ARM_MOVT_ABS: { - bvdbg("Performing MOVx_ABS [%d] link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", + binfo("Performing MOVx_ABS [%d] link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", ELF32_R_TYPE(rel->r_info), (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value); @@ -408,7 +408,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, upper_insn = (uint32_t)(*(uint16_t *)addr); lower_insn = (uint32_t)(*(uint16_t *)(addr + 2)); - bvdbg("Performing THM_MOVx [%d] link at addr=%08lx [%04x %04x] to sym=%p st_value=%08lx\n", + binfo("Performing THM_MOVx [%d] link at addr=%08lx [%04x %04x] to sym=%p st_value=%08lx\n", ELF32_R_TYPE(rel->r_info), (long)addr, (int)upper_insn, (int)lower_insn, sym, (long)sym->st_value); @@ -425,7 +425,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, /* And perform the relocation */ - bvdbg(" offset=%08lx branch target=%08lx\n", + binfo(" offset=%08lx branch target=%08lx\n", (long)offset, offset + sym->st_value); offset += sym->st_value; @@ -445,7 +445,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, lower_insn = ((lower_insn & 0x8f00) | ((offset & 0x0700) << 4) | (offset & 0x00ff)); *(uint16_t *)(addr + 2) = (uint16_t)lower_insn; - bvdbg(" insn [%04x %04x]\n", + binfo(" insn [%04x %04x]\n", (int)upper_insn, (int)lower_insn); } break; diff --git a/arch/arm/src/armv7-a/arm_addrenv.c b/arch/arm/src/armv7-a/arm_addrenv.c index 2bd1f886ce..92ab46cabd 100644 --- a/arch/arm/src/armv7-a/arm_addrenv.c +++ b/arch/arm/src/armv7-a/arm_addrenv.c @@ -257,7 +257,7 @@ int up_addrenv_create(size_t textsize, size_t datasize, size_t heapsize, { int ret; - bvdbg("addrenv=%p textsize=%lu datasize=%lu\n", + binfo("addrenv=%p textsize=%lu datasize=%lu\n", addrenv, (unsigned long)textsize, (unsigned long)datasize); DEBUGASSERT(addrenv); @@ -353,7 +353,7 @@ errout: int up_addrenv_destroy(FAR group_addrenv_t *addrenv) { - bvdbg("addrenv=%p\n", addrenv); + binfo("addrenv=%p\n", addrenv); DEBUGASSERT(addrenv); /* Destroy the .text region */ @@ -405,7 +405,7 @@ int up_addrenv_destroy(FAR group_addrenv_t *addrenv) int up_addrenv_vtext(FAR group_addrenv_t *addrenv, FAR void **vtext) { - bvdbg("return=%p\n", (FAR void *)CONFIG_ARCH_TEXT_VBASE); + binfo("return=%p\n", (FAR void *)CONFIG_ARCH_TEXT_VBASE); /* Not much to do in this case */ @@ -439,7 +439,7 @@ int up_addrenv_vtext(FAR group_addrenv_t *addrenv, FAR void **vtext) int up_addrenv_vdata(FAR group_addrenv_t *addrenv, uintptr_t textsize, FAR void **vdata) { - bvdbg("return=%p\n", + binfo("return=%p\n", (FAR void *)(CONFIG_ARCH_DATA_VBASE + ARCH_DATA_RESERVE_SIZE)); /* Not much to do in this case */ @@ -636,7 +636,7 @@ int up_addrenv_restore(FAR const save_addrenv_t *oldenv) uintptr_t vaddr; int i; - bvdbg("oldenv=%p\n", oldenv); + binfo("oldenv=%p\n", oldenv); DEBUGASSERT(oldenv); for (vaddr = CONFIG_ARCH_TEXT_VBASE, i = 0; @@ -752,7 +752,7 @@ int up_addrenv_coherent(FAR const group_addrenv_t *addrenv) int up_addrenv_clone(FAR const group_addrenv_t *src, FAR group_addrenv_t *dest) { - bvdbg("src=%p dest=%p\n", src, dest); + binfo("src=%p dest=%p\n", src, dest); DEBUGASSERT(src && dest); /* Just copy the address environment from the source to the destination */ @@ -784,7 +784,7 @@ int up_addrenv_clone(FAR const group_addrenv_t *src, int up_addrenv_attach(FAR struct task_group_s *group, FAR struct tcb_s *tcb) { - bvdbg("group=%p tcb=%p\n", group, tcb); + binfo("group=%p tcb=%p\n", group, tcb); /* Nothing needs to be done in this implementation */ @@ -817,7 +817,7 @@ int up_addrenv_attach(FAR struct task_group_s *group, FAR struct tcb_s *tcb) int up_addrenv_detach(FAR struct task_group_s *group, FAR struct tcb_s *tcb) { - bvdbg("group=%p tcb=%p\n", group, tcb); + binfo("group=%p tcb=%p\n", group, tcb); /* Nothing needs to be done in this implementation */ diff --git a/arch/arm/src/armv7-a/arm_addrenv_kstack.c b/arch/arm/src/armv7-a/arm_addrenv_kstack.c index da2a474126..2172023d9a 100644 --- a/arch/arm/src/armv7-a/arm_addrenv_kstack.c +++ b/arch/arm/src/armv7-a/arm_addrenv_kstack.c @@ -144,7 +144,7 @@ int up_addrenv_kstackalloc(FAR struct tcb_s *tcb) { - bvdbg("tcb=%p stacksize=%u\n", tcb, ARCH_KERNEL_STACKSIZE); + binfo("tcb=%p stacksize=%u\n", tcb, ARCH_KERNEL_STACKSIZE); DEBUGASSERT(tcb && tcb->xcp.kstack == 0); @@ -177,7 +177,7 @@ int up_addrenv_kstackalloc(FAR struct tcb_s *tcb) int up_addrenv_kstackfree(FAR struct tcb_s *tcb) { - bvdbg("tcb=%p\n", tcb); + binfo("tcb=%p\n", tcb); DEBUGASSERT(tcb); /* Does the exiting thread have a kernel stack? */ diff --git a/arch/arm/src/armv7-a/arm_addrenv_shm.c b/arch/arm/src/armv7-a/arm_addrenv_shm.c index 9a05b9f7b9..cc9c9440d8 100644 --- a/arch/arm/src/armv7-a/arm_addrenv_shm.c +++ b/arch/arm/src/armv7-a/arm_addrenv_shm.c @@ -92,7 +92,7 @@ int up_shmat(FAR uintptr_t *pages, unsigned int npages, uintptr_t vaddr) unsigned int nmapped; unsigned int shmndx; - shmvdbg("pages=%p npages=%d vaddr=%08lx\n", + shminfo("pages=%p npages=%d vaddr=%08lx\n", pages, npages, (unsigned long)vaddr); /* Sanity checks */ @@ -241,7 +241,7 @@ int up_shmdt(uintptr_t vaddr, unsigned int npages) unsigned int nunmapped; unsigned int shmndx; - shmvdbg("npages=%d vaddr=%08lx\n", npages, (unsigned long)vaddr); + shminfo("npages=%d vaddr=%08lx\n", npages, (unsigned long)vaddr); /* Sanity checks */ diff --git a/arch/arm/src/armv7-a/arm_addrenv_ustack.c b/arch/arm/src/armv7-a/arm_addrenv_ustack.c index 206d517ef3..bf8d135564 100644 --- a/arch/arm/src/armv7-a/arm_addrenv_ustack.c +++ b/arch/arm/src/armv7-a/arm_addrenv_ustack.c @@ -143,7 +143,7 @@ int up_addrenv_ustackalloc(FAR struct tcb_s *tcb, size_t stacksize) { int ret; - bvdbg("tcb=%p stacksize=%lu\n", tcb, (unsigned long)stacksize); + binfo("tcb=%p stacksize=%lu\n", tcb, (unsigned long)stacksize); DEBUGASSERT(tcb); @@ -190,7 +190,7 @@ int up_addrenv_ustackalloc(FAR struct tcb_s *tcb, size_t stacksize) int up_addrenv_ustackfree(FAR struct tcb_s *tcb) { - bvdbg("tcb=%p\n", tcb); + binfo("tcb=%p\n", tcb); DEBUGASSERT(tcb); /* Destroy the stack region */ @@ -221,7 +221,7 @@ int up_addrenv_ustackfree(FAR struct tcb_s *tcb) int up_addrenv_vustack(FAR const struct tcb_s *tcb, FAR void **vstack) { - bvdbg("Return=%p\n", (FAR void *)CONFIG_ARCH_STACK_VBASE); + binfo("Return=%p\n", (FAR void *)CONFIG_ARCH_STACK_VBASE); /* Not much to do in this case */ diff --git a/arch/arm/src/armv7-a/arm_addrenv_utils.c b/arch/arm/src/armv7-a/arm_addrenv_utils.c index f3147918f2..afc2650a89 100644 --- a/arch/arm/src/armv7-a/arm_addrenv_utils.c +++ b/arch/arm/src/armv7-a/arm_addrenv_utils.c @@ -84,7 +84,7 @@ int arm_addrenv_create_region(FAR uintptr_t **list, unsigned int listlen, unsigned int i; unsigned int j; - bvdbg("listlen=%d vaddr=%08lx regionsize=%ld, mmuflags=%08x\n", + binfo("listlen=%d vaddr=%08lx regionsize=%ld, mmuflags=%08x\n", listlen, (unsigned long)vaddr, (unsigned long)regionsize, (unsigned int)mmuflags); @@ -201,7 +201,7 @@ void arm_addrenv_destroy_region(FAR uintptr_t **list, unsigned int listlen, int i; int j; - bvdbg("listlen=%d vaddr=%08lx\n", listlen, (unsigned long)vaddr); + binfo("listlen=%d vaddr=%08lx\n", listlen, (unsigned long)vaddr); for (i = 0; i < listlen; vaddr += SECTION_SIZE, list++, i++) { diff --git a/arch/arm/src/armv7-a/arm_cpustart.c b/arch/arm/src/armv7-a/arm_cpustart.c index 1ec95da855..cec904e2df 100644 --- a/arch/arm/src/armv7-a/arm_cpustart.c +++ b/arch/arm/src/armv7-a/arm_cpustart.c @@ -106,7 +106,7 @@ int arm_start_handler(int irq, FAR void *context) { FAR struct tcb_s *tcb; - sllvdbg("CPU%d Started\n", up_cpu_index()); + sllinfo("CPU%d Started\n", up_cpu_index()); /* Reset scheduler parameters */ @@ -155,7 +155,7 @@ int arm_start_handler(int irq, FAR void *context) int up_cpu_start(int cpu) { - sllvdbg("Starting CPU%d\n", cpu); + sllinfo("Starting CPU%d\n", cpu); DEBUGASSERT(cpu >= 0 && cpu < CONFIG_SMP_NCPUS && cpu != this_cpu()); diff --git a/arch/arm/src/armv7-a/arm_dataabort.c b/arch/arm/src/armv7-a/arm_dataabort.c index 38a9cbe4b5..52c6bb2f98 100644 --- a/arch/arm/src/armv7-a/arm_dataabort.c +++ b/arch/arm/src/armv7-a/arm_dataabort.c @@ -126,7 +126,7 @@ uint32_t *arm_dataabort(uint32_t *regs, uint32_t dfar, uint32_t dfsr) * (It has not yet been saved in the register context save area). */ - pgllvdbg("VBASE: %08x VEND: %08x\n", PG_PAGED_VBASE, PG_PAGED_VEND); + pgllinfo("VBASE: %08x VEND: %08x\n", PG_PAGED_VBASE, PG_PAGED_VEND); if (dfar < PG_PAGED_VBASE || dfar >= PG_PAGED_VEND) { goto segfault; diff --git a/arch/arm/src/armv7-a/arm_elf.c b/arch/arm/src/armv7-a/arm_elf.c index 57898e136a..ada27e19cc 100644 --- a/arch/arm/src/armv7-a/arm_elf.c +++ b/arch/arm/src/armv7-a/arm_elf.c @@ -162,7 +162,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, case R_ARM_CALL: case R_ARM_JUMP24: { - bvdbg("Performing PC24 [%d] link at addr %08lx [%08lx] to sym '%s' st_value=%08lx\n", + binfo("Performing PC24 [%d] link at addr %08lx [%08lx] to sym '%s' st_value=%08lx\n", ELF32_R_TYPE(rel->r_info), (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value); @@ -191,7 +191,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, case R_ARM_ABS32: case R_ARM_TARGET1: /* New ABI: TARGET1 always treated as ABS32 */ { - bvdbg("Performing ABS32 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", + binfo("Performing ABS32 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value); *(uint32_t *)addr += sym->st_value; @@ -200,7 +200,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, case R_ARM_V4BX: { - bvdbg("Performing V4BX link at addr=%08lx [%08lx]\n", + binfo("Performing V4BX link at addr=%08lx [%08lx]\n", (long)addr, (long)(*(uint32_t *)addr)); /* Preserve only Rm and the condition code */ @@ -215,7 +215,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, case R_ARM_PREL31: { - bvdbg("Performing PREL31 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", + binfo("Performing PREL31 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value); offset = *(uint32_t *)addr + sym->st_value - addr; @@ -226,7 +226,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, case R_ARM_MOVW_ABS_NC: case R_ARM_MOVT_ABS: { - bvdbg("Performing MOVx_ABS [%d] link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", + binfo("Performing MOVx_ABS [%d] link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", ELF32_R_TYPE(rel->r_info), (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value); diff --git a/arch/arm/src/armv7-a/arm_gicv2.c b/arch/arm/src/armv7-a/arm_gicv2.c index 990a2c66dd..3d44e61f5f 100644 --- a/arch/arm/src/armv7-a/arm_gicv2.c +++ b/arch/arm/src/armv7-a/arm_gicv2.c @@ -387,7 +387,7 @@ uint32_t *arm_decodeirq(uint32_t *regs) regval = getreg32(GIC_ICCIAR); irq = (regval & GIC_ICCIAR_INTID_MASK) >> GIC_ICCIAR_INTID_SHIFT; - gicllvdbg("irq=%d\n", irq); + gicllinfo("irq=%d\n", irq); /* Ignore spurions IRQs. ICCIAR will report 1023 if there is no pending * interrupt. diff --git a/arch/arm/src/armv7-a/gic.h b/arch/arm/src/armv7-a/gic.h index cc6ee48330..9bddaa06ae 100644 --- a/arch/arm/src/armv7-a/gic.h +++ b/arch/arm/src/armv7-a/gic.h @@ -596,13 +596,13 @@ #ifdef CONFIG_DEBUG_IRQ # define gicdbg(format, ...) dbg(format, ##__VA_ARGS__) # define giclldbg(format, ...) lldbg(format, ##__VA_ARGS__) -# define gicvdbg(format, ...) vdbg(format, ##__VA_ARGS__) -# define gicllvdbg(format, ...) llvdbg(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 gicvdbg(x...) -# define gicllvdbg(x...) +# define gicinfo(x...) +# define gicllinfo(x...) #endif /**************************************************************************** diff --git a/arch/arm/src/armv7-m/up_elf.c b/arch/arm/src/armv7-m/up_elf.c index bf492f1aca..e3c2a8c1d3 100644 --- a/arch/arm/src/armv7-m/up_elf.c +++ b/arch/arm/src/armv7-m/up_elf.c @@ -164,7 +164,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, case R_ARM_CALL: case R_ARM_JUMP24: { - bvdbg("Performing PC24 [%d] link at addr %08lx [%08lx] to sym '%s' st_value=%08lx\n", + binfo("Performing PC24 [%d] link at addr %08lx [%08lx] to sym '%s' st_value=%08lx\n", ELF32_R_TYPE(rel->r_info), (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value); @@ -193,7 +193,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, case R_ARM_ABS32: case R_ARM_TARGET1: /* New ABI: TARGET1 always treated as ABS32 */ { - bvdbg("Performing ABS32 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", + binfo("Performing ABS32 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value); *(uint32_t *)addr += sym->st_value; @@ -204,7 +204,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, case R_ARM_TARGET2: /* TARGET2 is a platform-specific relocation: gcc-arm-none-eabi * performs a self relocation */ { - bvdbg("Performing TARGET2 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", + binfo("Performing TARGET2 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value); *(uint32_t *)addr += sym->st_value - addr; @@ -253,7 +253,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, upper_insn = (uint32_t)(*(uint16_t *)addr); lower_insn = (uint32_t)(*(uint16_t *)(addr + 2)); - bvdbg("Performing THM_JUMP24 [%d] link at addr=%08lx [%04x %04x] to sym=%p st_value=%08lx\n", + binfo("Performing THM_JUMP24 [%d] link at addr=%08lx [%04x %04x] to sym=%p st_value=%08lx\n", ELF32_R_TYPE(rel->r_info), (long)addr, (int)upper_insn, (int)lower_insn, sym, (long)sym->st_value); @@ -287,7 +287,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, /* And perform the relocation */ - bvdbg(" S=%d J1=%d J2=%d offset=%08lx branch target=%08lx\n", + binfo(" S=%d J1=%d J2=%d offset=%08lx branch target=%08lx\n", S, J1, J2, (long)offset, offset + sym->st_value - addr); offset += sym->st_value - addr; @@ -328,14 +328,14 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, lower_insn = ((lower_insn & 0xd000) | (J1 << 13) | (J2 << 11) | ((offset >> 1) & 0x07ff)); *(uint16_t *)(addr + 2) = (uint16_t)lower_insn; - bvdbg(" S=%d J1=%d J2=%d insn [%04x %04x]\n", + binfo(" S=%d J1=%d J2=%d insn [%04x %04x]\n", S, J1, J2, (int)upper_insn, (int)lower_insn); } break; case R_ARM_V4BX: { - bvdbg("Performing V4BX link at addr=%08lx [%08lx]\n", + binfo("Performing V4BX link at addr=%08lx [%08lx]\n", (long)addr, (long)(*(uint32_t *)addr)); /* Preserve only Rm and the condition code */ @@ -350,7 +350,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, case R_ARM_PREL31: { - bvdbg("Performing PREL31 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", + binfo("Performing PREL31 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value); offset = *(uint32_t *)addr + sym->st_value - addr; @@ -361,7 +361,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, case R_ARM_MOVW_ABS_NC: case R_ARM_MOVT_ABS: { - bvdbg("Performing MOVx_ABS [%d] link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", + binfo("Performing MOVx_ABS [%d] link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", ELF32_R_TYPE(rel->r_info), (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value); @@ -416,7 +416,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, upper_insn = (uint32_t)(*(uint16_t *)addr); lower_insn = (uint32_t)(*(uint16_t *)(addr + 2)); - bvdbg("Performing THM_MOVx [%d] link at addr=%08lx [%04x %04x] to sym=%p st_value=%08lx\n", + binfo("Performing THM_MOVx [%d] link at addr=%08lx [%04x %04x] to sym=%p st_value=%08lx\n", ELF32_R_TYPE(rel->r_info), (long)addr, (int)upper_insn, (int)lower_insn, sym, (long)sym->st_value); @@ -433,7 +433,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, /* And perform the relocation */ - bvdbg(" offset=%08lx branch target=%08lx\n", + binfo(" offset=%08lx branch target=%08lx\n", (long)offset, offset + sym->st_value); offset += sym->st_value; @@ -455,7 +455,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, (offset & 0x00ff)); *(uint16_t *)(addr + 2) = (uint16_t)lower_insn; - bvdbg(" insn [%04x %04x]\n", + binfo(" insn [%04x %04x]\n", (int)upper_insn, (int)lower_insn); } break; diff --git a/arch/arm/src/armv7-m/up_ramvec_attach.c b/arch/arm/src/armv7-m/up_ramvec_attach.c index 3700cdb00b..03314616b6 100644 --- a/arch/arm/src/armv7-m/up_ramvec_attach.c +++ b/arch/arm/src/armv7-m/up_ramvec_attach.c @@ -60,10 +60,10 @@ #ifdef CONFIG_DEBUG_IRQ # define intdbg lldbg -# define intvdbg llvdbg +# define intinfo llinfo #else # define intdbg(x...) -# define intvdbg(x...) +# define intinfo(x...) #endif /**************************************************************************** @@ -103,7 +103,7 @@ int up_ramvec_attach(int irq, up_vector_t vector) { int ret = -EINVAL; - intvdbg("%s IRQ%d\n", vector ? "Attaching" : "Detaching", irq); + intinfo("%s IRQ%d\n", vector ? "Attaching" : "Detaching", irq); if ((unsigned)irq < NR_VECTORS) { diff --git a/arch/arm/src/armv7-m/up_ramvec_initialize.c b/arch/arm/src/armv7-m/up_ramvec_initialize.c index 80b176d674..7cc11cfb02 100644 --- a/arch/arm/src/armv7-m/up_ramvec_initialize.c +++ b/arch/arm/src/armv7-m/up_ramvec_initialize.c @@ -79,10 +79,10 @@ #ifdef CONFIG_DEBUG_IRQ # define intdbg lldbg -# define intvdbg llvdbg +# define intinfo llinfo #else # define intdbg(x...) -# define intvdbg(x...) +# define intinfo(x...) #endif /**************************************************************************** @@ -147,7 +147,7 @@ void up_ramvec_initialize(void) src = (const CODE up_vector_t *)getreg32(NVIC_VECTAB); dest = g_ram_vectors; - intvdbg("src=%p dest=%p\n", src, dest); + intinfo("src=%p dest=%p\n", src, dest); for (i = 0; i < ARMV7M_VECTAB_SIZE; i++) { @@ -163,7 +163,7 @@ void up_ramvec_initialize(void) * the table alignment is insufficient. */ - intvdbg("NVIC_VECTAB=%08x\n", getreg32(NVIC_VECTAB)); + intinfo("NVIC_VECTAB=%08x\n", getreg32(NVIC_VECTAB)); DEBUGASSERT(getreg32(NVIC_VECTAB) == (uint32_t)g_ram_vectors); } diff --git a/arch/arm/src/armv7-r/arm_elf.c b/arch/arm/src/armv7-r/arm_elf.c index 698ecd0084..71ee69450b 100644 --- a/arch/arm/src/armv7-r/arm_elf.c +++ b/arch/arm/src/armv7-r/arm_elf.c @@ -174,7 +174,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, case R_ARM_CALL: case R_ARM_JUMP24: { - bvdbg("Performing PC24 [%d] link at addr %08lx [%08lx] to sym '%s' st_value=%08lx\n", + binfo("Performing PC24 [%d] link at addr %08lx [%08lx] to sym '%s' st_value=%08lx\n", ELF32_R_TYPE(rel->r_info), (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value); @@ -203,7 +203,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, case R_ARM_ABS32: case R_ARM_TARGET1: /* New ABI: TARGET1 always treated as ABS32 */ { - bvdbg("Performing ABS32 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", + binfo("Performing ABS32 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value); *(uint32_t *)addr += sym->st_value; @@ -212,7 +212,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, case R_ARM_V4BX: { - bvdbg("Performing V4BX link at addr=%08lx [%08lx]\n", + binfo("Performing V4BX link at addr=%08lx [%08lx]\n", (long)addr, (long)(*(uint32_t *)addr)); /* Preserve only Rm and the condition code */ @@ -227,7 +227,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, case R_ARM_PREL31: { - bvdbg("Performing PREL31 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", + binfo("Performing PREL31 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value); offset = *(uint32_t *)addr + sym->st_value - addr; @@ -238,7 +238,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym, case R_ARM_MOVW_ABS_NC: case R_ARM_MOVT_ABS: { - bvdbg("Performing MOVx_ABS [%d] link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", + binfo("Performing MOVx_ABS [%d] link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n", ELF32_R_TYPE(rel->r_info), (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value); diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c index 671f3fe59b..3497ded776 100644 --- a/arch/arm/src/c5471/c5471_ethernet.c +++ b/arch/arm/src/c5471/c5471_ethernet.c @@ -417,7 +417,7 @@ static inline void c5471_dumpbuffer(const char *msg, const uint8_t *buffer, unsi * defined or the following does nothing. */ - nvdbgdumpbuffer(msg, buffer, nbytes); + ninfodumpbuffer(msg, buffer, nbytes); } #else # define c5471_dumpbuffer(msg, buffer,nbytes) @@ -802,7 +802,7 @@ static inline void c5471_inctxcpu(struct c5471_driver_s *c5471) c5471->c_txcpudesc += 2*sizeof(uint32_t); } - nvdbg("TX CPU desc: %08x\n", c5471->c_txcpudesc); + ninfo("TX CPU desc: %08x\n", c5471->c_txcpudesc); } /**************************************************************************** @@ -825,7 +825,7 @@ static inline void c5471_incrxcpu(struct c5471_driver_s *c5471) c5471->c_rxcpudesc += 2*sizeof(uint32_t); } - nvdbg("RX CPU desc: %08x\n", c5471->c_rxcpudesc); + ninfo("RX CPU desc: %08x\n", c5471->c_rxcpudesc); } /**************************************************************************** @@ -861,7 +861,7 @@ static int c5471_transmit(struct c5471_driver_s *c5471) bfirstframe = true; c5471->c_lastdescstart = c5471->c_rxcpudesc; - nvdbg("Packet size: %d RX CPU desc: %08x\n", nbytes, c5471->c_rxcpudesc); + ninfo("Packet size: %d RX CPU desc: %08x\n", nbytes, c5471->c_rxcpudesc); c5471_dumpbuffer("Transmit packet", dev->d_buf, dev->d_len); while (nbytes) @@ -918,7 +918,7 @@ static int c5471_transmit(struct c5471_driver_s *c5471) putreg32(((getreg32(c5471->c_rxcpudesc) & ~EIM_RXDESC_BYTEMASK) | framelen), c5471->c_rxcpudesc); nbytes -= framelen; - nvdbg("Wrote framelen: %d nbytes: %d nshorts: %d\n", framelen, nbytes, nshorts); + ninfo("Wrote framelen: %d nbytes: %d nshorts: %d\n", framelen, nbytes, nshorts); if (0 == nbytes) { @@ -1092,43 +1092,43 @@ static void c5471_rxstatus(struct c5471_driver_s *c5471) if ((rxstatus & EIM_TXDESC_RETRYERROR) != 0) { c5471->c_rxretries++; - nvdbg("c_rxretries: %d\n", c5471->c_rxretries); + ninfo("c_rxretries: %d\n", c5471->c_rxretries); } if ((rxstatus & EIM_TXDESC_HEARTBEAT) != 0) { c5471->c_rxheartbeat++; - nvdbg("c_rxheartbeat: %d\n", c5471->c_rxheartbeat); + ninfo("c_rxheartbeat: %d\n", c5471->c_rxheartbeat); } if ((rxstatus & EIM_TXDESC_LCOLLISON) != 0) { c5471->c_rxlcollision++; - nvdbg("c_rxlcollision: %d\n", c5471->c_rxlcollision); + ninfo("c_rxlcollision: %d\n", c5471->c_rxlcollision); } if ((rxstatus & EIM_TXDESC_COLLISION) != 0) { c5471->c_rxcollision++; - nvdbg("c_rxcollision: %d\n", c5471->c_rxcollision); + ninfo("c_rxcollision: %d\n", c5471->c_rxcollision); } if ((rxstatus & EIM_TXDESC_CRCERROR) != 0) { c5471->c_rxcrc++; - nvdbg("c_rxcrc: %d\n", c5471->c_rxcrc); + ninfo("c_rxcrc: %d\n", c5471->c_rxcrc); } if ((rxstatus & EIM_TXDESC_UNDERRUN) != 0) { c5471->c_rxunderrun++; - nvdbg("c_rxunderrun: %d\n", c5471->c_rxunderrun); + ninfo("c_rxunderrun: %d\n", c5471->c_rxunderrun); } if ((rxstatus & EIM_TXDESC_LOC) != 0) { c5471->c_rxloc++; - nvdbg("c_rxloc: %d\n", c5471->c_rxloc); + ninfo("c_rxloc: %d\n", c5471->c_rxloc); } } } @@ -1166,7 +1166,7 @@ static void c5471_receive(struct c5471_driver_s *c5471) * the EIM for additional packets that might be received later from the network. */ - nvdbg("Reading TX CPU desc: %08x\n", c5471->c_txcpudesc); + ninfo("Reading TX CPU desc: %08x\n", c5471->c_txcpudesc); while (bmore) { /* Words #0 and #1 of descriptor */ @@ -1196,7 +1196,7 @@ static void c5471_receive(struct c5471_driver_s *c5471) /* Divide by 2 with round up to get the number of 16-bit words. */ nshorts = (framelen + 1) >> 1; - nvdbg("Reading framelen: %d packetlen: %d nshorts: %d packetmen: %p\n", + ninfo("Reading framelen: %d packetlen: %d nshorts: %d packetmen: %p\n", framelen, packetlen, nshorts, packetmem); for (i = 0 ; i < nshorts; i++, j++) @@ -1210,7 +1210,7 @@ static void c5471_receive(struct c5471_driver_s *c5471) } else { - nvdbg("Discarding framelen: %d packetlen\n", framelen, packetlen); + ninfo("Discarding framelen: %d packetlen\n", framelen, packetlen); } if (getreg32(c5471->c_txcpudesc) & EIM_TXDESC_LIF) @@ -1253,7 +1253,7 @@ static void c5471_receive(struct c5471_driver_s *c5471) /* Set amount of data in c5471->c_dev.d_len. */ dev->d_len = packetlen; - nvdbg("Received packet, packetlen: %d type: %02x\n", packetlen, ntohs(BUF->type)); + ninfo("Received packet, packetlen: %d type: %02x\n", packetlen, ntohs(BUF->type)); c5471_dumpbuffer("Received packet", dev->d_buf, dev->d_len); #ifdef CONFIG_NET_PKT @@ -1267,7 +1267,7 @@ static void c5471_receive(struct c5471_driver_s *c5471) #ifdef CONFIG_NET_IPv4 if (BUF->type == HTONS(ETHTYPE_IP)) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); /* Handle ARP on input then give the IPv4 packet to the network * layer @@ -1310,7 +1310,7 @@ static void c5471_receive(struct c5471_driver_s *c5471) #ifdef CONFIG_NET_IPv6 if (BUF->type == HTONS(ETHTYPE_IP6)) { - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); /* Give the IPv6 packet to the network layer */ @@ -1432,43 +1432,43 @@ static void c5471_txstatus(struct c5471_driver_s *c5471) if ((txstatus & EIM_RXDESC_MISS) != 0) { c5471->c_txmiss++; - nvdbg("c_txmiss: %d\n", c5471->c_txmiss); + ninfo("c_txmiss: %d\n", c5471->c_txmiss); } if ((txstatus & EIM_RXDESC_VLAN) != 0) { c5471->c_txvlan++; - nvdbg("c_txvlan: %d\n", c5471->c_txvlan); + ninfo("c_txvlan: %d\n", c5471->c_txvlan); } if ((txstatus & EIM_RXDESC_LFRAME) != 0) { c5471->c_txlframe++; - nvdbg("c_txlframe: %d\n", c5471->c_txlframe); + ninfo("c_txlframe: %d\n", c5471->c_txlframe); } if ((txstatus & EIM_RXDESC_SFRAME) != 0) { c5471->c_txsframe++; - nvdbg("c_txsframe: %d\n", c5471->c_txsframe); + ninfo("c_txsframe: %d\n", c5471->c_txsframe); } if ((txstatus & EIM_RXDESC_CRCERROR) != 0) { c5471->c_txcrc++; - nvdbg("c_txcrc: %d\n", c5471->c_txcrc); + ninfo("c_txcrc: %d\n", c5471->c_txcrc); } if ((txstatus & EIM_RXDESC_OVERRUN) != 0) { c5471->c_txoverrun++; - nvdbg("c_txoverrun: %d\n", c5471->c_txoverrun); + ninfo("c_txoverrun: %d\n", c5471->c_txoverrun); } if ((txstatus & EIM_RXDESC_OVERRUN) != 0) { c5471->c_txalign++; - nvdbg("c_txalign: %d\n", c5471->c_txalign); + ninfo("c_txalign: %d\n", c5471->c_txalign); } } } @@ -1607,7 +1607,7 @@ static void c5471_txtimeout(int argc, uint32_t arg, ...) #ifdef CONFIG_C5471_NET_STATS c5471->c_txtimeouts++; - nvdbg("c_txtimeouts: %d\n", c5471->c_txtimeouts); + ninfo("c_txtimeouts: %d\n", c5471->c_txtimeouts); #endif /* Then try to restart the hardware */ diff --git a/arch/arm/src/common/up_vfork.c b/arch/arm/src/common/up_vfork.c index b902ccba7b..1d8e8c5de1 100644 --- a/arch/arm/src/common/up_vfork.c +++ b/arch/arm/src/common/up_vfork.c @@ -130,12 +130,12 @@ pid_t up_vfork(const struct vfork_s *context) uint32_t stackutil; int ret; - svdbg("vfork context [%p]:\n", context); - svdbg(" r4:%08x r5:%08x r6:%08x r7:%08x\n", + sinfo("vfork context [%p]:\n", context); + sinfo(" r4:%08x r5:%08x r6:%08x r7:%08x\n", context->r4, context->r5, context->r6, context->r7); - svdbg(" r8:%08x r9:%08x r10:%08x\n", + sinfo(" r8:%08x r9:%08x r10:%08x\n", context->r8, context->r9, context->r10); - svdbg(" fp:%08x sp:%08x lr:%08x\n", + sinfo(" fp:%08x sp:%08x lr:%08x\n", context->fp, context->sp, context->lr); /* Allocate and initialize a TCB for the child task. */ @@ -147,7 +147,7 @@ pid_t up_vfork(const struct vfork_s *context) return (pid_t)ERROR; } - svdbg("TCBs: Parent=%p Child=%p\n", parent, child); + sinfo("TCBs: Parent=%p Child=%p\n", parent, child); /* Get the size of the parent task's stack. Due to alignment operations, * the adjusted stack size may be smaller than the stack size originally @@ -176,7 +176,7 @@ pid_t up_vfork(const struct vfork_s *context) DEBUGASSERT((uint32_t)parent->adj_stack_ptr > context->sp); stackutil = (uint32_t)parent->adj_stack_ptr - context->sp; - svdbg("Parent: stacksize:%d stackutil:%d\n", stacksize, stackutil); + sinfo("Parent: stacksize:%d stackutil:%d\n", stacksize, stackutil); /* Make some feeble effort to preserve the stack contents. This is * feeble because the stack surely contains invalid pointers and other @@ -201,9 +201,9 @@ pid_t up_vfork(const struct vfork_s *context) newfp = context->fp; } - svdbg("Parent: stack base:%08x SP:%08x FP:%08x\n", + sinfo("Parent: stack base:%08x SP:%08x FP:%08x\n", parent->adj_stack_ptr, context->sp, context->fp); - svdbg("Child: stack base:%08x SP:%08x FP:%08x\n", + sinfo("Child: stack base:%08x SP:%08x FP:%08x\n", child->cmn.adj_stack_ptr, newsp, newfp); /* Update the stack pointer, frame pointer, and volatile registers. When diff --git a/arch/arm/src/dm320/dm320_framebuffer.c b/arch/arm/src/dm320/dm320_framebuffer.c index 8fd4ec4463..b6c6def0d5 100644 --- a/arch/arm/src/dm320/dm320_framebuffer.c +++ b/arch/arm/src/dm320/dm320_framebuffer.c @@ -768,15 +768,15 @@ static void dm320_disable(void) { /* Disable all planes */ - gvdbg("Inactivate OSD:\n"); + ginfo("Inactivate OSD:\n"); putreg16(0, DM320_OSD_OSDWIN0MD); /* Win0 mode = 0 (1:active) */ putreg16(0, DM320_OSD_OSDWIN1MD); /* Win1 mode = 0 (1:active) */ putreg16(0, DM320_OSD_RECTCUR); /* Rectangular cursor mode = 0 (1:active) */ - gvdbg("DM320_OSD_OSDWIN0MD: %04x\n", getreg16(DM320_OSD_OSDWIN0MD)); - gvdbg("DM320_OSD_OSDWIN1MD: %04x\n", getreg16(DM320_OSD_OSDWIN1MD)); - gvdbg("DM320_OSD_RECTCUR: %04x\n", getreg16(DM320_OSD_RECTCUR)); + ginfo("DM320_OSD_OSDWIN0MD: %04x\n", getreg16(DM320_OSD_OSDWIN0MD)); + ginfo("DM320_OSD_OSDWIN1MD: %04x\n", getreg16(DM320_OSD_OSDWIN1MD)); + ginfo("DM320_OSD_RECTCUR: %04x\n", getreg16(DM320_OSD_RECTCUR)); } /**************************************************************************** @@ -791,17 +791,17 @@ static void dm320_hwinitialize(void) /* Initialize the main video to correct the origin */ - gvdbg("Setup main video origin:\n"); + ginfo("Setup main video origin:\n"); putreg16(CONFIG_DM320_BASEX, DM320_OSD_BASEPX); putreg16(CONFIG_DM320_BASEY, DM320_OSD_BASEPY); - gvdbg("DM320_OSD_BASEPX: %04x\n", getreg16(DM320_OSD_BASEPX)); - gvdbg("DM320_OSD_BASEPY: %04x\n", getreg16(DM320_OSD_BASEPY)); + ginfo("DM320_OSD_BASEPX: %04x\n", getreg16(DM320_OSD_BASEPX)); + ginfo("DM320_OSD_BASEPY: %04x\n", getreg16(DM320_OSD_BASEPY)); /* Set up the frame buffer address registers */ - gvdbg("Setup framebuffer addresses:\n"); + ginfo("Setup framebuffer addresses:\n"); putreg16(((dm320_osd1upperoffset() << 8) | @@ -809,9 +809,9 @@ static void dm320_hwinitialize(void) putreg16(dm320_osd0loweroffset(), DM320_OSD_OSDWIN0ADL); putreg16(dm320_osd1loweroffset(), DM320_OSD_OSDWIN1ADL); - gvdbg("DM320_OSD_OSDWINADH: %04x\n", getreg16(DM320_OSD_OSDWINADH)); - gvdbg("DM320_OSD_OSDWIN0ADL: %04x\n", getreg16(DM320_OSD_OSDWIN0ADL)); - gvdbg("DM320_OSD_OSDWIN1ADL: %04x\n", getreg16(DM320_OSD_OSDWIN1ADL)); + ginfo("DM320_OSD_OSDWINADH: %04x\n", getreg16(DM320_OSD_OSDWINADH)); + ginfo("DM320_OSD_OSDWIN0ADL: %04x\n", getreg16(DM320_OSD_OSDWIN0ADL)); + ginfo("DM320_OSD_OSDWIN1ADL: %04x\n", getreg16(DM320_OSD_OSDWIN1ADL)); /* Set up VID WIN0 */ @@ -820,19 +820,19 @@ static void dm320_hwinitialize(void) #endif #ifndef CONFIG_DM320_VID0_DISABLE - gvdbg("Initialize video win0:\n"); + ginfo("Initialize video win0:\n"); putreg16(dm320_vid0loweroffset(), DM320_OSD_VIDWIN0ADL); - gvdbg("DM320_OSD_VIDWINADH: %04x\n", getreg16(DM320_OSD_VIDWINADH)); - gvdbg("DM320_OSD_VIDWIN0ADL: %04x\n", getreg16(DM320_OSD_VIDWIN0ADL)); + ginfo("DM320_OSD_VIDWINADH: %04x\n", getreg16(DM320_OSD_VIDWINADH)); + ginfo("DM320_OSD_VIDWIN0ADL: %04x\n", getreg16(DM320_OSD_VIDWIN0ADL)); dm320_blankscreen((uint8_t *)g_vid0base, DM320_VID0_FBLEN); #ifndef CONFIG_DM320_DISABLE_PINGPONG putreg16(dm320_vid0ppupperoffset(), DM320_OSD_PPVWIN0ADH); putreg16(dm320_vid0pploweroffset(), DM320_OSD_PPVWIN0ADL); - gvdbg("DM320_OSD_PPVWIN0ADH: %04x\n", getreg16(DM320_OSD_PPVWIN0ADH)); - gvdbg("DM320_OSD_PPVWIN0ADL: %04x\n", getreg16(DM320_OSD_PPVWIN0ADL)); + ginfo("DM320_OSD_PPVWIN0ADH: %04x\n", getreg16(DM320_OSD_PPVWIN0ADH)); + ginfo("DM320_OSD_PPVWIN0ADL: %04x\n", getreg16(DM320_OSD_PPVWIN0ADL)); dm320_blankscreen((uint8_t *)g_vid0ppbase, DM320_VID0_FBLEN); #endif @@ -842,21 +842,21 @@ static void dm320_hwinitialize(void) putreg16(CONFIG_DM320_VID0_XRES, DM320_OSD_VIDWIN0XL); putreg16(CONFIG_DM320_VID0_YRES, DM320_OSD_VIDWIN0YL); - gvdbg("DM320_OSD_VIDWIN0XP: %04x\n", getreg16(DM320_OSD_VIDWIN0XP)); - gvdbg("DM320_OSD_VIDWIN0YP: %04x\n", getreg16(DM320_OSD_VIDWIN0YP)); - gvdbg("DM320_OSD_VIDWIN0OFST: %04x\n", getreg16(DM320_OSD_VIDWIN0OFST)); - gvdbg("DM320_OSD_VIDWIN0XL: %04x\n", getreg16(DM320_OSD_VIDWIN0XL)); - gvdbg("DM320_OSD_VIDWIN0YL: %04x\n", getreg16(DM320_OSD_VIDWIN0YL)); + ginfo("DM320_OSD_VIDWIN0XP: %04x\n", getreg16(DM320_OSD_VIDWIN0XP)); + ginfo("DM320_OSD_VIDWIN0YP: %04x\n", getreg16(DM320_OSD_VIDWIN0YP)); + ginfo("DM320_OSD_VIDWIN0OFST: %04x\n", getreg16(DM320_OSD_VIDWIN0OFST)); + ginfo("DM320_OSD_VIDWIN0XL: %04x\n", getreg16(DM320_OSD_VIDWIN0XL)); + ginfo("DM320_OSD_VIDWIN0YL: %04x\n", getreg16(DM320_OSD_VIDWIN0YL)); #endif /* Set up VID WIN1 */ #ifndef CONFIG_DM320_VID1_DISABLE - gvdbg("Initialize video win1:\n"); + ginfo("Initialize video win1:\n"); putreg16(dm320_vid1loweroffset(), DM320_OSD_VIDWIN1ADL); - gvdbg("DM320_OSD_VIDWINADH: %04x\n", getreg16(DM320_OSD_VIDWINADH)); - gvdbg("DM320_OSD_VIDWIN1ADL: %04x\n", getreg16(DM320_OSD_VIDWIN1ADL)); + ginfo("DM320_OSD_VIDWINADH: %04x\n", getreg16(DM320_OSD_VIDWINADH)); + ginfo("DM320_OSD_VIDWIN1ADL: %04x\n", getreg16(DM320_OSD_VIDWIN1ADL)); dm320_blankscreen((uint8_t *)g_vid1base, DM320_VID1_FBLEN); putreg16(CONFIG_DM320_VID1_XPOS, DM320_OSD_VIDWIN1XP); @@ -865,20 +865,20 @@ static void dm320_hwinitialize(void) putreg16(CONFIG_DM320_VID1_XRES, DM320_OSD_VIDWIN1XL); putreg16(CONFIG_DM320_VID1_YRES, DM320_OSD_VIDWIN1YL); - gvdbg("DM320_OSD_VIDWIN1XP: %04x\n", getreg16(DM320_OSD_VIDWIN1XP)); - gvdbg("DM320_OSD_VIDWIN1YP: %04x\n", getreg16(DM320_OSD_VIDWIN1YP)); - gvdbg("DM320_OSD_VIDWIN1OFST: %04x\n", getreg16(DM320_OSD_VIDWIN1OFST)); - gvdbg("DM320_OSD_VIDWIN1XL: %04x\n", getreg16(DM320_OSD_VIDWIN1XL)); - gvdbg("DM320_OSD_VIDWIN1YL: %04x\n", getreg16(DM320_OSD_VIDWIN1YL)); + ginfo("DM320_OSD_VIDWIN1XP: %04x\n", getreg16(DM320_OSD_VIDWIN1XP)); + ginfo("DM320_OSD_VIDWIN1YP: %04x\n", getreg16(DM320_OSD_VIDWIN1YP)); + ginfo("DM320_OSD_VIDWIN1OFST: %04x\n", getreg16(DM320_OSD_VIDWIN1OFST)); + ginfo("DM320_OSD_VIDWIN1XL: %04x\n", getreg16(DM320_OSD_VIDWIN1XL)); + ginfo("DM320_OSD_VIDWIN1YL: %04x\n", getreg16(DM320_OSD_VIDWIN1YL)); #endif putreg16(DM320_VIDMODE, DM320_OSD_VIDWINMD); - gvdbg("DM320_OSD_VIDWINMD: %04x\n", getreg16(DM320_OSD_VIDWINMD)); + ginfo("DM320_OSD_VIDWINMD: %04x\n", getreg16(DM320_OSD_VIDWINMD)); /* Set up OSD WIN0 */ #ifndef CONFIG_DM320_OSD0_DISABLE - gvdbg("Initialize OSD win0:\n"); + ginfo("Initialize OSD win0:\n"); dm320_blankscreen((uint8_t *)g_osd0base, DM320_OSD0_FBLEN); putreg16(CONFIG_DM320_OSD0_XPOS, DM320_OSD_OSDWIN0XP); @@ -892,18 +892,18 @@ static void dm320_hwinitialize(void) putreg16(CONFIG_DM320_OSD0_YRES, DM320_OSD_OSDWIN0YL); putreg16(INITIAL_OSD0MODE, DM320_OSD_OSDWIN0MD); - gvdbg("DM320_OSD_OSDWIN0XP: %04x\n", getreg16(DM320_OSD_OSDWIN0XP)); - gvdbg("DM320_OSD_OSDWIN0YP: %04x\n", getreg16(DM320_OSD_OSDWIN0YP)); - gvdbg("DM320_OSD_OSDWIN0OFST: %04x\n", getreg16(DM320_OSD_OSDWIN0OFST)); - gvdbg("DM320_OSD_OSDWIN0XL: %04x\n", getreg16(DM320_OSD_OSDWIN0XL)); - gvdbg("DM320_OSD_OSDWIN0YL: %04x\n", getreg16(DM320_OSD_OSDWIN0YL)); - gvdbg("DM320_OSD_OSDWIN0MD: %04x\n", getreg16(DM320_OSD_OSDWIN0MD)); + ginfo("DM320_OSD_OSDWIN0XP: %04x\n", getreg16(DM320_OSD_OSDWIN0XP)); + ginfo("DM320_OSD_OSDWIN0YP: %04x\n", getreg16(DM320_OSD_OSDWIN0YP)); + ginfo("DM320_OSD_OSDWIN0OFST: %04x\n", getreg16(DM320_OSD_OSDWIN0OFST)); + ginfo("DM320_OSD_OSDWIN0XL: %04x\n", getreg16(DM320_OSD_OSDWIN0XL)); + ginfo("DM320_OSD_OSDWIN0YL: %04x\n", getreg16(DM320_OSD_OSDWIN0YL)); + ginfo("DM320_OSD_OSDWIN0MD: %04x\n", getreg16(DM320_OSD_OSDWIN0MD)); #endif /* Set up OSD WIN1 */ #ifndef CONFIG_DM320_OSD1_DISABLE - gvdbg("Initialize OSD win1\n"); + ginfo("Initialize OSD win1\n"); dm320_blankscreen((uint8_t *)g_osd1base, DM320_OSD1_FBLEN); putreg16(CONFIG_DM320_OSD1_XPOS, DM320_OSD_OSDWIN1XP); @@ -917,12 +917,12 @@ static void dm320_hwinitialize(void) putreg16(CONFIG_DM320_OSD1_YRES, DM320_OSD_OSDWIN1YL); putreg16(INITIAL_OSD1MODE, DM320_OSD_OSDWIN1MD); - gvdbg("DM320_OSD_OSDWIN1XP: %04x\n", getreg16(DM320_OSD_OSDWIN1XP)); - gvdbg("DM320_OSD_OSDWIN1YP: %04x\n", getreg16(DM320_OSD_OSDWIN1YP)); - gvdbg("DM320_OSD_OSDWIN1OFST: %04x\n", getreg16(DM320_OSD_OSDWIN1OFST)); - gvdbg("DM320_OSD_OSDWIN1XL: %04x\n", getreg16(DM320_OSD_OSDWIN1XL)); - gvdbg("DM320_OSD_OSDWIN1YL: %04x\n", getreg16(DM320_OSD_OSDWIN1YL)); - gvdbg("DM320_OSD_OSDWIN1MD: %04x\n", getreg16(DM320_OSD_OSDWIN1MD)); + ginfo("DM320_OSD_OSDWIN1XP: %04x\n", getreg16(DM320_OSD_OSDWIN1XP)); + ginfo("DM320_OSD_OSDWIN1YP: %04x\n", getreg16(DM320_OSD_OSDWIN1YP)); + ginfo("DM320_OSD_OSDWIN1OFST: %04x\n", getreg16(DM320_OSD_OSDWIN1OFST)); + ginfo("DM320_OSD_OSDWIN1XL: %04x\n", getreg16(DM320_OSD_OSDWIN1XL)); + ginfo("DM320_OSD_OSDWIN1YL: %04x\n", getreg16(DM320_OSD_OSDWIN1YL)); + ginfo("DM320_OSD_OSDWIN1MD: %04x\n", getreg16(DM320_OSD_OSDWIN1MD)); #endif /* Set up the rectangular cursor with defaults */ @@ -946,11 +946,11 @@ static void dm320_hwinitialize(void) putreg16(DM320_RECTCURSOR_SETUP, DM320_OSD_RECTCUR); - gvdbg("DM320_OSD_CURXP: %04x\n", getreg16(DM320_OSD_CURXP)); - gvdbg("DM320_OSD_CURYP: %04x\n", getreg16(DM320_OSD_CURYP)); - gvdbg("DM320_OSD_CURXL: %04x\n", getreg16(DM320_OSD_CURXL)); - gvdbg("DM320_OSD_CURYL: %04x\n", getreg16(DM320_OSD_CURYL)); - gvdbg("DM320_OSD_RECTCUR: %04x\n", getreg16(DM320_OSD_RECTCUR)); + ginfo("DM320_OSD_CURXP: %04x\n", getreg16(DM320_OSD_CURXP)); + ginfo("DM320_OSD_CURYP: %04x\n", getreg16(DM320_OSD_CURYP)); + ginfo("DM320_OSD_CURXL: %04x\n", getreg16(DM320_OSD_CURXL)); + ginfo("DM320_OSD_CURYL: %04x\n", getreg16(DM320_OSD_CURYL)); + ginfo("DM320_OSD_RECTCUR: %04x\n", getreg16(DM320_OSD_RECTCUR)); #endif /* Set main window to the hardware default state. That initial @@ -969,7 +969,7 @@ static void dm320_hwinitialize(void) */ putreg16(CONFIG_DM320_BKGDCLUT, DM320_OSD_OSDMODE); - gvdbg("DM320_OSD_OSDMODE: %04x\n", getreg16(DM320_OSD_OSDMODE)); + ginfo("DM320_OSD_OSDMODE: %04x\n", getreg16(DM320_OSD_OSDMODE)); } /**************************************************************************** @@ -1265,16 +1265,16 @@ static int dm320_getcursor(FAR struct fb_vtable_s *vtable, FAR struct fb_cursora attrib->mxsize.w = MAX_XRES; attrib->mxsize.h = MAX_YRES; - gvdbg("DM320_OSD_CURXP: %04x\n", attrib->pos.x); - gvdbg("DM320_OSD_CURYP: %04x\n", attrib->pos.y); + ginfo("DM320_OSD_CURXP: %04x\n", attrib->pos.x); + ginfo("DM320_OSD_CURYP: %04x\n", attrib->pos.y); #ifdef CONFIG_FB_HWCURSORSIZE - gvdbg("DM320_OSD_CURXL: %04x\n", attrib->size.w); - gvdbg("DM320_OSD_CURYL: %04x\n", attrib->size.h); + ginfo("DM320_OSD_CURXL: %04x\n", attrib->size.w); + ginfo("DM320_OSD_CURYL: %04x\n", attrib->size.h); #else - gvdbg("DM320_OSD_CURXL: %04x\n", getreg16(DM320_OSD_CURXL)); - gvdbg("DM320_OSD_CURYL: %04x\n", getreg16(DM320_OSD_CURYL)); + ginfo("DM320_OSD_CURXL: %04x\n", getreg16(DM320_OSD_CURXL)); + ginfo("DM320_OSD_CURYL: %04x\n", getreg16(DM320_OSD_CURYL)); #endif - gvdbg("DM320_OSD_RECTCUR: %04x\n", getreg16(DM320_OSD_RECTCUR)); + ginfo("DM320_OSD_RECTCUR: %04x\n", getreg16(DM320_OSD_RECTCUR)); } #endif @@ -1300,7 +1300,7 @@ static int dm320_setcursor(FAR struct fb_vtable_s *vtable, FAR struct fb_setcurs flags = enter_critical_section(); if ((settings->flags & FB_CUR_SETPOSITION) != 0) { - gvdbg("x=%d y=%d\n", settings->pos.x, settings->pos.y); + ginfo("x=%d y=%d\n", settings->pos.x, settings->pos.y); if (settings->pos.x > MAX_YRES) { @@ -1319,7 +1319,7 @@ static int dm320_setcursor(FAR struct fb_vtable_s *vtable, FAR struct fb_setcurs #ifdef CONFIG_FB_HWCURSORSIZE if ((settings->flags & FB_CUR_SETSIZE) != 0) { - gvdbg("h=%d w=%d\n", settings->size.h, settings->size.w); + ginfo("h=%d w=%d\n", settings->size.h, settings->size.w); if (settings->size.w > MAX_YRES) { @@ -1349,11 +1349,11 @@ static int dm320_setcursor(FAR struct fb_vtable_s *vtable, FAR struct fb_setcurs putreg16(regval, DM320_OSD_RECTCUR); leave_critical_section(flags); - gvdbg("DM320_OSD_CURXP: %04x\n", getreg16(DM320_OSD_CURXP)); - gvdbg("DM320_OSD_CURYP: %04x\n", getreg16(DM320_OSD_CURYP)); - gvdbg("DM320_OSD_CURXL: %04x\n", getreg16(DM320_OSD_CURXL)); - gvdbg("DM320_OSD_CURYL: %04x\n", getreg16(DM320_OSD_CURYL)); - gvdbg("DM320_OSD_RECTCUR: %04x\n", getreg16(DM320_OSD_RECTCUR)); + ginfo("DM320_OSD_CURXP: %04x\n", getreg16(DM320_OSD_CURXP)); + ginfo("DM320_OSD_CURYP: %04x\n", getreg16(DM320_OSD_CURYP)); + ginfo("DM320_OSD_CURXL: %04x\n", getreg16(DM320_OSD_CURXL)); + ginfo("DM320_OSD_CURYL: %04x\n", getreg16(DM320_OSD_CURYL)); + ginfo("DM320_OSD_RECTCUR: %04x\n", getreg16(DM320_OSD_RECTCUR)); } #endif @@ -1381,7 +1381,7 @@ int up_fbinitialize(int display) { int ret; - gvdbg("Allocating framebuffers\n"); + ginfo("Allocating framebuffers\n"); ret = dm320_allocvideomemory(); if (ret != 0) { @@ -1391,7 +1391,7 @@ int up_fbinitialize(int display) /* Initialize the hardware */ - gvdbg("Initializing hardware\n"); + ginfo("Initializing hardware\n"); dm320_hwinitialize(); return 0; } diff --git a/arch/arm/src/dm320/dm320_usbdev.c b/arch/arm/src/dm320/dm320_usbdev.c index f0f87b7f58..aae0d5fe3c 100644 --- a/arch/arm/src/dm320/dm320_usbdev.c +++ b/arch/arm/src/dm320/dm320_usbdev.c @@ -1216,7 +1216,7 @@ static inline void dm320_ep0setup(struct dm320_usbdev_s *priv) value = GETUINT16(ctrl.value); len = GETUINT16(ctrl.len); - ullvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n", + ullinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n", ctrl.type, ctrl.req, value, index, len); /* Dispatch any non-standard requests */ @@ -1618,7 +1618,7 @@ static int dm320_ctlrinterrupt(int irq, FAR void *context) } else { - ullvdbg("Pending data on OUT endpoint\n"); + ullinfo("Pending data on OUT endpoint\n"); priv->rxpending = 1; } } diff --git a/arch/arm/src/efm32/efm32_adc.c b/arch/arm/src/efm32/efm32_adc.c index 66010104cf..29e01d9d0d 100644 --- a/arch/arm/src/efm32/efm32_adc.c +++ b/arch/arm/src/efm32/efm32_adc.c @@ -717,22 +717,22 @@ endif /* defined(ADC_COUNT) && (ADC_COUNT > 0) */ static void adc_tim_dumpregs(struct efm32_dev_s *priv, FAR const char *msg) { #if defined(CONFIG_DEBUG_ANALOG) && defined(CONFIG_DEBUG_INFO) - avdbg("%s:\n", msg); - avdbg(" CR1: %04x CR2: %04x SMCR: %04x DIER: %04x\n", + ainfo("%s:\n", msg); + ainfo(" CR1: %04x CR2: %04x SMCR: %04x DIER: %04x\n", tim_getreg(priv, EFM32_GTIM_CR1_OFFSET), tim_getreg(priv, EFM32_GTIM_CR2_OFFSET), tim_getreg(priv, EFM32_GTIM_SMCR_OFFSET), tim_getreg(priv, EFM32_GTIM_DIER_OFFSET)); - avdbg(" SR: %04x EGR: 0000 CCMR1: %04x CCMR2: %04x\n", + ainfo(" SR: %04x EGR: 0000 CCMR1: %04x CCMR2: %04x\n", tim_getreg(priv, EFM32_GTIM_SR_OFFSET), tim_getreg(priv, EFM32_GTIM_CCMR1_OFFSET), tim_getreg(priv, EFM32_GTIM_CCMR2_OFFSET)); - avdbg(" CCER: %04x CNT: %04x PSC: %04x ARR: %04x\n", + ainfo(" CCER: %04x CNT: %04x PSC: %04x ARR: %04x\n", tim_getreg(priv, EFM32_GTIM_CCER_OFFSET), tim_getreg(priv, EFM32_GTIM_CNT_OFFSET), tim_getreg(priv, EFM32_GTIM_PSC_OFFSET), tim_getreg(priv, EFM32_GTIM_ARR_OFFSET)); - avdbg(" CCR1: %04x CCR2: %04x CCR3: %04x CCR4: %04x\n", + ainfo(" CCR1: %04x CCR2: %04x CCR3: %04x CCR4: %04x\n", tim_getreg(priv, EFM32_GTIM_CCR1_OFFSET), tim_getreg(priv, EFM32_GTIM_CCR2_OFFSET), tim_getreg(priv, EFM32_GTIM_CCR3_OFFSET), @@ -740,7 +740,7 @@ static void adc_tim_dumpregs(struct efm32_dev_s *priv, FAR const char *msg) if (priv->tbase == EFM32_TIM1_BASE || priv->tbase == EFM32_TIM8_BASE) { - avdbg(" RCR: %04x BDTR: %04x DCR: %04x DMAR: %04x\n", + ainfo(" RCR: %04x BDTR: %04x DCR: %04x DMAR: %04x\n", tim_getreg(priv, EFM32_ATIM_RCR_OFFSET), tim_getreg(priv, EFM32_ATIM_BDTR_OFFSET), tim_getreg(priv, EFM32_ATIM_DCR_OFFSET), @@ -748,7 +748,7 @@ static void adc_tim_dumpregs(struct efm32_dev_s *priv, FAR const char *msg) } else { - avdbg(" DCR: %04x DMAR: %04x\n", + ainfo(" DCR: %04x DMAR: %04x\n", tim_getreg(priv, EFM32_GTIM_DCR_OFFSET), tim_getreg(priv, EFM32_GTIM_DMAR_OFFSET)); } @@ -775,7 +775,7 @@ static void adc_startconv(struct efm32_dev_s *priv, bool enable) { uint32_t regval; - avdbg("enable: %d\n", enable); + ainfo("enable: %d\n", enable); regval = adc_getreg(priv, EFM32_ADC_CR2_OFFSET); if (enable) @@ -864,7 +864,7 @@ static void adc_enable(FAR struct efm32_dev_s *priv, bool enable) { uint32_t regval; - avdbg("enable: %d\n", enable); + ainfo("enable: %d\n", enable); regval = adc_getreg(priv, EFM32_ADC_CR2_OFFSET); if (enable) @@ -922,7 +922,7 @@ static void adc_reset(FAR struct adc_dev_s *dev) int ret; #endif - avdbg("intf: ADC%d\n", priv->intf); + ainfo("intf: ADC%d\n", priv->intf); flags = enter_critical_section(); /* Enable ADC reset state */ @@ -1040,11 +1040,11 @@ static void adc_reset(FAR struct adc_dev_s *dev) leave_critical_section(flags); - avdbg("SR: 0x%08x CR1: 0x%08x CR2: 0x%08x\n", + ainfo("SR: 0x%08x CR1: 0x%08x CR2: 0x%08x\n", adc_getreg(priv, EFM32_ADC_SR_OFFSET), adc_getreg(priv, EFM32_ADC_CR1_OFFSET), adc_getreg(priv, EFM32_ADC_CR2_OFFSET)); - avdbg("SQR1: 0x%08x SQR2: 0x%08x SQR3: 0x%08x\n", + ainfo("SQR1: 0x%08x SQR2: 0x%08x SQR3: 0x%08x\n", adc_getreg(priv, EFM32_ADC_SQR1_OFFSET), adc_getreg(priv, EFM32_ADC_SQR2_OFFSET), adc_getreg(priv, EFM32_ADC_SQR3_OFFSET)); @@ -1081,7 +1081,7 @@ static int adc_setup(FAR struct adc_dev_s *dev) /* Enable the ADC interrupt */ - avdbg("Enable the ADC interrupt: irq=%d\n", priv->irq); + ainfo("Enable the ADC interrupt: irq=%d\n", priv->irq); up_enable_irq(priv->irq); } @@ -1132,7 +1132,7 @@ static void adc_rxint(FAR struct adc_dev_s *dev, bool enable) FAR struct efm32_dev_s *priv = (FAR struct efm32_dev_s *)dev->ad_priv; uint32_t regval; - avdbg("intf: %d enable: %d\n", priv->intf, enable); + ainfo("intf: %d enable: %d\n", priv->intf, enable); regval = adc_getreg(priv, EFM32_ADC_CR1_OFFSET); if (enable) @@ -1271,12 +1271,12 @@ struct adc_dev_s *efm32_adcinitialize(int intf, const uint8_t *chanlist, int nch FAR struct adc_dev_s *dev; FAR struct efm32_dev_s *priv; - avdbg("intf: %d nchannels: %d\n", intf, nchannels); + ainfo("intf: %d nchannels: %d\n", intf, nchannels); #ifdef CONFIG_EFM32_ADC1 if (intf == 1) { - avdbg("ADC1 Selected\n"); + ainfo("ADC1 Selected\n"); dev = &g_adcdev1; } else @@ -1284,7 +1284,7 @@ struct adc_dev_s *efm32_adcinitialize(int intf, const uint8_t *chanlist, int nch #ifdef CONFIG_EFM32_ADC2 if (intf == 2) { - avdbg("ADC2 Selected\n"); + ainfo("ADC2 Selected\n"); dev = &g_adcdev2; } else @@ -1292,7 +1292,7 @@ struct adc_dev_s *efm32_adcinitialize(int intf, const uint8_t *chanlist, int nch #ifdef CONFIG_EFM32_ADC3 if (intf == 3) { - avdbg("ADC3 Selected\n"); + ainfo("ADC3 Selected\n"); dev = &g_adcdev3; } else diff --git a/arch/arm/src/efm32/efm32_dma.c b/arch/arm/src/efm32/efm32_dma.c index a96bc160c0..c6c7af4e48 100644 --- a/arch/arm/src/efm32/efm32_dma.c +++ b/arch/arm/src/efm32/efm32_dma.c @@ -270,7 +270,7 @@ void weak_function up_dmainitialize(void) uint32_t regval; int i; - dmallvdbg("Initialize XDMAC0\n"); + dmallinfo("Initialize XDMAC0\n"); /* Initialize the channel list */ @@ -416,7 +416,7 @@ void efm32_dmafree(DMA_HANDLE handle) struct dma_channel_s *dmach = (struct dma_channel_s *)handle; DEBUGASSERT(dmach != NULL && dmach->inuse); - dmavdbg("DMA channel %d\n", dmach->chan); + dmainfo("DMA channel %d\n", dmach->chan); /* Disable the channel */ diff --git a/arch/arm/src/efm32/efm32_i2c.c b/arch/arm/src/efm32/efm32_i2c.c index 3f4638390e..de775d4dd4 100644 --- a/arch/arm/src/efm32/efm32_i2c.c +++ b/arch/arm/src/efm32/efm32_i2c.c @@ -138,10 +138,10 @@ #ifdef CONFIG_DEBUG_I2C # define i2cdbg dbg -# define i2cvdbg vdbg +# define i2cinfo info #else # define i2cdbg(x...) -# define i2cvdbg(x...) +# define i2cinfo(x...) #endif /* I2C event trace logic. NOTE: trace uses the internal, non-standard, @@ -605,7 +605,7 @@ static inline int efm32_i2c_sem_waitdone(FAR struct efm32_i2c_priv_s *priv) while (priv->result == I2CRESULT_INPROGRESS); - i2cvdbg("result: %s elapsed: %d threshold: %d i2c_state %s " + i2cinfo("result: %s elapsed: %d threshold: %d i2c_state %s " "I2Cx_STATES: %08x I2Cx_IF: %08x\n", efm32_i2c_result_str(priv->result), elapsed, timeout, efm32_i2c_state_str(priv->i2c_state), priv->i2c_reg_state, @@ -652,7 +652,7 @@ static inline int efm32_i2c_sem_waitdone(FAR struct efm32_i2c_priv_s *priv) while ((priv->result == I2CRESULT_INPROGRESS) && elapsed < timeout); - i2cvdbg("result: %s elapsed: %d threshold: %d i2c_state %s " + i2cinfo("result: %s elapsed: %d threshold: %d i2c_state %s " "I2Cx_STATES: %08x I2Cx_IF: %08x\n", efm32_i2c_result_str(priv->result), elapsed, timeout, efm32_i2c_state_str(priv->i2c_state), priv->i2c_reg_state, diff --git a/arch/arm/src/efm32/efm32_idle.c b/arch/arm/src/efm32/efm32_idle.c index 62d4e6315b..5d42299d70 100644 --- a/arch/arm/src/efm32/efm32_idle.c +++ b/arch/arm/src/efm32/efm32_idle.c @@ -110,7 +110,7 @@ static void up_idlepm(void) /* Perform board-specific, state-dependent logic here */ - llvdbg("newstate= %d oldstate=%d\n", newstate, oldstate); + llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); /* Then force the global state change */ diff --git a/arch/arm/src/efm32/efm32_pwm.c b/arch/arm/src/efm32/efm32_pwm.c index 175903511b..d0db8e6bde 100644 --- a/arch/arm/src/efm32/efm32_pwm.c +++ b/arch/arm/src/efm32/efm32_pwm.c @@ -85,19 +85,19 @@ # define pwmdbg dbg # define pwmlldbg lldbg # ifdef CONFIG_DEBUG_INFO -# define pwmvdbg vdbg -# define pwmllvdbg llvdbg +# define pwminfo info +# define pwmllinfo llinfo # define pwm_dumpgpio(p,m) efm32_dumpgpio(p,m) # else -# define pwmvdbg(x...) -# define pwmllvdbg(x...) +# define pwminfo(x...) +# define pwmllinfo(x...) # define pwm_dumpgpio(p,m) # endif #else # define pwmdbg(x...) # define pwmlldbg(x...) -# define pwmvdbg(x...) -# define pwmllvdbg(x...) +# define pwminfo(x...) +# define pwmllinfo(x...) # define pwm_dumpgpio(p,m) #endif @@ -329,23 +329,23 @@ static void pwm_dumpregs(struct efm32_pwmtimer_s *priv, FAR const char *msg) /* TODO debug pwm_dumpregs */ #if 0 - pwmvdbg("%s:\n", msg); - pwmvdbg(" CR1: %04x CR2: %04x SMCR: %04x DIER: %04x\n", + pwminfo("%s:\n", msg); + pwminfo(" CR1: %04x CR2: %04x SMCR: %04x DIER: %04x\n", pwm_getreg(priv, STM32_GTIM_CR1_OFFSET), pwm_getreg(priv, STM32_GTIM_CR2_OFFSET), pwm_getreg(priv, STM32_GTIM_SMCR_OFFSET), pwm_getreg(priv, STM32_GTIM_DIER_OFFSET)); - pwmvdbg(" SR: %04x EGR: %04x CCMR1: %04x CCMR2: %04x\n", + pwminfo(" SR: %04x EGR: %04x CCMR1: %04x CCMR2: %04x\n", pwm_getreg(priv, STM32_GTIM_SR_OFFSET), pwm_getreg(priv, STM32_GTIM_EGR_OFFSET), pwm_getreg(priv, STM32_GTIM_CCMR1_OFFSET), pwm_getreg(priv, STM32_GTIM_CCMR2_OFFSET)); - pwmvdbg(" CCER: %04x CNT: %04x PSC: %04x ARR: %04x\n", + pwminfo(" CCER: %04x CNT: %04x PSC: %04x ARR: %04x\n", pwm_getreg(priv, STM32_GTIM_CCER_OFFSET), pwm_getreg(priv, STM32_GTIM_CNT_OFFSET), pwm_getreg(priv, STM32_GTIM_PSC_OFFSET), pwm_getreg(priv, STM32_GTIM_ARR_OFFSET)); - pwmvdbg(" CCR1: %04x CCR2: %04x CCR3: %04x CCR4: %04x\n", + pwminfo(" CCR1: %04x CCR2: %04x CCR3: %04x CCR4: %04x\n", pwm_getreg(priv, STM32_GTIM_CCR1_OFFSET), pwm_getreg(priv, STM32_GTIM_CCR2_OFFSET), pwm_getreg(priv, STM32_GTIM_CCR3_OFFSET), @@ -353,7 +353,7 @@ static void pwm_dumpregs(struct efm32_pwmtimer_s *priv, FAR const char *msg) #if defined(CONFIG_STM32_TIM1_PWM) || defined(CONFIG_STM32_TIM8_PWM) if (priv->timtype == TIMTYPE_ADVANCED) { - pwmvdbg(" RCR: %04x BDTR: %04x DCR: %04x DMAR: %04x\n", + pwminfo(" RCR: %04x BDTR: %04x DCR: %04x DMAR: %04x\n", pwm_getreg(priv, STM32_ATIM_RCR_OFFSET), pwm_getreg(priv, STM32_ATIM_BDTR_OFFSET), pwm_getreg(priv, STM32_ATIM_DCR_OFFSET), @@ -362,7 +362,7 @@ static void pwm_dumpregs(struct efm32_pwmtimer_s *priv, FAR const char *msg) else #endif { - pwmvdbg(" DCR: %04x DMAR: %04x\n", + pwminfo(" DCR: %04x DMAR: %04x\n", pwm_getreg(priv, STM32_GTIM_DCR_OFFSET), pwm_getreg(priv, STM32_GTIM_DMAR_OFFSET)); } @@ -396,11 +396,11 @@ static int pwm_timer(FAR struct efm32_pwmtimer_s *priv, DEBUGASSERT(priv != NULL && info != NULL); #ifdef CONFIG_PWM_PULSECOUNT - pwmvdbg("TIMER%d channel: %d frequency: %d duty: %08x count: %d\n", + pwminfo("TIMER%d channel: %d frequency: %d duty: %08x count: %d\n", priv->timid, priv->channel, info->frequency, info->duty, info->count); #else - pwmvdbg("TIMER%d channel: %d frequency: %d duty: %08x\n", + pwminfo("TIMER%d channel: %d frequency: %d duty: %08x\n", priv->timid, priv->channel, info->frequency, info->duty); #endif DEBUGASSERT(info->frequency > 0 && info->duty >= 0 && @@ -541,7 +541,7 @@ static int pwm_interrupt(struct efm32_pwmtimer_s *priv) /* Now all of the time critical stuff is done so we can do some debug output */ - pwmllvdbg("Update interrupt SR: %04x prev: %d curr: %d count: %d\n", + pwmllinfo("Update interrupt SR: %04x prev: %d curr: %d count: %d\n", regval, priv->prev, priv->curr, priv->count); return OK; @@ -669,7 +669,7 @@ static int pwm_setup(FAR struct pwm_lowerhalf_s *dev) { FAR struct efm32_pwmtimer_s *priv = (FAR struct efm32_pwmtimer_s *)dev; - pwmvdbg("TIMER%d pincfg: %08x\n", priv->timid, priv->pincfg); + pwminfo("TIMER%d pincfg: %08x\n", priv->timid, priv->pincfg); pwm_dumpregs(priv, "Initially"); /* Configure the PWM output pin, but do not start the timer yet */ @@ -726,7 +726,7 @@ static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev) FAR struct efm32_pwmtimer_s *priv = (FAR struct efm32_pwmtimer_s *)dev; uint32_t pincfg; - pwmvdbg("TIMER%d pincfg: %08x\n", priv->timid, priv->pincfg); + pwminfo("TIMER%d pincfg: %08x\n", priv->timid, priv->pincfg); /* Make sure that the output has been stopped */ @@ -805,7 +805,7 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev) FAR struct efm32_pwmtimer_s *priv = (FAR struct efm32_pwmtimer_s *)dev; irqstate_t flags; - pwmvdbg("TIMER%d\n", priv->timid); + pwminfo("TIMER%d\n", priv->timid); /* Disable interrupts momentary to stop any ongoing timer processing and * to prevent any concurrent access to the reset register. @@ -848,7 +848,7 @@ static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg /* There are no platform-specific ioctl commands */ - pwmvdbg("TIMER%d\n", priv->timid); + pwminfo("TIMER%d\n", priv->timid); #endif return -ENOTTY; } @@ -878,7 +878,7 @@ FAR struct pwm_lowerhalf_s *efm32_pwminitialize(int timer) { FAR struct efm32_pwmtimer_s *lower; - pwmvdbg("TIMER%d\n", timer); + pwminfo("TIMER%d\n", timer); switch (timer) { diff --git a/arch/arm/src/efm32/efm32_rmu.h b/arch/arm/src/efm32/efm32_rmu.h index b6983a06a5..9d4dfb514e 100644 --- a/arch/arm/src/efm32/efm32_rmu.h +++ b/arch/arm/src/efm32/efm32_rmu.h @@ -58,13 +58,13 @@ #ifdef CONFIG_EFM32_RMU_DEBUG # define rmudbg lldbg # ifdef CONFIG_DEBUG_INFO -# define rmuvdbg lldbg +# define rmuinfo lldbg # else -# define rmuvdbg(x...) +# define rmuinfo(x...) # endif #else # define rmudbg(x...) -# define rmuvdbg(x...) +# define rmuinfo(x...) #endif /**************************************************************************** diff --git a/arch/arm/src/efm32/efm32_spi.c b/arch/arm/src/efm32/efm32_spi.c index ad2055d79f..7c48070e4a 100644 --- a/arch/arm/src/efm32/efm32_spi.c +++ b/arch/arm/src/efm32/efm32_spi.c @@ -102,13 +102,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /**************************************************************************** @@ -897,7 +897,7 @@ static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency) */ actual = (BOARD_HFPERCLK_FREQUENCY << 7) / (256 + clkdiv); - spivdbg("frequency=%u actual=%u\n", frequency, actual); + spiinfo("frequency=%u actual=%u\n", frequency, actual); /* Save the frequency selection so that subsequent reconfigurations * will be faster. @@ -932,7 +932,7 @@ static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode) uint32_t setting; uint32_t regval; - spivdbg("mode=%d\n", mode); + spiinfo("mode=%d\n", mode); DEBUGASSERT(priv && priv->config); config = priv->config; @@ -998,7 +998,7 @@ static void spi_setbits(struct spi_dev_s *dev, int nbits) uint32_t setting; bool lsbfirst; - spivdbg("nbits=%d\n", nbits); + spiinfo("nbits=%d\n", nbits); DEBUGASSERT(priv && priv->config); config = priv->config; @@ -1222,7 +1222,7 @@ static uint16_t spi_send(struct spi_dev_s *dev, uint16_t wd) spi_wait_status(config, _USART_STATUS_RXDATAV_MASK, USART_STATUS_RXDATAV); ret = (uint16_t)spi_getreg(config, EFM32_USART_RXDATA_OFFSET); - spivdbg("Sent: %04x Return: %04x \n", wd, ret); + spiinfo("Sent: %04x Return: %04x \n", wd, ret); return ret; } @@ -1263,7 +1263,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, DEBUGASSERT(priv && priv->config); config = priv->config; - spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); + spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); /* Flush any unread data */ @@ -1427,7 +1427,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, else #endif { - spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", + spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); /* Pre-calculate the timeout value */ @@ -1492,7 +1492,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, static void spi_sndblock(struct spi_dev_s *dev, const void *txbuffer, size_t nwords) { - spivdbg("txbuffer=%p nwords=%d\n", txbuffer, nwords); + spiinfo("txbuffer=%p nwords=%d\n", txbuffer, nwords); return spi_exchange(dev, txbuffer, NULL, nwords); } #endif @@ -1521,7 +1521,7 @@ static void spi_sndblock(struct spi_dev_s *dev, const void *txbuffer, static void spi_recvblock(struct spi_dev_s *dev, void *rxbuffer, size_t nwords) { - spivdbg("rxbuffer=%p nwords=%d\n", rxbuffer, nwords); + spiinfo("rxbuffer=%p nwords=%d\n", rxbuffer, nwords); return spi_exchange(dev, NULL, rxbuffer, nwords); } #endif diff --git a/arch/arm/src/efm32/efm32_timer.c b/arch/arm/src/efm32/efm32_timer.c index 1788723c6e..3e75e631ea 100644 --- a/arch/arm/src/efm32/efm32_timer.c +++ b/arch/arm/src/efm32/efm32_timer.c @@ -71,19 +71,19 @@ # define efm32_timerdbg dbg # define efm32_timerlldbg lldbg # ifdef CONFIG_DEBUG_INFO -# define efm32_timervdbg vdbg -# define efm32_timerllvdbg llvdbg +# 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_timerllvdbg(x...) +# define efm32_timerllinfo(x...) # define efm32_timer_dumpgpio(p,m) # endif #else # define efm32_timerdbg(x...) # define efm32_timerlldbg(x...) -# define efm32_timervdbg(x...) -# define efm32_timerllvdbg(x...) +# define efm32_timerinfo(x...) +# define efm32_timerllinfo(x...) # define efm32_timer_dumpgpio(p,m) #endif @@ -121,14 +121,14 @@ void efm32_timer_dumpregs(uintptr_t base, FAR const char *msg) { int i; - efm32_timervdbg("%s:\n", msg); - efm32_timervdbg(" CTRL: %04x STATUS: %04x IEN: %04x IF: %04x\n", + efm32_timerinfo("%s:\n", msg); + efm32_timerinfo(" CTRL: %04x STATUS: %04x IEN: %04x IF: %04x\n", getreg32(base + EFM32_TIMER_CTRL_OFFSET ), getreg32(base + EFM32_TIMER_STATUS_OFFSET ), getreg32(base + EFM32_TIMER_IEN_OFFSET ), getreg32(base + EFM32_TIMER_IF_OFFSET ) ); - efm32_timervdbg(" TOP: %04x TOPB: %04x CNT: %04x ROUTE: %04x\n", + efm32_timerinfo(" TOP: %04x TOPB: %04x CNT: %04x ROUTE: %04x\n", getreg32(base + EFM32_TIMER_TOP_OFFSET ), getreg32(base + EFM32_TIMER_TOPB_OFFSET ), getreg32(base + EFM32_TIMER_CNT_OFFSET ), @@ -140,7 +140,7 @@ void efm32_timer_dumpregs(uintptr_t base, FAR const char *msg) #if defined(CONFIG_DEBUG_TIMER) && defined(CONFIG_DEBUG_INFO) uintptr_t base_cc = base + EFM32_TIMER_CC_OFFSET(i); #endif - efm32_timervdbg("CC%d => CTRL: %04x CCV: %04x CCVP: %04x CCVB: %04x\n", + efm32_timerinfo("CC%d => CTRL: %04x CCV: %04x CCVP: %04x CCVB: %04x\n", i getreg32(base_cc + EFM32_TIMER_CC_CTRL_OFFSET ), getreg32(base_cc + EFM32_TIMER_CC_CCV_OFFSET ), @@ -149,13 +149,13 @@ void efm32_timer_dumpregs(uintptr_t base, FAR const char *msg) ); } - efm32_timervdbg("DTCTRL: %04x DTTIME: %04x DTFC: %04x DTOGEN: %04x\n", + efm32_timerinfo("DTCTRL: %04x DTTIME: %04x DTFC: %04x DTOGEN: %04x\n", getreg32(base + EFM32_TIMER_CTRL_OFFSET ), getreg32(base + EFM32_TIMER_STATUS_OFFSET ), getreg32(base + EFM32_TIMER_IEN_OFFSET ), getreg32(base + EFM32_TIMER_IF_OFFSET ) ); - efm32_timervdbg("DTFAULT: %04x DTFAULTC: %04x DTLOCK: %04x \n", + efm32_timerinfo("DTFAULT: %04x DTFAULTC: %04x DTLOCK: %04x \n", getreg32(base + EFM32_TIMER_CTRL_OFFSET ), getreg32(base + EFM32_TIMER_STATUS_OFFSET ), getreg32(base + EFM32_TIMER_IEN_OFFSET ), diff --git a/arch/arm/src/efm32/efm32_usbdev.c b/arch/arm/src/efm32/efm32_usbdev.c index fb20993657..bffcadbf93 100644 --- a/arch/arm/src/efm32/efm32_usbdev.c +++ b/arch/arm/src/efm32/efm32_usbdev.c @@ -1220,7 +1220,7 @@ static void efm32_epin_request(FAR struct efm32_usbdev_s *priv, return; } - ullvdbg("EP%d req=%p: len=%d xfrd=%d zlp=%d\n", + ullinfo("EP%d req=%p: len=%d xfrd=%d zlp=%d\n", privep->epphy, privreq, privreq->req.len, privreq->req.xfrd, privep->zlp); @@ -1486,7 +1486,7 @@ static void efm32_epout_complete(FAR struct efm32_usbdev_s *priv, return; } - ullvdbg("EP%d: len=%d xfrd=%d\n", + ullinfo("EP%d: len=%d xfrd=%d\n", privep->epphy, privreq->req.len, privreq->req.xfrd); /* Return the completed read request to the class driver and mark the state @@ -1521,7 +1521,7 @@ static inline void efm32_ep0out_receive(FAR struct efm32_ep_s *privep, int bcnt) DEBUGASSERT(privep && privep->ep.priv); priv = (FAR struct efm32_usbdev_s *)privep->ep.priv; - ullvdbg("EP0: bcnt=%d\n", bcnt); + ullinfo("EP0: bcnt=%d\n", bcnt); usbtrace(TRACE_READ(EP0), bcnt); /* Verify that an OUT SETUP request as received before this data was @@ -1614,7 +1614,7 @@ static inline void efm32_epout_receive(FAR struct efm32_ep_s *privep, int bcnt) return; } - ullvdbg("EP%d: len=%d xfrd=%d\n", privep->epphy, privreq->req.len, privreq->req.xfrd); + ullinfo("EP%d: len=%d xfrd=%d\n", privep->epphy, privreq->req.len, privreq->req.xfrd); usbtrace(TRACE_READ(privep->epphy), bcnt); /* Get the number of bytes to transfer from the RxFIFO */ @@ -1698,7 +1698,7 @@ static void efm32_epout_request(FAR struct efm32_usbdev_s *priv, return; } - ullvdbg("EP%d: len=%d\n", privep->epphy, privreq->req.len); + ullinfo("EP%d: len=%d\n", privep->epphy, privreq->req.len); /* Ignore any attempt to receive a zero length packet (this really * should not happen. @@ -2494,7 +2494,7 @@ static inline void efm32_ep0out_setup(struct efm32_usbdev_s *priv) ctrlreq.index = GETUINT16(priv->ctrlreq.index); ctrlreq.len = GETUINT16(priv->ctrlreq.len); - ullvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n", + ullinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n", ctrlreq.type, ctrlreq.req, ctrlreq.value, ctrlreq.index, ctrlreq.len); /* Check for a standard request */ @@ -4333,7 +4333,7 @@ static int efm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s * if (!req || !req->callback || !req->buf || !ep) { usbtrace(TRACE_DEVERROR(EFM32_TRACEERR_INVALIDPARMS), 0); - ullvdbg("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); + ullinfo("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); return -EINVAL; } #endif diff --git a/arch/arm/src/efm32/efm32_usbhost.c b/arch/arm/src/efm32/efm32_usbhost.c index cc9fe1c7d8..9f4c926cbe 100644 --- a/arch/arm/src/efm32/efm32_usbhost.c +++ b/arch/arm/src/efm32/efm32_usbhost.c @@ -2016,7 +2016,7 @@ static void efm32_in_next(FAR struct efm32_usbhost_s *priv, /* The transfer is complete, with or without an error */ - uvdbg("Transfer complete: %d\n", result); + uinfo("Transfer complete: %d\n", result); /* Extract the callback information */ @@ -2302,7 +2302,7 @@ static void efm32_out_next(FAR struct efm32_usbhost_s *priv, /* The transfer is complete, with or without an error */ - uvdbg("Transfer complete: %d\n", result); + uinfo("Transfer complete: %d\n", result); /* Extract the callback information */ @@ -2448,7 +2448,7 @@ static inline void efm32_gint_hcinisr(FAR struct efm32_usbhost_s *priv, /* AND the two to get the set of enabled, pending HC interrupts */ pending &= regval; - ullvdbg("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending); + ullinfo("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending); /* Check for a pending ACK response received/transmitted (ACK) interrupt */ @@ -2709,7 +2709,7 @@ static inline void efm32_gint_hcoutisr(FAR struct efm32_usbhost_s *priv, /* AND the two to get the set of enabled, pending HC interrupts */ pending &= regval; - ullvdbg("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending); + ullinfo("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending); /* Check for a pending ACK response received/transmitted (ACK) interrupt */ @@ -3012,7 +3012,7 @@ static inline void efm32_gint_rxflvlisr(FAR struct efm32_usbhost_s *priv) /* Read and pop the next status from the Rx FIFO */ grxsts = efm32_getreg(EFM32_USB_GRXSTSP); - ullvdbg("GRXSTS: %08x\n", grxsts); + ullinfo("GRXSTS: %08x\n", grxsts); /* Isolate the channel number/index in the status word */ @@ -3166,7 +3166,7 @@ static inline void efm32_gint_nptxfeisr(FAR struct efm32_usbhost_s *priv) /* Write the next group of packets into the Tx FIFO */ - ullvdbg("HNPTXSTS: %08x chidx: %d avail: %d buflen: %d xfrd: %d wrsize: %d\n", + ullinfo("HNPTXSTS: %08x chidx: %d avail: %d buflen: %d xfrd: %d wrsize: %d\n", regval, chidx, avail, chan->buflen, chan->xfrd, wrsize); efm32_gint_wrpacket(priv, chan->buffer, chidx, wrsize); @@ -3254,7 +3254,7 @@ static inline void efm32_gint_ptxfeisr(FAR struct efm32_usbhost_s *priv) /* Write the next group of packets into the Tx FIFO */ - ullvdbg("HPTXSTS: %08x chidx: %d avail: %d buflen: %d xfrd: %d wrsize: %d\n", + ullinfo("HPTXSTS: %08x chidx: %d avail: %d buflen: %d xfrd: %d wrsize: %d\n", regval, chidx, avail, chan->buflen, chan->xfrd, wrsize); efm32_gint_wrpacket(priv, chan->buffer, chidx, wrsize); @@ -3827,7 +3827,7 @@ static int efm32_wait(FAR struct usbhost_connection_s *conn, *hport = connport; leave_critical_section(flags); - uvdbg("RHport Connected: %s\n", connport->connected ? "YES" : "NO"); + uinfo("RHport Connected: %s\n", connport->connected ? "YES" : "NO"); return OK; } @@ -3844,7 +3844,7 @@ static int efm32_wait(FAR struct usbhost_connection_s *conn, *hport = connport; leave_critical_section(flags); - uvdbg("Hub port Connected: %s\n", connport->connected ? "YES" : "NO"); + uinfo("Hub port Connected: %s\n", connport->connected ? "YES" : "NO"); return OK; } #endif @@ -3964,7 +3964,7 @@ static int efm32_enumerate(FAR struct usbhost_connection_s *conn, /* Then let the common usbhost_enumerate do the real enumeration. */ - uvdbg("Enumerate the device\n"); + uinfo("Enumerate the device\n"); priv->smstate = SMSTATE_ENUM; ret = usbhost_enumerate(hport, &hport->devclass); @@ -4380,7 +4380,7 @@ static int efm32_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, DEBUGASSERT(priv != NULL && ep0info != NULL && req != NULL); usbhost_vtrace2(USBHOST_VTRACE2_CTRLIN, req->type, req->req); - uvdbg("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n", + uinfo("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n", req->type, req->req, req->value[1], req->value[0], req->index[1], req->index[0], req->len[1], req->len[0]); @@ -4465,7 +4465,7 @@ static int efm32_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, DEBUGASSERT(priv != NULL && ep0info != NULL && req != NULL); usbhost_vtrace2(USBHOST_VTRACE2_CTRLOUT, req->type, req->req); - uvdbg("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n", + uinfo("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n", req->type, req->req, req->value[1], req->value[0], req->index[1], req->index[0], req->len[1], req->len[0]); @@ -4583,7 +4583,7 @@ static ssize_t efm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep unsigned int chidx = (unsigned int)ep; ssize_t nbytes; - uvdbg("chidx: %d buflen: %d\n", (unsigned int)ep, buflen); + uinfo("chidx: %d buflen: %d\n", (unsigned int)ep, buflen); DEBUGASSERT(priv && buffer && chidx < EFM32_MAX_TX_FIFOS && buflen > 0); @@ -4650,7 +4650,7 @@ static int efm32_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, unsigned int chidx = (unsigned int)ep; int ret; - uvdbg("chidx: %d buflen: %d\n", (unsigned int)ep, buflen); + uinfo("chidx: %d buflen: %d\n", (unsigned int)ep, buflen); DEBUGASSERT(priv && buffer && chidx < EFM32_MAX_TX_FIFOS && buflen > 0); @@ -4700,7 +4700,7 @@ static int efm32_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) unsigned int chidx = (unsigned int)ep; irqstate_t flags; - uvdbg("chidx: %u: %d\n", chidx); + uinfo("chidx: %u: %d\n", chidx); DEBUGASSERT(priv && chidx < EFM32_MAX_TX_FIFOS); chan = &priv->chan[chidx]; @@ -4795,7 +4795,7 @@ static int efm32_connect(FAR struct usbhost_driver_s *drvr, /* Set the connected/disconnected flag */ hport->connected = connected; - ullvdbg("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO"); + ullinfo("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO"); /* Report the connection event */ diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c index 0a05346055..3328587c1c 100644 --- a/arch/arm/src/kinetis/kinetis_enet.c +++ b/arch/arm/src/kinetis/kinetis_enet.c @@ -557,7 +557,7 @@ static void kinetis_receive(FAR struct kinetis_driver_s *priv) #ifdef CONFIG_NET_IPv4 if (BUF->type == HTONS(ETHTYPE_IP)) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); NETDEV_RXIPV4(&priv->dev); /* Handle ARP on input then give the IPv4 packet to the network @@ -598,7 +598,7 @@ static void kinetis_receive(FAR struct kinetis_driver_s *priv) #ifdef CONFIG_NET_IPv6 if (BUF->type == HTONS(ETHTYPE_IP6)) { - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); NETDEV_RXIPV6(&priv->dev); /* Give the IPv6 packet to the network layer */ diff --git a/arch/arm/src/kinetis/kinetis_pwm.c b/arch/arm/src/kinetis/kinetis_pwm.c index 1091b88b28..6d8f223591 100644 --- a/arch/arm/src/kinetis/kinetis_pwm.c +++ b/arch/arm/src/kinetis/kinetis_pwm.c @@ -86,19 +86,19 @@ # define pwmdbg dbg # define pwmlldbg lldbg # ifdef CONFIG_DEBUG_INFO -# define pwmvdbg vdbg -# define pwmllvdbg llvdbg +# define pwminfo info +# define pwmllinfo llinfo # define pwm_dumpgpio(p,m) kinetis_pindump(p,m) # else # define pwmlldbg(x...) -# define pwmllvdbg(x...) +# define pwmllinfo(x...) # define pwm_dumpgpio(p,m) # endif #else # define pwmdbg(x...) # define pwmlldbg(x...) -# define pwmvdbg(x...) -# define pwmllvdbg(x...) +# define pwminfo(x...) +# define pwmllinfo(x...) # define pwm_dumpgpio(p,m) #endif @@ -265,25 +265,25 @@ static void pwm_dumpregs(struct kinetis_pwmtimer_s *priv, FAR const char *msg) { int nchannels = (priv->tpmid == 0) ? 8 : 2; - pwmvdbg("%s:\n", msg); - pwmvdbg(" FTM%d_SC: %04x FTM%d_CNT: %04x FTM%d_MOD: %04x\n", + pwminfo("%s:\n", msg); + pwminfo(" FTM%d_SC: %04x FTM%d_CNT: %04x FTM%d_MOD: %04x\n", priv->tpmid, pwm_getreg(priv, KINETIS_FTM_SC_OFFSET), priv->tpmid, pwm_getreg(priv, KINETIS_FTM_CNT_OFFSET), priv->tpmid, pwm_getreg(priv, KINETIS_FTM_MOD_OFFSET)); - pwmvdbg(" FTM%d_STATUS: %04x FTM%d_CONF: %04x\n", + pwminfo(" FTM%d_STATUS: %04x FTM%d_CONF: %04x\n", priv->tpmid, pwm_getreg(priv, KINETIS_FTM_STATUS_OFFSET), priv->tpmid, pwm_getreg(priv, KINETIS_FTM_CONF_OFFSET)); - pwmvdbg(" FTM%d_C0SC: %04x FTM%d_C0V: %04x\n", + pwminfo(" FTM%d_C0SC: %04x FTM%d_C0V: %04x\n", priv->tpmid, pwm_getreg(priv, KINETIS_FTM_C0SC_OFFSET), priv->tpmid, pwm_getreg(priv, KINETIS_FTM_C0V_OFFSET)); - pwmvdbg(" FTM%d_C1SC: %04x FTM%d_C1V: %04x\n", + pwminfo(" FTM%d_C1SC: %04x FTM%d_C1V: %04x\n", priv->tpmid, pwm_getreg(priv, KINETIS_FTM_C1SC_OFFSET), priv->tpmid, @@ -291,7 +291,7 @@ static void pwm_dumpregs(struct kinetis_pwmtimer_s *priv, FAR const char *msg) if (nchannels >= 3) { - pwmvdbg(" FTM%d_C2SC: %04x FTM%d_C2V: %04x\n", + pwminfo(" FTM%d_C2SC: %04x FTM%d_C2V: %04x\n", priv->tpmid, pwm_getreg(priv, KINETIS_FTM_C2SC_OFFSET), priv->tpmid, @@ -300,7 +300,7 @@ static void pwm_dumpregs(struct kinetis_pwmtimer_s *priv, FAR const char *msg) if (nchannels >= 4) { - pwmvdbg(" FTM%d_C3SC: %04x FTM%d_C3V: %04x\n", + pwminfo(" FTM%d_C3SC: %04x FTM%d_C3V: %04x\n", priv->tpmid, pwm_getreg(priv, KINETIS_FTM_C3SC_OFFSET), priv->tpmid, @@ -309,7 +309,7 @@ static void pwm_dumpregs(struct kinetis_pwmtimer_s *priv, FAR const char *msg) if (nchannels >= 5) { - pwmvdbg(" FTM%d_C4SC: %04x FTM%d_C4V: %04x\n", + pwminfo(" FTM%d_C4SC: %04x FTM%d_C4V: %04x\n", priv->tpmid, pwm_getreg(priv, KINETIS_FTM_C4SC_OFFSET), priv->tpmid, @@ -318,7 +318,7 @@ static void pwm_dumpregs(struct kinetis_pwmtimer_s *priv, FAR const char *msg) if (nchannels >= 6) { - pwmvdbg(" FTM%d_C5SC: %04x FTM%d_C5V: %04x\n", + pwminfo(" FTM%d_C5SC: %04x FTM%d_C5V: %04x\n", priv->tpmid, pwm_getreg(priv, KINETIS_FTM_C5SC_OFFSET), priv->tpmid, @@ -326,7 +326,7 @@ static void pwm_dumpregs(struct kinetis_pwmtimer_s *priv, FAR const char *msg) } if (nchannels >= 7) { - pwmvdbg(" FTM%d_C6SC: %04x FTM%d_C6V: %04x\n", + pwminfo(" FTM%d_C6SC: %04x FTM%d_C6V: %04x\n", priv->tpmid, pwm_getreg(priv, KINETIS_FTM_C6SC_OFFSET), priv->tpmid, @@ -334,7 +334,7 @@ static void pwm_dumpregs(struct kinetis_pwmtimer_s *priv, FAR const char *msg) } if (nchannels >= 8) { - pwmvdbg(" FTM%d_C7SC: %04x FTM%d_C7V: %04x\n", + pwminfo(" FTM%d_C7SC: %04x FTM%d_C7V: %04x\n", priv->tpmid, pwm_getreg(priv, KINETIS_FTM_C7SC_OFFSET), priv->tpmid, @@ -376,7 +376,7 @@ static int pwm_timer(FAR struct kinetis_pwmtimer_s *priv, DEBUGASSERT(priv != NULL && info != NULL); - pwmvdbg("FTM%d channel: %d frequency: %d duty: %08x\n", + pwminfo("FTM%d channel: %d frequency: %d duty: %08x\n", priv->tpmid, priv->channel, info->frequency, info->duty); DEBUGASSERT(info->frequency > 0 && info->duty > 0 && @@ -446,7 +446,7 @@ static int pwm_timer(FAR struct kinetis_pwmtimer_s *priv, cv = b16toi(info->duty * modulo + b16HALF); - pwmvdbg("FTM%d PCLK: %d frequency: %d FTMCLK: %d prescaler: %d modulo: %d c0v: %d\n", + pwminfo("FTM%d PCLK: %d frequency: %d FTMCLK: %d prescaler: %d modulo: %d c0v: %d\n", priv->tpmid, priv->pclk, info->frequency, tpmclk, presc_values[prescaler], modulo, cv); @@ -570,7 +570,7 @@ static int pwm_setup(FAR struct pwm_lowerhalf_s *dev) regval |= SIM_SCGC3_FTM2; putreg32(regval, KINETIS_SIM_SCGC3); - pwmvdbg("FTM%d pincfg: %08x\n", priv->tpmid, priv->pincfg); + pwminfo("FTM%d pincfg: %08x\n", priv->tpmid, priv->pincfg); pwm_dumpregs(priv, "Initially"); /* Configure the PWM output pin, but do not start the timer yet */ @@ -601,7 +601,7 @@ static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev) FAR struct kinetis_pwmtimer_s *priv = (FAR struct kinetis_pwmtimer_s *)dev; uint32_t pincfg; - pwmvdbg("FTM%d pincfg: %08x\n", priv->tpmid, priv->pincfg); + pwminfo("FTM%d pincfg: %08x\n", priv->tpmid, priv->pincfg); /* Make sure that the output has been stopped */ @@ -661,7 +661,7 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev) FAR struct kinetis_pwmtimer_s *priv = (FAR struct kinetis_pwmtimer_s *)dev; irqstate_t flags; - pwmvdbg("FTM%d\n", priv->tpmid); + pwminfo("FTM%d\n", priv->tpmid); /* Disable interrupts momentary to stop any ongoing timer processing and * to prevent any concurrent access to the reset register. @@ -744,7 +744,7 @@ static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg /* There are no platform-specific ioctl commands */ - pwmvdbg("FTM%d\n", priv->tpmid); + pwminfo("FTM%d\n", priv->tpmid); #endif return -ENOTTY; } @@ -772,7 +772,7 @@ FAR struct pwm_lowerhalf_s *kinetis_pwminitialize(int timer) { FAR struct kinetis_pwmtimer_s *lower; - pwmvdbg("FTM%d\n", timer); + pwminfo("FTM%d\n", timer); switch (timer) { diff --git a/arch/arm/src/kinetis/kinetis_sdhc.c b/arch/arm/src/kinetis/kinetis_sdhc.c index 72754437ea..d385592b40 100644 --- a/arch/arm/src/kinetis/kinetis_sdhc.c +++ b/arch/arm/src/kinetis/kinetis_sdhc.c @@ -791,7 +791,7 @@ static void kinetis_transmit(struct kinetis_dev_s *priv) * ready (BWR) */ - fllvdbg("Entry: remaining: %d IRQSTAT: %08x\n", + fllinfo("Entry: remaining: %d IRQSTAT: %08x\n", priv->remaining, getreg32(KINETIS_SDHC_IRQSTAT)); while (priv->remaining > 0 && @@ -837,7 +837,7 @@ static void kinetis_transmit(struct kinetis_dev_s *priv) putreg32(data.w, KINETIS_SDHC_DATPORT); } - fllvdbg("Exit: remaining: %d IRQSTAT: %08x\n", + fllinfo("Exit: remaining: %d IRQSTAT: %08x\n", priv->remaining, getreg32(KINETIS_SDHC_IRQSTAT)); } @@ -877,7 +877,7 @@ static void kinetis_receive(struct kinetis_dev_s *priv) * ready (BRR) */ - fllvdbg("Entry: remaining: %d IRQSTAT: %08x\n", + fllinfo("Entry: remaining: %d IRQSTAT: %08x\n", priv->remaining, getreg32(KINETIS_SDHC_IRQSTAT)); while (priv->remaining > 0 && @@ -929,7 +929,7 @@ static void kinetis_receive(struct kinetis_dev_s *priv) putreg32(watermark << SDHC_WML_RD_SHIFT, KINETIS_SDHC_WML); - fllvdbg("Exit: remaining: %d IRQSTAT: %08x WML: %08x\n", + fllinfo("Exit: remaining: %d IRQSTAT: %08x WML: %08x\n", priv->remaining, getreg32(KINETIS_SDHC_IRQSTAT), getreg32(KINETIS_SDHC_WML)); @@ -1105,7 +1105,7 @@ static int kinetis_interrupt(int irq, void *context) regval = getreg32(KINETIS_SDHC_IRQSIGEN); enabled = getreg32(KINETIS_SDHC_IRQSTAT) & regval; - fllvdbg("IRQSTAT: %08x IRQSIGEN %08x enabled: %08x\n", + fllinfo("IRQSTAT: %08x IRQSIGEN %08x enabled: %08x\n", getreg32(KINETIS_SDHC_IRQSTAT), regval, enabled); /* Disable card interrupts to clear the card interrupt to the host system. */ @@ -1289,7 +1289,7 @@ static void kinetis_reset(FAR struct sdio_dev_s *dev) putreg32(SDHC_INT_ALL, KINETIS_SDHC_IRQSTATEN); - fvdbg("SYSCTL: %08x PRSSTAT: %08x IRQSTATEN: %08x\n", + finfo("SYSCTL: %08x PRSSTAT: %08x IRQSTATEN: %08x\n", getreg32(KINETIS_SDHC_SYSCTL), getreg32(KINETIS_SDHC_PRSSTAT), getreg32(KINETIS_SDHC_IRQSTATEN)); @@ -1504,7 +1504,7 @@ static void kinetis_frequency(FAR struct sdio_dev_s *dev, uint32_t frequency) regval |= (SDHC_SYSCTL_SDCLKEN | SDHC_SYSCTL_PEREN | SDHC_SYSCTL_HCKEN | SDHC_SYSCTL_IPGEN); putreg32(regval, KINETIS_SDHC_SYSCTL); - fvdbg("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL)); + finfo("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL)); } #endif @@ -1538,7 +1538,7 @@ static void kinetis_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate) regval = getreg32(KINETIS_SDHC_SYSCTL); regval &= ~SDHC_SYSCTL_SDCLKEN; putreg32(regval, KINETIS_SDHC_SYSCTL); - fvdbg("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL)); + finfo("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL)); switch (rate) { @@ -1552,7 +1552,7 @@ static void kinetis_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate) regval &= ~(SDHC_SYSCTL_IPGEN | SDHC_SYSCTL_HCKEN | SDHC_SYSCTL_PEREN | SDHC_SYSCTL_SDCLKFS_MASK | SDHC_SYSCTL_DVS_MASK); putreg32(regval, KINETIS_SDHC_SYSCTL); - fvdbg("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL)); + finfo("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL)); return; } @@ -1593,7 +1593,7 @@ static void kinetis_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate) regval = getreg32(KINETIS_SDHC_SYSCTL); regval &= ~SDHC_SYSCTL_SDCLKEN; putreg32(regval, KINETIS_SDHC_SYSCTL); - fvdbg("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL)); + finfo("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL)); /* Clear the old prescaler and divisor values so that new ones can be ORed * in. @@ -1619,7 +1619,7 @@ static void kinetis_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate) regval &= ~(SDHC_SYSCTL_IPGEN | SDHC_SYSCTL_HCKEN | SDHC_SYSCTL_PEREN); putreg32(regval, KINETIS_SDHC_SYSCTL); - fvdbg("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL)); + finfo("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL)); return; } @@ -1653,7 +1653,7 @@ static void kinetis_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate) } putreg32(regval, KINETIS_SDHC_SYSCTL); - fvdbg("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL)); + finfo("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL)); } #endif @@ -1824,7 +1824,7 @@ static int kinetis_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t ar /* Other bits? What about CMDTYP? */ - fvdbg("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval); + finfo("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval); /* The Command Inhibit (CIHB) bit is set in the PRSSTAT bit immediately * after the transfer type register is written. This bit is cleared when @@ -2486,7 +2486,7 @@ static void kinetis_callbackenable(FAR struct sdio_dev_s *dev, { struct kinetis_dev_s *priv = (struct kinetis_dev_s *)dev; - fvdbg("eventset: %02x\n", eventset); + finfo("eventset: %02x\n", eventset); DEBUGASSERT(priv != NULL); priv->cbevents = eventset; @@ -2522,7 +2522,7 @@ static int kinetis_registercallback(FAR struct sdio_dev_s *dev, /* Disable callbacks and register this callback and is argument */ - fvdbg("Register %p(%p)\n", callback, arg); + finfo("Register %p(%p)\n", callback, arg); DEBUGASSERT(priv != NULL); priv->cbevents = 0; @@ -2694,7 +2694,7 @@ static void kinetis_callback(void *arg) /* Is a callback registered? */ DEBUGASSERT(priv != NULL); - fvdbg("Callback %p(%p) cbevents: %02x cdstatus: %02x\n", + finfo("Callback %p(%p) cbevents: %02x cdstatus: %02x\n", priv->callback, priv->cbarg, priv->cbevents, priv->cdstatus); if (priv->callback) @@ -2739,14 +2739,14 @@ static void kinetis_callback(void *arg) { /* Yes.. queue it */ - fvdbg("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); + finfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); (void)work_queue(HPWORK, &priv->cbwork, (worker_t)priv->callback, priv->cbarg, 0); } else { /* No.. then just call the callback here */ - fvdbg("Callback to %p(%p)\n", priv->callback, priv->cbarg); + finfo("Callback to %p(%p)\n", priv->callback, priv->cbarg); priv->callback(priv->cbarg); } } @@ -2792,7 +2792,7 @@ FAR struct sdio_dev_s *sdhc_initialize(int slotno) regval = getreg32(KINETIS_SIM_SCGC3); regval |= SIM_SCGC3_SDHC; putreg32(regval, KINETIS_SIM_SCGC3); - fvdbg("SIM_SCGC3: %08x\n", regval); + finfo("SIM_SCGC3: %08x\n", regval); /* In addition to the system clock, the SDHC module needs a clock for the * base for the external card clock. There are four possible sources for @@ -2808,7 +2808,7 @@ FAR struct sdio_dev_s *sdhc_initialize(int slotno) regval &= ~SIM_SOPT2_SDHCSRC_MASK; regval |= SIM_SOPT2_SDHCSRC_CORE; putreg32(regval, KINETIS_SIM_SOPT2); - fvdbg("SIM_SOPT2: %08x\n", regval); + finfo("SIM_SOPT2: %08x\n", regval); /* Configure pins for 1 or 4-bit, wide-bus operation (the chip is capable * of 8-bit wide bus operation but D4-D7 are not configured). @@ -2892,7 +2892,7 @@ void sdhc_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot) priv->cdstatus &= ~SDIO_STATUS_PRESENT; } - fvdbg("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus); + finfo("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus); /* Perform any requested callback if the status has changed */ @@ -2937,7 +2937,7 @@ void sdhc_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect) priv->cdstatus &= ~SDIO_STATUS_WRPROTECTED; } - fvdbg("cdstatus: %02x\n", priv->cdstatus); + finfo("cdstatus: %02x\n", priv->cdstatus); leave_critical_section(flags); } #endif /* CONFIG_KINETIS_SDHC */ diff --git a/arch/arm/src/kinetis/kinetis_usbdev.c b/arch/arm/src/kinetis/kinetis_usbdev.c index 936ea7192f..fdb76f455c 100644 --- a/arch/arm/src/kinetis/kinetis_usbdev.c +++ b/arch/arm/src/kinetis/kinetis_usbdev.c @@ -371,9 +371,9 @@ const struct trace_msg_t g_usb_trace_strings_deverror[] = # define regdbg lldbg # ifdef CONFIG_DEBUG_INFO -# define regvdbg lldbg +# define reginfo lldbg # else -# define regvdbg(x...) +# define reginfo(x...) # endif #else @@ -381,7 +381,7 @@ const struct trace_msg_t g_usb_trace_strings_deverror[] = # define khci_getreg(addr) getreg8(addr) # define khci_putreg(val,addr) putreg8(val,addr) # define regdbg(x...) -# define regvdbg(x...) +# define reginfo(x...) #endif @@ -391,15 +391,15 @@ const struct trace_msg_t g_usb_trace_strings_deverror[] = # define bdtdbg lldbg # ifdef CONFIG_DEBUG_INFO -# define bdtvdbg lldbg +# define bdtinfo lldbg # else -# define bdtvdbg(x...) +# define bdtinfo(x...) # endif #else # define bdtdbg(x...) -# define bdtvdbg(x...) +# define bdtinfo(x...) #endif @@ -987,10 +987,10 @@ static void khci_wrcomplete(struct khci_usbdev_s *priv, epno = USB_EPNO(privep->ep.eplog); #ifdef CONFIG_USBDEV_NOWRITEAHEAD - ullvdbg("EP%d: len=%d xfrd=%d inflight=%d\n", + ullinfo("EP%d: len=%d xfrd=%d inflight=%d\n", epno, privreq->req.len, privreq->req.xfrd, privreq->inflight[0]); #else - ullvdbg("EP%d: len=%d xfrd=%d inflight={%d, %d}\n", + ullinfo("EP%d: len=%d xfrd=%d inflight={%d, %d}\n", epno, privreq->req.len, privreq->req.xfrd, privreq->inflight[0], privreq->inflight[1]); #endif @@ -1303,7 +1303,7 @@ static int khci_wrstart(struct khci_usbdev_s *priv, bytesleft = privreq->req.len; } - ullvdbg("epno=%d req=%p: len=%d xfrd=%d index=%d nullpkt=%d\n", + ullinfo("epno=%d req=%p: len=%d xfrd=%d index=%d nullpkt=%d\n", epno, privreq, privreq->req.len, xfrd, index, privep->txnullpkt); /* Get the number of bytes left to be sent in the packet */ @@ -1417,7 +1417,7 @@ static int khci_rdcomplete(struct khci_usbdev_s *priv, bdtout = privep->bdtout; epno = USB_EPNO(privep->ep.eplog); - ullvdbg("EP%d: len=%d xfrd=%d\n", + ullinfo("EP%d: len=%d xfrd=%d\n", epno, privreq->req.len, privreq->req.xfrd); bdtdbg("EP%d BDT OUT [%p] {%08x, %08x}\n", epno, bdtout, bdtout->status, bdtout->addr); @@ -1705,7 +1705,7 @@ static int khci_rdrequest(struct khci_usbdev_s *priv, return OK; } - ullvdbg("EP%d: len=%d\n", USB_EPNO(privep->ep.eplog), privreq->req.len); + ullinfo("EP%d: len=%d\n", USB_EPNO(privep->ep.eplog), privreq->req.len); /* Ignore any attempt to receive a zero length packet */ @@ -1995,7 +1995,7 @@ static void khci_ep0setup(struct khci_usbdev_s *priv) index.w = GETUINT16(priv->ctrl.index); len.w = GETUINT16(priv->ctrl.len); - ullvdbg("SETUP: type=%02x req=%02x value=%04x index=%04x len=%04x\n", + ullinfo("SETUP: type=%02x req=%02x value=%04x index=%04x len=%04x\n", priv->ctrl.type, priv->ctrl.req, value.w, index.w, len.w); /* Dispatch any non-standard requests */ @@ -2239,7 +2239,7 @@ static void khci_ep0setup(struct khci_usbdev_s *priv) { /* Special case recipient=device test mode */ - ullvdbg("test mode: %d\n", index.w); + ullinfo("test mode: %d\n", index.w); } else { diff --git a/arch/arm/src/kl/kl_idle.c b/arch/arm/src/kl/kl_idle.c index e711b39e3c..b8a51b04da 100644 --- a/arch/arm/src/kl/kl_idle.c +++ b/arch/arm/src/kl/kl_idle.c @@ -103,7 +103,7 @@ static void up_idlepm(void) /* Perform board-specific, state-dependent logic here */ - llvdbg("newstate= %d oldstate=%d\n", newstate, oldstate); + llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); /* Then force the global state change */ diff --git a/arch/arm/src/kl/kl_pwm.c b/arch/arm/src/kl/kl_pwm.c index 266bb41770..52249f34fe 100644 --- a/arch/arm/src/kl/kl_pwm.c +++ b/arch/arm/src/kl/kl_pwm.c @@ -83,19 +83,19 @@ # define pwmdbg dbg # define pwmlldbg lldbg # ifdef CONFIG_DEBUG_INFO -# define pwmvdbg vdbg -# define pwmllvdbg llvdbg +# define pwminfo info +# define pwmllinfo llinfo # define pwm_dumpgpio(p,m) kl_dumpgpio(p,m) # else -# define pwmvdbg(x...) -# define pwmllvdbg(x...) +# define pwminfo(x...) +# define pwmllinfo(x...) # define pwm_dumpgpio(p,m) # endif #else # define pwmdbg(x...) # define pwmlldbg(x...) -# define pwmvdbg(x...) -# define pwmllvdbg(x...) +# define pwminfo(x...) +# define pwmllinfo(x...) # define pwm_dumpgpio(p,m) #endif @@ -258,25 +258,25 @@ static void pwm_dumpregs(struct kl_pwmtimer_s *priv, FAR const char *msg) { int nchannels = (priv->tpmid == 0) ? 6 : 2; - pwmvdbg("%s:\n", msg); - pwmvdbg(" TPM%d_SC: %04x TPM%d_CNT: %04x TPM%d_MOD: %04x\n", + pwminfo("%s:\n", msg); + pwminfo(" TPM%d_SC: %04x TPM%d_CNT: %04x TPM%d_MOD: %04x\n", priv->tpmid, pwm_getreg(priv, TPM_SC_OFFSET), priv->tpmid, pwm_getreg(priv, TPM_CNT_OFFSET), priv->tpmid, pwm_getreg(priv, TPM_MOD_OFFSET)); - pwmvdbg(" TPM%d_STATUS: %04x TPM%d_CONF: %04x\n", + pwminfo(" TPM%d_STATUS: %04x TPM%d_CONF: %04x\n", priv->tpmid, pwm_getreg(priv, TPM_STATUS_OFFSET), priv->tpmid, pwm_getreg(priv, TPM_CONF_OFFSET)); - pwmvdbg(" TPM%d_C0SC: %04x TPM%d_C0V: %04x\n", + pwminfo(" TPM%d_C0SC: %04x TPM%d_C0V: %04x\n", priv->tpmid, pwm_getreg(priv, TPM_C0SC_OFFSET), priv->tpmid, pwm_getreg(priv, TPM_C0V_OFFSET)); - pwmvdbg(" TPM%d_C1SC: %04x TPM%d_C1V: %04x\n", + pwminfo(" TPM%d_C1SC: %04x TPM%d_C1V: %04x\n", priv->tpmid, pwm_getreg(priv, TPM_C1SC_OFFSET), priv->tpmid, @@ -284,7 +284,7 @@ static void pwm_dumpregs(struct kl_pwmtimer_s *priv, FAR const char *msg) if (nchannels >= 3) { - pwmvdbg(" TPM%d_C2SC: %04x TPM%d_C2V: %04x\n", + pwminfo(" TPM%d_C2SC: %04x TPM%d_C2V: %04x\n", priv->tpmid, pwm_getreg(priv, TPM_C2SC_OFFSET), priv->tpmid, @@ -293,7 +293,7 @@ static void pwm_dumpregs(struct kl_pwmtimer_s *priv, FAR const char *msg) if (nchannels >= 4) { - pwmvdbg(" TPM%d_C3SC: %04x TPM%d_C3V: %04x\n", + pwminfo(" TPM%d_C3SC: %04x TPM%d_C3V: %04x\n", priv->tpmid, pwm_getreg(priv, TPM_C3SC_OFFSET), priv->tpmid, @@ -302,7 +302,7 @@ static void pwm_dumpregs(struct kl_pwmtimer_s *priv, FAR const char *msg) if (nchannels >= 5) { - pwmvdbg(" TPM%d_C4SC: %04x TPM%d_C4V: %04x\n", + pwminfo(" TPM%d_C4SC: %04x TPM%d_C4V: %04x\n", priv->tpmid, pwm_getreg(priv, TPM_C4SC_OFFSET), priv->tpmid, @@ -311,7 +311,7 @@ static void pwm_dumpregs(struct kl_pwmtimer_s *priv, FAR const char *msg) if (nchannels >= 6) { - pwmvdbg(" TPM%d_C5SC: %04x TPM%d_C5V: %04x\n", + pwminfo(" TPM%d_C5SC: %04x TPM%d_C5V: %04x\n", priv->tpmid, pwm_getreg(priv, TPM_C5SC_OFFSET), priv->tpmid, @@ -353,7 +353,7 @@ static int pwm_timer(FAR struct kl_pwmtimer_s *priv, DEBUGASSERT(priv != NULL && info != NULL); - pwmvdbg("TPM%d channel: %d frequency: %d duty: %08x\n", + pwminfo("TPM%d channel: %d frequency: %d duty: %08x\n", priv->tpmid, priv->channel, info->frequency, info->duty); DEBUGASSERT(info->frequency > 0 && info->duty > 0 && @@ -423,7 +423,7 @@ static int pwm_timer(FAR struct kl_pwmtimer_s *priv, cv = b16toi(info->duty * modulo + b16HALF); - pwmvdbg("TPM%d PCLK: %d frequency: %d TPMCLK: %d prescaler: %d modulo: %d c0v: %d\n", + pwminfo("TPM%d PCLK: %d frequency: %d TPMCLK: %d prescaler: %d modulo: %d c0v: %d\n", priv->tpmid, priv->pclk, info->frequency, tpmclk, presc_values[prescaler], modulo, cv); @@ -530,7 +530,7 @@ static int pwm_setup(FAR struct pwm_lowerhalf_s *dev) regval |= SIM_SCGC6_TPM0 | SIM_SCGC6_TPM1 | SIM_SCGC6_TPM2; putreg32(regval, KL_SIM_SCGC6); - pwmvdbg("TPM%d pincfg: %08x\n", priv->tpmid, priv->pincfg); + pwminfo("TPM%d pincfg: %08x\n", priv->tpmid, priv->pincfg); pwm_dumpregs(priv, "Initially"); /* Configure the PWM output pin, but do not start the timer yet */ @@ -561,7 +561,7 @@ static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev) FAR struct kl_pwmtimer_s *priv = (FAR struct kl_pwmtimer_s *)dev; uint32_t pincfg; - pwmvdbg("TPM%d pincfg: %08x\n", priv->tpmid, priv->pincfg); + pwminfo("TPM%d pincfg: %08x\n", priv->tpmid, priv->pincfg); /* Make sure that the output has been stopped */ @@ -621,7 +621,7 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev) FAR struct kl_pwmtimer_s *priv = (FAR struct kl_pwmtimer_s *)dev; irqstate_t flags; - pwmvdbg("TPM%d\n", priv->tpmid); + pwminfo("TPM%d\n", priv->tpmid); /* Disable interrupts momentary to stop any ongoing timer processing and * to prevent any concurrent access to the reset register. @@ -696,7 +696,7 @@ static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg /* There are no platform-specific ioctl commands */ - pwmvdbg("TPM%d\n", priv->tpmid); + pwminfo("TPM%d\n", priv->tpmid); #endif return -ENOTTY; } @@ -724,7 +724,7 @@ FAR struct pwm_lowerhalf_s *kl_pwminitialize(int timer) { FAR struct kl_pwmtimer_s *lower; - pwmvdbg("TPM%d\n", timer); + pwminfo("TPM%d\n", timer); switch (timer) { diff --git a/arch/arm/src/kl/kl_spi.c b/arch/arm/src/kl/kl_spi.c index 741e75c371..eacebac98a 100644 --- a/arch/arm/src/kl/kl_spi.c +++ b/arch/arm/src/kl/kl_spi.c @@ -73,13 +73,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /**************************************************************************** @@ -388,7 +388,7 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) FAR struct kl_spidev_s *priv = (FAR struct kl_spidev_s *)dev; uint8_t regval; - spivdbg("mode=%d\n", mode); + spiinfo("mode=%d\n", mode); /* Has the mode changed? */ @@ -519,7 +519,7 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, FAR uint8_t *txptr = (FAR uint8_t *)txbuffer; uint8_t data; - spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); + spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); /* Loop, sending each word in the user-provied data buffer. */ @@ -585,7 +585,7 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *txbuffer, size_t nwords) { - spivdbg("txbuffer=%p nwords=%d\n", txbuffer, nwords); + spiinfo("txbuffer=%p nwords=%d\n", txbuffer, nwords); return spi_exchange(dev, txbuffer, NULL, nwords); } #endif @@ -612,7 +612,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *txbuffer, #ifndef CONFIG_SPI_EXCHANGE static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *rxbuffer, size_t nwords) { - spivdbg("rxbuffer=%p nwords=%d\n", rxbuffer, nwords); + spiinfo("rxbuffer=%p nwords=%d\n", rxbuffer, nwords); return spi_exchange(dev, NULL, rxbuffer, nwords); } #endif diff --git a/arch/arm/src/lpc11xx/lpc11_serial.c b/arch/arm/src/lpc11xx/lpc11_serial.c index 86e3feb11c..02f6ef37d3 100644 --- a/arch/arm/src/lpc11xx/lpc11_serial.c +++ b/arch/arm/src/lpc11xx/lpc11_serial.c @@ -630,7 +630,7 @@ static int up_interrupt(int irq, void *context) /* Read the line status register (LSR) to clear */ status = up_serialin(priv, LPC11_UART_LSR_OFFSET); - vdbg("LSR: %02x\n", status); + info("LSR: %02x\n", status); break; } diff --git a/arch/arm/src/lpc11xx/lpc11_spi.c b/arch/arm/src/lpc11xx/lpc11_spi.c index e0422372c2..942ff3e2fc 100644 --- a/arch/arm/src/lpc11xx/lpc11_spi.c +++ b/arch/arm/src/lpc11xx/lpc11_spi.c @@ -82,13 +82,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /* SSP Clocking *************************************************************/ diff --git a/arch/arm/src/lpc11xx/lpc11_ssp.c b/arch/arm/src/lpc11xx/lpc11_ssp.c index 0e1889c3be..7ebb1b3bdb 100644 --- a/arch/arm/src/lpc11xx/lpc11_ssp.c +++ b/arch/arm/src/lpc11xx/lpc11_ssp.c @@ -83,13 +83,13 @@ #ifdef CONFIG_DEBUG_SPI # define sspdbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define sspdbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /* SSP Clocking *************************************************************/ @@ -754,7 +754,7 @@ static void ssp_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, * and (3) there are more bytes to be sent. */ - spivdbg("TX: rxpending: %d nwords: %d\n", rxpending, nwords); + spiinfo("TX: rxpending: %d nwords: %d\n", rxpending, nwords); while ((ssp_getreg(priv, LPC11_SSP_SR_OFFSET) & SSP_SR_TNF) && (rxpending < LPC11_SSP_FIFOSZ) && nwords) { @@ -767,7 +767,7 @@ static void ssp_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, * empty. */ - spivdbg("RX: rxpending: %d\n", rxpending); + spiinfo("RX: rxpending: %d\n", rxpending); while (ssp_getreg(priv, LPC11_SSP_SR_OFFSET) & SSP_SR_RNE) { data = (uint8_t)ssp_getreg(priv, LPC11_SSP_DR_OFFSET); diff --git a/arch/arm/src/lpc11xx/lpc11_timer.c b/arch/arm/src/lpc11xx/lpc11_timer.c index 01c2554279..a7b995fd90 100644 --- a/arch/arm/src/lpc11xx/lpc11_timer.c +++ b/arch/arm/src/lpc11xx/lpc11_timer.c @@ -92,19 +92,19 @@ # define pwmdbg dbg # define pwmlldbg lldbg # ifdef CONFIG_DEBUG_INFO -# define pwmvdbg vdbg -# define pwmllvdbg llvdbg +# define pwminfo info +# define pwmllinfo llinfo # define pwm_dumpgpio(p,m) stm32_dumpgpio(p,m) # else -# define pwmvdbg(x...) -# define pwmllvdbg(x...) +# define pwminfo(x...) +# define pwmllinfo(x...) # define pwm_dumpgpio(p,m) # endif #else # define pwmdbg(x...) # define pwmlldbg(x...) -# define pwmvdbg(x...) -# define pwmllvdbg(x...) +# define pwminfo(x...) +# define pwmllinfo(x...) # define pwm_dumpgpio(p,m) #endif diff --git a/arch/arm/src/lpc17xx/lpc176x_rtc.c b/arch/arm/src/lpc17xx/lpc176x_rtc.c index a0aa525ff7..fbec7c40e2 100644 --- a/arch/arm/src/lpc17xx/lpc176x_rtc.c +++ b/arch/arm/src/lpc17xx/lpc176x_rtc.c @@ -82,14 +82,14 @@ #ifdef CONFIG_DEBUG_RTC # define rtcdbg dbg -# define rtcvdbg vdbg +# define rtcinfo info # define rtclldbg lldbg -# define rtcllvdbg llvdbg +# define rtcllinfo llinfo #else # define rtcdbg(x...) -# define rtcvdbg(x...) +# define rtcinfo(x...) # define rtclldbg(x...) -# define rtcllvdbg(x...) +# define rtcllinfo(x...) #endif /************************************************************************************ diff --git a/arch/arm/src/lpc17xx/lpc17_can.c b/arch/arm/src/lpc17xx/lpc17_can.c index c3949f2778..ea08c70fe1 100644 --- a/arch/arm/src/lpc17xx/lpc17_can.c +++ b/arch/arm/src/lpc17xx/lpc17_can.c @@ -167,18 +167,18 @@ #ifdef CONFIG_DEBUG_CAN # ifdef CONFIG_CAN_REGDEBUG # define candbg lldbg -# define canvdbg llvdbg +# define caninfo llinfo # else # define candbg dbg -# define canvdbg vdbg +# define caninfo info # endif # define canlldbg lldbg -# define canllvdbg llvdbg +# define canllinfo llinfo #else # define candbg(x...) -# define canvdbg(x...) +# define caninfo(x...) # define canlldbg(x...) -# define canllvdbg(x...) +# define canllinfo(x...) #endif /* Timing *******************************************************************/ @@ -504,7 +504,7 @@ static void can_reset(FAR struct can_dev_s *dev) irqstate_t flags; int ret; - canvdbg("CAN%d\n", priv->port); + caninfo("CAN%d\n", priv->port); flags = enter_critical_section(); @@ -558,7 +558,7 @@ static int can_setup(FAR struct can_dev_s *dev) #endif int ret; - canvdbg("CAN%d\n", priv->port); + caninfo("CAN%d\n", priv->port); ret = irq_attach(LPC17_IRQ_CAN, can12_interrupt); if (ret == OK) @@ -588,7 +588,7 @@ static void can_shutdown(FAR struct can_dev_s *dev) #ifdef CONFIG_DEBUG_CAN FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->cd_priv; - canvdbg("CAN%d\n", priv->port); + caninfo("CAN%d\n", priv->port); #endif up_disable_irq(LPC17_IRQ_CAN); @@ -615,7 +615,7 @@ static void can_rxint(FAR struct can_dev_s *dev, bool enable) uint32_t regval; irqstate_t flags; - canvdbg("CAN%d enable: %d\n", priv->port, enable); + caninfo("CAN%d enable: %d\n", priv->port, enable); /* The EIR register is also modifed from the interrupt handler, so we have * to protect this code section. @@ -656,7 +656,7 @@ static void can_txint(FAR struct can_dev_s *dev, bool enable) uint32_t regval; irqstate_t flags; - canvdbg("CAN%d enable: %d\n", priv->port, enable); + caninfo("CAN%d enable: %d\n", priv->port, enable); /* Only disabling of the TX interrupt is supported here. The TX interrupt * is automatically enabled just before a message is sent in order to avoid @@ -753,7 +753,7 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg) irqstate_t flags; int ret = OK; - canvdbg("CAN%d ID: %d DLC: %d\n", + caninfo("CAN%d ID: %d DLC: %d\n", priv->port, msg->cm_hdr.ch_id, msg->cm_hdr.ch_dlc); if (msg->cm_hdr.ch_rtr) @@ -958,7 +958,7 @@ static void can_interrupt(FAR struct can_dev_s *dev) /* Read the interrupt and capture register (also clearing most status bits) */ regval = can_getreg(priv, LPC17_CAN_ICR_OFFSET); - canllvdbg("CAN%d ICR: %08x\n", priv->port, regval); + canllinfo("CAN%d ICR: %08x\n", priv->port, regval); /* Check for a receive interrupt */ @@ -1065,7 +1065,7 @@ static int can12_interrupt(int irq, void *context) { /* Handle CAN1/2 interrupts */ - canllvdbg("irq: %d\n", irq); + canllinfo("irq: %d\n", irq); #ifdef CONFIG_LPC17_CAN1 can_interrupt(&g_can1dev); @@ -1142,7 +1142,7 @@ static int can_bittiming(struct up_dev_s *priv) uint32_t ts2; uint32_t sjw; - canllvdbg("CAN%d PCLK: %d baud: %d\n", priv->port, + canllinfo("CAN%d PCLK: %d baud: %d\n", priv->port, CAN_CLOCK_FREQUENCY(priv->divisor), priv->baud); /* Try to get CAN_BIT_QUANTA quanta in one bit_time. @@ -1195,7 +1195,7 @@ static int can_bittiming(struct up_dev_s *priv) sjw = 1; - canllvdbg("TS1: %d TS2: %d BRP: %d SJW= %d\n", ts1, ts2, brp, sjw); + canllinfo("TS1: %d TS2: %d BRP: %d SJW= %d\n", ts1, ts2, brp, sjw); /* Configure bit timing */ @@ -1212,7 +1212,7 @@ static int can_bittiming(struct up_dev_s *priv) btr |= CAN_BTR_SAM; #endif - canllvdbg("Setting CANxBTR= 0x%08x\n", btr); + canllinfo("Setting CANxBTR= 0x%08x\n", btr); can_putreg(priv, LPC17_CAN_BTR_OFFSET, btr); /* Set bit timing */ return OK; } @@ -1240,7 +1240,7 @@ FAR struct can_dev_s *lpc17_caninitialize(int port) irqstate_t flags; uint32_t regval; - canllvdbg("CAN%d\n", port); + canllinfo("CAN%d\n", port); flags = enter_critical_section(); diff --git a/arch/arm/src/lpc17xx/lpc17_ethernet.c b/arch/arm/src/lpc17xx/lpc17_ethernet.c index 4bc992d2ce..5180204a32 100644 --- a/arch/arm/src/lpc17xx/lpc17_ethernet.c +++ b/arch/arm/src/lpc17xx/lpc17_ethernet.c @@ -906,7 +906,7 @@ static void lpc17_rxdone_process(struct lpc17_driver_s *priv) #ifdef CONFIG_NET_IPv4 if (BUF->type == HTONS(ETHTYPE_IP)) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); NETDEV_RXIPV4(&priv->lp_dev); /* Handle ARP on input then give the IPv4 packet to the @@ -948,7 +948,7 @@ static void lpc17_rxdone_process(struct lpc17_driver_s *priv) #ifdef CONFIG_NET_IPv6 if (BUF->type == HTONS(ETHTYPE_IP6)) { - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); NETDEV_RXIPV6(&priv->lp_dev); /* Give the IPv6 packet to the network layer */ @@ -1671,7 +1671,7 @@ static void lpc17_ipv6multicast(FAR struct lpc17_driver_s *priv) mac[4] = tmp16 & 0xff; mac[5] = tmp16 >> 8; - nvdbg("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n", + ninfo("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); (void)lpc17_addmac(dev, mac); @@ -2145,7 +2145,7 @@ static int lpc17_addmac(struct net_driver_s *dev, const uint8_t *mac) uint32_t crc; unsigned int ndx; - nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); /* Hash function: @@ -2221,7 +2221,7 @@ static int lpc17_rmmac(struct net_driver_s *dev, const uint8_t *mac) uint32_t crc; unsigned int ndx; - nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); /* Hash function: @@ -2647,14 +2647,14 @@ static inline int lpc17_phyinit(struct lpc17_driver_s *priv) */ phyreg = (unsigned int)lpc17_phyread(phyaddr, MII_PHYID1); - nvdbg("Addr: %d PHY ID1: %04x\n", phyaddr, phyreg); + ninfo("Addr: %d PHY ID1: %04x\n", phyaddr, phyreg); /* Compare OUI bits 3-18 */ if (phyreg == LPC17_PHYID1) { phyreg = lpc17_phyread(phyaddr, MII_PHYID2); - nvdbg("Addr: %d PHY ID2: %04x\n", phyaddr, phyreg); + ninfo("Addr: %d PHY ID2: %04x\n", phyaddr, phyreg); /* Compare OUI bits 19-24 and the 6-bit model number (ignoring the * 4-bit revision number). @@ -2676,7 +2676,7 @@ static inline int lpc17_phyinit(struct lpc17_driver_s *priv) ndbg("No PHY detected\n"); return -ENODEV; } - nvdbg("phyaddr: %d\n", phyaddr); + ninfo("phyaddr: %d\n", phyaddr); /* Save the discovered PHY device address */ diff --git a/arch/arm/src/lpc17xx/lpc17_lcd.c b/arch/arm/src/lpc17xx/lpc17_lcd.c index 79be36191c..0c0af0cd7c 100644 --- a/arch/arm/src/lpc17xx/lpc17_lcd.c +++ b/arch/arm/src/lpc17xx/lpc17_lcd.c @@ -202,7 +202,7 @@ struct fb_vtable_s g_fbobject = static int lpc17_getvideoinfo(FAR struct fb_vtable_s *vtable, FAR struct fb_videoinfo_s *vinfo) { - gvdbg("vtable=%p vinfo=%p\n", vtable, vinfo); + ginfo("vtable=%p vinfo=%p\n", vtable, vinfo); if (vtable && vinfo) { memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s)); @@ -220,7 +220,7 @@ static int lpc17_getvideoinfo(FAR struct fb_vtable_s *vtable, static int lpc17_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno, FAR struct fb_planeinfo_s *pinfo) { - gvdbg("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo); + ginfo("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo); if (vtable && planeno == 0 && pinfo) { memcpy(pinfo, &g_planeinfo, sizeof(struct fb_planeinfo_s)); @@ -244,7 +244,7 @@ static int lpc17_getcmap(FAR struct fb_vtable_s *vtable, int last; int i; - gvdbg("vtable=%p cmap=%p first=%d len=%d\n", + ginfo("vtable=%p cmap=%p first=%d len=%d\n", vtable, cmap, cmap->first, cmap->len); DEBUGASSERT(vtable && cmap && @@ -319,7 +319,7 @@ static int lpc17_putcmap(FAR struct fb_vtable_s *vtable, int last; int i; - gvdbg("vtable=%p cmap=%p first=%d len=%d\n", + ginfo("vtable=%p cmap=%p first=%d len=%d\n", vtable, cmap, cmap->first, cmap->len); DEBUGASSERT(vtable && cmap); @@ -383,21 +383,21 @@ static int lpc17_putcmap(FAR struct fb_vtable_s *vtable, static int lpc17_getcursor(FAR struct fb_vtable_s *vtable, FAR struct fb_cursorattrib_s *attrib) { - gvdbg("vtable=%p attrib=%p\n", vtable, attrib); + ginfo("vtable=%p attrib=%p\n", vtable, attrib); if (vtable && attrib) { #ifdef CONFIG_FB_HWCURSORIMAGE attrib->fmt = LPC17_COLOR_FMT; #endif - gvdbg("pos: (x=%d, y=%d)\n", g_cpos.x, g_cpos.y); + ginfo("pos: (x=%d, y=%d)\n", g_cpos.x, g_cpos.y); attrib->pos = g_cpos; #ifdef CONFIG_FB_HWCURSORSIZE attrib->mxsize.h = CONFIG_LPC17_LCD_VHEIGHT; attrib->mxsize.w = CONFIG_LPC17_LCD_HWIDTH; - gvdbg("size: (h=%d, w=%d)\n", g_csize.h, g_csize.w); + ginfo("size: (h=%d, w=%d)\n", g_csize.h, g_csize.w); attrib->size = g_csize; #endif return OK; @@ -416,26 +416,26 @@ static int lpc17_getcursor(FAR struct fb_vtable_s *vtable, static int lpc17_setcursor(FAR struct fb_vtable_s *vtable, FAR struct fb_setcursor_s *setttings) { - gvdbg("vtable=%p setttings=%p\n", vtable, setttings); + ginfo("vtable=%p setttings=%p\n", vtable, setttings); if (vtable && setttings) { - gvdbg("flags: %02x\n", settings->flags); + ginfo("flags: %02x\n", settings->flags); if ((flags & FB_CUR_SETPOSITION) != 0) { g_cpos = settings->pos; - gvdbg("pos: (h:%d, w:%d)\n", g_cpos.x, g_cpos.y); + ginfo("pos: (h:%d, w:%d)\n", g_cpos.x, g_cpos.y); } #ifdef CONFIG_FB_HWCURSORSIZE if ((flags & FB_CUR_SETSIZE) != 0) { g_csize = settings->size; - gvdbg("size: (h:%d, w:%d)\n", g_csize.h, g_csize.w); + ginfo("size: (h:%d, w:%d)\n", g_csize.h, g_csize.w); } #endif #ifdef CONFIG_FB_HWCURSORIMAGE if ((flags & FB_CUR_SETIMAGE) != 0) { - gvdbg("image: (h:%d, w:%d) @ %p\n", + ginfo("image: (h:%d, w:%d) @ %p\n", settings->img.height, settings->img.width, settings->img.image); } @@ -473,7 +473,7 @@ int up_fbinitialize(int display) uint32_t regval; int i; - gvdbg("Entry\n"); + ginfo("Entry\n"); /* Give LCD bus priority */ @@ -485,7 +485,7 @@ int up_fbinitialize(int display) /* Configure pins */ /* Video data */ - gvdbg("Configuring pins\n"); + ginfo("Configuring pins\n"); lpc17_configgpio(GPIO_LCD_VD0); lpc17_configgpio(GPIO_LCD_VD1); @@ -528,7 +528,7 @@ int up_fbinitialize(int display) modifyreg32(LPC17_SYSCON_PCONP, 0, SYSCON_PCONP_PCLCD); - gvdbg("Configuring the LCD controller\n"); + ginfo("Configuring the LCD controller\n"); /* Disable the cursor */ @@ -686,7 +686,7 @@ int up_fbinitialize(int display) #endif putreg32(0, LPC17_LCD_INTMSK); - gvdbg("Enabling the display\n"); + ginfo("Enabling the display\n"); for (i = LPC17_LCD_PWREN_DELAY; i; i--); @@ -727,7 +727,7 @@ int up_fbinitialize(int display) FAR struct fb_vtable_s *up_fbgetvplane(int display, int vplane) { - gvdbg("vplane: %d\n", vplane); + ginfo("vplane: %d\n", vplane); if (vplane == 0) { return &g_fbobject; @@ -801,14 +801,14 @@ void lpc17_lcdclear(nxgl_mxpixel_t color) #if LPC17_BPP > 16 uint32_t *dest = (uint32_t *)CONFIG_LPC17_LCD_VRAMBASE; - gvdbg("Clearing display: color=%08x VRAM=%08x size=%d\n", + ginfo("Clearing display: color=%08x VRAM=%08x size=%d\n", color, CONFIG_LPC17_LCD_VRAMBASE, CONFIG_LPC17_LCD_HWIDTH * CONFIG_LPC17_LCD_VHEIGHT * sizeof(uint32_t)); #else uint16_t *dest = (uint16_t *)CONFIG_LPC17_LCD_VRAMBASE; - gvdbg("Clearing display: color=%08x VRAM=%08x size=%d\n", + ginfo("Clearing display: color=%08x VRAM=%08x size=%d\n", color, CONFIG_LPC17_LCD_VRAMBASE, CONFIG_LPC17_LCD_HWIDTH * CONFIG_LPC17_LCD_VHEIGHT * sizeof(uint16_t)); #endif diff --git a/arch/arm/src/lpc17xx/lpc17_mcpwm.c b/arch/arm/src/lpc17xx/lpc17_mcpwm.c index 831132a3d6..04c1830dad 100644 --- a/arch/arm/src/lpc17xx/lpc17_mcpwm.c +++ b/arch/arm/src/lpc17xx/lpc17_mcpwm.c @@ -91,19 +91,19 @@ # define pwmdbg dbg # define pwmlldbg lldbg # ifdef CONFIG_DEBUG_INFO -# define pwmvdbg vdbg -# define pwmllvdbg llvdbg +# define pwminfo info +# define pwmllinfo llinfo # define pwm_dumpgpio(p,m) stm32_dumpgpio(p,m) # else -# define pwmvdbg(x...) -# define pwmllvdbg(x...) +# define pwminfo(x...) +# define pwmllinfo(x...) # define pwm_dumpgpio(p,m) # endif #else # define pwmdbg(x...) # define pwmlldbg(x...) -# define pwmvdbg(x...) -# define pwmllvdbg(x...) +# define pwminfo(x...) +# define pwmllinfo(x...) # define pwm_dumpgpio(p,m) #endif @@ -246,8 +246,8 @@ static void mcpwm_putreg(struct lpc17_mcpwmtimer_s *priv, int offset, uint32_t v static void mcpwm_dumpregs(FAR struct lpc17_mcpwmtimer_s *priv, FAR const char *msg) { - pwmvdbg("%s:\n", msg); - pwmvdbg(" CR1: %04x CR2: %04x SMCR: %04x DIER: %04x\n", + pwminfo("%s:\n", msg); + pwminfo(" CR1: %04x CR2: %04x SMCR: %04x DIER: %04x\n", mcpwm_getreg(priv, LPC17_PWM_MR0_OFFSET), mcpwm_getreg(priv, LPC17_PWM_MR1_OFFSET), mcpwm_getreg(priv, LPC17_PWM_MR2_OFFSET), @@ -255,7 +255,7 @@ static void mcpwm_dumpregs(FAR struct lpc17_mcpwmtimer_s *priv, #if defined(CONFIG_LPC17_MCPWM) if (priv->timtype == TIMTYPE_ADVANCED) { - pwmvdbg(" RCR: %04x BDTR: %04x DCR: %04x DMAR: %04x\n", + pwminfo(" RCR: %04x BDTR: %04x DCR: %04x DMAR: %04x\n", mcpwm_getreg(priv, LPC17_PWM_MR0_OFFSET), mcpwm_getreg(priv, LPC17_PWM_MR1_OFFSET), mcpwm_getreg(priv, LPC17_PWM_MR2_OFFSET), @@ -264,7 +264,7 @@ static void mcpwm_dumpregs(FAR struct lpc17_mcpwmtimer_s *priv, else #endif { - pwmvdbg(" DCR: %04x DMAR: %04x\n", + pwminfo(" DCR: %04x DMAR: %04x\n", mcpwm_getreg(priv, LPC17_PWM_MR2_OFFSET), mcpwm_getreg(priv, LPC17_PWM_MR3_OFFSET)); } @@ -520,7 +520,7 @@ static int mcpwm_shutdown(FAR struct pwm_lowerhalf_s *dev) FAR struct lpc17_mcpwmtimer_s *priv = (FAR struct lpc17_mcpwmtimer_s *)dev; uint32_t pincfg; - pwmvdbg("TIM%d pincfg: %08x\n", priv->timid, priv->pincfg); + pwminfo("TIM%d pincfg: %08x\n", priv->timid, priv->pincfg); /* Make sure that the output has been stopped */ @@ -576,7 +576,7 @@ static int mcpwm_stop(FAR struct pwm_lowerhalf_s *dev) uint32_t regval; irqstate_t flags; - pwmvdbg("TIM%d\n", priv->timid); + pwminfo("TIM%d\n", priv->timid); /* Disable interrupts momentary to stop any ongoing timer processing and * to prevent any concurrent access to the reset register. @@ -602,7 +602,7 @@ static int mcpwm_stop(FAR struct pwm_lowerhalf_s *dev) leave_critical_section(flags); - pwmvdbg("regaddr: %08x resetbit: %08x\n", regaddr, resetbit); + pwminfo("regaddr: %08x resetbit: %08x\n", regaddr, resetbit); mcpwm_dumpregs(priv, "After stop"); return OK; } @@ -630,7 +630,7 @@ static int mcpwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, unsigned long a /* There are no platform-specific ioctl commands */ - pwmvdbg("TIM%d\n", priv->timid); + pwminfo("TIM%d\n", priv->timid); #endif return -ENOTTY; } @@ -660,7 +660,7 @@ FAR struct pwm_lowerhalf_s *lpc17_mcpwminitialize(int timer) { FAR struct lpc17_mcpwmtimer_s *lower; - pwmvdbg("TIM%d\n", timer); + pwminfo("TIM%d\n", timer); switch (timer) { diff --git a/arch/arm/src/lpc17xx/lpc17_pwm.c b/arch/arm/src/lpc17xx/lpc17_pwm.c index 66794cdc65..3fdb7397ac 100644 --- a/arch/arm/src/lpc17xx/lpc17_pwm.c +++ b/arch/arm/src/lpc17xx/lpc17_pwm.c @@ -109,19 +109,19 @@ # define pwmdbg dbg # define pwmlldbg lldbg # ifdef CONFIG_DEBUG_INFO -# define pwmvdbg vdbg -# define pwmllvdbg llvdbg +# define pwminfo info +# define pwmllinfo llinfo # define pwm_dumpgpio(p,m) stm32_dumpgpio(p,m) # else -# define pwmvdbg(x...) -# define pwmllvdbg(x...) +# define pwminfo(x...) +# define pwmllinfo(x...) # define pwm_dumpgpio(p,m) # endif #else # define pwmdbg(x...) # define pwmlldbg(x...) -# define pwmvdbg(x...) -# define pwmllvdbg(x...) +# define pwminfo(x...) +# define pwmllinfo(x...) # define pwm_dumpgpio(p,m) #endif @@ -261,8 +261,8 @@ static void pwm_putreg(struct lpc17_pwmtimer_s *priv, int offset, uint32_t value #if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_INFO) static void pwm_dumpregs(struct lpc17_pwmtimer_s *priv, FAR const char *msg) { - pwmvdbg("%s:\n", msg); - pwmvdbg(" CR1: %04x CR2: %04x SMCR: %04x DIER: %04x\n", + pwminfo("%s:\n", msg); + pwminfo(" CR1: %04x CR2: %04x SMCR: %04x DIER: %04x\n", pwm_getreg(priv, LPC17_PWM_MR0_OFFSET), pwm_getreg(priv, LPC17_PWM_MR1_OFFSET), pwm_getreg(priv, LPC17_PWM_MR2_OFFSET), @@ -270,7 +270,7 @@ static void pwm_dumpregs(struct lpc17_pwmtimer_s *priv, FAR const char *msg) #if defined(CONFIG_LPC17_PWM1) if (priv->timtype == TIMTYPE_ADVANCED) { - pwmvdbg(" RCR: %04x BDTR: %04x DCR: %04x DMAR: %04x\n", + pwminfo(" RCR: %04x BDTR: %04x DCR: %04x DMAR: %04x\n", pwm_getreg(priv, LPC17_PWM_MR0_OFFSET), pwm_getreg(priv, LPC17_PWM_MR1_OFFSET), pwm_getreg(priv, LPC17_PWM_MR2_OFFSET), @@ -279,7 +279,7 @@ static void pwm_dumpregs(struct lpc17_pwmtimer_s *priv, FAR const char *msg) else #endif { - pwmvdbg(" DCR: %04x DMAR: %04x\n", + pwminfo(" DCR: %04x DMAR: %04x\n", pwm_getreg(priv, LPC17_PWM_MR2_OFFSET), pwm_getreg(priv, LPC17_PWM_MR3_OFFSET)); } @@ -491,7 +491,7 @@ static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev) FAR struct lpc17_pwmtimer_s *priv = (FAR struct lpc17_pwmtimer_s *)dev; uint32_t pincfg; - pwmvdbg("TIM%d pincfg: %08x\n", priv->timid, priv->pincfg); + pwminfo("TIM%d pincfg: %08x\n", priv->timid, priv->pincfg); /* Make sure that the output has been stopped */ @@ -547,7 +547,7 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev) uint32_t regval; irqstate_t flags; - pwmvdbg("TIM%d\n", priv->timid); + pwminfo("TIM%d\n", priv->timid); /* Disable interrupts momentary to stop any ongoing timer processing and * to prevent any concurrent access to the reset register. @@ -573,7 +573,7 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev) leave_critical_section(flags); - pwmvdbg("regaddr: %08x resetbit: %08x\n", regaddr, resetbit); + pwminfo("regaddr: %08x resetbit: %08x\n", regaddr, resetbit); pwm_dumpregs(priv, "After stop"); return OK; } @@ -601,7 +601,7 @@ static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg /* There are no platform-specific ioctl commands */ - pwmvdbg("TIM%d\n", priv->timid); + pwminfo("TIM%d\n", priv->timid); #endif return -ENOTTY; } @@ -631,7 +631,7 @@ FAR struct pwm_lowerhalf_s *lpc17_pwminitialize(int timer) { FAR struct lpc17_pwmtimer_s *lower; - pwmvdbg("TIM%d\n", timer); + pwminfo("TIM%d\n", timer); switch (timer) { diff --git a/arch/arm/src/lpc17xx/lpc17_sdcard.c b/arch/arm/src/lpc17xx/lpc17_sdcard.c index a00fd6ffaa..3f5c5a5b66 100644 --- a/arch/arm/src/lpc17xx/lpc17_sdcard.c +++ b/arch/arm/src/lpc17xx/lpc17_sdcard.c @@ -529,7 +529,7 @@ static inline void lpc17_setclock(uint32_t clkcr) regval |= clkcr; putreg32(regval, LPC17_SDCARD_CLOCK); - fvdbg("CLKCR: %08x PWR: %08x\n", + finfo("CLKCR: %08x PWR: %08x\n", getreg32(LPC17_SDCARD_CLOCK), getreg32(LPC17_SDCARD_PWR)); } @@ -1480,7 +1480,7 @@ static void lpc17_reset(FAR struct sdio_dev_s *dev) lpc17_setpwrctrl(SDCARD_PWR_CTRL_ON); leave_critical_section(flags); - fvdbg("CLCKR: %08x POWER: %08x\n", + finfo("CLCKR: %08x POWER: %08x\n", getreg32(LPC17_SDCARD_CLOCK), getreg32(LPC17_SDCARD_PWR)); } @@ -1689,7 +1689,7 @@ static int lpc17_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg) cmdidx = (cmd & MMCSD_CMDIDX_MASK) >> MMCSD_CMDIDX_SHIFT; regval |= cmdidx | SDCARD_CMD_CPSMEN; - fvdbg("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval); + finfo("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval); /* Write the SD card CMD */ @@ -2341,7 +2341,7 @@ static void lpc17_callbackenable(FAR struct sdio_dev_s *dev, { struct lpc17_dev_s *priv = (struct lpc17_dev_s *)dev; - fvdbg("eventset: %02x\n", eventset); + finfo("eventset: %02x\n", eventset); DEBUGASSERT(priv != NULL); priv->cbevents = eventset; @@ -2377,7 +2377,7 @@ static int lpc17_registercallback(FAR struct sdio_dev_s *dev, /* Disable callbacks and register this callback and is argument */ - fvdbg("Register %p(%p)\n", callback, arg); + finfo("Register %p(%p)\n", callback, arg); DEBUGASSERT(priv != NULL); priv->cbevents = 0; @@ -2590,7 +2590,7 @@ static void lpc17_callback(void *arg) /* Is a callback registered? */ DEBUGASSERT(priv != NULL); - fvdbg("Callback %p(%p) cbevents: %02x cdstatus: %02x\n", + finfo("Callback %p(%p) cbevents: %02x cdstatus: %02x\n", priv->callback, priv->cbarg, priv->cbevents, priv->cdstatus); if (priv->callback) @@ -2635,14 +2635,14 @@ static void lpc17_callback(void *arg) { /* Yes.. queue it */ - fvdbg("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); + finfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); (void)work_queue(HPWORK, &priv->cbwork, (worker_t)priv->callback, priv->cbarg, 0); } else { /* No.. then just call the callback here */ - fvdbg("Callback to %p(%p)\n", priv->callback, priv->cbarg); + finfo("Callback to %p(%p)\n", priv->callback, priv->cbarg); priv->callback(priv->cbarg); } } @@ -2781,7 +2781,7 @@ void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot) { priv->cdstatus &= ~SDIO_STATUS_PRESENT; } - fvdbg("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus); + finfo("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus); /* Perform any requested callback if the status has changed */ @@ -2824,7 +2824,7 @@ void sdio_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect) { priv->cdstatus &= ~SDIO_STATUS_WRPROTECTED; } - fvdbg("cdstatus: %02x\n", priv->cdstatus); + finfo("cdstatus: %02x\n", priv->cdstatus); leave_critical_section(flags); } #endif /* CONFIG_LPC17_SDCARD */ diff --git a/arch/arm/src/lpc17xx/lpc17_serial.c b/arch/arm/src/lpc17xx/lpc17_serial.c index d0e2ceeecf..6dda0aabc3 100644 --- a/arch/arm/src/lpc17xx/lpc17_serial.c +++ b/arch/arm/src/lpc17xx/lpc17_serial.c @@ -1134,7 +1134,7 @@ static int up_interrupt(int irq, void *context) /* Read the modem status register (MSR) to clear */ status = up_serialin(priv, LPC17_UART_MSR_OFFSET); - vdbg("MSR: %02x\n", status); + info("MSR: %02x\n", status); break; } @@ -1145,7 +1145,7 @@ static int up_interrupt(int irq, void *context) /* Read the line status register (LSR) to clear */ status = up_serialin(priv, LPC17_UART_LSR_OFFSET); - vdbg("LSR: %02x\n", status); + info("LSR: %02x\n", status); break; } diff --git a/arch/arm/src/lpc17xx/lpc17_spi.c b/arch/arm/src/lpc17xx/lpc17_spi.c index 06a6659264..7853419cdc 100644 --- a/arch/arm/src/lpc17xx/lpc17_spi.c +++ b/arch/arm/src/lpc17xx/lpc17_spi.c @@ -82,13 +82,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /* SSP Clocking *************************************************************/ diff --git a/arch/arm/src/lpc17xx/lpc17_ssp.c b/arch/arm/src/lpc17xx/lpc17_ssp.c index a99c061727..f80b12de1d 100644 --- a/arch/arm/src/lpc17xx/lpc17_ssp.c +++ b/arch/arm/src/lpc17xx/lpc17_ssp.c @@ -83,13 +83,13 @@ #ifdef CONFIG_DEBUG_SPI # define sspdbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define sspdbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /* SSP Clocking *************************************************************/ @@ -745,7 +745,7 @@ static void ssp_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw * and (3) there are more bytes to be sent. */ - spivdbg("TX: rxpending: %d nwords: %d\n", rxpending, nwords); + spiinfo("TX: rxpending: %d nwords: %d\n", rxpending, nwords); while ((ssp_getreg(priv, LPC17_SSP_SR_OFFSET) & SSP_SR_TNF) && (rxpending < LPC17_SSP_FIFOSZ) && nwords) { @@ -756,7 +756,7 @@ static void ssp_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw /* Now, read the RX data from the RX FIFO while the RX FIFO is not empty */ - spivdbg("RX: rxpending: %d\n", rxpending); + spiinfo("RX: rxpending: %d\n", rxpending); while (ssp_getreg(priv, LPC17_SSP_SR_OFFSET) & SSP_SR_RNE) { data = (uint8_t)ssp_getreg(priv, LPC17_SSP_DR_OFFSET); diff --git a/arch/arm/src/lpc17xx/lpc17_timer.c b/arch/arm/src/lpc17xx/lpc17_timer.c index 4cbe8238f1..198c099cd1 100644 --- a/arch/arm/src/lpc17xx/lpc17_timer.c +++ b/arch/arm/src/lpc17xx/lpc17_timer.c @@ -92,19 +92,19 @@ # define pwmdbg dbg # define pwmlldbg lldbg # ifdef CONFIG_DEBUG_INFO -# define pwmvdbg vdbg -# define pwmllvdbg llvdbg +# define pwminfo info +# define pwmllinfo llinfo # define pwm_dumpgpio(p,m) stm32_dumpgpio(p,m) # else -# define pwmvdbg(x...) -# define pwmllvdbg(x...) +# define pwminfo(x...) +# define pwmllinfo(x...) # define pwm_dumpgpio(p,m) # endif #else # define pwmdbg(x...) # define pwmlldbg(x...) -# define pwmvdbg(x...) -# define pwmllvdbg(x...) +# define pwminfo(x...) +# define pwmllinfo(x...) # define pwm_dumpgpio(p,m) #endif diff --git a/arch/arm/src/lpc17xx/lpc17_usbdev.c b/arch/arm/src/lpc17xx/lpc17_usbdev.c index 9995e03cda..62495439af 100644 --- a/arch/arm/src/lpc17xx/lpc17_usbdev.c +++ b/arch/arm/src/lpc17xx/lpc17_usbdev.c @@ -1076,7 +1076,7 @@ static int lpc17_wrrequest(struct lpc17_ep_s *privep) return OK; } - ullvdbg("epphy=%d req=%p: len=%d xfrd=%d nullpkt=%d\n", + ullinfo("epphy=%d req=%p: len=%d xfrd=%d nullpkt=%d\n", privep->epphy, privreq, privreq->req.len, privreq->req.xfrd, privep->txnullpkt); /* Ignore any attempt to send a zero length packet on anything but EP0IN */ @@ -1185,7 +1185,7 @@ static int lpc17_rdrequest(struct lpc17_ep_s *privep) return OK; } - ullvdbg("len=%d xfrd=%d nullpkt=%d\n", + ullinfo("len=%d xfrd=%d nullpkt=%d\n", privreq->req.len, privreq->req.xfrd, privep->txnullpkt); /* Ignore any attempt to receive a zero length packet */ @@ -1593,7 +1593,7 @@ static inline void lpc17_ep0setup(struct lpc17_usbdev_s *priv) index = GETUINT16(ctrl.index); len = GETUINT16(ctrl.len); - ullvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n", + ullinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n", ctrl.type, ctrl.req, value, index, len); /* Dispatch any non-standard requests */ @@ -1739,7 +1739,7 @@ static inline void lpc17_ep0setup(struct lpc17_usbdev_s *priv) if (((ctrl.type & USB_REQ_RECIPIENT_MASK) == USB_REQ_RECIPIENT_DEVICE) && value == USB_FEATURE_TESTMODE) { - ullvdbg("test mode: %d\n", index); + ullinfo("test mode: %d\n", index); } else if ((ctrl.type & USB_REQ_RECIPIENT_MASK) != USB_REQ_RECIPIENT_ENDPOINT) { @@ -2321,7 +2321,7 @@ static int lpc17_usbinterrupt(int irq, FAR void *context) } else { - ullvdbg("Pending data on OUT endpoint\n"); + ullinfo("Pending data on OUT endpoint\n"); priv->rxpending = 1; } } @@ -2797,7 +2797,7 @@ static int lpc17_epsubmit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r if (!req || !req->callback || !req->buf || !ep) { usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_INVALIDPARMS), 0); - ullvdbg("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); + ullinfo("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); return -EINVAL; } #endif diff --git a/arch/arm/src/lpc17xx/lpc17_usbhost.c b/arch/arm/src/lpc17xx/lpc17_usbhost.c index 94003be06d..e0cf06a037 100644 --- a/arch/arm/src/lpc17xx/lpc17_usbhost.c +++ b/arch/arm/src/lpc17xx/lpc17_usbhost.c @@ -1192,7 +1192,7 @@ static inline int lpc17_addinted(struct lpc17_usbhost_s *priv, interval = lpc17_getinterval(epdesc->interval); ed->interval = interval; - uvdbg("interval: %d->%d\n", epdesc->interval, interval); + uinfo("interval: %d->%d\n", epdesc->interval, interval); /* Get the offset associated with the ED direction. IN EDs get the even * entries, OUT EDs get the odd entries. @@ -1225,7 +1225,7 @@ static inline int lpc17_addinted(struct lpc17_usbhost_s *priv, interval = priv->outinterval; } } - uvdbg("min interval: %d offset: %d\n", interval, offset); + uinfo("min interval: %d offset: %d\n", interval, offset); /* Get the head of the first of the duplicated entries. The first offset * entry is always guaranteed to contain the common ED list head. @@ -1244,7 +1244,7 @@ static inline int lpc17_addinted(struct lpc17_usbhost_s *priv, ed->hw.nexted = head; lpc17_setinttab((uint32_t)ed, interval, offset); - uvdbg("head: %08x next: %08x\n", ed, head); + uinfo("head: %08x next: %08x\n", ed, head); /* Re-enabled periodic list processing */ @@ -1314,7 +1314,7 @@ static inline int lpc17_reminted(struct lpc17_usbhost_s *priv, */ head = (struct lpc17_ed_s *)HCCA->inttbl[offset]; - uvdbg("ed: %08x head: %08x next: %08x offset: %d\n", + uinfo("ed: %08x head: %08x next: %08x offset: %d\n", ed, head, head ? head->hw.nexted : 0, offset); /* Find the ED to be removed in the ED list */ @@ -1349,7 +1349,7 @@ static inline int lpc17_reminted(struct lpc17_usbhost_s *priv, prev->hw.nexted = ed->hw.nexted; } - uvdbg("ed: %08x head: %08x next: %08x\n", + uinfo("ed: %08x head: %08x next: %08x\n", ed, head, head ? head->hw.nexted : 0); /* Calculate the new minimum interval for this list */ @@ -1363,7 +1363,7 @@ static inline int lpc17_reminted(struct lpc17_usbhost_s *priv, } } - uvdbg("min interval: %d offset: %d\n", interval, offset); + uinfo("min interval: %d offset: %d\n", interval, offset); /* Save the new minimum interval */ @@ -1642,7 +1642,7 @@ static int lpc17_usbinterrupt(int irq, void *context) intst = lpc17_getreg(LPC17_USBHOST_INTST); regval = lpc17_getreg(LPC17_USBHOST_INTEN); - ullvdbg("INST: %08x INTEN: %08x\n", intst, regval); + ullinfo("INST: %08x INTEN: %08x\n", intst, regval); pending = intst & regval; if (pending != 0) @@ -1652,18 +1652,18 @@ static int lpc17_usbinterrupt(int irq, void *context) if ((pending & OHCI_INT_RHSC) != 0) { uint32_t rhportst1 = lpc17_getreg(LPC17_USBHOST_RHPORTST1); - ullvdbg("Root Hub Status Change, RHPORTST1: %08x\n", rhportst1); + ullinfo("Root Hub Status Change, RHPORTST1: %08x\n", rhportst1); if ((rhportst1 & OHCI_RHPORTST_CSC) != 0) { uint32_t rhstatus = lpc17_getreg(LPC17_USBHOST_RHSTATUS); - ullvdbg("Connect Status Change, RHSTATUS: %08x\n", rhstatus); + ullinfo("Connect Status Change, RHSTATUS: %08x\n", rhstatus); /* If DRWE is set, Connect Status Change indicates a remote wake-up event */ if (rhstatus & OHCI_RHSTATUS_DRWE) { - ullvdbg("DRWE: Remote wake-up\n"); + ullinfo("DRWE: Remote wake-up\n"); } /* Otherwise... Not a remote wake-up event */ @@ -1680,7 +1680,7 @@ static int lpc17_usbinterrupt(int irq, void *context) { /* Yes.. connected. */ - ullvdbg("Connected\n"); + ullinfo("Connected\n"); priv->connected = true; priv->change = true; @@ -1710,7 +1710,7 @@ static int lpc17_usbinterrupt(int irq, void *context) priv->rhport.hport.speed = USB_SPEED_FULL; } - ullvdbg("Speed:%d\n", priv->rhport.hport.speed); + ullinfo("Speed:%d\n", priv->rhport.hport.speed); } /* Check if we are now disconnected */ @@ -1719,7 +1719,7 @@ static int lpc17_usbinterrupt(int irq, void *context) { /* Yes.. disconnect the device */ - ullvdbg("Disconnected\n"); + ullinfo("Disconnected\n"); priv->connected = false; priv->change = true; @@ -2089,7 +2089,7 @@ static int lpc17_enumerate(FAR struct usbhost_connection_s *conn, /* Then let the common usbhost_enumerate do the real enumeration. */ - uvdbg("Enumerate the device\n"); + uinfo("Enumerate the device\n"); ret = usbhost_enumerate(hport, &hport->devclass); if (ret < 0) { @@ -2155,7 +2155,7 @@ static int lpc17_ep0configure(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, lpc17_givesem(&priv->exclsem); - uvdbg("EP0 CTRL:%08x\n", ed->hw.ctrl); + uinfo("EP0 CTRL:%08x\n", ed->hw.ctrl); return OK; } @@ -2255,7 +2255,7 @@ static int lpc17_epalloc(struct usbhost_driver_s *drvr, ed->hw.ctrl |= ED_CONTROL_F; } #endif - uvdbg("EP%d CTRL:%08x\n", epdesc->addr, ed->hw.ctrl); + uinfo("EP%d CTRL:%08x\n", epdesc->addr, ed->hw.ctrl); /* Initialize the semaphore that is used to wait for the endpoint * WDH event. @@ -2608,7 +2608,7 @@ static int lpc17_ctrlin(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, DEBUGASSERT(priv != NULL && ed != NULL && req != NULL); - uvdbg("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n", + uinfo("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n", req->type, req->req, req->value[1], req->value[0], req->index[1], req->index[0], req->len[1], req->len[0]); @@ -2646,7 +2646,7 @@ static int lpc17_ctrlout(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, DEBUGASSERT(priv != NULL && ed != NULL && req != NULL); - uvdbg("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n", + uinfo("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n", req->type, req->req, req->value[1], req->value[0], req->index[1], req->index[0], req->len[1], req->len[0]); @@ -2712,7 +2712,7 @@ static int lpc17_transfer_common(struct lpc17_usbhost_s *priv, xfrinfo = ed->xfrinfo; in = (ed->hw.ctrl & ED_CONTROL_D_MASK) == ED_CONTROL_D_IN; - uvdbg("EP%u %s toggle:%u maxpacket:%u buflen:%lu\n", + uinfo("EP%u %s toggle:%u maxpacket:%u buflen:%lu\n", (ed->hw.ctrl & ED_CONTROL_EN_MASK) >> ED_CONTROL_EN_SHIFT, in ? "IN" : "OUT", (ed->hw.headp & ED_HEADP_C) != 0 ? 1 : 0, @@ -2790,7 +2790,7 @@ static int lpc17_dma_alloc(struct lpc17_usbhost_s *priv, if (buflen > CONFIG_USBHOST_IOBUFSIZE) { - uvdbg("buflen (%d) > IO buffer size (%d)\n", + uinfo("buflen (%d) > IO buffer size (%d)\n", buflen, CONFIG_USBHOST_IOBUFSIZE); return -ENOMEM; } @@ -2800,7 +2800,7 @@ static int lpc17_dma_alloc(struct lpc17_usbhost_s *priv, newbuffer = lpc17_allocio(); if (!newbuffer) { - uvdbg("IO buffer allocation failed\n"); + uinfo("IO buffer allocation failed\n"); return -ENOMEM; } @@ -3454,7 +3454,7 @@ static int lpc17_connect(FAR struct usbhost_driver_s *drvr, /* Set the connected/disconnected flag */ hport->connected = connected; - ullvdbg("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO"); + ullinfo("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO"); /* Report the connection event */ @@ -3700,14 +3700,14 @@ struct usbhost_connection_s *lpc17_usbhost_initialize(int controller) /* Show AHB SRAM memory map */ #if 0 /* Useful if you have doubts about the layout */ - uvdbg("AHB SRAM:\n"); - uvdbg(" HCCA: %08x %d\n", LPC17_HCCA_BASE, LPC17_HCCA_SIZE); - uvdbg(" TDTAIL: %08x %d\n", LPC17_TDTAIL_ADDR, LPC17_TD_SIZE); - uvdbg(" EDCTRL: %08x %d\n", LPC17_EDCTRL_ADDR, LPC17_ED_SIZE); - uvdbg(" EDFREE: %08x %d\n", LPC17_EDFREE_BASE, LPC17_ED_SIZE); - uvdbg(" TDFREE: %08x %d\n", LPC17_TDFREE_BASE, LPC17_EDFREE_SIZE); - uvdbg(" TBFREE: %08x %d\n", LPC17_TBFREE_BASE, LPC17_TBFREE_SIZE); - uvdbg(" IOFREE: %08x %d\n", LPC17_IOFREE_BASE, LPC17_IOBUFFERS * CONFIG_USBHOST_IOBUFSIZE); + uinfo("AHB SRAM:\n"); + uinfo(" HCCA: %08x %d\n", LPC17_HCCA_BASE, LPC17_HCCA_SIZE); + uinfo(" TDTAIL: %08x %d\n", LPC17_TDTAIL_ADDR, LPC17_TD_SIZE); + uinfo(" EDCTRL: %08x %d\n", LPC17_EDCTRL_ADDR, LPC17_ED_SIZE); + uinfo(" EDFREE: %08x %d\n", LPC17_EDFREE_BASE, LPC17_ED_SIZE); + uinfo(" TDFREE: %08x %d\n", LPC17_TDFREE_BASE, LPC17_EDFREE_SIZE); + uinfo(" TBFREE: %08x %d\n", LPC17_TBFREE_BASE, LPC17_TBFREE_SIZE); + uinfo(" IOFREE: %08x %d\n", LPC17_IOFREE_BASE, LPC17_IOBUFFERS * CONFIG_USBHOST_IOBUFSIZE); #endif /* Initialize all the TDs, EDs and HCCA to 0 */ diff --git a/arch/arm/src/lpc214x/lpc214x_serial.c b/arch/arm/src/lpc214x/lpc214x_serial.c index 62b18ecfe3..f3ddd0cdd4 100644 --- a/arch/arm/src/lpc214x/lpc214x_serial.c +++ b/arch/arm/src/lpc214x/lpc214x_serial.c @@ -530,7 +530,7 @@ static int up_interrupt(int irq, void *context) /* Read the modem status register (MSR) to clear */ status = up_serialin(priv, LPC214X_UART_MSR_OFFSET); - vdbg("MSR: %02x\n", status); + info("MSR: %02x\n", status); break; } @@ -541,7 +541,7 @@ static int up_interrupt(int irq, void *context) /* Read the line status register (LSR) to clear */ status = up_serialin(priv, LPC214X_UART_LSR_OFFSET); - vdbg("LSR: %02x\n", status); + info("LSR: %02x\n", status); break; } diff --git a/arch/arm/src/lpc214x/lpc214x_usbdev.c b/arch/arm/src/lpc214x/lpc214x_usbdev.c index 5c058a6bc3..cce4c2adb0 100644 --- a/arch/arm/src/lpc214x/lpc214x_usbdev.c +++ b/arch/arm/src/lpc214x/lpc214x_usbdev.c @@ -1021,7 +1021,7 @@ static int lpc214x_wrrequest(struct lpc214x_ep_s *privep) return OK; } - ullvdbg("epphy=%d req=%p: len=%d xfrd=%d nullpkt=%d\n", + ullinfo("epphy=%d req=%p: len=%d xfrd=%d nullpkt=%d\n", privep->epphy, privreq, privreq->req.len, privreq->req.xfrd, privep->txnullpkt); /* Ignore any attempt to send a zero length packet on anything but EP0IN */ @@ -1130,7 +1130,7 @@ static int lpc214x_rdrequest(struct lpc214x_ep_s *privep) return OK; } - ullvdbg("len=%d xfrd=%d nullpkt=%d\n", + ullinfo("len=%d xfrd=%d nullpkt=%d\n", privreq->req.len, privreq->req.xfrd, privep->txnullpkt); /* Ignore any attempt to receive a zero length packet */ @@ -1552,7 +1552,7 @@ static inline void lpc214x_ep0setup(struct lpc214x_usbdev_s *priv) index = GETUINT16(ctrl.index); len = GETUINT16(ctrl.len); - ullvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n", + ullinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n", ctrl.type, ctrl.req, value, index, len); /* Dispatch any non-standard requests */ @@ -1697,7 +1697,7 @@ static inline void lpc214x_ep0setup(struct lpc214x_usbdev_s *priv) if (((ctrl.type & USB_REQ_RECIPIENT_MASK) == USB_REQ_RECIPIENT_DEVICE) && value == USB_FEATURE_TESTMODE) { - ullvdbg("test mode: %d\n", index); + ullinfo("test mode: %d\n", index); } else if ((ctrl.type & USB_REQ_RECIPIENT_MASK) != USB_REQ_RECIPIENT_ENDPOINT) { @@ -2287,7 +2287,7 @@ static int lpc214x_usbinterrupt(int irq, FAR void *context) } else { - ullvdbg("Pending data on OUT endpoint\n"); + ullinfo("Pending data on OUT endpoint\n"); priv->rxpending = 1; } } @@ -2763,7 +2763,7 @@ static int lpc214x_epsubmit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s if (!req || !req->callback || !req->buf || !ep) { usbtrace(TRACE_DEVERROR(LPC214X_TRACEERR_INVALIDPARMS), 0); - ullvdbg("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); + ullinfo("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); return -EINVAL; } #endif diff --git a/arch/arm/src/lpc2378/lpc23xx_serial.c b/arch/arm/src/lpc2378/lpc23xx_serial.c index 9650a0827a..90e62bf0a7 100644 --- a/arch/arm/src/lpc2378/lpc23xx_serial.c +++ b/arch/arm/src/lpc2378/lpc23xx_serial.c @@ -648,7 +648,7 @@ static int up_interrupt(int irq, void *context) /* Read the modem status register (MSR) to clear */ status = up_serialin(priv, UART_MSR_OFFSET); - vdbg("MSR: %02x\n", status); + info("MSR: %02x\n", status); break; } @@ -659,7 +659,7 @@ static int up_interrupt(int irq, void *context) /* Read the line status register (LSR) to clear */ status = up_serialin(priv, UART_LSR_OFFSET); - vdbg("LSR: %02x\n", status); + info("LSR: %02x\n", status); break; } diff --git a/arch/arm/src/lpc2378/lpc23xx_spi.c b/arch/arm/src/lpc2378/lpc23xx_spi.c index fa20e563a6..21aefa2f99 100644 --- a/arch/arm/src/lpc2378/lpc23xx_spi.c +++ b/arch/arm/src/lpc2378/lpc23xx_spi.c @@ -81,13 +81,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /* SPI Clocking. diff --git a/arch/arm/src/lpc31xx/lpc31_ehci.c b/arch/arm/src/lpc31xx/lpc31_ehci.c index 83ae348776..b881daea63 100644 --- a/arch/arm/src/lpc31xx/lpc31_ehci.c +++ b/arch/arm/src/lpc31xx/lpc31_ehci.c @@ -2113,7 +2113,7 @@ static int lpc31_async_setup(struct lpc31_rhport_s *rhport, #ifdef CONFIG_USBHOST_TRACE usbhost_vtrace2(EHCI_VTRACE2_ASYNCXFR, epinfo->epno, buflen); #else - uvdbg("RHport%d EP%d: buffer=%p, buflen=%d, req=%p\n", + uinfo("RHport%d EP%d: buffer=%p, buflen=%d, req=%p\n", RHPORT(rhport), epinfo->epno, buffer, buflen, req); #endif @@ -2391,7 +2391,7 @@ static int lpc31_intr_setup(struct lpc31_rhport_s *rhport, #ifdef CONFIG_USBHOST_TRACE usbhost_vtrace2(EHCI_VTRACE2_INTRXFR, epinfo->epno, buflen); #else - uvdbg("RHport%d EP%d: buffer=%p, buflen=%d\n", + uinfo("RHport%d EP%d: buffer=%p, buflen=%d\n", RHPORT(rhport), epinfo->epno, buffer, buflen); #endif @@ -3377,7 +3377,7 @@ static int lpc31_ehci_interrupt(int irq, FAR void *context) #ifdef CONFIG_USBHOST_TRACE usbhost_vtrace1(EHCI_VTRACE1_TOPHALF, usbsts & regval); #else - ullvdbg("USBSTS: %08x USBINTR: %08x\n", usbsts, regval); + ullinfo("USBSTS: %08x USBINTR: %08x\n", usbsts, regval); #endif /* Handle all unmasked interrupt sources */ @@ -3909,7 +3909,7 @@ static int lpc31_epalloc(FAR struct usbhost_driver_s *drvr, #ifdef CONFIG_USBHOST_TRACE usbhost_vtrace2(EHCI_VTRACE2_EPALLOC, epdesc->addr, epdesc->xfrtype); #else - uvdbg("EP%d DIR=%s FA=%08x TYPE=%d Interval=%d MaxPacket=%d\n", + uinfo("EP%d DIR=%s FA=%08x TYPE=%d Interval=%d MaxPacket=%d\n", epdesc->addr, epdesc->in ? "IN" : "OUT", hport->funcaddr, epdesc->xfrtype, epdesc->interval, epdesc->mxpacketsize); #endif @@ -4199,7 +4199,7 @@ static int lpc31_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, #ifdef CONFIG_USBHOST_TRACE usbhost_vtrace2(EHCI_VTRACE2_CTRLINOUT, RHPORT(rhport), req->req); #else - uvdbg("RHPort%d type: %02x req: %02x value: %02x%02x index: %02x%02x len: %04x\n", + uinfo("RHPort%d type: %02x req: %02x value: %02x%02x index: %02x%02x len: %04x\n", RHPORT(rhport), req->type, req->req, req->value[1], req->value[0], req->index[1], req->index[0], len); #endif @@ -4687,7 +4687,7 @@ static int lpc31_connect(FAR struct usbhost_driver_s *drvr, /* Set the connected/disconnected flag */ hport->connected = connected; - ullvdbg("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO"); + ullinfo("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO"); /* Report the connection event */ diff --git a/arch/arm/src/lpc31xx/lpc31_serial.c b/arch/arm/src/lpc31xx/lpc31_serial.c index 6567ce267e..74a0db9ddd 100644 --- a/arch/arm/src/lpc31xx/lpc31_serial.c +++ b/arch/arm/src/lpc31xx/lpc31_serial.c @@ -541,7 +541,7 @@ static int up_interrupt(int irq, void *context) /* Read the modem status register (MSR) to clear */ status = getreg32(LPC31_UART_MSR); - fvdbg("MSR: %02x\n", status); + finfo("MSR: %02x\n", status); break; } @@ -552,7 +552,7 @@ static int up_interrupt(int irq, void *context) /* Read the line status register (LSR) to clear */ status = getreg32(LPC31_UART_LSR); - fvdbg("LSR: %02x\n", status); + finfo("LSR: %02x\n", status); break; } diff --git a/arch/arm/src/lpc31xx/lpc31_usbdev.c b/arch/arm/src/lpc31xx/lpc31_usbdev.c index c1ece00bf6..25a8bb6004 100644 --- a/arch/arm/src/lpc31xx/lpc31_usbdev.c +++ b/arch/arm/src/lpc31xx/lpc31_usbdev.c @@ -1183,7 +1183,7 @@ static inline void lpc31_ep0setup(struct lpc31_usbdev_s *priv) index = GETUINT16(ctrl.index); len = GETUINT16(ctrl.len); - ullvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n", + ullinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n", ctrl.type, ctrl.req, value, index, len); /* Dispatch any non-standard requests */ @@ -1323,7 +1323,7 @@ static inline void lpc31_ep0setup(struct lpc31_usbdev_s *priv) if (((ctrl.type & USB_REQ_RECIPIENT_MASK) == USB_REQ_RECIPIENT_DEVICE) && value == USB_FEATURE_TESTMODE) { - ullvdbg("test mode: %d\n", index); + ullinfo("test mode: %d\n", index); } else if ((ctrl.type & USB_REQ_RECIPIENT_MASK) != USB_REQ_RECIPIENT_ENDPOINT) { @@ -2083,7 +2083,7 @@ static int lpc31_epsubmit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r if (!req || !req->callback || !req->buf || !ep) { usbtrace(TRACE_DEVERROR(LPC31_TRACEERR_INVALIDPARMS), 0); - ullvdbg("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); + ullinfo("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); return -EINVAL; } #endif diff --git a/arch/arm/src/lpc43xx/lpc43_ehci.c b/arch/arm/src/lpc43xx/lpc43_ehci.c index b1de82ab53..a170b01e21 100644 --- a/arch/arm/src/lpc43xx/lpc43_ehci.c +++ b/arch/arm/src/lpc43xx/lpc43_ehci.c @@ -1989,7 +1989,7 @@ static int lpc43_async_setup(struct lpc43_rhport_s *rhport, #ifdef CONFIG_USBHOST_TRACE usbhost_vtrace2(EHCI_VTRACE2_ASYNCXFR, epinfo->epno, buflen); #else - uvdbg("RHport%d EP%d: buffer=%p, buflen=%d, req=%p\n", + uinfo("RHport%d EP%d: buffer=%p, buflen=%d, req=%p\n", RHPORT(rhport), epinfo->epno, buffer, buflen, req); #endif @@ -2267,7 +2267,7 @@ static int lpc43_intr_setup(struct lpc43_rhport_s *rhport, #ifdef CONFIG_USBHOST_TRACE usbhost_vtrace2(EHCI_VTRACE2_INTRXFR, epinfo->epno, buflen); #else - uvdbg("RHport%d EP%d: buffer=%p, buflen=%d\n", + uinfo("RHport%d EP%d: buffer=%p, buflen=%d\n", RHPORT(rhport), epinfo->epno, buffer, buflen); #endif @@ -3207,7 +3207,7 @@ static int lpc43_ehci_interrupt(int irq, FAR void *context) #ifdef CONFIG_USBHOST_TRACE usbhost_vtrace1(EHCI_VTRACE1_TOPHALF, usbsts & regval); #else - ullvdbg("USBSTS: %08x USBINTR: %08x\n", usbsts, regval); + ullinfo("USBSTS: %08x USBINTR: %08x\n", usbsts, regval); #endif /* Handle all unmasked interrupt sources */ @@ -3739,7 +3739,7 @@ static int lpc43_epalloc(FAR struct usbhost_driver_s *drvr, #ifdef CONFIG_USBHOST_TRACE usbhost_vtrace2(EHCI_VTRACE2_EPALLOC, epdesc->addr, epdesc->xfrtype); #else - uvdbg("EP%d DIR=%s FA=%08x TYPE=%d Interval=%d MaxPacket=%d\n", + uinfo("EP%d DIR=%s FA=%08x TYPE=%d Interval=%d MaxPacket=%d\n", epdesc->addr, epdesc->in ? "IN" : "OUT", hport->funcaddr, epdesc->xfrtype, epdesc->interval, epdesc->mxpacketsize); #endif @@ -4023,7 +4023,7 @@ static int lpc43_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, #ifdef CONFIG_USBHOST_TRACE usbhost_vtrace2(EHCI_VTRACE2_CTRLINOUT, RHPORT(rhport), req->req); #else - uvdbg("RHPort%d type: %02x req: %02x value: %02x%02x index: %02x%02x len: %04x\n", + uinfo("RHPort%d type: %02x req: %02x value: %02x%02x index: %02x%02x len: %04x\n", RHPORT(rhport), req->type, req->req, req->value[1], req->value[0], req->index[1], req->index[0], len); #endif @@ -4511,7 +4511,7 @@ static int lpc43_connect(FAR struct usbhost_driver_s *drvr, /* Set the connected/disconnected flag */ hport->connected = connected; - ullvdbg("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO"); + ullinfo("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO"); /* Report the connection event */ diff --git a/arch/arm/src/lpc43xx/lpc43_ethernet.c b/arch/arm/src/lpc43xx/lpc43_ethernet.c index cca1e89766..6b5e456c24 100644 --- a/arch/arm/src/lpc43xx/lpc43_ethernet.c +++ b/arch/arm/src/lpc43xx/lpc43_ethernet.c @@ -947,7 +947,7 @@ static int lpc43_transmit(FAR struct lpc43_ethmac_s *priv) txdesc = priv->txhead; txfirst = txdesc; - nllvdbg("d_len: %d d_buf: %p txhead: %p tdes0: %08x\n", + nllinfo("d_len: %d d_buf: %p txhead: %p tdes0: %08x\n", priv->dev.d_len, priv->dev.d_buf, txdesc, txdesc->tdes0); DEBUGASSERT(txdesc && (txdesc->tdes0 & ETH_TDES0_OWN) == 0); @@ -964,7 +964,7 @@ static int lpc43_transmit(FAR struct lpc43_ethmac_s *priv) bufcount = (priv->dev.d_len + (CONFIG_LPC43_ETH_BUFSIZE-1)) / CONFIG_LPC43_ETH_BUFSIZE; lastsize = priv->dev.d_len - (bufcount - 1) * CONFIG_LPC43_ETH_BUFSIZE; - nllvdbg("bufcount: %d lastsize: %d\n", bufcount, lastsize); + nllinfo("bufcount: %d lastsize: %d\n", bufcount, lastsize); /* Set the first segment bit in the first TX descriptor */ @@ -1074,7 +1074,7 @@ static int lpc43_transmit(FAR struct lpc43_ethmac_s *priv) priv->inflight++; - nllvdbg("txhead: %p txtail: %p inflight: %d\n", + nllinfo("txhead: %p txtail: %p inflight: %d\n", priv->txhead, priv->txtail, priv->inflight); /* If all TX descriptors are in-flight, then we have to disable receive interrupts @@ -1373,7 +1373,7 @@ static void lpc43_freesegment(FAR struct lpc43_ethmac_s *priv, struct eth_rxdesc_s *rxdesc; int i; - nllvdbg("rxfirst: %p segments: %d\n", rxfirst, segments); + nllinfo("rxfirst: %p segments: %d\n", rxfirst, segments); /* Set OWN bit in RX descriptors. This gives the buffers back to DMA */ @@ -1431,7 +1431,7 @@ static int lpc43_recvframe(FAR struct lpc43_ethmac_s *priv) uint8_t *buffer; int i; - nllvdbg("rxhead: %p rxcurr: %p segments: %d\n", + nllinfo("rxhead: %p rxcurr: %p segments: %d\n", priv->rxhead, priv->rxcurr, priv->segments); /* Check if there are free buffers. We cannot receive new frames in this @@ -1497,7 +1497,7 @@ static int lpc43_recvframe(FAR struct lpc43_ethmac_s *priv) rxcurr = priv->rxcurr; } - nllvdbg("rxhead: %p rxcurr: %p segments: %d\n", + nllinfo("rxhead: %p rxcurr: %p segments: %d\n", priv->rxhead, priv->rxcurr, priv->segments); /* Check if any errors are reported in the frame */ @@ -1536,7 +1536,7 @@ static int lpc43_recvframe(FAR struct lpc43_ethmac_s *priv) priv->rxhead = (struct eth_rxdesc_s *)rxdesc->rdes3; lpc43_freesegment(priv, rxcurr, priv->segments); - nllvdbg("rxhead: %p d_buf: %p d_len: %d\n", + nllinfo("rxhead: %p d_buf: %p d_len: %d\n", priv->rxhead, dev->d_buf, dev->d_len); return OK; @@ -1563,7 +1563,7 @@ static int lpc43_recvframe(FAR struct lpc43_ethmac_s *priv) priv->rxhead = rxdesc; - nllvdbg("rxhead: %p rxcurr: %p segments: %d\n", + nllinfo("rxhead: %p rxcurr: %p segments: %d\n", priv->rxhead, priv->rxcurr, priv->segments); return -EAGAIN; @@ -1632,7 +1632,7 @@ static void lpc43_receive(FAR struct lpc43_ethmac_s *priv) #ifdef CONFIG_NET_IPv4 if (BUF->type == HTONS(ETHTYPE_IP)) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); /* Handle ARP on input then give the IPv4 packet to the network * layer @@ -1672,7 +1672,7 @@ static void lpc43_receive(FAR struct lpc43_ethmac_s *priv) #ifdef CONFIG_NET_IPv6 if (BUF->type == HTONS(ETHTYPE_IP6)) { - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); /* Give the IPv6 packet to the network layer */ @@ -1709,7 +1709,7 @@ static void lpc43_receive(FAR struct lpc43_ethmac_s *priv) #ifdef CONFIG_NET_ARP if (BUF->type == htons(ETHTYPE_ARP)) { - nllvdbg("ARP frame\n"); + nllinfo("ARP frame\n"); /* Handle ARP packet */ @@ -1768,7 +1768,7 @@ static void lpc43_freeframe(FAR struct lpc43_ethmac_s *priv) struct eth_txdesc_s *txdesc; int i; - nllvdbg("txhead: %p txtail: %p inflight: %d\n", + nllinfo("txhead: %p txtail: %p inflight: %d\n", priv->txhead, priv->txtail, priv->inflight); /* Scan for "in-flight" descriptors owned by the CPU */ @@ -1784,7 +1784,7 @@ static void lpc43_freeframe(FAR struct lpc43_ethmac_s *priv) * TX descriptors. */ - nllvdbg("txtail: %p tdes0: %08x tdes2: %08x tdes3: %08x\n", + nllinfo("txtail: %p tdes0: %08x tdes2: %08x tdes3: %08x\n", txdesc, txdesc->tdes0, txdesc->tdes2, txdesc->tdes3); DEBUGASSERT(txdesc->tdes2 != 0); @@ -1837,7 +1837,7 @@ static void lpc43_freeframe(FAR struct lpc43_ethmac_s *priv) priv->txtail = txdesc; - nllvdbg("txhead: %p txtail: %p inflight: %d\n", + nllinfo("txhead: %p txtail: %p inflight: %d\n", priv->txhead, priv->txtail, priv->inflight); } } @@ -2480,7 +2480,7 @@ static int lpc43_ifdown(struct net_driver_s *dev) static inline void lpc43_txavail_process(FAR struct lpc43_ethmac_s *priv) { - nvdbg("ifup: %d\n", priv->ifup); + ninfo("ifup: %d\n", priv->ifup); /* Ignore the notification if the interface is not yet up */ @@ -2647,7 +2647,7 @@ static int lpc43_addmac(struct net_driver_s *dev, FAR const uint8_t *mac) uint32_t temp; uint32_t registeraddress; - nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); /* Add the MAC address to the hardware multicast hash table */ @@ -2704,7 +2704,7 @@ static int lpc43_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac) uint32_t temp; uint32_t registeraddress; - nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); /* Remove the MAC address to the hardware multicast hash table */ @@ -3172,7 +3172,7 @@ static inline int lpc43_dm9161(FAR struct lpc43_ethmac_s *priv) up_systemreset(); } - nvdbg("PHY ID1: 0x%04X\n", phyval); + ninfo("PHY ID1: 0x%04X\n", phyval); /* Now check the "DAVICOM Specified Configuration Register (DSCR)", Register 16 */ @@ -3330,7 +3330,7 @@ static int lpc43_phyinit(FAR struct lpc43_ethmac_s *priv) /* Remember the selected speed and duplex modes */ - nvdbg("PHYSR[%d]: %04x\n", CONFIG_LPC43_PHYSR, phyval); + ninfo("PHYSR[%d]: %04x\n", CONFIG_LPC43_PHYSR, phyval); #ifdef CONFIG_ETH0_PHY_LAN8720 if ((phyval & (MII_MSR_100BASETXHALF | MII_MSR_100BASETXFULL)) != 0) @@ -3718,7 +3718,7 @@ static void lpc43_macaddress(FAR struct lpc43_ethmac_s *priv) FAR struct net_driver_s *dev = &priv->dev; uint32_t regval; - nllvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", dev->d_ifname, 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], @@ -3786,7 +3786,7 @@ static void lpc43_ipv6multicast(FAR struct lpc43_ethmac_s *priv) mac[4] = tmp16 & 0xff; mac[5] = tmp16 >> 8; - nvdbg("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n", + ninfo("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); (void)lpc43_addmac(dev, mac); @@ -3925,12 +3925,12 @@ static int lpc43_ethconfig(FAR struct lpc43_ethmac_s *priv) /* Reset the Ethernet block */ - nllvdbg("Reset the Ethernet block\n"); + nllinfo("Reset the Ethernet block\n"); lpc43_ethreset(priv); /* Initialize the PHY */ - nllvdbg("Initialize the PHY\n"); + nllinfo("Initialize the PHY\n"); ret = lpc43_phyinit(priv); if (ret < 0) { @@ -3945,7 +3945,7 @@ static int lpc43_ethconfig(FAR struct lpc43_ethmac_s *priv) /* Initialize the MAC and DMA */ - nllvdbg("Initialize the MAC and DMA\n"); + nllinfo("Initialize the MAC and DMA\n"); ret = lpc43_macconfig(priv); if (ret < 0) { @@ -3966,7 +3966,7 @@ static int lpc43_ethconfig(FAR struct lpc43_ethmac_s *priv) /* Enable normal MAC operation */ - nllvdbg("Enable normal operation\n"); + nllinfo("Enable normal operation\n"); return lpc43_macenable(priv); } diff --git a/arch/arm/src/lpc43xx/lpc43_gpdma.c b/arch/arm/src/lpc43xx/lpc43_gpdma.c index 991f80a1cf..37313b901e 100644 --- a/arch/arm/src/lpc43xx/lpc43_gpdma.c +++ b/arch/arm/src/lpc43xx/lpc43_gpdma.c @@ -69,14 +69,14 @@ #ifdef DMA_DEBUG # define dmadbg lldbg # ifdef DMA_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef DMA_VERBOSE # define dmadbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /**************************************************************************** diff --git a/arch/arm/src/lpc43xx/lpc43_idle.c b/arch/arm/src/lpc43xx/lpc43_idle.c index 62f665495e..4dc5a30209 100644 --- a/arch/arm/src/lpc43xx/lpc43_idle.c +++ b/arch/arm/src/lpc43xx/lpc43_idle.c @@ -98,7 +98,7 @@ static void up_idlepm(void) /* Perform board-specific, state-dependent logic here */ - llvdbg("newstate= %d oldstate=%d\n", newstate, oldstate); + llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); /* Then force the global state change */ diff --git a/arch/arm/src/lpc43xx/lpc43_serial.c b/arch/arm/src/lpc43xx/lpc43_serial.c index c12d65597b..78778b609e 100644 --- a/arch/arm/src/lpc43xx/lpc43_serial.c +++ b/arch/arm/src/lpc43xx/lpc43_serial.c @@ -854,7 +854,7 @@ static int up_interrupt(int irq, void *context) /* Read the modem status register (MSR) to clear */ status = up_serialin(priv, LPC43_UART_MSR_OFFSET); - vdbg("MSR: %02x\n", status); + info("MSR: %02x\n", status); break; } @@ -865,7 +865,7 @@ static int up_interrupt(int irq, void *context) /* Read the line status register (LSR) to clear */ status = up_serialin(priv, LPC43_UART_LSR_OFFSET); - vdbg("LSR: %02x\n", status); + info("LSR: %02x\n", status); break; } diff --git a/arch/arm/src/lpc43xx/lpc43_spi.c b/arch/arm/src/lpc43xx/lpc43_spi.c index 46eda5576d..bc9813f44d 100644 --- a/arch/arm/src/lpc43xx/lpc43_spi.c +++ b/arch/arm/src/lpc43xx/lpc43_spi.c @@ -69,14 +69,14 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef CONFIG_DEBUG_INFO # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /* SPI Clocking. diff --git a/arch/arm/src/lpc43xx/lpc43_spifi.c b/arch/arm/src/lpc43xx/lpc43_spifi.c index 41b1703f97..e7e183ab55 100644 --- a/arch/arm/src/lpc43xx/lpc43_spifi.c +++ b/arch/arm/src/lpc43xx/lpc43_spifi.c @@ -382,7 +382,7 @@ static void lpc43_blockerase(struct lpc43_dev_s *priv, off_t sector) priv->operands.dest = SPIFI_BASE + (sector << SPIFI_BLKSHIFT); priv->operands.length = SPIFI_BLKSIZE; - fvdbg("SPIFI_ERASE: dest=%p length=%d\n", + finfo("SPIFI_ERASE: dest=%p length=%d\n", priv->operands.dest, priv->operands.length); result = SPIFI_ERASE(priv, &priv->rom, &priv->operands); @@ -411,7 +411,7 @@ static inline int lpc43_chiperase(struct lpc43_dev_s *priv) priv->operands.dest = SPIFI_BASE; priv->operands.length = SPIFI_BLKSIZE * priv->nblocks; - fvdbg("SPIFI_ERASE: dest=%p length=%d\n", + finfo("SPIFI_ERASE: dest=%p length=%d\n", priv->operands.dest, priv->operands.length); result = SPIFI_ERASE(priv, &priv->rom, &priv->operands); @@ -457,7 +457,7 @@ static int lpc43_pagewrite(FAR struct lpc43_dev_s *priv, FAR uint8_t *dest, priv->operands.dest = dest; priv->operands.length = nbytes; - fvdbg("SPIFI_PROGRAM: src=%p dest=%p length=%d\n", + finfo("SPIFI_PROGRAM: src=%p dest=%p length=%d\n", src, priv->operands.dest, priv->operands.length); result = SPIFI_PROGRAM(priv, &priv->rom, src, &priv->operands); @@ -492,7 +492,7 @@ static inline void lpc43_pageread(FAR struct lpc43_dev_s *priv, FAR uint8_t *dest, FAR const uint8_t *src, size_t nbytes) { - fvdbg("src=%p dest=%p length=%d\n", src, dest, nbytes); + finfo("src=%p dest=%p length=%d\n", src, dest, nbytes); memcpy(dest, src, nbytes); } @@ -511,7 +511,7 @@ static void lpc43_cacheflush(struct lpc43_dev_s *priv) * the cached erase block to FLASH. */ - fvdbg("flags: %02x blkno: %d\n", priv->flags, priv->blkno); + finfo("flags: %02x blkno: %d\n", priv->flags, priv->blkno); if (IS_DIRTY(priv) || IS_ERASED(priv)) { /* Get the SPIFI address corresponding to the cached erase block */ @@ -551,7 +551,7 @@ static FAR uint8_t *lpc43_cacheread(struct lpc43_dev_s *priv, off_t sector) */ blkno = sector >> (SPIFI_BLKSHIFT - SPIFI_512SHIFT); - fvdbg("sector: %ld blkno: %d\n", sector, blkno); + finfo("sector: %ld blkno: %d\n", sector, blkno); /* Check if the requested erase block is already in the cache */ @@ -612,7 +612,7 @@ static void lpc43_cacheerase(struct lpc43_dev_s *priv, off_t sector) if (!IS_ERASED(priv)) { off_t blkno = sector >> (SPIFI_BLKSHIFT - SPIFI_512SHIFT); - fvdbg("sector: %ld blkno: %d\n", sector, blkno); + finfo("sector: %ld blkno: %d\n", sector, blkno); lpc43_blockerase(priv, blkno); SET_ERASED(priv); @@ -646,7 +646,7 @@ static void lpc43_cachewrite(FAR struct lpc43_dev_s *priv, FAR const uint8_t *bu dest = lpc43_cacheread(priv, sector); - fvdbg("dest=%p src=%p sector: %ld flags: %02x\n", + finfo("dest=%p src=%p sector: %ld flags: %02x\n", dest, buffer, sector, priv->flags); /* Erase the block containing this sector if it is not already erased. @@ -657,7 +657,7 @@ static void lpc43_cachewrite(FAR struct lpc43_dev_s *priv, FAR const uint8_t *bu if (!IS_ERASED(priv)) { off_t blkno = sector >> (SPIFI_BLKSHIFT - SPIFI_512SHIFT); - fvdbg("sector: %ld blkno: %d\n", sector, blkno); + finfo("sector: %ld blkno: %d\n", sector, blkno); lpc43_blockerase(priv, blkno); SET_ERASED(priv); @@ -692,7 +692,7 @@ static int lpc43_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nbloc FAR struct lpc43_dev_s *priv = (FAR struct lpc43_dev_s *)dev; size_t blocksleft = nblocks; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); while (blocksleft-- > 0) { @@ -726,7 +726,7 @@ static ssize_t lpc43_bread(FAR struct mtd_dev_s *dev, off_t startblock, size_t n #ifdef CONFIG_SPIFI_SECTOR512 ssize_t nbytes; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* On this device, we can handle the block read just like the byte-oriented read */ @@ -743,7 +743,7 @@ static ssize_t lpc43_bread(FAR struct mtd_dev_s *dev, off_t startblock, size_t n FAR struct lpc43_dev_s *priv = (FAR struct lpc43_dev_s *)dev; ssize_t nbytes; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* On this device, we can handle the block read just like the byte-oriented read */ @@ -774,7 +774,7 @@ static ssize_t lpc43_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_t FAR struct lpc43_dev_s *priv = (FAR struct lpc43_dev_s *)dev; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); lpc43_cachewrite(priv, buffer, startblock, nblocks); @@ -786,7 +786,7 @@ static ssize_t lpc43_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_t FAR struct lpc43_dev_s *priv = (FAR struct lpc43_dev_s *)dev; FAR uint8_t *dest; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* Get the SPIFI address corresponding to the erase block */ @@ -819,7 +819,7 @@ static ssize_t lpc43_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes FAR struct lpc43_dev_s *priv = (FAR struct lpc43_dev_s *)dev; FAR const uint8_t *src; - fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); + finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); /* Get the SPIFI address corresponding sector */ @@ -829,7 +829,7 @@ static ssize_t lpc43_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes lpc43_pageread(priv, buffer, src, nbytes); - fvdbg("return nbytes: %d\n", (int)nbytes); + finfo("return nbytes: %d\n", (int)nbytes); return nbytes; } @@ -842,7 +842,7 @@ static int lpc43_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) FAR struct lpc43_dev_s *priv = (FAR struct lpc43_dev_s *)dev; int ret = -EINVAL; /* Assume good command with bad parameters */ - fvdbg("cmd: %d \n", cmd); + finfo("cmd: %d \n", cmd); switch (cmd) { @@ -871,7 +871,7 @@ static int lpc43_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) #endif ret = OK; - fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n", + finfo("blocksize: %d erasesize: %d neraseblocks: %d\n", geo->blocksize, geo->erasesize, geo->neraseblocks); } } @@ -891,7 +891,7 @@ static int lpc43_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) break; } - fvdbg("return %d\n", ret); + finfo("return %d\n", ret); return ret; } @@ -1038,24 +1038,24 @@ static inline int lpc43_rominit(FAR struct lpc43_dev_s *priv) } } - fvdbg("SPFI:\n"); - fvdbg(" base: %08x\n", priv->rom.base); - fvdbg(" regbase: %08x\n", priv->rom.regbase); - fvdbg(" devsize: %08x\n", priv->rom.devsize); - fvdbg(" memsize: %08x\n", priv->rom.memsize); - fvdbg(" mfger: %02x\n", priv->rom.mfger); - fvdbg(" devtype: %02x\n", priv->rom.devtype); - fvdbg(" devid: %02x\n", priv->rom.devid); - fvdbg(" busy: %02x\n", priv->rom.busy); - fvdbg(" stat: %04x\n", priv->rom.stat.h); - fvdbg(" setprot: %04x\n", priv->rom.setprot); - fvdbg(" writeprot: %04x\n", priv->rom.writeprot); - fvdbg(" memcmd: %08x\n", priv->rom.memcmd); - fvdbg(" progcmd: %08x\n", priv->rom.progcmd); - fvdbg(" sectors: %04x\n", priv->rom.sectors); - fvdbg(" protbytes: %04x\n", priv->rom.protbytes); - fvdbg(" opts: %08x\n", priv->rom.opts); - fvdbg(" errcheck: %08x\n", priv->rom.errcheck); + finfo("SPFI:\n"); + finfo(" base: %08x\n", priv->rom.base); + finfo(" regbase: %08x\n", priv->rom.regbase); + finfo(" devsize: %08x\n", priv->rom.devsize); + finfo(" memsize: %08x\n", priv->rom.memsize); + finfo(" mfger: %02x\n", priv->rom.mfger); + finfo(" devtype: %02x\n", priv->rom.devtype); + finfo(" devid: %02x\n", priv->rom.devid); + finfo(" busy: %02x\n", priv->rom.busy); + finfo(" stat: %04x\n", priv->rom.stat.h); + finfo(" setprot: %04x\n", priv->rom.setprot); + finfo(" writeprot: %04x\n", priv->rom.writeprot); + finfo(" memcmd: %08x\n", priv->rom.memcmd); + finfo(" progcmd: %08x\n", priv->rom.progcmd); + finfo(" sectors: %04x\n", priv->rom.sectors); + finfo(" protbytes: %04x\n", priv->rom.protbytes); + finfo(" opts: %08x\n", priv->rom.opts); + finfo(" errcheck: %08x\n", priv->rom.errcheck); /* Get the largest erase block size */ @@ -1065,11 +1065,11 @@ static inline int lpc43_rominit(FAR struct lpc43_dev_s *priv) sectors = priv->rom.sectors; log2 = 0; - fvdbg("FLASH Geometry:\n"); + finfo("FLASH Geometry:\n"); while (sectors > 0) { - fvdbg(" log2: %d rept: %d\n", desc->log2, desc->rept); + finfo(" log2: %d rept: %d\n", desc->log2, desc->rept); /* Check if this is the largest erase block size seen */ @@ -1091,10 +1091,10 @@ static inline int lpc43_rominit(FAR struct lpc43_dev_s *priv) priv->blksize = (1 << log2); priv->nblocks = (priv->rom.memsize - CONFIG_SPIFI_OFFSET) / priv->blksize; - fvdbg("Driver FLASH Geometry:\n"); - fvdbg(" blkshift: %d\n", priv->blkshift); - fvdbg(" blksize: %08x\n", priv->blksize); - fvdbg(" nblocks: %d\n", priv->nblocks); + finfo("Driver FLASH Geometry:\n"); + finfo(" blkshift: %d\n", priv->blkshift); + finfo(" blksize: %08x\n", priv->blksize); + finfo(" nblocks: %d\n", priv->nblocks); #ifdef CONFIG_SPIFI_SECTOR512 DEBUGASSERT(log2 > 9); @@ -1106,10 +1106,10 @@ static inline int lpc43_rominit(FAR struct lpc43_dev_s *priv) priv->nblocks = ((priv->rom.memsize - CONFIG_SPIFI_OFFSET) >> SPIFI_BLKSHIFT); - fvdbg("Driver FLASH Geometry:\n"); - fvdbg(" blkshift: %d\n", SPIFI_BLKSHIFT); - fvdbg(" blksize: %08x\n", SPIFI_BLKSIZE); - fvdbg(" nblocks: %d\n", priv->nblocks); + finfo("Driver FLASH Geometry:\n"); + finfo(" blkshift: %d\n", SPIFI_BLKSHIFT); + finfo(" blksize: %08x\n", SPIFI_BLKSIZE); + finfo(" nblocks: %d\n", priv->nblocks); #endif return OK; @@ -1208,7 +1208,7 @@ FAR struct mtd_dev_s *lpc43_spifi_initialize(void) /* Return the implementation-specific state structure as the MTD device */ - fvdbg("Return %p\n", priv); + finfo("Return %p\n", priv); return (FAR struct mtd_dev_s *)priv; } diff --git a/arch/arm/src/lpc43xx/lpc43_ssp.c b/arch/arm/src/lpc43xx/lpc43_ssp.c index 0d227fa8fa..61c8ce3c4e 100644 --- a/arch/arm/src/lpc43xx/lpc43_ssp.c +++ b/arch/arm/src/lpc43xx/lpc43_ssp.c @@ -78,14 +78,14 @@ #ifdef CONFIG_SSP_DEBUG # define sspdbg lldbg # ifdef CONFIG_SSP_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef CONFIG_SSP_VERBOSE # define sspdbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif @@ -576,7 +576,7 @@ static void ssp_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, * and (3) there are more bytes to be sent. */ - spivdbg("TX: rxpending: %d nwords: %d\n", rxpending, nwords); + spiinfo("TX: rxpending: %d nwords: %d\n", rxpending, nwords); while ((ssp_getreg(priv, LPC43_SSP_SR_OFFSET) & SSP_SR_TNF) && (rxpending < LPC43_SSP_FIFOSZ) && nwords) { @@ -599,7 +599,7 @@ static void ssp_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, /* Now, read the RX data from the RX FIFO while the RX FIFO is not empty */ - spivdbg("RX: rxpending: %d\n", rxpending); + spiinfo("RX: rxpending: %d\n", rxpending); while (ssp_getreg(priv, LPC43_SSP_SR_OFFSET) & SSP_SR_RNE) { data = ssp_getreg(priv, LPC43_SSP_DR_OFFSET); diff --git a/arch/arm/src/lpc43xx/lpc43_usb0dev.c b/arch/arm/src/lpc43xx/lpc43_usb0dev.c index 57e3ef2c8c..082f35eb3b 100644 --- a/arch/arm/src/lpc43xx/lpc43_usb0dev.c +++ b/arch/arm/src/lpc43xx/lpc43_usb0dev.c @@ -1228,7 +1228,7 @@ static inline void lpc43_ep0setup(struct lpc43_usbdev_s *priv) priv->ep0buf_len = len; - ullvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n", + ullinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n", ctrl->type, ctrl->req, value, index, len); /* Starting a control request - update state */ @@ -1393,7 +1393,7 @@ static inline void lpc43_ep0setup(struct lpc43_usbdev_s *priv) if (((ctrl->type & USB_REQ_RECIPIENT_MASK) == USB_REQ_RECIPIENT_DEVICE) && value == USB_FEATURE_TESTMODE) { - ullvdbg("test mode: %d\n", index); + ullinfo("test mode: %d\n", index); } else if ((ctrl->type & USB_REQ_RECIPIENT_MASK) != USB_REQ_RECIPIENT_ENDPOINT) { @@ -2206,7 +2206,7 @@ static int lpc43_epsubmit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r if (!req || !req->callback || !req->buf || !ep) { usbtrace(TRACE_DEVERROR(LPC43_TRACEERR_INVALIDPARMS), 0); - ullvdbg("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); + ullinfo("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); return -EINVAL; } #endif diff --git a/arch/arm/src/nuc1xx/nuc_idle.c b/arch/arm/src/nuc1xx/nuc_idle.c index 9dd225313f..e0e0131059 100644 --- a/arch/arm/src/nuc1xx/nuc_idle.c +++ b/arch/arm/src/nuc1xx/nuc_idle.c @@ -99,7 +99,7 @@ static void up_idlepm(void) /* Perform board-specific, state-dependent logic here */ - llvdbg("newstate= %d oldstate=%d\n", newstate, oldstate); + llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); /* Then force the global state change */ diff --git a/arch/arm/src/sam34/sam4cm_freerun.c b/arch/arm/src/sam34/sam4cm_freerun.c index 63bcea2031..429ae813c5 100644 --- a/arch/arm/src/sam34/sam4cm_freerun.c +++ b/arch/arm/src/sam34/sam4cm_freerun.c @@ -121,7 +121,7 @@ int sam_freerun_initialize(struct sam_freerun_s *freerun, int chan, uint32_t cmr; int ret; - tcvdbg("chan=%d resolution=%d usec\n", chan, resolution); + tcinfo("chan=%d resolution=%d usec\n", chan, resolution); DEBUGASSERT(freerun && resolution > 0); /* Get the TC frequency the corresponds to the requested resolution */ @@ -137,7 +137,7 @@ int sam_freerun_initialize(struct sam_freerun_s *freerun, int chan, return ret; } - tcvdbg("frequency=%lu, divisor=%u, cmr=%08lx\n", + tcinfo("frequency=%lu, divisor=%u, cmr=%08lx\n", (unsigned long)frequency, (unsigned long)divisor, (unsigned long)cmr); @@ -257,7 +257,7 @@ int sam_freerun_counter(struct sam_freerun_s *freerun, struct timespec *ts) leave_critical_section(flags); - tcvdbg("counter=%lu (%lu) overflow=%lu, sr=%08lx\n", + tcinfo("counter=%lu (%lu) overflow=%lu, sr=%08lx\n", (unsigned long)counter, (unsigned long)verify, (unsigned long)overflow, (unsigned long)sr); @@ -277,7 +277,7 @@ int sam_freerun_counter(struct sam_freerun_s *freerun, struct timespec *ts) ts->tv_sec = sec; ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - tcvdbg("usec=%llu ts=(%lu, %lu)\n", + tcinfo("usec=%llu ts=(%lu, %lu)\n", usec, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); return OK; diff --git a/arch/arm/src/sam34/sam4cm_oneshot.c b/arch/arm/src/sam34/sam4cm_oneshot.c index eeda41bc8e..79a668ee0f 100644 --- a/arch/arm/src/sam34/sam4cm_oneshot.c +++ b/arch/arm/src/sam34/sam4cm_oneshot.c @@ -91,7 +91,7 @@ static void sam_oneshot_handler(TC_HANDLE tch, void *arg, uint32_t sr) oneshot_handler_t oneshot_handler; void *oneshot_arg; - tcllvdbg("Expired...\n"); + tcllinfo("Expired...\n"); DEBUGASSERT(oneshot && oneshot->handler); /* The clock was stopped, but not disabled when the RC match occurred. @@ -148,7 +148,7 @@ int sam_oneshot_initialize(struct sam_oneshot_s *oneshot, int chan, uint32_t cmr; int ret; - tcvdbg("chan=%d resolution=%d usec\n", chan, resolution); + tcinfo("chan=%d resolution=%d usec\n", chan, resolution); DEBUGASSERT(oneshot && resolution > 0); /* Get the TC frequency the corresponds to the requested resolution */ @@ -164,7 +164,7 @@ int sam_oneshot_initialize(struct sam_oneshot_s *oneshot, int chan, return ret; } - tcvdbg("frequency=%lu, divisor=%lu, cmr=%08lx\n", + tcinfo("frequency=%lu, divisor=%lu, cmr=%08lx\n", (unsigned long)frequency, (unsigned long)divisor, (unsigned long)cmr); @@ -258,7 +258,7 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, struct sam_freerun_s *freer uint64_t regval; irqstate_t flags; - tcvdbg("handler=%p arg=%p, ts=(%lu, %lu)\n", + tcinfo("handler=%p arg=%p, ts=(%lu, %lu)\n", handler, arg, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); DEBUGASSERT(oneshot && handler && ts); @@ -269,7 +269,7 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, struct sam_freerun_s *freer { /* Yes.. then cancel it */ - tcvdbg("Already running... cancelling\n"); + tcinfo("Already running... cancelling\n"); (void)sam_oneshot_cancel(oneshot, freerun, NULL); } @@ -291,7 +291,7 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, struct sam_freerun_s *freer regval = (usec * (uint64_t)sam_tc_divfreq(oneshot->tch)) / USEC_PER_SEC; - tcvdbg("usec=%llu regval=%08llx\n", usec, regval); + tcinfo("usec=%llu regval=%08llx\n", usec, regval); DEBUGASSERT(regval <= UINT16_MAX); /* Set up to receive the callback when the interrupt occurs */ @@ -400,7 +400,7 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, struct sam_freerun_s *free * REVISIT: This does not appear to be the case. */ - tcvdbg("Cancelling...\n"); + tcinfo("Cancelling...\n"); count = sam_tc_getcounter(oneshot->tch); rc = sam_tc_getregister(oneshot->tch, TC_REGC); @@ -436,7 +436,7 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, struct sam_freerun_s *free * oneshot timer. */ - tcvdbg("rc=%lu count=%lu usec=%lu\n", + tcinfo("rc=%lu count=%lu usec=%lu\n", (unsigned long)rc, (unsigned long)count, (unsigned long)usec); /* REVISIT: I am not certain why the timer counter value sometimes @@ -481,7 +481,7 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, struct sam_freerun_s *free ts->tv_nsec = (unsigned long)nsec; } - tcvdbg("remaining (%lu, %lu)\n", + tcinfo("remaining (%lu, %lu)\n", (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); } diff --git a/arch/arm/src/sam34/sam4cm_tc.c b/arch/arm/src/sam34/sam4cm_tc.c index 91ab9c3ca2..22afa97928 100644 --- a/arch/arm/src/sam34/sam4cm_tc.c +++ b/arch/arm/src/sam34/sam4cm_tc.c @@ -876,7 +876,7 @@ TC_HANDLE sam_tc_allocate(int channel, int mode) * access to the requested channel. */ - tcvdbg("channel=%d mode=%08x\n", channel, mode); + tcinfo("channel=%d mode=%08x\n", channel, mode); chan = sam_tc_initialize(channel); if (chan) @@ -902,7 +902,7 @@ TC_HANDLE sam_tc_allocate(int channel, int mode) /* Return an opaque reference to the channel */ - tcvdbg("Returning %p\n", chan); + tcinfo("Returning %p\n", chan); return (TC_HANDLE)chan; } @@ -924,7 +924,7 @@ void sam_tc_free(TC_HANDLE handle) { struct sam_chan_s *chan = (struct sam_chan_s *)handle; - tcvdbg("Freeing %p channel=%d inuse=%d\n", chan, chan->chan, chan->inuse); + tcinfo("Freeing %p channel=%d inuse=%d\n", chan, chan->chan, chan->inuse); DEBUGASSERT(chan && chan->inuse); /* Make sure that interrupts are detached and disabled and that the channel @@ -957,7 +957,7 @@ void sam_tc_start(TC_HANDLE handle) { struct sam_chan_s *chan = (struct sam_chan_s *)handle; - tcvdbg("Starting channel %d inuse=%d\n", chan->chan, chan->inuse); + tcinfo("Starting channel %d inuse=%d\n", chan->chan, chan->inuse); DEBUGASSERT(chan && chan->inuse); /* Read the SR to clear any pending interrupts on this channel */ @@ -989,7 +989,7 @@ void sam_tc_stop(TC_HANDLE handle) { struct sam_chan_s *chan = (struct sam_chan_s *)handle; - tcvdbg("Stopping channel %d inuse=%d\n", chan->chan, chan->inuse); + tcinfo("Stopping channel %d inuse=%d\n", chan->chan, chan->inuse); DEBUGASSERT(chan && chan->inuse); sam_chan_putreg(chan, SAM_TC_CCR_OFFSET, TC_CCR_CLKDIS); @@ -1096,7 +1096,7 @@ void sam_tc_setregister(TC_HANDLE handle, int regid, uint32_t regval) DEBUGASSERT(chan && regid < TC_NREGISTERS); - tcvdbg("Channel %d: Set register RC%d to %08lx\n", + tcinfo("Channel %d: Set register RC%d to %08lx\n", chan->chan, regid, (unsigned long)regval); sam_chan_putreg(chan, g_regoffset[regid], regval); @@ -1233,7 +1233,7 @@ int sam_tc_divisor(uint32_t frequency, uint32_t *div, uint32_t *tcclks) uint32_t ftcin = sam_tc_infreq(); int ndx = 0; - tcvdbg("frequency=%d\n", frequency); + tcinfo("frequency=%d\n", frequency); /* Satisfy lower bound. That is, the value of the divider such that: * @@ -1270,7 +1270,7 @@ int sam_tc_divisor(uint32_t frequency, uint32_t *div, uint32_t *tcclks) if (div) { uint32_t value = sam_tc_freqdiv_lookup(ftcin, ndx); - tcvdbg("return div=%lu\n", (unsigned long)value); + tcinfo("return div=%lu\n", (unsigned long)value); *div = value; } @@ -1278,7 +1278,7 @@ int sam_tc_divisor(uint32_t frequency, uint32_t *div, uint32_t *tcclks) if (tcclks) { - tcvdbg("return tcclks=%08lx\n", (unsigned long)TC_CMR_TCCLKS(ndx)); + tcinfo("return tcclks=%08lx\n", (unsigned long)TC_CMR_TCCLKS(ndx)); *tcclks = TC_CMR_TCCLKS(ndx); } diff --git a/arch/arm/src/sam34/sam4cm_tc.h b/arch/arm/src/sam34/sam4cm_tc.h index 85520d84d9..e71ffdb42b 100644 --- a/arch/arm/src/sam34/sam4cm_tc.h +++ b/arch/arm/src/sam34/sam4cm_tc.h @@ -84,14 +84,14 @@ #ifdef CONFIG_SAM34_TC_DEBUG # define tcdbg dbg -# define tcvdbg vdbg +# define tcinfo info # define tclldbg lldbg -# define tcllvdbg llvdbg +# define tcllinfo llinfo #else # define tcdbg(x...) -# define tcvdbg(x...) +# define tcinfo(x...) # define tclldbg(x...) -# define tcllvdbg(x...) +# define tcllinfo(x...) #endif /**************************************************************************** diff --git a/arch/arm/src/sam34/sam4cm_tickless.c b/arch/arm/src/sam34/sam4cm_tickless.c index 7d13e8756e..a942d429f3 100644 --- a/arch/arm/src/sam34/sam4cm_tickless.c +++ b/arch/arm/src/sam34/sam4cm_tickless.c @@ -197,7 +197,7 @@ static struct sam_tickless_s g_tickless; static void sam_oneshot_handler(void *arg) { - tcllvdbg("Expired...\n"); + tcllinfo("Expired...\n"); sched_timer_expiration(); } diff --git a/arch/arm/src/sam34/sam_dmac.c b/arch/arm/src/sam34/sam_dmac.c index bcc8fb03f0..2c60c958ba 100644 --- a/arch/arm/src/sam34/sam_dmac.c +++ b/arch/arm/src/sam34/sam_dmac.c @@ -1354,7 +1354,7 @@ static int sam_dmainterrupt(int irq, void *context) void weak_function up_dmainitialize(void) { - dmallvdbg("Initialize DMAC0\n"); + dmallinfo("Initialize DMAC0\n"); /* Enable peripheral clock */ @@ -1460,7 +1460,7 @@ DMA_HANDLE sam_dmachannel(uint32_t chflags) sam_givechsem(); - dmavdbg("chflags: %08x returning dmach: %p\n", (int)chflags, dmach); + dmainfo("chflags: %08x returning dmach: %p\n", (int)chflags, dmach); return (DMA_HANDLE)dmach; } @@ -1486,7 +1486,7 @@ void sam_dmaconfig(DMA_HANDLE handle, uint32_t chflags) /* Set the new DMA channel flags. */ - dmavdbg("chflags: %08x\n", (int)chflags); + dmainfo("chflags: %08x\n", (int)chflags); dmach->flags = chflags; } @@ -1507,7 +1507,7 @@ void sam_dmafree(DMA_HANDLE handle) { struct sam_dma_s *dmach = (struct sam_dma_s *)handle; - dmavdbg("dmach: %p\n", dmach); + dmainfo("dmach: %p\n", dmach); DEBUGASSERT((dmach != NULL) && (dmach->inuse)); /* Mark the channel no longer in use. Clearing the inuse flag is an atomic @@ -1536,10 +1536,10 @@ int sam_dmatxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr, size_t nby size_t maxtransfer; int ret = OK; - dmavdbg("dmach: %p paddr: %08x maddr: %08x nbytes: %d\n", + dmainfo("dmach: %p paddr: %08x maddr: %08x nbytes: %d\n", dmach, (int)paddr, (int)maddr, (int)nbytes); DEBUGASSERT(dmach); - dmavdbg("llhead: %p lltail: %p\n", dmach->llhead, dmach->lltail); + dmainfo("llhead: %p lltail: %p\n", dmach->llhead, dmach->lltail); /* The maximum transfer size in bytes depends upon the maximum number of * transfers and the number of bytes per transfer. @@ -1604,10 +1604,10 @@ int sam_dmarxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr, size_t nby size_t maxtransfer; int ret = OK; - dmavdbg("dmach: %p paddr: %08x maddr: %08x nbytes: %d\n", + dmainfo("dmach: %p paddr: %08x maddr: %08x nbytes: %d\n", dmach, (int)paddr, (int)maddr, (int)nbytes); DEBUGASSERT(dmach); - dmavdbg("llhead: %p lltail: %p\n", dmach->llhead, dmach->lltail); + dmainfo("llhead: %p lltail: %p\n", dmach->llhead, dmach->lltail); /* The maximum transfer size in bytes depends upon the maximum number of * transfers and the number of bytes per transfer. @@ -1667,7 +1667,7 @@ int sam_dmastart(DMA_HANDLE handle, dma_callback_t callback, void *arg) struct sam_dma_s *dmach = (struct sam_dma_s *)handle; int ret = -EINVAL; - dmavdbg("dmach: %p callback: %p arg: %p\n", dmach, callback, arg); + dmainfo("dmach: %p callback: %p arg: %p\n", dmach, callback, arg); DEBUGASSERT(dmach != NULL); /* Verify that the DMA has been setup (i.e., at least one entry in the @@ -1711,7 +1711,7 @@ void sam_dmastop(DMA_HANDLE handle) struct sam_dma_s *dmach = (struct sam_dma_s *)handle; irqstate_t flags; - dmavdbg("dmach: %p\n", dmach); + dmainfo("dmach: %p\n", dmach); DEBUGASSERT(dmach != NULL); flags = enter_critical_section(); diff --git a/arch/arm/src/sam34/sam_emac.c b/arch/arm/src/sam34/sam_emac.c index 957ea10d34..e6fdd770ed 100644 --- a/arch/arm/src/sam34/sam_emac.c +++ b/arch/arm/src/sam34/sam_emac.c @@ -753,7 +753,7 @@ static int sam_transmit(struct sam_emac_s *priv) uint32_t regval; uint32_t status; - nllvdbg("d_len: %d txhead: %d\n", dev->d_len, priv->txhead); + nllinfo("d_len: %d txhead: %d\n", dev->d_len, priv->txhead); sam_dumppacket("Transmit packet", dev->d_buf, dev->d_len); /* Check parameter */ @@ -830,7 +830,7 @@ static int sam_transmit(struct sam_emac_s *priv) if (sam_txfree(priv) < 1) { - nllvdbg("Disabling RX interrupts\n"); + nllinfo("Disabling RX interrupts\n"); sam_putreg(priv, SAM_EMAC_IDR, EMAC_INT_RCOMP); } @@ -1010,7 +1010,7 @@ static int sam_recvframe(struct sam_emac_s *priv) sam_cmcc_invalidate((uintptr_t)rxdesc, (uintptr_t)rxdesc + sizeof(struct emac_rxdesc_s)); - nllvdbg("rxndx: %d\n", rxndx); + nllinfo("rxndx: %d\n", rxndx); while ((rxdesc->addr & EMACRXD_ADDR_OWNER) != 0) { @@ -1060,7 +1060,7 @@ static int sam_recvframe(struct sam_emac_s *priv) { if (rxndx == priv->rxndx) { - nllvdbg("ERROR: No EOF (Invalid of buffers too small)\n"); + nllinfo("ERROR: No EOF (Invalid of buffers too small)\n"); do { /* Give ownership back to the EMAC */ @@ -1107,7 +1107,7 @@ static int sam_recvframe(struct sam_emac_s *priv) /* Frame size from the EMAC */ dev->d_len = (rxdesc->status & EMACRXD_STA_FRLEN_MASK); - nllvdbg("packet %d-%d (%d)\n", priv->rxndx, rxndx, dev->d_len); + nllinfo("packet %d-%d (%d)\n", priv->rxndx, rxndx, dev->d_len); /* All data have been copied in the application frame buffer, * release the RX descriptor @@ -1132,7 +1132,7 @@ static int sam_recvframe(struct sam_emac_s *priv) * all of the data. */ - nllvdbg("rxndx: %d d_len: %d\n", priv->rxndx, dev->d_len); + nllinfo("rxndx: %d d_len: %d\n", priv->rxndx, dev->d_len); if (pktlen < dev->d_len) { @@ -1167,7 +1167,7 @@ static int sam_recvframe(struct sam_emac_s *priv) /* No packet was found */ priv->rxndx = rxndx; - nllvdbg("rxndx: %d\n", priv->rxndx); + nllinfo("rxndx: %d\n", priv->rxndx); return -EAGAIN; } @@ -1222,7 +1222,7 @@ static void sam_receive(struct sam_emac_s *priv) #ifdef CONFIG_NET_IPv4 if (BUF->type == HTONS(ETHTYPE_IP)) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); /* Handle ARP on input then give the IPv4 packet to the network * layer @@ -1262,7 +1262,7 @@ static void sam_receive(struct sam_emac_s *priv) #ifdef CONFIG_NET_IPv6 if (BUF->type == HTONS(ETHTYPE_IP6)) { - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); /* Give the IPv6 packet to the network layer */ @@ -1299,7 +1299,7 @@ static void sam_receive(struct sam_emac_s *priv) #ifdef CONFIG_NET_ARP if (BUF->type == htons(ETHTYPE_ARP)) { - nllvdbg("ARP frame\n"); + nllinfo("ARP frame\n"); /* Handle ARP packet */ @@ -1442,7 +1442,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv) imr = sam_getreg(priv, SAM_EMAC_IMR); pending = isr & ~(imr | EMAC_INT_UNUSED); - nllvdbg("isr: %08x pending: %08x\n", isr, pending); + nllinfo("isr: %08x pending: %08x\n", isr, pending); /* Check for the completion of a transmission. This should be done before * checking for received data (because receiving can cause another transmission @@ -1962,7 +1962,7 @@ static int sam_ifup(struct net_driver_s *dev) /* Configure the EMAC interface for normal operation. */ - nllvdbg("Initialize the EMAC\n"); + nllinfo("Initialize the EMAC\n"); sam_emac_configure(priv); /* Set the MAC address (should have been configured while we were down) */ @@ -1994,11 +1994,11 @@ static int sam_ifup(struct net_driver_s *dev) } while (sam_linkup(priv) == 0); - nllvdbg("Link detected \n"); + nllinfo("Link detected \n"); /* Enable normal MAC operation */ - nllvdbg("Enable normal operation\n"); + nllinfo("Enable normal operation\n"); /* Set and activate a timer process */ @@ -2077,7 +2077,7 @@ static int sam_ifdown(struct net_driver_s *dev) static inline void sam_txavail_process(FAR struct sam_emac_s *priv) { - nllvdbg("ifup: %d\n", priv->ifup); + nllinfo("ifup: %d\n", priv->ifup); /* Ignore the notification if the interface is not yet up */ @@ -2331,7 +2331,7 @@ static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac) unsigned int bit; UNUSED(priv); - nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); /* Calculate the 6-bit has table index */ @@ -2405,7 +2405,7 @@ static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac) unsigned int bit; UNUSED(priv); - nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); /* Calculate the 6-bit has table index */ @@ -2601,21 +2601,21 @@ static void sam_phydump(struct sam_emac_s *priv) sam_putreg(priv, SAM_EMAC_NCR, regval); #ifdef CONFIG_SAM34_EMAC_RMII - nllvdbg("RMII Registers (Address %02x)\n", priv->phyaddr); + nllinfo("RMII Registers (Address %02x)\n", priv->phyaddr); #else /* defined(CONFIG_SAM34_EMAC_MII) */ - nllvdbg("MII Registers (Address %02x)\n", priv->phyaddr); + nllinfo("MII Registers (Address %02x)\n", priv->phyaddr); #endif sam_phyread(priv, priv->phyaddr, MII_MCR, &phyval); - nllvdbg(" MCR: %04x\n", phyval); + nllinfo(" MCR: %04x\n", phyval); sam_phyread(priv, priv->phyaddr, MII_MSR, &phyval); - nllvdbg(" MSR: %04x\n", phyval); + nllinfo(" MSR: %04x\n", phyval); sam_phyread(priv, priv->phyaddr, MII_ADVERTISE, &phyval); - nllvdbg(" ADVERTISE: %04x\n", phyval); + nllinfo(" ADVERTISE: %04x\n", phyval); sam_phyread(priv, priv->phyaddr, MII_LPA, &phyval); - nllvdbg(" LPR: %04x\n", phyval); + nllinfo(" LPR: %04x\n", phyval); sam_phyread(priv, priv->phyaddr, CONFIG_SAM34_EMAC_PHYSR, &phyval); - nllvdbg(" PHYSR: %04x\n", phyval); + nllinfo(" PHYSR: %04x\n", phyval); /* Disable management port */ @@ -2738,7 +2738,7 @@ static int sam_phyreset(struct sam_emac_s *priv) int timeout; int ret; - nllvdbg(" sam_phyreset\n"); + nllinfo(" sam_phyreset\n"); /* Enable management port */ @@ -2805,7 +2805,7 @@ static int sam_phyfind(struct sam_emac_s *priv, uint8_t *phyaddr) unsigned int offset; int ret = -ESRCH; - nllvdbg("Find a valid PHY address\n"); + nllinfo("Find a valid PHY address\n"); /* Enable management port */ @@ -2850,10 +2850,10 @@ static int sam_phyfind(struct sam_emac_s *priv, uint8_t *phyaddr) if (ret == OK) { - nllvdbg(" PHYID1: %04x PHY addr: %d\n", phyval, candidate); + nllinfo(" PHYID1: %04x PHY addr: %d\n", phyval, candidate); *phyaddr = candidate; sam_phyread(priv, candidate, CONFIG_SAM34_EMAC_PHYSR, &phyval); - nllvdbg(" PHYSR: %04x PHY addr: %d\n", phyval, candidate); + nllinfo(" PHYSR: %04x PHY addr: %d\n", phyval, candidate); } /* Disable management port */ @@ -3030,7 +3030,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) goto errout; } - nllvdbg("PHYID1: %04x PHY address: %02x\n", phyid1, priv->phyaddr); + nllinfo("PHYID1: %04x PHY address: %02x\n", phyid1, priv->phyaddr); ret = sam_phyread(priv, priv->phyaddr, MII_PHYID2, &phyid2); if (ret < 0) @@ -3039,14 +3039,14 @@ static int sam_autonegotiate(struct sam_emac_s *priv) goto errout; } - nllvdbg("PHYID2: %04x PHY address: %02x\n", phyid2, priv->phyaddr); + nllinfo("PHYID2: %04x PHY address: %02x\n", phyid2, priv->phyaddr); if (phyid1 == MII_OUI_MSB && ((phyid2 & MII_PHYID2_OUI_MASK) >> MII_PHYID2_OUI_SHIFT) == MII_OUI_LSB) { - nllvdbg(" Vendor Model Number: %04x\n", + nllinfo(" Vendor Model Number: %04x\n", (phyid2 & MII_PHYID2_MODEL_MASK) >> MII_PHYID2_MODEL_SHIFT); - nllvdbg(" Model Revision Number: %04x\n", + nllinfo(" Model Revision Number: %04x\n", (phyid2 & MII_PHYID2_REV_MASK) >> MII_PHYID2_REV_SHIFT); } else @@ -3118,7 +3118,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) goto errout; } - nllvdbg(" MCR: %04x\n", mcr); + nllinfo(" MCR: %04x\n", mcr); /* Check AutoNegotiate complete */ @@ -3138,7 +3138,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) { /* Yes.. break out of the loop */ - nllvdbg("AutoNegotiate complete\n"); + nllinfo("AutoNegotiate complete\n"); break; } @@ -3297,7 +3297,7 @@ static bool sam_linkup(struct sam_emac_s *priv) /* Start the EMAC transfers */ - nllvdbg("Link is up\n"); + nllinfo("Link is up\n"); linkup = true; errout: @@ -3598,7 +3598,7 @@ static void sam_macaddress(struct sam_emac_s *priv) struct net_driver_s *dev = &priv->dev; uint32_t regval; - nllvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", dev->d_ifname, 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], @@ -3664,7 +3664,7 @@ static void sam_ipv6multicast(struct sam_emac_s *priv) mac[4] = tmp16 & 0xff; mac[5] = tmp16 >> 8; - nvdbg("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n", + ninfo("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); (void)sam_addmac(dev, mac); @@ -3710,7 +3710,7 @@ static int sam_emac_configure(struct sam_emac_s *priv) { uint32_t regval; - nllvdbg("Entry\n"); + nllinfo("Entry\n"); /* Enable clocking to the EMAC peripheral */ diff --git a/arch/arm/src/sam34/sam_hsmci.c b/arch/arm/src/sam34/sam_hsmci.c index d84fb0175f..bf5f3c6e71 100644 --- a/arch/arm/src/sam34/sam_hsmci.c +++ b/arch/arm/src/sam34/sam_hsmci.c @@ -1320,7 +1320,7 @@ static int sam_interrupt(int irq, void *context) { /* Yes.. Was the error some kind of timeout? */ - fllvdbg("ERROR: events: %08x SR: %08x\n", + fllinfo("ERROR: events: %08x SR: %08x\n", priv->cmdrmask, enabled); if ((pending & HSMCI_RESPONSE_TIMEOUT_ERRORS) != 0) @@ -1754,7 +1754,7 @@ static int sam_sendcmd(FAR struct sdio_dev_s *dev, /* Write the fully decorated command to CMDR */ - fvdbg("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval); + finfo("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval); putreg32(regval, SAM_HSMCI_CMDR); sam_cmdsample1(SAMPLENDX_AFTER_CMDR); return OK; @@ -2348,7 +2348,7 @@ static void sam_callbackenable(FAR struct sdio_dev_s *dev, { struct sam_dev_s *priv = (struct sam_dev_s *)dev; - fvdbg("eventset: %02x\n", eventset); + finfo("eventset: %02x\n", eventset); DEBUGASSERT(priv != NULL); priv->cbevents = eventset; @@ -2384,7 +2384,7 @@ static int sam_registercallback(FAR struct sdio_dev_s *dev, /* Disable callbacks and register this callback and is argument */ - fvdbg("Register %p(%p)\n", callback, arg); + finfo("Register %p(%p)\n", callback, arg); DEBUGASSERT(priv != NULL); priv->cbevents = 0; @@ -2581,7 +2581,7 @@ static void sam_callback(void *arg) /* Is a callback registered? */ DEBUGASSERT(priv != NULL); - fvdbg("Callback %p(%p) cbevents: %02x cdstatus: %02x\n", + finfo("Callback %p(%p) cbevents: %02x cdstatus: %02x\n", priv->callback, priv->cbarg, priv->cbevents, priv->cdstatus); if (priv->callback) @@ -2626,14 +2626,14 @@ static void sam_callback(void *arg) { /* Yes.. queue it */ - fllvdbg("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); + fllinfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); (void)work_queue(LPWORK, &priv->cbwork, (worker_t)priv->callback, priv->cbarg, 0); } else { /* No.. then just call the callback here */ - fvdbg("Callback to %p(%p)\n", priv->callback, priv->cbarg); + finfo("Callback to %p(%p)\n", priv->callback, priv->cbarg); priv->callback(priv->cbarg); } } @@ -2741,7 +2741,7 @@ void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot) priv->cdstatus &= ~SDIO_STATUS_PRESENT; } - fllvdbg("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus); + fllinfo("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus); /* Perform any requested callback if the status has changed */ @@ -2786,7 +2786,7 @@ void sdio_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect) priv->cdstatus &= ~SDIO_STATUS_WRPROTECTED; } - fvdbg("cdstatus: %02x\n", priv->cdstatus); + finfo("cdstatus: %02x\n", priv->cdstatus); leave_critical_section(flags); } #endif /* CONFIG_SAM34_HSMCI */ diff --git a/arch/arm/src/sam34/sam_rtc.c b/arch/arm/src/sam34/sam_rtc.c index 8dbe4e9e1a..1877f7d111 100644 --- a/arch/arm/src/sam34/sam_rtc.c +++ b/arch/arm/src/sam34/sam_rtc.c @@ -90,14 +90,14 @@ #ifdef CONFIG_DEBUG_RTC # define rtcdbg dbg -# define rtcvdbg vdbg +# define rtcinfo info # define rtclldbg lldbg -# define rtcllvdbg llvdbg +# define rtcllinfo llinfo #else # define rtcdbg(x...) -# define rtcvdbg(x...) +# define rtcinfo(x...) # define rtclldbg(x...) -# define rtcllvdbg(x...) +# define rtcllinfo(x...) #endif /************************************************************************************ diff --git a/arch/arm/src/sam34/sam_rtt.c b/arch/arm/src/sam34/sam_rtt.c index a0c94f7ef7..e281723114 100644 --- a/arch/arm/src/sam34/sam_rtt.c +++ b/arch/arm/src/sam34/sam_rtt.c @@ -82,10 +82,10 @@ #ifdef CONFIG_DEBUG_RTT # define rttdbg lldbg -# define rttvdbg llvdbg +# define rttinfo llinfo #else # define rttdbg(x...) -# define rttvdbg(x...) +# define rttinfo(x...) #endif /**************************************************************************** @@ -287,7 +287,7 @@ static int sam34_interrupt(int irq, FAR void *context) { FAR struct sam34_lowerhalf_s *priv = &g_tcdev; - rttvdbg("Entry\n"); + rttinfo("Entry\n"); DEBUGASSERT(irq == SAM_IRQ_RTT); /* Check if the interrupt is really pending */ @@ -373,7 +373,7 @@ static int sam34_start(FAR struct timer_lowerhalf_s *lower) uint32_t mr; uint32_t vr; - rttvdbg("Entry\n"); + rttinfo("Entry\n"); DEBUGASSERT(priv); if (priv->started) @@ -433,7 +433,7 @@ static int sam34_start(FAR struct timer_lowerhalf_s *lower) static int sam34_stop(FAR struct timer_lowerhalf_s *lower) { FAR struct sam34_lowerhalf_s *priv = (FAR struct sam34_lowerhalf_s *)lower; - rttvdbg("Entry\n"); + rttinfo("Entry\n"); DEBUGASSERT(priv); if (!priv->started) @@ -474,7 +474,7 @@ static int sam34_getstatus(FAR struct timer_lowerhalf_s *lower, { FAR struct sam34_lowerhalf_s *priv = (FAR struct sam34_lowerhalf_s *)lower; - rttvdbg("Entry\n"); + rttinfo("Entry\n"); DEBUGASSERT(priv); /* Return the status bit */ @@ -498,9 +498,9 @@ static int sam34_getstatus(FAR struct timer_lowerhalf_s *lower, status->timeleft = 1000000ULL*(sam34_getreg(SAM_RTT_AR) - sam34_readvr())/RTT_FCLK; - rttvdbg(" flags : %08x\n", status->flags); - rttvdbg(" timeout : %d\n", status->timeout); - rttvdbg(" timeleft : %d\n", status->timeleft); + rttinfo(" flags : %08x\n", status->flags); + rttinfo(" timeout : %d\n", status->timeout); + rttinfo(" timeleft : %d\n", status->timeleft); return OK; } @@ -526,7 +526,7 @@ static int sam34_settimeout(FAR struct timer_lowerhalf_s *lower, FAR struct sam34_lowerhalf_s *priv = (FAR struct sam34_lowerhalf_s *)lower; DEBUGASSERT(priv); - rttvdbg("Entry: timeout=%d\n", timeout); + rttinfo("Entry: timeout=%d\n", timeout); if (priv->started) { @@ -547,7 +547,7 @@ static int sam34_settimeout(FAR struct timer_lowerhalf_s *lower, timeout = (1000000ULL * priv->clkticks) / RTT_FCLK; /* Truncated timeout */ priv->adjustment = priv->timeout - timeout; /* Truncated time to be added to next interval (dither) */ - rttvdbg("fclk=%d clkticks=%d timout=%d, adjustment=%d\n", + rttinfo("fclk=%d clkticks=%d timout=%d, adjustment=%d\n", RTT_FCLK, priv->clkticks, priv->timeout, priv->adjustment); return OK; @@ -582,7 +582,7 @@ static tccb_t sam34_sethandler(FAR struct timer_lowerhalf_s *lower, flags = enter_critical_section(); DEBUGASSERT(priv); - rttvdbg("Entry: handler=%p\n", handler); + rttinfo("Entry: handler=%p\n", handler); /* Get the old handler return value */ @@ -623,7 +623,7 @@ static int sam34_ioctl(FAR struct timer_lowerhalf_s *lower, int cmd, int ret = -ENOTTY; DEBUGASSERT(priv); - rttvdbg("Entry: cmd=%d arg=%ld\n", cmd, arg); + rttinfo("Entry: cmd=%d arg=%ld\n", cmd, arg); UNUSED(priv); return ret; @@ -653,7 +653,7 @@ void sam_rttinitialize(FAR const char *devpath) { FAR struct sam34_lowerhalf_s *priv = &g_tcdev; - rttvdbg("Entry: devpath=%s\n", devpath); + rttinfo("Entry: devpath=%s\n", devpath); /* Initialize the driver state structure. Here we assume: (1) the state * structure lies in .bss and was zeroed at reset time. (2) This function diff --git a/arch/arm/src/sam34/sam_spi.c b/arch/arm/src/sam34/sam_spi.c index 203ec5a1df..ca9938782e 100644 --- a/arch/arm/src/sam34/sam_spi.c +++ b/arch/arm/src/sam34/sam_spi.c @@ -150,13 +150,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif #define DMA_INITIAL 0 @@ -523,17 +523,17 @@ static inline void spi_putreg(struct sam_spidev_s *spi, uint32_t value, #if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO) static void spi_dumpregs(struct sam_spidev_s *spi, const char *msg) { - spivdbg("%s:\n", msg); - spivdbg(" MR:%08x SR:%08x IMR:%08x\n", + spiinfo("%s:\n", msg); + spiinfo(" MR:%08x SR:%08x IMR:%08x\n", getreg32(spi->base + SAM_SPI_MR_OFFSET), getreg32(spi->base + SAM_SPI_SR_OFFSET), getreg32(spi->base + SAM_SPI_IMR_OFFSET)); - spivdbg(" CSR0:%08x CSR1:%08x CSR2:%08x CSR3:%08x\n", + spiinfo(" CSR0:%08x CSR1:%08x CSR2:%08x CSR3:%08x\n", getreg32(spi->base + SAM_SPI_CSR0_OFFSET), getreg32(spi->base + SAM_SPI_CSR1_OFFSET), getreg32(spi->base + SAM_SPI_CSR2_OFFSET), getreg32(spi->base + SAM_SPI_CSR3_OFFSET)); - spivdbg(" WPCR:%08x WPSR:%08x\n", + spiinfo(" WPCR:%08x WPSR:%08x\n", getreg32(spi->base + SAM_SPI_WPCR_OFFSET), getreg32(spi->base + SAM_SPI_WPSR_OFFSET)); } @@ -893,7 +893,7 @@ static int spi_lock(struct spi_dev_s *dev, bool lock) struct sam_spics_s *spics = (struct sam_spics_s *)dev; struct sam_spidev_s *spi = spi_device(spics); - spivdbg("lock=%d\n", lock); + spiinfo("lock=%d\n", lock); if (lock) { /* Take the semaphore (perhaps waiting) */ @@ -941,10 +941,10 @@ static void spi_select(struct spi_dev_s *dev, enum spi_dev_e devid, /* Are we selecting or de-selecting the device? */ - spivdbg("selected=%d\n", selected); + spiinfo("selected=%d\n", selected); if (selected) { - spivdbg("cs=%d\n", spics->cs); + spiinfo("cs=%d\n", spics->cs); /* Before writing the TDR, the PCS field in the SPI_MR register must be set * in order to select a slave. @@ -999,7 +999,7 @@ static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency) uint32_t regval; unsigned int offset; - spivdbg("cs=%d frequency=%d\n", spics->cs, frequency); + spiinfo("cs=%d frequency=%d\n", spics->cs, frequency); /* Check if the requested frequency is the same as the frequency selection */ @@ -1069,7 +1069,7 @@ static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency) /* Calculate the new actual frequency */ actual = SAM_SPI_CLOCK / scbr; - spivdbg("csr[offset=%02x]=%08x actual=%d\n", offset, regval, actual); + spiinfo("csr[offset=%02x]=%08x actual=%d\n", offset, regval, actual); /* Save the frequency setting */ @@ -1102,7 +1102,7 @@ static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode) uint32_t regval; unsigned int offset; - spivdbg("cs=%d mode=%d\n", spics->cs, mode); + spiinfo("cs=%d mode=%d\n", spics->cs, mode); /* Has the mode changed? */ @@ -1145,7 +1145,7 @@ static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode) } spi_putreg(spi, regval, offset); - spivdbg("csr[offset=%02x]=%08x\n", offset, regval); + spiinfo("csr[offset=%02x]=%08x\n", offset, regval); /* Save the mode so that subsequent re-configurations will be faster */ @@ -1175,7 +1175,7 @@ static void spi_setbits(struct spi_dev_s *dev, int nbits) uint32_t regval; unsigned int offset; - spivdbg("cs=%d nbits=%d\n", spics->cs, nbits); + spiinfo("cs=%d nbits=%d\n", spics->cs, nbits); DEBUGASSERT(spics && nbits > 7 && nbits < 17); /* Has the number of bits changed? */ @@ -1190,7 +1190,7 @@ static void spi_setbits(struct spi_dev_s *dev, int nbits) regval |= SPI_CSR_BITS(nbits); spi_putreg(spi, regval, offset); - spivdbg("csr[offset=%02x]=%08x\n", offset, regval); + spiinfo("csr[offset=%02x]=%08x\n", offset, regval); /* Save the selection so the subsequence re-configurations will be faster */ @@ -1228,7 +1228,7 @@ static uint16_t spi_send(struct spi_dev_s *dev, uint16_t wd) rxbyte = (uint8_t)0; spi_exchange(dev, &txbyte, &rxbyte, 1); - spivdbg("Sent %02x received %02x\n", txbyte, rxbyte); + spiinfo("Sent %02x received %02x\n", txbyte, rxbyte); return (uint16_t)rxbyte; } @@ -1276,7 +1276,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, uint8_t *rxptr8; uint8_t *txptr8; - spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); + spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); /* Set up PCS bits */ @@ -1422,7 +1422,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, return; } - spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); + spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); spics = (struct sam_spics_s *)dev; spi = spi_device(spics); @@ -1745,7 +1745,7 @@ struct spi_dev_s *sam_spibus_initialize(int port) /* The support SAM parts have only a single SPI port */ - spivdbg("port: %d csno: %d spino: %d\n", port, csno, spino); + spiinfo("port: %d csno: %d spino: %d\n", port, csno, spino); DEBUGASSERT(csno >= 0 && csno <= SAM_SPI_NCS); #if defined(CONFIG_SAM34_SPI0) && defined(CONFIG_SAM34_SPI1) @@ -1924,7 +1924,7 @@ struct spi_dev_s *sam_spibus_initialize(int port) spi_putreg(spi, regval, offset); spics->nbits = 8; - spivdbg("csr[offset=%02x]=%08x\n", offset, regval); + spiinfo("csr[offset=%02x]=%08x\n", offset, regval); return &spics->spidev; } diff --git a/arch/arm/src/sam34/sam_tc.c b/arch/arm/src/sam34/sam_tc.c index a95fa49527..985249c6f6 100644 --- a/arch/arm/src/sam34/sam_tc.c +++ b/arch/arm/src/sam34/sam_tc.c @@ -80,10 +80,10 @@ #ifdef CONFIG_DEBUG_TIMER # define tcdbg lldbg -# define tcvdbg llvdbg +# define tcinfo llinfo #else # define tcdbg(x...) -# define tcvdbg(x...) +# define tcinfo(x...) #endif /**************************************************************************** @@ -268,7 +268,7 @@ static int sam34_interrupt(int irq, FAR void *context) { FAR struct sam34_lowerhalf_s *priv = &g_tcdevs[irq-SAM_IRQ_TC0]; - tcvdbg("Entry\n"); + tcinfo("Entry\n"); DEBUGASSERT((irq >= SAM_IRQ_TC0) && (irq <= SAM_IRQ_TC5)); /* Check if the interrupt is really pending */ @@ -299,7 +299,7 @@ static int sam34_interrupt(int irq, FAR void *context) /* No handler or the handler returned false.. stop the timer */ sam34_stop((FAR struct timer_lowerhalf_s *)priv); - tcvdbg("Stopped\n"); + tcinfo("Stopped\n"); } /* TC_INT_CPCS is cleared by reading SAM_TCx_SR */ @@ -328,7 +328,7 @@ static int sam34_start(FAR struct timer_lowerhalf_s *lower) FAR struct sam34_lowerhalf_s *priv = (FAR struct sam34_lowerhalf_s *)lower; uint32_t mr_val; - tcvdbg("Entry\n"); + tcinfo("Entry\n"); DEBUGASSERT(priv); if (priv->started) @@ -382,7 +382,7 @@ static int sam34_start(FAR struct timer_lowerhalf_s *lower) static int sam34_stop(FAR struct timer_lowerhalf_s *lower) { FAR struct sam34_lowerhalf_s *priv = (FAR struct sam34_lowerhalf_s *)lower; - tcvdbg("Entry\n"); + tcinfo("Entry\n"); DEBUGASSERT(priv); if (!priv->started) @@ -421,7 +421,7 @@ static int sam34_getstatus(FAR struct timer_lowerhalf_s *lower, FAR struct sam34_lowerhalf_s *priv = (FAR struct sam34_lowerhalf_s *)lower; uint32_t elapsed; - tcvdbg("Entry\n"); + tcinfo("Entry\n"); DEBUGASSERT(priv); /* Return the status bit */ @@ -446,9 +446,9 @@ static int sam34_getstatus(FAR struct timer_lowerhalf_s *lower, elapsed = sam34_getreg(priv->base + SAM_TC_CV_OFFSET); status->timeleft = ((uint64_t)priv->timeout * elapsed) / (priv->clkticks + 1); /* TODO - check on this +1 */ - tcvdbg(" flags : %08x\n", status->flags); - tcvdbg(" timeout : %d\n", status->timeout); - tcvdbg(" timeleft : %d\n", status->timeleft); + tcinfo(" flags : %08x\n", status->flags); + tcinfo(" timeout : %d\n", status->timeout); + tcinfo(" timeleft : %d\n", status->timeleft); return OK; } @@ -480,7 +480,7 @@ static int sam34_settimeout(FAR struct timer_lowerhalf_s *lower, return -EPERM; } - tcvdbg("Entry: timeout=%d\n", timeout); + tcinfo("Entry: timeout=%d\n", timeout); /* Can this timeout be represented? */ @@ -496,7 +496,7 @@ static int sam34_settimeout(FAR struct timer_lowerhalf_s *lower, timeout = (1000000ULL * priv->clkticks) / TC_FCLK; /* Truncated timeout */ priv->adjustment = priv->timeout - timeout; /* Truncated time to be added to next interval (dither) */ - tcvdbg("fclk=%d clkticks=%d timout=%d, adjustment=%d\n", + tcinfo("fclk=%d clkticks=%d timout=%d, adjustment=%d\n", TC_FCLK, priv->clkticks, priv->timeout, priv->adjustment); return OK; @@ -531,7 +531,7 @@ static tccb_t sam34_sethandler(FAR struct timer_lowerhalf_s *lower, flags = enter_critical_section(); DEBUGASSERT(priv); - tcvdbg("Entry: handler=%p\n", handler); + tcinfo("Entry: handler=%p\n", handler); /* Get the old handler return value */ @@ -572,7 +572,7 @@ static int sam34_ioctl(FAR struct timer_lowerhalf_s *lower, int cmd, int ret = -ENOTTY; DEBUGASSERT(priv); - tcvdbg("Entry: cmd=%d arg=%ld\n", cmd, arg); + tcinfo("Entry: cmd=%d arg=%ld\n", cmd, arg); UNUSED(priv); return ret; @@ -602,7 +602,7 @@ void sam_tcinitialize(FAR const char *devpath, int irq) { FAR struct sam34_lowerhalf_s *priv = &g_tcdevs[irq-SAM_IRQ_TC0]; - tcvdbg("Entry: devpath=%s\n", devpath); + tcinfo("Entry: devpath=%s\n", devpath); DEBUGASSERT((irq >= SAM_IRQ_TC0) && (irq <= SAM_IRQ_TC5)); /* Initialize the driver state structure. Here we assume: (1) the state diff --git a/arch/arm/src/sam34/sam_twi.c b/arch/arm/src/sam34/sam_twi.c index f8c2f7f7ca..265c3f636d 100644 --- a/arch/arm/src/sam34/sam_twi.c +++ b/arch/arm/src/sam34/sam_twi.c @@ -100,14 +100,14 @@ #ifdef CONFIG_DEBUG_I2C # define i2cdbg dbg -# define i2cvdbg vdbg +# define i2cinfo info # define i2clldbg lldbg -# define i2cllvdbg llvdbg +# define i2cllinfo llinfo #else # define i2cdbg(x...) -# define i2cvdbg(x...) +# define i2cinfo(x...) # define i2clldbg(x...) -# define i2cllvdbg(x...) +# define i2cllinfo(x...) #endif /**************************************************************************** @@ -460,7 +460,7 @@ static int twi_interrupt(struct twi_dev_s *priv) imr = twi_getrel(priv, SAM_TWI_IMR_OFFSET); pending = sr & imr; - i2cllvdbg("TWI%d pending: %08x\n", priv->twi, pending); + i2cllinfo("TWI%d pending: %08x\n", priv->twi, pending); msg = priv->msg; @@ -708,7 +708,7 @@ static int twi_transfer(FAR struct i2c_master_s *dev, int ret; DEBUGASSERT(dev != NULL); - i2cvdbg("TWI%d count: %d\n", priv->twi, count); + i2cinfo("TWI%d count: %d\n", priv->twi, count); /* Get exclusive access to the device */ @@ -842,7 +842,7 @@ static void twi_hw_initialize(struct twi_dev_s *priv, unsigned int pid, uint32_t mck; #endif - i2cvdbg("TWI%d Initializing\n", priv->twi); + i2cinfo("TWI%d Initializing\n", priv->twi); /* SVEN: TWI Slave Mode Enabled */ @@ -925,7 +925,7 @@ struct i2c_master_s *sam_i2cbus_initialize(int bus) uint32_t frequency; unsigned int pid; - i2cvdbg("Initializing TWI%d\n", bus); + i2cinfo("Initializing TWI%d\n", bus); flags = enter_critical_section(); @@ -1029,7 +1029,7 @@ int sam_i2cbus_uninitialize(FAR struct i2c_master_s * dev) { struct twi_dev_s *priv = (struct twi_dev_s *) dev; - i2cvdbg("TWI%d Un-initializing\n", priv->twi); + i2cinfo("TWI%d Un-initializing\n", priv->twi); /* Disable interrupts */ diff --git a/arch/arm/src/sam34/sam_udp.c b/arch/arm/src/sam34/sam_udp.c index 0a74f5ba24..c1a30c9fc5 100644 --- a/arch/arm/src/sam34/sam_udp.c +++ b/arch/arm/src/sam34/sam_udp.c @@ -968,7 +968,7 @@ static int sam_req_write(struct sam_usbdev_s *priv, struct sam_ep_s *privep) return -ENOENT; } - ullvdbg("epno=%d req=%p: len=%d xfrd=%d inflight=%d zlpneeded=%d\n", + ullinfo("epno=%d req=%p: len=%d xfrd=%d inflight=%d zlpneeded=%d\n", epno, privreq, privreq->req.len, privreq->req.xfrd, privreq->inflight, privep->zlpneeded); @@ -1139,7 +1139,7 @@ static int sam_req_read(struct sam_usbdev_s *priv, struct sam_ep_s *privep, return -ENOENT; } - ullvdbg("EP%d: len=%d xfrd=%d\n", + ullinfo("EP%d: len=%d xfrd=%d\n", epno, privreq->req.len, privreq->req.xfrd); /* Ignore any attempt to receive a zero length packet */ @@ -1408,7 +1408,7 @@ static void sam_ep0_setup(struct sam_usbdev_s *priv) index.w = GETUINT16(priv->ctrl.index); len.w = GETUINT16(priv->ctrl.len); - ullvdbg("SETUP: type=%02x req=%02x value=%04x index=%04x len=%04x\n", + ullinfo("SETUP: type=%02x req=%02x value=%04x index=%04x len=%04x\n", priv->ctrl.type, priv->ctrl.req, value.w, index.w, len.w); /* Dispatch any non-standard requests */ @@ -1572,7 +1572,7 @@ static void sam_ep0_setup(struct sam_usbdev_s *priv) { /* Special case recipient=device test mode */ - ullvdbg("test mode: %d\n", index.w); + ullinfo("test mode: %d\n", index.w); } else if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) != USB_REQ_RECIPIENT_ENDPOINT) { @@ -2749,7 +2749,7 @@ static int sam_ep_configure_internal(struct sam_ep_s *privep, DEBUGASSERT(privep && privep->dev && desc); - uvdbg("len: %02x type: %02x addr: %02x attr: %02x " + uinfo("len: %02x type: %02x addr: %02x attr: %02x " "maxpacketsize: %02x %02x interval: %02x\n", desc->len, desc->type, desc->addr, desc->attr, desc->mxpacketsize[0], desc->mxpacketsize[1], diff --git a/arch/arm/src/sam34/sam_wdt.c b/arch/arm/src/sam34/sam_wdt.c index dbb3f6f895..92dde86756 100644 --- a/arch/arm/src/sam34/sam_wdt.c +++ b/arch/arm/src/sam34/sam_wdt.c @@ -89,10 +89,10 @@ #ifdef CONFIG_DEBUG_WATCHDOG # define wddbg lldbg -# define wdvdbg llvdbg +# define wdinfo llinfo #else # define wddbg(x...) -# define wdvdbg(x...) +# define wdinfo(x...) #endif /**************************************************************************** @@ -314,7 +314,7 @@ static int sam34_start(FAR struct watchdog_lowerhalf_s *lower) FAR struct sam34_lowerhalf_s *priv = (FAR struct sam34_lowerhalf_s *)lower; uint32_t mr_val = 0; - wdvdbg("Entry\n"); + wdinfo("Entry\n"); DEBUGASSERT(priv); /* The watchdog is always disabled after a reset. It is enabled by setting @@ -360,7 +360,7 @@ static int sam34_stop(FAR struct watchdog_lowerhalf_s *lower) * except by a reset. */ - wdvdbg("Entry\n"); + wdinfo("Entry\n"); return -ENOSYS; } @@ -386,7 +386,7 @@ static int sam34_stop(FAR struct watchdog_lowerhalf_s *lower) static int sam34_keepalive(FAR struct watchdog_lowerhalf_s *lower) { - wdvdbg("Entry\n"); + wdinfo("Entry\n"); sam34_putreg((WDT_CR_KEY | WDT_CR_WDRSTT), SAM_WDT_CR); return OK; @@ -414,7 +414,7 @@ static int sam34_getstatus(FAR struct watchdog_lowerhalf_s *lower, FAR struct sam34_lowerhalf_s *priv = (FAR struct sam34_lowerhalf_s *)lower; uint32_t elapsed; - wdvdbg("Entry\n"); + wdinfo("Entry\n"); DEBUGASSERT(priv); /* Return the status bit */ @@ -441,10 +441,10 @@ static int sam34_getstatus(FAR struct watchdog_lowerhalf_s *lower, status->timeleft = (priv->timeout * elapsed) / (priv->reload + 1); - wdvdbg("Status : %08x\n", sam34_getreg(SAM_WDT_SR)); - wdvdbg(" flags : %08x\n", status->flags); - wdvdbg(" timeout : %d\n", status->timeout); - wdvdbg(" timeleft : %d\n", status->timeleft); + wdinfo("Status : %08x\n", sam34_getreg(SAM_WDT_SR)); + wdinfo(" flags : %08x\n", status->flags); + wdinfo(" timeout : %d\n", status->timeout); + wdinfo(" timeleft : %d\n", status->timeleft); return OK; } @@ -471,7 +471,7 @@ static int sam34_settimeout(FAR struct watchdog_lowerhalf_s *lower, uint32_t reload; DEBUGASSERT(priv); - wdvdbg("Entry: timeout=%d\n", timeout); + wdinfo("Entry: timeout=%d\n", timeout); /* Can this timeout be represented? */ @@ -503,7 +503,7 @@ static int sam34_settimeout(FAR struct watchdog_lowerhalf_s *lower, priv->reload = reload; - wdvdbg("fwdt=%d reload=%d timout=%d\n", + wdinfo("fwdt=%d reload=%d timout=%d\n", WDT_FCLK, reload, priv->timeout); /* Don't commit to MR register until started! */ @@ -543,7 +543,7 @@ static xcpt_t sam34_capture(FAR struct watchdog_lowerhalf_s *lower, uint16_t regval; DEBUGASSERT(priv); - wdvdbg("Entry: handler=%p\n", handler); + wdinfo("Entry: handler=%p\n", handler); /* Get the old handler return value */ @@ -611,7 +611,7 @@ static int sam34_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd, int ret = -ENOTTY; DEBUGASSERT(priv); - wdvdbg("Entry: cmd=%d arg=%ld\n", cmd, arg); + wdinfo("Entry: cmd=%d arg=%ld\n", cmd, arg); /* WDIOC_MINTIME: Set the minimum ping time. If two keepalive ioctls * are received within this time, a reset event will be generated. @@ -676,7 +676,7 @@ void sam_wdtinitialize(FAR const char *devpath) WDT_MR_WDRSTEN); sam34_putreg(mr_val, SAM_WDT_MR); - wdvdbg("Entry: devpath=%s\n", devpath); + wdinfo("Entry: devpath=%s\n", devpath); /* NOTE we assume that clocking to the IWDG has already been provided by * the RCC initialization logic. diff --git a/arch/arm/src/sama5/sam_adc.c b/arch/arm/src/sama5/sam_adc.c index 68565bc502..e1e3071996 100644 --- a/arch/arm/src/sama5/sam_adc.c +++ b/arch/arm/src/sama5/sam_adc.c @@ -604,7 +604,7 @@ static void sam_adc_dmadone(void *arg) int chan; int i; - avdbg("ready=%d enabled=%d\n", priv->enabled, priv->ready); + ainfo("ready=%d enabled=%d\n", priv->enabled, priv->ready); ASSERT(priv != NULL && !priv->ready); /* If the DMA transfer is not enabled, just ignore the data (and do not start @@ -725,7 +725,7 @@ static void sam_adc_dmacallback(DMA_HANDLE handle, void *arg, int result) struct sam_adc_s *priv = (struct sam_adc_s *)arg; int ret; - allvdbg("ready=%d enabled=%d\n", priv->enabled, priv->ready); + allinfo("ready=%d enabled=%d\n", priv->enabled, priv->ready); DEBUGASSERT(priv->ready); /* Check of the bottom half is keeping up with us. @@ -798,7 +798,7 @@ static int sam_adc_dmasetup(FAR struct sam_adc_s *priv, FAR uint8_t *buffer, uint32_t paddr; uint32_t maddr; - avdbg("buffer=%p buflen=%d\n", buffer, (int)buflen); + ainfo("buffer=%p buflen=%d\n", buffer, (int)buflen); DEBUGASSERT(priv != NULL && buffer != NULL && buflen > 0); DEBUGASSERT(((uint32_t)buffer & 3) == 0); @@ -849,7 +849,7 @@ static void sam_adc_endconversion(void *arg) int chan; ASSERT(priv != NULL); - avdbg("pending=%08x\n", priv->pending); + ainfo("pending=%08x\n", priv->pending); /* Get the set of unmasked, pending ADC interrupts */ @@ -1011,7 +1011,7 @@ static void sam_adc_reset(struct adc_dev_s *dev) #endif uint32_t regval; - avdbg("Resetting..\n"); + ainfo("Resetting..\n"); /* NOTE: We can't really reset the ADC hardware without losing the * touchscreen configuration. @@ -1081,7 +1081,7 @@ static int sam_adc_setup(struct adc_dev_s *dev) struct sam_adc_s *priv = (struct sam_adc_s *)dev->ad_priv; uint32_t regval; - avdbg("Setup\n"); + ainfo("Setup\n"); /* Enable channel number tag. This bit will force the channel number (CHNB) * to be included in the LDCR register content. @@ -1152,7 +1152,7 @@ static void sam_adc_shutdown(struct adc_dev_s *dev) struct sam_adc_s *priv = (struct sam_adc_s *)dev->ad_priv; #endif - avdbg("Shutdown\n"); + ainfo("Shutdown\n"); /* Reset the ADC peripheral */ @@ -1181,7 +1181,7 @@ static void sam_adc_rxint(struct adc_dev_s *dev, bool enable) struct sam_adc_s *priv = (struct sam_adc_s *)dev->ad_priv; #endif - avdbg("enable=%d\n", enable); + ainfo("enable=%d\n", enable); #ifdef CONFIG_SAMA5_ADC_DMA /* Ignore redundant requests */ @@ -1232,7 +1232,7 @@ static int sam_adc_ioctl(struct adc_dev_s *dev, int cmd, unsigned long arg) #endif int ret = OK; - avdbg("cmd=%d arg=%ld\n", cmd, arg); + ainfo("cmd=%d arg=%ld\n", cmd, arg); switch (cmd) { @@ -1277,7 +1277,7 @@ static int sam_adc_settimer(struct sam_adc_s *priv, uint32_t frequency, uint32_t regval; int ret; - avdbg("frequency=%ld channel=%d\n", (long)frequency, channel); + ainfo("frequency=%ld channel=%d\n", (long)frequency, channel); DEBUGASSERT(priv && frequency > 0); /* Configure TC for a 1Hz frequency and trigger on RC compare. */ @@ -1350,7 +1350,7 @@ static void sam_adc_freetimer(struct sam_adc_s *priv) { /* Is a timer allocated? */ - avdbg("tc=%p\n", priv->tc); + ainfo("tc=%p\n", priv->tc); if (priv->tc) { @@ -1377,7 +1377,7 @@ static int sam_adc_trigger(struct sam_adc_s *priv) int ret = OK; #if defined(CONFIG_SAMA5_ADC_SWTRIG) - avdbg("Setup software trigger\n"); + ainfo("Setup software trigger\n"); /* Configure the software trigger */ @@ -1393,7 +1393,7 @@ static int sam_adc_trigger(struct sam_adc_s *priv) sam_adc_putreg(priv, SAM_ADC_TRGR, regval); #elif defined(CONFIG_SAMA5_ADC_ADTRG) - avdbg("Setup ADTRG trigger\n"); + ainfo("Setup ADTRG trigger\n"); /* Configure the trigger via the external ADTRG signal */ @@ -1420,7 +1420,7 @@ static int sam_adc_trigger(struct sam_adc_s *priv) sam_adc_putreg(priv, SAM_ADC_TRGR, regval); #elif defined(CONFIG_SAMA5_ADC_TIOATRIG) - avdbg("Setup timer/counter trigger\n"); + ainfo("Setup timer/counter trigger\n"); /* Start the timer */ @@ -1500,7 +1500,7 @@ static void sam_adc_autocalibrate(struct sam_adc_s *priv) #ifdef CONFIG_SAMA5_ADC_AUTOCALIB uint32_t regval; - avdbg("Entry\n"); + ainfo("Entry\n"); /* Launch an automatic calibration of the ADC cell on next sequence */ @@ -1527,7 +1527,7 @@ static void sam_adc_offset(struct sam_adc_s *priv) { uint32_t regval = 0; - avdbg("Entry\n"); + ainfo("Entry\n"); #ifdef CONFIG_SAMA5_ADC_ANARCH /* Set the offset for each enabled channel. This centers the analog signal @@ -1644,7 +1644,7 @@ static void sam_adc_gain(struct sam_adc_s *priv) #ifdef CONFIG_SAMA5_ADC_ANARCH uint32_t regval; - avdbg("Entry\n"); + ainfo("Entry\n"); /* Set the gain for each enabled channel */ @@ -1690,7 +1690,7 @@ static void sam_adc_gain(struct sam_adc_s *priv) sam_adc_putreg(priv, SAM_ADC_CGR, regval); #else - avdbg("Gain=%d\n", CONFIG_SAMA5_ADC_GAIN); + ainfo("Gain=%d\n", CONFIG_SAMA5_ADC_GAIN); /* Set GAIN0 only. GAIN0 will be used for all channels. */ @@ -1711,7 +1711,7 @@ static void sam_adc_analogchange(struct sam_adc_s *priv) { uint32_t regval; - avdbg("Entry\n"); + ainfo("Entry\n"); /* Enable/disable the analog change feature */ @@ -1754,7 +1754,7 @@ static void sam_adc_setseqr(int chan, uint32_t *seqr1, uint32_t *seqr2, int seq) *seqr1 |= ADC_SEQR1_USCH(seq, chan); } - avdbg("chan=%d seqr1=%08x seqr2=%08x seq=%d\n", chan, *seqr1, *seqr2, seq); + ainfo("chan=%d seqr1=%08x seqr2=%08x seq=%d\n", chan, *seqr1, *seqr2, seq); } #endif @@ -1766,7 +1766,7 @@ static void sam_adc_sequencer(struct sam_adc_s *priv) uint32_t seqr2; int seq; - avdbg("Setup sequencer\n"); + ainfo("Setup sequencer\n"); /* Set user configured channel sequence */ @@ -1855,7 +1855,7 @@ static void sam_adc_sequencer(struct sam_adc_s *priv) #else uint32_t regval; - avdbg("Disable sequencer\n"); + ainfo("Disable sequencer\n"); /* Disable the sequencer */ @@ -1878,7 +1878,7 @@ static void sam_adc_channels(struct sam_adc_s *priv) { uint32_t regval; - avdbg("Entry\n"); + ainfo("Entry\n"); /* Enable channels. */ @@ -1964,7 +1964,7 @@ struct adc_dev_s *sam_adc_initialize(void) if (!priv->initialized) { - avdbg("Initializing...\n"); + ainfo("Initializing...\n"); /* Disable ADC peripheral clock */ @@ -2127,7 +2127,7 @@ struct adc_dev_s *sam_adc_initialize(void) /* Return a pointer to the device structure */ - avdbg("Returning %p\n", &g_adcdev); + ainfo("Returning %p\n", &g_adcdev); return &g_adcdev; } @@ -2143,7 +2143,7 @@ void sam_adc_lock(FAR struct sam_adc_s *priv) { int ret; - avdbg("Locking\n"); + ainfo("Locking\n"); do { @@ -2168,7 +2168,7 @@ void sam_adc_lock(FAR struct sam_adc_s *priv) void sam_adc_unlock(FAR struct sam_adc_s *priv) { - avdbg("Unlocking\n"); + ainfo("Unlocking\n"); sem_post(&priv->exclsem); } diff --git a/arch/arm/src/sama5/sam_can.c b/arch/arm/src/sama5/sam_can.c index ac9e93cc08..2689ac414f 100644 --- a/arch/arm/src/sama5/sam_can.c +++ b/arch/arm/src/sama5/sam_can.c @@ -128,14 +128,14 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg -# define canvdbg vdbg +# define caninfo info # define canlldbg lldbg -# define canllvdbg llvdbg +# define canllinfo llinfo #else # define candbg(x...) -# define canvdbg(x...) +# define caninfo(x...) # define canlldbg(x...) -# define canllvdbg(x...) +# define canllinfo(x...) #endif #if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_CAN) @@ -730,7 +730,7 @@ static int can_recvsetup(FAR struct sam_can_s *priv) priv->rxmbset |= (1 << mbndx); - canvdbg("CAN%d Mailbox %d: Index=%d rxmbset=%02x\n", + caninfo("CAN%d Mailbox %d: Index=%d rxmbset=%02x\n", config->port, mbno, mbndx, priv->rxmbset); /* Set up the message ID and filter mask @@ -798,7 +798,7 @@ static void can_reset(FAR struct can_dev_s *dev) config = priv->config; DEBUGASSERT(config); - canllvdbg("CAN%d\n", config->port); + canllinfo("CAN%d\n", config->port); UNUSED(config); /* Get exclusive access to the CAN peripheral */ @@ -855,7 +855,7 @@ static int can_setup(FAR struct can_dev_s *dev) config = priv->config; DEBUGASSERT(config); - canllvdbg("CAN%d pid: %d\n", config->port, config->pid); + canllinfo("CAN%d pid: %d\n", config->port, config->pid); /* Get exclusive access to the CAN peripheral */ @@ -933,7 +933,7 @@ static void can_shutdown(FAR struct can_dev_s *dev) config = priv->config; DEBUGASSERT(config); - canllvdbg("CAN%d\n", config->port); + canllinfo("CAN%d\n", config->port); /* Get exclusive access to the CAN peripheral */ @@ -972,7 +972,7 @@ static void can_rxint(FAR struct can_dev_s *dev, bool enable) FAR struct sam_can_s *priv = dev->cd_priv; DEBUGASSERT(priv && priv->config); - canllvdbg("CAN%d enable: %d\n", priv->config->port, enable); + canllinfo("CAN%d enable: %d\n", priv->config->port, enable); /* Enable/disable the mailbox interrupts from all receive mailboxes */ @@ -1005,7 +1005,7 @@ static void can_txint(FAR struct can_dev_s *dev, bool enable) FAR struct sam_can_s *priv = dev->cd_priv; DEBUGASSERT(priv && priv->config); - canllvdbg("CAN%d enable: %d\n", priv->config->port, enable); + canllinfo("CAN%d enable: %d\n", priv->config->port, enable); /* Get exclusive access to the CAN peripheral */ @@ -1106,8 +1106,8 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg) priv = dev->cd_priv; DEBUGASSERT(priv && priv->config); - canllvdbg("CAN%d\n", priv->config->port); - canllvdbg("CAN%d ID: %d DLC: %d\n", + canllinfo("CAN%d\n", priv->config->port); + canllinfo("CAN%d ID: %d DLC: %d\n", priv->config->port, msg->cm_hdr.ch_id, msg->cm_hdr.ch_dlc); /* Get exclusive access to the CAN peripheral */ @@ -1126,7 +1126,7 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg) priv->txmbset |= (1 << mbndx); - canvdbg("Mailbox Index=%d txmbset=%02x\n", mbndx, priv->txmbset); + caninfo("Mailbox Index=%d txmbset=%02x\n", mbndx, priv->txmbset); /* Set up the ID and mask, standard 11-bit or extended 29-bit. * REVISIT: This logic should be capable of sending standard messages @@ -1788,7 +1788,7 @@ static int can_autobaud(struct sam_can_s *priv) uint32_t regval; int ret; - canllvdbg("CAN%d\n", config->port); + canllinfo("CAN%d\n", config->port); /* The CAN controller can start listening to the network in Autobaud Mode. * In this case, the error counters are locked and a mailbox may be @@ -1858,7 +1858,7 @@ static int can_hwinitialize(struct sam_can_s *priv) uint32_t mck; int ret; - canllvdbg("CAN%d\n", config->port); + canllinfo("CAN%d\n", config->port); /* Configure CAN pins */ @@ -1970,7 +1970,7 @@ FAR struct can_dev_s *sam_caninitialize(int port) FAR struct sam_can_s *priv; FAR const struct sam_config_s *config; - canvdbg("CAN%d\n", port); + caninfo("CAN%d\n", port); /* NOTE: Peripherical clocking for CAN0 and/or CAN1 was already provided * by sam_clockconfig() early in the reset sequence. diff --git a/arch/arm/src/sama5/sam_dmac.c b/arch/arm/src/sama5/sam_dmac.c index bf3f148168..f86edd3169 100644 --- a/arch/arm/src/sama5/sam_dmac.c +++ b/arch/arm/src/sama5/sam_dmac.c @@ -1920,7 +1920,7 @@ void sam_dmainitialize(struct sam_dmac_s *dmac) void weak_function up_dmainitialize(void) { #ifdef CONFIG_SAMA5_DMAC0 - dmallvdbg("Initialize DMAC0\n"); + dmallinfo("Initialize DMAC0\n"); /* Enable peripheral clock */ @@ -1940,7 +1940,7 @@ void weak_function up_dmainitialize(void) #endif #ifdef CONFIG_SAMA5_DMAC1 - dmallvdbg("Initialize DMAC1\n"); + dmallinfo("Initialize DMAC1\n"); /* Enable peripheral clock */ @@ -2046,7 +2046,7 @@ DMA_HANDLE sam_dmachannel(uint8_t dmacno, uint32_t chflags) if (dmach) { - dmavdbg("DMAC%d CH%d: chflags: %08x returning dmach: %p\n", + dmainfo("DMAC%d CH%d: chflags: %08x returning dmach: %p\n", (int)dmacno, dmach->chan, (int)chflags, dmach); } else @@ -2082,13 +2082,13 @@ void sam_dmaconfig(DMA_HANDLE handle, uint32_t chflags) dmach->flags = chflags; #if defined(CONFIG_SAMA5_DMAC0) && defined(CONFIG_SAMA5_DMAC1) - dmavdbg("DMAC%d CH%d: chflags: %08x\n", + dmainfo("DMAC%d CH%d: chflags: %08x\n", dmach->dmac, dmach->chan, (int)chflags); #elif defined(CONFIG_SAMA5_DMAC0) - dmavdbg("DMAC0 CH%d: chflags: %08x\n", + dmainfo("DMAC0 CH%d: chflags: %08x\n", dmach->chan, (int)chflags); #else - dmavdbg("DMAC1 CH%d: chflags: %08x\n", + dmainfo("DMAC1 CH%d: chflags: %08x\n", dmach->chan, (int)chflags); #endif } @@ -2110,7 +2110,7 @@ void sam_dmafree(DMA_HANDLE handle) { struct sam_dmach_s *dmach = (struct sam_dmach_s *)handle; - dmavdbg("dmach: %p\n", dmach); + dmainfo("dmach: %p\n", dmach); DEBUGASSERT((dmach != NULL) && (dmach->inuse)); /* Mark the channel no longer in use. Clearing the inuse flag is an atomic @@ -2140,10 +2140,10 @@ int sam_dmatxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr, size_t remaining; int ret = OK; - dmavdbg("dmach: %p paddr: %08x maddr: %08x nbytes: %d\n", + dmainfo("dmach: %p paddr: %08x maddr: %08x nbytes: %d\n", dmach, (int)paddr, (int)maddr, (int)nbytes); DEBUGASSERT(dmach); - dmavdbg("llhead: %p lltail: %p\n", dmach->llhead, dmach->lltail); + dmainfo("llhead: %p lltail: %p\n", dmach->llhead, dmach->lltail); /* The maximum transfer size in bytes depends upon the maximum number of * transfers and the number of bytes per transfer. @@ -2219,10 +2219,10 @@ int sam_dmarxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr, size_t remaining; int ret = OK; - dmavdbg("dmach: %p paddr: %08x maddr: %08x nbytes: %d\n", + dmainfo("dmach: %p paddr: %08x maddr: %08x nbytes: %d\n", dmach, (int)paddr, (int)maddr, (int)nbytes); DEBUGASSERT(dmach); - dmavdbg("llhead: %p lltail: %p\n", dmach->llhead, dmach->lltail); + dmainfo("llhead: %p lltail: %p\n", dmach->llhead, dmach->lltail); /* The maximum transfer size in bytes depends upon the maximum number of * transfers and the number of bytes per transfer. @@ -2294,7 +2294,7 @@ int sam_dmastart(DMA_HANDLE handle, dma_callback_t callback, void *arg) struct sam_dmach_s *dmach = (struct sam_dmach_s *)handle; int ret = -EINVAL; - dmavdbg("dmach: %p callback: %p arg: %p\n", dmach, callback, arg); + dmainfo("dmach: %p callback: %p arg: %p\n", dmach, callback, arg); DEBUGASSERT(dmach != NULL); /* Verify that the DMA has been setup (i.e., at least one entry in the @@ -2338,7 +2338,7 @@ void sam_dmastop(DMA_HANDLE handle) struct sam_dmach_s *dmach = (struct sam_dmach_s *)handle; irqstate_t flags; - dmavdbg("dmach: %p\n", dmach); + dmainfo("dmach: %p\n", dmach); DEBUGASSERT(dmach != NULL); flags = enter_critical_section(); diff --git a/arch/arm/src/sama5/sam_ehci.c b/arch/arm/src/sama5/sam_ehci.c index 9c5dbd211a..8d41577c7d 100644 --- a/arch/arm/src/sama5/sam_ehci.c +++ b/arch/arm/src/sama5/sam_ehci.c @@ -1928,7 +1928,7 @@ static int sam_async_setup(struct sam_rhport_s *rhport, #ifdef CONFIG_USBHOST_TRACE usbhost_vtrace2(EHCI_VTRACE2_ASYNCXFR, epinfo->epno, buflen); #else - uvdbg("RHport%d EP%d: buffer=%p, buflen=%d, req=%p\n", + uinfo("RHport%d EP%d: buffer=%p, buflen=%d, req=%p\n", RHPORT(rhport), epinfo->epno, buffer, buflen, req); #endif @@ -2206,7 +2206,7 @@ static int sam_intr_setup(struct sam_rhport_s *rhport, #ifdef CONFIG_USBHOST_TRACE usbhost_vtrace2(EHCI_VTRACE2_INTRXFR, epinfo->epno, buflen); #else - uvdbg("RHport%d EP%d: buffer=%p, buflen=%d\n", + uinfo("RHport%d EP%d: buffer=%p, buflen=%d\n", RHPORT(rhport), epinfo->epno, buffer, buflen); #endif @@ -3187,7 +3187,7 @@ static int sam_ehci_tophalf(int irq, FAR void *context) #ifdef CONFIG_USBHOST_TRACE usbhost_vtrace1(EHCI_VTRACE1_TOPHALF, usbsts & regval); #else - ullvdbg("USBSTS: %08x USBINTR: %08x\n", usbsts, regval); + ullinfo("USBSTS: %08x USBINTR: %08x\n", usbsts, regval); #endif /* Handle all unmasked interrupt sources */ @@ -3730,7 +3730,7 @@ static int sam_epalloc(FAR struct usbhost_driver_s *drvr, #ifdef CONFIG_USBHOST_TRACE usbhost_vtrace2(EHCI_VTRACE2_EPALLOC, epdesc->addr, epdesc->xfrtype); #else - uvdbg("EP%d DIR=%s FA=%08x TYPE=%d Interval=%d MaxPacket=%d\n", + uinfo("EP%d DIR=%s FA=%08x TYPE=%d Interval=%d MaxPacket=%d\n", epdesc->addr, epdesc->in ? "IN" : "OUT", hport->funcaddr, epdesc->xfrtype, epdesc->interval, epdesc->mxpacketsize); #endif @@ -4019,7 +4019,7 @@ static int sam_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, #ifdef CONFIG_USBHOST_TRACE usbhost_vtrace2(EHCI_VTRACE2_CTRLINOUT, RHPORT(rhport), req->req); #else - uvdbg("RHPort%d type: %02x req: %02x value: %02x%02x index: %02x%02x len: %04x\n", + uinfo("RHPort%d type: %02x req: %02x value: %02x%02x index: %02x%02x len: %04x\n", RHPORT(rhport), req->type, req->req, req->value[1], req->value[0], req->index[1], req->index[0], len); #endif @@ -4500,7 +4500,7 @@ static int sam_connect(FAR struct usbhost_driver_s *drvr, /* Set the connected/disconnected flag */ hport->connected = connected; - ullvdbg("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO"); + ullinfo("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO"); /* Report the connection event */ diff --git a/arch/arm/src/sama5/sam_emaca.c b/arch/arm/src/sama5/sam_emaca.c index 69b6db2cb3..755ccc1dd9 100644 --- a/arch/arm/src/sama5/sam_emaca.c +++ b/arch/arm/src/sama5/sam_emaca.c @@ -725,7 +725,7 @@ static int sam_transmit(struct sam_emac_s *priv) uint32_t regval; uint32_t status; - nllvdbg("d_len: %d txhead: %d\n", dev->d_len, priv->txhead); + nllinfo("d_len: %d txhead: %d\n", dev->d_len, priv->txhead); sam_dumppacket("Transmit packet", dev->d_buf, dev->d_len); /* Check parameter */ @@ -806,7 +806,7 @@ static int sam_transmit(struct sam_emac_s *priv) if (sam_txfree(priv) < 1) { - nllvdbg("Disabling RX interrupts\n"); + nllinfo("Disabling RX interrupts\n"); sam_putreg(priv, SAM_EMAC_IDR, EMAC_INT_RCOMP); } @@ -986,7 +986,7 @@ static int sam_recvframe(struct sam_emac_s *priv) arch_invalidate_dcache((uintptr_t)rxdesc, (uintptr_t)rxdesc + sizeof(struct emac_rxdesc_s)); - nllvdbg("rxndx: %d\n", rxndx); + nllinfo("rxndx: %d\n", rxndx); while ((rxdesc->addr & EMACRXD_ADDR_OWNER) != 0) { @@ -1042,7 +1042,7 @@ static int sam_recvframe(struct sam_emac_s *priv) { if (rxndx == priv->rxndx) { - nllvdbg("ERROR: No EOF (Invalid of buffers too small)\n"); + nllinfo("ERROR: No EOF (Invalid of buffers too small)\n"); do { /* Give ownership back to the EMAC */ @@ -1097,7 +1097,7 @@ static int sam_recvframe(struct sam_emac_s *priv) /* Frame size from the EMAC */ dev->d_len = (rxdesc->status & EMACRXD_STA_FRLEN_MASK); - nllvdbg("packet %d-%d (%d)\n", priv->rxndx, rxndx, dev->d_len); + nllinfo("packet %d-%d (%d)\n", priv->rxndx, rxndx, dev->d_len); /* All data have been copied in the application frame buffer, * release the RX descriptor @@ -1128,7 +1128,7 @@ static int sam_recvframe(struct sam_emac_s *priv) * all of the data. */ - nllvdbg("rxndx: %d d_len: %d\n", priv->rxndx, dev->d_len); + nllinfo("rxndx: %d d_len: %d\n", priv->rxndx, dev->d_len); if (pktlen < dev->d_len) { @@ -1172,7 +1172,7 @@ static int sam_recvframe(struct sam_emac_s *priv) /* No packet was found */ priv->rxndx = rxndx; - nllvdbg("rxndx: %d\n", priv->rxndx); + nllinfo("rxndx: %d\n", priv->rxndx); return -EAGAIN; } @@ -1227,7 +1227,7 @@ static void sam_receive(struct sam_emac_s *priv) #ifdef CONFIG_NET_IPv4 if (BUF->type == HTONS(ETHTYPE_IP)) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); /* Handle ARP on input then give the IPv4 packet to the network * layer @@ -1267,7 +1267,7 @@ static void sam_receive(struct sam_emac_s *priv) #ifdef CONFIG_NET_IPv6 if (BUF->type == HTONS(ETHTYPE_IP6)) { - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); /* Give the IPv6 packet to the network layer */ @@ -1304,7 +1304,7 @@ static void sam_receive(struct sam_emac_s *priv) #ifdef CONFIG_NET_ARP if (BUF->type == htons(ETHTYPE_ARP)) { - nllvdbg("ARP frame\n"); + nllinfo("ARP frame\n"); /* Handle ARP packet */ @@ -1449,7 +1449,7 @@ static int sam_emac_interrupt(int irq, void *context) imr = sam_getreg(priv, SAM_EMAC_IMR); pending = isr & ~(imr | EMAC_INT_UNUSED); - nllvdbg("isr: %08x pending: %08x\n", isr, pending); + nllinfo("isr: %08x pending: %08x\n", isr, pending); /* Check for the completion of a transmission. This should be done before * checking for received data (because receiving can cause another transmission @@ -1705,7 +1705,7 @@ static int sam_ifup(struct net_driver_s *dev) /* Configure the EMAC interface for normal operation. */ - nllvdbg("Initialize the EMAC\n"); + nllinfo("Initialize the EMAC\n"); sam_emac_configure(priv); /* Set the MAC address (should have been configured while we were down) */ @@ -1737,11 +1737,11 @@ static int sam_ifup(struct net_driver_s *dev) } while (sam_linkup(priv) == 0); - nllvdbg("Link detected \n"); + nllinfo("Link detected \n"); /* Enable normal MAC operation */ - nllvdbg("Enable normal operation\n"); + nllinfo("Enable normal operation\n"); /* Set and activate a timer process */ @@ -1825,7 +1825,7 @@ static int sam_txavail(struct net_driver_s *dev) struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private; irqstate_t flags; - nllvdbg("ifup: %d\n", priv->ifup); + nllinfo("ifup: %d\n", priv->ifup); /* Disable interrupts because this function may be called from interrupt * level processing. @@ -2003,7 +2003,7 @@ static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac) unsigned int bit; UNUSED(priv); - nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); /* Calculate the 6-bit has table index */ @@ -2077,7 +2077,7 @@ static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac) unsigned int bit; UNUSED(priv); - nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); /* Calculate the 6-bit has table index */ @@ -2273,21 +2273,21 @@ static void sam_phydump(struct sam_emac_s *priv) sam_putreg(priv, SAM_EMAC_NCR, regval); #ifdef CONFIG_SAMA5_EMAC_RMII - nllvdbg("RMII Registers (Address %02x)\n", priv->phyaddr); + nllinfo("RMII Registers (Address %02x)\n", priv->phyaddr); #else /* defined(CONFIG_SAMA5_EMAC_MII) */ - nllvdbg("MII Registers (Address %02x)\n", priv->phyaddr); + nllinfo("MII Registers (Address %02x)\n", priv->phyaddr); #endif sam_phyread(priv, priv->phyaddr, MII_MCR, &phyval); - nllvdbg(" MCR: %04x\n", phyval); + nllinfo(" MCR: %04x\n", phyval); sam_phyread(priv, priv->phyaddr, MII_MSR, &phyval); - nllvdbg(" MSR: %04x\n", phyval); + nllinfo(" MSR: %04x\n", phyval); sam_phyread(priv, priv->phyaddr, MII_ADVERTISE, &phyval); - nllvdbg(" ADVERTISE: %04x\n", phyval); + nllinfo(" ADVERTISE: %04x\n", phyval); sam_phyread(priv, priv->phyaddr, MII_LPA, &phyval); - nllvdbg(" LPR: %04x\n", phyval); + nllinfo(" LPR: %04x\n", phyval); sam_phyread(priv, priv->phyaddr, CONFIG_SAMA5_EMAC_PHYSR, &phyval); - nllvdbg(" PHYSR: %04x\n", phyval); + nllinfo(" PHYSR: %04x\n", phyval); /* Disable management port */ @@ -2410,7 +2410,7 @@ static int sam_phyreset(struct sam_emac_s *priv) int timeout; int ret; - nllvdbg(" sam_phyreset\n"); + nllinfo(" sam_phyreset\n"); /* Enable management port */ @@ -2477,7 +2477,7 @@ static int sam_phyfind(struct sam_emac_s *priv, uint8_t *phyaddr) unsigned int offset; int ret = -ESRCH; - nllvdbg("Find a valid PHY address\n"); + nllinfo("Find a valid PHY address\n"); /* Enable management port */ @@ -2522,10 +2522,10 @@ static int sam_phyfind(struct sam_emac_s *priv, uint8_t *phyaddr) if (ret == OK) { - nllvdbg(" PHYID1: %04x PHY addr: %d\n", phyval, candidate); + nllinfo(" PHYID1: %04x PHY addr: %d\n", phyval, candidate); *phyaddr = candidate; sam_phyread(priv, candidate, CONFIG_SAMA5_EMAC_PHYSR, &phyval); - nllvdbg(" PHYSR: %04x PHY addr: %d\n", phyval, candidate); + nllinfo(" PHYSR: %04x PHY addr: %d\n", phyval, candidate); } /* Disable management port */ @@ -2684,7 +2684,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) goto errout; } - nllvdbg("PHYID1: %04x PHY address: %02x\n", phyid1, priv->phyaddr); + nllinfo("PHYID1: %04x PHY address: %02x\n", phyid1, priv->phyaddr); ret = sam_phyread(priv, priv->phyaddr, MII_PHYID2, &phyid2); if (ret < 0) @@ -2693,14 +2693,14 @@ static int sam_autonegotiate(struct sam_emac_s *priv) goto errout; } - nllvdbg("PHYID2: %04x PHY address: %02x\n", phyid2, priv->phyaddr); + nllinfo("PHYID2: %04x PHY address: %02x\n", phyid2, priv->phyaddr); if (phyid1 == MII_OUI_MSB && ((phyid2 & MII_PHYID2_OUI_MASK) >> MII_PHYID2_OUI_SHIFT) == MII_OUI_LSB) { - nllvdbg(" Vendor Model Number: %04x\n", + nllinfo(" Vendor Model Number: %04x\n", (phyid2 & MII_PHYID2_MODEL_MASK) >> MII_PHYID2_MODEL_SHIFT); - nllvdbg(" Model Revision Number: %04x\n", + nllinfo(" Model Revision Number: %04x\n", (phyid2 & MII_PHYID2_REV_MASK) >> MII_PHYID2_REV_SHIFT); } else @@ -2772,7 +2772,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) goto errout; } - nllvdbg(" MCR: %04x\n", mcr); + nllinfo(" MCR: %04x\n", mcr); /* Check AutoNegotiate complete */ @@ -2792,7 +2792,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) { /* Yes.. break out of the loop */ - nllvdbg("AutoNegotiate complete\n"); + nllinfo("AutoNegotiate complete\n"); break; } @@ -2955,7 +2955,7 @@ static bool sam_linkup(struct sam_emac_s *priv) /* Start the EMAC transfers */ - nllvdbg("Link is up\n"); + nllinfo("Link is up\n"); linkup = true; errout: @@ -3276,7 +3276,7 @@ static void sam_macaddress(struct sam_emac_s *priv) struct net_driver_s *dev = &priv->dev; uint32_t regval; - nllvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", dev->d_ifname, 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], @@ -3342,7 +3342,7 @@ static void sam_ipv6multicast(struct sam_emac_s *priv) mac[4] = tmp16 & 0xff; mac[5] = tmp16 >> 8; - nvdbg("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n", + ninfo("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); (void)sam_addmac(dev, mac); @@ -3388,7 +3388,7 @@ static int sam_emac_configure(struct sam_emac_s *priv) { uint32_t regval; - nllvdbg("Entry\n"); + nllinfo("Entry\n"); /* Enable clocking to the EMAC peripheral */ diff --git a/arch/arm/src/sama5/sam_emacb.c b/arch/arm/src/sama5/sam_emacb.c index 65eb01e7fd..c6fe757a98 100644 --- a/arch/arm/src/sama5/sam_emacb.c +++ b/arch/arm/src/sama5/sam_emacb.c @@ -1088,7 +1088,7 @@ static int sam_transmit(struct sam_emac_s *priv) uint32_t regval; uint32_t status; - nllvdbg("d_len: %d txhead: %d\n", dev->d_len, priv->txhead); + nllinfo("d_len: %d txhead: %d\n", dev->d_len, priv->txhead); sam_dumppacket("Transmit packet", dev->d_buf, dev->d_len); /* Check parameter */ @@ -1169,7 +1169,7 @@ static int sam_transmit(struct sam_emac_s *priv) if (sam_txfree(priv) < 1) { - nllvdbg("Disabling RX interrupts\n"); + nllinfo("Disabling RX interrupts\n"); sam_putreg(priv, SAM_EMAC_IDR_OFFSET, EMAC_INT_RCOMP); } @@ -1349,7 +1349,7 @@ static int sam_recvframe(struct sam_emac_s *priv) arch_invalidate_dcache((uintptr_t)rxdesc, (uintptr_t)rxdesc + sizeof(struct emac_rxdesc_s)); - nllvdbg("rxndx: %d\n", rxndx); + nllinfo("rxndx: %d\n", rxndx); while ((rxdesc->addr & EMACRXD_ADDR_OWNER) != 0) { @@ -1405,7 +1405,7 @@ static int sam_recvframe(struct sam_emac_s *priv) { if (rxndx == priv->rxndx) { - nllvdbg("ERROR: No EOF (Invalid of buffers too small)\n"); + nllinfo("ERROR: No EOF (Invalid of buffers too small)\n"); do { /* Give ownership back to the EMAC */ @@ -1460,7 +1460,7 @@ static int sam_recvframe(struct sam_emac_s *priv) /* Frame size from the EMAC */ dev->d_len = (rxdesc->status & EMACRXD_STA_FRLEN_MASK); - nllvdbg("packet %d-%d (%d)\n", priv->rxndx, rxndx, dev->d_len); + nllinfo("packet %d-%d (%d)\n", priv->rxndx, rxndx, dev->d_len); /* All data have been copied in the application frame buffer, * release the RX descriptor @@ -1491,7 +1491,7 @@ static int sam_recvframe(struct sam_emac_s *priv) * all of the data. */ - nllvdbg("rxndx: %d d_len: %d\n", priv->rxndx, dev->d_len); + 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", @@ -1535,7 +1535,7 @@ static int sam_recvframe(struct sam_emac_s *priv) /* No packet was found */ priv->rxndx = rxndx; - nllvdbg("rxndx: %d\n", priv->rxndx); + nllinfo("rxndx: %d\n", priv->rxndx); return -EAGAIN; } @@ -1590,7 +1590,7 @@ static void sam_receive(struct sam_emac_s *priv) #ifdef CONFIG_NET_IPv4 if (BUF->type == HTONS(ETHTYPE_IP)) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); /* Handle ARP on input then give the IPv4 packet to the network * layer @@ -1630,7 +1630,7 @@ static void sam_receive(struct sam_emac_s *priv) #ifdef CONFIG_NET_IPv6 if (BUF->type == HTONS(ETHTYPE_IP6)) { - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); /* Give the IPv6 packet to the network layer */ @@ -1667,7 +1667,7 @@ static void sam_receive(struct sam_emac_s *priv) #ifdef CONFIG_NET_ARP if (BUF->type == htons(ETHTYPE_ARP)) { - nllvdbg("ARP frame\n"); + nllinfo("ARP frame\n"); /* Handle ARP packet */ @@ -1836,7 +1836,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv) imr = sam_getreg(priv, SAM_EMAC_IMR_OFFSET); pending = isr & ~(imr | EMAC_INT_UNUSED); - nllvdbg("isr: %08x pending: %08x\n", isr, pending); + nllinfo("isr: %08x pending: %08x\n", isr, pending); /* Check for the completion of a transmission. This should be done before * checking for received data (because receiving can cause another transmission @@ -2390,7 +2390,7 @@ static int sam_ifup(struct net_driver_s *dev) /* Configure the EMAC interface for normal operation. */ - nllvdbg("Initialize the EMAC\n"); + nllinfo("Initialize the EMAC\n"); sam_emac_configure(priv); /* Set the MAC address (should have been configured while we were down) */ @@ -2422,11 +2422,11 @@ static int sam_ifup(struct net_driver_s *dev) } while (sam_linkup(priv) == 0); - nllvdbg("Link detected \n"); + nllinfo("Link detected \n"); /* Enable normal MAC operation */ - nllvdbg("Enable normal operation\n"); + nllinfo("Enable normal operation\n"); /* Set and activate a timer process */ @@ -2505,7 +2505,7 @@ static int sam_ifdown(struct net_driver_s *dev) static inline void sam_txavail_process(FAR struct sam_emac_s *priv) { - nllvdbg("ifup: %d\n", priv->ifup); + nllinfo("ifup: %d\n", priv->ifup); /* Ignore the notification if the interface is not yet up */ @@ -2758,7 +2758,7 @@ static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac) unsigned int ndx; unsigned int bit; - nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); /* Calculate the 6-bit has table index */ @@ -2831,7 +2831,7 @@ static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac) unsigned int ndx; unsigned int bit; - nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); /* Calculate the 6-bit has table index */ @@ -3026,19 +3026,19 @@ static void sam_phydump(struct sam_emac_s *priv) regval |= EMAC_NCR_MPE; sam_putreg(priv, SAM_EMAC_NCR_OFFSET, regval); - nllvdbg("%s Registers (Address %02x)\n", + nllinfo("%s Registers (Address %02x)\n", priv->attr->rmii ? "RMII" : "MII", priv->phyaddr); sam_phyread(priv, priv->phyaddr, MII_MCR, &phyval); - nllvdbg(" MCR: %04x\n", phyval); + nllinfo(" MCR: %04x\n", phyval); sam_phyread(priv, priv->phyaddr, MII_MSR, &phyval); - nllvdbg(" MSR: %04x\n", phyval); + nllinfo(" MSR: %04x\n", phyval); sam_phyread(priv, priv->phyaddr, MII_ADVERTISE, &phyval); - nllvdbg(" ADVERTISE: %04x\n", phyval); + nllinfo(" ADVERTISE: %04x\n", phyval); sam_phyread(priv, priv->phyaddr, MII_LPA, &phyval); - nllvdbg(" LPR: %04x\n", phyval); + nllinfo(" LPR: %04x\n", phyval); sam_phyread(priv, priv->phyaddr, priv->attr->physr, &phyval); - nllvdbg(" PHYSR: %04x\n", phyval); + nllinfo(" PHYSR: %04x\n", phyval); /* Disable management port */ @@ -3262,7 +3262,7 @@ static int sam_phyreset(struct sam_emac_s *priv) int timeout; int ret; - nllvdbg(" sam_phyreset\n"); + nllinfo(" sam_phyreset\n"); /* Enable management port */ @@ -3329,7 +3329,7 @@ static int sam_phyfind(struct sam_emac_s *priv, uint8_t *phyaddr) unsigned int offset; int ret = -ESRCH; - nllvdbg("Find a valid PHY address\n"); + nllinfo("Find a valid PHY address\n"); /* Enable management port */ @@ -3374,10 +3374,10 @@ static int sam_phyfind(struct sam_emac_s *priv, uint8_t *phyaddr) if (ret == OK) { - nllvdbg(" PHYID1: %04x PHY addr: %d\n", phyval, candidate); + nllinfo(" PHYID1: %04x PHY addr: %d\n", phyval, candidate); *phyaddr = candidate; sam_phyread(priv, candidate, priv->attr->physr, &phyval); - nllvdbg(" PHYSR: %04x PHY addr: %d\n", phyval, candidate); + nllinfo(" PHYSR: %04x PHY addr: %d\n", phyval, candidate); } /* Disable management port */ @@ -3556,7 +3556,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) goto errout; } - nllvdbg("PHYID1: %04x PHY address: %02x\n", phyid1, priv->phyaddr); + nllinfo("PHYID1: %04x PHY address: %02x\n", phyid1, priv->phyaddr); ret = sam_phyread(priv, priv->phyaddr, MII_PHYID2, &phyid2); if (ret < 0) @@ -3565,15 +3565,15 @@ static int sam_autonegotiate(struct sam_emac_s *priv) goto errout; } - nllvdbg("PHYID2: %04x PHY address: %02x\n", phyid2, priv->phyaddr); + nllinfo("PHYID2: %04x PHY address: %02x\n", phyid2, priv->phyaddr); if (phyid1 == priv->attr->msoui && ((phyid2 & MII_PHYID2_OUI_MASK) >> MII_PHYID2_OUI_SHIFT) == (uint16_t)priv->attr->lsoui) { - nllvdbg(" Vendor Model Number: %04x\n", + nllinfo(" Vendor Model Number: %04x\n", (phyid2 & MII_PHYID2_MODEL_MASK) >> MII_PHYID2_MODEL_SHIFT); - nllvdbg(" Model Revision Number: %04x\n", + nllinfo(" Model Revision Number: %04x\n", (phyid2 & MII_PHYID2_REV_MASK) >> MII_PHYID2_REV_SHIFT); } else @@ -3645,7 +3645,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) goto errout; } - nllvdbg(" MCR: %04x\n", mcr); + nllinfo(" MCR: %04x\n", mcr); /* Check AutoNegotiate complete */ @@ -3665,7 +3665,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) { /* Yes.. break out of the loop */ - nllvdbg("AutoNegotiate complete\n"); + nllinfo("AutoNegotiate complete\n"); break; } @@ -3828,7 +3828,7 @@ static bool sam_linkup(struct sam_emac_s *priv) /* Start the EMAC transfers */ - nllvdbg("Link is up\n"); + nllinfo("Link is up\n"); linkup = true; errout: @@ -4012,7 +4012,7 @@ static inline void sam_ethgpioconfig(struct sam_emac_s *priv) else #endif { - nvdbg("ERROR: emac=%d\n", priv->attr->emac); + ninfo("ERROR: emac=%d\n", priv->attr->emac); } } @@ -4311,7 +4311,7 @@ static void sam_macaddress(struct sam_emac_s *priv) struct net_driver_s *dev = &priv->dev; uint32_t regval; - nllvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", dev->d_ifname, 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], @@ -4377,7 +4377,7 @@ static void sam_ipv6multicast(struct sam_emac_s *priv) mac[4] = tmp16 & 0xff; mac[5] = tmp16 >> 8; - nvdbg("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n", + ninfo("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); (void)sam_addmac(dev, mac); @@ -4423,7 +4423,7 @@ static int sam_emac_configure(struct sam_emac_s *priv) { uint32_t regval; - nllvdbg("Entry\n"); + nllinfo("Entry\n"); /* Enable clocking to the EMAC peripheral */ diff --git a/arch/arm/src/sama5/sam_freerun.c b/arch/arm/src/sama5/sam_freerun.c index 18d2556bbf..0828660151 100644 --- a/arch/arm/src/sama5/sam_freerun.c +++ b/arch/arm/src/sama5/sam_freerun.c @@ -138,7 +138,7 @@ int sam_freerun_initialize(struct sam_freerun_s *freerun, int chan, uint32_t cmr; int ret; - tcvdbg("chan=%d resolution=%d usec\n", chan, resolution); + tcinfo("chan=%d resolution=%d usec\n", chan, resolution); DEBUGASSERT(freerun && resolution > 0); /* Get the TC frequency the corresponds to the requested resolution */ @@ -154,7 +154,7 @@ int sam_freerun_initialize(struct sam_freerun_s *freerun, int chan, return ret; } - tcvdbg("frequency=%lu, divisor=%u, cmr=%08lx\n", + tcinfo("frequency=%lu, divisor=%u, cmr=%08lx\n", (unsigned long)frequency, (unsigned long)divisor, (unsigned long)cmr); @@ -274,7 +274,7 @@ int sam_freerun_counter(struct sam_freerun_s *freerun, struct timespec *ts) leave_critical_section(flags); - tcvdbg("counter=%lu (%lu) overflow=%lu, sr=%08lx\n", + tcinfo("counter=%lu (%lu) overflow=%lu, sr=%08lx\n", (unsigned long)counter, (unsigned long)verify, (unsigned long)overflow, (unsigned long)sr); @@ -294,7 +294,7 @@ int sam_freerun_counter(struct sam_freerun_s *freerun, struct timespec *ts) ts->tv_sec = sec; ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - tcvdbg("usec=%llu ts=(%lu, %lu)\n", + tcinfo("usec=%llu ts=(%lu, %lu)\n", usec, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); return OK; diff --git a/arch/arm/src/sama5/sam_gmac.c b/arch/arm/src/sama5/sam_gmac.c index a242093746..fd06f414de 100644 --- a/arch/arm/src/sama5/sam_gmac.c +++ b/arch/arm/src/sama5/sam_gmac.c @@ -656,7 +656,7 @@ static int sam_transmit(struct sam_gmac_s *priv) uint32_t regval; uint32_t status; - nllvdbg("d_len: %d txhead: %d txtail: %d\n", + nllinfo("d_len: %d txhead: %d txtail: %d\n", dev->d_len, priv->txhead, priv->txtail); sam_dumppacket("Transmit packet", dev->d_buf, dev->d_len); @@ -738,7 +738,7 @@ static int sam_transmit(struct sam_gmac_s *priv) if (sam_txfree(priv) < 1) { - nllvdbg("Disabling RX interrupts\n"); + nllinfo("Disabling RX interrupts\n"); sam_putreg(priv, SAM_GMAC_IDR, GMAC_INT_RCOMP); } @@ -918,7 +918,7 @@ static int sam_recvframe(struct sam_gmac_s *priv) arch_invalidate_dcache((uintptr_t)rxdesc, (uintptr_t)rxdesc + sizeof(struct gmac_rxdesc_s)); - nllvdbg("rxndx: %d\n", rxndx); + nllinfo("rxndx: %d\n", rxndx); while ((rxdesc->addr & GMACRXD_ADDR_OWNER) != 0) { @@ -974,7 +974,7 @@ static int sam_recvframe(struct sam_gmac_s *priv) { if (rxndx == priv->rxndx) { - nllvdbg("ERROR: No EOF (Invalid of buffers too small)\n"); + nllinfo("ERROR: No EOF (Invalid of buffers too small)\n"); do { /* Give ownership back to the GMAC */ @@ -1029,7 +1029,7 @@ static int sam_recvframe(struct sam_gmac_s *priv) /* Frame size from the GMAC */ dev->d_len = (rxdesc->status & GMACRXD_STA_FRLEN_MASK); - nllvdbg("packet %d-%d (%d)\n", priv->rxndx, rxndx, dev->d_len); + nllinfo("packet %d-%d (%d)\n", priv->rxndx, rxndx, dev->d_len); /* All data have been copied in the application frame buffer, * release the RX descriptor @@ -1060,7 +1060,7 @@ static int sam_recvframe(struct sam_gmac_s *priv) * all of the data. */ - nllvdbg("rxndx: %d d_len: %d\n", priv->rxndx, dev->d_len); + nllinfo("rxndx: %d d_len: %d\n", priv->rxndx, dev->d_len); if (pktlen < dev->d_len) { @@ -1102,7 +1102,7 @@ static int sam_recvframe(struct sam_gmac_s *priv) /* No packet was found */ priv->rxndx = rxndx; - nllvdbg("rxndx: %d\n", priv->rxndx); + nllinfo("rxndx: %d\n", priv->rxndx); return -EAGAIN; } @@ -1157,7 +1157,7 @@ static void sam_receive(struct sam_gmac_s *priv) #ifdef CONFIG_NET_IPv4 if (BUF->type == HTONS(ETHTYPE_IP)) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); /* Handle ARP on input then give the IPv4 packet to the network * layer @@ -1197,7 +1197,7 @@ static void sam_receive(struct sam_gmac_s *priv) #ifdef CONFIG_NET_IPv6 if (BUF->type == HTONS(ETHTYPE_IP6)) { - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); /* Give the IPv6 packet to the network layer */ @@ -1234,7 +1234,7 @@ static void sam_receive(struct sam_gmac_s *priv) #ifdef CONFIG_NET_ARP if (BUF->type == htons(ETHTYPE_ARP)) { - nllvdbg("ARP frame\n"); + nllinfo("ARP frame\n"); /* Handle ARP packet */ @@ -1377,7 +1377,7 @@ static int sam_gmac_interrupt(int irq, void *context) imr = sam_getreg(priv, SAM_GMAC_IMR); pending = isr & ~(imr | GMAC_INT_UNUSED); - nllvdbg("isr: %08x pending: %08x\n", isr, pending); + nllinfo("isr: %08x pending: %08x\n", isr, pending); /* Check for the completion of a transmission. This should be done before * checking for received data (because receiving can cause another transmission @@ -1657,7 +1657,7 @@ static int sam_ifup(struct net_driver_s *dev) /* Configure the GMAC interface for normal operation. */ - nllvdbg("Initialize the GMAC\n"); + nllinfo("Initialize the GMAC\n"); sam_gmac_configure(priv); /* Set the MAC address (should have been configured while we were down) */ @@ -1696,7 +1696,7 @@ static int sam_ifup(struct net_driver_s *dev) /* Enable normal MAC operation */ - nllvdbg("Enable normal operation\n"); + nllinfo("Enable normal operation\n"); /* Set and activate a timer process */ @@ -1780,7 +1780,7 @@ static int sam_txavail(struct net_driver_s *dev) struct sam_gmac_s *priv = (struct sam_gmac_s *)dev->d_private; irqstate_t flags; - nllvdbg("ifup: %d\n", priv->ifup); + nllinfo("ifup: %d\n", priv->ifup); /* Disable interrupts because this function may be called from interrupt * level processing. @@ -1958,7 +1958,7 @@ static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac) unsigned int bit; UNUSED(priv); - nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); /* Calculate the 6-bit has table index */ @@ -2032,7 +2032,7 @@ static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac) unsigned int bit; UNUSED(priv); - nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); /* Calculate the 6-bit has table index */ @@ -2220,21 +2220,21 @@ static void sam_phydump(struct sam_gmac_s *priv) sam_enablemdio(priv); - nllvdbg("GMII Registers (Address %02x)\n", priv->phyaddr); + nllinfo("GMII Registers (Address %02x)\n", priv->phyaddr); sam_phyread(priv, priv->phyaddr, GMII_MCR, &phyval); - nllvdbg(" MCR: %04x\n", phyval); + nllinfo(" MCR: %04x\n", phyval); sam_phyread(priv, priv->phyaddr, GMII_MSR, &phyval); - nllvdbg(" MSR: %04x\n", phyval); + nllinfo(" MSR: %04x\n", phyval); sam_phyread(priv, priv->phyaddr, GMII_ADVERTISE, &phyval); - nllvdbg(" ADVERTISE: %04x\n", phyval); + nllinfo(" ADVERTISE: %04x\n", phyval); sam_phyread(priv, priv->phyaddr, GMII_LPA, &phyval); - nllvdbg(" LPR: %04x\n", phyval); + nllinfo(" LPR: %04x\n", phyval); sam_phyread(priv, priv->phyaddr, GMII_1000BTCR, &phyval); - nllvdbg(" 1000BTCR: %04x\n", phyval); + nllinfo(" 1000BTCR: %04x\n", phyval); sam_phyread(priv, priv->phyaddr, GMII_1000BTSR, &phyval); - nllvdbg(" 1000BTSR: %04x\n", phyval); + nllinfo(" 1000BTSR: %04x\n", phyval); sam_phyread(priv, priv->phyaddr, GMII_ESTATUS, &phyval); - nllvdbg(" ESTATUS: %04x\n", phyval); + nllinfo(" ESTATUS: %04x\n", phyval); /* Disable management port */ @@ -2418,7 +2418,7 @@ static int sam_phyreset(struct sam_gmac_s *priv) int timeout; int ret; - nllvdbg(" sam_phyreset\n"); + nllinfo(" sam_phyreset\n"); /* Enable management port */ @@ -2480,7 +2480,7 @@ static int sam_phyfind(struct sam_gmac_s *priv, uint8_t *phyaddr) unsigned int offset; int ret = -ESRCH; - nllvdbg("Find a valid PHY address\n"); + nllinfo("Find a valid PHY address\n"); /* Enable management port */ @@ -2523,7 +2523,7 @@ static int sam_phyfind(struct sam_gmac_s *priv, uint8_t *phyaddr) if (ret == OK) { - nllvdbg(" PHYID1: %04x PHY addr: %d\n", phyval, candidate); + nllinfo(" PHYID1: %04x PHY addr: %d\n", phyval, candidate); *phyaddr = candidate; } @@ -2683,7 +2683,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv) goto errout; } - nllvdbg("PHYID1: %04x PHY address: %02x\n", phyid1, priv->phyaddr); + nllinfo("PHYID1: %04x PHY address: %02x\n", phyid1, priv->phyaddr); /* Read the LS bits of the OUI from Pthe PHYID2 register */ @@ -2694,14 +2694,14 @@ static int sam_autonegotiate(struct sam_gmac_s *priv) goto errout; } - nllvdbg("PHYID2: %04x PHY address: %02x\n", phyid2, priv->phyaddr); + nllinfo("PHYID2: %04x PHY address: %02x\n", phyid2, priv->phyaddr); if (phyid1 == GMII_OUI_MSB && (phyid2 & GMII_PHYID2_OUI_MASK) == GMII_OUI_LSB) { - nllvdbg(" Vendor Model Number: %04x\n", + nllinfo(" Vendor Model Number: %04x\n", (phyid2 & GMII_PHYID2_MODEL_MASK) >> GMII_PHYID2_MODEL_SHIFT); - nllvdbg(" Model Revision Number: %04x\n", + nllinfo(" Model Revision Number: %04x\n", (phyid2 & GMII_PHYID2_REV_MASK) >> GMII_PHYID2_REV_SHIFT); } else @@ -2777,7 +2777,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv) goto errout; } - nllvdbg(" MCR: 0x%X\n", phyval); + nllinfo(" MCR: 0x%X\n", phyval); /* Wait for autonegotion to complete */ @@ -2797,7 +2797,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv) { /* Yes.. break out of the loop */ - nllvdbg("AutoNegotiate complete\n"); + nllinfo("AutoNegotiate complete\n"); break; } @@ -3324,7 +3324,7 @@ static void sam_macaddress(struct sam_gmac_s *priv) struct net_driver_s *dev = &priv->dev; uint32_t regval; - nllvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", dev->d_ifname, 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], @@ -3390,7 +3390,7 @@ static void sam_ipv6multicast(struct sam_gmac_s *priv) mac[4] = tmp16 & 0xff; mac[5] = tmp16 >> 8; - nvdbg("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n", + ninfo("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); (void)sam_addmac(dev, mac); @@ -3436,7 +3436,7 @@ static int sam_gmac_configure(struct sam_gmac_s *priv) { uint32_t regval; - nllvdbg("Entry\n"); + nllinfo("Entry\n"); /* Enable clocking to the GMAC peripheral */ diff --git a/arch/arm/src/sama5/sam_hsmci.c b/arch/arm/src/sama5/sam_hsmci.c index 3a44973373..2e13488a59 100644 --- a/arch/arm/src/sama5/sam_hsmci.c +++ b/arch/arm/src/sama5/sam_hsmci.c @@ -1609,7 +1609,7 @@ static int sam_hsmci_interrupt(struct sam_dev_s *priv) { /* Yes.. Was the error some kind of timeout? */ - fllvdbg("ERROR: events: %08x SR: %08x\n", + fllinfo("ERROR: events: %08x SR: %08x\n", priv->cmdrmask, enabled); if ((pending & HSMCI_RESPONSE_TIMEOUT_ERRORS) != 0) @@ -2090,7 +2090,7 @@ static int sam_sendcmd(FAR struct sdio_dev_s *dev, /* Write the fully decorated command to CMDR */ - fvdbg("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval); + finfo("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval); sam_putreg(priv, regval, SAM_HSMCI_CMDR_OFFSET); sam_cmdsample1(priv, SAMPLENDX_AFTER_CMDR); return OK; @@ -2812,7 +2812,7 @@ static void sam_callbackenable(FAR struct sdio_dev_s *dev, { struct sam_dev_s *priv = (struct sam_dev_s *)dev; - fvdbg("eventset: %02x\n", eventset); + finfo("eventset: %02x\n", eventset); DEBUGASSERT(priv != NULL); priv->cbevents = eventset; @@ -2848,7 +2848,7 @@ static int sam_registercallback(FAR struct sdio_dev_s *dev, /* Disable callbacks and register this callback and is argument */ - fvdbg("Register %p(%p)\n", callback, arg); + finfo("Register %p(%p)\n", callback, arg); DEBUGASSERT(priv != NULL); priv->cbevents = 0; @@ -3095,7 +3095,7 @@ static void sam_callback(void *arg) /* Is a callback registered? */ DEBUGASSERT(priv != NULL); - fvdbg("Callback %p(%p) cbevents: %02x cdstatus: %02x\n", + finfo("Callback %p(%p) cbevents: %02x cdstatus: %02x\n", priv->callback, priv->cbarg, priv->cbevents, priv->cdstatus); flags = enter_critical_section(); @@ -3153,7 +3153,7 @@ static void sam_callback(void *arg) fdbg("ERROR: Failed to cancel work: %d\n", ret); } - fllvdbg("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); + fllinfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); ret = work_queue(LPWORK, &priv->cbwork, (worker_t)priv->callback, priv->cbarg, 0); if (ret < 0) @@ -3323,7 +3323,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno) return NULL; } - fvdbg("priv: %p base: %08x hsmci: %d dmac: %d pid: %d\n", + finfo("priv: %p base: %08x hsmci: %d dmac: %d pid: %d\n", priv, priv->base, priv->hsmci, dmac, pid); /* Initialize the HSMCI slot structure */ @@ -3393,7 +3393,7 @@ void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot) priv->cdstatus &= ~SDIO_STATUS_PRESENT; } - fllvdbg("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus); + fllinfo("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus); /* Perform any requested callback if the status has changed */ @@ -3438,7 +3438,7 @@ void sdio_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect) priv->cdstatus &= ~SDIO_STATUS_WRPROTECTED; } - fvdbg("cdstatus: %02x\n", priv->cdstatus); + finfo("cdstatus: %02x\n", priv->cdstatus); leave_critical_section(flags); } diff --git a/arch/arm/src/sama5/sam_isi.c b/arch/arm/src/sama5/sam_isi.c index 124734a416..86fa8e0dad 100644 --- a/arch/arm/src/sama5/sam_isi.c +++ b/arch/arm/src/sama5/sam_isi.c @@ -160,7 +160,7 @@ int sam_isi_initialize(void) */ g_isi.actual = sam_pck_configure(ISI_PCKID, PCKSRC_MCK, CONFIG_ISI_MCKFREQ); - gvdbg("PCK%d frequency=%d actual=%d\n", + ginfo("PCK%d frequency=%d actual=%d\n", ISI_PCKID, CONFIG_ISI_MCKFREQ, g_isi.actual); /* Enable the MCK (output) */ diff --git a/arch/arm/src/sama5/sam_lcd.c b/arch/arm/src/sama5/sam_lcd.c index 90a15d4053..cc2b4bf1c8 100644 --- a/arch/arm/src/sama5/sam_lcd.c +++ b/arch/arm/src/sama5/sam_lcd.c @@ -1101,7 +1101,7 @@ static void sam_wait_lcdstatus(uint32_t mask, uint32_t value) static int sam_base_getvideoinfo(struct fb_vtable_s *vtable, struct fb_videoinfo_s *vinfo) { - gvdbg("vtable=%p vinfo=%p\n", vtable, vinfo); + ginfo("vtable=%p vinfo=%p\n", vtable, vinfo); if (vtable && vinfo) { memcpy(vinfo, &g_base_videoinfo, sizeof(struct fb_videoinfo_s)); @@ -1119,7 +1119,7 @@ static int sam_base_getvideoinfo(struct fb_vtable_s *vtable, static int sam_base_getplaneinfo(struct fb_vtable_s *vtable, int planeno, struct fb_planeinfo_s *pinfo) { - gvdbg("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo); + ginfo("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo); if (vtable && planeno == 0 && pinfo) { pinfo->fbmem = (void *)LAYER_BASE.framebuffer; @@ -1166,21 +1166,21 @@ static int sam_base_putcmap(struct fb_vtable_s *vtable, static int sam_hcr_getcursor(struct fb_vtable_s *vtable, struct fb_cursorattrib_s *attrib) { - gvdbg("vtable=%p attrib=%p\n", vtable, attrib); + ginfo("vtable=%p attrib=%p\n", vtable, attrib); if (vtable && attrib) { #ifdef CONFIG_FB_HWCURSORIMAGE attrib->fmt = SAMA5_HCR_COLOR_FMT; #endif - gvdbg("pos: (x=%d, y=%d)\n", g_lcdc.cpos.x, g_lcdc.cpos.y); + ginfo("pos: (x=%d, y=%d)\n", g_lcdc.cpos.x, g_lcdc.cpos.y); attrib->pos = g_lcdc.cpos; #ifdef CONFIG_FB_HWCURSORSIZE attrib->mxsize.h = CONFIG_SAMA5_LCDC_HCR_HEIGHT; attrib->mxsize.w = CONFIG_SAMA5_LCDC_HCR_WIDTH; - gvdbg("size: (h=%d, w=%d)\n", g_lcdc.csize.h, g_lcdc.csize.w); + ginfo("size: (h=%d, w=%d)\n", g_lcdc.csize.h, g_lcdc.csize.w); attrib->size = g_lcdc.csize; #endif return OK; @@ -1199,26 +1199,26 @@ static int sam_hcr_getcursor(struct fb_vtable_s *vtable, static int sam_hcr_setcursor(struct fb_vtable_s *vtable, struct fb_setcursor_s *setttings) { - gvdbg("vtable=%p setttings=%p\n", vtable, setttings); + ginfo("vtable=%p setttings=%p\n", vtable, setttings); if (vtable && setttings) { - gvdbg("flags: %02x\n", settings->flags); + ginfo("flags: %02x\n", settings->flags); if ((flags & FB_CUR_SETPOSITION) != 0) { g_lcdc.cpos = settings->pos; - gvdbg("pos: (h:%d, w:%d)\n", g_lcdc.cpos.x, g_lcdc.cpos.y); + ginfo("pos: (h:%d, w:%d)\n", g_lcdc.cpos.x, g_lcdc.cpos.y); } #ifdef CONFIG_FB_HWCURSORSIZE if ((flags & FB_CUR_SETSIZE) != 0) { g_lcdc.csize = settings->size; - gvdbg("size: (h:%d, w:%d)\n", g_lcdc.csize.h, g_lcdc.csize.w); + ginfo("size: (h:%d, w:%d)\n", g_lcdc.csize.h, g_lcdc.csize.w); } #endif #ifdef CONFIG_FB_HWCURSORIMAGE if ((flags & FB_CUR_SETIMAGE) != 0) { - gvdbg("image: (h:%d, w:%d) @ %p\n", + ginfo("image: (h:%d, w:%d) @ %p\n", settings->img.height, settings->img.width, settings->img.image); } @@ -1294,9 +1294,9 @@ static void sam_dmasetup(int lid, struct sam_dscr_s *dscr, uint8_t *buffer) #if defined(CONFIG_DEBUG_GRAPHICS) && defined(CONFIG_DEBUG_INFO) /* Dump the DMA setup */ - gvdbg("DMA descriptor: addr=%08x ctrl=%08x next=%08x\n", + ginfo("DMA descriptor: addr=%08x ctrl=%08x next=%08x\n", dscr->addr, dscr->ctrl, dscr->next); - gvdbg("DMA registers[%d]: head=%08x addr=%08x ctrl=%08x next=%08x\n", + ginfo("DMA registers[%d]: head=%08x addr=%08x ctrl=%08x next=%08x\n", lid, sam_getreg(g_layerhead[lid]), sam_getreg(g_layeraddr[lid]), sam_getreg(g_layerctrl[lid]), sam_getreg(g_layernext[lid])); #endif @@ -1379,7 +1379,7 @@ static int sam_setclut(struct sam_layer_s *layer, unsigned int end; int i; - gvdbg("layer=%d cmap=%p first=%d len=%d\n", + ginfo("layer=%d cmap=%p first=%d len=%d\n", layer->lid, cmap, cmap->first, cmap->len); DEBUGASSERT(layer && cmap); @@ -1460,7 +1460,7 @@ static int sam_getclut(struct sam_layer_s *layer, uintptr_t regval; int i; - gvdbg("layer=%d cmap=%p first=%d len=%d\n", + ginfo("layer=%d cmap=%p first=%d len=%d\n", layer->lid, cmap, layer->offset, layer->nclut); DEBUGASSERT(layer && cmap); @@ -1514,7 +1514,7 @@ static void sam_pio_config(void) { int i; - gvdbg("Configuring pins\n"); + ginfo("Configuring pins\n"); /* Configure each pin */ @@ -2915,7 +2915,7 @@ int up_fbinitialize(int display) uint32_t regval; #endif - gvdbg("Entry\n"); + ginfo("Entry\n"); /* Configure layer layer structures, DMA descriptor memory, and * framebuffers @@ -2931,7 +2931,7 @@ int up_fbinitialize(int display) sam_pio_config(); - gvdbg("Configuring the LCD controller\n"); + ginfo("Configuring the LCD controller\n"); /* Enable the LCD peripheral clock */ @@ -2959,7 +2959,7 @@ int up_fbinitialize(int display) /* And turn the LCD on */ - gvdbg("Enabling the display\n"); + ginfo("Enabling the display\n"); sam_lcd_enable(); /* Display base layer */ @@ -3012,7 +3012,7 @@ int up_fbinitialize(int display) FAR struct fb_vtable_s *up_fbgetvplane(int display, int vplane) { - gvdbg("vplane: %d\n", vplane); + ginfo("vplane: %d\n", vplane); if (vplane == 0) { return (struct fb_vtable_s *)&g_base_vtable; @@ -3062,7 +3062,7 @@ void sam_lcdclear(nxgl_mxpixel_t color) uint16_t *dest = (uint16_t *)LAYER_BASE.framebuffer; int i; - gvdbg("Clearing display: BPP=16 color=%04x framebuffer=%08x size=%d\n", + ginfo("Clearing display: BPP=16 color=%04x framebuffer=%08x size=%d\n", color, LAYER_BASE.framebuffer, SAMA5_BASE_FBSIZE); for (i = 0; i < SAMA5_BASE_FBSIZE; i += sizeof(uint16_t)) @@ -3076,7 +3076,7 @@ void sam_lcdclear(nxgl_mxpixel_t color) uint8_t b; int i; - gvdbg("Clearing display: BPP=24 color=%06x framebuffer=%08x size=%d\n", + ginfo("Clearing display: BPP=24 color=%06x framebuffer=%08x size=%d\n", color, LAYER_BASE.framebuffer, SAMA5_BASE_FBSIZE); b = color & 0xff; @@ -3093,7 +3093,7 @@ void sam_lcdclear(nxgl_mxpixel_t color) uint32_t *dest = (uint32_t *)LAYER_BASE.framebuffer; int i; - gvdbg("Clearing display: BPP=32 color=%08x framebuffer=%08x size=%d\n", + ginfo("Clearing display: BPP=32 color=%08x framebuffer=%08x size=%d\n", color, LAYER_BASE.framebuffer, SAMA5_BASE_FBSIZE); for (i = 0; i < SAMA5_BASE_FBSIZE; i += sizeof(uint32_t)) diff --git a/arch/arm/src/sama5/sam_nand.c b/arch/arm/src/sama5/sam_nand.c index d5d235d216..6e53471e40 100644 --- a/arch/arm/src/sama5/sam_nand.c +++ b/arch/arm/src/sama5/sam_nand.c @@ -999,7 +999,7 @@ static uint32_t nand_nfc_poll(void) sr = nand_getreg(SAM_HSMC_SR); #ifndef CONFIG_SAMA5_NAND_REGDEBUG - // fllvdbg("sr=%08x\n", sr); + // fllinfo("sr=%08x\n", sr); #endif /* When set to one, this XFRDONE indicates that the NFC has terminated @@ -1065,7 +1065,7 @@ static int hsmc_interrupt(int irq, void *context) uint32_t pending = sr & imr; #ifndef CONFIG_SAMA5_NAND_REGDEBUG - fllvdbg("sr=%08x imr=%08x\n", sr, imr); + fllinfo("sr=%08x imr=%08x\n", sr, imr); #endif /* When set to one, this XFRDONE indicates that the NFC has terminated @@ -1233,7 +1233,7 @@ static int nand_wait_dma(struct sam_nandcs_s *priv) } } - fvdbg("Awakened: result=%d\n", priv->result); + finfo("Awakened: result=%d\n", priv->result); priv->dmadone = false; return priv->result; } @@ -1293,7 +1293,7 @@ static int nand_dma_read(struct sam_nandcs_s *priv, DEBUGASSERT(priv->dma); - fvdbg("vsrc=%08x vdest=%08x nbytes=%d\n", + finfo("vsrc=%08x vdest=%08x nbytes=%d\n", (int)vsrc, (int)vdest, (int)nbytes); /* Initialize sampling */ @@ -1463,7 +1463,7 @@ static int nand_nfcsram_read(struct sam_nandcs_s *priv, uint8_t *buffer, int remaining; int ret; - fvdbg("buffer=%p buflen=%d\n", buffer, buflen); + finfo("buffer=%p buflen=%d\n", buffer, buflen); /* Get the offset data source address */ @@ -1530,7 +1530,7 @@ static int nand_read(struct sam_nandcs_s *priv, uint8_t *buffer, int buswidth; int ret; - fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen); + finfo("buffer=%p buflen=%d\n", buffer, (int)buflen); /* Get the buswidth */ @@ -1622,7 +1622,7 @@ static int nand_read_pmecc(struct sam_nandcs_s *priv, off_t block, uint16_t sparesize; int ret; - fvdbg("block=%d page=%d data=%p\n", (int)block, page, data); + finfo("block=%d page=%d data=%p\n", (int)block, page, data); DEBUGASSERT(priv && data); /* Get page and spare sizes */ @@ -1765,7 +1765,7 @@ static int nand_nfcsram_write(struct sam_nandcs_s *priv, uint8_t *buffer, uintptr_t dest; int ret; - fvdbg("buffer=%p buflen=%d offset=%d\n", buffer, buflen, offset); + finfo("buffer=%p buflen=%d offset=%d\n", buffer, buflen, offset); nand_dump("NFC SRAM Write", buffer, buflen); /* Apply the offset to the destination address */ @@ -1829,7 +1829,7 @@ static int nand_write(struct sam_nandcs_s *priv, uint8_t *buffer, int buswidth; int ret; - fvdbg("buffer=%p buflen=%d offset=%d\n", buffer, buflen, offset); + finfo("buffer=%p buflen=%d offset=%d\n", buffer, buflen, offset); nand_dump("NAND Write", buffer, buflen); /* Apply the offset to the destination address */ @@ -1924,7 +1924,7 @@ static int nand_readpage_noecc(struct sam_nandcs_s *priv, off_t block, off_t coladdr; int ret; - fvdbg("block=%d page=%d data=%p spare=%p\n", (int)block, page, data, spare); + finfo("block=%d page=%d data=%p spare=%p\n", (int)block, page, data, spare); DEBUGASSERT(priv && (data || spare)); /* Get page and spare sizes */ @@ -2038,7 +2038,7 @@ static int nand_readpage_pmecc(struct sam_nandcs_s *priv, off_t block, int ret; int i; - fvdbg("block=%d page=%d data=%p\n", (int)block, page, data); + finfo("block=%d page=%d data=%p\n", (int)block, page, data); DEBUGASSERT(priv && data); /* Make sure that we have exclusive access to the PMECC and that the PMECC @@ -2159,7 +2159,7 @@ static int nand_writepage_noecc(struct sam_nandcs_s *priv, off_t block, off_t rowaddr; int ret = OK; - fvdbg("block=%d page=%d data=%p spare=%p\n", (int)block, page, data, spare); + finfo("block=%d page=%d data=%p spare=%p\n", (int)block, page, data, spare); /* Get page and spare sizes */ @@ -2320,7 +2320,7 @@ static int nand_writepage_pmecc(struct sam_nandcs_s *priv, off_t block, unsigned int i; int ret = 0; - fvdbg("block=%d page=%d data=%p\n", (int)block, page, data); + finfo("block=%d page=%d data=%p\n", (int)block, page, data); DEBUGASSERT(priv && data); /* Make sure that we have exclusive access to the PMECC and that the PMECC @@ -2344,7 +2344,7 @@ static int nand_writepage_pmecc(struct sam_nandcs_s *priv, off_t block, /* Calculate physical address of the page */ rowaddr = block * nandmodel_pagesperblock(&priv->raw.model) + page; - fvdbg("pagesize=%d eccsaddr=%d rowaddr=%d\n", pagesize, eccsaddr, rowaddr); + finfo("pagesize=%d eccsaddr=%d rowaddr=%d\n", pagesize, eccsaddr, rowaddr); #if 1 /* Use NFC SRAM */ /* Write the data area to NFC SRAM */ @@ -2437,7 +2437,7 @@ static int nand_writepage_pmecc(struct sam_nandcs_s *priv, off_t block, eccpersector = (pmecc_get_eccsize()) / sectersperpage; eccsize = sectersperpage * eccpersector; - fvdbg("sectersperpage=%d eccpersector=%d eccsize=%d\n", + finfo("sectersperpage=%d eccpersector=%d eccsize=%d\n", sectersperpage, eccpersector, eccsize); #ifdef CONFIG_SAMA5_PMECC_TRIMPAGE @@ -2550,7 +2550,7 @@ static int nand_eraseblock(struct nand_raw_s *raw, off_t block) DEBUGASSERT(priv); - fvdbg("block=%d\n", (int)block); + finfo("block=%d\n", (int)block); /* Get exclusvie access to the HSMC hardware. * REVISIT: The scope of this exclusivity is just NAND. @@ -2796,7 +2796,7 @@ static int nand_writepage(struct nand_raw_s *raw, off_t block, static void nand_reset(struct sam_nandcs_s *priv) { - fvdbg("Resetting\n"); + finfo("Resetting\n"); nand_nfc_cleale(priv, 0, COMMAND_RESET, 0, 0, 0); nand_wait_ready(priv); } @@ -2834,7 +2834,7 @@ struct mtd_dev_s *sam_nand_initialize(int cs) uint8_t ecctype; int ret; - fvdbg("CS%d\n", cs); + finfo("CS%d\n", cs); /* Select the device structure (In SAMA5D3, NAND is only supported on CS3). */ diff --git a/arch/arm/src/sama5/sam_ohci.c b/arch/arm/src/sama5/sam_ohci.c index 5dbad089e9..65e5111d56 100644 --- a/arch/arm/src/sama5/sam_ohci.c +++ b/arch/arm/src/sama5/sam_ohci.c @@ -1318,7 +1318,7 @@ static inline int sam_reminted(struct sam_ed_s *ed) #ifdef CONFIG_USBHOST_TRACE usbhost_vtrace1(OHCI_VTRACE1_VIRTED, (uintptr_t)ed); #else - uvdbg("ed: %08x head: %08x next: %08x offset: %d\n", + uinfo("ed: %08x head: %08x next: %08x offset: %d\n", ed, physhead, head ? head->hw.nexted : 0, offset); #endif @@ -1358,7 +1358,7 @@ static inline int sam_reminted(struct sam_ed_s *ed) #ifdef CONFIG_USBHOST_TRACE usbhost_vtrace1(OHCI_VTRACE1_VIRTED, (uintptr_t)ed); #else - uvdbg("ed: %08x head: %08x next: %08x\n", + uinfo("ed: %08x head: %08x next: %08x\n", ed, physhead, head ? head->hw.nexted : 0); #endif @@ -3103,7 +3103,7 @@ static int sam_ctrlin(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, #ifdef CONFIG_USBHOST_TRACE usbhost_vtrace2(OHCI_VTRACE2_CTRLIN, RHPORT(rhport), req->req); #else - uvdbg("RHPort%d type: %02x req: %02x value: %02x%02x index: %02x%02x len: %02x%02x\n", + uinfo("RHPort%d type: %02x req: %02x value: %02x%02x index: %02x%02x len: %02x%02x\n", RHPORT(rhport), req->type, req->req, req->value[1], req->value[0], req->index[1], req->index[0], req->len[1], req->len[0]); @@ -3152,7 +3152,7 @@ static int sam_ctrlout(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, #ifdef CONFIG_USBHOST_TRACE usbhost_vtrace2(OHCI_VTRACE2_CTRLOUT, RHPORT(rhport), req->req); #else - uvdbg("RHPort%d type: %02x req: %02x value: %02x%02x index: %02x%02x len: %02x%02x\n", + uinfo("RHPort%d type: %02x req: %02x value: %02x%02x index: %02x%02x len: %02x%02x\n", RHPORT(rhport), req->type, req->req, req->value[1], req->value[0], req->index[1], req->index[0], req->len[1], req->len[0]); @@ -3227,7 +3227,7 @@ static int sam_transfer_common(struct sam_rhport_s *rhport, (ed->hw.ctrl & ED_CONTROL_EN_MASK) >> ED_CONTROL_EN_SHIFT, (uint16_t)buflen); #else - uvdbg("EP%d %s toggle: %d maxpacket: %d buflen: %d\n", + uinfo("EP%d %s toggle: %d maxpacket: %d buflen: %d\n", (ed->hw.ctrl & ED_CONTROL_EN_MASK) >> ED_CONTROL_EN_SHIFT, in ? "IN" : "OUT", (ed->hw.headp & ED_HEADP_C) != 0 ? 1 : 0, @@ -3788,7 +3788,7 @@ static int sam_connect(struct usbhost_driver_s *drvr, /* Set the connected/disconnected flag */ hport->connected = connected; - ullvdbg("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO"); + ullinfo("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO"); /* Report the connection event */ diff --git a/arch/arm/src/sama5/sam_oneshot.c b/arch/arm/src/sama5/sam_oneshot.c index c6d0a79ef5..cb53ea11f7 100644 --- a/arch/arm/src/sama5/sam_oneshot.c +++ b/arch/arm/src/sama5/sam_oneshot.c @@ -108,7 +108,7 @@ static void sam_oneshot_handler(TC_HANDLE tch, void *arg, uint32_t sr) oneshot_handler_t oneshot_handler; void *oneshot_arg; - tcllvdbg("Expired...\n"); + tcllinfo("Expired...\n"); DEBUGASSERT(oneshot && oneshot->handler); /* The clock was stopped, but not disabled when the RC match occurred. @@ -165,7 +165,7 @@ int sam_oneshot_initialize(struct sam_oneshot_s *oneshot, int chan, uint32_t cmr; int ret; - tcvdbg("chan=%d resolution=%d usec\n", chan, resolution); + tcinfo("chan=%d resolution=%d usec\n", chan, resolution); DEBUGASSERT(oneshot && resolution > 0); /* Get the TC frequency the corresponds to the requested resolution */ @@ -181,7 +181,7 @@ int sam_oneshot_initialize(struct sam_oneshot_s *oneshot, int chan, return ret; } - tcvdbg("frequency=%lu, divisor=%lu, cmr=%08lx\n", + tcinfo("frequency=%lu, divisor=%lu, cmr=%08lx\n", (unsigned long)frequency, (unsigned long)divisor, (unsigned long)cmr); @@ -260,7 +260,7 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, struct sam_freerun_s *freer uint64_t regval; irqstate_t flags; - tcvdbg("handler=%p arg=%p, ts=(%lu, %lu)\n", + tcinfo("handler=%p arg=%p, ts=(%lu, %lu)\n", handler, arg, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); DEBUGASSERT(oneshot && handler && ts); @@ -271,7 +271,7 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, struct sam_freerun_s *freer { /* Yes.. then cancel it */ - tcvdbg("Already running... cancelling\n"); + tcinfo("Already running... cancelling\n"); (void)sam_oneshot_cancel(oneshot, freerun, NULL); } @@ -293,7 +293,7 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, struct sam_freerun_s *freer regval = (usec * (uint64_t)sam_tc_divfreq(oneshot->tch)) / USEC_PER_SEC; - tcvdbg("usec=%llu regval=%08llx\n", usec, regval); + tcinfo("usec=%llu regval=%08llx\n", usec, regval); DEBUGASSERT(regval <= UINT32_MAX); /* Set up to receive the callback when the interrupt occurs */ @@ -402,7 +402,7 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, struct sam_freerun_s *free * REVISIT: This does not appear to be the case. */ - tcvdbg("Cancelling...\n"); + tcinfo("Cancelling...\n"); count = sam_tc_getcounter(oneshot->tch); rc = sam_tc_getregister(oneshot->tch, TC_REGC); @@ -438,7 +438,7 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, struct sam_freerun_s *free * oneshot timer. */ - tcvdbg("rc=%lu count=%lu usec=%lu\n", + tcinfo("rc=%lu count=%lu usec=%lu\n", (unsigned long)rc, (unsigned long)count, (unsigned long)usec); /* REVISIT: I am not certain why the timer counter value sometimes @@ -483,7 +483,7 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, struct sam_freerun_s *free ts->tv_nsec = (unsigned long)nsec; } - tcvdbg("remaining (%lu, %lu)\n", + tcinfo("remaining (%lu, %lu)\n", (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); } diff --git a/arch/arm/src/sama5/sam_pmecc.c b/arch/arm/src/sama5/sam_pmecc.c index 8dfee40e3a..c1f42478a3 100644 --- a/arch/arm/src/sama5/sam_pmecc.c +++ b/arch/arm/src/sama5/sam_pmecc.c @@ -858,7 +858,7 @@ static int pmecc_pagelayout(uint16_t datasize, uint16_t eccsize) int bcherr1k; int selector; - fvdbg("datasize=%d eccsize=%d\n", datasize, eccsize); + finfo("datasize=%d eccsize=%d\n", datasize, eccsize); DEBUGASSERT(datasize > 0 && eccsize > 0); /* Try for 512 byte sectors */ @@ -877,7 +877,7 @@ static int pmecc_pagelayout(uint16_t datasize, uint16_t eccsize) selector = 1; } - fvdbg("nsectors512=%d bcherr512=%d selector=%d\n", + finfo("nsectors512=%d bcherr512=%d selector=%d\n", nsectors512, bcherr512, selector); /* Try for 1024 byte sectors */ @@ -902,7 +902,7 @@ static int pmecc_pagelayout(uint16_t datasize, uint16_t eccsize) selector |= 2; } - fvdbg("nsectors1k=%d bcherr1k=%d selector=%d\n", + finfo("nsectors1k=%d bcherr1k=%d selector=%d\n", nsectors1k, bcherr1k, selector); /* Now pick the best (most likely 1024) */ @@ -960,7 +960,7 @@ static int pmecc_pagelayout(uint16_t datasize, uint16_t eccsize) g_pmecc.desc.bcherr = ((uint32_t)bcherr << HSMC_PMECCFG_BCHERR_SHIFT); - fvdbg("sector1k=%d nsectors=%d bcherr=%d correctability=%d\n", + finfo("sector1k=%d nsectors=%d bcherr=%d correctability=%d\n", g_pmecc.sector1k, g_pmecc.nsectors, bcherr, g_pmecc.correctability); return OK; @@ -1018,7 +1018,7 @@ int pmecc_configure(struct sam_nandcs_s *priv, bool protected) uint32_t regval; int ret; - fvdbg("protected=%d configured=%d\n", protected, g_pmecc.configured); + finfo("protected=%d configured=%d\n", protected, g_pmecc.configured); /* Check if we need to re-configure */ @@ -1030,7 +1030,7 @@ int pmecc_configure(struct sam_nandcs_s *priv, bool protected) { /* No, we are already configured */ - fvdbg("Already configured\n"); + finfo("Already configured\n"); return OK; } @@ -1096,7 +1096,7 @@ int pmecc_configure(struct sam_nandcs_s *priv, bool protected) #endif } - fvdbg("sectorsz=%08x sectorsperpage=%d mm=%d\n", + finfo("sectorsz=%08x sectorsperpage=%d mm=%d\n", g_pmecc.desc.sectorsz, sectorsperpage, g_pmecc.desc.mm); switch (sectorsperpage) @@ -1120,7 +1120,7 @@ int pmecc_configure(struct sam_nandcs_s *priv, bool protected) g_pmecc.desc.nn = (1 << g_pmecc.desc.mm) - 1; - fvdbg("pagesize=%08x nn=%d\n", g_pmecc.desc.pagesize, g_pmecc.desc.nn); + finfo("pagesize=%08x nn=%d\n", g_pmecc.desc.pagesize, g_pmecc.desc.nn); /* Real value of ECC bit number correction (2, 4, 8, 12, 24) */ @@ -1136,13 +1136,13 @@ int pmecc_configure(struct sam_nandcs_s *priv, bool protected) (((g_pmecc.desc.mm * g_pmecc.correctability) >> 3) + 1) * sectorsperpage; } - fvdbg("mm=%d correctability=%d eccsize=%d\n", + finfo("mm=%d correctability=%d eccsize=%d\n", g_pmecc.desc.mm, g_pmecc.correctability, g_pmecc.desc.eccsize); g_pmecc.desc.eccstart = eccoffset; g_pmecc.desc.eccend = eccoffset + g_pmecc.desc.eccsize; - fvdbg("eccstart=%d eccend=%d sparesize=%d\n", + finfo("eccstart=%d eccend=%d sparesize=%d\n", g_pmecc.desc.eccstart, g_pmecc.desc.eccend, priv->raw.model.sparesize); diff --git a/arch/arm/src/sama5/sam_pwm.c b/arch/arm/src/sama5/sam_pwm.c index af6edf98bf..c80cf5812e 100644 --- a/arch/arm/src/sama5/sam_pwm.c +++ b/arch/arm/src/sama5/sam_pwm.c @@ -404,17 +404,17 @@ # define pwmdbg dbg # define pwmlldbg lldbg # ifdef CONFIG_DEBUG_INFO -# define pwmvdbg vdbg -# define pwmllvdbg llvdbg +# define pwminfo info +# define pwmllinfo llinfo # else -# define pwmvdbg(x...) -# define pwmllvdbg(x...) +# define pwminfo(x...) +# define pwmllinfo(x...) # endif #else # define pwmdbg(x...) # define pwmlldbg(x...) -# define pwmvdbg(x...) -# define pwmllvdbg(x...) +# define pwminfo(x...) +# define pwmllinfo(x...) #endif /**************************************************************************** @@ -917,58 +917,58 @@ static void pwm_chan_putreg(struct sam_pwm_chan_s *chan, int offset, #if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_INFO) static void pwm_dumpregs(struct sam_pwm_chan_s *chan, FAR const char *msg) { - pwmvdbg("PWM: %s\n", msg); - pwmvdbg(" CLK: %08x SR: %08x IMR1: %08x ISR1: %08x\n", + pwminfo("PWM: %s\n", msg); + pwminfo(" CLK: %08x SR: %08x IMR1: %08x ISR1: %08x\n", pwm_getreg(chan, SAM_PWM_CLK_OFFSET), pwm_getreg(chan, SAM_PWM_SR_OFFSET), pwm_getreg(chan, SAM_PWM_IMR1_OFFSET), pwm_getreg(chan, SAM_PWM_ISR1_OFFSET)); - pwmvdbg(" SCM: %08x SCUC: %08x SCUP: %08x IMR2: %08x\n", + pwminfo(" SCM: %08x SCUC: %08x SCUP: %08x IMR2: %08x\n", pwm_getreg(chan, SAM_PWM_SCM_OFFSET), pwm_getreg(chan, SAM_PWM_SCUC_OFFSET), pwm_getreg(chan, SAM_PWM_SCUP_OFFSET), pwm_getreg(chan, SAM_PWM_IMR2_OFFSET)); - pwmvdbg(" ISR2: %08x OOV: %08x OS: %08x FMR: %08x\n", + pwminfo(" ISR2: %08x OOV: %08x OS: %08x FMR: %08x\n", pwm_getreg(chan, SAM_PWM_ISR2_OFFSET), pwm_getreg(chan, SAM_PWM_OOV_OFFSET), pwm_getreg(chan, SAM_PWM_OS_OFFSET), pwm_getreg(chan, SAM_PWM_FMR_OFFSET)); - pwmvdbg(" FSR: %08x FPV: %08x FPE: %08x ELMR0: %08x\n", + pwminfo(" FSR: %08x FPV: %08x FPE: %08x ELMR0: %08x\n", pwm_getreg(chan, SAM_PWM_FSR_OFFSET), pwm_getreg(chan, SAM_PWM_FPV_OFFSET), pwm_getreg(chan, SAM_PWM_FPE_OFFSET), pwm_getreg(chan, SAM_PWM_ELMR0_OFFSET)); - pwmvdbg(" ELMR1: %08x SMMR: %08x WPSR: %08x\n", + pwminfo(" ELMR1: %08x SMMR: %08x WPSR: %08x\n", pwm_getreg(chan, SAM_PWM_ELMR1_OFFSET), pwm_getreg(chan, SAM_PWM_SMMR_OFFSET), pwm_getreg(chan, SAM_PWM_WPSR_OFFSET)); - pwmvdbg(" CMPV0: %08x CMPM0: %08x CMPV1: %08x CMPM1: %08x\n", + pwminfo(" CMPV0: %08x CMPM0: %08x CMPV1: %08x CMPM1: %08x\n", pwm_getreg(chan, SAM_PWM_CMPV0_OFFSET), pwm_getreg(chan, SAM_PWM_CMPM0_OFFSET), pwm_getreg(chan, SAM_PWM_CMPV1_OFFSET), pwm_getreg(chan, SAM_PWM_CMPM1_OFFSET)); - pwmvdbg(" CMPV2: %08x CMPM2: %08x CMPV3: %08x CMPM3: %08x\n", + pwminfo(" CMPV2: %08x CMPM2: %08x CMPV3: %08x CMPM3: %08x\n", pwm_getreg(chan, SAM_PWM_CMPV2_OFFSET), pwm_getreg(chan, SAM_PWM_CMPM2_OFFSET), pwm_getreg(chan, SAM_PWM_CMPV3_OFFSET), pwm_getreg(chan, SAM_PWM_CMPM3_OFFSET)); - pwmvdbg(" CMPV4: %08x CMPM4: %08x CMPV5: %08x CMPM5: %08x\n", + pwminfo(" CMPV4: %08x CMPM4: %08x CMPV5: %08x CMPM5: %08x\n", pwm_getreg(chan, SAM_PWM_CMPV4_OFFSET), pwm_getreg(chan, SAM_PWM_CMPM4_OFFSET), pwm_getreg(chan, SAM_PWM_CMPV5_OFFSET), pwm_getreg(chan, SAM_PWM_CMPM5_OFFSET)); - pwmvdbg(" CMPV6: %08x CMPM6: %08x CMPV7: %08x CMPM7: %08x\n", + pwminfo(" CMPV6: %08x CMPM6: %08x CMPV7: %08x CMPM7: %08x\n", pwm_getreg(chan, SAM_PWM_CMPV6_OFFSET), pwm_getreg(chan, SAM_PWM_CMPM6_OFFSET), pwm_getreg(chan, SAM_PWM_CMPV7_OFFSET), pwm_getreg(chan, SAM_PWM_CMPM7_OFFSET)); - pwmvdbg("Channel %d: %s\n", chan->channel, msg); - pwmvdbg(" CMR: %08x CDTY: %08x CPRD: %08x CCNT: %08x\n", + pwminfo("Channel %d: %s\n", chan->channel, msg); + pwminfo(" CMR: %08x CDTY: %08x CPRD: %08x CCNT: %08x\n", pwm_chan_getreg(chan, SAM_PWM_CMR_OFFSET), pwm_chan_getreg(chan, SAM_PWM_CDTY_OFFSET), pwm_chan_getreg(chan, SAM_PWM_CPRD_OFFSET), pwm_chan_getreg(chan, SAM_PWM_CCNT_OFFSET)); - pwmvdbg(" CT: %08x\n", + pwminfo(" CT: %08x\n", pwm_chan_getreg(chan, SAM_PWM_DT_OFFSET)); } #endif @@ -1018,7 +1018,7 @@ static int pwm_setup(FAR struct pwm_lowerhalf_s *dev) { FAR struct sam_pwm_chan_s *chan = (FAR struct sam_pwm_chan_s *)dev; - pwmvdbg("Channel %d: H=%08x L=%08x FI=%08x\n", + pwminfo("Channel %d: H=%08x L=%08x FI=%08x\n", chan->channel, chan->ohpincfg, chan->olpincfg, chan->fipincfg); /* Configure selected PWM pins */ @@ -1061,7 +1061,7 @@ static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev) { FAR struct sam_pwm_chan_s *chan = (FAR struct sam_pwm_chan_s *)dev; - pwmvdbg("Channel %d\n", chan->channel); + pwminfo("Channel %d\n", chan->channel); /* Make sure that the output has been stopped */ @@ -1167,7 +1167,7 @@ static int pwm_start(FAR struct pwm_lowerhalf_s *dev, } pwm_chan_putreg(chan, SAM_PWM_CDTY_OFFSET, regval); - pwmvdbg("Fsrc=%d cprd=%d cdty=%d\n", fsrc, cprd, regval); + pwminfo("Fsrc=%d cprd=%d cdty=%d\n", fsrc, cprd, regval); /* Enable the channel */ @@ -1199,7 +1199,7 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev) { FAR struct sam_pwm_chan_s *chan = (FAR struct sam_pwm_chan_s *)dev; - pwmvdbg("Channel %d\n", chan->channel); + pwminfo("Channel %d\n", chan->channel); /* Disable further PWM interrupts from this channel */ @@ -1236,7 +1236,7 @@ static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg /* There are no platform-specific ioctl commands */ - pwmvdbg("Channel %d\n", chan->channel); + pwminfo("Channel %d\n", chan->channel); #endif return -ENOTTY; } @@ -1299,7 +1299,7 @@ FAR struct pwm_lowerhalf_s *sam_pwminitialize(int channel) FAR struct sam_pwm_chan_s *chan; uint32_t regval; - pwmvdbg("Channel %d\n", channel); + pwminfo("Channel %d\n", channel); switch (channel) { diff --git a/arch/arm/src/sama5/sam_rtc.c b/arch/arm/src/sama5/sam_rtc.c index 94bca91142..05600d9ec1 100644 --- a/arch/arm/src/sama5/sam_rtc.c +++ b/arch/arm/src/sama5/sam_rtc.c @@ -87,14 +87,14 @@ #ifdef CONFIG_DEBUG_RTC # define rtcdbg dbg -# define rtcvdbg vdbg +# define rtcinfo info # define rtclldbg lldbg -# define rtcllvdbg llvdbg +# define rtcllinfo llinfo #else # define rtcdbg(x...) -# define rtcvdbg(x...) +# define rtcinfo(x...) # define rtclldbg(x...) -# define rtcllvdbg(x...) +# define rtcllinfo(x...) #endif /************************************************************************************ diff --git a/arch/arm/src/sama5/sam_spi.c b/arch/arm/src/sama5/sam_spi.c index e914af0aa8..646a848bee 100644 --- a/arch/arm/src/sama5/sam_spi.c +++ b/arch/arm/src/sama5/sam_spi.c @@ -143,13 +143,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif #define DMA_INITIAL 0 @@ -512,17 +512,17 @@ static inline void spi_putreg(struct sam_spidev_s *spi, uint32_t value, #if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO) static void spi_dumpregs(struct sam_spidev_s *spi, const char *msg) { - spivdbg("%s:\n", msg); - spivdbg(" MR:%08x SR:%08x IMR:%08x\n", + spiinfo("%s:\n", msg); + spiinfo(" MR:%08x SR:%08x IMR:%08x\n", getreg32(spi->base + SAM_SPI_MR_OFFSET), getreg32(spi->base + SAM_SPI_SR_OFFSET), getreg32(spi->base + SAM_SPI_IMR_OFFSET)); - spivdbg(" CSR0:%08x CSR1:%08x CSR2:%08x CSR3:%08x\n", + spiinfo(" CSR0:%08x CSR1:%08x CSR2:%08x CSR3:%08x\n", getreg32(spi->base + SAM_SPI_CSR0_OFFSET), getreg32(spi->base + SAM_SPI_CSR1_OFFSET), getreg32(spi->base + SAM_SPI_CSR2_OFFSET), getreg32(spi->base + SAM_SPI_CSR3_OFFSET)); - spivdbg(" WPCR:%08x WPSR:%08x\n", + spiinfo(" WPCR:%08x WPSR:%08x\n", getreg32(spi->base + SAM_SPI_WPCR_OFFSET), getreg32(spi->base + SAM_SPI_WPSR_OFFSET)); } @@ -882,7 +882,7 @@ static int spi_lock(struct spi_dev_s *dev, bool lock) struct sam_spics_s *spics = (struct sam_spics_s *)dev; struct sam_spidev_s *spi = spi_device(spics); - spivdbg("lock=%d\n", lock); + spiinfo("lock=%d\n", lock); if (lock) { /* Take the semaphore (perhaps waiting) */ @@ -930,10 +930,10 @@ static void spi_select(struct spi_dev_s *dev, enum spi_dev_e devid, /* Are we selecting or de-selecting the device? */ - spivdbg("selected=%d\n", selected); + spiinfo("selected=%d\n", selected); if (selected) { - spivdbg("cs=%d\n", spics->cs); + spiinfo("cs=%d\n", spics->cs); /* Before writing the TDR, the PCS field in the SPI_MR register must be set * in order to select a slave. @@ -988,7 +988,7 @@ static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency) uint32_t regval; unsigned int offset; - spivdbg("cs=%d frequency=%d\n", spics->cs, frequency); + spiinfo("cs=%d frequency=%d\n", spics->cs, frequency); /* Check if the requested frequency is the same as the frequency selection */ @@ -1058,7 +1058,7 @@ static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency) /* Calculate the new actual frequency */ actual = SAM_SPI_CLOCK / scbr; - spivdbg("csr[offset=%02x]=%08x actual=%d\n", offset, regval, actual); + spiinfo("csr[offset=%02x]=%08x actual=%d\n", offset, regval, actual); /* Save the frequency setting */ @@ -1091,7 +1091,7 @@ static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode) uint32_t regval; unsigned int offset; - spivdbg("cs=%d mode=%d\n", spics->cs, mode); + spiinfo("cs=%d mode=%d\n", spics->cs, mode); /* Has the mode changed? */ @@ -1134,7 +1134,7 @@ static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode) } spi_putreg(spi, regval, offset); - spivdbg("csr[offset=%02x]=%08x\n", offset, regval); + spiinfo("csr[offset=%02x]=%08x\n", offset, regval); /* Save the mode so that subsequent re-configurations will be faster */ @@ -1164,7 +1164,7 @@ static void spi_setbits(struct spi_dev_s *dev, int nbits) uint32_t regval; unsigned int offset; - spivdbg("cs=%d nbits=%d\n", spics->cs, nbits); + spiinfo("cs=%d nbits=%d\n", spics->cs, nbits); DEBUGASSERT(spics && nbits > 7 && nbits < 17); /* NOTE: The logic in spi_send and in spi_exchange only handles 8-bit @@ -1186,7 +1186,7 @@ static void spi_setbits(struct spi_dev_s *dev, int nbits) regval |= SPI_CSR_BITS(nbits); spi_putreg(spi, regval, offset); - spivdbg("csr[offset=%02x]=%08x\n", offset, regval); + spiinfo("csr[offset=%02x]=%08x\n", offset, regval); /* Save the selection so the subsequence re-configurations will be faster */ @@ -1224,7 +1224,7 @@ static uint16_t spi_send(struct spi_dev_s *dev, uint16_t wd) rxbyte = (uint8_t)0; spi_exchange(dev, &txbyte, &rxbyte, 1); - spivdbg("Sent %02x received %02x\n", txbyte, rxbyte); + spiinfo("Sent %02x received %02x\n", txbyte, rxbyte); return (uint16_t)rxbyte; } @@ -1270,7 +1270,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, uint32_t pcs; uint32_t data; - spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); + spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); /* Set up PCS bits */ @@ -1390,7 +1390,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, return; } - spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); + spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); spics = (struct sam_spics_s *)dev; spi = spi_device(spics); @@ -1673,7 +1673,7 @@ struct spi_dev_s *sam_spibus_initialize(int port) /* The support SAM parts have only a single SPI port */ - spivdbg("port: %d csno: %d spino: %d\n", port, csno, spino); + spiinfo("port: %d csno: %d spino: %d\n", port, csno, spino); DEBUGASSERT(csno >= 0 && csno <= SAM_SPI_NCS); #if defined(CONFIG_SAMA5_SPI0) && defined(CONFIG_SAMA5_SPI1) @@ -1852,7 +1852,7 @@ struct spi_dev_s *sam_spibus_initialize(int port) spi_putreg(spi, regval, offset); spics->nbits = 8; - spivdbg("csr[offset=%02x]=%08x\n", offset, regval); + spiinfo("csr[offset=%02x]=%08x\n", offset, regval); return &spics->spidev; } diff --git a/arch/arm/src/sama5/sam_ssc.c b/arch/arm/src/sama5/sam_ssc.c index 4ea4f5f611..97ce8ce964 100644 --- a/arch/arm/src/sama5/sam_ssc.c +++ b/arch/arm/src/sama5/sam_ssc.c @@ -417,16 +417,16 @@ # define i2sdbg dbg # define i2slldbg lldbg # ifdef CONFIG_DEBUG_INFO -# define i2svdbg dbg -# define i2sllvdbg lldbg +# define i2sinfo dbg +# define i2sllinfo lldbg # else -# define i2svdbg(x...) +# define i2sinfo(x...) # endif #else # define i2sdbg(x...) # define i2slldbg(x...) -# define i2svdbg(x...) -# define i2sllvdbg(x...) +# define i2sinfo(x...) +# define i2sllinfo(x...) #endif #define DMA_INITIAL 0 @@ -820,18 +820,18 @@ static inline uintptr_t ssc_physregaddr(struct sam_ssc_s *priv, #if defined(CONFIG_DEBUG_I2S) && defined(CONFIG_DEBUG_INFO) static void scc_dump_regs(struct sam_ssc_s *priv, const char *msg) { - i2svdbg("SSC%d: %s\n", priv->sscno, msg); - i2svdbg(" CMR:%08x RCMR:%08x RFMR:%08x TCMR:%08x\n", + i2sinfo("SSC%d: %s\n", priv->sscno, msg); + i2sinfo(" CMR:%08x RCMR:%08x RFMR:%08x TCMR:%08x\n", getreg32(priv->base + SAM_SSC_CMR_OFFSET), getreg32(priv->base + SAM_SSC_RCMR_OFFSET), getreg32(priv->base + SAM_SSC_RFMR_OFFSET), getreg32(priv->base + SAM_SSC_TCMR_OFFSET)); - i2svdbg(" TFMR:%08x RC0R:%08x RC1R:%08x SR:%08x\n", + i2sinfo(" TFMR:%08x RC0R:%08x RC1R:%08x SR:%08x\n", getreg32(priv->base + SAM_SSC_TFMR_OFFSET), getreg32(priv->base + SAM_SSC_RC0R_OFFSET), getreg32(priv->base + SAM_SSC_RC1R_OFFSET), getreg32(priv->base + SAM_SSC_SR_OFFSET)); - i2svdbg(" IMR:%08x WPMR:%08x WPSR:%08x\n", + i2sinfo(" IMR:%08x WPMR:%08x WPSR:%08x\n", getreg32(priv->base + SAM_SSC_IMR_OFFSET), getreg32(priv->base + SAM_SSC_WPMR_OFFSET), getreg32(priv->base + SAM_SSC_WPSR_OFFSET)); @@ -868,11 +868,11 @@ static void ssc_dump_queue(sq_queue_t *queue) if (!apb) { - i2sllvdbg(" %p: No buffer\n", bfcontainer); + i2sllinfo(" %p: No buffer\n", bfcontainer); } else { - i2sllvdbg(" %p: buffer=%p nmaxbytes=%d nbytes=%d\n", + i2sllinfo(" %p: buffer=%p nmaxbytes=%d nbytes=%d\n", bfcontainer, apb, apb->nmaxbytes, apb->nbytes); } } @@ -883,12 +883,12 @@ static void ssc_dump_queues(struct sam_transport_s *xpt, const char *msg) irqstate_t flags; flags = enter_critical_section(); - i2sllvdbg("%s\n", msg); - i2sllvdbg(" Pending:\n"); + i2sllinfo("%s\n", msg); + i2sllinfo(" Pending:\n"); ssc_dump_queue(&xpt->pend); - i2sllvdbg(" Active:\n"); + i2sllinfo(" Active:\n"); ssc_dump_queue(&xpt->act); - i2sllvdbg(" Done:\n"); + i2sllinfo(" Done:\n"); ssc_dump_queue(&xpt->done); leave_critical_section(flags); } @@ -1447,7 +1447,7 @@ static void ssc_rx_worker(void *arg) * So we have to start the next DMA here. */ - i2svdbg("rx.act.head=%p rx.done.head=%p\n", + i2sinfo("rx.act.head=%p rx.done.head=%p\n", priv->rx.act.head, priv->rx.done.head); ssc_dump_rxqueues(priv, "RX worker start"); @@ -1859,7 +1859,7 @@ static void ssc_tx_worker(void *arg) * So we have to start the next DMA here. */ - i2svdbg("tx.act.head=%p tx.done.head=%p\n", + i2sinfo("tx.act.head=%p tx.done.head=%p\n", priv->tx.act.head, priv->tx.done.head); ssc_dump_txqueues(priv, "TX worker start"); @@ -2234,7 +2234,7 @@ static int ssc_receive(struct i2s_dev_s *dev, struct ap_buffer_s *apb, #endif DEBUGASSERT(priv && apb && ((uintptr_t)apb->samp & priv->align) == 0); - i2svdbg("apb=%p nmaxbytes=%d arg=%p timeout=%d\n", + i2sinfo("apb=%p nmaxbytes=%d arg=%p timeout=%d\n", apb, apb->nmaxbytes, arg, timeout); ssc_init_buffer(apb->samp, apb->nmaxbytes); @@ -2449,7 +2449,7 @@ static int ssc_send(struct i2s_dev_s *dev, struct ap_buffer_s *apb, */ DEBUGASSERT(priv && apb); - i2svdbg("apb=%p nbytes=%d arg=%p timeout=%d\n", + i2sinfo("apb=%p nbytes=%d arg=%p timeout=%d\n", apb, apb->nbytes - apb->curbyte, arg, timeout); ssc_dump_buffer("Sending", &apb->samp[apb->curbyte], @@ -2929,7 +2929,7 @@ static void ssc_clocking(struct sam_ssc_s *priv) sam_enableperiph1(priv->pid); - i2svdbg("PCSR1=%08x PCR=%08x CMR=%08x\n", + i2sinfo("PCSR1=%08x PCR=%08x CMR=%08x\n", getreg32(SAM_PMC_PCSR1), regval, ssc_getreg(priv, SAM_SSC_CMR_OFFSET)); } @@ -3431,7 +3431,7 @@ struct i2s_dev_s *sam_ssc_initialize(int port) /* The support SAM parts have only a single SSC port */ - i2svdbg("port: %d\n", port); + i2sinfo("port: %d\n", port); /* Allocate a new state structure for this chip select. NOTE that there * is no protection if the same chip select is used in two different diff --git a/arch/arm/src/sama5/sam_tc.c b/arch/arm/src/sama5/sam_tc.c index 54cf71242c..af434004ef 100644 --- a/arch/arm/src/sama5/sam_tc.c +++ b/arch/arm/src/sama5/sam_tc.c @@ -1102,7 +1102,7 @@ TC_HANDLE sam_tc_allocate(int channel, int mode) * access to the requested channel. */ - tcvdbg("channel=%d mode=%08x\n", channel, mode); + tcinfo("channel=%d mode=%08x\n", channel, mode); chan = sam_tc_initialize(channel); if (chan) @@ -1128,7 +1128,7 @@ TC_HANDLE sam_tc_allocate(int channel, int mode) /* Return an opaque reference to the channel */ - tcvdbg("Returning %p\n", chan); + tcinfo("Returning %p\n", chan); return (TC_HANDLE)chan; } @@ -1150,7 +1150,7 @@ void sam_tc_free(TC_HANDLE handle) { struct sam_chan_s *chan = (struct sam_chan_s *)handle; - tcvdbg("Freeing %p channel=%d inuse=%d\n", chan, chan->chan, chan->inuse); + tcinfo("Freeing %p channel=%d inuse=%d\n", chan, chan->chan, chan->inuse); DEBUGASSERT(chan && chan->inuse); /* Make sure that interrupts are detached and disabled and that the channel @@ -1183,7 +1183,7 @@ void sam_tc_start(TC_HANDLE handle) { struct sam_chan_s *chan = (struct sam_chan_s *)handle; - tcvdbg("Starting channel %d inuse=%d\n", chan->chan, chan->inuse); + tcinfo("Starting channel %d inuse=%d\n", chan->chan, chan->inuse); DEBUGASSERT(chan && chan->inuse); /* Read the SR to clear any pending interrupts on this channel */ @@ -1215,7 +1215,7 @@ void sam_tc_stop(TC_HANDLE handle) { struct sam_chan_s *chan = (struct sam_chan_s *)handle; - tcvdbg("Stopping channel %d inuse=%d\n", chan->chan, chan->inuse); + tcinfo("Stopping channel %d inuse=%d\n", chan->chan, chan->inuse); DEBUGASSERT(chan && chan->inuse); sam_chan_putreg(chan, SAM_TC_CCR_OFFSET, TC_CCR_CLKDIS); @@ -1322,7 +1322,7 @@ void sam_tc_setregister(TC_HANDLE handle, int regid, uint32_t regval) DEBUGASSERT(chan && regid < TC_NREGISTERS); - tcvdbg("Channel %d: Set register RC%d to %08lx\n", + tcinfo("Channel %d: Set register RC%d to %08lx\n", chan->chan, regid, (unsigned long)regval); sam_chan_putreg(chan, g_regoffset[regid], regval); @@ -1465,7 +1465,7 @@ int sam_tc_divisor(uint32_t frequency, uint32_t *div, uint32_t *tcclks) uint32_t ftcin = sam_tc_infreq(); int ndx = 0; - tcvdbg("frequency=%d\n", frequency); + tcinfo("frequency=%d\n", frequency); /* Satisfy lower bound. That is, the value of the divider such that: * @@ -1502,7 +1502,7 @@ int sam_tc_divisor(uint32_t frequency, uint32_t *div, uint32_t *tcclks) if (div) { uint32_t value = sam_tc_freqdiv_lookup(ftcin, ndx); - tcvdbg("return div=%lu\n", (unsigned long)value); + tcinfo("return div=%lu\n", (unsigned long)value); *div = value; } @@ -1510,7 +1510,7 @@ int sam_tc_divisor(uint32_t frequency, uint32_t *div, uint32_t *tcclks) if (tcclks) { - tcvdbg("return tcclks=%08lx\n", (unsigned long)TC_CMR_TCCLKS(ndx)); + tcinfo("return tcclks=%08lx\n", (unsigned long)TC_CMR_TCCLKS(ndx)); *tcclks = TC_CMR_TCCLKS(ndx); } diff --git a/arch/arm/src/sama5/sam_tc.h b/arch/arm/src/sama5/sam_tc.h index 311f6d329f..8d5df8423e 100644 --- a/arch/arm/src/sama5/sam_tc.h +++ b/arch/arm/src/sama5/sam_tc.h @@ -87,14 +87,14 @@ #ifdef CONFIG_SAMA5_TC_DEBUG # define tcdbg dbg -# define tcvdbg vdbg +# define tcinfo info # define tclldbg lldbg -# define tcllvdbg llvdbg +# define tcllinfo llinfo #else # define tcdbg(x...) -# define tcvdbg(x...) +# define tcinfo(x...) # define tclldbg(x...) -# define tcllvdbg(x...) +# define tcllinfo(x...) #endif /**************************************************************************** diff --git a/arch/arm/src/sama5/sam_tickless.c b/arch/arm/src/sama5/sam_tickless.c index 70cecb1217..190cdf19a5 100644 --- a/arch/arm/src/sama5/sam_tickless.c +++ b/arch/arm/src/sama5/sam_tickless.c @@ -209,7 +209,7 @@ static struct sam_tickless_s g_tickless; static void sam_oneshot_handler(void *arg) { - tcllvdbg("Expired...\n"); + tcllinfo("Expired...\n"); sched_timer_expiration(); } diff --git a/arch/arm/src/sama5/sam_trng.c b/arch/arm/src/sama5/sam_trng.c index 1be5585bc4..eb9ee65c27 100644 --- a/arch/arm/src/sama5/sam_trng.c +++ b/arch/arm/src/sama5/sam_trng.c @@ -243,7 +243,7 @@ static ssize_t sam_read(struct file *filep, char *buffer, size_t buflen) ssize_t retval; int ret; - fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen); + finfo("buffer=%p buflen=%d\n", buffer, (int)buflen); /* Get exclusive access to the TRNG harware */ @@ -283,7 +283,7 @@ static ssize_t sam_read(struct file *filep, char *buffer, size_t buflen) { ret = sem_wait(&g_trngdev.waitsem); - fvdbg("Awakened: nsamples=%d maxsamples=%d ret=%d\n", + finfo("Awakened: nsamples=%d maxsamples=%d ret=%d\n", g_trngdev.nsamples, g_trngdev.maxsamples, ret); if (ret < 0) @@ -320,7 +320,7 @@ errout: sem_post(&g_trngdev.exclsem); - fvdbg("Return %d\n", (int)retval); + finfo("Return %d\n", (int)retval); return retval; } @@ -346,7 +346,7 @@ void up_rnginitialize(void) { int ret; - fvdbg("Initializing TRNG hardware\n"); + finfo("Initializing TRNG hardware\n"); /* Initialize the device structure */ diff --git a/arch/arm/src/sama5/sam_tsd.c b/arch/arm/src/sama5/sam_tsd.c index 3bed567508..5159a34e7e 100644 --- a/arch/arm/src/sama5/sam_tsd.c +++ b/arch/arm/src/sama5/sam_tsd.c @@ -285,7 +285,7 @@ static void sam_tsd_notify(struct sam_tsd_s *priv) if (fds) { fds->revents |= POLLIN; - ivdbg("Report events: %02x\n", fds->revents); + iinfo("Report events: %02x\n", fds->revents); sem_post(fds->sem); } } @@ -380,7 +380,7 @@ static int sam_tsd_waitsample(struct sam_tsd_s *priv, struct sam_sample_s *sampl { /* Wait for a sample data */ - ivdbg("Waiting..\n"); + iinfo("Waiting..\n"); priv->nwaiters++; ret = sem_wait(&priv->waitsem); priv->nwaiters--; @@ -398,7 +398,7 @@ static int sam_tsd_waitsample(struct sam_tsd_s *priv, struct sam_sample_s *sampl } } - ivdbg("Sampled\n"); + iinfo("Sampled\n"); /* Re-acquire the semaphore that manages mutually exclusive access to * the device structure. We may have to wait here. But we have our sample. @@ -538,7 +538,7 @@ static void sam_tsd_bottomhalf(void *arg) /* Handle the change from pen down to pen up */ - ivdbg("pending: %08x pendown: %d contact: %d\n", + iinfo("pending: %08x pendown: %d contact: %d\n", pending, pendown, priv->sample.contact); if (!pendown) @@ -834,7 +834,7 @@ static int sam_tsd_open(struct file *filep) uint8_t tmp; int ret; - ivdbg("crefs: %d\n", priv->crefs); + iinfo("crefs: %d\n", priv->crefs); /* Get exclusive access to the device structures */ @@ -883,7 +883,7 @@ static int sam_tsd_close(struct file *filep) FAR struct inode *inode = filep->f_inode; FAR struct sam_tsd_s *priv = inode->i_private; - ivdbg("crefs: %d\n", priv->crefs); + iinfo("crefs: %d\n", priv->crefs); /* Get exclusive access to the ADC device */ @@ -919,7 +919,7 @@ static ssize_t sam_tsd_read(struct file *filep, char *buffer, size_t len) struct sam_sample_s sample; int ret; - ivdbg("buffer:%p len:%d\n", buffer, len); + iinfo("buffer:%p len:%d\n", buffer, len); DEBUGASSERT(filep); inode = filep->f_inode; @@ -954,7 +954,7 @@ static ssize_t sam_tsd_read(struct file *filep, char *buffer, size_t len) * option, then just return an error. */ - ivdbg("Sample data is not available\n"); + iinfo("Sample data is not available\n"); if (filep->f_oflags & O_NONBLOCK) { ret = -EAGAIN; @@ -1018,16 +1018,16 @@ static ssize_t sam_tsd_read(struct file *filep, char *buffer, size_t len) report->point[0].flags = TSD_PENMOVE; } - ivdbg(" id: %d\n", report->point[0].id); - ivdbg(" flags: %02x\n", report->point[0].flags); - ivdbg(" x: %d\n", report->point[0].x); - ivdbg(" y: %d\n", report->point[0].y); + iinfo(" id: %d\n", report->point[0].id); + iinfo(" flags: %02x\n", report->point[0].flags); + iinfo(" x: %d\n", report->point[0].x); + iinfo(" y: %d\n", report->point[0].y); ret = SIZEOF_TOUCH_SAMPLE_S(1); errout: sam_adc_unlock(priv->adc); - ivdbg("Returning: %d\n", ret); + iinfo("Returning: %d\n", ret); return (ssize_t)ret; } @@ -1041,7 +1041,7 @@ static int sam_tsd_ioctl(struct file *filep, int cmd, unsigned long arg) struct sam_tsd_s *priv; int ret; - ivdbg("cmd: %d arg: %ld\n", cmd, arg); + iinfo("cmd: %d arg: %ld\n", cmd, arg); DEBUGASSERT(filep); inode = filep->f_inode; @@ -1077,7 +1077,7 @@ static int sam_tsd_poll(struct file *filep, struct pollfd *fds, bool setup) int ret = OK; int i; - ivdbg("setup: %d\n", (int)setup); + iinfo("setup: %d\n", (int)setup); DEBUGASSERT(filep && fds); inode = filep->f_inode; @@ -1655,7 +1655,7 @@ int sam_tsd_register(struct sam_adc_s *adc, int minor) char devname[DEV_NAMELEN]; int ret; - ivdbg("minor: %d\n", minor); + iinfo("minor: %d\n", minor); /* Debug-only sanity checks */ @@ -1674,7 +1674,7 @@ int sam_tsd_register(struct sam_adc_s *adc, int minor) /* Register the device as an input device */ (void)snprintf(devname, DEV_NAMELEN, DEV_FORMAT, minor); - ivdbg("Registering %s\n", devname); + iinfo("Registering %s\n", devname); ret = register_driver(devname, &g_tsdops, 0666, priv); if (ret < 0) diff --git a/arch/arm/src/sama5/sam_twi.c b/arch/arm/src/sama5/sam_twi.c index 72b9358b65..d430898dde 100644 --- a/arch/arm/src/sama5/sam_twi.c +++ b/arch/arm/src/sama5/sam_twi.c @@ -128,14 +128,14 @@ #ifdef CONFIG_DEBUG_I2C # define i2cdbg dbg -# define i2cvdbg vdbg +# define i2cinfo info # define i2clldbg lldbg -# define i2cllvdbg llvdbg +# define i2cllinfo llinfo #else # define i2cdbg(x...) -# define i2cvdbg(x...) +# define i2cinfo(x...) # define i2clldbg(x...) -# define i2cllvdbg(x...) +# define i2cllinfo(x...) #endif /**************************************************************************** @@ -514,9 +514,9 @@ static int twi_wait(struct twi_dev_s *priv, unsigned int size) do { - i2cvdbg("TWI%d Waiting...\n", priv->attr->twi); + i2cinfo("TWI%d Waiting...\n", priv->attr->twi); twi_takesem(&priv->waitsem); - i2cvdbg("TWI%d Awakened with result: %d\n", + i2cinfo("TWI%d Awakened with result: %d\n", priv->attr->twi, priv->result); } while (priv->result == -EBUSY); @@ -574,7 +574,7 @@ static int twi_interrupt(struct twi_dev_s *priv) imr = twi_getrel(priv, SAM_TWI_IMR_OFFSET); pending = sr & imr; - i2cllvdbg("TWI%d pending: %08x\n", priv->attr->twi, pending); + i2cllinfo("TWI%d pending: %08x\n", priv->attr->twi, pending); /* Byte received */ @@ -841,7 +841,7 @@ static int twi_transfer(FAR struct i2c_master_s *dev, int ret; DEBUGASSERT(dev != NULL && msgs != NULL && count > 0); - i2cvdbg("TWI%d count: %d\n", priv->attr->twi, count); + i2cinfo("TWI%d count: %d\n", priv->attr->twi, count); /* Calculate the total transfer size so that we can calculate a reasonable * timeout value. @@ -1127,7 +1127,7 @@ static void twi_hw_initialize(struct twi_dev_s *priv, uint32_t frequency) uint32_t regval; uint32_t mck; - i2cvdbg("TWI%d Initializing\n", priv->attr->twi); + i2cinfo("TWI%d Initializing\n", priv->attr->twi); /* Configure PIO pins */ @@ -1228,7 +1228,7 @@ struct i2c_master_s *sam_i2cbus_initialize(int bus) irqstate_t flags; int ret; - i2cvdbg("Initializing TWI%d\n", bus); + i2cinfo("Initializing TWI%d\n", bus); #ifdef CONFIG_SAMA5_TWI0 if (bus == 0) @@ -1347,7 +1347,7 @@ int sam_i2cbus_uninitialize(FAR struct i2c_master_s *dev) { struct twi_dev_s *priv = (struct twi_dev_s *) dev; - i2cvdbg("TWI%d Un-initializing\n", priv->attr->twi); + i2cinfo("TWI%d Un-initializing\n", priv->attr->twi); /* Disable TWI interrupts */ diff --git a/arch/arm/src/sama5/sam_udphs.c b/arch/arm/src/sama5/sam_udphs.c index 06c2cf2fed..72d8bb8241 100644 --- a/arch/arm/src/sama5/sam_udphs.c +++ b/arch/arm/src/sama5/sam_udphs.c @@ -1357,7 +1357,7 @@ static int sam_req_write(struct sam_usbdev_s *priv, struct sam_ep_s *privep) return -ENOENT; } - ullvdbg("epno=%d req=%p: len=%d xfrd=%d inflight=%d zlpneeded=%d\n", + ullinfo("epno=%d req=%p: len=%d xfrd=%d inflight=%d zlpneeded=%d\n", epno, privreq, privreq->req.len, privreq->req.xfrd, privreq->inflight, privep->zlpneeded); @@ -1600,7 +1600,7 @@ static int sam_req_read(struct sam_usbdev_s *priv, struct sam_ep_s *privep, return -ENOENT; } - ullvdbg("EP%d: len=%d xfrd=%d\n", + ullinfo("EP%d: len=%d xfrd=%d\n", epno, privreq->req.len, privreq->req.xfrd); /* Ignore any attempt to receive a zero length packet */ @@ -1885,7 +1885,7 @@ static void sam_ep0_setup(struct sam_usbdev_s *priv) index.w = GETUINT16(priv->ctrl.index); len.w = GETUINT16(priv->ctrl.len); - ullvdbg("SETUP: type=%02x req=%02x value=%04x index=%04x len=%04x\n", + ullinfo("SETUP: type=%02x req=%02x value=%04x index=%04x len=%04x\n", priv->ctrl.type, priv->ctrl.req, value.w, index.w, len.w); /* Dispatch any non-standard requests */ @@ -2049,7 +2049,7 @@ static void sam_ep0_setup(struct sam_usbdev_s *priv) { /* Special case recipient=device test mode */ - ullvdbg("test mode: %d\n", index.w); + ullinfo("test mode: %d\n", index.w); } else if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) != USB_REQ_RECIPIENT_ENDPOINT) { @@ -2349,7 +2349,7 @@ static void sam_dma_interrupt(struct sam_usbdev_s *priv, int epno) /* Get the result of the DMA operation */ dmastatus = sam_getreg(SAM_UDPHS_DMASTATUS(epno)); - uvdbg("DMA%d DMASTATUS: %08x\n", epno, dmastatus); + uinfo("DMA%d DMASTATUS: %08x\n", epno, dmastatus); /* Disable DMA interrupt to avoid receiving 2 (B_EN and TR_EN) */ @@ -3220,7 +3220,7 @@ static int sam_ep_configure_internal(struct sam_ep_s *privep, uint8_t nbtrans; bool dirin; - uvdbg("len: %02x type: %02x addr: %02x attr: %02x " + uinfo("len: %02x type: %02x addr: %02x attr: %02x " "maxpacketsize: %02x %02x interval: %02x\n", desc->len, desc->type, desc->addr, desc->attr, desc->mxpacketsize[0], desc->mxpacketsize[1], diff --git a/arch/arm/src/sama5/sam_wdt.c b/arch/arm/src/sama5/sam_wdt.c index d14f45c198..8e1141543a 100644 --- a/arch/arm/src/sama5/sam_wdt.c +++ b/arch/arm/src/sama5/sam_wdt.c @@ -88,10 +88,10 @@ #ifdef CONFIG_DEBUG_WATCHDOG # define wddbg lldbg -# define wdvdbg llvdbg +# define wdinfo llinfo #else # define wddbg(x...) -# define wdvdbg(x...) +# define wdinfo(x...) #endif /**************************************************************************** @@ -315,7 +315,7 @@ static int sam_start(FAR struct watchdog_lowerhalf_s *lower) * timer with the newly programmed mode parameters. */ - wdvdbg("Entry\n"); + wdinfo("Entry\n"); return priv->started ? OK : -ENOSYS; } @@ -343,7 +343,7 @@ static int sam_stop(FAR struct watchdog_lowerhalf_s *lower) * timer with the newly programmed mode parameters. */ - wdvdbg("Entry\n"); + wdinfo("Entry\n"); return -ENOSYS; } @@ -366,7 +366,7 @@ static int sam_stop(FAR struct watchdog_lowerhalf_s *lower) static int sam_keepalive(FAR struct watchdog_lowerhalf_s *lower) { - wdvdbg("Entry\n"); + wdinfo("Entry\n"); /* Write WDT_CR_WDRSTT to the WDT CR regiser (along with the KEY value) * will restart the watchdog timer. @@ -397,7 +397,7 @@ static int sam_getstatus(FAR struct watchdog_lowerhalf_s *lower, { FAR struct sam_lowerhalf_s *priv = (FAR struct sam_lowerhalf_s *)lower; - wdvdbg("Entry\n"); + wdinfo("Entry\n"); DEBUGASSERT(priv); /* Return the status bit */ @@ -426,10 +426,10 @@ static int sam_getstatus(FAR struct watchdog_lowerhalf_s *lower, status->timeleft = 0; - wdvdbg("Status :\n"); - wdvdbg(" flags : %08x\n", status->flags); - wdvdbg(" timeout : %d\n", status->timeout); - wdvdbg(" timeleft : %d\n", status->timeleft); + wdinfo("Status :\n"); + wdinfo(" flags : %08x\n", status->flags); + wdinfo(" timeout : %d\n", status->timeout); + wdinfo(" timeleft : %d\n", status->timeleft); return OK; } @@ -457,7 +457,7 @@ static int sam_settimeout(FAR struct watchdog_lowerhalf_s *lower, uint32_t regval; DEBUGASSERT(priv); - wdvdbg("Entry: timeout=%d\n", timeout); + wdinfo("Entry: timeout=%d\n", timeout); /* Can this timeout be represented? */ @@ -496,7 +496,7 @@ static int sam_settimeout(FAR struct watchdog_lowerhalf_s *lower, priv->reload = reload; - wdvdbg("reload=%d timout: %d->%d\n", + wdinfo("reload=%d timout: %d->%d\n", reload, timeout, priv->timeout); /* Set the WDT_MR according to calculated value @@ -541,7 +541,7 @@ static int sam_settimeout(FAR struct watchdog_lowerhalf_s *lower, priv->started = true; - wdvdbg("Setup: CR: %08x MR: %08x SR: %08x\n", + wdinfo("Setup: CR: %08x MR: %08x SR: %08x\n", sam_getreg(SAM_WDT_CR), sam_getreg(SAM_WDT_MR), sam_getreg(SAM_WDT_SR)); @@ -582,7 +582,7 @@ static xcpt_t sam_capture(FAR struct watchdog_lowerhalf_s *lower, xcpt_t oldhandler; DEBUGASSERT(priv); - wdvdbg("Entry: handler=%p\n", handler); + wdinfo("Entry: handler=%p\n", handler); /* Get the old handler return value */ @@ -636,7 +636,7 @@ static xcpt_t sam_capture(FAR struct watchdog_lowerhalf_s *lower, static int sam_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd, unsigned long arg) { - wdvdbg("cmd=%d arg=%ld\n", cmd, arg); + wdinfo("cmd=%d arg=%ld\n", cmd, arg); /* No ioctls are supported */ @@ -667,7 +667,7 @@ int sam_wdt_initialize(void) { FAR struct sam_lowerhalf_s *priv = &g_wdtdev; - wdvdbg("Entry: CR: %08x MR: %08x SR: %08x\n", + wdinfo("Entry: CR: %08x MR: %08x SR: %08x\n", sam_getreg(SAM_WDT_CR), sam_getreg(SAM_WDT_MR), sam_getreg(SAM_WDT_SR)); diff --git a/arch/arm/src/sama5/sam_xdmac.c b/arch/arm/src/sama5/sam_xdmac.c index bb4ce4e1dd..77301c5c43 100644 --- a/arch/arm/src/sama5/sam_xdmac.c +++ b/arch/arm/src/sama5/sam_xdmac.c @@ -1957,7 +1957,7 @@ void sam_dmainitialize(struct sam_xdmac_s *xdmac) void weak_function up_dmainitialize(void) { #ifdef CONFIG_SAMA5_XDMAC0 - dmallvdbg("Initialize XDMAC0\n"); + dmallinfo("Initialize XDMAC0\n"); /* Enable peripheral clock */ @@ -1977,7 +1977,7 @@ void weak_function up_dmainitialize(void) #endif #ifdef CONFIG_SAMA5_XDMAC1 - dmallvdbg("Initialize XDMAC1\n"); + dmallinfo("Initialize XDMAC1\n"); /* Enable peripheral clock */ @@ -2083,7 +2083,7 @@ DMA_HANDLE sam_dmachannel(uint8_t dmacno, uint32_t chflags) if (xdmach) { - dmavdbg("XDMAC%d CH%d: chflags: %08x returning xdmach: %p\n", + dmainfo("XDMAC%d CH%d: chflags: %08x returning xdmach: %p\n", (int)dmacno, xdmach->chan, (int)chflags, xdmach); } else @@ -2119,13 +2119,13 @@ void sam_dmaconfig(DMA_HANDLE handle, uint32_t chflags) xdmach->flags = chflags; #if defined(CONFIG_SAMA5_XDMAC0) && defined(CONFIG_SAMA5_XDMAC1) - dmavdbg("XDMAC%d CH%d: chflags: %08x\n", + dmainfo("XDMAC%d CH%d: chflags: %08x\n", xdmach->xdmac, xdmach->chan, (int)chflags); #elif defined(CONFIG_SAMA5_XDMAC0) - dmavdbg("XDMAC0 CH%d: chflags: %08x\n", + dmainfo("XDMAC0 CH%d: chflags: %08x\n", xdmach->chan, (int)chflags); #else - dmavdbg("XDMAC1 CH%d: chflags: %08x\n", + dmainfo("XDMAC1 CH%d: chflags: %08x\n", xdmach->chan, (int)chflags); #endif } @@ -2148,7 +2148,7 @@ void sam_dmafree(DMA_HANDLE handle) struct sam_xdmach_s *xdmach = (struct sam_xdmach_s *)handle; struct sam_xdmac_s *xdmac; - dmavdbg("xdmach: %p\n", xdmach); + dmainfo("xdmach: %p\n", xdmach); DEBUGASSERT((xdmach != NULL) && (xdmach->inuse)); xdmac = sam_controller(xdmach); @@ -2186,10 +2186,10 @@ int sam_dmatxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr, size_t remaining; int ret = OK; - dmavdbg("xdmach: %p paddr: %08x maddr: %08x nbytes: %d\n", + dmainfo("xdmach: %p paddr: %08x maddr: %08x nbytes: %d\n", xdmach, (int)paddr, (int)maddr, (int)nbytes); DEBUGASSERT(xdmach); - dmavdbg("llhead: %p lltail: %p\n", xdmach->llhead, xdmach->lltail); + dmainfo("llhead: %p lltail: %p\n", xdmach->llhead, xdmach->lltail); /* The maximum transfer size in bytes depends upon the maximum number of * transfers and the number of bytes per transfer. @@ -2265,10 +2265,10 @@ int sam_dmarxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr, size_t remaining; int ret = OK; - dmavdbg("xdmach: %p paddr: %08x maddr: %08x nbytes: %d\n", + dmainfo("xdmach: %p paddr: %08x maddr: %08x nbytes: %d\n", xdmach, (int)paddr, (int)maddr, (int)nbytes); DEBUGASSERT(xdmach); - dmavdbg("llhead: %p lltail: %p\n", xdmach->llhead, xdmach->lltail); + dmainfo("llhead: %p lltail: %p\n", xdmach->llhead, xdmach->lltail); /* The maximum transfer size in bytes depends upon the maximum number of * transfers and the number of bytes per transfer. @@ -2340,7 +2340,7 @@ int sam_dmastart(DMA_HANDLE handle, dma_callback_t callback, void *arg) struct sam_xdmach_s *xdmach = (struct sam_xdmach_s *)handle; int ret = -EINVAL; - dmavdbg("xdmach: %p callback: %p arg: %p\n", xdmach, callback, arg); + dmainfo("xdmach: %p callback: %p arg: %p\n", xdmach, callback, arg); DEBUGASSERT(xdmach != NULL); /* Verify that the DMA has been setup (i.e., at least one entry in the @@ -2384,7 +2384,7 @@ void sam_dmastop(DMA_HANDLE handle) struct sam_xdmach_s *xdmach = (struct sam_xdmach_s *)handle; irqstate_t flags; - dmavdbg("xdmach: %p\n", xdmach); + dmainfo("xdmach: %p\n", xdmach); DEBUGASSERT(xdmach != NULL); flags = enter_critical_section(); diff --git a/arch/arm/src/samdl/sam_dmac.c b/arch/arm/src/samdl/sam_dmac.c index de5004f2d7..4eafd93790 100644 --- a/arch/arm/src/samdl/sam_dmac.c +++ b/arch/arm/src/samdl/sam_dmac.c @@ -769,7 +769,7 @@ static int sam_rxbuffer(struct sam_dmach_s *dmach, uint32_t paddr, void weak_function up_dmainitialize(void) { - dmallvdbg("Initialize DMAC\n"); + dmallinfo("Initialize DMAC\n"); int i; /* Initialize global semaphores */ @@ -888,7 +888,7 @@ DMA_HANDLE sam_dmachannel(uint32_t chflags) sam_givechsem(); - dmavdbg("chflags: %08x returning dmach: %p\n", (int)chflags, dmach); + dmainfo("chflags: %08x returning dmach: %p\n", (int)chflags, dmach); return (DMA_HANDLE)dmach; } @@ -914,7 +914,7 @@ void sam_dmaconfig(DMA_HANDLE handle, uint32_t chflags) /* Set the new DMA channel flags. */ - dmavdbg("chflags: %08x\n", (int)chflags); + dmainfo("chflags: %08x\n", (int)chflags); dmach->dc_flags = chflags; } @@ -935,7 +935,7 @@ void sam_dmafree(DMA_HANDLE handle) { struct sam_dmach_s *dmach = (struct sam_dmach_s *)handle; - dmavdbg("dmach: %p\n", dmach); + dmainfo("dmach: %p\n", dmach); DEBUGASSERT((dmach != NULL) && (dmach->dc_inuse)); /* Mark the channel no longer in use. Clearing the inuse flag is an atomic @@ -965,12 +965,12 @@ int sam_dmatxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr, size_t maxtransfer; int ret = OK; - dmavdbg("dmach: %p paddr: %08x maddr: %08x nbytes: %d\n", + dmainfo("dmach: %p paddr: %08x maddr: %08x nbytes: %d\n", dmach, (int)paddr, (int)maddr, (int)nbytes); DEBUGASSERT(dmach); #if CONFIG_SAMDL_DMAC_NDESC > 0 - dmavdbg("dc_head: %p dc_tail: %p\n", dmach->dc_head, dmach->dc_tail); + dmainfo("dc_head: %p dc_tail: %p\n", dmach->dc_head, dmach->dc_tail); #endif /* The maximum transfer size in bytes depends upon the maximum number of @@ -1039,12 +1039,12 @@ int sam_dmarxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr, size_t maxtransfer; int ret = OK; - dmavdbg("dmach: %p paddr: %08x maddr: %08x nbytes: %d\n", + dmainfo("dmach: %p paddr: %08x maddr: %08x nbytes: %d\n", dmach, (int)paddr, (int)maddr, (int)nbytes); DEBUGASSERT(dmach); #if CONFIG_SAMDL_DMAC_NDESC > 0 - dmavdbg("dc_head: %p dc_tail: %p\n", dmach->dc_head, dmach->dc_tail); + dmainfo("dc_head: %p dc_tail: %p\n", dmach->dc_head, dmach->dc_tail); #endif /* The maximum transfer size in bytes depends upon the maximum number of @@ -1115,7 +1115,7 @@ int sam_dmastart(DMA_HANDLE handle, dma_callback_t callback, void *arg) uint8_t memqos; int ret = -EINVAL; - dmavdbg("dmach: %p callback: %p arg: %p\n", dmach, callback, arg); + dmainfo("dmach: %p callback: %p arg: %p\n", dmach, callback, arg); DEBUGASSERT(dmach != NULL && dmach->dc_chan < SAMDL_NDMACHAN); head = &g_base_desc[dmach->dc_chan]; @@ -1240,7 +1240,7 @@ void sam_dmastop(DMA_HANDLE handle) struct sam_dmach_s *dmach = (struct sam_dmach_s *)handle; irqstate_t flags; - dmavdbg("dmach: %p\n", dmach); + dmainfo("dmach: %p\n", dmach); DEBUGASSERT(dmach != NULL); flags = enter_critical_section(); diff --git a/arch/arm/src/samdl/sam_idle.c b/arch/arm/src/samdl/sam_idle.c index be58de12be..b54d8d3a7d 100644 --- a/arch/arm/src/samdl/sam_idle.c +++ b/arch/arm/src/samdl/sam_idle.c @@ -99,7 +99,7 @@ static void up_idlepm(void) /* Perform board-specific, state-dependent logic here */ - llvdbg("newstate= %d oldstate=%d\n", newstate, oldstate); + llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); /* Then force the global state change */ diff --git a/arch/arm/src/samdl/sam_spi.c b/arch/arm/src/samdl/sam_spi.c index 35aa6cfc76..78bc1b9cf3 100644 --- a/arch/arm/src/samdl/sam_spi.c +++ b/arch/arm/src/samdl/sam_spi.c @@ -93,13 +93,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /**************************************************************************** @@ -742,16 +742,16 @@ static void spi_putreg32(struct sam_spidev_s *priv, uint32_t regval, #if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO) static void spi_dumpregs(struct sam_spidev_s *priv, const char *msg) { - spivdbg("%s:\n", msg); - spivdbg(" CTRLA:%08x CTRLB:%08x DBGCTRL:%02x\n", + spiinfo("%s:\n", msg); + spiinfo(" CTRLA:%08x CTRLB:%08x DBGCTRL:%02x\n", getreg32(priv->base + SAM_SPI_CTRLA_OFFSET), getreg32(priv->base + SAM_SPI_CTRLB_OFFSET), getreg8(priv->base + SAM_SPI_DBGCTRL_OFFSET)); - spivdbg(" BAUD:%02x INTEN:%02x INTFLAG:%02x\n", + spiinfo(" BAUD:%02x INTEN:%02x INTFLAG:%02x\n", getreg8(priv->base + SAM_SPI_BAUD_OFFSET), getreg8(priv->base + SAM_SPI_INTENCLR_OFFSET), getreg8(priv->base + SAM_SPI_INTFLAG_OFFSET)); - spivdbg(" STATUS:%04x ADDR:%08x\n", + spiinfo(" STATUS:%04x ADDR:%08x\n", getreg16(priv->base + SAM_SPI_STATUS_OFFSET), getreg32(priv->base + SAM_SPI_ADDR_OFFSET)); } @@ -890,7 +890,7 @@ static int spi_lock(struct spi_dev_s *dev, bool lock) { struct sam_spidev_s *priv = (struct sam_spidev_s *)dev; - spivdbg("lock=%d\n", lock); + spiinfo("lock=%d\n", lock); if (lock) { /* Take the semaphore (perhaps waiting) */ @@ -935,7 +935,7 @@ static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency) uint32_t baud; uint32_t ctrla; - spivdbg("sercom=%d frequency=%d\n", priv->sercom, frequency); + spiinfo("sercom=%d frequency=%d\n", priv->sercom, frequency); /* Check if the configured BAUD is within the valid range */ @@ -1016,7 +1016,7 @@ static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency) priv->frequency = frequency; priv->actual = actual; - spivdbg("Frequency %d->%d\n", frequency, actual); + spiinfo("Frequency %d->%d\n", frequency, actual); return actual; } @@ -1040,7 +1040,7 @@ static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode) struct sam_spidev_s *priv = (struct sam_spidev_s *)dev; uint32_t regval; - spivdbg("sercom=%d mode=%d\n", priv->sercom, mode); + spiinfo("sercom=%d mode=%d\n", priv->sercom, mode); /* Has the mode changed? */ @@ -1101,7 +1101,7 @@ static void spi_setbits(struct spi_dev_s *dev, int nbits) struct sam_spidev_s *priv = (struct sam_spidev_s *)dev; uint32_t regval; - spivdbg("sercom=%d nbits=%d\n", priv->sercom, nbits); + spiinfo("sercom=%d nbits=%d\n", priv->sercom, nbits); DEBUGASSERT(priv && nbits > 7 && nbits < 10); /* Has the number of bits changed? */ @@ -1156,7 +1156,7 @@ static uint16_t spi_send(struct spi_dev_s *dev, uint16_t wd) rxbyte = (uint8_t)0; spi_exchange(dev, &txbyte, &rxbyte, 1); - spivdbg("Sent %02x received %02x\n", txbyte, rxbyte); + spiinfo("Sent %02x received %02x\n", txbyte, rxbyte); return (uint16_t)rxbyte; } @@ -1194,7 +1194,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, uint8_t *prx8; uint16_t data; - spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); + spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); /* Set up data receive and transmit pointers */ @@ -1438,7 +1438,7 @@ struct spi_dev_s *sam_spibus_initialize(int port) /* Get the port state structure */ - spivdbg("port: %d \n", port); + spiinfo("port: %d \n", port); #ifdef SAMDL_HAVE_SPI0 if (port == 0) diff --git a/arch/arm/src/samv7/sam_emac.c b/arch/arm/src/samv7/sam_emac.c index 4f2384b9cb..e03cd76e6c 100644 --- a/arch/arm/src/samv7/sam_emac.c +++ b/arch/arm/src/samv7/sam_emac.c @@ -1379,7 +1379,7 @@ static int sam_transmit(struct sam_emac_s *priv, int qid) txhead = xfrq->txhead; txdesc = &xfrq->txdesc[txhead]; - nllvdbg("d_len: %d txhead[%d]: %d\n", dev->d_len, qid, xfrq->txhead); + nllinfo("d_len: %d txhead[%d]: %d\n", dev->d_len, qid, xfrq->txhead); sam_dumppacket("Transmit packet", dev->d_buf, dev->d_len); /* If no free TX descriptor, buffer can't be sent */ @@ -1460,7 +1460,7 @@ static int sam_transmit(struct sam_emac_s *priv, int qid) if (sam_txfree(priv, qid) < 1) { - nllvdbg("Disabling RX interrupts\n"); + nllinfo("Disabling RX interrupts\n"); sam_putreg(priv, SAM_EMAC_IDR_OFFSET, EMAC_INT_RCOMP); } @@ -1646,7 +1646,7 @@ static int sam_recvframe(struct sam_emac_s *priv, int qid) arch_invalidate_dcache((uintptr_t)rxdesc, (uintptr_t)rxdesc + sizeof(struct emac_rxdesc_s)); - nllvdbg("Entry rxndx[%d]: %d\n", qid, rxndx); + nllinfo("Entry rxndx[%d]: %d\n", qid, rxndx); while ((rxdesc->addr & EMACRXD_ADDR_OWNER) != 0) { @@ -1709,7 +1709,7 @@ static int sam_recvframe(struct sam_emac_s *priv, int qid) { if (rxndx == xfrq->rxndx) { - nllvdbg("ERROR: No EOF (Invalid or buffers too small)\n"); + nllinfo("ERROR: No EOF (Invalid or buffers too small)\n"); do { /* Give ownership back to the EMAC */ @@ -1767,7 +1767,7 @@ static int sam_recvframe(struct sam_emac_s *priv, int qid) /* Frame size from the EMAC */ dev->d_len = (rxdesc->status & EMACRXD_STA_FRLEN_MASK); - nllvdbg("packet %d-%d (%d)\n", xfrq->rxndx, rxndx, dev->d_len); + nllinfo("packet %d-%d (%d)\n", xfrq->rxndx, rxndx, dev->d_len); /* All data have been copied in the application frame buffer, * release the RX descriptor(s). Loop until all descriptors @@ -1801,7 +1801,7 @@ static int sam_recvframe(struct sam_emac_s *priv, int qid) * all of the data. */ - nllvdbg("rxndx: %d d_len: %d\n", + nllinfo("rxndx: %d d_len: %d\n", xfrq->rxndx, dev->d_len); if (pktlen < dev->d_len) { @@ -1854,7 +1854,7 @@ static int sam_recvframe(struct sam_emac_s *priv, int qid) /* No packet was found */ xfrq->rxndx = rxndx; - nllvdbg("Exit rxndx[%d]: %d\n", qid, xfrq->rxndx); + nllinfo("Exit rxndx[%d]: %d\n", qid, xfrq->rxndx); return -EAGAIN; } @@ -1912,7 +1912,7 @@ static void sam_receive(struct sam_emac_s *priv, int qid) #ifdef CONFIG_NET_IPv4 if (BUF->type == HTONS(ETHTYPE_IP)) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); NETDEV_RXIPV4(&priv->dev); /* Handle ARP on input then give the IPv4 packet to the network @@ -1953,7 +1953,7 @@ static void sam_receive(struct sam_emac_s *priv, int qid) #ifdef CONFIG_NET_IPv6 if (BUF->type == HTONS(ETHTYPE_IP6)) { - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); NETDEV_RXIPV6(&priv->dev); /* Give the IPv6 packet to the network layer */ @@ -1991,7 +1991,7 @@ static void sam_receive(struct sam_emac_s *priv, int qid) #ifdef CONFIG_NET_ARP if (BUF->type == htons(ETHTYPE_ARP)) { - nllvdbg("ARP frame\n"); + nllinfo("ARP frame\n"); NETDEV_RXARP(&priv->dev); /* Handle ARP packet */ @@ -2286,7 +2286,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv, int qid) imr = sam_getreg(priv, SAM_EMAC_IMR_OFFSET); pending = isr & ~(imr | EMAC_INT_UNUSED); - nllvdbg("isr: %08x pending: %08x\n", isr, pending); + nllinfo("isr: %08x pending: %08x\n", isr, pending); /* Check for the receipt of an RX packet. * @@ -2837,7 +2837,7 @@ static int sam_ifup(struct net_driver_s *dev) /* Configure the EMAC interface for normal operation. */ - nllvdbg("Initialize the EMAC\n"); + nllinfo("Initialize the EMAC\n"); sam_emac_configure(priv); sam_queue_configure(priv, EMAC_QUEUE_1); sam_queue_configure(priv, EMAC_QUEUE_2); @@ -2872,11 +2872,11 @@ static int sam_ifup(struct net_driver_s *dev) } while (sam_linkup(priv) == 0); - nllvdbg("Link detected \n"); + nllinfo("Link detected \n"); /* Enable normal MAC operation */ - nllvdbg("Enable normal operation\n"); + nllinfo("Enable normal operation\n"); /* Set and activate a timer process */ @@ -2955,7 +2955,7 @@ static int sam_ifdown(struct net_driver_s *dev) static inline void sam_txavail_process(FAR struct sam_emac_s *priv) { - nllvdbg("ifup: %d\n", priv->ifup); + nllinfo("ifup: %d\n", priv->ifup); /* Ignore the notification if the interface is not yet up */ @@ -3208,7 +3208,7 @@ static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac) unsigned int ndx; unsigned int bit; - nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); /* Calculate the 6-bit has table index */ @@ -3281,7 +3281,7 @@ static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac) unsigned int ndx; unsigned int bit; - nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); /* Calculate the 6-bit has table index */ @@ -3476,19 +3476,19 @@ static void sam_phydump(struct sam_emac_s *priv) regval |= EMAC_NCR_MPE; sam_putreg(priv, SAM_EMAC_NCR_OFFSET, regval); - nllvdbg("%s Registers (Address %02x)\n", + nllinfo("%s Registers (Address %02x)\n", priv->attr->rmii ? "RMII" : "MII", priv->phyaddr); sam_phyread(priv, priv->phyaddr, MII_MCR, &phyval); - nllvdbg(" MCR: %04x\n", phyval); + nllinfo(" MCR: %04x\n", phyval); sam_phyread(priv, priv->phyaddr, MII_MSR, &phyval); - nllvdbg(" MSR: %04x\n", phyval); + nllinfo(" MSR: %04x\n", phyval); sam_phyread(priv, priv->phyaddr, MII_ADVERTISE, &phyval); - nllvdbg(" ADVERTISE: %04x\n", phyval); + nllinfo(" ADVERTISE: %04x\n", phyval); sam_phyread(priv, priv->phyaddr, MII_LPA, &phyval); - nllvdbg(" LPR: %04x\n", phyval); + nllinfo(" LPR: %04x\n", phyval); sam_phyread(priv, priv->phyaddr, priv->attr->physr, &phyval); - nllvdbg(" PHYSR: %04x\n", phyval); + nllinfo(" PHYSR: %04x\n", phyval); /* Disable management port */ @@ -3716,7 +3716,7 @@ static int sam_phyreset(struct sam_emac_s *priv) int timeout; int ret; - nllvdbg(" sam_phyreset\n"); + nllinfo(" sam_phyreset\n"); /* Enable management port */ @@ -3783,7 +3783,7 @@ static int sam_phyfind(struct sam_emac_s *priv, uint8_t *phyaddr) unsigned int offset; int ret = -ESRCH; - nllvdbg("Find a valid PHY address\n"); + nllinfo("Find a valid PHY address\n"); /* Enable management port */ @@ -3828,10 +3828,10 @@ static int sam_phyfind(struct sam_emac_s *priv, uint8_t *phyaddr) if (ret == OK) { - nllvdbg(" PHYID1: %04x PHY addr: %d\n", phyval, candidate); + nllinfo(" PHYID1: %04x PHY addr: %d\n", phyval, candidate); *phyaddr = candidate; sam_phyread(priv, candidate, priv->attr->physr, &phyval); - nllvdbg(" PHYSR: %04x PHY addr: %d\n", phyval, candidate); + nllinfo(" PHYSR: %04x PHY addr: %d\n", phyval, candidate); } /* Disable management port */ @@ -4011,7 +4011,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) goto errout; } - nllvdbg("PHYID1: %04x PHY address: %02x\n", phyid1, priv->phyaddr); + nllinfo("PHYID1: %04x PHY address: %02x\n", phyid1, priv->phyaddr); ret = sam_phyread(priv, priv->phyaddr, MII_PHYID2, &phyid2); if (ret < 0) @@ -4020,15 +4020,15 @@ static int sam_autonegotiate(struct sam_emac_s *priv) goto errout; } - nllvdbg("PHYID2: %04x PHY address: %02x\n", phyid2, priv->phyaddr); + nllinfo("PHYID2: %04x PHY address: %02x\n", phyid2, priv->phyaddr); if (phyid1 == priv->attr->msoui && ((phyid2 & MII_PHYID2_OUI_MASK) >> MII_PHYID2_OUI_SHIFT) == (uint16_t)priv->attr->lsoui) { - nllvdbg(" Vendor Model Number: %04x\n", + nllinfo(" Vendor Model Number: %04x\n", (phyid2 & MII_PHYID2_MODEL_MASK) >> MII_PHYID2_MODEL_SHIFT); - nllvdbg(" Model Revision Number: %04x\n", + nllinfo(" Model Revision Number: %04x\n", (phyid2 & MII_PHYID2_REV_MASK) >> MII_PHYID2_REV_SHIFT); } else @@ -4100,7 +4100,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) goto errout; } - nllvdbg(" MCR: %04x\n", mcr); + nllinfo(" MCR: %04x\n", mcr); /* Check AutoNegotiate complete */ @@ -4120,7 +4120,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv) { /* Yes.. break out of the loop */ - nllvdbg("AutoNegotiate complete\n"); + nllinfo("AutoNegotiate complete\n"); break; } @@ -4288,7 +4288,7 @@ static bool sam_linkup(struct sam_emac_s *priv) /* Start the EMAC transfers */ - nllvdbg("Link is up\n"); + nllinfo("Link is up\n"); linkup = true; errout: @@ -4480,7 +4480,7 @@ static inline void sam_ethgpioconfig(struct sam_emac_s *priv) else #endif { - nvdbg("ERROR: emac=%d\n", priv->attr->emac); + ninfo("ERROR: emac=%d\n", priv->attr->emac); } } @@ -4803,7 +4803,7 @@ static void sam_macaddress(struct sam_emac_s *priv) struct net_driver_s *dev = &priv->dev; uint32_t regval; - nllvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", dev->d_ifname, 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], @@ -4869,7 +4869,7 @@ static void sam_ipv6multicast(struct sam_emac_s *priv) mac[4] = tmp16 & 0xff; mac[5] = tmp16 >> 8; - nvdbg("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n", + ninfo("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); (void)sam_addmac(dev, mac); @@ -5006,7 +5006,7 @@ static int sam_emac_configure(struct sam_emac_s *priv) { uint32_t regval; - nllvdbg("Entry\n"); + nllinfo("Entry\n"); /* Enable clocking to the EMAC peripheral */ @@ -5270,7 +5270,7 @@ int sam_emac_setmacaddr(int intf, uint8_t mac[6]) dev = &priv->dev; memcpy(dev->d_mac.ether_addr_octet, mac, 6); - nvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + ninfo("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", dev->d_ifname, 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], diff --git a/arch/arm/src/samv7/sam_freerun.c b/arch/arm/src/samv7/sam_freerun.c index c5eec516dd..b4c438781b 100644 --- a/arch/arm/src/samv7/sam_freerun.c +++ b/arch/arm/src/samv7/sam_freerun.c @@ -124,7 +124,7 @@ int sam_freerun_initialize(struct sam_freerun_s *freerun, int chan, uint32_t cmr; int ret; - tcvdbg("chan=%d resolution=%d usec\n", chan, resolution); + tcinfo("chan=%d resolution=%d usec\n", chan, resolution); DEBUGASSERT(freerun && resolution > 0); /* Get the TC frequency the corresponds to the requested resolution */ @@ -140,7 +140,7 @@ int sam_freerun_initialize(struct sam_freerun_s *freerun, int chan, return ret; } - tcvdbg("frequency=%lu, actual=%lu, cmr=%08lx\n", + tcinfo("frequency=%lu, actual=%lu, cmr=%08lx\n", (unsigned long)frequency, (unsigned long)actual, (unsigned long)cmr); @@ -260,7 +260,7 @@ int sam_freerun_counter(struct sam_freerun_s *freerun, struct timespec *ts) leave_critical_section(flags); - tcvdbg("counter=%lu (%lu) overflow=%lu, sr=%08lx\n", + tcinfo("counter=%lu (%lu) overflow=%lu, sr=%08lx\n", (unsigned long)counter, (unsigned long)verify, (unsigned long)overflow, (unsigned long)sr); @@ -280,7 +280,7 @@ int sam_freerun_counter(struct sam_freerun_s *freerun, struct timespec *ts) ts->tv_sec = sec; ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - tcvdbg("usec=%llu ts=(%lu, %lu)\n", + tcinfo("usec=%llu ts=(%lu, %lu)\n", usec, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); return OK; diff --git a/arch/arm/src/samv7/sam_hsmci.c b/arch/arm/src/samv7/sam_hsmci.c index ccea194a24..10b0cff4b5 100644 --- a/arch/arm/src/samv7/sam_hsmci.c +++ b/arch/arm/src/samv7/sam_hsmci.c @@ -1590,7 +1590,7 @@ static int sam_hsmci_interrupt(struct sam_dev_s *priv) { /* Yes.. Was the error some kind of timeout? */ - fllvdbg("ERROR: events: %08x SR: %08x\n", + fllinfo("ERROR: events: %08x SR: %08x\n", priv->cmdrmask, enabled); if ((pending & HSMCI_RESPONSE_TIMEOUT_ERRORS) != 0) @@ -2056,7 +2056,7 @@ static int sam_sendcmd(FAR struct sdio_dev_s *dev, /* Write the fully decorated command to CMDR */ - fvdbg("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval); + finfo("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval); sam_putreg(priv, regval, SAM_HSMCI_CMDR_OFFSET); sam_cmdsample1(priv, SAMPLENDX_AFTER_CMDR); return OK; @@ -2847,7 +2847,7 @@ static void sam_callbackenable(FAR struct sdio_dev_s *dev, { struct sam_dev_s *priv = (struct sam_dev_s *)dev; - fvdbg("eventset: %02x\n", eventset); + finfo("eventset: %02x\n", eventset); DEBUGASSERT(priv != NULL); priv->cbevents = eventset; @@ -2883,7 +2883,7 @@ static int sam_registercallback(FAR struct sdio_dev_s *dev, /* Disable callbacks and register this callback and is argument */ - fvdbg("Register %p(%p)\n", callback, arg); + finfo("Register %p(%p)\n", callback, arg); DEBUGASSERT(priv != NULL); priv->cbevents = 0; @@ -3158,7 +3158,7 @@ static void sam_callback(void *arg) /* Is a callback registered? */ DEBUGASSERT(priv != NULL); - fvdbg("Callback %p(%p) cbevents: %02x cdstatus: %02x\n", + finfo("Callback %p(%p) cbevents: %02x cdstatus: %02x\n", priv->callback, priv->cbarg, priv->cbevents, priv->cdstatus); flags = enter_critical_section(); @@ -3216,7 +3216,7 @@ static void sam_callback(void *arg) fdbg("ERROR: Failed to cancel work: %d\n", ret); } - fllvdbg("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); + fllinfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); ret = work_queue(LPWORK, &priv->cbwork, (worker_t)priv->callback, priv->cbarg, 0); if (ret < 0) @@ -3261,7 +3261,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno) * for now, an* HSMCI peripheral does correspond to a slot. */ - fvdbg("slotno: %d\n", slotno); + finfo("slotno: %d\n", slotno); #ifdef CONFIG_SAMV7_HSMCI0 if (slotno == 0) @@ -3344,7 +3344,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno) return NULL; } - fvdbg("priv: %p base: %08x hsmci: %d pid: %d\n", + finfo("priv: %p base: %08x hsmci: %d pid: %d\n", priv, priv->base, priv->hsmci, pid); /* Initialize the HSMCI slot structure */ @@ -3414,7 +3414,7 @@ void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot) priv->cdstatus &= ~SDIO_STATUS_PRESENT; } - fllvdbg("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus); + fllinfo("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus); /* Perform any requested callback if the status has changed */ @@ -3459,7 +3459,7 @@ void sdio_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect) priv->cdstatus &= ~SDIO_STATUS_WRPROTECTED; } - fvdbg("cdstatus: %02x\n", priv->cdstatus); + finfo("cdstatus: %02x\n", priv->cdstatus); leave_critical_section(flags); } diff --git a/arch/arm/src/samv7/sam_mcan.c b/arch/arm/src/samv7/sam_mcan.c index f7b9e31592..15c9104781 100644 --- a/arch/arm/src/samv7/sam_mcan.c +++ b/arch/arm/src/samv7/sam_mcan.c @@ -795,9 +795,9 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg -# define canvdbg vdbg +# define caninfo info # define canlldbg lldbg -# define canllvdbg llvdbg +# define canllinfo llinfo # ifdef CONFIG_SAMV7_MCAN_REGDEBUG # define canregdbg lldbg @@ -807,9 +807,9 @@ #else # define candbg(x...) -# define canvdbg(x...) +# define caninfo(x...) # define canlldbg(x...) -# define canllvdbg(x...) +# define canllinfo(x...) # define canregdbg(x...) #endif @@ -2151,7 +2151,7 @@ static void mcan_reset(FAR struct can_dev_s *dev) config = priv->config; DEBUGASSERT(config); - canllvdbg("MCAN%d\n", config->port); + canllinfo("MCAN%d\n", config->port); UNUSED(config); /* Get exclusive access to the MCAN peripheral */ @@ -2208,7 +2208,7 @@ static int mcan_setup(FAR struct can_dev_s *dev) config = priv->config; DEBUGASSERT(config); - canllvdbg("MCAN%d pid: %d\n", config->port, config->pid); + canllinfo("MCAN%d pid: %d\n", config->port, config->pid); /* Get exclusive access to the MCAN peripheral */ @@ -2285,7 +2285,7 @@ static void mcan_shutdown(FAR struct can_dev_s *dev) config = priv->config; DEBUGASSERT(config); - canllvdbg("MCAN%d\n", config->port); + canllinfo("MCAN%d\n", config->port); /* Get exclusive access to the MCAN peripheral */ @@ -2334,7 +2334,7 @@ static void mcan_rxint(FAR struct can_dev_s *dev, bool enable) DEBUGASSERT(priv && priv->config); - canllvdbg("MCAN%d enable: %d\n", priv->config->port, enable); + canllinfo("MCAN%d enable: %d\n", priv->config->port, enable); /* Enable/disable the receive interrupts */ @@ -2376,7 +2376,7 @@ static void mcan_txint(FAR struct can_dev_s *dev, bool enable) DEBUGASSERT(priv && priv->config); - canllvdbg("MCAN%d enable: %d\n", priv->config->port, enable); + canllinfo("MCAN%d enable: %d\n", priv->config->port, enable); /* Enable/disable the receive interrupts */ @@ -2415,7 +2415,7 @@ static int mcan_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg) FAR struct sam_mcan_s *priv; int ret = -ENOTTY; - canvdbg("cmd=%04x arg=%lu\n", cmd, arg); + caninfo("cmd=%04x arg=%lu\n", cmd, arg); DEBUGASSERT(dev && dev->cd_priv); priv = dev->cd_priv; @@ -2683,8 +2683,8 @@ static int mcan_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg) DEBUGASSERT(priv && priv->config); config = priv->config; - canllvdbg("MCAN%d\n", config->port); - canllvdbg("MCAN%d ID: %d DLC: %d\n", + canllinfo("MCAN%d\n", config->port); + canllinfo("MCAN%d ID: %d DLC: %d\n", config->port, msg->cm_hdr.ch_id, msg->cm_hdr.ch_dlc); /* That that FIFO elements were configured. @@ -3608,7 +3608,7 @@ static int mcan_hw_initialize(struct sam_mcan_s *priv) uint32_t cntr; uint32_t cmr; - canllvdbg("MCAN%d\n", config->port); + canllinfo("MCAN%d\n", config->port); /* Configure MCAN pins */ @@ -3883,7 +3883,7 @@ FAR struct can_dev_s *sam_mcan_initialize(int port) FAR const struct sam_config_s *config; uint32_t regval; - canvdbg("MCAN%d\n", port); + caninfo("MCAN%d\n", port); /* Select PCK5 clock source and pre-scaler value. Both MCAN controllers * use PCK5 to derive bit rate. diff --git a/arch/arm/src/samv7/sam_oneshot.c b/arch/arm/src/samv7/sam_oneshot.c index 76c4ee1a41..bc0fb34015 100644 --- a/arch/arm/src/samv7/sam_oneshot.c +++ b/arch/arm/src/samv7/sam_oneshot.c @@ -109,7 +109,7 @@ static void sam_oneshot_handler(TC_HANDLE tch, void *arg, uint32_t sr) oneshot_handler_t oneshot_handler; void *oneshot_arg; - tcllvdbg("Expired...\n"); + tcllinfo("Expired...\n"); DEBUGASSERT(oneshot && oneshot->handler); /* The clock was stopped, but not disabled when the RC match occurred. @@ -166,7 +166,7 @@ int sam_oneshot_initialize(struct sam_oneshot_s *oneshot, int chan, uint32_t cmr; int ret; - tcvdbg("chan=%d resolution=%d usec\n", chan, resolution); + tcinfo("chan=%d resolution=%d usec\n", chan, resolution); DEBUGASSERT(oneshot && resolution > 0); /* Get the TC frequency the corresponds to the requested resolution */ @@ -182,7 +182,7 @@ int sam_oneshot_initialize(struct sam_oneshot_s *oneshot, int chan, return ret; } - tcvdbg("frequency=%lu, actual=%lu, cmr=%08lx\n", + tcinfo("frequency=%lu, actual=%lu, cmr=%08lx\n", (unsigned long)frequency, (unsigned long)actual, (unsigned long)cmr); @@ -261,7 +261,7 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, struct sam_freerun_s *freer uint64_t regval; irqstate_t flags; - tcvdbg("handler=%p arg=%p, ts=(%lu, %lu)\n", + tcinfo("handler=%p arg=%p, ts=(%lu, %lu)\n", handler, arg, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); DEBUGASSERT(oneshot && handler && ts); @@ -272,7 +272,7 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, struct sam_freerun_s *freer { /* Yes.. then cancel it */ - tcvdbg("Already running... cancelling\n"); + tcinfo("Already running... cancelling\n"); (void)sam_oneshot_cancel(oneshot, freerun, NULL); } @@ -294,7 +294,7 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, struct sam_freerun_s *freer regval = (usec * (uint64_t)sam_tc_divfreq(oneshot->tch)) / USEC_PER_SEC; - tcvdbg("usec=%llu regval=%08llx\n", usec, regval); + tcinfo("usec=%llu regval=%08llx\n", usec, regval); DEBUGASSERT(regval <= UINT16_MAX); /* Set up to receive the callback when the interrupt occurs */ @@ -403,7 +403,7 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, struct sam_freerun_s *free * REVISIT: This does not appear to be the case. */ - tcvdbg("Cancelling...\n"); + tcinfo("Cancelling...\n"); count = sam_tc_getcounter(oneshot->tch); rc = sam_tc_getregister(oneshot->tch, TC_REGC); @@ -439,7 +439,7 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, struct sam_freerun_s *free * oneshot timer. */ - tcvdbg("rc=%lu count=%lu usec=%lu\n", + tcinfo("rc=%lu count=%lu usec=%lu\n", (unsigned long)rc, (unsigned long)count, (unsigned long)usec); /* REVISIT: I am not certain why the timer counter value sometimes @@ -484,7 +484,7 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, struct sam_freerun_s *free ts->tv_nsec = (unsigned long)nsec; } - tcvdbg("remaining (%lu, %lu)\n", + tcinfo("remaining (%lu, %lu)\n", (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec); } diff --git a/arch/arm/src/samv7/sam_qspi.c b/arch/arm/src/samv7/sam_qspi.c index 150739dfd4..b08490f248 100644 --- a/arch/arm/src/samv7/sam_qspi.c +++ b/arch/arm/src/samv7/sam_qspi.c @@ -156,13 +156,13 @@ #ifdef CONFIG_DEBUG_SPI # define qspidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define qspivdbg lldbg +# define qspiinfo lldbg # else -# define qspivdbg(x...) +# define qspiinfo(x...) # endif #else # define qspidbg(x...) -# define qspivdbg(x...) +# define qspiinfo(x...) #endif #define DMA_INITIAL 0 @@ -477,18 +477,18 @@ static inline void qspi_putreg(struct sam_qspidev_s *priv, uint32_t value, #if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO) static void qspi_dumpregs(struct sam_qspidev_s *priv, const char *msg) { - qspivdbg("%s:\n", msg); - qspivdbg(" MR:%08x SR:%08x IMR:%08x SCR:%08x\n", + qspiinfo("%s:\n", msg); + qspiinfo(" MR:%08x SR:%08x IMR:%08x SCR:%08x\n", getreg32(priv->base + SAM_QSPI_MR_OFFSET), getreg32(priv->base + SAM_QSPI_SR_OFFSET), getreg32(priv->base + SAM_QSPI_IMR_OFFSET), getreg32(priv->base + SAM_QSPI_SCR_OFFSET)); - qspivdbg(" IAR:%08x ICR:%08x IFR:%08x SMR:%08x\n", + qspiinfo(" IAR:%08x ICR:%08x IFR:%08x SMR:%08x\n", getreg32(priv->base + SAM_QSPI_IAR_OFFSET), getreg32(priv->base + SAM_QSPI_ICR_OFFSET), getreg32(priv->base + SAM_QSPI_IFR_OFFSET), getreg32(priv->base + SAM_QSPI_SMR_OFFSET)); - qspivdbg(" WPCR:%08x WPSR:%08x\n", + qspiinfo(" WPCR:%08x WPSR:%08x\n", getreg32(priv->base + SAM_QSPI_WPCR_OFFSET), getreg32(priv->base + SAM_QSPI_WPSR_OFFSET)); } @@ -1078,7 +1078,7 @@ static int qspi_lock(struct qspi_dev_s *dev, bool lock) { struct sam_qspidev_s *priv = (struct sam_qspidev_s *)dev; - qspivdbg("lock=%d\n", lock); + qspiinfo("lock=%d\n", lock); if (lock) { /* Take the semaphore (perhaps waiting) */ @@ -1128,7 +1128,7 @@ static uint32_t qspi_setfrequency(struct qspi_dev_s *dev, uint32_t frequency) #endif uint32_t regval; - qspivdbg("frequency=%d\n", frequency); + qspiinfo("frequency=%d\n", frequency); DEBUGASSERT(priv); /* Check if the requested frequency is the same as the frequency selection */ @@ -1215,14 +1215,14 @@ static uint32_t qspi_setfrequency(struct qspi_dev_s *dev, uint32_t frequency) /* Calculate the new actual frequency */ actual = SAM_QSPI_CLOCK / scbr; - qspivdbg("SCBR=%d actual=%d\n", scbr, actual); + qspiinfo("SCBR=%d actual=%d\n", scbr, actual); /* Save the frequency setting */ priv->frequency = frequency; priv->actual = actual; - qspivdbg("Frequency %d->%d\n", frequency, actual); + qspiinfo("Frequency %d->%d\n", frequency, actual); return actual; } @@ -1246,7 +1246,7 @@ static void qspi_setmode(struct qspi_dev_s *dev, enum qspi_mode_e mode) struct sam_qspidev_s *priv = (struct sam_qspidev_s *)dev; uint32_t regval; - qspivdbg("mode=%d\n", mode); + qspiinfo("mode=%d\n", mode); /* Has the mode changed? */ @@ -1288,7 +1288,7 @@ static void qspi_setmode(struct qspi_dev_s *dev, enum qspi_mode_e mode) } qspi_putreg(priv, regval, SAM_QSPI_SCR_OFFSET); - qspivdbg("SCR=%08x\n", regval); + qspiinfo("SCR=%08x\n", regval); /* Save the mode so that subsequent re-configurations will be faster */ @@ -1316,7 +1316,7 @@ static void qspi_setbits(struct qspi_dev_s *dev, int nbits) struct sam_qspidev_s *priv = (struct sam_qspidev_s *)dev; uint32_t regval; - qspivdbg("nbits=%d\n", nbits); + qspiinfo("nbits=%d\n", nbits); DEBUGASSERT(priv != NULL); DEBUGASSERT(nbits >= SAM_QSPI_MINBITS && nbits <= SAM_QSPI_MAXBITS); @@ -1331,7 +1331,7 @@ static void qspi_setbits(struct qspi_dev_s *dev, int nbits) regval |= QSPI_MR_NBBITS(nbits); qspi_putreg(priv, regval, SAM_QSPI_MR_OFFSET); - qspivdbg("MR=%08x\n", regval); + qspiinfo("MR=%08x\n", regval); /* Save the selection so the subsequence re-configurations will be faster */ @@ -1364,20 +1364,20 @@ static int qspi_command(struct qspi_dev_s *dev, DEBUGASSERT(priv != NULL && cmdinfo != NULL); #ifdef CONFIG_DEBUG_SPI - qspivdbg("Transfer:\n"); - qspivdbg(" flags: %02x\n", cmdinfo->flags); - qspivdbg(" cmd: %04x\n", cmdinfo->cmd); + qspiinfo("Transfer:\n"); + qspiinfo(" flags: %02x\n", cmdinfo->flags); + qspiinfo(" cmd: %04x\n", cmdinfo->cmd); if (QSPICMD_ISADDRESS(cmdinfo->flags)) { - qspivdbg(" address/length: %08lx/%d\n", + qspiinfo(" address/length: %08lx/%d\n", (unsigned long)cmdinfo->addr, cmdinfo->addrlen); } if (QSPICMD_ISDATA(cmdinfo->flags)) { - qspivdbg(" %s Data:\n", QSPICMD_ISWRITE(cmdinfo->flags) ? "Write" : "Read"); - qspivdbg(" buffer/length: %p/%d\n", cmdinfo->buffer, cmdinfo->buflen); + qspiinfo(" %s Data:\n", QSPICMD_ISWRITE(cmdinfo->flags) ? "Write" : "Read"); + qspiinfo(" buffer/length: %p/%d\n", cmdinfo->buffer, cmdinfo->buflen); } #endif @@ -1572,13 +1572,13 @@ static int qspi_memory(struct qspi_dev_s *dev, DEBUGASSERT(priv != NULL && meminfo != NULL); - qspivdbg("Transfer:\n"); - qspivdbg(" flags: %02x\n", meminfo->flags); - qspivdbg(" cmd: %04x\n", meminfo->cmd); - qspivdbg(" address/length: %08lx/%d\n", + qspiinfo("Transfer:\n"); + qspiinfo(" flags: %02x\n", meminfo->flags); + qspiinfo(" cmd: %04x\n", meminfo->cmd); + qspiinfo(" address/length: %08lx/%d\n", (unsigned long)meminfo->addr, meminfo->addrlen); - qspivdbg(" %s Data:\n", QSPIMEM_ISWRITE(meminfo->flags) ? "Write" : "Read"); - qspivdbg(" buffer/length: %p/%d\n", meminfo->buffer, meminfo->buflen); + qspiinfo(" %s Data:\n", QSPIMEM_ISWRITE(meminfo->flags) ? "Write" : "Read"); + qspiinfo(" buffer/length: %p/%d\n", meminfo->buffer, meminfo->buflen); #ifdef CONFIG_SAMV7_QSPI_DMA /* Can we perform DMA? Should we perform DMA? */ @@ -1746,7 +1746,7 @@ struct qspi_dev_s *sam_qspi_initialize(int intf) /* The supported SAM parts have only a single QSPI port */ - qspivdbg("intf: %d\n", intf); + qspiinfo("intf: %d\n", intf); DEBUGASSERT(intf >= 0 && intf < SAMV7_NQSPI); /* Select the QSPI interface */ diff --git a/arch/arm/src/samv7/sam_rswdt.c b/arch/arm/src/samv7/sam_rswdt.c index 20ea3c2183..c9f08e444c 100644 --- a/arch/arm/src/samv7/sam_rswdt.c +++ b/arch/arm/src/samv7/sam_rswdt.c @@ -88,10 +88,10 @@ #ifdef CONFIG_DEBUG_WATCHDOG # define wddbg lldbg -# define wdvdbg llvdbg +# define wdinfo llinfo #else # define wddbg(x...) -# define wdvdbg(x...) +# define wdinfo(x...) #endif /**************************************************************************** @@ -315,7 +315,7 @@ static int sam_start(FAR struct watchdog_lowerhalf_s *lower) * timer with the newly programmed mode parameters. */ - wdvdbg("Entry\n"); + wdinfo("Entry\n"); return priv->started ? OK : -ENOSYS; } @@ -343,7 +343,7 @@ static int sam_stop(FAR struct watchdog_lowerhalf_s *lower) * timer with the newly programmed mode parameters. */ - wdvdbg("Entry\n"); + wdinfo("Entry\n"); return -ENOSYS; } @@ -366,7 +366,7 @@ static int sam_stop(FAR struct watchdog_lowerhalf_s *lower) static int sam_keepalive(FAR struct watchdog_lowerhalf_s *lower) { - wdvdbg("Entry\n"); + wdinfo("Entry\n"); /* Write RSWDT_CR_WDRSTT to the RSWDT CR regiser (along with the KEY value) * will restart the watchdog timer. @@ -397,7 +397,7 @@ static int sam_getstatus(FAR struct watchdog_lowerhalf_s *lower, { FAR struct sam_lowerhalf_s *priv = (FAR struct sam_lowerhalf_s *)lower; - wdvdbg("Entry\n"); + wdinfo("Entry\n"); DEBUGASSERT(priv); /* Return the status bit */ @@ -426,10 +426,10 @@ static int sam_getstatus(FAR struct watchdog_lowerhalf_s *lower, status->timeleft = 0; - wdvdbg("Status :\n"); - wdvdbg(" flags : %08x\n", status->flags); - wdvdbg(" timeout : %d\n", status->timeout); - wdvdbg(" timeleft : %d\n", status->timeleft); + wdinfo("Status :\n"); + wdinfo(" flags : %08x\n", status->flags); + wdinfo(" timeout : %d\n", status->timeout); + wdinfo(" timeleft : %d\n", status->timeleft); return OK; } @@ -457,7 +457,7 @@ static int sam_settimeout(FAR struct watchdog_lowerhalf_s *lower, uint32_t regval; DEBUGASSERT(priv); - wdvdbg("Entry: timeout=%d\n", timeout); + wdinfo("Entry: timeout=%d\n", timeout); /* Can this timeout be represented? */ @@ -496,7 +496,7 @@ static int sam_settimeout(FAR struct watchdog_lowerhalf_s *lower, priv->reload = reload; - wdvdbg("reload=%d timout: %d->%d\n", + wdinfo("reload=%d timout: %d->%d\n", reload, timeout, priv->timeout); /* Set the RSWDT_MR according to calculated value @@ -541,7 +541,7 @@ static int sam_settimeout(FAR struct watchdog_lowerhalf_s *lower, priv->started = true; - wdvdbg("Setup: CR: %08x MR: %08x SR: %08x\n", + wdinfo("Setup: CR: %08x MR: %08x SR: %08x\n", sam_getreg(SAM_RSWDT_CR), sam_getreg(SAM_RSWDT_MR), sam_getreg(SAM_RSWDT_SR)); @@ -582,7 +582,7 @@ static xcpt_t sam_capture(FAR struct watchdog_lowerhalf_s *lower, xcpt_t oldhandler; DEBUGASSERT(priv); - wdvdbg("Entry: handler=%p\n", handler); + wdinfo("Entry: handler=%p\n", handler); /* Get the old handler return value */ @@ -636,7 +636,7 @@ static xcpt_t sam_capture(FAR struct watchdog_lowerhalf_s *lower, static int sam_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd, unsigned long arg) { - wdvdbg("cmd=%d arg=%ld\n", cmd, arg); + wdinfo("cmd=%d arg=%ld\n", cmd, arg); /* No ioctls are supported */ @@ -667,7 +667,7 @@ int sam_rswdt_initialize(void) { FAR struct sam_lowerhalf_s *priv = &g_wdtdev; - wdvdbg("Entry: CR: %08x MR: %08x SR: %08x\n", + wdinfo("Entry: CR: %08x MR: %08x SR: %08x\n", sam_getreg(SAM_RSWDT_CR), sam_getreg(SAM_RSWDT_MR), sam_getreg(SAM_RSWDT_SR)); diff --git a/arch/arm/src/samv7/sam_spi.c b/arch/arm/src/samv7/sam_spi.c index b03a9dd7c6..454947d572 100644 --- a/arch/arm/src/samv7/sam_spi.c +++ b/arch/arm/src/samv7/sam_spi.c @@ -138,13 +138,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif #define DMA_INITIAL 0 @@ -518,17 +518,17 @@ static inline void spi_putreg(struct sam_spidev_s *spi, uint32_t value, #if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO) static void spi_dumpregs(struct sam_spidev_s *spi, const char *msg) { - spivdbg("%s:\n", msg); - spivdbg(" MR:%08x SR:%08x IMR:%08x\n", + spiinfo("%s:\n", msg); + spiinfo(" MR:%08x SR:%08x IMR:%08x\n", getreg32(spi->base + SAM_SPI_MR_OFFSET), getreg32(spi->base + SAM_SPI_SR_OFFSET), getreg32(spi->base + SAM_SPI_IMR_OFFSET)); - spivdbg(" CSR0:%08x CSR1:%08x CSR2:%08x CSR3:%08x\n", + spiinfo(" CSR0:%08x CSR1:%08x CSR2:%08x CSR3:%08x\n", getreg32(spi->base + SAM_SPI_CSR0_OFFSET), getreg32(spi->base + SAM_SPI_CSR1_OFFSET), getreg32(spi->base + SAM_SPI_CSR2_OFFSET), getreg32(spi->base + SAM_SPI_CSR3_OFFSET)); - spivdbg(" WPCR:%08x WPSR:%08x\n", + spiinfo(" WPCR:%08x WPSR:%08x\n", getreg32(spi->base + SAM_SPI_WPCR_OFFSET), getreg32(spi->base + SAM_SPI_WPSR_OFFSET)); } @@ -903,7 +903,7 @@ static int spi_lock(struct spi_dev_s *dev, bool lock) struct sam_spics_s *spics = (struct sam_spics_s *)dev; struct sam_spidev_s *spi = spi_device(spics); - spivdbg("lock=%d\n", lock); + spiinfo("lock=%d\n", lock); if (lock) { /* Take the semaphore (perhaps waiting) */ @@ -951,10 +951,10 @@ static void spi_select(struct spi_dev_s *dev, enum spi_dev_e devid, /* Are we selecting or de-selecting the device? */ - spivdbg("selected=%d\n", selected); + spiinfo("selected=%d\n", selected); if (selected) { - spivdbg("cs=%d\n", spics->cs); + spiinfo("cs=%d\n", spics->cs); /* Before writing the TDR, the PCS field in the SPI_MR register must be set * in order to select a slave. @@ -1009,7 +1009,7 @@ static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency) uint32_t regval; unsigned int offset; - spivdbg("cs=%d frequency=%d\n", spics->cs, frequency); + spiinfo("cs=%d frequency=%d\n", spics->cs, frequency); /* Check if the requested frequency is the same as the frequency selection */ @@ -1079,7 +1079,7 @@ static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency) /* Calculate the new actual frequency */ actual = SAM_SPI_CLOCK / scbr; - spivdbg("csr[offset=%02x]=%08x actual=%d\n", offset, regval, actual); + spiinfo("csr[offset=%02x]=%08x actual=%d\n", offset, regval, actual); /* Save the frequency setting */ @@ -1112,7 +1112,7 @@ static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode) uint32_t regval; unsigned int offset; - spivdbg("cs=%d mode=%d\n", spics->cs, mode); + spiinfo("cs=%d mode=%d\n", spics->cs, mode); /* Has the mode changed? */ @@ -1155,7 +1155,7 @@ static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode) } spi_putreg(spi, regval, offset); - spivdbg("csr[offset=%02x]=%08x\n", offset, regval); + spiinfo("csr[offset=%02x]=%08x\n", offset, regval); /* Save the mode so that subsequent re-configurations will be faster */ @@ -1185,7 +1185,7 @@ static void spi_setbits(struct spi_dev_s *dev, int nbits) uint32_t regval; unsigned int offset; - spivdbg("cs=%d nbits=%d\n", spics->cs, nbits); + spiinfo("cs=%d nbits=%d\n", spics->cs, nbits); DEBUGASSERT(spics && nbits > 7 && nbits < 17); /* Has the number of bits changed? */ @@ -1200,7 +1200,7 @@ static void spi_setbits(struct spi_dev_s *dev, int nbits) regval |= SPI_CSR_BITS(nbits); spi_putreg(spi, regval, offset); - spivdbg("csr[offset=%02x]=%08x\n", offset, regval); + spiinfo("csr[offset=%02x]=%08x\n", offset, regval); /* Save the selection so the subsequence re-configurations will be faster */ @@ -1238,7 +1238,7 @@ static uint16_t spi_send(struct spi_dev_s *dev, uint16_t wd) rxbyte = (uint8_t)0; spi_exchange(dev, &txbyte, &rxbyte, 1); - spivdbg("Sent %02x received %02x\n", txbyte, rxbyte); + spiinfo("Sent %02x received %02x\n", txbyte, rxbyte); return (uint16_t)rxbyte; } @@ -1286,7 +1286,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, uint8_t *rxptr8; uint8_t *txptr8; - spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); + spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); /* Set up PCS bits */ @@ -1432,7 +1432,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, return; } - spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); + spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); spics = (struct sam_spics_s *)dev; spi = spi_device(spics); @@ -1751,7 +1751,7 @@ FAR struct spi_dev_s *sam_spibus_initialize(int port) /* The support SAM parts have only a single SPI port */ - spivdbg("port: %d csno: %d spino: %d\n", port, csno, spino); + spiinfo("port: %d csno: %d spino: %d\n", port, csno, spino); DEBUGASSERT(csno >= 0 && csno <= SAM_SPI_NCS); #if defined(CONFIG_SAMV7_SPI0_MASTER) && defined(CONFIG_SAMV7_SPI1_MASTER) @@ -1934,7 +1934,7 @@ FAR struct spi_dev_s *sam_spibus_initialize(int port) spi_putreg(spi, regval, offset); spics->nbits = 8; - spivdbg("csr[offset=%02x]=%08x\n", offset, regval); + spiinfo("csr[offset=%02x]=%08x\n", offset, regval); return &spics->spidev; } diff --git a/arch/arm/src/samv7/sam_spi_slave.c b/arch/arm/src/samv7/sam_spi_slave.c index 317d7955c4..b2203519cb 100644 --- a/arch/arm/src/samv7/sam_spi_slave.c +++ b/arch/arm/src/samv7/sam_spi_slave.c @@ -87,13 +87,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /**************************************************************************** @@ -351,17 +351,17 @@ static void spi_putreg(struct sam_spidev_s *priv, uint32_t value, #if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO) static void spi_dumpregs(struct sam_spidev_s *priv, const char *msg) { - spivdbg("%s:\n", msg); - spivdbg(" MR:%08x SR:%08x IMR:%08x\n", + spiinfo("%s:\n", msg); + spiinfo(" MR:%08x SR:%08x IMR:%08x\n", getreg32(priv->base + SAM_SPI_MR_OFFSET), getreg32(priv->base + SAM_SPI_SR_OFFSET), getreg32(priv->base + SAM_SPI_IMR_OFFSET)); - spivdbg(" CSR0:%08x CSR1:%08x CSR2:%08x CSR3:%08x\n", + spiinfo(" CSR0:%08x CSR1:%08x CSR2:%08x CSR3:%08x\n", getreg32(priv->base + SAM_SPI_CSR0_OFFSET), getreg32(priv->base + SAM_SPI_CSR1_OFFSET), getreg32(priv->base + SAM_SPI_CSR2_OFFSET), getreg32(priv->base + SAM_SPI_CSR3_OFFSET)); - spivdbg(" WPCR:%08x WPSR:%08x\n", + spiinfo(" WPCR:%08x WPSR:%08x\n", getreg32(priv->base + SAM_SPI_WPCR_OFFSET), getreg32(priv->base + SAM_SPI_WPSR_OFFSET)); } @@ -699,7 +699,7 @@ static void spi_setmode(struct sam_spidev_s *priv, enum spi_smode_e mode) { uint32_t regval; - spivdbg("mode=%d\n", mode); + spiinfo("mode=%d\n", mode); /* Has the mode changed? */ @@ -741,7 +741,7 @@ static void spi_setmode(struct sam_spidev_s *priv, enum spi_smode_e mode) } spi_putreg(priv, regval, SAM_SPI_CSR0_OFFSET); - spivdbg("csr0=%08x\n", regval); + spiinfo("csr0=%08x\n", regval); /* Save the mode so that subsequent re-configurations will be faster */ @@ -768,7 +768,7 @@ static void spi_setbits(struct sam_spidev_s *priv, int nbits) { uint32_t regval; - spivdbg("nbits=%d\n", nbits); + spiinfo("nbits=%d\n", nbits); DEBUGASSERT(priv && nbits > 7 && nbits < 17); /* Has the number of bits changed? */ @@ -782,7 +782,7 @@ static void spi_setbits(struct sam_spidev_s *priv, int nbits) regval |= SPI_CSR_BITS(nbits); spi_putreg(priv, regval, SAM_SPI_CSR0_OFFSET); - spivdbg("csr0=%08x\n", regval); + spiinfo("csr0=%08x\n", regval); /* Save the selection so the subsequence re-configurations will be faster */ @@ -819,7 +819,7 @@ static void spi_bind(struct spi_sctrlr_s *sctrlr, struct sam_spidev_s *priv = (struct sam_spidev_s *)sctrlr; uint32_t regval; - spivdbg("sdev=%p mode=%d nbits=%d\n", sdv, mode, nbits); + spiinfo("sdev=%p mode=%d nbits=%d\n", sdv, mode, nbits); DEBUGASSERT(priv != NULL && priv->sdev == NULL && sdev != NULL); @@ -921,7 +921,7 @@ static void spi_unbind(struct spi_sctrlr_s *sctrlr) struct sam_spidev_s *priv = (struct sam_spidev_s *)sctrlr; DEBUGASSERT(priv != NULL); - spivdbg("Unbinding %p\n", priv->sdev); + spiinfo("Unbinding %p\n", priv->sdev); DEBUGASSERT(priv->sdev != NULL); @@ -978,7 +978,7 @@ static int spi_enqueue(struct spi_sctrlr_s *sctrlr, uint16_t data) int next; int ret; - spivdbg("data=%04x\n", data); + spiinfo("data=%04x\n", data); DEBUGASSERT(priv != NULL && priv->sdev != NULL); /* Get exclusive access to the SPI device */ @@ -1095,7 +1095,7 @@ static void spi_qflush(struct spi_sctrlr_s *sctrlr) struct sam_spidev_s *priv = (struct sam_spidev_s *)sctrlr; irqstate_t flags; - spivdbg("data=%04x\n", data); + spiinfo("data=%04x\n", data); DEBUGASSERT(priv != NULL && priv->sdev != NULL); @@ -1140,7 +1140,7 @@ struct spi_sctrlr_s *sam_spi_slave_initialize(int port) /* The support SAM parts have only a single SPI port */ - spivdbg("port: %d spino: %d\n", port, spino); + spiinfo("port: %d spino: %d\n", port, spino); #if defined(CONFIG_SAMV7_SPI0_SLAVE) && defined(CONFIG_SAMV7_SPI1_SLAVE) DEBUGASSERT(spino >= 0 && spino <= 1); @@ -1287,7 +1287,7 @@ struct spi_sctrlr_s *sam_spi_slave_initialize(int port) spi_putreg(priv, regval, SAM_SPI_CSR0_OFFSET); priv->nbits = 8; - spivdbg("csr[offset=%02x]=%08x\n", offset, regval); + spiinfo("csr[offset=%02x]=%08x\n", offset, regval); return &priv->sctrlr; } diff --git a/arch/arm/src/samv7/sam_ssc.c b/arch/arm/src/samv7/sam_ssc.c index 32abed171c..52891da588 100644 --- a/arch/arm/src/samv7/sam_ssc.c +++ b/arch/arm/src/samv7/sam_ssc.c @@ -390,16 +390,16 @@ # define i2sdbg dbg # define i2slldbg lldbg # ifdef CONFIG_DEBUG_INFO -# define i2svdbg dbg -# define i2sllvdbg lldbg +# define i2sinfo dbg +# define i2sllinfo lldbg # else -# define i2svdbg(x...) +# define i2sinfo(x...) # endif #else # define i2sdbg(x...) # define i2slldbg(x...) -# define i2svdbg(x...) -# define i2sllvdbg(x...) +# define i2sinfo(x...) +# define i2sllinfo(x...) #endif #define DMA_INITIAL 0 @@ -792,18 +792,18 @@ static inline uintptr_t ssc_regaddr(struct sam_ssc_s *priv, unsigned int offset) #if defined(CONFIG_DEBUG_I2S) && defined(CONFIG_DEBUG_INFO) static void scc_dump_regs(struct sam_ssc_s *priv, const char *msg) { - i2svdbg("SSC%d: %s\n", priv->sscno, msg); - i2svdbg(" CMR:%08x RCMR:%08x RFMR:%08x TCMR:%08x\n", + i2sinfo("SSC%d: %s\n", priv->sscno, msg); + i2sinfo(" CMR:%08x RCMR:%08x RFMR:%08x TCMR:%08x\n", getreg32(priv->base + SAM_SSC_CMR_OFFSET), getreg32(priv->base + SAM_SSC_RCMR_OFFSET), getreg32(priv->base + SAM_SSC_RFMR_OFFSET), getreg32(priv->base + SAM_SSC_TCMR_OFFSET)); - i2svdbg(" TFMR:%08x RC0R:%08x RC1R:%08x SR:%08x\n", + i2sinfo(" TFMR:%08x RC0R:%08x RC1R:%08x SR:%08x\n", getreg32(priv->base + SAM_SSC_TFMR_OFFSET), getreg32(priv->base + SAM_SSC_RC0R_OFFSET), getreg32(priv->base + SAM_SSC_RC1R_OFFSET), getreg32(priv->base + SAM_SSC_SR_OFFSET)); - i2svdbg(" IMR:%08x WPMR:%08x WPSR:%08x\n", + i2sinfo(" IMR:%08x WPMR:%08x WPSR:%08x\n", getreg32(priv->base + SAM_SSC_IMR_OFFSET), getreg32(priv->base + SAM_SSC_WPMR_OFFSET), getreg32(priv->base + SAM_SSC_WPSR_OFFSET)); @@ -840,11 +840,11 @@ static void ssc_dump_queue(sq_queue_t *queue) if (!apb) { - i2sllvdbg(" %p: No buffer\n", bfcontainer); + i2sllinfo(" %p: No buffer\n", bfcontainer); } else { - i2sllvdbg(" %p: buffer=%p nmaxbytes=%d nbytes=%d\n", + i2sllinfo(" %p: buffer=%p nmaxbytes=%d nbytes=%d\n", bfcontainer, apb, apb->nmaxbytes, apb->nbytes); } } @@ -855,12 +855,12 @@ static void ssc_dump_queues(struct sam_transport_s *xpt, const char *msg) irqstate_t flags; flags = enter_critical_section(); - i2sllvdbg("%s\n", msg); - i2sllvdbg(" Pending:\n"); + i2sllinfo("%s\n", msg); + i2sllinfo(" Pending:\n"); ssc_dump_queue(&xpt->pend); - i2sllvdbg(" Active:\n"); + i2sllinfo(" Active:\n"); ssc_dump_queue(&xpt->act); - i2sllvdbg(" Done:\n"); + i2sllinfo(" Done:\n"); ssc_dump_queue(&xpt->done); leave_critical_section(flags); } @@ -1420,7 +1420,7 @@ static void ssc_rx_worker(void *arg) * So we have to start the next DMA here. */ - i2svdbg("rx.act.head=%p rx.done.head=%p\n", + i2sinfo("rx.act.head=%p rx.done.head=%p\n", priv->rx.act.head, priv->rx.done.head); ssc_dump_rxqueues(priv, "RX worker start"); @@ -1836,7 +1836,7 @@ static void ssc_tx_worker(void *arg) * So we have to start the next DMA here. */ - i2svdbg("tx.act.head=%p tx.done.head=%p\n", + i2sinfo("tx.act.head=%p tx.done.head=%p\n", priv->tx.act.head, priv->tx.done.head); ssc_dump_txqueues(priv, "TX worker start"); @@ -2211,7 +2211,7 @@ static int ssc_receive(struct i2s_dev_s *dev, struct ap_buffer_s *apb, #endif DEBUGASSERT(priv && apb && ((uintptr_t)apb->samp & priv->align) == 0); - i2svdbg("apb=%p nmaxbytes=%d arg=%p timeout=%d\n", + i2sinfo("apb=%p nmaxbytes=%d arg=%p timeout=%d\n", apb, apb->nmaxbytes, arg, timeout); ssc_init_buffer(apb->samp, apb->nmaxbytes); @@ -2426,7 +2426,7 @@ static int ssc_send(struct i2s_dev_s *dev, struct ap_buffer_s *apb, */ DEBUGASSERT(priv && apb); - i2svdbg("apb=%p nbytes=%d arg=%p timeout=%d\n", + i2sinfo("apb=%p nbytes=%d arg=%p timeout=%d\n", apb, apb->nbytes - apb->curbyte, arg, timeout); ssc_dump_buffer("Sending", &apb->samp[apb->curbyte], @@ -2906,7 +2906,7 @@ static void ssc_clocking(struct sam_ssc_s *priv) sam_enableperiph1(priv->pid); - i2svdbg("PCSR1=%08x PCR=%08x CMR=%08x\n", + i2sinfo("PCSR1=%08x PCR=%08x CMR=%08x\n", getreg32(SAM_PMC_PCSR1), regval, ssc_getreg(priv, SAM_SSC_CMR_OFFSET)); } @@ -3405,7 +3405,7 @@ struct i2s_dev_s *sam_ssc_initialize(int port) /* The support SAM parts have only a single SSC port */ - i2svdbg("port: %d\n", port); + i2sinfo("port: %d\n", port); /* Allocate a new state structure for this chip select. NOTE that there * is no protection if the same chip select is used in two different diff --git a/arch/arm/src/samv7/sam_tc.c b/arch/arm/src/samv7/sam_tc.c index 0356985776..d50ea984d2 100644 --- a/arch/arm/src/samv7/sam_tc.c +++ b/arch/arm/src/samv7/sam_tc.c @@ -841,7 +841,7 @@ static int sam_tc_interrupt(struct sam_tc_s *tc, struct sam_chan_s *chan) imr = sam_chan_getreg(chan, SAM_TC_IMR_OFFSET); pending = sr & imr; - tcllvdbg("TC%d Channel %d: pending=%08lx\n", + tcllinfo("TC%d Channel %d: pending=%08lx\n", tc->tc, chan->chan, (unsigned long)pending); /* Are there any pending interrupts for this channel? */ @@ -1046,7 +1046,7 @@ static int sam_tc_mcksrc(uint32_t frequency, uint32_t *tcclks, uint32_t fnext; int ndx = 0; - tcvdbg("frequency=%d\n", frequency); + tcinfo("frequency=%d\n", frequency); /* Satisfy lower bound. That is, the value of the divider such that: * @@ -1318,7 +1318,7 @@ TC_HANDLE sam_tc_allocate(int channel, int mode) * access to the requested channel. */ - tcvdbg("channel=%d mode=%08x\n", channel, mode); + tcinfo("channel=%d mode=%08x\n", channel, mode); chan = sam_tc_initialize(channel); if (chan) @@ -1344,7 +1344,7 @@ TC_HANDLE sam_tc_allocate(int channel, int mode) /* Return an opaque reference to the channel */ - tcvdbg("Returning %p\n", chan); + tcinfo("Returning %p\n", chan); return (TC_HANDLE)chan; } @@ -1366,7 +1366,7 @@ void sam_tc_free(TC_HANDLE handle) { struct sam_chan_s *chan = (struct sam_chan_s *)handle; - tcvdbg("Freeing %p channel=%d inuse=%d\n", chan, chan->chan, chan->inuse); + tcinfo("Freeing %p channel=%d inuse=%d\n", chan, chan->chan, chan->inuse); DEBUGASSERT(chan && chan->inuse); /* Make sure that interrupts are detached and disabled and that the channel @@ -1399,7 +1399,7 @@ void sam_tc_start(TC_HANDLE handle) { struct sam_chan_s *chan = (struct sam_chan_s *)handle; - tcvdbg("Starting channel %d inuse=%d\n", chan->chan, chan->inuse); + tcinfo("Starting channel %d inuse=%d\n", chan->chan, chan->inuse); DEBUGASSERT(chan && chan->inuse); /* Read the SR to clear any pending interrupts on this channel */ @@ -1431,7 +1431,7 @@ void sam_tc_stop(TC_HANDLE handle) { struct sam_chan_s *chan = (struct sam_chan_s *)handle; - tcvdbg("Stopping channel %d inuse=%d\n", chan->chan, chan->inuse); + tcinfo("Stopping channel %d inuse=%d\n", chan->chan, chan->inuse); DEBUGASSERT(chan && chan->inuse); sam_chan_putreg(chan, SAM_TC_CCR_OFFSET, TC_CCR_CLKDIS); @@ -1538,7 +1538,7 @@ void sam_tc_setregister(TC_HANDLE handle, int regid, uint32_t regval) DEBUGASSERT(chan && regid < TC_NREGISTERS); - tcvdbg("Channel %d: Set register RC%d to %08lx\n", + tcinfo("Channel %d: Set register RC%d to %08lx\n", chan->chan, regid, (unsigned long)regval); sam_chan_putreg(chan, g_regoffset[regid], regval); @@ -1717,7 +1717,7 @@ int sam_tc_clockselect(uint32_t frequency, uint32_t *tcclks, if (actual) { - tcvdbg("return actual=%lu\n", (unsigned long)fselect); + tcinfo("return actual=%lu\n", (unsigned long)fselect); *actual = pck6_actual; } @@ -1725,7 +1725,7 @@ int sam_tc_clockselect(uint32_t frequency, uint32_t *tcclks, if (tcclks) { - tcvdbg("return tcclks=%08lx\n", (unsigned long)TC_CMR_TCCLKS_PCK6); + tcinfo("return tcclks=%08lx\n", (unsigned long)TC_CMR_TCCLKS_PCK6); *tcclks = TC_CMR_TCCLKS_PCK6; } @@ -1739,7 +1739,7 @@ int sam_tc_clockselect(uint32_t frequency, uint32_t *tcclks, if (actual) { - tcvdbg("return actual=%lu\n", (unsigned long)mck_actual); + tcinfo("return actual=%lu\n", (unsigned long)mck_actual); *actual = mck_actual; } @@ -1747,7 +1747,7 @@ int sam_tc_clockselect(uint32_t frequency, uint32_t *tcclks, if (tcclks) { - tcvdbg("return tcclks=%08lx\n", (unsigned long)mck_tcclks); + tcinfo("return tcclks=%08lx\n", (unsigned long)mck_tcclks); *tcclks = mck_tcclks; } diff --git a/arch/arm/src/samv7/sam_tc.h b/arch/arm/src/samv7/sam_tc.h index 5dda45ece9..15673deaf9 100644 --- a/arch/arm/src/samv7/sam_tc.h +++ b/arch/arm/src/samv7/sam_tc.h @@ -88,14 +88,14 @@ #ifdef CONFIG_SAMV7_TC_DEBUG # define tcdbg dbg -# define tcvdbg vdbg +# define tcinfo info # define tclldbg lldbg -# define tcllvdbg llvdbg +# define tcllinfo llinfo #else # define tcdbg(x...) -# define tcvdbg(x...) +# define tcinfo(x...) # define tclldbg(x...) -# define tcllvdbg(x...) +# define tcllinfo(x...) #endif /**************************************************************************** diff --git a/arch/arm/src/samv7/sam_tickless.c b/arch/arm/src/samv7/sam_tickless.c index 3d1a7ad95a..899d464609 100644 --- a/arch/arm/src/samv7/sam_tickless.c +++ b/arch/arm/src/samv7/sam_tickless.c @@ -221,7 +221,7 @@ static struct sam_tickless_s g_tickless; static void sam_oneshot_handler(void *arg) { - tcllvdbg("Expired...\n"); + tcllinfo("Expired...\n"); sched_timer_expiration(); } diff --git a/arch/arm/src/samv7/sam_trng.c b/arch/arm/src/samv7/sam_trng.c index 3a76b924e1..392e6af70f 100644 --- a/arch/arm/src/samv7/sam_trng.c +++ b/arch/arm/src/samv7/sam_trng.c @@ -244,7 +244,7 @@ static ssize_t sam_read(struct file *filep, char *buffer, size_t buflen) ssize_t retval; int ret; - fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen); + finfo("buffer=%p buflen=%d\n", buffer, (int)buflen); /* Get exclusive access to the TRNG harware */ @@ -284,7 +284,7 @@ static ssize_t sam_read(struct file *filep, char *buffer, size_t buflen) { ret = sem_wait(&g_trngdev.waitsem); - fvdbg("Awakened: nsamples=%d maxsamples=%d ret=%d\n", + finfo("Awakened: nsamples=%d maxsamples=%d ret=%d\n", g_trngdev.nsamples, g_trngdev.maxsamples, ret); if (ret < 0) @@ -321,7 +321,7 @@ errout: sem_post(&g_trngdev.exclsem); - fvdbg("Return %d\n", (int)retval); + finfo("Return %d\n", (int)retval); return retval; } @@ -347,7 +347,7 @@ void up_rnginitialize(void) { int ret; - fvdbg("Initializing TRNG hardware\n"); + finfo("Initializing TRNG hardware\n"); /* Initialize the device structure */ diff --git a/arch/arm/src/samv7/sam_twihs.c b/arch/arm/src/samv7/sam_twihs.c index 3e2779597b..3e242d8525 100644 --- a/arch/arm/src/samv7/sam_twihs.c +++ b/arch/arm/src/samv7/sam_twihs.c @@ -125,14 +125,14 @@ #ifdef CONFIG_DEBUG_I2C # define i2cdbg dbg -# define i2cvdbg vdbg +# define i2cinfo info # define i2clldbg lldbg -# define i2cllvdbg llvdbg +# define i2cllinfo llinfo #else # define i2cdbg(x...) -# define i2cvdbg(x...) +# define i2cinfo(x...) # define i2clldbg(x...) -# define i2cllvdbg(x...) +# define i2cllinfo(x...) #endif /**************************************************************************** @@ -494,9 +494,9 @@ static int twi_wait(struct twi_dev_s *priv, unsigned int size) do { - i2cvdbg("TWIHS%d Waiting...\n", priv->attr->twi); + i2cinfo("TWIHS%d Waiting...\n", priv->attr->twi); twi_takesem(&priv->waitsem); - i2cvdbg("TWIHS%d Awakened with result: %d\n", + i2cinfo("TWIHS%d Awakened with result: %d\n", priv->attr->twi, priv->result); } while (priv->result == -EBUSY); @@ -554,7 +554,7 @@ static int twi_interrupt(struct twi_dev_s *priv) imr = twi_getrel(priv, SAM_TWIHS_IMR_OFFSET); pending = sr & imr; - i2cllvdbg("TWIHS%d pending: %08x\n", priv->attr->twi, pending); + i2cllinfo("TWIHS%d pending: %08x\n", priv->attr->twi, pending); /* Byte received */ @@ -871,7 +871,7 @@ static int twi_transfer(FAR struct i2c_master_s *dev, int ret; DEBUGASSERT(dev != NULL && msgs != NULL && count > 0); - i2cvdbg("TWIHS%d count: %d\n", priv->attr->twi, count); + i2cinfo("TWIHS%d count: %d\n", priv->attr->twi, count); /* Calculate the total transfer size so that we can calculate a reasonable * timeout value. @@ -1157,7 +1157,7 @@ static void twi_hw_initialize(struct twi_dev_s *priv, uint32_t frequency) uint32_t regval; uint32_t mck; - i2cvdbg("TWIHS%d Initializing\n", priv->attr->twi); + i2cinfo("TWIHS%d Initializing\n", priv->attr->twi); /* Configure PIO pins */ @@ -1258,7 +1258,7 @@ struct i2c_master_s *sam_i2cbus_initialize(int bus) irqstate_t flags; int ret; - i2cvdbg("Initializing TWIHS%d\n", bus); + i2cinfo("Initializing TWIHS%d\n", bus); #ifdef CONFIG_SAMV7_TWIHS0 if (bus == 0) @@ -1374,7 +1374,7 @@ int sam_i2cbus_uninitialize(FAR struct i2c_master_s *dev) struct twi_dev_s *priv = (struct twi_dev_s *) dev; irqstate_t flags; - i2cvdbg("TWIHS%d Un-initializing\n", priv->attr->twi); + i2cinfo("TWIHS%d Un-initializing\n", priv->attr->twi); /* Disable TWIHS interrupts */ diff --git a/arch/arm/src/samv7/sam_usbdevhs.c b/arch/arm/src/samv7/sam_usbdevhs.c index de6872e92e..c7c2275b98 100644 --- a/arch/arm/src/samv7/sam_usbdevhs.c +++ b/arch/arm/src/samv7/sam_usbdevhs.c @@ -1412,7 +1412,7 @@ static int sam_req_write(struct sam_usbdev_s *priv, struct sam_ep_s *privep) return -ENOENT; } - ullvdbg("epno=%d req=%p: len=%d xfrd=%d inflight=%d zlpneeded=%d\n", + ullinfo("epno=%d req=%p: len=%d xfrd=%d inflight=%d zlpneeded=%d\n", epno, privreq, privreq->req.len, privreq->req.xfrd, privreq->inflight, privep->zlpneeded); @@ -1647,7 +1647,7 @@ static int sam_req_read(struct sam_usbdev_s *priv, struct sam_ep_s *privep, return -ENOENT; } - ullvdbg("EP%d: len=%d xfrd=%d\n", + ullinfo("EP%d: len=%d xfrd=%d\n", epno, privreq->req.len, privreq->req.xfrd); /* Ignore any attempt to receive a zero length packet */ @@ -1982,7 +1982,7 @@ static void sam_ep0_setup(struct sam_usbdev_s *priv) index.w = GETUINT16(priv->ctrl.index); len.w = GETUINT16(priv->ctrl.len); - ullvdbg("SETUP: type=%02x req=%02x value=%04x index=%04x len=%04x\n", + ullinfo("SETUP: type=%02x req=%02x value=%04x index=%04x len=%04x\n", priv->ctrl.type, priv->ctrl.req, value.w, index.w, len.w); /* Dispatch any non-standard requests */ @@ -2146,7 +2146,7 @@ static void sam_ep0_setup(struct sam_usbdev_s *priv) { /* Special case recipient=device test mode */ - ullvdbg("test mode: %d\n", index.w); + ullinfo("test mode: %d\n", index.w); } else if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) != USB_REQ_RECIPIENT_ENDPOINT) { @@ -3489,7 +3489,7 @@ static int sam_ep_configure_internal(struct sam_ep_s *privep, uint8_t nbtrans; bool dirin; - uvdbg("len: %02x type: %02x addr: %02x attr: %02x " + uinfo("len: %02x type: %02x addr: %02x attr: %02x " "maxpacketsize: %02x %02x interval: %02x\n", desc->len, desc->type, desc->addr, desc->attr, desc->mxpacketsize[0], desc->mxpacketsize[1], diff --git a/arch/arm/src/samv7/sam_wdt.c b/arch/arm/src/samv7/sam_wdt.c index 8d63806682..cd156021e3 100644 --- a/arch/arm/src/samv7/sam_wdt.c +++ b/arch/arm/src/samv7/sam_wdt.c @@ -88,10 +88,10 @@ #ifdef CONFIG_DEBUG_WATCHDOG # define wddbg lldbg -# define wdvdbg llvdbg +# define wdinfo llinfo #else # define wddbg(x...) -# define wdvdbg(x...) +# define wdinfo(x...) #endif /**************************************************************************** @@ -315,7 +315,7 @@ static int sam_start(FAR struct watchdog_lowerhalf_s *lower) * timer with the newly programmed mode parameters. */ - wdvdbg("Entry\n"); + wdinfo("Entry\n"); return priv->started ? OK : -ENOSYS; } @@ -343,7 +343,7 @@ static int sam_stop(FAR struct watchdog_lowerhalf_s *lower) * timer with the newly programmed mode parameters. */ - wdvdbg("Entry\n"); + wdinfo("Entry\n"); return -ENOSYS; } @@ -366,7 +366,7 @@ static int sam_stop(FAR struct watchdog_lowerhalf_s *lower) static int sam_keepalive(FAR struct watchdog_lowerhalf_s *lower) { - wdvdbg("Entry\n"); + wdinfo("Entry\n"); /* Write WDT_CR_WDRSTT to the WDT CR regiser (along with the KEY value) * will restart the watchdog timer. @@ -397,7 +397,7 @@ static int sam_getstatus(FAR struct watchdog_lowerhalf_s *lower, { FAR struct sam_lowerhalf_s *priv = (FAR struct sam_lowerhalf_s *)lower; - wdvdbg("Entry\n"); + wdinfo("Entry\n"); DEBUGASSERT(priv); /* Return the status bit */ @@ -426,10 +426,10 @@ static int sam_getstatus(FAR struct watchdog_lowerhalf_s *lower, status->timeleft = 0; - wdvdbg("Status :\n"); - wdvdbg(" flags : %08x\n", status->flags); - wdvdbg(" timeout : %d\n", status->timeout); - wdvdbg(" timeleft : %d\n", status->timeleft); + wdinfo("Status :\n"); + wdinfo(" flags : %08x\n", status->flags); + wdinfo(" timeout : %d\n", status->timeout); + wdinfo(" timeleft : %d\n", status->timeleft); return OK; } @@ -457,7 +457,7 @@ static int sam_settimeout(FAR struct watchdog_lowerhalf_s *lower, uint32_t regval; DEBUGASSERT(priv); - wdvdbg("Entry: timeout=%d\n", timeout); + wdinfo("Entry: timeout=%d\n", timeout); /* Can this timeout be represented? */ @@ -496,7 +496,7 @@ static int sam_settimeout(FAR struct watchdog_lowerhalf_s *lower, priv->reload = reload; - wdvdbg("reload=%d timout: %d->%d\n", + wdinfo("reload=%d timout: %d->%d\n", reload, timeout, priv->timeout); /* Set the WDT_MR according to calculated value @@ -541,7 +541,7 @@ static int sam_settimeout(FAR struct watchdog_lowerhalf_s *lower, priv->started = true; - wdvdbg("Setup: CR: %08x MR: %08x SR: %08x\n", + wdinfo("Setup: CR: %08x MR: %08x SR: %08x\n", sam_getreg(SAM_WDT_CR), sam_getreg(SAM_WDT_MR), sam_getreg(SAM_WDT_SR)); @@ -582,7 +582,7 @@ static xcpt_t sam_capture(FAR struct watchdog_lowerhalf_s *lower, xcpt_t oldhandler; DEBUGASSERT(priv); - wdvdbg("Entry: handler=%p\n", handler); + wdinfo("Entry: handler=%p\n", handler); /* Get the old handler return value */ @@ -636,7 +636,7 @@ static xcpt_t sam_capture(FAR struct watchdog_lowerhalf_s *lower, static int sam_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd, unsigned long arg) { - wdvdbg("cmd=%d arg=%ld\n", cmd, arg); + wdinfo("cmd=%d arg=%ld\n", cmd, arg); /* No ioctls are supported */ @@ -667,7 +667,7 @@ int sam_wdt_initialize(void) { FAR struct sam_lowerhalf_s *priv = &g_wdtdev; - wdvdbg("Entry: CR: %08x MR: %08x SR: %08x\n", + wdinfo("Entry: CR: %08x MR: %08x SR: %08x\n", sam_getreg(SAM_WDT_CR), sam_getreg(SAM_WDT_MR), sam_getreg(SAM_WDT_SR)); diff --git a/arch/arm/src/samv7/sam_xdmac.c b/arch/arm/src/samv7/sam_xdmac.c index 886de898fe..c52f63fb9b 100644 --- a/arch/arm/src/samv7/sam_xdmac.c +++ b/arch/arm/src/samv7/sam_xdmac.c @@ -1616,7 +1616,7 @@ void sam_dmainitialize(struct sam_xdmac_s *xdmac) void weak_function up_dmainitialize(void) { - dmallvdbg("Initialize XDMAC\n"); + dmallinfo("Initialize XDMAC\n"); /* Enable peripheral clock */ @@ -1697,7 +1697,7 @@ DMA_HANDLE sam_dmachannel(uint8_t dmacno, uint32_t chflags) if (xdmach) { - dmavdbg("XDMAC%d CH%d: chflags: %08x returning xdmach: %p\n", + dmainfo("XDMAC%d CH%d: chflags: %08x returning xdmach: %p\n", (int)dmacno, xdmach->chan, (int)chflags, xdmach); } else @@ -1731,7 +1731,7 @@ void sam_dmaconfig(DMA_HANDLE handle, uint32_t chflags) /* Set the new DMA channel flags. */ xdmach->flags = chflags; - dmavdbg("XDMAC CH%d: chflags: %08x\n", xdmach->chan, (int)chflags); + dmainfo("XDMAC CH%d: chflags: %08x\n", xdmach->chan, (int)chflags); } /**************************************************************************** @@ -1752,7 +1752,7 @@ void sam_dmafree(DMA_HANDLE handle) struct sam_xdmach_s *xdmach = (struct sam_xdmach_s *)handle; struct sam_xdmac_s *xdmac; - dmavdbg("xdmach: %p\n", xdmach); + dmainfo("xdmach: %p\n", xdmach); DEBUGASSERT((xdmach != NULL) && (xdmach->inuse)); xdmac = sam_controller(xdmach); @@ -1790,10 +1790,10 @@ int sam_dmatxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr, size_t remaining; int ret = OK; - dmavdbg("xdmach: %p paddr: %08x maddr: %08x nbytes: %d\n", + dmainfo("xdmach: %p paddr: %08x maddr: %08x nbytes: %d\n", xdmach, (int)paddr, (int)maddr, (int)nbytes); DEBUGASSERT(xdmach); - dmavdbg("llhead: %p lltail: %p\n", xdmach->llhead, xdmach->lltail); + dmainfo("llhead: %p lltail: %p\n", xdmach->llhead, xdmach->lltail); /* The maximum transfer size in bytes depends upon the maximum number of * transfers and the number of bytes per transfer. @@ -1869,10 +1869,10 @@ int sam_dmarxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr, size_t remaining; int ret = OK; - dmavdbg("xdmach: %p paddr: %08x maddr: %08x nbytes: %d\n", + dmainfo("xdmach: %p paddr: %08x maddr: %08x nbytes: %d\n", xdmach, (int)paddr, (int)maddr, (int)nbytes); DEBUGASSERT(xdmach); - dmavdbg("llhead: %p lltail: %p\n", xdmach->llhead, xdmach->lltail); + dmainfo("llhead: %p lltail: %p\n", xdmach->llhead, xdmach->lltail); /* The maximum transfer size in bytes depends upon the maximum number of * transfers and the number of bytes per transfer. @@ -1944,7 +1944,7 @@ int sam_dmastart(DMA_HANDLE handle, dma_callback_t callback, void *arg) struct sam_xdmach_s *xdmach = (struct sam_xdmach_s *)handle; int ret = -EINVAL; - dmavdbg("xdmach: %p callback: %p arg: %p\n", xdmach, callback, arg); + dmainfo("xdmach: %p callback: %p arg: %p\n", xdmach, callback, arg); DEBUGASSERT(xdmach != NULL); /* Verify that the DMA has been setup (i.e., at least one entry in the @@ -1998,7 +1998,7 @@ void sam_dmastop(DMA_HANDLE handle) struct sam_xdmach_s *xdmach = (struct sam_xdmach_s *)handle; irqstate_t flags; - dmavdbg("xdmach: %p\n", xdmach); + dmainfo("xdmach: %p\n", xdmach); DEBUGASSERT(xdmach != NULL); flags = enter_critical_section(); diff --git a/arch/arm/src/stm32/stm32_adc.c b/arch/arm/src/stm32/stm32_adc.c index 5e34110fc9..f3970f3d31 100644 --- a/arch/arm/src/stm32/stm32_adc.c +++ b/arch/arm/src/stm32/stm32_adc.c @@ -748,22 +748,22 @@ static void tim_modifyreg(FAR struct stm32_dev_s *priv, int offset, #ifdef ADC_HAVE_TIMER static void tim_dumpregs(FAR struct stm32_dev_s *priv, FAR const char *msg) { - avdbg("%s:\n", msg); - avdbg(" CR1: %04x CR2: %04x SMCR: %04x DIER: %04x\n", + ainfo("%s:\n", msg); + ainfo(" CR1: %04x CR2: %04x SMCR: %04x DIER: %04x\n", tim_getreg(priv, STM32_GTIM_CR1_OFFSET), tim_getreg(priv, STM32_GTIM_CR2_OFFSET), tim_getreg(priv, STM32_GTIM_SMCR_OFFSET), tim_getreg(priv, STM32_GTIM_DIER_OFFSET)); - avdbg(" SR: %04x EGR: 0000 CCMR1: %04x CCMR2: %04x\n", + ainfo(" SR: %04x EGR: 0000 CCMR1: %04x CCMR2: %04x\n", tim_getreg(priv, STM32_GTIM_SR_OFFSET), tim_getreg(priv, STM32_GTIM_CCMR1_OFFSET), tim_getreg(priv, STM32_GTIM_CCMR2_OFFSET)); - avdbg(" CCER: %04x CNT: %04x PSC: %04x ARR: %04x\n", + ainfo(" CCER: %04x CNT: %04x PSC: %04x ARR: %04x\n", tim_getreg(priv, STM32_GTIM_CCER_OFFSET), tim_getreg(priv, STM32_GTIM_CNT_OFFSET), tim_getreg(priv, STM32_GTIM_PSC_OFFSET), tim_getreg(priv, STM32_GTIM_ARR_OFFSET)); - avdbg(" CCR1: %04x CCR2: %04x CCR3: %04x CCR4: %04x\n", + ainfo(" CCR1: %04x CCR2: %04x CCR3: %04x CCR4: %04x\n", tim_getreg(priv, STM32_GTIM_CCR1_OFFSET), tim_getreg(priv, STM32_GTIM_CCR2_OFFSET), tim_getreg(priv, STM32_GTIM_CCR3_OFFSET), @@ -771,7 +771,7 @@ static void tim_dumpregs(FAR struct stm32_dev_s *priv, FAR const char *msg) #ifndef CONFIG_STM32_STM32L15XX if (priv->tbase == STM32_TIM1_BASE || priv->tbase == STM32_TIM8_BASE) { - avdbg(" RCR: %04x BDTR: %04x DCR: %04x DMAR: %04x\n", + ainfo(" RCR: %04x BDTR: %04x DCR: %04x DMAR: %04x\n", tim_getreg(priv, STM32_ATIM_RCR_OFFSET), tim_getreg(priv, STM32_ATIM_BDTR_OFFSET), tim_getreg(priv, STM32_ATIM_DCR_OFFSET), @@ -779,7 +779,7 @@ static void tim_dumpregs(FAR struct stm32_dev_s *priv, FAR const char *msg) } else { - avdbg(" DCR: %04x DMAR: %04x\n", + ainfo(" DCR: %04x DMAR: %04x\n", tim_getreg(priv, STM32_GTIM_DCR_OFFSET), tim_getreg(priv, STM32_GTIM_DMAR_OFFSET)); } @@ -804,7 +804,7 @@ static void tim_dumpregs(FAR struct stm32_dev_s *priv, FAR const char *msg) #ifdef ADC_HAVE_TIMER static void adc_timstart(FAR struct stm32_dev_s *priv, bool enable) { - avdbg("enable: %d\n", enable ? 1 : 0); + ainfo("enable: %d\n", enable ? 1 : 0); if (enable) { @@ -873,7 +873,7 @@ static int adc_timinit(FAR struct stm32_dev_s *priv) * position. */ - avdbg("Initializing timers extsel = 0x%08x\n", priv->extsel); + ainfo("Initializing timers extsel = 0x%08x\n", priv->extsel); adc_modifyreg(priv, STM32_ADC_EXTREG_OFFSET, ADC_EXTREG_EXTEN_MASK | ADC_EXTREG_EXTSEL_MASK, @@ -1205,7 +1205,7 @@ static int adc_timinit(FAR struct stm32_dev_s *priv) #if defined(CONFIG_STM32_STM32F10XX) static void adc_startconv(FAR struct stm32_dev_s *priv, bool enable) { - avdbg("enable: %d\n", enable ? 1 : 0); + ainfo("enable: %d\n", enable ? 1 : 0); if (!enable) { @@ -1227,7 +1227,7 @@ static void adc_startconv(FAR struct stm32_dev_s *priv, bool enable) { uint32_t regval; - avdbg("enable: %d\n", enable ? 1 : 0); + ainfo("enable: %d\n", enable ? 1 : 0); if (enable) { @@ -1256,7 +1256,7 @@ static void adc_startconv(FAR struct stm32_dev_s *priv, bool enable) #else static void adc_startconv(FAR struct stm32_dev_s *priv, bool enable) { - avdbg("enable: %d\n", enable ? 1 : 0); + ainfo("enable: %d\n", enable ? 1 : 0); if (enable) { @@ -1364,7 +1364,7 @@ static void adc_power_down_idle(FAR struct stm32_dev_s *priv, bool pdi_high) { uint32_t regval; - avdbg("PDI: %d\n", pdi_high ? 1 : 0); + ainfo("PDI: %d\n", pdi_high ? 1 : 0); regval = adc_getreg(priv, STM32_ADC_CR1_OFFSET); @@ -1405,7 +1405,7 @@ static void adc_power_down_delay(FAR struct stm32_dev_s *priv, bool pdd_high) { uint32_t regval; - avdbg("PDD: %d\n", pdd_high ? 1 : 0); + ainfo("PDD: %d\n", pdd_high ? 1 : 0); regval = adc_getreg(priv, STM32_ADC_CR1_OFFSET); @@ -1445,7 +1445,7 @@ static void adc_power_down_delay(FAR struct stm32_dev_s *priv, bool pdd_high) static void adc_dels_after_conversion(FAR struct stm32_dev_s *priv, uint32_t delay) { - avdbg("Delay selected: 0x%08x\n", delay); + ainfo("Delay selected: 0x%08x\n", delay); adc_modifyreg(priv, STM32_ADC_CR2_OFFSET, ADC_CR2_DELS_MASK, delay); } @@ -1471,7 +1471,7 @@ static void adc_dels_after_conversion(FAR struct stm32_dev_s *priv, static void adc_select_ch_bank(FAR struct stm32_dev_s *priv, bool chb_selected) { - avdbg("Bank of channels selected: %c\n", chb_selected ? 'B' : 'A'); + ainfo("Bank of channels selected: %c\n", chb_selected ? 'B' : 'A'); if (chb_selected) { @@ -1505,7 +1505,7 @@ static void adc_enable(FAR struct stm32_dev_s *priv, bool enable) { uint32_t regval; - avdbg("enable: %d\n", enable ? 1 : 0); + ainfo("enable: %d\n", enable ? 1 : 0); regval = adc_getreg(priv, STM32_ADC_CR_OFFSET); @@ -1543,7 +1543,7 @@ static void adc_enable(FAR struct stm32_dev_s *priv, bool enable) bool enabled = false; #endif - avdbg("enable: %d\n", enable ? 1 : 0); + ainfo("enable: %d\n", enable ? 1 : 0); if (!enabled && enable) { @@ -1717,7 +1717,7 @@ static void adc_reset(FAR struct adc_dev_s *dev) int ret; #endif - allvdbg("intf: %d\n", priv->intf); + allinfo("intf: %d\n", priv->intf); flags = enter_critical_section(); #if defined(CONFIG_STM32_STM32L15XX) && \ @@ -2018,26 +2018,26 @@ static void adc_reset(FAR struct adc_dev_s *dev) leave_critical_section(flags); #ifdef CONFIG_STM32_STM32F30XX - avdbg("ISR: 0x%08x CR: 0x%08x CFGR: 0x%08x\n", + ainfo("ISR: 0x%08x CR: 0x%08x CFGR: 0x%08x\n", adc_getreg(priv, STM32_ADC_ISR_OFFSET), adc_getreg(priv, STM32_ADC_CR_OFFSET), adc_getreg(priv, STM32_ADC_CFGR_OFFSET)); #else - avdbg("SR: 0x%08x CR1: 0x%08x CR2: 0x%08x\n", + ainfo("SR: 0x%08x CR1: 0x%08x CR2: 0x%08x\n", adc_getreg(priv, STM32_ADC_SR_OFFSET), adc_getreg(priv, STM32_ADC_CR1_OFFSET), adc_getreg(priv, STM32_ADC_CR2_OFFSET)); #endif - avdbg("SQR1: 0x%08x SQR2: 0x%08x SQR3: 0x%08x\n", + ainfo("SQR1: 0x%08x SQR2: 0x%08x SQR3: 0x%08x\n", adc_getreg(priv, STM32_ADC_SQR1_OFFSET), adc_getreg(priv, STM32_ADC_SQR2_OFFSET), adc_getreg(priv, STM32_ADC_SQR3_OFFSET)); #if defined(CONFIG_STM32_STM32F30XX) - avdbg("SQR4: 0x%08x\n", adc_getreg(priv, STM32_ADC_SQR4_OFFSET)); + ainfo("SQR4: 0x%08x\n", adc_getreg(priv, STM32_ADC_SQR4_OFFSET)); #elif defined(CONFIG_STM32_STM32L15XX) - avdbg("SQR4: 0x%08x SQR5: 0x%08x\n", + ainfo("SQR4: 0x%08x SQR5: 0x%08x\n", adc_getreg(priv, STM32_ADC_SQR4_OFFSET) adc_getreg(priv, STM32_ADC_SQR5_OFFSET)); #endif @@ -2045,16 +2045,16 @@ static void adc_reset(FAR struct adc_dev_s *dev) #if defined(CONFIG_STM32_STM32F30XX) if (priv->base == STM32_ADC1_BASE || priv->base == STM32_ADC2_BASE) { - avdbg("CCR: 0x%08x\n", getreg32(STM32_ADC12_CCR)); + ainfo("CCR: 0x%08x\n", getreg32(STM32_ADC12_CCR)); } else { - avdbg("CCR: 0x%08x\n", getreg32(STM32_ADC34_CCR)); + ainfo("CCR: 0x%08x\n", getreg32(STM32_ADC34_CCR)); } #elif defined(CONFIG_STM32_STM32F20XX) || \ defined(CONFIG_STM32_STM32F40XX) || \ defined(CONFIG_STM32_STM32L15XX) - avdbg("CCR: 0x%08x\n", getreg32(STM32_ADC_CCR)); + ainfo("CCR: 0x%08x\n", getreg32(STM32_ADC_CCR)); #endif } @@ -2107,7 +2107,7 @@ static int adc_setup(FAR struct adc_dev_s *dev) ret = irq_attach(priv->irq, priv->isr); if (ret < 0) { - avdbg("irq_attach failed: %d\n", ret); + ainfo("irq_attach failed: %d\n", ret); return ret; } @@ -2117,7 +2117,7 @@ static int adc_setup(FAR struct adc_dev_s *dev) /* Enable the ADC interrupt */ - avdbg("Enable the ADC interrupt: irq=%d\n", priv->irq); + ainfo("Enable the ADC interrupt: irq=%d\n", priv->irq); up_enable_irq(priv->irq); return ret; @@ -2172,7 +2172,7 @@ static void adc_rxint(FAR struct adc_dev_s *dev, bool enable) { FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv; - avdbg("intf: %d enable: %d\n", priv->intf, enable ? 1 : 0); + ainfo("intf: %d enable: %d\n", priv->intf, enable ? 1 : 0); if (enable) { @@ -2219,7 +2219,7 @@ static void adc_ioc_enable_tvref_register(FAR struct adc_dev_s *dev, stm32_modifyreg32(STM32_ADC_CCR, ADC_CCR_TSVREFE, 0); } - avdbg("STM32_ADC_CCR value: 0x%08x\n", getreg32(STM32_ADC_CCR)); + ainfo("STM32_ADC_CCR value: 0x%08x\n", getreg32(STM32_ADC_CCR)); } #endif @@ -2263,7 +2263,7 @@ static int adc_ioc_change_sleep_between_opers(FAR struct adc_dev_s *dev, break; default: - avdbg("unknown cmd: %d\n", cmd); + ainfo("unknown cmd: %d\n", cmd); break; } @@ -2436,7 +2436,7 @@ static int adc_ioc_change_ints(FAR struct adc_dev_s *dev, int cmd, bool arg) break; default: - avdbg("unknown cmd: %d\n", cmd); + ainfo("unknown cmd: %d\n", cmd); break; } @@ -2983,31 +2983,31 @@ struct adc_dev_s *stm32_adcinitialize(int intf, FAR const uint8_t *chanlist, FAR struct adc_dev_s *dev; FAR struct stm32_dev_s *priv; - avdbg("intf: %d cchannels: %d\n", intf, cchannels); + ainfo("intf: %d cchannels: %d\n", intf, cchannels); switch (intf) { #ifdef CONFIG_STM32_ADC1 case 1: - avdbg("ADC1 selected\n"); + ainfo("ADC1 selected\n"); dev = &g_adcdev1; break; #endif #ifdef CONFIG_STM32_ADC2 case 2: - avdbg("ADC2 selected\n"); + ainfo("ADC2 selected\n"); dev = &g_adcdev2; break; #endif #ifdef CONFIG_STM32_ADC3 case 3: - avdbg("ADC3 selected\n"); + ainfo("ADC3 selected\n"); dev = &g_adcdev3; break; #endif #ifdef CONFIG_STM32_ADC4 case 4: - avdbg("ADC4 selected\n"); + ainfo("ADC4 selected\n"); dev = &g_adcdev4; break; #endif diff --git a/arch/arm/src/stm32/stm32_can.c b/arch/arm/src/stm32/stm32_can.c index 8cb61decf1..29545492ef 100644 --- a/arch/arm/src/stm32/stm32_can.c +++ b/arch/arm/src/stm32/stm32_can.c @@ -86,14 +86,14 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg -# define canvdbg vdbg +# define caninfo info # define canlldbg lldbg -# define canllvdbg llvdbg +# define canllinfo llinfo #else # define candbg(x...) -# define canvdbg(x...) +# define caninfo(x...) # define canlldbg(x...) -# define canllvdbg(x...) +# define canllinfo(x...) #endif #if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_CAN) @@ -555,7 +555,7 @@ static void can_reset(FAR struct can_dev_s *dev) uint32_t regbit = 0; irqstate_t flags; - canllvdbg("CAN%d\n", priv->port); + canllinfo("CAN%d\n", priv->port); /* Get the bits in the AHB1RSTR register needed to reset this CAN device */ @@ -617,7 +617,7 @@ static int can_setup(FAR struct can_dev_s *dev) FAR struct stm32_can_s *priv = dev->cd_priv; int ret; - canllvdbg("CAN%d RX0 irq: %d RX1 irq: %d TX irq: %d\n", + canllinfo("CAN%d RX0 irq: %d RX1 irq: %d TX irq: %d\n", priv->port, priv->canrx[0], priv->canrx[1], priv->cantx); /* CAN cell initialization */ @@ -700,7 +700,7 @@ static void can_shutdown(FAR struct can_dev_s *dev) { FAR struct stm32_can_s *priv = dev->cd_priv; - canllvdbg("CAN%d\n", priv->port); + canllinfo("CAN%d\n", priv->port); /* Disable the RX FIFO 0/1 and TX interrupts */ @@ -738,7 +738,7 @@ static void can_rxint(FAR struct can_dev_s *dev, bool enable) FAR struct stm32_can_s *priv = dev->cd_priv; uint32_t regval; - canllvdbg("CAN%d enable: %d\n", priv->port, enable); + canllinfo("CAN%d enable: %d\n", priv->port, enable); /* Enable/disable the FIFO 0/1 message pending interrupt */ @@ -773,7 +773,7 @@ static void can_txint(FAR struct can_dev_s *dev, bool enable) FAR struct stm32_can_s *priv = dev->cd_priv; uint32_t regval; - canllvdbg("CAN%d enable: %d\n", priv->port, enable); + canllinfo("CAN%d enable: %d\n", priv->port, enable); /* Support only disabling the transmit mailbox interrupt */ @@ -858,7 +858,7 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg) int dlc; int txmb; - canllvdbg("CAN%d ID: %d DLC: %d\n", + canllinfo("CAN%d ID: %d DLC: %d\n", priv->port, msg->cm_hdr.ch_id, msg->cm_hdr.ch_dlc); /* Select one empty transmit mailbox */ @@ -1011,7 +1011,7 @@ static bool can_txready(FAR struct can_dev_s *dev) /* Return true if any mailbox is available */ regval = can_getreg(priv, STM32_CAN_TSR_OFFSET); - canllvdbg("CAN%d TSR: %08x\n", priv->port, regval); + canllinfo("CAN%d TSR: %08x\n", priv->port, regval); return (regval & CAN_ALL_MAILBOXES) != 0; } @@ -1042,7 +1042,7 @@ static bool can_txempty(FAR struct can_dev_s *dev) /* Return true if all mailboxes are available */ regval = can_getreg(priv, STM32_CAN_TSR_OFFSET); - canllvdbg("CAN%d TSR: %08x\n", priv->port, regval); + canllinfo("CAN%d TSR: %08x\n", priv->port, regval); return (regval & CAN_ALL_MAILBOXES) == CAN_ALL_MAILBOXES; } @@ -1394,7 +1394,7 @@ static int can_bittiming(FAR struct stm32_can_s *priv) uint32_t ts1; uint32_t ts2; - canllvdbg("CAN%d PCLK1: %d baud: %d\n", + canllinfo("CAN%d PCLK1: %d baud: %d\n", priv->port, STM32_PCLK1_FREQUENCY, priv->baud); /* Try to get CAN_BIT_QUANTA quanta in one bit_time. @@ -1447,7 +1447,7 @@ static int can_bittiming(FAR struct stm32_can_s *priv) DEBUGASSERT(brp >= 1 && brp <= CAN_BTR_BRP_MAX); } - canllvdbg("TS1: %d TS2: %d BRP: %d\n", ts1, ts2, brp); + canllinfo("TS1: %d TS2: %d BRP: %d\n", ts1, ts2, brp); /* Configure bit timing. This also does the following, less obvious * things. Unless loopback mode is enabled, it: @@ -1490,7 +1490,7 @@ static int can_cellinit(FAR struct stm32_can_s *priv) uint32_t regval; int ret; - canllvdbg("CAN%d\n", priv->port); + canllinfo("CAN%d\n", priv->port); /* Exit from sleep mode */ @@ -1616,7 +1616,7 @@ static int can_filterinit(FAR struct stm32_can_s *priv) uint32_t regval; uint32_t bitmask; - canllvdbg("CAN%d filter: %d\n", priv->port, priv->filter); + canllinfo("CAN%d filter: %d\n", priv->port, priv->filter); /* Get the bitmask associated with the filter used by this CAN block */ @@ -1706,7 +1706,7 @@ FAR struct can_dev_s *stm32_caninitialize(int port) { FAR struct can_dev_s *dev = NULL; - canvdbg("CAN%d\n", port); + caninfo("CAN%d\n", port); /* NOTE: Peripherical clocking for CAN1 and/or CAN2 was already provided * by stm32_clockconfig() early in the reset sequence. diff --git a/arch/arm/src/stm32/stm32_dac.c b/arch/arm/src/stm32/stm32_dac.c index 4c1a985c32..9f879f3166 100644 --- a/arch/arm/src/stm32/stm32_dac.c +++ b/arch/arm/src/stm32/stm32_dac.c @@ -1114,7 +1114,7 @@ FAR struct dac_dev_s *stm32_dacinitialize(int intf) #ifdef CONFIG_STM32_DAC1 if (intf == 1) { - avdbg("DAC1 Selected\n"); + ainfo("DAC1 Selected\n"); dev = &g_dac1dev; } else @@ -1122,7 +1122,7 @@ FAR struct dac_dev_s *stm32_dacinitialize(int intf) #ifdef CONFIG_STM32_DAC2 if (intf == 2) { - avdbg("DAC2 Selected\n"); + ainfo("DAC2 Selected\n"); dev = &g_dac2dev; } else diff --git a/arch/arm/src/stm32/stm32_dma2d.c b/arch/arm/src/stm32/stm32_dma2d.c index e951e8916d..213e4bfa67 100644 --- a/arch/arm/src/stm32/stm32_dma2d.c +++ b/arch/arm/src/stm32/stm32_dma2d.c @@ -138,10 +138,10 @@ #ifdef CONFIG_STM32_DMA2D_REGDEBUG # define regdbg dbg -# define regvdbg vdbg +# define reginfo info #else # define regdbg(x...) -# define regvdbg(x...) +# define reginfo(x...) #endif /* check clut support */ @@ -408,7 +408,7 @@ static void stm32_dma2d_control(uint32_t setbits, uint32_t clrbits) { uint32_t cr; - gvdbg("setbits=%08x, clrbits=%08x\n", setbits, clrbits); + ginfo("setbits=%08x, clrbits=%08x\n", setbits, clrbits); cr = getreg32(STM32_DMA2D_CR); cr &= ~clrbits; @@ -429,7 +429,7 @@ static int stm32_dma2dirq(int irq, void *context) uint32_t regval = getreg32(STM32_DMA2D_ISR); FAR struct stm32_interrupt_s *priv = &g_interrupt; - regvdbg("irq = %d, regval = %08x\n", irq, regval); + reginfo("irq = %d, regval = %08x\n", irq, regval); if (regval & DMA2D_ISR_TCIF) { @@ -558,9 +558,9 @@ static int stm32_dma2d_loadclut(uintptr_t pfcreg) regval = getreg32(pfcreg); regval |= DMA2D_xGPFCCR_START; - regvdbg("set regval=%08x\n", regval); + reginfo("set regval=%08x\n", regval); putreg32(regval, pfcreg); - regvdbg("configured regval=%08x\n", getreg32(pfcreg)); + reginfo("configured regval=%08x\n", getreg32(pfcreg)); } leave_critical_section(flags); @@ -632,7 +632,7 @@ static uint32_t stm32_dma2d_memaddress(FAR const struct stm32_dma2d_s *layer, offset = xpos * DMA2D_PF_BYPP(layer->pinfo.bpp) + layer->pinfo.stride * ypos; - gvdbg("%p\n", ((uint32_t) pinfo->fbmem) + offset); + ginfo("%p\n", ((uint32_t) pinfo->fbmem) + offset); return ((uint32_t) pinfo->fbmem) + offset; } @@ -655,7 +655,7 @@ static fb_coord_t stm32_dma2d_lineoffset(FAR const struct stm32_dma2d_s *layer, { /* offset at the end of each line in the context to the area layer */ - gvdbg("%d\n", layer->vinfo.xres - area->xres); + ginfo("%d\n", layer->vinfo.xres - area->xres); return layer->vinfo.xres - area->xres; } @@ -677,7 +677,7 @@ static fb_coord_t stm32_dma2d_lineoffset(FAR const struct stm32_dma2d_s *layer, static int stm32_dma2d_pixelformat(uint8_t fmt, uint8_t *fmtmap) { - gvdbg("fmt=%d, fmtmap=%p\n", fmt, fmtmap); + ginfo("fmt=%d, fmtmap=%p\n", fmt, fmtmap); /* Map to the controller known format * @@ -736,7 +736,7 @@ static int stm32_dma2d_pixelformat(uint8_t fmt, uint8_t *fmtmap) static int stm32_dma2d_bpp(uint8_t fmt, uint8_t *bpp) { - gvdbg("fmt=%d, bpp=%p\n", fmt, bpp); + ginfo("fmt=%d, bpp=%p\n", fmt, bpp); switch (fmt) { @@ -937,7 +937,7 @@ static void stm32_dma2d_linit(FAR struct stm32_dma2d_s *layer, { FAR struct dma2d_layer_s *priv = &layer->dma2d; - gvdbg("layer=%p, lid=%d, fmt=%02x\n", layer, lid, fmt); + ginfo("layer=%p, lid=%d, fmt=%02x\n", layer, lid, fmt); /* initialize the layer interface */ @@ -985,7 +985,7 @@ static void stm32_dma2d_lfifo(FAR const struct stm32_dma2d_s *layer, int lid, fb_coord_t xpos, fb_coord_t ypos, FAR const struct ltdc_area_s *area) { - gvdbg("layer=%p, lid=%d, xpos=%d, ypos=%d, area=%p\n", + ginfo("layer=%p, lid=%d, xpos=%d, ypos=%d, area=%p\n", layer, lid, xpos, ypos, area); putreg32(stm32_dma2d_memaddress(layer, xpos, ypos), stm32_mar_layer_t[lid]); @@ -1006,7 +1006,7 @@ static void stm32_dma2d_lfifo(FAR const struct stm32_dma2d_s *layer, int lid, static void stm32_dma2d_lcolor(FAR const struct stm32_dma2d_s *layer, int lid, uint32_t color) { - gvdbg("layer=%p, lid=%d, color=%08x\n", layer, lid, color); + ginfo("layer=%p, lid=%d, color=%08x\n", layer, lid, color); putreg32(color, stm32_color_layer_t[lid]); } @@ -1027,7 +1027,7 @@ static void stm32_dma2d_llnr(FAR struct stm32_dma2d_s *layer, { uint32_t nlrreg; - gvdbg("pixel per line: %d, number of lines: %d\n", area->xres, area->yres); + ginfo("pixel per line: %d, number of lines: %d\n", area->xres, area->yres); nlrreg = getreg32(STM32_DMA2D_NLR); nlrreg = (DMA2D_NLR_PL(area->xres) | DMA2D_NLR_NL(area->yres)); @@ -1047,7 +1047,7 @@ static void stm32_dma2d_llnr(FAR struct stm32_dma2d_s *layer, static int stm32_dma2d_loutpfc(FAR const struct stm32_dma2d_s *layer) { - gvdbg("layer=%p\n", layer); + ginfo("layer=%p\n", layer); /* CLUT format isn't supported by the dma2d controller */ @@ -1083,7 +1083,7 @@ static void stm32_dma2d_lpfc(FAR const struct stm32_dma2d_s *layer, { uint32_t pfccrreg; - gvdbg("layer=%p, lid=%d, blendmode=%08x\n", layer, lid, blendmode); + ginfo("layer=%p, lid=%d, blendmode=%08x\n", layer, lid, blendmode); /* Set color format */ @@ -1172,7 +1172,7 @@ static int stm32_dma2dgetvideoinfo(FAR struct dma2d_layer_s *layer, { FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer; - gvdbg("layer=%p, vinfo=%p\n", layer, vinfo); + ginfo("layer=%p, vinfo=%p\n", layer, vinfo); if (stm32_dma2d_lvalidate(priv) && vinfo) { @@ -1209,7 +1209,7 @@ static int stm32_dma2dgetplaneinfo(FAR struct dma2d_layer_s *layer, int planeno, { FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer; - gvdbg("layer=%p, planeno=%d, pinfo=%p\n", layer, planeno, pinfo); + ginfo("layer=%p, planeno=%d, pinfo=%p\n", layer, planeno, pinfo); if (stm32_dma2d_lvalidate(priv) && pinfo && planeno == 0) { @@ -1244,7 +1244,7 @@ static int stm32_dma2dgetlid(FAR struct dma2d_layer_s *layer, int *lid) { FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer; - gvdbg("layer=%p, lid=%p\n", layer, lid); + ginfo("layer=%p, lid=%p\n", layer, lid); if (stm32_dma2d_lvalidate(priv) && lid) { @@ -1282,7 +1282,7 @@ static int stm32_dma2dsetclut(FAR struct dma2d_layer_s *layer, int ret; FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer; - gvdbg("layer=%p, cmap=%p\n", layer, cmap); + ginfo("layer=%p, cmap=%p\n", layer, cmap); if (stm32_dma2d_lvalidate(priv) && cmap) { @@ -1349,7 +1349,7 @@ static int stm32_dma2dsetclut(FAR struct dma2d_layer_s *layer, clut888[offset + 1] = cmap->green[n]; clut888[offset + 2] = cmap->red[n]; - regvdbg("n=%d, red=%02x, green=%02x, blue=%02x\n", n, + reginfo("n=%d, red=%02x, green=%02x, blue=%02x\n", n, clut888[offset], clut888[offset + 1], clut888[offset + 2]); #else @@ -1358,7 +1358,7 @@ static int stm32_dma2dsetclut(FAR struct dma2d_layer_s *layer, (uint32_t)DMA2D_CLUT_GREEN(cmap->green[n]) | (uint32_t)DMA2D_CLUT_BLUE(cmap->blue[n]); - regvdbg("n=%d, alpha=%02x, red=%02x, green=%02x, blue=%02x\n", n, + reginfo("n=%d, alpha=%02x, red=%02x, green=%02x, blue=%02x\n", n, DMA2D_CLUT_ALPHA(cmap->alpha[n]), DMA2D_CLUT_RED(cmap->red[n]), DMA2D_CLUT_GREEN(cmap->green[n]), @@ -1401,7 +1401,7 @@ static int stm32_dma2dgetclut(FAR struct dma2d_layer_s *layer, int ret; FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer; - gvdbg("layer=%p, cmap=%p\n", layer, cmap); + ginfo("layer=%p, cmap=%p\n", layer, cmap); if (stm32_dma2d_lvalidate(priv) && cmap) { @@ -1438,7 +1438,7 @@ static int stm32_dma2dgetclut(FAR struct dma2d_layer_s *layer, cmap->green[n] = clut888[offset + 1]; cmap->red[n] = clut888[offset + 2]; - regvdbg("n=%d, red=%02x, green=%02x, blue=%02x\n", n, + reginfo("n=%d, red=%02x, green=%02x, blue=%02x\n", n, clut888[offset], clut888[offset + 1], clut888[offset + 2]); #else @@ -1447,7 +1447,7 @@ static int stm32_dma2dgetclut(FAR struct dma2d_layer_s *layer, cmap->green[n] = (uint8_t)DMA2D_CMAP_GREEN(clut[n]); cmap->blue[n] = (uint8_t)DMA2D_CMAP_BLUE(clut[n]); - regvdbg("n=%d, alpha=%02x, red=%02x, green=%02x, blue=%02x\n", n, + reginfo("n=%d, alpha=%02x, red=%02x, green=%02x, blue=%02x\n", n, DMA2D_CMAP_ALPHA(clut[n]), DMA2D_CMAP_RED(clut[n]), DMA2D_CMAP_GREEN(clut[n]), DMA2D_CMAP_BLUE(clut[n])); #endif @@ -1491,7 +1491,7 @@ static int stm32_dma2dsetalpha(FAR struct dma2d_layer_s *layer, uint8_t alpha) { FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer; - gvdbg("layer=%p, alpha=%02x\n", layer, alpha); + ginfo("layer=%p, alpha=%02x\n", layer, alpha); if (stm32_dma2d_lvalidate(priv)) { @@ -1526,7 +1526,7 @@ static int stm32_dma2dgetalpha(FAR struct dma2d_layer_s *layer, uint8_t *alpha) { FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer; - gvdbg("layer=%p, alpha=%p\n", layer, alpha); + ginfo("layer=%p, alpha=%p\n", layer, alpha); if (stm32_dma2d_lvalidate(priv)) { @@ -1577,7 +1577,7 @@ static int stm32_dma2dsetblendmode(FAR struct dma2d_layer_s *layer, { FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer; - gvdbg("layer=%p, mode=%08x\n", layer, mode); + ginfo("layer=%p, mode=%08x\n", layer, mode); if (stm32_dma2d_lvalidate(priv)) { @@ -1613,7 +1613,7 @@ static int stm32_dma2dgetblendmode(FAR struct dma2d_layer_s *layer, { FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer; - gvdbg("layer=%p, mode=%p\n", layer, mode); + ginfo("layer=%p, mode=%p\n", layer, mode); if (stm32_dma2d_lvalidate(priv) && mode) { @@ -1661,7 +1661,7 @@ static int stm32_dma2dblit(FAR struct dma2d_layer_s *dest, FAR struct stm32_dma2d_s * destlayer = (FAR struct stm32_dma2d_s *)dest; FAR struct stm32_dma2d_s * srclayer = (FAR struct stm32_dma2d_s *)src; - gvdbg("dest=%p, destxpos=%d, destypos=%d, src=%p, srcarea=%p\n", + ginfo("dest=%p, destxpos=%d, destypos=%d, src=%p, srcarea=%p\n", dest, destxpos, destypos, src, srcarea); if (stm32_dma2d_lvalidatesize(destlayer, destxpos, destypos, srcarea) && @@ -1772,7 +1772,7 @@ static int stm32_dma2dblend(FAR struct dma2d_layer_s *dest, FAR struct stm32_dma2d_s * forelayer = (FAR struct stm32_dma2d_s *)fore; FAR struct stm32_dma2d_s * backlayer = (FAR struct stm32_dma2d_s *)back; - gvdbg("dest=%p, destxpos=%d, destypos=%d, " + ginfo("dest=%p, destxpos=%d, destypos=%d, " "fore=%p, forexpos=%d, foreypos=%d, " "back=%p, backarea=%p\n", dest, destxpos, destypos, fore, forexpos, foreypos, back, backarea); @@ -1874,7 +1874,7 @@ static int stm32_dma2dfillarea(FAR struct dma2d_layer_s *layer, int ret; FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer; - gvdbg("layer=%p, area=%p, color=%08x\n", layer, area, color); + ginfo("layer=%p, area=%p, color=%08x\n", layer, area, color); if (stm32_dma2d_lvalidatesize(priv, area->xpos, area->ypos, area)) { @@ -1989,7 +1989,7 @@ FAR struct dma2d_layer_s *up_dma2dcreatelayer(fb_coord_t width, uint8_t bpp = 0; FAR struct stm32_dma2d_s *layer = NULL; - gvdbg("width=%d, height=%d, fmt=%02x \n", width, height, fmt); + ginfo("width=%d, height=%d, fmt=%02x \n", width, height, fmt); /* Validate if pixel format supported */ @@ -2265,7 +2265,7 @@ FAR struct dma2d_layer_s * stm32_dma2dinitltdc(FAR struct stm32_ltdc_s *layer) uint8_t fmt = 0; FAR struct stm32_ltdc_dma2d_s *priv; - gvdbg("layer=%p\n", layer); + ginfo("layer=%p\n", layer); DEBUGASSERT(layer && layer->lid >= 0 && layer->lid < DMA2D_SHADOW_LAYER); ret = stm32_dma2d_pixelformat(layer->vinfo.fmt, &fmt); diff --git a/arch/arm/src/stm32/stm32_eth.c b/arch/arm/src/stm32/stm32_eth.c index c7a4abc044..481538aedd 100644 --- a/arch/arm/src/stm32/stm32_eth.c +++ b/arch/arm/src/stm32/stm32_eth.c @@ -1012,7 +1012,7 @@ static int stm32_transmit(FAR struct stm32_ethmac_s *priv) txdesc = priv->txhead; txfirst = txdesc; - nllvdbg("d_len: %d d_buf: %p txhead: %p tdes0: %08x\n", + nllinfo("d_len: %d d_buf: %p txhead: %p tdes0: %08x\n", priv->dev.d_len, priv->dev.d_buf, txdesc, txdesc->tdes0); DEBUGASSERT(txdesc && (txdesc->tdes0 & ETH_TDES0_OWN) == 0); @@ -1029,7 +1029,7 @@ static int stm32_transmit(FAR struct stm32_ethmac_s *priv) bufcount = (priv->dev.d_len + (CONFIG_STM32_ETH_BUFSIZE-1)) / CONFIG_STM32_ETH_BUFSIZE; lastsize = priv->dev.d_len - (bufcount - 1) * CONFIG_STM32_ETH_BUFSIZE; - nllvdbg("bufcount: %d lastsize: %d\n", bufcount, lastsize); + nllinfo("bufcount: %d lastsize: %d\n", bufcount, lastsize); /* Set the first segment bit in the first TX descriptor */ @@ -1139,7 +1139,7 @@ static int stm32_transmit(FAR struct stm32_ethmac_s *priv) priv->inflight++; - nllvdbg("txhead: %p txtail: %p inflight: %d\n", + nllinfo("txhead: %p txtail: %p inflight: %d\n", priv->txhead, priv->txtail, priv->inflight); /* If all TX descriptors are in-flight, then we have to disable receive interrupts @@ -1438,7 +1438,7 @@ static void stm32_freesegment(FAR struct stm32_ethmac_s *priv, struct eth_rxdesc_s *rxdesc; int i; - nllvdbg("rxfirst: %p segments: %d\n", rxfirst, segments); + nllinfo("rxfirst: %p segments: %d\n", rxfirst, segments); /* Set OWN bit in RX descriptors. This gives the buffers back to DMA */ @@ -1496,7 +1496,7 @@ static int stm32_recvframe(FAR struct stm32_ethmac_s *priv) uint8_t *buffer; int i; - nllvdbg("rxhead: %p rxcurr: %p segments: %d\n", + nllinfo("rxhead: %p rxcurr: %p segments: %d\n", priv->rxhead, priv->rxcurr, priv->segments); /* Check if there are free buffers. We cannot receive new frames in this @@ -1562,7 +1562,7 @@ static int stm32_recvframe(FAR struct stm32_ethmac_s *priv) rxcurr = priv->rxcurr; } - nllvdbg("rxhead: %p rxcurr: %p segments: %d\n", + nllinfo("rxhead: %p rxcurr: %p segments: %d\n", priv->rxhead, priv->rxcurr, priv->segments); /* Check if any errors are reported in the frame */ @@ -1601,7 +1601,7 @@ static int stm32_recvframe(FAR struct stm32_ethmac_s *priv) priv->rxhead = (struct eth_rxdesc_s *)rxdesc->rdes3; stm32_freesegment(priv, rxcurr, priv->segments); - nllvdbg("rxhead: %p d_buf: %p d_len: %d\n", + nllinfo("rxhead: %p d_buf: %p d_len: %d\n", priv->rxhead, dev->d_buf, dev->d_len); return OK; @@ -1628,7 +1628,7 @@ static int stm32_recvframe(FAR struct stm32_ethmac_s *priv) priv->rxhead = rxdesc; - nllvdbg("rxhead: %p rxcurr: %p segments: %d\n", + nllinfo("rxhead: %p rxcurr: %p segments: %d\n", priv->rxhead, priv->rxcurr, priv->segments); return -EAGAIN; @@ -1698,7 +1698,7 @@ static void stm32_receive(FAR struct stm32_ethmac_s *priv) #ifdef CONFIG_NET_IPv4 if (BUF->type == HTONS(ETHTYPE_IP)) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); /* Handle ARP on input then give the IPv4 packet to the network * layer @@ -1738,7 +1738,7 @@ static void stm32_receive(FAR struct stm32_ethmac_s *priv) #ifdef CONFIG_NET_IPv6 if (BUF->type == HTONS(ETHTYPE_IP6)) { - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); /* Give the IPv6 packet to the network layer */ @@ -1775,7 +1775,7 @@ static void stm32_receive(FAR struct stm32_ethmac_s *priv) #ifdef CONFIG_NET_ARP if (BUF->type == htons(ETHTYPE_ARP)) { - nllvdbg("ARP frame\n"); + nllinfo("ARP frame\n"); /* Handle ARP packet */ @@ -1834,7 +1834,7 @@ static void stm32_freeframe(FAR struct stm32_ethmac_s *priv) struct eth_txdesc_s *txdesc; int i; - nllvdbg("txhead: %p txtail: %p inflight: %d\n", + nllinfo("txhead: %p txtail: %p inflight: %d\n", priv->txhead, priv->txtail, priv->inflight); /* Scan for "in-flight" descriptors owned by the CPU */ @@ -1850,7 +1850,7 @@ static void stm32_freeframe(FAR struct stm32_ethmac_s *priv) * TX descriptors. */ - nllvdbg("txtail: %p tdes0: %08x tdes2: %08x tdes3: %08x\n", + nllinfo("txtail: %p tdes0: %08x tdes2: %08x tdes3: %08x\n", txdesc, txdesc->tdes0, txdesc->tdes2, txdesc->tdes3); DEBUGASSERT(txdesc->tdes2 != 0); @@ -1903,7 +1903,7 @@ static void stm32_freeframe(FAR struct stm32_ethmac_s *priv) priv->txtail = txdesc; - nllvdbg("txhead: %p txtail: %p inflight: %d\n", + nllinfo("txhead: %p txtail: %p inflight: %d\n", priv->txhead, priv->txtail, priv->inflight); } } @@ -2545,7 +2545,7 @@ static int stm32_ifdown(struct net_driver_s *dev) static inline void stm32_txavail_process(FAR struct stm32_ethmac_s *priv) { - nvdbg("ifup: %d\n", priv->ifup); + ninfo("ifup: %d\n", priv->ifup); /* Ignore the notification if the interface is not yet up */ @@ -2712,7 +2712,7 @@ static int stm32_addmac(struct net_driver_s *dev, FAR const uint8_t *mac) uint32_t temp; uint32_t registeraddress; - nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); /* Add the MAC address to the hardware multicast hash table */ @@ -2769,7 +2769,7 @@ static int stm32_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac) uint32_t temp; uint32_t registeraddress; - nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); /* Remove the MAC address to the hardware multicast hash table */ @@ -3236,7 +3236,7 @@ static inline int stm32_dm9161(FAR struct stm32_ethmac_s *priv) up_systemreset(); } - nvdbg("PHY ID1: 0x%04X\n", phyval); + ninfo("PHY ID1: 0x%04X\n", phyval); /* Now check the "DAVICOM Specified Configuration Register (DSCR)", Register 16 */ @@ -3393,7 +3393,7 @@ static int stm32_phyinit(FAR struct stm32_ethmac_s *priv) /* Remember the selected speed and duplex modes */ - nvdbg("PHYSR[%d]: %04x\n", CONFIG_STM32_PHYSR, phyval); + ninfo("PHYSR[%d]: %04x\n", CONFIG_STM32_PHYSR, phyval); /* Different PHYs present speed and mode information in different ways. IF * This CONFIG_STM32_PHYSR_ALTCONFIG is selected, this indicates that the PHY @@ -3853,7 +3853,7 @@ static void stm32_macaddress(FAR struct stm32_ethmac_s *priv) FAR struct net_driver_s *dev = &priv->dev; uint32_t regval; - nllvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", dev->d_ifname, 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], @@ -3921,7 +3921,7 @@ static void stm32_ipv6multicast(FAR struct stm32_ethmac_s *priv) mac[4] = tmp16 & 0xff; mac[5] = tmp16 >> 8; - nvdbg("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n", + ninfo("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); (void)stm32_addmac(dev, mac); @@ -4059,12 +4059,12 @@ static int stm32_ethconfig(FAR struct stm32_ethmac_s *priv) /* Reset the Ethernet block */ - nllvdbg("Reset the Ethernet block\n"); + nllinfo("Reset the Ethernet block\n"); stm32_ethreset(priv); /* Initialize the PHY */ - nllvdbg("Initialize the PHY\n"); + nllinfo("Initialize the PHY\n"); ret = stm32_phyinit(priv); if (ret < 0) { @@ -4073,7 +4073,7 @@ static int stm32_ethconfig(FAR struct stm32_ethmac_s *priv) /* Initialize the MAC and DMA */ - nllvdbg("Initialize the MAC and DMA\n"); + nllinfo("Initialize the MAC and DMA\n"); ret = stm32_macconfig(priv); if (ret < 0) { @@ -4094,7 +4094,7 @@ static int stm32_ethconfig(FAR struct stm32_ethmac_s *priv) /* Enable normal MAC operation */ - nllvdbg("Enable normal operation\n"); + nllinfo("Enable normal operation\n"); return stm32_macenable(priv); } @@ -4130,7 +4130,7 @@ int stm32_ethinitialize(int intf) { struct stm32_ethmac_s *priv; - nvdbg("intf: %d\n", intf); + ninfo("intf: %d\n", intf); /* Get the interface structure associated with this interface number. */ diff --git a/arch/arm/src/stm32/stm32_i2c.c b/arch/arm/src/stm32/stm32_i2c.c index 6d06098b01..e1d7e3cade 100644 --- a/arch/arm/src/stm32/stm32_i2c.c +++ b/arch/arm/src/stm32/stm32_i2c.c @@ -166,10 +166,10 @@ #ifdef CONFIG_DEBUG_I2C # define i2cdbg dbg -# define i2cvdbg vdbg +# define i2cinfo info #else # define i2cdbg(x...) -# define i2cvdbg(x...) +# define i2cinfo(x...) #endif /* I2C event trace logic. NOTE: trace uses the internal, non-standard, low-level @@ -693,7 +693,7 @@ static inline int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv) while (priv->intstate != INTSTATE_DONE && elapsed < timeout); - i2cvdbg("intstate: %d elapsed: %ld threshold: %ld status: %08x\n", + i2cinfo("intstate: %d elapsed: %ld threshold: %ld status: %08x\n", priv->intstate, (long)elapsed, (long)timeout, priv->status); /* Set the interrupt state back to IDLE */ @@ -766,7 +766,7 @@ static inline void stm32_i2c_sem_waitstop(FAR struct stm32_i2c_priv_s *priv) * still pending. */ - i2cvdbg("Timeout with CR1: %04x SR1: %04x\n", cr1, sr1); + i2cinfo("Timeout with CR1: %04x SR1: %04x\n", cr1, sr1); } /************************************************************************************ diff --git a/arch/arm/src/stm32/stm32_i2c_alt.c b/arch/arm/src/stm32/stm32_i2c_alt.c index da50a9c263..cc0aa02120 100644 --- a/arch/arm/src/stm32/stm32_i2c_alt.c +++ b/arch/arm/src/stm32/stm32_i2c_alt.c @@ -173,10 +173,10 @@ #ifdef CONFIG_DEBUG_I2C # define i2cdbg dbg -# define i2cvdbg vdbg +# define i2cinfo info #else # define i2cdbg(x...) -# define i2cvdbg(x...) +# define i2cinfo(x...) #endif /* I2C event trace logic. NOTE: trace uses the internal, non-standard, low-level @@ -701,7 +701,7 @@ static int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv) while (priv->intstate != INTSTATE_DONE && elapsed < timeout); - i2cvdbg("intstate: %d elapsed: %ld threshold: %ld status: %08x\n", + i2cinfo("intstate: %d elapsed: %ld threshold: %ld status: %08x\n", priv->intstate, (long)elapsed, (long)timeout, priv->status); /* Set the interrupt state back to IDLE */ @@ -774,7 +774,7 @@ static inline void stm32_i2c_sem_waitstop(FAR struct stm32_i2c_priv_s *priv) * still pending. */ - i2cvdbg("Timeout with CR1: %04x SR1: %04x\n", cr1, sr1); + i2cinfo("Timeout with CR1: %04x SR1: %04x\n", cr1, sr1); } /************************************************************************************ @@ -1208,7 +1208,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) { uint32_t status; - i2cvdbg("I2C ISR called\n"); + i2cinfo("I2C ISR called\n"); /* Get state of the I2C controller (register SR1 only) * @@ -1252,7 +1252,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) if (priv->dcnt == -1 && priv->msgc > 0) { - i2cvdbg("Switch to new message\n"); + i2cinfo("Switch to new message\n"); /* Get current message to process data and copy to private structure */ @@ -1261,7 +1261,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) priv->total_msg_len = priv->msgv->length; /* Set total msg length */ priv->flags = priv->msgv->flags; /* Copy flags to private struct */ - i2cvdbg("Current flags %i\n", priv->flags); + i2cinfo("Current flags %i\n", priv->flags); /* Decrease counter to indicate the number of messages left to process */ @@ -1314,7 +1314,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) { /* Start bit is set */ - i2cvdbg("Entering address handling, status = %i\n", status); + i2cinfo("Entering address handling, status = %i\n", status); /* Check for empty message (for robustness) */ @@ -1326,7 +1326,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) if (priv->total_msg_len == 1 && (priv->flags & I2C_M_READ)) { - i2cvdbg("short read N=1: setting NACK\n"); + i2cinfo("short read N=1: setting NACK\n"); /* Set POS bit to zero (can be up from a previous 2 byte receive) */ @@ -1339,7 +1339,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) } else if (priv->total_msg_len == 2 && (priv->flags & I2C_M_READ)) { - i2cvdbg("short read N=2: setting POS and ACK bits\n"); + i2cinfo("short read N=2: setting POS and ACK bits\n"); stm32_i2c_modifyreg(priv, STM32_I2C_CR1_OFFSET, 0, I2C_CR1_POS); stm32_i2c_modifyreg(priv, STM32_I2C_CR1_OFFSET, 0, I2C_CR1_ACK); @@ -1349,7 +1349,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) { /* Enable ACK after address byte */ - i2cvdbg("setting ACK\n"); + i2cinfo("setting ACK\n"); /* Set POS bit to zero (can be up from a previous 2 byte receive) */ @@ -1369,7 +1369,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) (priv->flags & I2C_M_TEN) ? 0 :((priv->msgv->addr << 1) | (priv->flags & I2C_M_READ))); - i2cvdbg("Address sent. Addr=%#02x Write/Read bit=%i\n", + i2cinfo("Address sent. Addr=%#02x Write/Read bit=%i\n", priv->msgv->addr, (priv->flags & I2C_M_READ)); /* Flag that address has just been sent */ @@ -1428,15 +1428,15 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) else if ((status & I2C_SR1_ADDR) == 0 && priv->check_addr_ACK) { - i2cvdbg("Invalid Address. Setting stop bit and clearing message\n"); - i2cvdbg("status %i\n", status); + i2cinfo("Invalid Address. Setting stop bit and clearing message\n"); + i2cinfo("status %i\n", status); /* Set condition to terminate msg chain transmission as address is invalid. */ priv->dcnt = -1; priv->msgc = 0; - i2cvdbg("dcnt %i , msgc %i\n", priv->dcnt, priv->msgc); + i2cinfo("dcnt %i , msgc %i\n", priv->dcnt, priv->msgc); /* Reset flag to check for valid address */ @@ -1482,8 +1482,8 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) stm32_i2c_modifyreg(priv, STM32_I2C_CR2_OFFSET, 0, I2C_CR2_ITBUFEN); stm32_i2c_sendstop(priv); - i2cvdbg("Address ACKed beginning data reception\n"); - i2cvdbg("short read N=1: programming stop bit\n"); + i2cinfo("Address ACKed beginning data reception\n"); + i2cinfo("short read N=1: programming stop bit\n"); priv->dcnt--; /* Trace */ @@ -1498,8 +1498,8 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) stm32_i2c_modifyreg(priv, STM32_I2C_CR1_OFFSET, I2C_CR1_ACK, 0); - i2cvdbg("Address ACKed beginning data reception\n"); - i2cvdbg("short read N=2: programming NACK\n"); + i2cinfo("Address ACKed beginning data reception\n"); + i2cinfo("short read N=2: programming NACK\n"); /* Trace */ @@ -1507,7 +1507,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) } else { - i2cvdbg("Address ACKed beginning data reception\n"); + i2cinfo("Address ACKed beginning data reception\n"); /* Trace */ @@ -1530,7 +1530,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) * transmit the next byte. */ - i2cvdbg("Entering write mode dcnt = %i msgc = %i\n", + i2cinfo("Entering write mode dcnt = %i msgc = %i\n", priv->dcnt, priv->msgc); /* Clear ADDR flag by reading SR2 and adding it to status */ @@ -1567,12 +1567,12 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) /* If last message send stop bit */ stm32_i2c_sendstop(priv); - i2cvdbg("Stop sent dcnt = %i msgc = %i\n", priv->dcnt, priv->msgc); + i2cinfo("Stop sent dcnt = %i msgc = %i\n", priv->dcnt, priv->msgc); /* Decrease counter to get to next message */ priv->dcnt--; - i2cvdbg("dcnt %i\n", priv->dcnt); + i2cinfo("dcnt %i\n", priv->dcnt); stm32_i2c_traceevent(priv, I2CEVENT_WRITE_STOP, priv->dcnt); } @@ -1586,13 +1586,13 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) { stm32_i2c_sendstart(priv); - i2cvdbg("Restart detected!\n"); - i2cvdbg("Nextflag %i\n", priv->msgv[0].flags); + i2cinfo("Restart detected!\n"); + i2cinfo("Nextflag %i\n", priv->msgv[0].flags); /* Decrease counter to get to next message */ priv->dcnt--; - i2cvdbg("dcnt %i\n", priv->dcnt); + i2cinfo("dcnt %i\n", priv->dcnt); stm32_i2c_traceevent(priv, I2CEVENT_WRITE_RESTART, priv->dcnt); } @@ -1654,7 +1654,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) * (RXNE is set) then the driver can read from the data register. */ - i2cvdbg("Entering read mode dcnt = %i msgc = %i, status %i\n", + i2cinfo("Entering read mode dcnt = %i msgc = %i, status %i\n", priv->dcnt, priv->msgc, status); /* Implementation of method 2 for receiving data following @@ -1665,7 +1665,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) if (priv->dcnt == 0 && priv->total_msg_len == 1) { - i2cvdbg("short read N=1: Read data from data register(DR)\n"); + i2cinfo("short read N=1: Read data from data register(DR)\n"); *priv->ptr++ = stm32_i2c_getreg(priv, STM32_I2C_DR_OFFSET); priv->dcnt--; @@ -1676,12 +1676,12 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) else if (priv->dcnt == 2 && priv->total_msg_len == 2 && !(status & I2C_SR1_BTF)) { - i2cvdbg("short read N=2: DR full, SR empty. Waiting for more bytes.\n"); + i2cinfo("short read N=2: DR full, SR empty. Waiting for more bytes.\n"); stm32_i2c_traceevent(priv, I2CEVENT_READ_SR_EMPTY, 0); } else if (priv->dcnt == 2 && priv->total_msg_len == 2 && (status & I2C_SR1_BTF)) { - i2cvdbg("short read N=2: DR and SR full setting stop bit and reading twice\n"); + i2cinfo("short read N=2: DR and SR full setting stop bit and reading twice\n"); stm32_i2c_sendstop(priv); *priv->ptr++ = stm32_i2c_getreg(priv, STM32_I2C_DR_OFFSET); @@ -1708,7 +1708,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) * this should be able to handle it). */ - i2cvdbg("DR full, SR empty. Waiting for more bytes.\n"); + i2cinfo("DR full, SR empty. Waiting for more bytes.\n"); stm32_i2c_traceevent(priv, I2CEVENT_READ_SR_EMPTY, 0); } else if (priv->dcnt >= 4 && priv->total_msg_len >= 3 && (status & I2C_SR1_BTF)) @@ -1717,7 +1717,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) * RXNE(receive buffer not empty) flag. */ - i2cvdbg("Read data from data register(DR)\n"); + i2cinfo("Read data from data register(DR)\n"); *priv->ptr++ = stm32_i2c_getreg(priv, STM32_I2C_DR_OFFSET); /* Decrease current message length */ @@ -1732,8 +1732,8 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) * This coincides with EV7_2 in the reference manual. */ - i2cvdbg("Program NACK\n"); - i2cvdbg("Read data from data register(DR) dcnt=3\n"); + i2cinfo("Program NACK\n"); + i2cinfo("Read data from data register(DR) dcnt=3\n"); stm32_i2c_traceevent(priv, I2CEVENT_READ_3, priv->dcnt); @@ -1753,10 +1753,10 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) } else if (priv->dcnt == 2 && (status & I2C_SR1_BTF) && priv->total_msg_len >= 3) { - i2cvdbg("Program stop\n"); - i2cvdbg("Read data from data register(DR) dcnt=2\n"); - i2cvdbg("Read data from data register(SR) dcnt=1\n"); - i2cvdbg("Setting condition to stop ISR dcnt = -1\n"); + i2cinfo("Program stop\n"); + i2cinfo("Read data from data register(DR) dcnt=2\n"); + i2cinfo("Read data from data register(SR) dcnt=1\n"); + i2cinfo("Setting condition to stop ISR dcnt = -1\n"); stm32_i2c_traceevent(priv, I2CEVENT_READ_3, priv->dcnt); @@ -1853,7 +1853,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) if (priv->dcnt == -1 && priv->msgc == 0) { - i2cvdbg("Shutting down I2C ISR\n"); + i2cinfo("Shutting down I2C ISR\n"); stm32_i2c_traceevent(priv, I2CEVENT_ISR_SHUTDOWN, 0); diff --git a/arch/arm/src/stm32/stm32_idle.c b/arch/arm/src/stm32/stm32_idle.c index 0786f2ac99..64e08a1b04 100644 --- a/arch/arm/src/stm32/stm32_idle.c +++ b/arch/arm/src/stm32/stm32_idle.c @@ -101,7 +101,7 @@ static void up_idlepm(void) /* Perform board-specific, state-dependent logic here */ - llvdbg("newstate= %d oldstate=%d\n", newstate, oldstate); + llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); /* Then force the global state change */ diff --git a/arch/arm/src/stm32/stm32_iwdg.c b/arch/arm/src/stm32/stm32_iwdg.c index 80d45be729..85af854ef4 100644 --- a/arch/arm/src/stm32/stm32_iwdg.c +++ b/arch/arm/src/stm32/stm32_iwdg.c @@ -113,10 +113,10 @@ #ifdef CONFIG_DEBUG_WATCHDOG # define wddbg lldbg -# define wdvdbg llvdbg +# define wdinfo llinfo #else # define wddbg(x...) -# define wdvdbg(x...) +# define wdinfo(x...) #endif /**************************************************************************** @@ -339,7 +339,7 @@ static int stm32_start(FAR struct watchdog_lowerhalf_s *lower) FAR struct stm32_lowerhalf_s *priv = (FAR struct stm32_lowerhalf_s *)lower; irqstate_t flags; - wdvdbg("Entry: started=%d\n"); + wdinfo("Entry: started=%d\n"); DEBUGASSERT(priv); /* Have we already been started? */ @@ -394,7 +394,7 @@ static int stm32_stop(FAR struct watchdog_lowerhalf_s *lower) { /* There is no way to disable the IDWG timer once it has been started */ - wdvdbg("Entry\n"); + wdinfo("Entry\n"); return -ENOSYS; } @@ -420,7 +420,7 @@ static int stm32_keepalive(FAR struct watchdog_lowerhalf_s *lower) FAR struct stm32_lowerhalf_s *priv = (FAR struct stm32_lowerhalf_s *)lower; irqstate_t flags; - wdvdbg("Entry\n"); + wdinfo("Entry\n"); /* Reload the IWDG timer */ @@ -455,7 +455,7 @@ static int stm32_getstatus(FAR struct watchdog_lowerhalf_s *lower, uint32_t ticks; uint32_t elapsed; - wdvdbg("Entry\n"); + wdinfo("Entry\n"); DEBUGASSERT(priv); /* Return the status bit */ @@ -484,10 +484,10 @@ static int stm32_getstatus(FAR struct watchdog_lowerhalf_s *lower, status->timeleft = priv->timeout - elapsed; - wdvdbg("Status :\n"); - wdvdbg(" flags : %08x\n", status->flags); - wdvdbg(" timeout : %d\n", status->timeout); - wdvdbg(" timeleft : %d\n", status->timeleft); + wdinfo("Status :\n"); + wdinfo(" flags : %08x\n", status->flags); + wdinfo(" timeout : %d\n", status->timeout); + wdinfo(" timeleft : %d\n", status->timeleft); return OK; } @@ -516,7 +516,7 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower, int prescaler; int shift; - wdvdbg("Entry: timeout=%d\n", timeout); + wdinfo("Entry: timeout=%d\n", timeout); DEBUGASSERT(priv); /* Can this timeout be represented? */ @@ -631,7 +631,7 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower, } #endif - wdvdbg("prescaler=%d fiwdg=%d reload=%d\n", prescaler, fiwdg, reload); + wdinfo("prescaler=%d fiwdg=%d reload=%d\n", prescaler, fiwdg, reload); return OK; } @@ -662,7 +662,7 @@ void stm32_iwdginitialize(FAR const char *devpath, uint32_t lsifreq) { FAR struct stm32_lowerhalf_s *priv = &g_wdgdev; - wdvdbg("Entry: devpath=%s lsifreq=%d\n", devpath, lsifreq); + wdinfo("Entry: devpath=%s lsifreq=%d\n", devpath, lsifreq); /* NOTE we assume that clocking to the IWDG has already been provided by * the RCC initialization logic. @@ -682,7 +682,7 @@ void stm32_iwdginitialize(FAR const char *devpath, uint32_t lsifreq) */ stm32_rcc_enablelsi(); - wdvdbg("RCC CSR: %08x\n", getreg32(STM32_RCC_CSR)); + wdinfo("RCC CSR: %08x\n", getreg32(STM32_RCC_CSR)); /* Select an arbitrary initial timeout value. But don't start the watchdog * yet. NOTE: If the "Hardware watchdog" feature is enabled through the diff --git a/arch/arm/src/stm32/stm32_ltdc.c b/arch/arm/src/stm32/stm32_ltdc.c index 8ae8e890fd..678aceda7e 100644 --- a/arch/arm/src/stm32/stm32_ltdc.c +++ b/arch/arm/src/stm32/stm32_ltdc.c @@ -284,10 +284,10 @@ #ifdef CONFIG_STM32_LTDC_REGDEBUG # define regdbg dbg -# define regvdbg vdbg +# define reginfo info #else # define regdbg(x...) -# define regvdbg(x...) +# define reginfo(x...) #endif /* Preallocated LTDC framebuffers */ @@ -942,13 +942,13 @@ static void stm32_ltdc_gpioconfig(void) { int i; - gvdbg("Configuring pins\n"); + ginfo("Configuring pins\n"); /* Configure each pin */ for (i = 0; i < STM32_LTDC_NPINCONFIGS; i++) { - regvdbg("set gpio%d = %08x\n", i, g_ltdcpins[i]); + reginfo("set gpio%d = %08x\n", i, g_ltdcpins[i]); stm32_configgpio(g_ltdcpins[i]); } } @@ -972,51 +972,51 @@ static void stm32_ltdc_periphconfig(void) /* Configure APB2 LTDC clock external */ - regvdbg("configured RCC_APB2ENR=%08x\n", getreg32(STM32_RCC_APB2ENR)); + reginfo("configured RCC_APB2ENR=%08x\n", getreg32(STM32_RCC_APB2ENR)); /* Configure the SAI PLL external to provide the LCD_CLK */ - regvdbg("configured RCC_PLLSAI=%08x\n", getreg32(STM32_RCC_PLLSAICFGR)); + reginfo("configured RCC_PLLSAI=%08x\n", getreg32(STM32_RCC_PLLSAICFGR)); /* Configure dedicated clock external */ - regvdbg("configured RCC_DCKCFGR=%08x\n", getreg32(STM32_RCC_DCKCFGR)); + reginfo("configured RCC_DCKCFGR=%08x\n", getreg32(STM32_RCC_DCKCFGR)); /* Configure LTDC_SSCR */ regval = (STM32_LTDC_SSCR_VSH | STM32_LTDC_SSCR_HSW); - regvdbg("set LTDC_SSCR=%08x\n", regval); + reginfo("set LTDC_SSCR=%08x\n", regval); putreg32(regval, STM32_LTDC_SSCR); - regvdbg("configured LTDC_SSCR=%08x\n", getreg32(STM32_LTDC_SSCR)); + reginfo("configured LTDC_SSCR=%08x\n", getreg32(STM32_LTDC_SSCR)); /* Configure LTDC_BPCR */ regval = (STM32_LTDC_BPCR_AVBP | STM32_LTDC_BPCR_AHBP); - regvdbg("set LTDC_BPCR=%08x\n", regval); + reginfo("set LTDC_BPCR=%08x\n", regval); putreg32(regval, STM32_LTDC_BPCR); - regvdbg("configured LTDC_BPCR=%08x\n", getreg32(STM32_LTDC_BPCR)); + reginfo("configured LTDC_BPCR=%08x\n", getreg32(STM32_LTDC_BPCR)); /* Configure LTDC_AWCR */ regval = (STM32_LTDC_AWCR_AAH | STM32_LTDC_AWCR_AAW); - regvdbg("set LTDC_AWCR=%08x\n", regval); + reginfo("set LTDC_AWCR=%08x\n", regval); putreg32(regval, STM32_LTDC_AWCR); - regvdbg("configured LTDC_AWCR=%08x\n", getreg32(STM32_LTDC_AWCR)); + reginfo("configured LTDC_AWCR=%08x\n", getreg32(STM32_LTDC_AWCR)); /* Configure LTDC_TWCR */ regval = (STM32_LTDC_TWCR_TOTALH | STM32_LTDC_TWCR_TOTALW); - regvdbg("set LTDC_TWCR=%08x\n", regval); + reginfo("set LTDC_TWCR=%08x\n", regval); putreg32(regval, STM32_LTDC_TWCR); - regvdbg("configured LTDC_TWCR=%08x\n", getreg32(STM32_LTDC_TWCR)); + reginfo("configured LTDC_TWCR=%08x\n", getreg32(STM32_LTDC_TWCR)); /* Configure LTDC_GCR */ regval = (STM32_LTDC_GCR_PCPOL | STM32_LTDC_GCR_DEPOL | STM32_LTDC_GCR_VSPOL | STM32_LTDC_GCR_HSPOL); - regvdbg("set LTDC_GCR=%08x\n", regval); + reginfo("set LTDC_GCR=%08x\n", regval); putreg32(regval, STM32_LTDC_GCR); - regvdbg("configured LTDC_GCR=%08x\n", getreg32(STM32_LTDC_GCR)); + reginfo("configured LTDC_GCR=%08x\n", getreg32(STM32_LTDC_GCR)); } /**************************************************************************** @@ -1032,9 +1032,9 @@ static void stm32_ltdc_periphconfig(void) static void stm32_ltdc_bgcolor(uint32_t rgb) { - regvdbg("set LTDC_BCCR=%08x\n", rgb); + reginfo("set LTDC_BCCR=%08x\n", rgb); putreg32(rgb, STM32_LTDC_BCCR); - regvdbg("configured LTDC_BCCR=%08x\n", getreg32(STM32_LTDC_BCCR)); + reginfo("configured LTDC_BCCR=%08x\n", getreg32(STM32_LTDC_BCCR)); } /**************************************************************************** @@ -1073,9 +1073,9 @@ static void stm32_ltdc_dither(bool enable, LTDC_GCR_DGW(0) | LTDC_GCR_DBW(0)); regval |= (LTDC_GCR_DRW(red) | LTDC_GCR_DGW(green) | LTDC_GCR_DBW(blue)); - regvdbg("set LTDC_GCR=%08x\n", regval); + reginfo("set LTDC_GCR=%08x\n", regval); putreg32(regval, STM32_LTDC_GCR); - regvdbg("configured LTDC_GCR=%08x\n", getreg32(STM32_LTDC_GCR)); + reginfo("configured LTDC_GCR=%08x\n", getreg32(STM32_LTDC_GCR)); } /**************************************************************************** @@ -1090,9 +1090,9 @@ static void stm32_ltdc_linepos(void) { /* Configure LTDC_LIPCR */ - regvdbg("set LTDC_LIPCR=%08x\n", STM32_LTDC_LIPCR_LIPOS); + reginfo("set LTDC_LIPCR=%08x\n", STM32_LTDC_LIPCR_LIPOS); putreg32(STM32_LTDC_LIPCR_LIPOS, STM32_LTDC_LIPCR); - regvdbg("configured LTDC_LIPCR=%08x\n", getreg32(STM32_LTDC_LIPCR)); + reginfo("configured LTDC_LIPCR=%08x\n", getreg32(STM32_LTDC_LIPCR)); } /**************************************************************************** @@ -1114,9 +1114,9 @@ static void stm32_ltdc_irqctrl(uint32_t setirqs, uint32_t clrirqs) regval = getreg32(STM32_LTDC_IER); regval &= ~clrirqs; regval |= setirqs; - regvdbg("set LTDC_IER=%08x\n", regval); + reginfo("set LTDC_IER=%08x\n", regval); putreg32(regval, STM32_LTDC_IER); - regvdbg("configured LTDC_IER=%08x\n", getreg32(STM32_LTDC_IER)); + reginfo("configured LTDC_IER=%08x\n", getreg32(STM32_LTDC_IER)); } /**************************************************************************** @@ -1133,7 +1133,7 @@ static int stm32_ltdcirq(int irq, void *context) uint32_t regval = getreg32(STM32_LTDC_ISR); - regvdbg("irq = %d, regval = %08x\n", irq, regval); + reginfo("irq = %d, regval = %08x\n", irq, regval); if (regval & LTDC_ISR_RRIF) { @@ -1255,9 +1255,9 @@ static int stm32_ltdc_reload(uint8_t value, bool waitvblank) * immediately reload is set. */ - regvdbg("set LTDC_SRCR=%08x\n", value); + reginfo("set LTDC_SRCR=%08x\n", value); putreg32(value, STM32_LTDC_SRCR); - regvdbg("configured LTDC_SRCR=%08x\n", getreg32(STM32_LTDC_SRCR)); + reginfo("configured LTDC_SRCR=%08x\n", getreg32(STM32_LTDC_SRCR)); if (waitvblank & (value == LTDC_SRCR_VBR)) { @@ -1354,7 +1354,7 @@ static void stm32_lcd_enable(bool enable) uint32_t regval; regval = getreg32(STM32_LTDC_GCR); - regvdbg("get LTDC_GCR=%08x\n", regval); + reginfo("get LTDC_GCR=%08x\n", regval); if (enable == true) { @@ -1365,9 +1365,9 @@ static void stm32_lcd_enable(bool enable) regval &= ~LTDC_GCR_LTDCEN; } - regvdbg("set LTDC_GCR=%08x\n", regval); + reginfo("set LTDC_GCR=%08x\n", regval); putreg32(regval, STM32_LTDC_GCR); - regvdbg("configured LTDC_GCR=%08x\n", getreg32(STM32_LTDC_GCR)); + reginfo("configured LTDC_GCR=%08x\n", getreg32(STM32_LTDC_GCR)); } /**************************************************************************** @@ -1392,7 +1392,7 @@ static void stm32_ltdc_lclutenable(FAR struct stm32_layer_s *layer, bool enable) uint32_t regval; regval = getreg32(stm32_cr_layer_t[layer->state.lid]); - regvdbg("get LTDC_L%dCR=%08x\n", layer->state.lid + 1, regval); + reginfo("get LTDC_L%dCR=%08x\n", layer->state.lid + 1, regval); /* Disable the clut support during update the color table */ @@ -1405,7 +1405,7 @@ static void stm32_ltdc_lclutenable(FAR struct stm32_layer_s *layer, bool enable) regval &= ~LTDC_LxCR_CLUTEN; } - regvdbg("set LTDC_L%dCR=%08x\n", layer->state.lid + 1, regval); + reginfo("set LTDC_L%dCR=%08x\n", layer->state.lid + 1, regval); putreg32(regval, stm32_cr_layer_t[layer->state.lid]); } #endif @@ -1615,7 +1615,7 @@ static void stm32_ltdc_larea(struct stm32_layer_s *layer) FAR struct stm32_ltdc_s *priv = &layer->state; FAR struct ltdc_area_s *area = &priv->area; - regvdbg("xpos = %d, ypos = %d, xres = %d, yres = %d\n", + reginfo("xpos = %d, ypos = %d, xres = %d, yres = %d\n", area->xpos, area->ypos, area->xres, area->yres); lxpos = area->xpos + (STM32_LTDC_LxWHPCR_WHSTPOS + 1); @@ -1633,9 +1633,9 @@ static void stm32_ltdc_larea(struct stm32_layer_s *layer) /* Configure LxWHPCR / LxWVPCR register */ - regvdbg("set LTDC_L%dWHPCR=%08x\n", priv->lid + 1, whpcr); + reginfo("set LTDC_L%dWHPCR=%08x\n", priv->lid + 1, whpcr); putreg32(whpcr, stm32_whpcr_layer_t[priv->lid]); - regvdbg("set LTDC_L%dWVPCR=%08x\n", priv->lid + 1, wvpcr); + reginfo("set LTDC_L%dWVPCR=%08x\n", priv->lid + 1, wvpcr); putreg32(wvpcr, stm32_wvpcr_layer_t[priv->lid]); /* Configure framebuffer */ @@ -1664,7 +1664,7 @@ static void stm32_ltdc_lpixelformat(FAR struct stm32_layer_s *layer) { /* Configure PFCR register */ - regvdbg("set LTDC_L%dPFCR=%08x\n", layer->state.lid + 1, + reginfo("set LTDC_L%dPFCR=%08x\n", layer->state.lid + 1, stm32_fmt_layer_t[layer->state.lid]); putreg32(stm32_fmt_layer_t[layer->state.lid], stm32_pfcr_layer_t[layer->state.lid]); @@ -1698,7 +1698,7 @@ static inline void stm32_ltdc_lframebuffer(FAR struct stm32_layer_s *layer) offset = priv->xpos * STM32_LTDC_Lx_BYPP(pinfo->bpp) + pinfo->stride * priv->ypos; - regvdbg("set LTDC_L%dCFBAR=%08x\n", priv->lid + 1, pinfo->fbmem + offset); + reginfo("set LTDC_L%dCFBAR=%08x\n", priv->lid + 1, pinfo->fbmem + offset); putreg32((uint32_t)pinfo->fbmem + offset, stm32_cfbar_layer_t[priv->lid]); /* Configure LxCFBLR register */ @@ -1708,12 +1708,12 @@ static inline void stm32_ltdc_lframebuffer(FAR struct stm32_layer_s *layer) cfblr = LTDC_LxCFBLR_CFBP(pinfo->stride) | LTDC_LxCFBLR_CFBLL(area->xres * STM32_LTDC_Lx_BYPP(pinfo->bpp) + 3); - regvdbg("set LTDC_L%dCFBLR=%08x\n", priv->lid + 1, cfblr); + reginfo("set LTDC_L%dCFBLR=%08x\n", priv->lid + 1, cfblr); putreg32(cfblr, stm32_cfblr_layer_t[priv->lid]); /* Configure LxCFBLNR register */ - regvdbg("set LTDC_L%dCFBLNR=%08x\n", priv->lid + 1, area->yres); + reginfo("set LTDC_L%dCFBLNR=%08x\n", priv->lid + 1, area->yres); putreg32(area->yres, stm32_cfblnr_layer_t[priv->lid]); } @@ -1733,7 +1733,7 @@ static inline void stm32_ltdc_lframebuffer(FAR struct stm32_layer_s *layer) static void stm32_ltdc_lalpha(FAR struct stm32_layer_s *layer) { uint8_t opac = stm32_ltdc_lgetopac(layer); - regvdbg("set LTDC_L%dCACR=%02x\n", layer->state.lid + 1, opac); + reginfo("set LTDC_L%dCACR=%02x\n", layer->state.lid + 1, opac); putreg32(opac, stm32_cacr_layer_t[layer->state.lid]); /* Clear the constant alpha operation flag */ @@ -1760,7 +1760,7 @@ static void stm32_ltdc_lalpha(FAR struct stm32_layer_s *layer) static void stm32_ltdc_lblendmode(FAR struct stm32_layer_s *layer, uint8_t bf1, uint8_t bf2) { - regvdbg("set LTDC_L%dBFCR=%08x\n", layer->state.lid + 1, + reginfo("set LTDC_L%dBFCR=%08x\n", layer->state.lid + 1, (LTDC_LxBFCR_BF1(bf1) | LTDC_LxBFCR_BF2(bf2))); putreg32((LTDC_LxBFCR_BF1(bf1) | LTDC_LxBFCR_BF2(bf2)), stm32_bfcr_layer_t[layer->state.lid]); @@ -1785,7 +1785,7 @@ static void stm32_ltdc_lblendmode(FAR struct stm32_layer_s *layer, static void stm32_ltdc_lcolor(FAR struct stm32_layer_s *layer, uint32_t argb) { - regvdbg("set LTDC_L%dDCCR=%08x\n", layer->state.lid + 1, argb); + reginfo("set LTDC_L%dDCCR=%08x\n", layer->state.lid + 1, argb); putreg32(argb, stm32_dccr_layer_t[layer->state.lid]); /* Clear the color operation flag */ @@ -1816,7 +1816,7 @@ static void stm32_ltdc_lcolorkey(FAR struct stm32_layer_s *layer) { /* Set colorkey */ - regvdbg("set LTDC_L%dCKCR=%08x\n", + reginfo("set LTDC_L%dCKCR=%08x\n", layer->state.lid + 1, layer->state.colorkey); putreg32(layer->state.colorkey, stm32_ckcr_layer_t[layer->state.lid]); @@ -1831,7 +1831,7 @@ static void stm32_ltdc_lcolorkey(FAR struct stm32_layer_s *layer) regval &= ~LTDC_LxCR_COLKEN; } - regvdbg("set LTDC_L%dCR=%08x\n", layer->state.lid + 1, regval); + reginfo("set LTDC_L%dCR=%08x\n", layer->state.lid + 1, regval); putreg32(regval, stm32_cr_layer_t[layer->state.lid]); /* Clear the colorkey operation flag */ @@ -1903,7 +1903,7 @@ static void stm32_ltdc_lclut(FAR struct stm32_layer_s *layer, #endif - regvdbg("set LTDC_L%dCLUTWR = %08x, cmap->first = %d, cmap->len = %d\n", + reginfo("set LTDC_L%dCLUTWR = %08x, cmap->first = %d, cmap->len = %d\n", layer->state.lid + 1, regval, cmap->first, cmap->len); putreg32(regval, stm32_clutwr_layer_t[layer->state.lid]); } @@ -1950,7 +1950,7 @@ static void stm32_ltdc_lenable(FAR struct stm32_layer_s *layer) regval &= ~LTDC_LxCR_LEN; } - regvdbg("set LTDC_L%dCR=%08x\n", layer->state.lid + 1, regval); + reginfo("set LTDC_L%dCR=%08x\n", layer->state.lid + 1, regval); putreg32(regval, stm32_cr_layer_t[layer->state.lid]); /* Clear the enable operation flag */ @@ -1985,7 +1985,7 @@ static void stm32_ltdc_lclear(FAR struct stm32_layer_s *layer, uint8_t *dest = (uint8_t *)priv->pinfo.fbmem; int i; - gvdbg("Clearing display: BPP=%d color=%04x framebuffer=%08x size=%d\n", + ginfo("Clearing display: BPP=%d color=%04x framebuffer=%08x size=%d\n", priv->pinfo.bpp, color, dest, priv->pinfo.fblen); for (i = 0; i < priv->pinfo.fblen; i += sizeof(uint8_t)) @@ -2003,7 +2003,7 @@ static void stm32_ltdc_lclear(FAR struct stm32_layer_s *layer, uint16_t *dest = (uint16_t *)priv->pinfo.fbmem; int i; - gvdbg("Clearing display: BPP=%d color=%04x framebuffer=%08x size=%d\n", + ginfo("Clearing display: BPP=%d color=%04x framebuffer=%08x size=%d\n", priv->pinfo.bpp, color, dest, priv->pinfo.fblen); for (i = 0; i < priv->pinfo.fblen; i += sizeof(uint16_t)) @@ -2024,7 +2024,7 @@ static void stm32_ltdc_lclear(FAR struct stm32_layer_s *layer, uint8_t b; int i; - gvdbg("Clearing display: BPP=%d color=%04x framebuffer=%08x size=%d\n", + ginfo("Clearing display: BPP=%d color=%04x framebuffer=%08x size=%d\n", priv->pinfo.bpp, color, dest, priv->pinfo.fblen); r = (uint8_t) color; @@ -2048,7 +2048,7 @@ static void stm32_ltdc_lclear(FAR struct stm32_layer_s *layer, uint32_t *dest = (uint32_t *)priv->pinfo.fbmem; int i; - gvdbg("Clearing display: BPP=%d color=%04x framebuffer=%08x size=%d\n", + ginfo("Clearing display: BPP=%d color=%04x framebuffer=%08x size=%d\n", priv->pinfo.bpp, color, dest, priv->pinfo.fblen); for (i = 0; i < priv->pinfo.fblen; i += sizeof(uint32_t)) @@ -2191,7 +2191,7 @@ static void stm32_ltdc_linit(int lid) static int stm32_getvideoinfo(struct fb_vtable_s *vtable, struct fb_videoinfo_s *vinfo) { - gvdbg("vtable=%p vinfo=%p\n", vtable, vinfo); + ginfo("vtable=%p vinfo=%p\n", vtable, vinfo); if (vtable) { FAR struct ltdc_layer_s *ltdc; @@ -2226,7 +2226,7 @@ static int stm32_getvideoinfo(struct fb_vtable_s *vtable, static int stm32_getplaneinfo(struct fb_vtable_s *vtable, int planeno, struct fb_planeinfo_s *pinfo) { - gvdbg("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo); + ginfo("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo); if (vtable) { FAR struct ltdc_layer_s *ltdc; @@ -2315,7 +2315,7 @@ static int stm32_putcmap(struct fb_vtable_s *vtable, static int stm32_lgetvideoinfo(struct ltdc_layer_s *layer, struct fb_videoinfo_s *vinfo) { - gvdbg("layer=%p vinfo=%p\n", layer, vinfo); + ginfo("layer=%p vinfo=%p\n", layer, vinfo); FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer; if (stm32_ltdc_lvalidate(priv)) @@ -2349,7 +2349,7 @@ static int stm32_lgetvideoinfo(struct ltdc_layer_s *layer, static int stm32_lgetplaneinfo(struct ltdc_layer_s *layer, int planeno, struct fb_planeinfo_s *pinfo) { - gvdbg("layer=%p planeno=%d pinfo=%p\n", layer, planeno, pinfo); + ginfo("layer=%p planeno=%d pinfo=%p\n", layer, planeno, pinfo); FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer; if (stm32_ltdc_lvalidate(priv) && planeno == 0) @@ -2386,7 +2386,7 @@ static int stm32_setclut(struct ltdc_layer_s *layer, { int ret; FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer; - gvdbg("layer=%p cmap=%p\n", layer, cmap); + ginfo("layer=%p cmap=%p\n", layer, cmap); if (stm32_ltdc_lvalidate(priv) && cmap) { @@ -2444,7 +2444,7 @@ static int stm32_getclut(struct ltdc_layer_s *layer, { int ret; FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer; - gvdbg("layer=%p cmap=%p\n", layer, cmap); + ginfo("layer=%p cmap=%p\n", layer, cmap); if (priv == &LAYER_L1 || priv == &LAYER_L2) { @@ -2489,7 +2489,7 @@ static int stm32_getclut(struct ltdc_layer_s *layer, cmap->green[n] = clut888[offset + 1]; cmap->red[n] = clut888[offset + 2]; - regvdbg("n=%d, red=%02x, green=%02x, blue=%02x\n", n, + reginfo("n=%d, red=%02x, green=%02x, blue=%02x\n", n, clut888[offset], clut888[offset + 1], clut888[offset + 2]); # else @@ -2498,7 +2498,7 @@ static int stm32_getclut(struct ltdc_layer_s *layer, cmap->green[n] = (uint8_t)LTDC_CMAP_GREEN(clut[n]); cmap->blue[n] = (uint8_t)LTDC_CMAP_BLUE(clut[n]); - regvdbg("n=%d, alpha=%02x, red=%02x, green=%02x, blue=%02x\n", n, + reginfo("n=%d, alpha=%02x, red=%02x, green=%02x, blue=%02x\n", n, DMA2D_CMAP_ALPHA(clut[n]), DMA2D_CMAP_RED(clut[n]), DMA2D_CMAP_GREEN(clut[n]), DMA2D_CMAP_BLUE(clut[n])); # endif @@ -2542,7 +2542,7 @@ static int stm32_getlid(FAR struct ltdc_layer_s *layer, int *lid, { FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer; - gvdbg("flag = %08x\n", flag); + ginfo("flag = %08x\n", flag); if (stm32_ltdc_lvalidate(priv)) { @@ -2617,7 +2617,7 @@ static int stm32_getlid(FAR struct ltdc_layer_s *layer, int *lid, static int stm32_setcolor(FAR struct ltdc_layer_s *layer, uint32_t argb) { FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer; - gvdbg("layer = %p, argb = %08x\n", layer, argb); + ginfo("layer = %p, argb = %08x\n", layer, argb); if (stm32_ltdc_lvalidate(priv)) { @@ -2652,7 +2652,7 @@ static int stm32_setcolor(FAR struct ltdc_layer_s *layer, uint32_t argb) static int stm32_getcolor(FAR struct ltdc_layer_s *layer, uint32_t *argb) { FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer; - gvdbg("layer = %p, argb = %p\n", layer, argb); + ginfo("layer = %p, argb = %p\n", layer, argb); if (stm32_ltdc_lvalidate(priv)) { @@ -2688,7 +2688,7 @@ static int stm32_getcolor(FAR struct ltdc_layer_s *layer, uint32_t *argb) static int stm32_setcolorkey(FAR struct ltdc_layer_s *layer, uint32_t rgb) { FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer; - gvdbg("layer = %p, argb = %08x\n", layer, rgb); + ginfo("layer = %p, argb = %08x\n", layer, rgb); if (stm32_ltdc_lvalidate(priv)) { @@ -2723,7 +2723,7 @@ static int stm32_setcolorkey(FAR struct ltdc_layer_s *layer, uint32_t rgb) static int stm32_getcolorkey(FAR struct ltdc_layer_s *layer, uint32_t *rgb) { FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer; - gvdbg("layer = %p, argb = %p\n", layer, rgb); + ginfo("layer = %p, argb = %p\n", layer, rgb); if (stm32_ltdc_lvalidate(priv)) { @@ -2763,7 +2763,7 @@ static int stm32_getcolorkey(FAR struct ltdc_layer_s *layer, uint32_t *rgb) static int stm32_setalpha(FAR struct ltdc_layer_s *layer, uint8_t alpha) { FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer; - gvdbg("layer = %p, alpha = %02x\n", layer, alpha); + ginfo("layer = %p, alpha = %02x\n", layer, alpha); if (stm32_ltdc_lvalidate(priv)) { @@ -2798,7 +2798,7 @@ static int stm32_setalpha(FAR struct ltdc_layer_s *layer, uint8_t alpha) static int stm32_getalpha(FAR struct ltdc_layer_s *layer, uint8_t *alpha) { FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer; - gvdbg("layer = %p, alpha = %p\n", layer, alpha); + ginfo("layer = %p, alpha = %p\n", layer, alpha); if (stm32_ltdc_lvalidate(priv)) { @@ -2857,7 +2857,7 @@ static int stm32_setblendmode(FAR struct ltdc_layer_s *layer, uint32_t mode) { FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer; uint32_t blendmode = mode; - gvdbg("layer = %p, mode = %08x\n", layer, mode); + ginfo("layer = %p, mode = %08x\n", layer, mode); if (stm32_ltdc_lvalidate(priv)) { @@ -2964,7 +2964,7 @@ static int stm32_setblendmode(FAR struct ltdc_layer_s *layer, uint32_t mode) static int stm32_getblendmode(FAR struct ltdc_layer_s *layer, uint32_t *mode) { FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer; - gvdbg("layer = %p, mode = %p\n", layer, mode); + ginfo("layer = %p, mode = %p\n", layer, mode); if (stm32_ltdc_lvalidate(priv)) { @@ -3011,7 +3011,7 @@ static int stm32_setarea(FAR struct ltdc_layer_s *layer, fb_coord_t srcypos) { FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer; - gvdbg("layer = %p, area = %p, srcxpos = %d, srcypos = %d\n", + ginfo("layer = %p, area = %p, srcxpos = %d, srcypos = %d\n", layer, area, srcxpos, srcypos); if (stm32_ltdc_lvalidate(priv)) @@ -3066,7 +3066,7 @@ static int stm32_getarea(FAR struct ltdc_layer_s *layer, fb_coord_t *srcxpos, fb_coord_t *srcypos) { FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer; - gvdbg("layer = %p, area = %p, srcxpos = %p, srcypos = %p\n", + ginfo("layer = %p, area = %p, srcxpos = %p, srcypos = %p\n", layer, area, srcxpos, srcypos); if (stm32_ltdc_lvalidate(priv)) @@ -3131,7 +3131,7 @@ static int stm32_update(FAR struct ltdc_layer_s *layer, uint32_t mode) FAR struct stm32_layer_s *inactive = &LAYER(!g_lactive); #endif - gvdbg("layer = %p, mode = %08x\n", layer, mode); + ginfo("layer = %p, mode = %08x\n", layer, mode); if (stm32_ltdc_lvalidate(priv)) { @@ -3272,7 +3272,7 @@ static int stm32_blit(FAR struct ltdc_layer_s *dest, { FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)dest; - gvdbg("dest = %p, destxpos = %d, destypos = %d, src = %p, srcarea = %p\n", + ginfo("dest = %p, destxpos = %d, destypos = %d, src = %p, srcarea = %p\n", dest, destxpos, destypos, src, srcarea); if (stm32_ltdc_lvalidate(priv)) @@ -3325,7 +3325,7 @@ static int stm32_blend(FAR struct ltdc_layer_s *dest, { FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)dest; - gvdbg("dest=%p, destxpos=%d, destypos=%d, " + ginfo("dest=%p, destxpos=%d, destypos=%d, " "fore=%p, forexpos=%d foreypos=%d, " "back=%p, backarea=%p\n", dest, destxpos, destypos, fore, forexpos, foreypos, back, backarea); @@ -3370,7 +3370,7 @@ static int stm32_fillarea(FAR struct ltdc_layer_s *layer, uint32_t color) { FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer; - gvdbg("layer = %p, area = %p, color = %08x\n", layer, area, color); + ginfo("layer = %p, area = %p, color = %08x\n", layer, area, color); if (stm32_ltdc_lvalidate(priv)) { @@ -3407,7 +3407,7 @@ static int stm32_fillarea(FAR struct ltdc_layer_s *layer, FAR struct ltdc_layer_s *stm32_ltdcgetlayer(int lid) { - gvdbg("lid: %d\n", lid); + ginfo("lid: %d\n", lid); if (lid == LTDC_LAYER_L1 || lid == LTDC_LAYER_L2) { return (FAR struct ltdc_layer_s *) &LAYER(lid); @@ -3447,16 +3447,16 @@ int stm32_ltdcinitialize(void) stm32_lcd_enable(false); - gvdbg("Configuring the LCD controller\n"); + ginfo("Configuring the LCD controller\n"); /* Configure LCD periphery */ - gvdbg("Configure lcd periphery\n"); + ginfo("Configure lcd periphery\n"); stm32_ltdc_periphconfig(); /* Configure global ltdc register */ - gvdbg("Configure global register\n"); + ginfo("Configure global register\n"); stm32_global_configure(); #ifdef CONFIG_STM32_DMA2D @@ -3472,7 +3472,7 @@ int stm32_ltdcinitialize(void) /* Initialize ltdc layer */ - gvdbg("Initialize ltdc layer\n"); + ginfo("Initialize ltdc layer\n"); stm32_ltdc_linit(LTDC_LAYER_L1); #ifdef CONFIG_STM32_LTDC_L2 stm32_ltdc_linit(LTDC_LAYER_L2); @@ -3493,12 +3493,12 @@ int stm32_ltdcinitialize(void) /* Reload shadow register */ - gvdbg("Reload shadow register\n"); + ginfo("Reload shadow register\n"); stm32_ltdc_reload(LTDC_SRCR_IMR, false); /* Turn the LCD on */ - gvdbg("Enabling the display\n"); + ginfo("Enabling the display\n"); stm32_lcd_enable(true); /* Set initialized state */ @@ -3524,7 +3524,7 @@ int stm32_ltdcinitialize(void) struct fb_vtable_s *stm32_ltdcgetvplane(int vplane) { - gvdbg("vplane: %d\n", vplane); + ginfo("vplane: %d\n", vplane); if (vplane == 0) { diff --git a/arch/arm/src/stm32/stm32_otgfsdev.c b/arch/arm/src/stm32/stm32_otgfsdev.c index 81fb004fbc..2d347ad870 100644 --- a/arch/arm/src/stm32/stm32_otgfsdev.c +++ b/arch/arm/src/stm32/stm32_otgfsdev.c @@ -1218,7 +1218,7 @@ static void stm32_epin_request(FAR struct stm32_usbdev_s *priv, return; } - ullvdbg("EP%d req=%p: len=%d xfrd=%d zlp=%d\n", + ullinfo("EP%d req=%p: len=%d xfrd=%d zlp=%d\n", privep->epphy, privreq, privreq->req.len, privreq->req.xfrd, privep->zlp); @@ -1484,7 +1484,7 @@ static void stm32_epout_complete(FAR struct stm32_usbdev_s *priv, return; } - ullvdbg("EP%d: len=%d xfrd=%d\n", + ullinfo("EP%d: len=%d xfrd=%d\n", privep->epphy, privreq->req.len, privreq->req.xfrd); /* Return the completed read request to the class driver and mark the state @@ -1519,7 +1519,7 @@ static inline void stm32_ep0out_receive(FAR struct stm32_ep_s *privep, int bcnt) DEBUGASSERT(privep && privep->ep.priv); priv = (FAR struct stm32_usbdev_s *)privep->ep.priv; - ullvdbg("EP0: bcnt=%d\n", bcnt); + ullinfo("EP0: bcnt=%d\n", bcnt); usbtrace(TRACE_READ(EP0), bcnt); /* Verify that an OUT SETUP request as received before this data was @@ -1612,7 +1612,7 @@ static inline void stm32_epout_receive(FAR struct stm32_ep_s *privep, int bcnt) return; } - ullvdbg("EP%d: len=%d xfrd=%d\n", privep->epphy, privreq->req.len, privreq->req.xfrd); + ullinfo("EP%d: len=%d xfrd=%d\n", privep->epphy, privreq->req.len, privreq->req.xfrd); usbtrace(TRACE_READ(privep->epphy), bcnt); /* Get the number of bytes to transfer from the RxFIFO */ @@ -1696,7 +1696,7 @@ static void stm32_epout_request(FAR struct stm32_usbdev_s *priv, return; } - ullvdbg("EP%d: len=%d\n", privep->epphy, privreq->req.len); + ullinfo("EP%d: len=%d\n", privep->epphy, privreq->req.len); /* Ignore any attempt to receive a zero length packet (this really * should not happen. @@ -2490,7 +2490,7 @@ static inline void stm32_ep0out_setup(struct stm32_usbdev_s *priv) ctrlreq.index = GETUINT16(priv->ctrlreq.index); ctrlreq.len = GETUINT16(priv->ctrlreq.len); - ullvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n", + ullinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n", ctrlreq.type, ctrlreq.req, ctrlreq.value, ctrlreq.index, ctrlreq.len); /* Check for a standard request */ @@ -4334,7 +4334,7 @@ static int stm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s * if (!req || !req->callback || !req->buf || !ep) { usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0); - ullvdbg("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); + ullinfo("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); return -EINVAL; } #endif diff --git a/arch/arm/src/stm32/stm32_otgfshost.c b/arch/arm/src/stm32/stm32_otgfshost.c index 81f6ded269..ba0d451d43 100644 --- a/arch/arm/src/stm32/stm32_otgfshost.c +++ b/arch/arm/src/stm32/stm32_otgfshost.c @@ -1938,7 +1938,7 @@ static void stm32_in_next(FAR struct stm32_usbhost_s *priv, /* The transfer is complete, with or without an error */ - uvdbg("Transfer complete: %d\n", result); + uinfo("Transfer complete: %d\n", result); /* Extract the callback information */ @@ -2224,7 +2224,7 @@ static void stm32_out_next(FAR struct stm32_usbhost_s *priv, /* The transfer is complete, with or without an error */ - uvdbg("Transfer complete: %d\n", result); + uinfo("Transfer complete: %d\n", result); /* Extract the callback information */ @@ -2370,7 +2370,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, /* AND the two to get the set of enabled, pending HC interrupts */ pending &= regval; - ullvdbg("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending); + ullinfo("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending); /* Check for a pending ACK response received/transmitted (ACK) interrupt */ @@ -2631,7 +2631,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, /* AND the two to get the set of enabled, pending HC interrupts */ pending &= regval; - ullvdbg("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending); + ullinfo("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending); /* Check for a pending ACK response received/transmitted (ACK) interrupt */ @@ -2949,7 +2949,7 @@ static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv) /* Read and pop the next status from the Rx FIFO */ grxsts = stm32_getreg(STM32_OTGFS_GRXSTSP); - ullvdbg("GRXSTS: %08x\n", grxsts); + ullinfo("GRXSTS: %08x\n", grxsts); /* Isolate the channel number/index in the status word */ @@ -3102,7 +3102,7 @@ static inline void stm32_gint_nptxfeisr(FAR struct stm32_usbhost_s *priv) /* Write the next group of packets into the Tx FIFO */ - ullvdbg("HNPTXSTS: %08x chidx: %d avail: %d buflen: %d xfrd: %d wrsize: %d\n", + ullinfo("HNPTXSTS: %08x chidx: %d avail: %d buflen: %d xfrd: %d wrsize: %d\n", regval, chidx, avail, chan->buflen, chan->xfrd, wrsize); stm32_gint_wrpacket(priv, chan->buffer, chidx, wrsize); @@ -3190,7 +3190,7 @@ static inline void stm32_gint_ptxfeisr(FAR struct stm32_usbhost_s *priv) /* Write the next group of packets into the Tx FIFO */ - ullvdbg("HPTXSTS: %08x chidx: %d avail: %d buflen: %d xfrd: %d wrsize: %d\n", + ullinfo("HPTXSTS: %08x chidx: %d avail: %d buflen: %d xfrd: %d wrsize: %d\n", regval, chidx, avail, chan->buflen, chan->xfrd, wrsize); stm32_gint_wrpacket(priv, chan->buffer, chidx, wrsize); @@ -3760,7 +3760,7 @@ static int stm32_wait(FAR struct usbhost_connection_s *conn, *hport = connport; leave_critical_section(flags); - uvdbg("RHport Connected: %s\n", connport->connected ? "YES" : "NO"); + uinfo("RHport Connected: %s\n", connport->connected ? "YES" : "NO"); return OK; } @@ -3777,7 +3777,7 @@ static int stm32_wait(FAR struct usbhost_connection_s *conn, *hport = connport; leave_critical_section(flags); - uvdbg("Hub port Connected: %s\n", connport->connected ? "YES" : "NO"); + uinfo("Hub port Connected: %s\n", connport->connected ? "YES" : "NO"); return OK; } #endif @@ -3897,7 +3897,7 @@ static int stm32_enumerate(FAR struct usbhost_connection_s *conn, /* Then let the common usbhost_enumerate do the real enumeration. */ - uvdbg("Enumerate the device\n"); + uinfo("Enumerate the device\n"); priv->smstate = SMSTATE_ENUM; ret = usbhost_enumerate(hport, &hport->devclass); @@ -4312,7 +4312,7 @@ static int stm32_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, DEBUGASSERT(priv != NULL && ep0info != NULL && req != NULL); usbhost_vtrace2(OTGFS_VTRACE2_CTRLIN, req->type, req->req); - uvdbg("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n", + uinfo("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n", req->type, req->req, req->value[1], req->value[0], req->index[1], req->index[0], req->len[1], req->len[0]); @@ -4397,7 +4397,7 @@ static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, DEBUGASSERT(priv != NULL && ep0info != NULL && req != NULL); usbhost_vtrace2(OTGFS_VTRACE2_CTRLOUT, req->type, req->req); - uvdbg("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n", + uinfo("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n", req->type, req->req, req->value[1], req->value[0], req->index[1], req->index[0], req->len[1], req->len[0]); @@ -4515,7 +4515,7 @@ static ssize_t stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep unsigned int chidx = (unsigned int)ep; ssize_t nbytes; - uvdbg("chidx: %d buflen: %d\n", (unsigned int)ep, buflen); + uinfo("chidx: %d buflen: %d\n", (unsigned int)ep, buflen); DEBUGASSERT(priv && buffer && chidx < STM32_MAX_TX_FIFOS && buflen > 0); @@ -4582,7 +4582,7 @@ static int stm32_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, unsigned int chidx = (unsigned int)ep; int ret; - uvdbg("chidx: %d buflen: %d\n", (unsigned int)ep, buflen); + uinfo("chidx: %d buflen: %d\n", (unsigned int)ep, buflen); DEBUGASSERT(priv && buffer && chidx < STM32_MAX_TX_FIFOS && buflen > 0); @@ -4632,7 +4632,7 @@ static int stm32_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) unsigned int chidx = (unsigned int)ep; irqstate_t flags; - uvdbg("chidx: %u: %d\n", chidx); + uinfo("chidx: %u: %d\n", chidx); DEBUGASSERT(priv && chidx < STM32_MAX_TX_FIFOS); chan = &priv->chan[chidx]; @@ -4727,7 +4727,7 @@ static int stm32_connect(FAR struct usbhost_driver_s *drvr, /* Set the connected/disconnected flag */ hport->connected = connected; - ullvdbg("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO"); + ullinfo("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO"); /* Report the connection event */ diff --git a/arch/arm/src/stm32/stm32_otghsdev.c b/arch/arm/src/stm32/stm32_otghsdev.c index 07e9f0af1c..7df1b921ce 100644 --- a/arch/arm/src/stm32/stm32_otghsdev.c +++ b/arch/arm/src/stm32/stm32_otghsdev.c @@ -1218,7 +1218,7 @@ static void stm32_epin_request(FAR struct stm32_usbdev_s *priv, return; } - ullvdbg("EP%d req=%p: len=%d xfrd=%d zlp=%d\n", + ullinfo("EP%d req=%p: len=%d xfrd=%d zlp=%d\n", privep->epphy, privreq, privreq->req.len, privreq->req.xfrd, privep->zlp); @@ -1484,7 +1484,7 @@ static void stm32_epout_complete(FAR struct stm32_usbdev_s *priv, return; } - ullvdbg("EP%d: len=%d xfrd=%d\n", + ullinfo("EP%d: len=%d xfrd=%d\n", privep->epphy, privreq->req.len, privreq->req.xfrd); /* Return the completed read request to the class driver and mark the state @@ -1519,7 +1519,7 @@ static inline void stm32_ep0out_receive(FAR struct stm32_ep_s *privep, int bcnt) DEBUGASSERT(privep && privep->ep.priv); priv = (FAR struct stm32_usbdev_s *)privep->ep.priv; - ullvdbg("EP0: bcnt=%d\n", bcnt); + ullinfo("EP0: bcnt=%d\n", bcnt); usbtrace(TRACE_READ(EP0), bcnt); /* Verify that an OUT SETUP request as received before this data was @@ -1612,7 +1612,7 @@ static inline void stm32_epout_receive(FAR struct stm32_ep_s *privep, int bcnt) return; } - ullvdbg("EP%d: len=%d xfrd=%d\n", privep->epphy, privreq->req.len, privreq->req.xfrd); + ullinfo("EP%d: len=%d xfrd=%d\n", privep->epphy, privreq->req.len, privreq->req.xfrd); usbtrace(TRACE_READ(privep->epphy), bcnt); /* Get the number of bytes to transfer from the RxFIFO */ @@ -1696,7 +1696,7 @@ static void stm32_epout_request(FAR struct stm32_usbdev_s *priv, return; } - ullvdbg("EP%d: len=%d\n", privep->epphy, privreq->req.len); + ullinfo("EP%d: len=%d\n", privep->epphy, privreq->req.len); /* Ignore any attempt to receive a zero length packet (this really * should not happen. @@ -2490,7 +2490,7 @@ static inline void stm32_ep0out_setup(struct stm32_usbdev_s *priv) ctrlreq.index = GETUINT16(priv->ctrlreq.index); ctrlreq.len = GETUINT16(priv->ctrlreq.len); - ullvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n", + ullinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n", ctrlreq.type, ctrlreq.req, ctrlreq.value, ctrlreq.index, ctrlreq.len); /* Check for a standard request */ @@ -4334,7 +4334,7 @@ static int stm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s * if (!req || !req->callback || !req->buf || !ep) { usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0); - ullvdbg("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); + ullinfo("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); return -EINVAL; } #endif diff --git a/arch/arm/src/stm32/stm32_otghshost.c b/arch/arm/src/stm32/stm32_otghshost.c index 4c6252a029..4a81571791 100644 --- a/arch/arm/src/stm32/stm32_otghshost.c +++ b/arch/arm/src/stm32/stm32_otghshost.c @@ -1938,7 +1938,7 @@ static void stm32_in_next(FAR struct stm32_usbhost_s *priv, /* The transfer is complete, with or without an error */ - uvdbg("Transfer complete: %d\n", result); + uinfo("Transfer complete: %d\n", result); /* Extract the callback information */ @@ -2224,7 +2224,7 @@ static void stm32_out_next(FAR struct stm32_usbhost_s *priv, /* The transfer is complete, with or without an error */ - uvdbg("Transfer complete: %d\n", result); + uinfo("Transfer complete: %d\n", result); /* Extract the callback information */ @@ -2370,7 +2370,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, /* AND the two to get the set of enabled, pending HC interrupts */ pending &= regval; - ullvdbg("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending); + ullinfo("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending); /* Check for a pending ACK response received/transmitted (ACK) interrupt */ @@ -2631,7 +2631,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, /* AND the two to get the set of enabled, pending HC interrupts */ pending &= regval; - ullvdbg("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending); + ullinfo("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending); /* Check for a pending ACK response received/transmitted (ACK) interrupt */ @@ -2949,7 +2949,7 @@ static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv) /* Read and pop the next status from the Rx FIFO */ grxsts = stm32_getreg(STM32_OTGHS_GRXSTSP); - ullvdbg("GRXSTS: %08x\n", grxsts); + ullinfo("GRXSTS: %08x\n", grxsts); /* Isolate the channel number/index in the status word */ @@ -3102,7 +3102,7 @@ static inline void stm32_gint_nptxfeisr(FAR struct stm32_usbhost_s *priv) /* Write the next group of packets into the Tx FIFO */ - ullvdbg("HNPTXSTS: %08x chidx: %d avail: %d buflen: %d xfrd: %dwrsize: %d\n", + ullinfo("HNPTXSTS: %08x chidx: %d avail: %d buflen: %d xfrd: %dwrsize: %d\n", regval, chidx, avail, chan->buflen, chan->xfrd, wrsize); stm32_gint_wrpacket(priv, chan->buffer, chidx, wrsize); @@ -3190,7 +3190,7 @@ static inline void stm32_gint_ptxfeisr(FAR struct stm32_usbhost_s *priv) /* Write the next group of packets into the Tx FIFO */ - ullvdbg("HPTXSTS: %08x chidx: %d avail: %d buflen: %d xfrd: %d wrsize: %d\n", + ullinfo("HPTXSTS: %08x chidx: %d avail: %d buflen: %d xfrd: %d wrsize: %d\n", regval, chidx, avail, chan->buflen, chan->xfrd, wrsize); stm32_gint_wrpacket(priv, chan->buffer, chidx, wrsize); @@ -3760,7 +3760,7 @@ static int stm32_wait(FAR struct usbhost_connection_s *conn, *hport = connport; leave_critical_section(flags); - uvdbg("RHport Connected: %s\n", connport->connected ? "YES" : "NO"); + uinfo("RHport Connected: %s\n", connport->connected ? "YES" : "NO"); return OK; } @@ -3777,7 +3777,7 @@ static int stm32_wait(FAR struct usbhost_connection_s *conn, *hport = connport; leave_critical_section(flags); - uvdbg("Hub port Connected: %s\n", connport->connected ? "YES" : "NO"); + uinfo("Hub port Connected: %s\n", connport->connected ? "YES" : "NO"); return OK; } #endif @@ -3897,7 +3897,7 @@ static int stm32_enumerate(FAR struct usbhost_connection_s *conn, /* Then let the common usbhost_enumerate do the real enumeration. */ - uvdbg("Enumerate the device\n"); + uinfo("Enumerate the device\n"); priv->smstate = SMSTATE_ENUM; ret = usbhost_enumerate(hport, &hport->devclass); @@ -4312,7 +4312,7 @@ static int stm32_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, DEBUGASSERT(priv != NULL && ep0info != NULL && req != NULL); usbhost_vtrace2(OTGHS_VTRACE2_CTRLIN, req->type, req->req); - uvdbg("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n", + uinfo("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n", req->type, req->req, req->value[1], req->value[0], req->index[1], req->index[0], req->len[1], req->len[0]); @@ -4397,7 +4397,7 @@ static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, DEBUGASSERT(priv != NULL && ep0info != NULL && req != NULL); usbhost_vtrace2(OTGHS_VTRACE2_CTRLOUT, req->type, req->req); - uvdbg("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n", + uinfo("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n", req->type, req->req, req->value[1], req->value[0], req->index[1], req->index[0], req->len[1], req->len[0]); @@ -4515,7 +4515,7 @@ static ssize_t stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep unsigned int chidx = (unsigned int)ep; ssize_t nbytes; - uvdbg("chidx: %d buflen: %d\n", (unsigned int)ep, buflen); + uinfo("chidx: %d buflen: %d\n", (unsigned int)ep, buflen); DEBUGASSERT(priv && buffer && chidx < STM32_MAX_TX_FIFOS && buflen > 0); @@ -4582,7 +4582,7 @@ static int stm32_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, unsigned int chidx = (unsigned int)ep; int ret; - uvdbg("chidx: %d buflen: %d\n", (unsigned int)ep, buflen); + uinfo("chidx: %d buflen: %d\n", (unsigned int)ep, buflen); DEBUGASSERT(priv && buffer && chidx < STM32_MAX_TX_FIFOS && buflen > 0); @@ -4632,7 +4632,7 @@ static int stm32_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) unsigned int chidx = (unsigned int)ep; irqstate_t flags; - uvdbg("chidx: %u: %d\n", chidx); + uinfo("chidx: %u: %d\n", chidx); DEBUGASSERT(priv && chidx < STM32_MAX_TX_FIFOS); chan = &priv->chan[chidx]; @@ -4727,7 +4727,7 @@ static int stm32_connect(FAR struct usbhost_driver_s *drvr, /* Set the connected/disconnected flag */ hport->connected = connected; - ullvdbg("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO"); + ullinfo("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO"); /* Report the connection event */ diff --git a/arch/arm/src/stm32/stm32_procfs_ccm.c b/arch/arm/src/stm32/stm32_procfs_ccm.c index 231f37dd9c..816f37977e 100644 --- a/arch/arm/src/stm32/stm32_procfs_ccm.c +++ b/arch/arm/src/stm32/stm32_procfs_ccm.c @@ -142,7 +142,7 @@ static int ccm_open(FAR struct file *filep, FAR const char *relpath, { FAR struct ccm_file_s *priv; - fvdbg("Open '%s'\n", relpath); + finfo("Open '%s'\n", relpath); /* PROCFS is read-only. Any attempt to open with any kind of write * access is not permitted. @@ -214,7 +214,7 @@ static ssize_t ccm_read(FAR struct file *filep, FAR char *buffer, struct mallinfo mem; off_t offset = filep->f_pos; - fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen); + finfo("buffer=%p buflen=%d\n", buffer, (int)buflen); /* Recover our private data from the struct file instance */ @@ -273,7 +273,7 @@ static int ccm_dup(FAR const struct file *oldp, FAR struct file *newp) FAR struct ccm_file_s *oldpriv; FAR struct ccm_file_s *newpriv; - fvdbg("Dup %p->%p\n", oldp, newp); + finfo("Dup %p->%p\n", oldp, newp); /* Recover our private data from the old struct file instance */ diff --git a/arch/arm/src/stm32/stm32_pwm.c b/arch/arm/src/stm32/stm32_pwm.c index be70eb8007..0af0465bff 100644 --- a/arch/arm/src/stm32/stm32_pwm.c +++ b/arch/arm/src/stm32/stm32_pwm.c @@ -125,19 +125,19 @@ # define pwmdbg dbg # define pwmlldbg lldbg # ifdef CONFIG_DEBUG_INFO -# define pwmvdbg vdbg -# define pwmllvdbg llvdbg +# define pwminfo info +# define pwmllinfo llinfo # define pwm_dumpgpio(p,m) stm32_dumpgpio(p,m) # else -# define pwmvdbg(x...) -# define pwmllvdbg(x...) +# define pwminfo(x...) +# define pwmllinfo(x...) # define pwm_dumpgpio(p,m) # endif #else # define pwmdbg(x...) # define pwmlldbg(x...) -# define pwmvdbg(x...) -# define pwmllvdbg(x...) +# define pwminfo(x...) +# define pwmllinfo(x...) # define pwm_dumpgpio(p,m) #endif @@ -972,23 +972,23 @@ static void pwm_putreg(struct stm32_pwmtimer_s *priv, int offset, uint16_t value #if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_INFO) static void pwm_dumpregs(struct stm32_pwmtimer_s *priv, FAR const char *msg) { - pwmvdbg("%s:\n", msg); - pwmvdbg(" CR1: %04x CR2: %04x SMCR: %04x DIER: %04x\n", + pwminfo("%s:\n", msg); + pwminfo(" CR1: %04x CR2: %04x SMCR: %04x DIER: %04x\n", pwm_getreg(priv, STM32_GTIM_CR1_OFFSET), pwm_getreg(priv, STM32_GTIM_CR2_OFFSET), pwm_getreg(priv, STM32_GTIM_SMCR_OFFSET), pwm_getreg(priv, STM32_GTIM_DIER_OFFSET)); - pwmvdbg(" SR: %04x EGR: %04x CCMR1: %04x CCMR2: %04x\n", + pwminfo(" SR: %04x EGR: %04x CCMR1: %04x CCMR2: %04x\n", pwm_getreg(priv, STM32_GTIM_SR_OFFSET), pwm_getreg(priv, STM32_GTIM_EGR_OFFSET), pwm_getreg(priv, STM32_GTIM_CCMR1_OFFSET), pwm_getreg(priv, STM32_GTIM_CCMR2_OFFSET)); - pwmvdbg(" CCER: %04x CNT: %04x PSC: %04x ARR: %04x\n", + pwminfo(" CCER: %04x CNT: %04x PSC: %04x ARR: %04x\n", pwm_getreg(priv, STM32_GTIM_CCER_OFFSET), pwm_getreg(priv, STM32_GTIM_CNT_OFFSET), pwm_getreg(priv, STM32_GTIM_PSC_OFFSET), pwm_getreg(priv, STM32_GTIM_ARR_OFFSET)); - pwmvdbg(" CCR1: %04x CCR2: %04x CCR3: %04x CCR4: %04x\n", + pwminfo(" CCR1: %04x CCR2: %04x CCR3: %04x CCR4: %04x\n", pwm_getreg(priv, STM32_GTIM_CCR1_OFFSET), pwm_getreg(priv, STM32_GTIM_CCR2_OFFSET), pwm_getreg(priv, STM32_GTIM_CCR3_OFFSET), @@ -996,7 +996,7 @@ static void pwm_dumpregs(struct stm32_pwmtimer_s *priv, FAR const char *msg) #if defined(CONFIG_STM32_TIM1_PWM) || defined(CONFIG_STM32_TIM8_PWM) if (priv->timtype == TIMTYPE_ADVANCED) { - pwmvdbg(" RCR: %04x BDTR: %04x DCR: %04x DMAR: %04x\n", + pwminfo(" RCR: %04x BDTR: %04x DCR: %04x DMAR: %04x\n", pwm_getreg(priv, STM32_ATIM_RCR_OFFSET), pwm_getreg(priv, STM32_ATIM_BDTR_OFFSET), pwm_getreg(priv, STM32_ATIM_DCR_OFFSET), @@ -1005,7 +1005,7 @@ static void pwm_dumpregs(struct stm32_pwmtimer_s *priv, FAR const char *msg) else #endif { - pwmvdbg(" DCR: %04x DMAR: %04x\n", + pwminfo(" DCR: %04x DMAR: %04x\n", pwm_getreg(priv, STM32_GTIM_DCR_OFFSET), pwm_getreg(priv, STM32_GTIM_DMAR_OFFSET)); } @@ -1068,14 +1068,14 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv, DEBUGASSERT(priv != NULL && info != NULL); #if defined(CONFIG_PWM_MULTICHAN) - pwmvdbg("TIM%u frequency: %u\n", + pwminfo("TIM%u frequency: %u\n", priv->timid, info->frequency); #elif defined(CONFIG_PWM_PULSECOUNT) - pwmvdbg("TIM%u channel: %u frequency: %u duty: %08x count: %u\n", + pwminfo("TIM%u channel: %u frequency: %u duty: %08x count: %u\n", priv->timid, priv->channels[0].channel, info->frequency, info->duty, info->count); #else - pwmvdbg("TIM%u channel: %u frequency: %u duty: %08x\n", + pwminfo("TIM%u channel: %u frequency: %u duty: %08x\n", priv->timid, priv->channels[0].channel, info->frequency, info->duty); #endif @@ -1146,7 +1146,7 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv, reload = 65535; } - pwmvdbg("TIM%u PCLK: %u frequency: %u TIMCLK: %u prescaler: %u reload: %u\n", + pwminfo("TIM%u PCLK: %u frequency: %u TIMCLK: %u prescaler: %u reload: %u\n", priv->timid, priv->pclk, info->frequency, timclk, prescaler, reload); /* Set up the timer CR1 register: @@ -1352,7 +1352,7 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv, ccr = b16toi(duty * reload + b16HALF); - pwmvdbg("ccr: %u\n", ccr); + pwminfo("ccr: %u\n", ccr); switch (mode) { @@ -1667,7 +1667,7 @@ static int pwm_update_duty(FAR struct stm32_pwmtimer_s *priv, uint8_t channel, DEBUGASSERT(priv != NULL); - pwmvdbg("TIM%u channel: %u duty: %08x\n", + pwminfo("TIM%u channel: %u duty: %08x\n", priv->timid, channel, duty); #ifndef CONFIG_PWM_MULTICHAN @@ -1686,7 +1686,7 @@ static int pwm_update_duty(FAR struct stm32_pwmtimer_s *priv, uint8_t channel, ccr = b16toi(duty * reload + b16HALF); - pwmvdbg("ccr: %u\n", ccr); + pwminfo("ccr: %u\n", ccr); switch (channel) { @@ -1795,7 +1795,7 @@ static int pwm_interrupt(struct stm32_pwmtimer_s *priv) /* Now all of the time critical stuff is done so we can do some debug output */ - pwmllvdbg("Update interrupt SR: %04x prev: %u curr: %u count: %u\n", + pwmllinfo("Update interrupt SR: %04x prev: %u curr: %u count: %u\n", regval, priv->prev, priv->curr, priv->count); return OK; @@ -2030,7 +2030,7 @@ static int pwm_setup(FAR struct pwm_lowerhalf_s *dev) uint32_t pincfg; int i; - pwmvdbg("TIM%u\n", priv->timid); + pwminfo("TIM%u\n", priv->timid); pwm_dumpregs(priv, "Initially"); /* Enable APB1/2 clocking for timer. */ @@ -2047,7 +2047,7 @@ static int pwm_setup(FAR struct pwm_lowerhalf_s *dev) continue; } - pwmvdbg("pincfg: %08x\n", pincfg); + pwminfo("pincfg: %08x\n", pincfg); stm32_configgpio(pincfg); pwm_dumpgpio(pincfg, "PWM setup"); @@ -2078,7 +2078,7 @@ static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev) uint32_t pincfg; int i; - pwmvdbg("TIM%u\n", priv->timid); + pwminfo("TIM%u\n", priv->timid); /* Make sure that the output has been stopped */ @@ -2098,7 +2098,7 @@ static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev) continue; } - pwmvdbg("pincfg: %08x\n", pincfg); + pwminfo("pincfg: %08x\n", pincfg); pincfg &= (GPIO_PORT_MASK | GPIO_PIN_MASK); @@ -2233,7 +2233,7 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev) uint32_t regval; irqstate_t flags; - pwmvdbg("TIM%u\n", priv->timid); + pwminfo("TIM%u\n", priv->timid); /* Disable interrupts momentary to stop any ongoing timer processing and * to prevent any concurrent access to the reset register. @@ -2360,7 +2360,7 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev) putreg32(regval, regaddr); leave_critical_section(flags); - pwmvdbg("regaddr: %08x resetbit: %08x\n", regaddr, resetbit); + pwminfo("regaddr: %08x resetbit: %08x\n", regaddr, resetbit); pwm_dumpregs(priv, "After stop"); return OK; } @@ -2388,7 +2388,7 @@ static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg /* There are no platform-specific ioctl commands */ - pwmvdbg("TIM%u\n", priv->timid); + pwminfo("TIM%u\n", priv->timid); #endif return -ENOTTY; } @@ -2418,7 +2418,7 @@ FAR struct pwm_lowerhalf_s *stm32_pwminitialize(int timer) { FAR struct stm32_pwmtimer_s *lower; - pwmvdbg("TIM%u\n", timer); + pwminfo("TIM%u\n", timer); switch (timer) { diff --git a/arch/arm/src/stm32/stm32_qencoder.c b/arch/arm/src/stm32/stm32_qencoder.c index 1d554be642..4b438a7e72 100644 --- a/arch/arm/src/stm32/stm32_qencoder.c +++ b/arch/arm/src/stm32/stm32_qencoder.c @@ -634,23 +634,23 @@ static void stm32_putreg32(FAR struct stm32_lowerhalf_s *priv, int offset, uint3 #if defined(CONFIG_DEBUG_SENSORS) && defined(CONFIG_DEBUG_INFO) static void stm32_dumpregs(FAR struct stm32_lowerhalf_s *priv, FAR const char *msg) { - snvdbg("%s:\n", msg); - snvdbg(" CR1: %04x CR2: %04x SMCR: %04x DIER: %04x\n", + sninfo("%s:\n", msg); + sninfo(" CR1: %04x CR2: %04x SMCR: %04x DIER: %04x\n", stm32_getreg16(priv, STM32_GTIM_CR1_OFFSET), stm32_getreg16(priv, STM32_GTIM_CR2_OFFSET), stm32_getreg16(priv, STM32_GTIM_SMCR_OFFSET), stm32_getreg16(priv, STM32_GTIM_DIER_OFFSET)); - snvdbg(" SR: %04x EGR: %04x CCMR1: %04x CCMR2: %04x\n", + sninfo(" SR: %04x EGR: %04x CCMR1: %04x CCMR2: %04x\n", stm32_getreg16(priv, STM32_GTIM_SR_OFFSET), stm32_getreg16(priv, STM32_GTIM_EGR_OFFSET), stm32_getreg16(priv, STM32_GTIM_CCMR1_OFFSET), stm32_getreg16(priv, STM32_GTIM_CCMR2_OFFSET)); - snvdbg(" CCER: %04x CNT: %04x PSC: %04x ARR: %04x\n", + sninfo(" CCER: %04x CNT: %04x PSC: %04x ARR: %04x\n", stm32_getreg16(priv, STM32_GTIM_CCER_OFFSET), stm32_getreg16(priv, STM32_GTIM_CNT_OFFSET), stm32_getreg16(priv, STM32_GTIM_PSC_OFFSET), stm32_getreg16(priv, STM32_GTIM_ARR_OFFSET)); - snvdbg(" CCR1: %04x CCR2: %04x CCR3: %04x CCR4: %04x\n", + sninfo(" CCR1: %04x CCR2: %04x CCR3: %04x CCR4: %04x\n", stm32_getreg16(priv, STM32_GTIM_CCR1_OFFSET), stm32_getreg16(priv, STM32_GTIM_CCR2_OFFSET), stm32_getreg16(priv, STM32_GTIM_CCR3_OFFSET), @@ -658,7 +658,7 @@ static void stm32_dumpregs(FAR struct stm32_lowerhalf_s *priv, FAR const char *m #if defined(CONFIG_STM32_TIM1_QE) || defined(CONFIG_STM32_TIM8_QE) if (priv->config->timid == 1 || priv->config->timid == 8) { - snvdbg(" RCR: %04x BDTR: %04x DCR: %04x DMAR: %04x\n", + sninfo(" RCR: %04x BDTR: %04x DCR: %04x DMAR: %04x\n", stm32_getreg16(priv, STM32_ATIM_RCR_OFFSET), stm32_getreg16(priv, STM32_ATIM_BDTR_OFFSET), stm32_getreg16(priv, STM32_ATIM_DCR_OFFSET), @@ -667,7 +667,7 @@ static void stm32_dumpregs(FAR struct stm32_lowerhalf_s *priv, FAR const char *m else #endif { - snvdbg(" DCR: %04x DMAR: %04x\n", + sninfo(" DCR: %04x DMAR: %04x\n", stm32_getreg16(priv, STM32_GTIM_DCR_OFFSET), stm32_getreg16(priv, STM32_GTIM_DMAR_OFFSET)); } @@ -1125,7 +1125,7 @@ static int stm32_shutdown(FAR struct qe_lowerhalf_s *lower) putreg32(regval, regaddr); leave_critical_section(flags); - snvdbg("regaddr: %08x resetbit: %08x\n", regaddr, resetbit); + sninfo("regaddr: %08x resetbit: %08x\n", regaddr, resetbit); stm32_dumpregs(priv, "After stop"); /* Put the TI1 GPIO pin back to its default state */ @@ -1203,7 +1203,7 @@ static int stm32_reset(FAR struct qe_lowerhalf_s *lower) #ifdef HAVE_16BIT_TIMERS irqstate_t flags; - snvdbg("Resetting position to zero\n"); + sninfo("Resetting position to zero\n"); DEBUGASSERT(lower && priv->inuse); /* Reset the timer and the counter. Interrupts are disabled to make this atomic @@ -1215,7 +1215,7 @@ static int stm32_reset(FAR struct qe_lowerhalf_s *lower) priv->position = 0; leave_critical_section(flags); #else - snvdbg("Resetting position to zero\n"); + sninfo("Resetting position to zero\n"); DEBUGASSERT(lower && priv->inuse); /* Reset the counter to zero */ diff --git a/arch/arm/src/stm32/stm32_rng.c b/arch/arm/src/stm32/stm32_rng.c index 5726f43ef9..11477eb893 100644 --- a/arch/arm/src/stm32/stm32_rng.c +++ b/arch/arm/src/stm32/stm32_rng.c @@ -102,7 +102,7 @@ static int stm32_rnginitialize() { uint32_t regval; - vdbg("Initializing RNG\n"); + info("Initializing RNG\n"); memset(&g_rngdev, 0, sizeof(struct rng_dev_s)); @@ -112,7 +112,7 @@ static int stm32_rnginitialize() { /* We could not attach the ISR to the interrupt */ - vdbg("Could not attach IRQ.\n"); + info("Could not attach IRQ.\n"); return -EAGAIN; } diff --git a/arch/arm/src/stm32/stm32_rtcc.c b/arch/arm/src/stm32/stm32_rtcc.c index 7d403ba504..3b0877775a 100644 --- a/arch/arm/src/stm32/stm32_rtcc.c +++ b/arch/arm/src/stm32/stm32_rtcc.c @@ -127,14 +127,14 @@ #ifdef CONFIG_DEBUG_RTC # define rtcdbg dbg -# define rtcvdbg vdbg +# define rtcinfo info # define rtclldbg lldbg -# define rtcllvdbg llvdbg +# define rtcllinfo llinfo #else # define rtcdbg(x...) -# define rtcvdbg(x...) +# define rtcinfo(x...) # define rtclldbg(x...) -# define rtcllvdbg(x...) +# define rtcllinfo(x...) #endif /************************************************************************************ diff --git a/arch/arm/src/stm32/stm32_sdio.c b/arch/arm/src/stm32/stm32_sdio.c index 386eddefeb..7244877af6 100644 --- a/arch/arm/src/stm32/stm32_sdio.c +++ b/arch/arm/src/stm32/stm32_sdio.c @@ -596,7 +596,7 @@ static inline void stm32_setclkcr(uint32_t clkcr) regval |= clkcr; putreg32(regval, STM32_SDIO_CLKCR); - fvdbg("CLKCR: %08x PWR: %08x\n", + finfo("CLKCR: %08x PWR: %08x\n", getreg32(STM32_SDIO_CLKCR), getreg32(STM32_SDIO_POWER)); } @@ -1582,7 +1582,7 @@ static void stm32_reset(FAR struct sdio_dev_s *dev) stm32_setpwrctrl(SDIO_POWER_PWRCTRL_ON); leave_critical_section(flags); - fvdbg("CLCKR: %08x POWER: %08x\n", + finfo("CLCKR: %08x POWER: %08x\n", getreg32(STM32_SDIO_CLKCR), getreg32(STM32_SDIO_POWER)); } @@ -1795,7 +1795,7 @@ static int stm32_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg) cmdidx = (cmd & MMCSD_CMDIDX_MASK) >> MMCSD_CMDIDX_SHIFT; regval |= cmdidx | SDIO_CMD_CPSMEN; - fvdbg("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval); + finfo("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval); /* Write the SDIO CMD */ @@ -2471,7 +2471,7 @@ static void stm32_callbackenable(FAR struct sdio_dev_s *dev, { struct stm32_dev_s *priv = (struct stm32_dev_s *)dev; - fvdbg("eventset: %02x\n", eventset); + finfo("eventset: %02x\n", eventset); DEBUGASSERT(priv != NULL); priv->cbevents = eventset; @@ -2507,7 +2507,7 @@ static int stm32_registercallback(FAR struct sdio_dev_s *dev, /* Disable callbacks and register this callback and is argument */ - fvdbg("Register %p(%p)\n", callback, arg); + finfo("Register %p(%p)\n", callback, arg); DEBUGASSERT(priv != NULL); priv->cbevents = 0; @@ -2743,7 +2743,7 @@ static void stm32_callback(void *arg) /* Is a callback registered? */ DEBUGASSERT(priv != NULL); - fvdbg("Callback %p(%p) cbevents: %02x cdstatus: %02x\n", + finfo("Callback %p(%p) cbevents: %02x cdstatus: %02x\n", priv->callback, priv->cbarg, priv->cbevents, priv->cdstatus); if (priv->callback) @@ -2788,14 +2788,14 @@ static void stm32_callback(void *arg) { /* Yes.. queue it */ - fvdbg("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); + finfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); (void)work_queue(HPWORK, &priv->cbwork, (worker_t)priv->callback, priv->cbarg, 0); } else { /* No.. then just call the callback here */ - fvdbg("Callback to %p(%p)\n", priv->callback, priv->cbarg); + finfo("Callback to %p(%p)\n", priv->callback, priv->cbarg); priv->callback(priv->cbarg); } } @@ -2925,7 +2925,7 @@ void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot) leave_critical_section(flags); - fvdbg("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus); + finfo("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus); /* Perform any requested callback if the status has changed */ @@ -2967,7 +2967,7 @@ void sdio_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect) { priv->cdstatus &= ~SDIO_STATUS_WRPROTECTED; } - fvdbg("cdstatus: %02x\n", priv->cdstatus); + finfo("cdstatus: %02x\n", priv->cdstatus); leave_critical_section(flags); } #endif /* CONFIG_STM32_SDIO */ diff --git a/arch/arm/src/stm32/stm32_spi.c b/arch/arm/src/stm32/stm32_spi.c index 86d99da736..6c3f7eea90 100644 --- a/arch/arm/src/stm32/stm32_spi.c +++ b/arch/arm/src/stm32/stm32_spi.c @@ -167,13 +167,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ @@ -1052,7 +1052,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency) * faster. */ - spivdbg("Frequency %d->%d\n", frequency, actual); + spiinfo("Frequency %d->%d\n", frequency, actual); priv->frequency = frequency; priv->actual = actual; @@ -1082,7 +1082,7 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) uint16_t setbits; uint16_t clrbits; - spivdbg("mode=%d\n", mode); + spiinfo("mode=%d\n", mode); /* Has the mode changed? */ @@ -1147,7 +1147,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) uint16_t setbits; uint16_t clrbits; - spivdbg("nbits=%d\n", nbits); + spiinfo("nbits=%d\n", nbits); /* Has the number of bits changed? */ @@ -1222,7 +1222,7 @@ static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t wd) regval = spi_getreg(priv, STM32_SPI_SR_OFFSET); - spivdbg("Sent: %04x Return: %04x Status: %02x\n", wd, ret, regval); + spiinfo("Sent: %04x Return: %04x Status: %02x\n", wd, ret, regval); UNUSED(regval); return ret; @@ -1260,7 +1260,7 @@ static void spi_exchange_nodma(FAR struct spi_dev_s *dev, FAR const void *txbuff FAR struct stm32_spidev_s *priv = (FAR struct stm32_spidev_s *)dev; DEBUGASSERT(priv && priv->spibase); - spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); + spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); /* 8- or 16-bit mode? */ @@ -1373,7 +1373,7 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, static uint16_t rxdummy = 0xffff; static const uint16_t txdummy = 0xffff; - spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); + spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); DEBUGASSERT(priv && priv->spibase); /* Setup DMAs */ @@ -1416,7 +1416,7 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, #ifndef CONFIG_SPI_EXCHANGE static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *txbuffer, size_t nwords) { - spivdbg("txbuffer=%p nwords=%d\n", txbuffer, nwords); + spiinfo("txbuffer=%p nwords=%d\n", txbuffer, nwords); return spi_exchange(dev, txbuffer, NULL, nwords); } #endif @@ -1443,7 +1443,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *txbuffer, si #ifndef CONFIG_SPI_EXCHANGE static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *rxbuffer, size_t nwords) { - spivdbg("rxbuffer=%p nwords=%d\n", rxbuffer, nwords); + spiinfo("rxbuffer=%p nwords=%d\n", rxbuffer, nwords); return spi_exchange(dev, NULL, rxbuffer, nwords); } #endif diff --git a/arch/arm/src/stm32/stm32_usbdev.c b/arch/arm/src/stm32/stm32_usbdev.c index 27f75be899..5f352dc26c 100644 --- a/arch/arm/src/stm32/stm32_usbdev.c +++ b/arch/arm/src/stm32/stm32_usbdev.c @@ -1367,7 +1367,7 @@ static int stm32_wrrequest(struct stm32_usbdev_s *priv, struct stm32_ep_s *prive } epno = USB_EPNO(privep->ep.eplog); - ullvdbg("epno=%d req=%p: len=%d xfrd=%d nullpkt=%d\n", + ullinfo("epno=%d req=%p: len=%d xfrd=%d nullpkt=%d\n", epno, privreq, privreq->req.len, privreq->req.xfrd, privep->txnullpkt); UNUSED(epno); @@ -1458,7 +1458,7 @@ static inline int stm32_ep0_rdrequest(struct stm32_usbdev_s *priv) pmalen = stm32_geteprxcount(EP0); - ullvdbg("EP0: pmalen=%d\n", pmalen); + ullinfo("EP0: pmalen=%d\n", pmalen); usbtrace(TRACE_READ(EP0), pmalen); /* Read the data into our special buffer for SETUP data */ @@ -1510,7 +1510,7 @@ static int stm32_rdrequest(struct stm32_usbdev_s *priv, struct stm32_ep_s *prive return -ENOENT; } - ullvdbg("EP%d: len=%d xfrd=%d\n", epno, privreq->req.len, privreq->req.xfrd); + ullinfo("EP%d: len=%d xfrd=%d\n", epno, privreq->req.len, privreq->req.xfrd); /* Ignore any attempt to receive a zero length packet */ @@ -1768,7 +1768,7 @@ static void stm32_ep0setup(struct stm32_usbdev_s *priv) index.w = GETUINT16(priv->ctrl.index); len.w = GETUINT16(priv->ctrl.len); - ullvdbg("SETUP: type=%02x req=%02x value=%04x index=%04x len=%04x\n", + ullinfo("SETUP: type=%02x req=%02x value=%04x index=%04x len=%04x\n", priv->ctrl.type, priv->ctrl.req, value.w, index.w, len.w); /* Is this an setup with OUT and data of length > 0 */ @@ -1959,7 +1959,7 @@ static void stm32_ep0setup(struct stm32_usbdev_s *priv) { /* Special case recipient=device test mode */ - ullvdbg("test mode: %d\n", index.w); + ullinfo("test mode: %d\n", index.w); } else if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) != USB_REQ_RECIPIENT_ENDPOINT) { diff --git a/arch/arm/src/stm32/stm32_wwdg.c b/arch/arm/src/stm32/stm32_wwdg.c index 5cab6ce92b..dd20476f57 100644 --- a/arch/arm/src/stm32/stm32_wwdg.c +++ b/arch/arm/src/stm32/stm32_wwdg.c @@ -89,10 +89,10 @@ #ifdef CONFIG_DEBUG_WATCHDOG # define wddbg lldbg -# define wdvdbg llvdbg +# define wdinfo llinfo #else # define wddbg(x...) -# define wdvdbg(x...) +# define wdinfo(x...) #endif /**************************************************************************** @@ -348,7 +348,7 @@ static int stm32_start(FAR struct watchdog_lowerhalf_s *lower) { FAR struct stm32_lowerhalf_s *priv = (FAR struct stm32_lowerhalf_s *)lower; - wdvdbg("Entry\n"); + wdinfo("Entry\n"); DEBUGASSERT(priv); /* The watchdog is always disabled after a reset. It is enabled by setting @@ -383,7 +383,7 @@ static int stm32_stop(FAR struct watchdog_lowerhalf_s *lower) * except by a reset. */ - wdvdbg("Entry\n"); + wdinfo("Entry\n"); return -ENOSYS; } @@ -414,7 +414,7 @@ static int stm32_keepalive(FAR struct watchdog_lowerhalf_s *lower) { FAR struct stm32_lowerhalf_s *priv = (FAR struct stm32_lowerhalf_s *)lower; - wdvdbg("Entry\n"); + wdinfo("Entry\n"); DEBUGASSERT(priv); /* Write to T[6:0] bits to configure the counter value, no need to do @@ -448,7 +448,7 @@ static int stm32_getstatus(FAR struct watchdog_lowerhalf_s *lower, uint32_t elapsed; uint16_t reload; - wdvdbg("Entry\n"); + wdinfo("Entry\n"); DEBUGASSERT(priv); /* Return the status bit */ @@ -474,10 +474,10 @@ static int stm32_getstatus(FAR struct watchdog_lowerhalf_s *lower, elapsed = priv->reload - reload; status->timeleft = (priv->timeout * elapsed) / (priv->reload + 1); - wdvdbg("Status :\n"); - wdvdbg(" flags : %08x\n", status->flags); - wdvdbg(" timeout : %d\n", status->timeout); - wdvdbg(" timeleft : %d\n", status->flags); + wdinfo("Status :\n"); + wdinfo(" flags : %08x\n", status->flags); + wdinfo(" timeout : %d\n", status->timeout); + wdinfo(" timeleft : %d\n", status->flags); return OK; } @@ -507,7 +507,7 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower, int wdgtb; DEBUGASSERT(priv); - wdvdbg("Entry: timeout=%d\n", timeout); + wdinfo("Entry: timeout=%d\n", timeout); /* Can this timeout be represented? */ @@ -562,7 +562,7 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower, */ #if 0 - wdvdbg("wdgtb=%d fwwdg=%d reload=%d timout=%d\n", + wdinfo("wdgtb=%d fwwdg=%d reload=%d timout=%d\n", wdgtb, fwwdg, reload, 1000 * (reload + 1) / fwwdg); #endif if (reload <= WWDG_CR_T_MAX || wdgtb == 3) @@ -595,7 +595,7 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower, priv->fwwdg = fwwdg; priv->reload = reload; - wdvdbg("wdgtb=%d fwwdg=%d reload=%d timout=%d\n", + wdinfo("wdgtb=%d fwwdg=%d reload=%d timout=%d\n", wdgtb, fwwdg, reload, priv->timeout); /* Set WDGTB[1:0] bits according to calculated value */ @@ -644,7 +644,7 @@ static xcpt_t stm32_capture(FAR struct watchdog_lowerhalf_s *lower, uint16_t regval; DEBUGASSERT(priv); - wdvdbg("Entry: handler=%p\n", handler); + wdinfo("Entry: handler=%p\n", handler); /* Get the old handler return value */ @@ -708,7 +708,7 @@ static int stm32_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd, int ret = -ENOTTY; DEBUGASSERT(priv); - wdvdbg("Entry: cmd=%d arg=%ld\n", cmd, arg); + wdinfo("Entry: cmd=%d arg=%ld\n", cmd, arg); /* WDIOC_MINTIME: Set the minimum ping time. If two keepalive ioctls * are received within this time, a reset event will be generated. @@ -761,7 +761,7 @@ void stm32_wwdginitialize(FAR const char *devpath) { FAR struct stm32_lowerhalf_s *priv = &g_wdgdev; - wdvdbg("Entry: devpath=%s\n", devpath); + wdinfo("Entry: devpath=%s\n", devpath); /* NOTE we assume that clocking to the IWDG has already been provided by * the RCC initialization logic. diff --git a/arch/arm/src/stm32/stm32f30xxx_i2c.c b/arch/arm/src/stm32/stm32f30xxx_i2c.c index 15b0cb63bb..643ca1ecd8 100644 --- a/arch/arm/src/stm32/stm32f30xxx_i2c.c +++ b/arch/arm/src/stm32/stm32f30xxx_i2c.c @@ -158,10 +158,10 @@ #ifdef CONFIG_DEBUG_I2C # define i2cdbg dbg -# define i2cvdbg vdbg +# define i2cinfo info #else # define i2cdbg(x...) -# define i2cvdbg(x...) +# define i2cinfo(x...) #endif /* I2C event trace logic. NOTE: trace uses the internal, non-standard, low-level @@ -727,7 +727,7 @@ static inline int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv) while (priv->intstate != INTSTATE_DONE && elapsed < timeout); - i2cvdbg("intstate: %d elapsed: %ld threshold: %ld status: %08x\n", + i2cinfo("intstate: %d elapsed: %ld threshold: %ld status: %08x\n", priv->intstate, (long)elapsed, (long)timeout, priv->status); /* Set the interrupt state back to IDLE */ @@ -881,7 +881,7 @@ static inline void stm32_i2c_sem_waitstop(FAR struct stm32_i2c_priv_s *priv) * still pending. */ - i2cvdbg("Timeout with CR: %04x SR: %04x\n", cr, sr); + i2cinfo("Timeout with CR: %04x SR: %04x\n", cr, sr); } /************************************************************************************ diff --git a/arch/arm/src/stm32/stm32f40xxx_dma.c b/arch/arm/src/stm32/stm32f40xxx_dma.c index 41d2436859..0ca3bc31ce 100644 --- a/arch/arm/src/stm32/stm32f40xxx_dma.c +++ b/arch/arm/src/stm32/stm32f40xxx_dma.c @@ -869,7 +869,7 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr) uint32_t transfer_size, burst_length; uint32_t mend; - dmavdbg("stm32_dmacapable: 0x%08x/%u 0x%08x\n", maddr, count, ccr); + dmainfo("stm32_dmacapable: 0x%08x/%u 0x%08x\n", maddr, count, ccr); /* Verify that the address conforms to the memory transfer size. * Transfers to/from memory performed by the DMA controller are @@ -899,13 +899,13 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr) break; default: - dmavdbg("stm32_dmacapable: bad transfer size in CCR\n"); + dmainfo("stm32_dmacapable: bad transfer size in CCR\n"); return false; } if ((maddr & (transfer_size - 1)) != 0) { - dmavdbg("stm32_dmacapable: transfer unaligned\n"); + dmainfo("stm32_dmacapable: transfer unaligned\n"); return false; } @@ -937,13 +937,13 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr) break; default: - dmavdbg("stm32_dmacapable: bad burst size in CCR\n"); + dmainfo("stm32_dmacapable: bad burst size in CCR\n"); return false; } if ((maddr & (burst_length - 1)) != 0) { - dmavdbg("stm32_dmacapable: burst crosses 1KiB\n"); + dmainfo("stm32_dmacapable: burst crosses 1KiB\n"); return false; } } @@ -952,7 +952,7 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr) if ((maddr & STM32_REGION_MASK) != (mend & STM32_REGION_MASK)) { - dmavdbg("stm32_dmacapable: transfer crosses memory region\n"); + dmainfo("stm32_dmacapable: transfer crosses memory region\n"); return false; } @@ -973,7 +973,7 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr) if (maddr >= STM32_CCMRAM_BASE && (maddr - STM32_CCMRAM_BASE) < 65536) { - dmavdbg("stm32_dmacapable: transfer targets CCMRAM\n"); + dmainfo("stm32_dmacapable: transfer targets CCMRAM\n"); return false; } break; @@ -981,11 +981,11 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr) default: /* Everything else is unsupported by DMA */ - dmavdbg("stm32_dmacapable: transfer targets unknown/unsupported region\n"); + dmainfo("stm32_dmacapable: transfer targets unknown/unsupported region\n"); return false; } - dmavdbg("stm32_dmacapable: transfer OK\n"); + dmainfo("stm32_dmacapable: transfer OK\n"); return true; } #endif diff --git a/arch/arm/src/stm32/stm32f40xxx_rtcc.c b/arch/arm/src/stm32/stm32f40xxx_rtcc.c index d89134fd46..0f79fc1709 100644 --- a/arch/arm/src/stm32/stm32f40xxx_rtcc.c +++ b/arch/arm/src/stm32/stm32f40xxx_rtcc.c @@ -135,14 +135,14 @@ #ifdef CONFIG_DEBUG_RTC # define rtcdbg dbg -# define rtcvdbg vdbg +# define rtcinfo info # define rtclldbg lldbg -# define rtcllvdbg llvdbg +# define rtcllinfo llinfo #else # define rtcdbg(x...) -# define rtcvdbg(x...) +# define rtcinfo(x...) # define rtclldbg(x...) -# define rtcllvdbg(x...) +# define rtcllinfo(x...) #endif /************************************************************************************ @@ -792,7 +792,7 @@ static int rtchw_set_alrmar(rtc_alarmreg_t alarmreg) /* Set the RTC Alarm register */ putreg32(alarmreg, STM32_RTC_ALRMAR); - rtcvdbg(" TR: %08x ALRMAR: %08x\n", + rtcinfo(" TR: %08x ALRMAR: %08x\n", getreg32(STM32_RTC_TR), getreg32(STM32_RTC_ALRMAR)); /* Enable RTC alarm */ @@ -829,7 +829,7 @@ static int rtchw_set_alrmbr(rtc_alarmreg_t alarmreg) /* Set the RTC Alarm register */ putreg32(alarmreg, STM32_RTC_ALRMBR); - rtcvdbg(" TR: %08x ALRMBR: %08x\n", + rtcinfo(" TR: %08x ALRMBR: %08x\n", getreg32(STM32_RTC_TR), getreg32(STM32_RTC_ALRMBR)); /* Enable RTC alarm B */ @@ -1409,7 +1409,7 @@ int stm32_rtc_setalarm(FAR struct alm_setalarm_s *alminfo) #endif default: - rtcvdbg("ERROR: Invalid ALARM%d\n", alminfo->as_id); + rtcinfo("ERROR: Invalid ALARM%d\n", alminfo->as_id); break; } @@ -1507,7 +1507,7 @@ int stm32_rtc_cancelalarm(enum alm_id_e alarmid) #endif default: - rtcvdbg("ERROR: Invalid ALARM%d\n", alarmid); + rtcinfo("ERROR: Invalid ALARM%d\n", alarmid); break; } diff --git a/arch/arm/src/stm32f7/stm32_dma.c b/arch/arm/src/stm32f7/stm32_dma.c index eab3412fbe..1b7f821d33 100644 --- a/arch/arm/src/stm32f7/stm32_dma.c +++ b/arch/arm/src/stm32f7/stm32_dma.c @@ -871,7 +871,7 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr) uint32_t transfer_size, burst_length; uint32_t mend; - dmavdbg("stm32_dmacapable: 0x%08x/%u 0x%08x\n", maddr, count, ccr); + dmainfo("stm32_dmacapable: 0x%08x/%u 0x%08x\n", maddr, count, ccr); /* Verify that the address conforms to the memory transfer size. * Transfers to/from memory performed by the DMA controller are @@ -901,13 +901,13 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr) break; default: - dmavdbg("stm32_dmacapable: bad transfer size in CCR\n"); + dmainfo("stm32_dmacapable: bad transfer size in CCR\n"); return false; } if ((maddr & (transfer_size - 1)) != 0) { - dmavdbg("stm32_dmacapable: transfer unaligned\n"); + dmainfo("stm32_dmacapable: transfer unaligned\n"); return false; } @@ -939,13 +939,13 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr) break; default: - dmavdbg("stm32_dmacapable: bad burst size in CCR\n"); + dmainfo("stm32_dmacapable: bad burst size in CCR\n"); return false; } if ((maddr & (burst_length - 1)) != 0) { - dmavdbg("stm32_dmacapable: burst crosses 1KiB\n"); + dmainfo("stm32_dmacapable: burst crosses 1KiB\n"); return false; } } @@ -954,7 +954,7 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr) if ((maddr & STM32_REGION_MASK) != (mend & STM32_REGION_MASK)) { - dmavdbg("stm32_dmacapable: transfer crosses memory region\n"); + dmainfo("stm32_dmacapable: transfer crosses memory region\n"); return false; } @@ -975,7 +975,7 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr) if (maddr >= STM32_CCMRAM_BASE && (maddr - STM32_CCMRAM_BASE) < 65536) { - dmavdbg("stm32_dmacapable: transfer targets CCMRAM\n"); + dmainfo("stm32_dmacapable: transfer targets CCMRAM\n"); return false; } break; @@ -983,11 +983,11 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr) default: /* Everything else is unsupported by DMA */ - dmavdbg("stm32_dmacapable: transfer targets unknown/unsupported region\n"); + dmainfo("stm32_dmacapable: transfer targets unknown/unsupported region\n"); return false; } - dmavdbg("stm32_dmacapable: transfer OK\n"); + dmainfo("stm32_dmacapable: transfer OK\n"); return true; } #endif diff --git a/arch/arm/src/stm32f7/stm32_ethernet.c b/arch/arm/src/stm32f7/stm32_ethernet.c index 4e6664ade1..1123d0b0a9 100644 --- a/arch/arm/src/stm32f7/stm32_ethernet.c +++ b/arch/arm/src/stm32f7/stm32_ethernet.c @@ -1060,7 +1060,7 @@ static int stm32_transmit(struct stm32_ethmac_s *priv) txdesc = priv->txhead; txfirst = txdesc; - nllvdbg("d_len: %d d_buf: %p txhead: %p tdes0: %08x\n", + nllinfo("d_len: %d d_buf: %p txhead: %p tdes0: %08x\n", priv->dev.d_len, priv->dev.d_buf, txdesc, txdesc->tdes0); DEBUGASSERT(txdesc && (txdesc->tdes0 & ETH_TDES0_OWN) == 0); @@ -1082,7 +1082,7 @@ static int stm32_transmit(struct stm32_ethmac_s *priv) bufcount = (priv->dev.d_len + (ALIGNED_BUFSIZE-1)) / ALIGNED_BUFSIZE; lastsize = priv->dev.d_len - (bufcount - 1) * ALIGNED_BUFSIZE; - nllvdbg("bufcount: %d lastsize: %d\n", bufcount, lastsize); + nllinfo("bufcount: %d lastsize: %d\n", bufcount, lastsize); /* Set the first segment bit in the first TX descriptor */ @@ -1209,7 +1209,7 @@ static int stm32_transmit(struct stm32_ethmac_s *priv) priv->inflight++; - nllvdbg("txhead: %p txtail: %p inflight: %d\n", + nllinfo("txhead: %p txtail: %p inflight: %d\n", priv->txhead, priv->txtail, priv->inflight); /* If all TX descriptors are in-flight, then we have to disable receive interrupts @@ -1508,7 +1508,7 @@ static void stm32_freesegment(struct stm32_ethmac_s *priv, struct eth_rxdesc_s *rxdesc; int i; - nllvdbg("rxfirst: %p segments: %d\n", rxfirst, segments); + nllinfo("rxfirst: %p segments: %d\n", rxfirst, segments); /* Give the freed RX buffers back to the Ethernet MAC to be refilled */ @@ -1580,7 +1580,7 @@ static int stm32_recvframe(struct stm32_ethmac_s *priv) uint8_t *buffer; int i; - nllvdbg("rxhead: %p rxcurr: %p segments: %d\n", + nllinfo("rxhead: %p rxcurr: %p segments: %d\n", priv->rxhead, priv->rxcurr, priv->segments); /* Check if there are free buffers. We cannot receive new frames in this @@ -1652,7 +1652,7 @@ static int stm32_recvframe(struct stm32_ethmac_s *priv) rxcurr = priv->rxcurr; } - nllvdbg("rxhead: %p rxcurr: %p segments: %d\n", + nllinfo("rxhead: %p rxcurr: %p segments: %d\n", priv->rxhead, priv->rxcurr, priv->segments); /* Check if any errors are reported in the frame */ @@ -1705,7 +1705,7 @@ static int stm32_recvframe(struct stm32_ethmac_s *priv) arch_invalidate_dcache((uintptr_t)dev->d_buf, (uintptr_t)dev->d_buf + dev->d_len); - nllvdbg("rxhead: %p d_buf: %p d_len: %d\n", + nllinfo("rxhead: %p d_buf: %p d_len: %d\n", priv->rxhead, dev->d_buf, dev->d_len); /* Return success */ @@ -1739,7 +1739,7 @@ static int stm32_recvframe(struct stm32_ethmac_s *priv) priv->rxhead = rxdesc; - nllvdbg("rxhead: %p rxcurr: %p segments: %d\n", + nllinfo("rxhead: %p rxcurr: %p segments: %d\n", priv->rxhead, priv->rxcurr, priv->segments); return -EAGAIN; @@ -1799,7 +1799,7 @@ static void stm32_receive(struct stm32_ethmac_s *priv) #ifdef CONFIG_NET_IPv4 if (BUF->type == HTONS(ETHTYPE_IP)) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); /* Handle ARP on input then give the IPv4 packet to the network * layer @@ -1839,7 +1839,7 @@ static void stm32_receive(struct stm32_ethmac_s *priv) #ifdef CONFIG_NET_IPv6 if (BUF->type == HTONS(ETHTYPE_IP6)) { - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); /* Give the IPv6 packet to the network layer */ @@ -1876,7 +1876,7 @@ static void stm32_receive(struct stm32_ethmac_s *priv) #ifdef CONFIG_NET_ARP if (BUF->type == htons(ETHTYPE_ARP)) { - nllvdbg("ARP frame\n"); + nllinfo("ARP frame\n"); /* Handle ARP packet */ @@ -1935,7 +1935,7 @@ static void stm32_freeframe(struct stm32_ethmac_s *priv) struct eth_txdesc_s *txdesc; int i; - nllvdbg("txhead: %p txtail: %p inflight: %d\n", + nllinfo("txhead: %p txtail: %p inflight: %d\n", priv->txhead, priv->txtail, priv->inflight); /* Scan for "in-flight" descriptors owned by the CPU */ @@ -1956,7 +1956,7 @@ static void stm32_freeframe(struct stm32_ethmac_s *priv) * TX descriptors. */ - nllvdbg("txtail: %p tdes0: %08x tdes2: %08x tdes3: %08x\n", + nllinfo("txtail: %p tdes0: %08x tdes2: %08x tdes3: %08x\n", txdesc, txdesc->tdes0, txdesc->tdes2, txdesc->tdes3); DEBUGASSERT(txdesc->tdes2 != 0); @@ -2021,7 +2021,7 @@ static void stm32_freeframe(struct stm32_ethmac_s *priv) priv->txtail = txdesc; - nllvdbg("txhead: %p txtail: %p inflight: %d\n", + nllinfo("txhead: %p txtail: %p inflight: %d\n", priv->txhead, priv->txtail, priv->inflight); } } @@ -2563,12 +2563,12 @@ static int stm32_ifup(struct net_driver_s *dev) int ret; #ifdef CONFIG_NET_IPv4 - nvdbg("Bringing up: %d.%d.%d.%d\n", + ninfo("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); #endif #ifdef CONFIG_NET_IPv6 - nvdbg("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", + ninfo("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2], dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[5], dev->d_ipv6addr[6], dev->d_ipv6addr[7]); @@ -2616,7 +2616,7 @@ static int stm32_ifdown(struct net_driver_s *dev) struct stm32_ethmac_s *priv = (struct stm32_ethmac_s *)dev->d_private; irqstate_t flags; - nvdbg("Taking the network down\n"); + ninfo("Taking the network down\n"); /* Disable the Ethernet interrupt */ @@ -2661,7 +2661,7 @@ static int stm32_ifdown(struct net_driver_s *dev) static inline void stm32_txavail_process(struct stm32_ethmac_s *priv) { - nvdbg("ifup: %d\n", priv->ifup); + ninfo("ifup: %d\n", priv->ifup); /* Ignore the notification if the interface is not yet up */ @@ -2829,7 +2829,7 @@ static int stm32_addmac(struct net_driver_s *dev, const uint8_t *mac) uint32_t temp; uint32_t registeraddress; - nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); /* Add the MAC address to the hardware multicast hash table */ @@ -2886,7 +2886,7 @@ static int stm32_rmmac(struct net_driver_s *dev, const uint8_t *mac) uint32_t temp; uint32_t registeraddress; - nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); /* Remove the MAC address to the hardware multicast hash table */ @@ -3267,7 +3267,7 @@ static int stm32_phyread(uint16_t phydevaddr, uint16_t phyregaddr, uint16_t *val } } - nvdbg("MII transfer timed out: phydevaddr: %04x phyregaddr: %04x\n", + ninfo("MII transfer timed out: phydevaddr: %04x phyregaddr: %04x\n", phydevaddr, phyregaddr); return -ETIMEDOUT; @@ -3326,7 +3326,7 @@ static int stm32_phywrite(uint16_t phydevaddr, uint16_t phyregaddr, uint16_t val } } - nvdbg("MII transfer timed out: phydevaddr: %04x phyregaddr: %04x value: %04x\n", + ninfo("MII transfer timed out: phydevaddr: %04x phyregaddr: %04x value: %04x\n", phydevaddr, phyregaddr, value); return -ETIMEDOUT; @@ -3374,7 +3374,7 @@ static inline int stm32_dm9161(struct stm32_ethmac_s *priv) up_systemreset(); } - nvdbg("PHY ID1: 0x%04X\n", phyval); + ninfo("PHY ID1: 0x%04X\n", phyval); /* Now check the "DAVICOM Specified Configuration Register (DSCR)", Register 16 */ @@ -3531,7 +3531,7 @@ static int stm32_phyinit(struct stm32_ethmac_s *priv) /* Remember the selected speed and duplex modes */ - nvdbg("PHYSR[%d]: %04x\n", CONFIG_STM32F7_PHYSR, phyval); + ninfo("PHYSR[%d]: %04x\n", CONFIG_STM32F7_PHYSR, phyval); /* Different PHYs present speed and mode information in different ways. IF * This CONFIG_STM32F7_PHYSR_ALTCONFIG is selected, this indicates that the PHY @@ -3613,7 +3613,7 @@ static int stm32_phyinit(struct stm32_ethmac_s *priv) #endif #endif - nvdbg("Duplex: %s Speed: %d MBps\n", + ninfo("Duplex: %s Speed: %d MBps\n", priv->fduplex ? "FULL" : "HALF", priv->mbps100 ? 100 : 10); @@ -3973,7 +3973,7 @@ static void stm32_macaddress(struct stm32_ethmac_s *priv) struct net_driver_s *dev = &priv->dev; uint32_t regval; - nllvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", dev->d_ifname, 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], @@ -4041,7 +4041,7 @@ static void stm32_ipv6multicast(struct stm32_ethmac_s *priv) mac[4] = tmp16 & 0xff; mac[5] = tmp16 >> 8; - nvdbg("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n", + ninfo("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); (void)stm32_addmac(dev, mac); @@ -4179,12 +4179,12 @@ static int stm32_ethconfig(struct stm32_ethmac_s *priv) /* Reset the Ethernet block */ - nllvdbg("Reset the Ethernet block\n"); + nllinfo("Reset the Ethernet block\n"); stm32_ethreset(priv); /* Initialize the PHY */ - nllvdbg("Initialize the PHY\n"); + nllinfo("Initialize the PHY\n"); ret = stm32_phyinit(priv); if (ret < 0) { @@ -4193,7 +4193,7 @@ static int stm32_ethconfig(struct stm32_ethmac_s *priv) /* Initialize the MAC and DMA */ - nllvdbg("Initialize the MAC and DMA\n"); + nllinfo("Initialize the MAC and DMA\n"); ret = stm32_macconfig(priv); if (ret < 0) { @@ -4217,7 +4217,7 @@ static int stm32_ethconfig(struct stm32_ethmac_s *priv) /* Enable normal MAC operation */ - nllvdbg("Enable normal operation\n"); + nllinfo("Enable normal operation\n"); return stm32_macenable(priv); } @@ -4253,7 +4253,7 @@ int stm32_ethinitialize(int intf) { struct stm32_ethmac_s *priv; - nvdbg("intf: %d\n", intf); + ninfo("intf: %d\n", intf); /* Get the interface structure associated with this interface number. */ diff --git a/arch/arm/src/stm32f7/stm32_procfs_dtcm.c b/arch/arm/src/stm32f7/stm32_procfs_dtcm.c index af6f467fef..59faa89318 100644 --- a/arch/arm/src/stm32f7/stm32_procfs_dtcm.c +++ b/arch/arm/src/stm32f7/stm32_procfs_dtcm.c @@ -147,7 +147,7 @@ static int dtcm_open(FAR struct file *filep, FAR const char *relpath, { FAR struct dtcm_file_s *priv; - fvdbg("Open '%s'\n", relpath); + finfo("Open '%s'\n", relpath); /* PROCFS is read-only. Any attempt to open with any kind of write * access is not permitted. @@ -219,7 +219,7 @@ static ssize_t dtcm_read(FAR struct file *filep, FAR char *buffer, struct mallinfo mem; off_t offset = filep->f_pos; - fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen); + finfo("buffer=%p buflen=%d\n", buffer, (int)buflen); /* Recover our private data from the struct file instance */ @@ -278,7 +278,7 @@ static int dtcm_dup(FAR const struct file *oldp, FAR struct file *newp) FAR struct dtcm_file_s *oldpriv; FAR struct dtcm_file_s *newpriv; - fvdbg("Dup %p->%p\n", oldp, newp); + finfo("Dup %p->%p\n", oldp, newp); /* Recover our private data from the old struct file instance */ diff --git a/arch/arm/src/stm32l4/stm32l4_can.c b/arch/arm/src/stm32l4/stm32l4_can.c index 81efb677d2..3781de996e 100644 --- a/arch/arm/src/stm32l4/stm32l4_can.c +++ b/arch/arm/src/stm32l4/stm32l4_can.c @@ -87,14 +87,14 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg -# define canvdbg vdbg +# define caninfo info # define canlldbg lldbg -# define canllvdbg llvdbg +# define canllinfo llinfo #else # define candbg(x...) -# define canvdbg(x...) +# define caninfo(x...) # define canlldbg(x...) -# define canllvdbg(x...) +# define canllinfo(x...) #endif #if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_CAN) @@ -514,7 +514,7 @@ static void can_reset(FAR struct can_dev_s *dev) uint32_t regbit = 0; irqstate_t flags; - canllvdbg("CAN%d\n", priv->port); + canllinfo("CAN%d\n", priv->port); /* Get the bits in the AHB1RSTR1 register needed to reset this CAN device */ @@ -569,7 +569,7 @@ static int can_setup(FAR struct can_dev_s *dev) FAR struct stm32l4_can_s *priv = dev->cd_priv; int ret; - canllvdbg("CAN%d RX0 irq: %d TX irq: %d\n", priv->port, priv->canrx0, priv->cantx); + canllinfo("CAN%d RX0 irq: %d TX irq: %d\n", priv->port, priv->canrx0, priv->cantx); /* CAN cell initialization */ @@ -639,7 +639,7 @@ static void can_shutdown(FAR struct can_dev_s *dev) { FAR struct stm32l4_can_s *priv = dev->cd_priv; - canllvdbg("CAN%d\n", priv->port); + canllinfo("CAN%d\n", priv->port); /* Disable the RX FIFO 0 and TX interrupts */ @@ -675,7 +675,7 @@ static void can_rxint(FAR struct can_dev_s *dev, bool enable) FAR struct stm32l4_can_s *priv = dev->cd_priv; uint32_t regval; - canllvdbg("CAN%d enable: %d\n", priv->port, enable); + canllinfo("CAN%d enable: %d\n", priv->port, enable); /* Enable/disable the FIFO 0 message pending interrupt */ @@ -711,7 +711,7 @@ static void can_txint(FAR struct can_dev_s *dev, bool enable) FAR struct stm32l4_can_s *priv = dev->cd_priv; uint32_t regval; - canllvdbg("CAN%d enable: %d\n", priv->port, enable); + canllinfo("CAN%d enable: %d\n", priv->port, enable); /* Support only disabling the transmit mailbox interrupt */ @@ -796,7 +796,7 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg) int dlc; int txmb; - canllvdbg("CAN%d ID: %d DLC: %d\n", priv->port, msg->cm_hdr.ch_id, msg->cm_hdr.ch_dlc); + canllinfo("CAN%d ID: %d DLC: %d\n", priv->port, msg->cm_hdr.ch_id, msg->cm_hdr.ch_dlc); /* Select one empty transmit mailbox */ @@ -949,7 +949,7 @@ static bool can_txready(FAR struct can_dev_s *dev) /* Return true if any mailbox is available */ regval = can_getreg(priv, STM32L4_CAN_TSR_OFFSET); - canllvdbg("CAN%d TSR: %08x\n", priv->port, regval); + canllinfo("CAN%d TSR: %08x\n", priv->port, regval); if ((regval & CAN_ALL_MAILBOXES) != 0) { @@ -985,7 +985,7 @@ static bool can_txempty(FAR struct can_dev_s *dev) /* Return true if all mailboxes are available */ regval = can_getreg(priv, STM32L4_CAN_TSR_OFFSET); - canllvdbg("CAN%d TSR: %08x\n", priv->port, regval); + canllinfo("CAN%d TSR: %08x\n", priv->port, regval); if ((regval & CAN_ALL_MAILBOXES) == CAN_ALL_MAILBOXES) { @@ -1260,7 +1260,7 @@ static int can_bittiming(struct stm32l4_can_s *priv) uint32_t ts1; uint32_t ts2; - canllvdbg("CAN%d PCLK1: %d baud: %d\n", + canllinfo("CAN%d PCLK1: %d baud: %d\n", priv->port, STM32L4_PCLK1_FREQUENCY, priv->baud); /* Try to get CAN_BIT_QUANTA quanta in one bit_time. @@ -1314,7 +1314,7 @@ static int can_bittiming(struct stm32l4_can_s *priv) DEBUGASSERT(brp >= 1 && brp <= CAN_BTR_BRP_MAX); } - canllvdbg("TS1: %d TS2: %d BRP: %d\n", ts1, ts2, brp); + canllinfo("TS1: %d TS2: %d BRP: %d\n", ts1, ts2, brp); /* Configure bit timing. This also does the following, less obvious * things. Unless loopback mode is enabled, it: @@ -1357,7 +1357,7 @@ static int can_cellinit(struct stm32l4_can_s *priv) uint32_t regval; int ret; - canllvdbg("CAN%d\n", priv->port); + canllinfo("CAN%d\n", priv->port); /* Exit from sleep mode */ @@ -1486,7 +1486,7 @@ static int can_filterinit(struct stm32l4_can_s *priv) uint32_t regval; uint32_t bitmask; - canllvdbg("CAN%d filter: %d\n", priv->port, priv->filter); + canllinfo("CAN%d filter: %d\n", priv->port, priv->filter); /* Get the bitmask associated with the filter used by this CAN block */ @@ -1565,7 +1565,7 @@ FAR struct can_dev_s *stm32l4_caninitialize(int port) { struct can_dev_s *dev = NULL; - canvdbg("CAN%d\n", port); + caninfo("CAN%d\n", port); /* NOTE: Peripherical clocking for CAN1 and/or CAN2 was already provided * by stm32l4_clockconfig() early in the reset sequence. diff --git a/arch/arm/src/stm32l4/stm32l4_i2c.c b/arch/arm/src/stm32l4/stm32l4_i2c.c index 452b125e36..08bc407719 100644 --- a/arch/arm/src/stm32l4/stm32l4_i2c.c +++ b/arch/arm/src/stm32l4/stm32l4_i2c.c @@ -150,10 +150,10 @@ #ifdef CONFIG_DEBUG_I2C # define i2cdbg dbg -# define i2cvdbg vdbg +# define i2cinfo info #else # define i2cdbg(x...) -# define i2cvdbg(x...) +# define i2cinfo(x...) #endif /* I2C event trace logic. NOTE: trace uses the internal, non-standard, low-level @@ -671,7 +671,7 @@ static inline int stm32l4_i2c_sem_waitdone(FAR struct stm32l4_i2c_priv_s *priv) while (priv->intstate != INTSTATE_DONE && elapsed < timeout); - i2cvdbg("intstate: %d elapsed: %ld threshold: %ld status: %08x\n", + i2cinfo("intstate: %d elapsed: %ld threshold: %ld status: %08x\n", priv->intstate, (long)elapsed, (long)timeout, priv->status); /* Set the interrupt state back to IDLE */ @@ -825,7 +825,7 @@ static inline void stm32l4_i2c_sem_waitstop(FAR struct stm32l4_i2c_priv_s *priv) * still pending. */ - i2cvdbg("Timeout with CR: %04x SR: %04x\n", cr, sr); + i2cinfo("Timeout with CR: %04x SR: %04x\n", cr, sr); } /************************************************************************************ diff --git a/arch/arm/src/stm32l4/stm32l4_idle.c b/arch/arm/src/stm32l4/stm32l4_idle.c index 7cf0734c22..00cceb1470 100644 --- a/arch/arm/src/stm32l4/stm32l4_idle.c +++ b/arch/arm/src/stm32l4/stm32l4_idle.c @@ -101,7 +101,7 @@ static void up_idlepm(void) /* Perform board-specific, state-dependent logic here */ - llvdbg("newstate= %d oldstate=%d\n", newstate, oldstate); + llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); /* Then force the global state change */ diff --git a/arch/arm/src/stm32l4/stm32l4_qspi.c b/arch/arm/src/stm32l4/stm32l4_qspi.c index 723ce2841f..06c136014e 100644 --- a/arch/arm/src/stm32l4/stm32l4_qspi.c +++ b/arch/arm/src/stm32l4/stm32l4_qspi.c @@ -103,13 +103,13 @@ #ifdef CONFIG_DEBUG_SPI # define qspidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define qspivdbg lldbg +# define qspiinfo lldbg # else -# define qspivdbg(x...) +# define qspiinfo(x...) # endif #else # define qspidbg(x...) -# define qspivdbg(x...) +# define qspiinfo(x...) #endif #define DMA_INITIAL 0 @@ -509,7 +509,7 @@ static inline void qspi_putreg(struct stm32l4_qspidev_s *priv, uint32_t value, static void qspi_dumpregs(struct stm32l4_qspidev_s *priv, const char *msg) { uint32_t regval; - qspivdbg("%s:\n", msg); + qspiinfo("%s:\n", msg); #if 0 /* this extra verbose output may be helpful in some cases; you'll need @@ -517,8 +517,8 @@ static void qspi_dumpregs(struct stm32l4_qspidev_s *priv, const char *msg) */ regval = getreg32(priv->base + STM32L4_QUADSPI_CR_OFFSET); /* Control Register */ - qspivdbg("CR:%08x\n",regval); - qspivdbg(" EN:%1d ABORT:%1d DMAEN:%1d TCEN:%1d SSHIFT:%1d\n" + qspiinfo("CR:%08x\n",regval); + qspiinfo(" EN:%1d ABORT:%1d DMAEN:%1d TCEN:%1d SSHIFT:%1d\n" " FTHRES: %d\n" " TEIE:%1d TCIE:%1d FTIE:%1d SMIE:%1d TOIE:%1d APMS:%1d PMM:%1d\n" " PRESCALER: %d\n", @@ -539,16 +539,16 @@ static void qspi_dumpregs(struct stm32l4_qspidev_s *priv, const char *msg) ); regval = getreg32(priv->base + STM32L4_QUADSPI_DCR_OFFSET); /* Device Configuration Register */ - qspivdbg("DCR:%08x\n",regval); - qspivdbg(" CKMODE:%1d CSHT:%d FSIZE:%d\n", + qspiinfo("DCR:%08x\n",regval); + qspiinfo(" CKMODE:%1d CSHT:%d FSIZE:%d\n", (regval&QSPI_DCR_CKMODE)?1:0, (regval&QSPI_DCR_CSHT_MASK)>>QSPI_DCR_CSHT_SHIFT, (regval&QSPI_DCR_FSIZE_MASK)>>QSPI_DCR_FSIZE_SHIFT ); regval = getreg32(priv->base + STM32L4_QUADSPI_CCR_OFFSET); /* Communication Configuration Register */ - qspivdbg("CCR:%08x\n",regval); - qspivdbg(" INST:%02x IMODE:%d ADMODE:%d ADSIZE:%d ABMODE:%d\n" + qspiinfo("CCR:%08x\n",regval); + qspiinfo(" INST:%02x IMODE:%d ADMODE:%d ADSIZE:%d ABMODE:%d\n" " ABSIZE:%d DCYC:%d DMODE:%d FMODE:%d\n" " SIOO:%1d DDRM:%1d\n", (regval&QSPI_CCR_INSTRUCTION_MASK)>>QSPI_CCR_INSTRUCTION_SHIFT, @@ -565,8 +565,8 @@ static void qspi_dumpregs(struct stm32l4_qspidev_s *priv, const char *msg) ); regval = getreg32(priv->base + STM32L4_QUADSPI_SR_OFFSET); /* Status Register */ - qspivdbg("SR:%08x\n",regval); - qspivdbg(" TEF:%1d TCF:%1d FTF:%1d SMF:%1d TOF:%1d BUSY:%1d FLEVEL:%d\n", + qspiinfo("SR:%08x\n",regval); + qspiinfo(" TEF:%1d TCF:%1d FTF:%1d SMF:%1d TOF:%1d BUSY:%1d FLEVEL:%d\n", (regval&QSPI_SR_TEF)?1:0, (regval&QSPI_SR_TCF)?1:0, (regval&QSPI_SR_FTF)?1:0, @@ -577,17 +577,17 @@ static void qspi_dumpregs(struct stm32l4_qspidev_s *priv, const char *msg) ); #else - qspivdbg(" CR:%08x DCR:%08x CCR:%08x SR:%08x\n", + qspiinfo(" CR:%08x DCR:%08x CCR:%08x SR:%08x\n", getreg32(priv->base + STM32L4_QUADSPI_CR_OFFSET), /* Control Register */ getreg32(priv->base + STM32L4_QUADSPI_DCR_OFFSET), /* Device Configuration Register */ getreg32(priv->base + STM32L4_QUADSPI_CCR_OFFSET), /* Communication Configuration Register */ getreg32(priv->base + STM32L4_QUADSPI_SR_OFFSET)); /* Status Register */ - qspivdbg(" DLR:%08x ABR:%08x PSMKR:%08x PSMAR:%08x\n", + qspiinfo(" DLR:%08x ABR:%08x PSMKR:%08x PSMAR:%08x\n", getreg32(priv->base + STM32L4_QUADSPI_DLR_OFFSET), /* Data Length Register */ getreg32(priv->base + STM32L4_QUADSPI_ABR_OFFSET), /* Alternate Bytes Register */ getreg32(priv->base + STM32L4_QUADSPI_PSMKR_OFFSET), /* Polling Status mask Register */ getreg32(priv->base + STM32L4_QUADSPI_PSMAR_OFFSET)); /* Polling Status match Register */ - qspivdbg(" PIR:%08x LPTR:%08x\n", + qspiinfo(" PIR:%08x LPTR:%08x\n", getreg32(priv->base + STM32L4_QUADSPI_PIR_OFFSET), /* Polling Interval Register */ getreg32(priv->base + STM32L4_QUADSPI_LPTR_OFFSET)); /* Low-Power Timeout Register */ (void)regval; @@ -599,25 +599,25 @@ static void qspi_dumpregs(struct stm32l4_qspidev_s *priv, const char *msg) static void qspi_dumpgpioconfig(const char *msg) { uint32_t regval; - qspivdbg("%s:\n", msg); + qspiinfo("%s:\n", msg); regval = getreg32(STM32L4_GPIOE_MODER); - qspivdbg("E_MODER:%08x\n",regval); + qspiinfo("E_MODER:%08x\n",regval); regval = getreg32(STM32L4_GPIOE_OTYPER); - qspivdbg("E_OTYPER:%08x\n",regval); + qspiinfo("E_OTYPER:%08x\n",regval); regval = getreg32(STM32L4_GPIOE_OSPEED); - qspivdbg("E_OSPEED:%08x\n",regval); + qspiinfo("E_OSPEED:%08x\n",regval); regval = getreg32(STM32L4_GPIOE_PUPDR); - qspivdbg("E_PUPDR:%08x\n",regval); + qspiinfo("E_PUPDR:%08x\n",regval); regval = getreg32(STM32L4_GPIOE_AFRL); - qspivdbg("E_AFRL:%08x\n",regval); + qspiinfo("E_AFRL:%08x\n",regval); regval = getreg32(STM32L4_GPIOE_AFRH); - qspivdbg("E_AFRH:%08x\n",regval); + qspiinfo("E_AFRH:%08x\n",regval); } #endif @@ -729,20 +729,20 @@ static int qspi_setupxctnfromcmd(struct qspi_xctnspec_s *xctn, DEBUGASSERT(xctn != NULL && cmdinfo != NULL); #ifdef CONFIG_DEBUG_SPI - qspivdbg("Transfer:\n"); - qspivdbg(" flags: %02x\n", cmdinfo->flags); - qspivdbg(" cmd: %04x\n", cmdinfo->cmd); + qspiinfo("Transfer:\n"); + qspiinfo(" flags: %02x\n", cmdinfo->flags); + qspiinfo(" cmd: %04x\n", cmdinfo->cmd); if (QSPICMD_ISADDRESS(cmdinfo->flags)) { - qspivdbg(" address/length: %08lx/%d\n", + qspiinfo(" address/length: %08lx/%d\n", (unsigned long)cmdinfo->addr, cmdinfo->addrlen); } if (QSPICMD_ISDATA(cmdinfo->flags)) { - qspivdbg(" %s Data:\n", QSPICMD_ISWRITE(cmdinfo->flags) ? "Write" : "Read"); - qspivdbg(" buffer/length: %p/%d\n", cmdinfo->buffer, cmdinfo->buflen); + qspiinfo(" %s Data:\n", QSPICMD_ISWRITE(cmdinfo->flags) ? "Write" : "Read"); + qspiinfo(" buffer/length: %p/%d\n", cmdinfo->buffer, cmdinfo->buflen); } #endif @@ -853,13 +853,13 @@ static int qspi_setupxctnfrommem(struct qspi_xctnspec_s *xctn, DEBUGASSERT(xctn != NULL && meminfo != NULL); #ifdef CONFIG_DEBUG_SPI - qspivdbg("Transfer:\n"); - qspivdbg(" flags: %02x\n", meminfo->flags); - qspivdbg(" cmd: %04x\n", meminfo->cmd); - qspivdbg(" address/length: %08lx/%d\n", + qspiinfo("Transfer:\n"); + qspiinfo(" flags: %02x\n", meminfo->flags); + qspiinfo(" cmd: %04x\n", meminfo->cmd); + qspiinfo(" address/length: %08lx/%d\n", (unsigned long)meminfo->addr, meminfo->addrlen); - qspivdbg(" %s Data:\n", QSPIMEM_ISWRITE(meminfo->flags) ? "Write" : "Read"); - qspivdbg(" buffer/length: %p/%d\n", meminfo->buffer, meminfo->buflen); + qspiinfo(" %s Data:\n", QSPIMEM_ISWRITE(meminfo->flags) ? "Write" : "Read"); + qspiinfo(" buffer/length: %p/%d\n", meminfo->buffer, meminfo->buflen); #endif DEBUGASSERT(meminfo->cmd < 256); @@ -1705,7 +1705,7 @@ static int qspi_lock(struct qspi_dev_s *dev, bool lock) { struct stm32l4_qspidev_s *priv = (struct stm32l4_qspidev_s *)dev; - qspivdbg("lock=%d\n", lock); + qspiinfo("lock=%d\n", lock); if (lock) { /* Take the semaphore (perhaps waiting) */ @@ -1758,7 +1758,7 @@ static uint32_t qspi_setfrequency(struct qspi_dev_s *dev, uint32_t frequency) return 0; } - qspivdbg("frequency=%d\n", frequency); + qspiinfo("frequency=%d\n", frequency); DEBUGASSERT(priv); /* Wait till BUSY flag reset */ @@ -1810,14 +1810,14 @@ static uint32_t qspi_setfrequency(struct qspi_dev_s *dev, uint32_t frequency) /* Calculate the new actual frequency */ actual = STL32L4_QSPI_CLOCK / prescaler; - qspivdbg("prescaler=%d actual=%d\n", prescaler, actual); + qspiinfo("prescaler=%d actual=%d\n", prescaler, actual); /* Save the frequency setting */ priv->frequency = frequency; priv->actual = actual; - qspivdbg("Frequency %d->%d\n", frequency, actual); + qspiinfo("Frequency %d->%d\n", frequency, actual); return actual; } @@ -1850,7 +1850,7 @@ static void qspi_setmode(struct qspi_dev_s *dev, enum qspi_mode_e mode) return; } - qspivdbg("mode=%d\n", mode); + qspiinfo("mode=%d\n", mode); /* Has the mode changed? */ @@ -1880,14 +1880,14 @@ static void qspi_setmode(struct qspi_dev_s *dev, enum qspi_mode_e mode) case QSPIDEV_MODE1: /* CPOL=0; CPHA=1 */ case QSPIDEV_MODE2: /* CPOL=1; CPHA=0 */ - qspivdbg("unsupported mode=%d\n", mode); + qspiinfo("unsupported mode=%d\n", mode); default: DEBUGASSERT(FALSE); return; } qspi_putreg(priv, regval, STM32L4_QUADSPI_DCR); - qspivdbg("DCR=%08x\n", regval); + qspiinfo("DCR=%08x\n", regval); /* Save the mode so that subsequent re-configurations will be faster */ @@ -1917,7 +1917,7 @@ static void qspi_setbits(struct qspi_dev_s *dev, int nbits) if (8 != nbits) { - qspivdbg("unsupported nbits=%d\n", nbits); + qspiinfo("unsupported nbits=%d\n", nbits); DEBUGASSERT(FALSE); } } @@ -2456,7 +2456,7 @@ struct qspi_dev_s *stm32l4_qspi_initialize(int intf) /* The STM32L4 has only a single QSPI port */ - qspivdbg("intf: %d\n", intf); + qspiinfo("intf: %d\n", intf); DEBUGASSERT(intf == 0); /* Select the QSPI interface */ diff --git a/arch/arm/src/stm32l4/stm32l4_rng.c b/arch/arm/src/stm32l4/stm32l4_rng.c index b82c42fdc2..2a27348bee 100644 --- a/arch/arm/src/stm32l4/stm32l4_rng.c +++ b/arch/arm/src/stm32l4/stm32l4_rng.c @@ -107,7 +107,7 @@ static const struct file_operations g_rngops = static int stm32l4_rnginitialize(void) { - vdbg("Initializing RNG\n"); + info("Initializing RNG\n"); memset(&g_rngdev, 0, sizeof(struct rng_dev_s)); @@ -117,7 +117,7 @@ static int stm32l4_rnginitialize(void) { /* We could not attach the ISR to the interrupt */ - vdbg("Could not attach IRQ.\n"); + info("Could not attach IRQ.\n"); return -EAGAIN; } diff --git a/arch/arm/src/stm32l4/stm32l4_rtcc.c b/arch/arm/src/stm32l4/stm32l4_rtcc.c index eab4fa45e8..2c349abfd9 100644 --- a/arch/arm/src/stm32l4/stm32l4_rtcc.c +++ b/arch/arm/src/stm32l4/stm32l4_rtcc.c @@ -120,14 +120,14 @@ #ifdef CONFIG_DEBUG_RTC # define rtcdbg dbg -# define rtcvdbg vdbg +# define rtcinfo info # define rtclldbg lldbg -# define rtcllvdbg llvdbg +# define rtcllinfo llinfo #else # define rtcdbg(x...) -# define rtcvdbg(x...) +# define rtcinfo(x...) # define rtclldbg(x...) -# define rtcllvdbg(x...) +# define rtcllinfo(x...) #endif /************************************************************************************ @@ -750,7 +750,7 @@ static int rtchw_set_alrmar(rtc_alarmreg_t alarmreg) putreg32(alarmreg, STM32L4_RTC_ALRMAR); putreg32(0, STM32L4_RTC_ALRMASSR); - rtcvdbg(" TR: %08x ALRMAR: %08x\n", + rtcinfo(" TR: %08x ALRMAR: %08x\n", getreg32(STM32L4_RTC_TR), getreg32(STM32L4_RTC_ALRMAR)); /* Enable RTC alarm A */ @@ -796,7 +796,7 @@ static int rtchw_set_alrmbr(rtc_alarmreg_t alarmreg) putreg32(alarmreg, STM32L4_RTC_ALRMBR); putreg32(0, STM32L4_RTC_ALRMBSSR); - rtcvdbg(" TR: %08x ALRMBR: %08x\n", + rtcinfo(" TR: %08x ALRMBR: %08x\n", getreg32(STM32L4_RTC_TR), getreg32(STM32L4_RTC_ALRMBR)); /* Enable RTC alarm B */ @@ -1309,7 +1309,7 @@ int stm32l4_rtc_setalarm(FAR struct alm_setalarm_s *alminfo) break; default: - rtcvdbg("ERROR: Invalid ALARM%d\n", alminfo->as_id); + rtcinfo("ERROR: Invalid ALARM%d\n", alminfo->as_id); break; } @@ -1409,7 +1409,7 @@ int stm32l4_rtc_cancelalarm(enum alm_id_e alarmid) break; default: - rtcvdbg("ERROR: Invalid ALARM%d\n", alarmid); + rtcinfo("ERROR: Invalid ALARM%d\n", alarmid); break; } diff --git a/arch/arm/src/stm32l4/stm32l4_spi.c b/arch/arm/src/stm32l4/stm32l4_spi.c index acb9a9ba5a..712ed7c915 100644 --- a/arch/arm/src/stm32l4/stm32l4_spi.c +++ b/arch/arm/src/stm32l4/stm32l4_spi.c @@ -148,13 +148,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ @@ -1020,7 +1020,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency) * faster. */ - spivdbg("Frequency %d->%d\n", frequency, actual); + spiinfo("Frequency %d->%d\n", frequency, actual); priv->frequency = frequency; priv->actual = actual; @@ -1050,7 +1050,7 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) uint16_t setbits; uint16_t clrbits; - spivdbg("mode=%d\n", mode); + spiinfo("mode=%d\n", mode); /* Has the mode changed? */ @@ -1117,7 +1117,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) uint16_t clrbits1, clrbits2; int savbits = nbits; - spivdbg("nbits=%d\n", nbits); + spiinfo("nbits=%d\n", nbits); /* Has the number of bits changed? */ @@ -1220,11 +1220,11 @@ static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t wd) if (spi_16bitmode(priv)) { - spivdbg("Sent: %04x Return: %04x Status: %02x\n", wd, ret, regval); + spiinfo("Sent: %04x Return: %04x Status: %02x\n", wd, ret, regval); } else { - spivdbg("Sent: %02x Return: %02x Status: %02x\n", wd, ret, regval); + spiinfo("Sent: %02x Return: %02x Status: %02x\n", wd, ret, regval); } UNUSED(regval); @@ -1263,7 +1263,7 @@ static void spi_exchange_nodma(FAR struct spi_dev_s *dev, FAR const void *txbuff FAR struct stm32l4_spidev_s *priv = (FAR struct stm32l4_spidev_s *)dev; DEBUGASSERT(priv && priv->spibase); - spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); + spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); /* 8- or 16-bit mode? */ @@ -1376,7 +1376,7 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, static uint16_t rxdummy = 0xffff; static const uint16_t txdummy = 0xffff; - spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); + spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); DEBUGASSERT(priv && priv->spibase); /* Setup DMAs */ @@ -1419,7 +1419,7 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, #ifndef CONFIG_SPI_EXCHANGE static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *txbuffer, size_t nwords) { - spivdbg("txbuffer=%p nwords=%d\n", txbuffer, nwords); + spiinfo("txbuffer=%p nwords=%d\n", txbuffer, nwords); return spi_exchange(dev, txbuffer, NULL, nwords); } #endif @@ -1446,7 +1446,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *txbuffer, si #ifndef CONFIG_SPI_EXCHANGE static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *rxbuffer, size_t nwords) { - spivdbg("rxbuffer=%p nwords=%d\n", rxbuffer, nwords); + spiinfo("rxbuffer=%p nwords=%d\n", rxbuffer, nwords); return spi_exchange(dev, NULL, rxbuffer, nwords); } #endif diff --git a/arch/arm/src/tiva/lm3s_ethernet.c b/arch/arm/src/tiva/lm3s_ethernet.c index 0acaeb3c07..4776e39e71 100644 --- a/arch/arm/src/tiva/lm3s_ethernet.c +++ b/arch/arm/src/tiva/lm3s_ethernet.c @@ -333,7 +333,7 @@ static void tiva_ethreset(struct tiva_driver_s *priv) regval = getreg32(TIVA_SYSCON_RCGC2); regval |= (SYSCON_RCGC2_EMAC0 | SYSCON_RCGC2_EPHY0); putreg32(regval, TIVA_SYSCON_RCGC2); - nllvdbg("RCGC2: %08x\n", regval); + nllinfo("RCGC2: %08x\n", regval); /* Put the Ethernet controller into the reset state */ @@ -349,7 +349,7 @@ static void tiva_ethreset(struct tiva_driver_s *priv) regval &= ~(SYSCON_SRCR2_EMAC0 | SYSCON_SRCR2_EPHY0); putreg32(regval, TIVA_SYSCON_SRCR2); - nllvdbg("SRCR2: %08x\n", regval); + nllinfo("SRCR2: %08x\n", regval); /* Wait just a bit, again. If we touch the ethernet too soon, we may busfault. */ @@ -495,7 +495,7 @@ static int tiva_transmit(struct tiva_driver_s *priv) */ pktlen = priv->ld_dev.d_len; - nllvdbg("Sending packet, pktlen: %d\n", pktlen); + nllinfo("Sending packet, pktlen: %d\n", pktlen); DEBUGASSERT(pktlen > ETH_HDRLEN); dbuf = priv->ld_dev.d_buf; @@ -584,7 +584,7 @@ static int tiva_txpoll(struct net_driver_s *dev) * the field d_len is set to a value > 0. */ - nllvdbg("Poll result: d_len=%d\n", priv->ld_dev.d_len); + nllinfo("Poll result: d_len=%d\n", priv->ld_dev.d_len); if (priv->ld_dev.d_len > 0) { DEBUGASSERT((tiva_ethin(priv, TIVA_MAC_TR_OFFSET) & MAC_TR_NEWTX) == 0); @@ -672,7 +672,7 @@ static void tiva_receive(struct tiva_driver_s *priv) regval = tiva_ethin(priv, TIVA_MAC_DATA_OFFSET); pktlen = (int)(regval & 0x0000ffff); - nllvdbg("Receiving packet, pktlen: %d\n", pktlen); + nllinfo("Receiving packet, pktlen: %d\n", pktlen); /* Check if the pktlen is valid. It should be large enough to hold * an Ethernet header and small enough to fit entirely in the I/O @@ -770,7 +770,7 @@ static void tiva_receive(struct tiva_driver_s *priv) #ifdef CONFIG_NET_IPv4 if (ETHBUF->type == HTONS(ETHTYPE_IP)) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); NETDEV_RXIPV4(&priv->ld_dev); /* Handle ARP on input then give the IPv4 packet to the network @@ -811,7 +811,7 @@ static void tiva_receive(struct tiva_driver_s *priv) #ifdef CONFIG_NET_IPv6 if (ETHBUF->type == HTONS(ETHTYPE_IP6)) { - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); NETDEV_RXIPV6(&priv->ld_dev); /* Give the IPv6 packet to the network layer */ @@ -850,7 +850,7 @@ static void tiva_receive(struct tiva_driver_s *priv) #ifdef CONFIG_NET_ARP if (ETHBUF->type == htons(ETHTYPE_ARP)) { - nllvdbg("ARP packet received (%02x)\n", ETHBUF->type); + nllinfo("ARP packet received (%02x)\n", ETHBUF->type); NETDEV_RXARP(&priv->ld_dev); arp_arpin(&priv->ld_dev); @@ -1125,7 +1125,7 @@ static int tiva_ifup(struct net_driver_s *dev) div = SYSCLK_FREQUENCY / 2 / TIVA_MAX_MDCCLK; tiva_ethout(priv, TIVA_MAC_MDV_OFFSET, div); - nllvdbg("MDV: %08x\n", div); + nllinfo("MDV: %08x\n", div); /* Then configure the Ethernet Controller for normal operation * @@ -1137,7 +1137,7 @@ static int tiva_ifup(struct net_driver_s *dev) regval &= ~TIVA_TCTCL_CLRBITS; regval |= TIVA_TCTCL_SETBITS; tiva_ethout(priv, TIVA_MAC_TCTL_OFFSET, regval); - nllvdbg("TCTL: %08x\n", regval); + nllinfo("TCTL: %08x\n", regval); /* Setup the receive control register (Disable multicast frames, disable * promiscuous mode, disable bad CRC rejection). @@ -1147,7 +1147,7 @@ static int tiva_ifup(struct net_driver_s *dev) regval &= ~TIVA_RCTCL_CLRBITS; regval |= TIVA_RCTCL_SETBITS; tiva_ethout(priv, TIVA_MAC_RCTL_OFFSET, regval); - nllvdbg("RCTL: %08x\n", regval); + nllinfo("RCTL: %08x\n", regval); /* Setup the time stamp configuration register */ @@ -1159,7 +1159,7 @@ static int tiva_ifup(struct net_driver_s *dev) regval &= ~(MAC_TS_EN); #endif tiva_ethout(priv, TIVA_MAC_TS_OFFSET, regval); - nllvdbg("TS: %08x\n", regval); + nllinfo("TS: %08x\n", regval); #endif /* Wait for the link to come up. This following is not very conservative diff --git a/arch/arm/src/tiva/tiva_adclib.c b/arch/arm/src/tiva/tiva_adclib.c index 64fb93552d..cb561682ed 100644 --- a/arch/arm/src/tiva/tiva_adclib.c +++ b/arch/arm/src/tiva/tiva_adclib.c @@ -209,7 +209,7 @@ void tiva_adc_one_time_init(uint32_t clock, uint8_t sample_rate) static bool one_time_init = false; #ifdef CONFIG_DEBUG_ANALOG - avdbg("setting clock=%d MHz sample rate=%d\n", + ainfo("setting clock=%d MHz sample rate=%d\n", clock, sample_rate); #endif @@ -219,7 +219,7 @@ void tiva_adc_one_time_init(uint32_t clock, uint8_t sample_rate) if (one_time_init == false) { - avdbg("performing ADC one-time initialization...\n"); + ainfo("performing ADC one-time initialization...\n"); /* set clock */ tiva_adc_clock(clock); @@ -238,7 +238,7 @@ void tiva_adc_one_time_init(uint32_t clock, uint8_t sample_rate) #ifdef CONFIG_DEBUG_ANALOG else { - avdbg("one time initialization previously completed\n"); + ainfo("one time initialization previously completed\n"); } #endif } @@ -257,7 +257,7 @@ void tiva_adc_configure(struct tiva_adc_cfg_s *cfg) uint8_t s; uint8_t c; - avdbg("configure ADC%d...\n", cfg->adc); + ainfo("configure ADC%d...\n", cfg->adc); /* Configure each SSE */ @@ -270,7 +270,7 @@ void tiva_adc_configure(struct tiva_adc_cfg_s *cfg) #ifdef CONFIG_DEBUG_ANALOG else { - avdbg("ADC%d SSE%d has no configuration\n", cfg->adc, s); + ainfo("ADC%d SSE%d has no configuration\n", cfg->adc, s); } #endif } @@ -298,9 +298,9 @@ void tiva_adc_configure(struct tiva_adc_cfg_s *cfg) void tiva_adc_sse_cfg(uint8_t adc, uint8_t sse, struct tiva_adc_sse_cfg_s *ssecfg) { - avdbg("configure ADC%d SSE%d...\n", adc, sse); + ainfo("configure ADC%d SSE%d...\n", adc, sse); #ifdef CONFIG_DEBUG_ANALOG - avdbg("priority=%d trigger=%d...\n", ssecfg->priority, ssecfg->trigger); + ainfo("priority=%d trigger=%d...\n", ssecfg->priority, ssecfg->trigger); #endif uint8_t priority = ssecfg->priority; @@ -327,7 +327,7 @@ void tiva_adc_sse_cfg(uint8_t adc, uint8_t sse, void tiva_adc_step_cfg(struct tiva_adc_step_cfg_s *stepcfg) { #ifdef CONFIG_DEBUG_ANALOG - avdbg(" shold=0x%02x flags=0x%02x ain=%d...\n", + ainfo(" shold=0x%02x flags=0x%02x ain=%d...\n", stepcfg->shold, stepcfg->flags, stepcfg->ain); #endif @@ -341,7 +341,7 @@ void tiva_adc_step_cfg(struct tiva_adc_step_cfg_s *stepcfg) uint8_t ain = stepcfg->ain; uint32_t gpio = ain2gpio[stepcfg->ain]; - avdbg("configure ADC%d SSE%d STEP%d...\n", adc, sse, step); + ainfo("configure ADC%d SSE%d STEP%d...\n", adc, sse, step); /* Configure the AIN GPIO for analog input if not flagged to be muxed to * the internal temperature sensor @@ -410,7 +410,7 @@ void tiva_adc_irq_attach(uint8_t adc, uint8_t sse, xcpt_t isr) int irq = sse2irq[SSE_IDX(adc, sse)]; #ifdef CONFIG_DEBUG_ANALOG - avdbg("assigning ISR=0x%p to ADC%d SSE%d IRQ=0x%02x...\n", + ainfo("assigning ISR=0x%p to ADC%d SSE%d IRQ=0x%02x...\n", isr, adc, sse, irq); #endif @@ -682,7 +682,7 @@ uint32_t tiva_adc_int_status(uint8_t adc) uint8_t tiva_adc_sse_enable(uint8_t adc, uint8_t sse, bool state) { - avdbg("ADC%d SSE%d=%01d\n", adc, sse, state); + ainfo("ADC%d SSE%d=%01d\n", adc, sse, state); uintptr_t actssreg = TIVA_ADC_ACTSS(adc); if (state == true) @@ -867,7 +867,7 @@ uint8_t tiva_adc_sse_data(uint8_t adc, uint8_t sse, int32_t *buf) ssfstatreg = getreg32(TIVA_ADC_BASE(adc) + TIVA_ADC_SSFSTAT(sse)); } - avdbg("fifo=%d\n", fifo_count); + ainfo("fifo=%d\n", fifo_count); return fifo_count; } @@ -1086,20 +1086,20 @@ void tiva_adc_dump_reg_cfg(uint8_t adc, uint8_t sse) /* Dump register contents */ - avdbg("CC [0x%08x]=0x%08x\n", ccreg, cc); - avdbg("PC [0x%08x]=0x%08x\n", pcreg, pc); - avdbg("ACTSS [0x%08x]=0x%08x\n", actssreg, actss); - avdbg("SSPRI [0x%08x]=0x%08x\n", ssprireg, sspri); - avdbg("EMUX [0x%08x]=0x%08x\n", emuxreg, emux); - avdbg("SSMUX [0x%08x]=0x%08x\n", ssmuxreg, ssmux); + ainfo("CC [0x%08x]=0x%08x\n", ccreg, cc); + ainfo("PC [0x%08x]=0x%08x\n", pcreg, pc); + ainfo("ACTSS [0x%08x]=0x%08x\n", actssreg, actss); + ainfo("SSPRI [0x%08x]=0x%08x\n", ssprireg, sspri); + ainfo("EMUX [0x%08x]=0x%08x\n", emuxreg, emux); + ainfo("SSMUX [0x%08x]=0x%08x\n", ssmuxreg, ssmux); #ifdef CONFIG_ARCH_CHIP_TM4C129 - avdbg("SSEMUX [0x%08x]=0x%08x\n", ssemuxreg, ssemux); + ainfo("SSEMUX [0x%08x]=0x%08x\n", ssemuxreg, ssemux); #endif - avdbg("SSOP [0x%08x]=0x%08x\n", ssopreg, ssop); + ainfo("SSOP [0x%08x]=0x%08x\n", ssopreg, ssop); #ifdef CONFIG_EXPERIMENTAL - avdbg("SSTSH [0x%08x]=0x%08x\n", sstshreg, sstsh); + ainfo("SSTSH [0x%08x]=0x%08x\n", sstshreg, sstsh); #endif - avdbg("SSCTL [0x%08x]=0x%08x\n", ssctlreg, ssctl); + ainfo("SSCTL [0x%08x]=0x%08x\n", ssctlreg, ssctl); } #endif /* CONFIG_DEBUG_ANALOG */ diff --git a/arch/arm/src/tiva/tiva_adclow.c b/arch/arm/src/tiva/tiva_adclow.c index 7a0b5509ce..6b9273dc68 100644 --- a/arch/arm/src/tiva/tiva_adclow.c +++ b/arch/arm/src/tiva/tiva_adclow.c @@ -327,7 +327,7 @@ static int tiva_adc1_sse3_interrupt(int irq, void *context) static void tiva_adc_irqinitialize(struct tiva_adc_cfg_s *cfg) { - avdbg("initialize irqs for ADC%d...\n", cfg->adc); + ainfo("initialize irqs for ADC%d...\n", cfg->adc); #ifdef CONFIG_TIVA_ADC0 if (cfg->adc == 0) @@ -411,7 +411,7 @@ static int tiva_adc_bind(FAR struct adc_dev_s *dev, static void tiva_adc_reset(struct adc_dev_s *dev) { - avdbg("Resetting...\n"); + ainfo("Resetting...\n"); struct tiva_adc_s *priv = (struct tiva_adc_s *)dev->ad_priv; struct tiva_adc_sse_s *sse; @@ -443,7 +443,7 @@ static void tiva_adc_reset(struct adc_dev_s *dev) static int tiva_adc_setup(struct adc_dev_s *dev) { - avdbg("Setup\n"); + ainfo("Setup\n"); struct tiva_adc_s *priv = (struct tiva_adc_s *)dev->ad_priv; struct tiva_adc_sse_s *sse; @@ -477,7 +477,7 @@ static int tiva_adc_setup(struct adc_dev_s *dev) static void tiva_adc_shutdown(struct adc_dev_s *dev) { struct tiva_adc_s *priv = (struct tiva_adc_s *)dev->ad_priv; - avdbg("Shutdown\n"); + ainfo("Shutdown\n"); DEBUGASSERT(priv->ena); @@ -512,7 +512,7 @@ static void tiva_adc_shutdown(struct adc_dev_s *dev) static void tiva_adc_rxint(struct adc_dev_s *dev, bool enable) { - avdbg("RXINT=%d\n", enable); + ainfo("RXINT=%d\n", enable); struct tiva_adc_s *priv = (struct tiva_adc_s *)dev->ad_priv; struct tiva_adc_sse_s *sse; @@ -552,7 +552,7 @@ static int tiva_adc_ioctl(struct adc_dev_s *dev, int cmd, unsigned long arg) { int ret = OK; - avdbg("cmd=%d arg=%ld\n", cmd, arg); + ainfo("cmd=%d arg=%ld\n", cmd, arg); switch (cmd) { @@ -704,7 +704,7 @@ static void tiva_adc_read(void *arg) priv->cb->au_receive(dev, tiva_adc_get_ain(sse->adc, sse->num, i), buf[i]); - avdbg("AIN%d = 0x%04x\n", + ainfo("AIN%d = 0x%04x\n", tiva_adc_get_ain(sse->adc, sse->num, i), buf[i]); } } @@ -832,9 +832,9 @@ static struct tiva_adc_s *tiva_adc_struct_init(struct tiva_adc_cfg_s *cfg) } tiva_adc_struct_init_error: - avdbg("Invalid ADC device number: expected=%d actual=%d\n", + ainfo("Invalid ADC device number: expected=%d actual=%d\n", 0, cfg->adc); - avdbg("ADC%d (CONFIG_TIVA_ADC%d) must be enabled in Kconfig first!", + ainfo("ADC%d (CONFIG_TIVA_ADC%d) must be enabled in Kconfig first!", cfg->adc, cfg->adc); return NULL; @@ -872,7 +872,7 @@ int tiva_adc_initialize(const char *devpath, struct tiva_adc_cfg_s *cfg, struct tiva_adc_s *adc; int ret = 0; - avdbg("initializing...\n"); + ainfo("initializing...\n"); /* Initialize the private ADC device data structure */ @@ -916,11 +916,11 @@ int tiva_adc_initialize(const char *devpath, struct tiva_adc_cfg_s *cfg, return -ENODEV; } - avdbg("adc_dev_s=0x%08x\n", adc->dev); + ainfo("adc_dev_s=0x%08x\n", adc->dev); /* Register the ADC driver */ - avdbg("Register the ADC driver at %s\n", devpath); + ainfo("Register the ADC driver at %s\n", devpath); ret = adc_register(devpath, adc->dev); if (ret < 0) @@ -943,7 +943,7 @@ int tiva_adc_initialize(const char *devpath, struct tiva_adc_cfg_s *cfg, void tiva_adc_lock(FAR struct tiva_adc_s *priv, int sse) { - avdbg("Locking...\n"); + ainfo("Locking...\n"); struct tiva_adc_sse_s *s = g_sses[SSE_IDX(priv->devno, sse)]; int ret; @@ -964,7 +964,7 @@ void tiva_adc_lock(FAR struct tiva_adc_s *priv, int sse) #ifdef CONFIG_DEBUG_ANALOG if (loop_count % 1000) { - avdbg("loop=%d\n"); + ainfo("loop=%d\n"); } ++loop_count; #endif @@ -982,7 +982,7 @@ void tiva_adc_lock(FAR struct tiva_adc_s *priv, int sse) void tiva_adc_unlock(FAR struct tiva_adc_s *priv, int sse) { - avdbg("Unlocking\n"); + ainfo("Unlocking\n"); struct tiva_adc_sse_s *s = g_sses[SSE_IDX(priv->devno, sse)]; sem_post(&s->exclsem); } @@ -1002,33 +1002,33 @@ void tiva_adc_unlock(FAR struct tiva_adc_s *priv, int sse) static void tiva_adc_runtimeobj_ptrs(void) { # ifdef CONFIG_TIVA_ADC0 - avdbg("ADC0 [struct] [global value] [array value]\n"); - avdbg(" adc_dev_s dev0=0x%08x g_devs[0]=0x%08x\n", + ainfo("ADC0 [struct] [global value] [array value]\n"); + ainfo(" adc_dev_s dev0=0x%08x g_devs[0]=0x%08x\n", &dev0, g_devs[0]); - avdbg(" tiva_adc_s adc0=0x%08x g_adcs[0]=0x%08x\n", + ainfo(" tiva_adc_s adc0=0x%08x g_adcs[0]=0x%08x\n", &adc0, g_adcs[0]); - avdbg(" tiva_adc_sse_s sse0=0x%08x g_sses[0,0]=0x%08x\n", + ainfo(" tiva_adc_sse_s sse0=0x%08x g_sses[0,0]=0x%08x\n", &sse00, g_sses[SSE_IDX(0, 0)]); - avdbg(" tiva_adc_sse_s sse1=0x%08x g_sses[0,1]=0x%08x\n", + ainfo(" tiva_adc_sse_s sse1=0x%08x g_sses[0,1]=0x%08x\n", &sse01, g_sses[SSE_IDX(0, 1)]); - avdbg(" tiva_adc_sse_s sse2=0x%08x g_sses[0,2]=0x%08x\n", + ainfo(" tiva_adc_sse_s sse2=0x%08x g_sses[0,2]=0x%08x\n", &sse02, g_sses[SSE_IDX(0, 2)]); - avdbg(" tiva_adc_sse_s sse3=0x%08x g_sses[0,3]=0x%08x\n", + ainfo(" tiva_adc_sse_s sse3=0x%08x g_sses[0,3]=0x%08x\n", &sse03, g_sses[SSE_IDX(0, 3)]); # endif # ifdef CONFIG_TIVA_ADC1 - avdbg("ADC1 [struct] [global value] [array value]\n"); - avdbg(" adc_dev_s dev1=0x%08x g_devs[1]=0x%08x\n", + ainfo("ADC1 [struct] [global value] [array value]\n"); + ainfo(" adc_dev_s dev1=0x%08x g_devs[1]=0x%08x\n", &dev1, g_devs[1]); - avdbg(" tiva_adc_s adc1=0x%08x g_adcs[1]=0x%08x\n", + ainfo(" tiva_adc_s adc1=0x%08x g_adcs[1]=0x%08x\n", &adc1, g_adcs[1]); - avdbg(" tiva_adc_sse_s sse0=0x%08x g_sses[1,0]=0x%08x\n", + ainfo(" tiva_adc_sse_s sse0=0x%08x g_sses[1,0]=0x%08x\n", &sse10, g_sses[SSE_IDX(1, 0)]); - avdbg(" tiva_adc_sse_s sse1=0x%08x g_sses[1,1]=0x%08x\n", + ainfo(" tiva_adc_sse_s sse1=0x%08x g_sses[1,1]=0x%08x\n", &sse11, g_sses[SSE_IDX(1, 1)]); - avdbg(" tiva_adc_sse_s sse2=0x%08x g_sses[1,2]=0x%08x\n", + ainfo(" tiva_adc_sse_s sse2=0x%08x g_sses[1,2]=0x%08x\n", &sse12, g_sses[SSE_IDX(1, 2)]); - avdbg(" tiva_adc_sse_s sse3=0x%08x g_sses[1,3]=0x%08x\n", + ainfo(" tiva_adc_sse_s sse3=0x%08x g_sses[1,3]=0x%08x\n", &sse13, g_sses[SSE_IDX(1, 3)]); # endif } @@ -1038,24 +1038,24 @@ static void tiva_adc_runtimeobj_vals(void) struct tiva_adc_sse_s *sse; uint8_t s; # ifdef CONFIG_TIVA_ADC0 - avdbg("ADC0 [0x%08x] cfg=%d ena=%d devno=%d\n", + ainfo("ADC0 [0x%08x] cfg=%d ena=%d devno=%d\n", &adc0, adc0.cfg, adc0.ena, adc0.devno); for (s = 0; s < 4; ++s) { sse = g_sses[SSE_IDX(0, s)]; - avdbg("SSE%d [0x%08x] adc=%d cfg=%d ena=%d num=%d\n", + ainfo("SSE%d [0x%08x] adc=%d cfg=%d ena=%d num=%d\n", s, sse, sse->adc, sse->cfg, sse->ena, sse->num); } # endif # ifdef CONFIG_TIVA_ADC1 - avdbg("ADC1 [0x%08x] cfg=%d ena=%d devno=%d\n", + ainfo("ADC1 [0x%08x] cfg=%d ena=%d devno=%d\n", &adc1, adc1.cfg, adc1.ena, adc1.devno); for (s = 0; s < 4; ++s) { sse = g_sses[SSE_IDX(1, s)]; - avdbg("SSE%d [0x%08x] adc=%d cfg=%d ena=%d num=%d\n", + ainfo("SSE%d [0x%08x] adc=%d cfg=%d ena=%d num=%d\n", s, sse, sse->adc, sse->cfg, sse->ena, sse->num); } # endif @@ -1072,15 +1072,15 @@ static void tiva_adc_runtimeobj_vals(void) static void tiva_adc_dump_dev(void) { # ifdef CONFIG_TIVA_ADC0 - avdbg("adc_ops_s g_adcops=0x%08x adc0.dev->ad_ops=0x%08x\n", + ainfo("adc_ops_s g_adcops=0x%08x adc0.dev->ad_ops=0x%08x\n", &g_adcops, adc0.dev->ad_ops); - avdbg("tiva_adc_s adc0=0x%08x adc0.dev->ad_priv=0x%08x\n", + ainfo("tiva_adc_s adc0=0x%08x adc0.dev->ad_priv=0x%08x\n", &adc0, adc0.dev->ad_priv); # endif # ifdef CONFIG_TIVA_ADC1 - avdbg("adc_ops_s g_adcops=0x%08x adc1.dev->ad_ops=0x%08x\n", + ainfo("adc_ops_s g_adcops=0x%08x adc1.dev->ad_ops=0x%08x\n", &g_adcops, adc1.dev->ad_ops); - avdbg("tiva_adc_s adc1=0x%08x adc1.dev->ad_priv=0x%08x\n", + ainfo("tiva_adc_s adc1=0x%08x adc1.dev->ad_priv=0x%08x\n", &adc1, adc1.dev->ad_priv); # endif } diff --git a/arch/arm/src/tiva/tiva_flash.c b/arch/arm/src/tiva/tiva_flash.c index 0dd70dd1dc..c606b18887 100644 --- a/arch/arm/src/tiva/tiva_flash.c +++ b/arch/arm/src/tiva/tiva_flash.c @@ -146,7 +146,7 @@ static int tiva_erase(FAR struct mtd_dev_s *dev, off_t startblock, { pageaddr = TIVA_VIRTUAL_BASE + curpage * TIVA_FLASH_PAGESIZE; - fvdbg("Erase page at %08x\n", pageaddr); + finfo("Erase page at %08x\n", pageaddr); /* set page address */ diff --git a/arch/arm/src/tiva/tiva_gpio.c b/arch/arm/src/tiva/tiva_gpio.c index 6ce03bdae5..4acbc6076e 100644 --- a/arch/arm/src/tiva/tiva_gpio.c +++ b/arch/arm/src/tiva/tiva_gpio.c @@ -734,13 +734,13 @@ static inline void tiva_interrupt(uint32_t pinset) #ifdef CONFIG_DEBUG_GPIO uint32_t regval; - gpiovdbg("reg expected actual: [interrupt type=%d]\n", inttype); + gpioinfo("reg expected actual: [interrupt type=%d]\n", inttype); regval = (getreg32(base+TIVA_GPIO_IS_OFFSET) & pin) ? pin : 0; - gpiovdbg("IS 0x%08x 0x%08x\n", isset, regval); + gpioinfo("IS 0x%08x 0x%08x\n", isset, regval); regval = (getreg32(base+TIVA_GPIO_IBE_OFFSET) & pin) ? pin : 0; - gpiovdbg("IBE 0x%08x 0x%08x\n", ibeset, regval); + gpioinfo("IBE 0x%08x 0x%08x\n", ibeset, regval); regval = (getreg32(base+TIVA_GPIO_IEV_OFFSET) & pin) ? pin : 0; - gpiovdbg("IEV 0x%08x 0x%08x\n", ievset, regval); + gpioinfo("IEV 0x%08x 0x%08x\n", ievset, regval); #endif } #endif @@ -988,14 +988,14 @@ void tiva_gpio_lockport(uint32_t pinset, bool lock) if (lock) { #ifdef CONFIG_DEBUG_GPIO - gpiovdbg(" locking port=%d pin=%d\n", port, pinno); + gpioinfo(" locking port=%d pin=%d\n", port, pinno); #endif modifyreg32(base + TIVA_GPIO_CR_OFFSET, pinmask, 0); } else { #ifdef CONFIG_DEBUG_GPIO - gpiovdbg("unlocking port=%d pin=%d\n", port, pinno); + gpioinfo("unlocking port=%d pin=%d\n", port, pinno); #endif modifyreg32(base + TIVA_GPIO_CR_OFFSET, 0, pinmask); } diff --git a/arch/arm/src/tiva/tiva_gpio.h b/arch/arm/src/tiva/tiva_gpio.h index 12b466042e..94a90937ff 100644 --- a/arch/arm/src/tiva/tiva_gpio.h +++ b/arch/arm/src/tiva/tiva_gpio.h @@ -328,13 +328,13 @@ #ifdef CONFIG_DEBUG_GPIO # define gpiodbg(format, ...) dbg(format, ##__VA_ARGS__) # define gpiolldbg(format, ...) lldbg(format, ##__VA_ARGS__) -# define gpiovdbg(format, ...) vdbg(format, ##__VA_ARGS__) -# define gpiollvdbg(format, ...) llvdbg(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 gpiovdbg(x...) -# define gpiollvdbg(x...) +# define gpioinfo(x...) +# define gpiollinfo(x...) #endif /**************************************************************************** diff --git a/arch/arm/src/tiva/tiva_gpioirq.c b/arch/arm/src/tiva/tiva_gpioirq.c index 33b5fa0e3a..8931988a93 100644 --- a/arch/arm/src/tiva/tiva_gpioirq.c +++ b/arch/arm/src/tiva/tiva_gpioirq.c @@ -293,7 +293,7 @@ static int tiva_gpioporthandler(uint8_t port, void *context) uint8_t pin; /* Pin number */ tiva_gpioirqclear(port, 0xff); - gpiollvdbg("mis=0b%08b\n", mis & 0xff); + gpiollinfo("mis=0b%08b\n", mis & 0xff); /* Now process each IRQ pending in the MIS */ @@ -303,7 +303,7 @@ static int tiva_gpioporthandler(uint8_t port, void *context) { if (((mis >> pin) & 1) != 0) { - gpiollvdbg("port=%d pin=%d irq=%p index=%d\n", + gpiollinfo("port=%d pin=%d irq=%p index=%d\n", port, pin, g_gpioportirqvector[TIVA_GPIO_IRQ_IDX(port, pin)], TIVA_GPIO_IRQ_IDX(port, pin)); @@ -560,7 +560,7 @@ int tiva_gpioirqinitialize(void) g_gpioportirqvector[i] = irq_unexpected_isr; } - gpiovdbg("tiva_gpioirqinitialize isr=%d/%d irq_unexpected_isr=%p\n", + gpioinfo("tiva_gpioirqinitialize isr=%d/%d irq_unexpected_isr=%p\n", i, TIVA_NIRQ_PINS, irq_unexpected_isr); /* Then attach each GPIO interrupt handlers and enable corresponding GPIO @@ -692,7 +692,7 @@ xcpt_t tiva_gpioirqattach(uint32_t pinset, xcpt_t isr) * to the unexpected interrupt handler. */ - gpiovdbg("assign port=%d pin=%d function=%p to idx=%d\n", + gpioinfo("assign port=%d pin=%d function=%p to idx=%d\n", port, pinno, isr, TIVA_GPIO_IRQ_IDX(port, pinno)); if (isr == NULL) @@ -737,7 +737,7 @@ void tiva_gpioportirqattach(uint8_t port, xcpt_t isr) * to the unexpected interrupt handler. */ - gpiovdbg("assign function=%p to port=%d\n", isr, port); + gpioinfo("assign function=%p to port=%d\n", isr, port); if (isr == NULL) { diff --git a/arch/arm/src/tiva/tiva_i2c.c b/arch/arm/src/tiva/tiva_i2c.c index 28450836f8..bf19f58248 100644 --- a/arch/arm/src/tiva/tiva_i2c.c +++ b/arch/arm/src/tiva/tiva_i2c.c @@ -123,10 +123,10 @@ #ifdef CONFIG_DEBUG_I2C # define i2cdbg dbg -# define i2cvdbg vdbg +# define i2cinfo info #else # define i2cdbg(x...) -# define i2cvdbg(x...) +# define i2cinfo(x...) #endif #ifndef CONFIG_DEBUG @@ -865,7 +865,7 @@ static inline int tiva_i2c_sem_waitdone(struct tiva_i2c_priv_s *priv) while (priv->intstate != INTSTATE_DONE && elapsed < timeout); - i2cvdbg("intstate: %d elapsed: %ld threshold: %ld status: %08x\n", + i2cinfo("intstate: %d elapsed: %ld threshold: %ld status: %08x\n", priv->intstate, (long)elapsed, (long)timeout, status); /* Set the interrupt state back to IDLE */ @@ -1676,7 +1676,7 @@ static int tiva_i2c_initialize(struct tiva_i2c_priv_s *priv, uint32_t frequency) uint32_t regval; int ret; - i2cvdbg("I2C%d: refs=%d\n", config->devno, priv->refs); + i2cinfo("I2C%d: refs=%d\n", config->devno, priv->refs); /* Enable power and clocking to the I2C peripheral. * @@ -1692,12 +1692,12 @@ static int tiva_i2c_initialize(struct tiva_i2c_priv_s *priv, uint32_t frequency) tiva_i2c_enablepwr(config->devno); tiva_i2c_enableclk(config->devno); - i2cvdbg("I2C%d: RCGI2C[%08x]=%08x\n", + i2cinfo("I2C%d: RCGI2C[%08x]=%08x\n", config->devno, TIVA_SYSCON_RCGCI2C, getreg32(TIVA_SYSCON_RCGCI2C)); #else modifyreg32(TIVA_SYSCON_RCGC1, 0, priv->rcgbit); - i2cvdbg("I2C%d: RCGC1[%08x]=%08x\n", + i2cinfo("I2C%d: RCGC1[%08x]=%08x\n", config->devno, TIVA_SYSCON_RCGC1, getreg32(TIVA_SYSCON_RCGC1)); #endif @@ -1713,13 +1713,13 @@ static int tiva_i2c_initialize(struct tiva_i2c_priv_s *priv, uint32_t frequency) /* Configure pins */ - i2cvdbg("I2C%d: SCL=%08x SDA=%08x\n", + i2cinfo("I2C%d: SCL=%08x SDA=%08x\n", config->devno, config->scl_pin, config->sda_pin); ret = tiva_configgpio(config->scl_pin); if (ret < 0) { - i2cvdbg("I2C%d: tiva_configgpio(%08x) failed: %d\n", + i2cinfo("I2C%d: tiva_configgpio(%08x) failed: %d\n", config->scl_pin, ret); return ret; } @@ -1727,7 +1727,7 @@ static int tiva_i2c_initialize(struct tiva_i2c_priv_s *priv, uint32_t frequency) ret = tiva_configgpio(config->sda_pin); if (ret < 0) { - i2cvdbg("I2C%d: tiva_configgpio(%08x) failed: %d\n", + i2cinfo("I2C%d: tiva_configgpio(%08x) failed: %d\n", config->sda_pin, ret); tiva_configgpio(MKI2C_INPUT(config->scl_pin)); return ret; @@ -1779,7 +1779,7 @@ static int tiva_i2c_uninitialize(struct tiva_i2c_priv_s *priv) { uint32_t regval; - i2cvdbg("I2C%d: refs=%d\n", priv->config->devno, priv->refs); + i2cinfo("I2C%d: refs=%d\n", priv->config->devno, priv->refs); /* Disable I2C */ @@ -1823,7 +1823,7 @@ static void tiva_i2c_setclock(struct tiva_i2c_priv_s *priv, uint32_t frequency) uint32_t regval; uint32_t tmp; - i2cvdbg("I2C%d: frequency: %u\n", priv->config->devno, frequency); + i2cinfo("I2C%d: frequency: %u\n", priv->config->devno, frequency); /* Has the I2C bus frequency changed? */ @@ -1876,7 +1876,7 @@ static int tiva_i2c_transfer(struct i2c_master_s *dev, struct i2c_msg_s *msgv, int ret = OK; DEBUGASSERT(priv && priv->config && msgv && msgc > 0); - i2cvdbg("I2C%d: msgc=%d\n", priv->config->devno, msgc); + i2cinfo("I2C%d: msgc=%d\n", priv->config->devno, msgc); tiva_i2c_sem_wait(priv); /* Ensure that address or flags don't change meanwhile */ @@ -2027,7 +2027,7 @@ static int tiva_i2c_reset(FAR struct i2c_master_s * dev) int ret = ERROR; DEBUGASSERT(priv && priv->config); - i2cvdbg("I2C%d:\n", priv->config->devno); + i2cinfo("I2C%d:\n", priv->config->devno); /* Our caller must own a ref */ @@ -2144,7 +2144,7 @@ struct i2c_master_s *tiva_i2cbus_initialize(int port) const struct tiva_i2c_config_s *config; int flags; - i2cvdbg("I2C%d: Initialize\n", port); + i2cinfo("I2C%d: Initialize\n", port); /* Get I2C private structure */ @@ -2267,7 +2267,7 @@ int tiva_i2cbus_uninitialize(struct i2c_master_s *dev) DEBUGASSERT(priv && priv->config && priv->refs > 0); - i2cvdbg("I2C%d: Uninitialize\n", priv->config->devno); + i2cinfo("I2C%d: Uninitialize\n", priv->config->devno); /* Decrement reference count and check for underflow */ diff --git a/arch/arm/src/tiva/tiva_ssi.c b/arch/arm/src/tiva/tiva_ssi.c index 451db9fdf9..b4147b1567 100644 --- a/arch/arm/src/tiva/tiva_ssi.c +++ b/arch/arm/src/tiva/tiva_ssi.c @@ -74,10 +74,10 @@ #ifdef SSI_DEBUG # define ssidbg lldbg -# define ssivdbg llvdbg +# define ssiinfo llinfo #else # define ssidbg(x...) -# define ssivdbg(x...) +# define ssiinfo(x...) #endif /* How many SSI modules does this chip support? The LM3S6918 supports 2 SSI @@ -462,7 +462,7 @@ static uint32_t ssi_disable(struct tiva_ssidev_s *priv) retval = ssi_getreg(priv, TIVA_SSI_CR1_OFFSET); regval = (retval & ~SSI_CR1_SSE); ssi_putreg(priv, TIVA_SSI_CR1_OFFSET, regval); - ssivdbg("CR1: %08x\n", regval); + ssiinfo("CR1: %08x\n", regval); return retval; } @@ -489,7 +489,7 @@ static void ssi_enable(struct tiva_ssidev_s *priv, uint32_t enable) regval &= ~SSI_CR1_SSE; regval |= (enable & SSI_CR1_SSE); ssi_putreg(priv, TIVA_SSI_CR1_OFFSET, regval); - ssivdbg("CR1: %08x\n", regval); + ssiinfo("CR1: %08x\n", regval); } /**************************************************************************** @@ -538,14 +538,14 @@ static void ssi_semtake(sem_t *sem) static void ssi_txnull(struct tiva_ssidev_s *priv) { - ssivdbg("TX: ->0xffff\n"); + ssiinfo("TX: ->0xffff\n"); ssi_putreg(priv, TIVA_SSI_DR_OFFSET, 0xffff); } static void ssi_txuint16(struct tiva_ssidev_s *priv) { uint16_t *ptr = (uint16_t *)priv->txbuffer; - ssivdbg("TX: %p->%04x\n", ptr, *ptr); + ssiinfo("TX: %p->%04x\n", ptr, *ptr); ssi_putreg(priv, TIVA_SSI_DR_OFFSET, (uint32_t)(*ptr++)); priv->txbuffer = (void *)ptr; } @@ -553,7 +553,7 @@ static void ssi_txuint16(struct tiva_ssidev_s *priv) static void ssi_txuint8(struct tiva_ssidev_s *priv) { uint8_t *ptr = (uint8_t *)priv->txbuffer; - ssivdbg("TX: %p->%02x\n", ptr, *ptr); + ssiinfo("TX: %p->%02x\n", ptr, *ptr); ssi_putreg(priv, TIVA_SSI_DR_OFFSET, (uint32_t)(*ptr++)); priv->txbuffer = (void *)ptr; } @@ -579,7 +579,7 @@ static void ssi_rxnull(struct tiva_ssidev_s *priv) { #if defined(SSI_DEBUG) && defined(CONFIG_DEBUG_INFO) uint32_t regval = ssi_getreg(priv, TIVA_SSI_DR_OFFSET); - ssivdbg("RX: discard %04x\n", regval); + ssiinfo("RX: discard %04x\n", regval); #else (void)ssi_getreg(priv, TIVA_SSI_DR_OFFSET); #endif @@ -589,7 +589,7 @@ static void ssi_rxuint16(struct tiva_ssidev_s *priv) { uint16_t *ptr = (uint16_t *)priv->rxbuffer; *ptr = (uint16_t)ssi_getreg(priv, TIVA_SSI_DR_OFFSET); - ssivdbg("RX: %p<-%04x\n", ptr, *ptr); + ssiinfo("RX: %p<-%04x\n", ptr, *ptr); priv->rxbuffer = (void *)(++ptr); } @@ -597,7 +597,7 @@ static void ssi_rxuint8(struct tiva_ssidev_s *priv) { uint8_t *ptr = (uint8_t *)priv->rxbuffer; *ptr = (uint8_t)ssi_getreg(priv, TIVA_SSI_DR_OFFSET); - ssivdbg("RX: %p<-%02x\n", ptr, *ptr); + ssiinfo("RX: %p<-%02x\n", ptr, *ptr); priv->rxbuffer = (void *)(++ptr); } @@ -882,7 +882,7 @@ static int ssi_transfer(struct tiva_ssidev_s *priv, const void *txbuffer, #ifndef CONFIG_SSI_POLLWAIT flags = enter_critical_section(); - ssivdbg("ntxwords: %d nrxwords: %d nwords: %d SR: %08x\n", + ssiinfo("ntxwords: %d nrxwords: %d nwords: %d SR: %08x\n", priv->ntxwords, priv->nrxwords, priv->nwords, ssi_getreg(priv, TIVA_SSI_SR_OFFSET)); @@ -896,7 +896,7 @@ static int ssi_transfer(struct tiva_ssidev_s *priv, const void *txbuffer, ssi_performrx(priv); - ssivdbg("ntxwords: %d nrxwords: %d nwords: %d SR: %08x IM: %08x\n", + ssiinfo("ntxwords: %d nrxwords: %d nwords: %d SR: %08x IM: %08x\n", priv->ntxwords, priv->nrxwords, priv->nwords, ssi_getreg(priv, TIVA_SSI_SR_OFFSET), ssi_getreg(priv, TIVA_SSI_IM_OFFSET)); @@ -906,7 +906,7 @@ static int ssi_transfer(struct tiva_ssidev_s *priv, const void *txbuffer, * with the transfer, so it should be safe with no timeout. */ - ssivdbg("Waiting for transfer complete\n"); + ssiinfo("Waiting for transfer complete\n"); leave_critical_section(flags); do { @@ -1029,7 +1029,7 @@ static int ssi_interrupt(int irq, void *context) } #endif - ssivdbg("ntxwords: %d nrxwords: %d nwords: %d SR: %08x\n", + ssiinfo("ntxwords: %d nrxwords: %d nwords: %d SR: %08x\n", priv->ntxwords, priv->nrxwords, priv->nwords, ssi_getreg(priv, TIVA_SSI_SR_OFFSET)); @@ -1041,7 +1041,7 @@ static int ssi_interrupt(int irq, void *context) ssi_performrx(priv); - ssivdbg("ntxwords: %d nrxwords: %d nwords: %d SR: %08x IM: %08x\n", + ssiinfo("ntxwords: %d nrxwords: %d nwords: %d SR: %08x IM: %08x\n", priv->ntxwords, priv->nrxwords, priv->nwords, ssi_getreg(priv, TIVA_SSI_SR_OFFSET), ssi_getreg(priv, TIVA_SSI_IM_OFFSET)); @@ -1207,7 +1207,7 @@ static uint32_t ssi_setfrequencyinternal(struct tiva_ssidev_s *priv, regval &= ~SSI_CR0_SCR_MASK; regval |= (scr << SSI_CR0_SCR_SHIFT); ssi_putreg(priv, TIVA_SSI_CR0_OFFSET, regval); - ssivdbg("CR0: %08x CPSR: %08x\n", regval, cpsdvsr); + ssiinfo("CR0: %08x CPSR: %08x\n", regval, cpsdvsr); /* Calcluate the actual frequency */ @@ -1298,7 +1298,7 @@ static void ssi_setmodeinternal(struct tiva_ssidev_s *priv, enum spi_mode_e mode regval &= ~(SSI_CR0_FRF_MASK | SSI_CR0_SPH | SSI_CR0_SPO); regval |= modebits; ssi_putreg(priv, TIVA_SSI_CR0_OFFSET, regval); - ssivdbg("CR0: %08x\n", regval); + ssiinfo("CR0: %08x\n", regval); /* Save the mode so that subsequent re-configuratins will be faster */ @@ -1348,7 +1348,7 @@ static void ssi_setbitsinternal(struct tiva_ssidev_s *priv, int nbits) regval &= ~SSI_CR0_DSS_MASK; regval |= ((nbits - 1) << SSI_CR0_DSS_SHIFT); ssi_putreg(priv, TIVA_SSI_CR0_OFFSET, regval); - ssivdbg("CR0: %08x\n", regval); + ssiinfo("CR0: %08x\n", regval); priv->nbits = nbits; } diff --git a/arch/arm/src/tiva/tiva_timer.h b/arch/arm/src/tiva/tiva_timer.h index 0f262bc73e..6ae90d8292 100644 --- a/arch/arm/src/tiva/tiva_timer.h +++ b/arch/arm/src/tiva/tiva_timer.h @@ -135,10 +135,10 @@ #ifdef CONFIG_DEBUG_TIMER # define timdbg lldbg -# define timvdbg llvdbg +# define timinfo llinfo #else # define timdbg(x...) -# define timvdbg(x...) +# define timinfo(x...) #endif /**************************************************************************** diff --git a/arch/arm/src/tiva/tiva_timerlib.c b/arch/arm/src/tiva/tiva_timerlib.c index fd6b5805db..b71fc1f35b 100644 --- a/arch/arm/src/tiva/tiva_timerlib.c +++ b/arch/arm/src/tiva/tiva_timerlib.c @@ -1776,7 +1776,7 @@ TIMER_HANDLE tiva_gptm_configure(const struct tiva_gptmconfig_s *config) priv->clkin = ALTCLK_FREQUENCY; #else - timvdbg("tiva_gptm_configure: Error: alternate clock only available on TM4C129 devices\n"); + timinfo("tiva_gptm_configure: Error: alternate clock only available on TM4C129 devices\n"); return (TIMER_HANDLE)NULL; #endif /* CONFIG_ARCH_CHIP_TM4C129 */ } @@ -2564,7 +2564,7 @@ uint32_t tiva_timer32_remaining(TIMER_HANDLE handle) uint32_t interval; uint32_t remaining; - timvdbg("Entry\n"); + timinfo("Entry\n"); DEBUGASSERT(priv && priv->attr && priv->config && priv->config->mode != TIMER16_MODE); diff --git a/arch/arm/src/tiva/tiva_timerlow32.c b/arch/arm/src/tiva/tiva_timerlow32.c index ac3ac065f5..8840ba55d6 100644 --- a/arch/arm/src/tiva/tiva_timerlow32.c +++ b/arch/arm/src/tiva/tiva_timerlow32.c @@ -200,7 +200,7 @@ static uint32_t tiva_ticks2usec(struct tiva_lowerhalf_s *priv, uint32_t ticks) static void tiva_timeout(struct tiva_lowerhalf_s *priv, uint32_t timeout) { - timvdbg("Entry: timeout=%d\n", timeout); + timinfo("Entry: timeout=%d\n", timeout); /* Save the desired timeout value */ @@ -215,7 +215,7 @@ static void tiva_timeout(struct tiva_lowerhalf_s *priv, uint32_t timeout) timeout = tiva_ticks2usec(priv, priv->clkticks); priv->adjustment = priv->timeout - timeout; - timvdbg("clkin=%d clkticks=%d timeout=%d, adjustment=%d\n", + timinfo("clkin=%d clkticks=%d timeout=%d, adjustment=%d\n", priv->clkin, priv->clkticks, priv->timeout, priv->adjustment); } @@ -237,7 +237,7 @@ static void tiva_timer_handler(TIMER_HANDLE handle, void *arg, uint32_t status) { struct tiva_lowerhalf_s *priv = (struct tiva_lowerhalf_s *)arg; - timvdbg("Entry: status=%08x\n", status); + timinfo("Entry: status=%08x\n", status); DEBUGASSERT(arg && status); /* Check if the timeout interrupt is pending */ @@ -276,7 +276,7 @@ static void tiva_timer_handler(TIMER_HANDLE handle, void *arg, uint32_t status) /* No handler or the handler returned false.. stop the timer */ tiva_timer32_stop(priv->handle); - timvdbg("Stopped\n"); + timinfo("Stopped\n"); } } } @@ -300,7 +300,7 @@ static int tiva_start(struct timer_lowerhalf_s *lower) { struct tiva_lowerhalf_s *priv = (struct tiva_lowerhalf_s *)lower; - timvdbg("Entry: started %d\n", priv->started); + timinfo("Entry: started %d\n", priv->started); /* Has the timer already been started? */ @@ -337,7 +337,7 @@ static int tiva_stop(struct timer_lowerhalf_s *lower) { struct tiva_lowerhalf_s *priv = (struct tiva_lowerhalf_s *)lower; - timvdbg("Entry: started %d\n", priv->started); + timinfo("Entry: started %d\n", priv->started); /* Has the timer already been started? */ @@ -377,7 +377,7 @@ static int tiva_getstatus(struct timer_lowerhalf_s *lower, struct tiva_lowerhalf_s *priv = (struct tiva_lowerhalf_s *)lower; uint32_t remaining; - timvdbg("Entry\n"); + timinfo("Entry\n"); DEBUGASSERT(priv); /* Return the status bit */ @@ -402,9 +402,9 @@ static int tiva_getstatus(struct timer_lowerhalf_s *lower, remaining = tiva_timer32_remaining(priv->handle); status->timeleft = tiva_ticks2usec(priv, remaining); - timvdbg(" flags : %08x\n", status->flags); - timvdbg(" timeout : %d\n", status->timeout); - timvdbg(" timeleft : %d\n", status->timeleft); + timinfo(" flags : %08x\n", status->flags); + timinfo(" timeout : %d\n", status->timeout); + timinfo(" timeleft : %d\n", status->timeleft); return OK; } @@ -435,7 +435,7 @@ static int tiva_settimeout(struct timer_lowerhalf_s *lower, uint32_t timeout) return -EPERM; } - timvdbg("Entry: timeout=%d\n", timeout); + timinfo("Entry: timeout=%d\n", timeout); /* Calculate the the new time settings */ @@ -476,7 +476,7 @@ static tccb_t tiva_sethandler(struct timer_lowerhalf_s *lower, flags = enter_critical_section(); DEBUGASSERT(priv); - timvdbg("Entry: handler=%p\n", handler); + timinfo("Entry: handler=%p\n", handler); /* Get the old handler return value */ @@ -516,7 +516,7 @@ static int tiva_ioctl(struct timer_lowerhalf_s *lower, int cmd, int ret = -ENOTTY; DEBUGASSERT(priv); - timvdbg("Entry: cmd=%d arg=%ld\n", cmd, arg); + timinfo("Entry: cmd=%d arg=%ld\n", cmd, arg); return ret; } @@ -557,7 +557,7 @@ int tiva_timer_initialize(FAR const char *devpath, void *drvr; int ret; - timvdbg("\n"); + timinfo("\n"); DEBUGASSERT(devpath); /* Allocate an instance of the lower half state structure */ diff --git a/arch/arm/src/tiva/tm4c_ethernet.c b/arch/arm/src/tiva/tm4c_ethernet.c index eeb36a32ec..5a77fc5c4b 100644 --- a/arch/arm/src/tiva/tm4c_ethernet.c +++ b/arch/arm/src/tiva/tm4c_ethernet.c @@ -1051,7 +1051,7 @@ static int tiva_transmit(FAR struct tiva_ethmac_s *priv) txdesc = priv->txhead; txfirst = txdesc; - nvdbg("d_len: %d d_buf: %p txhead: %p tdes0: %08x\n", + ninfo("d_len: %d d_buf: %p txhead: %p tdes0: %08x\n", priv->dev.d_len, priv->dev.d_buf, txdesc, txdesc->tdes0); DEBUGASSERT(txdesc && (txdesc->tdes0 & EMAC_TDES0_OWN) == 0); @@ -1068,7 +1068,7 @@ static int tiva_transmit(FAR struct tiva_ethmac_s *priv) bufcount = (priv->dev.d_len + (OPTIMAL_EMAC_BUFSIZE-1)) / OPTIMAL_EMAC_BUFSIZE; lastsize = priv->dev.d_len - (bufcount - 1) * OPTIMAL_EMAC_BUFSIZE; - nvdbg("bufcount: %d lastsize: %d\n", bufcount, lastsize); + ninfo("bufcount: %d lastsize: %d\n", bufcount, lastsize); /* Set the first segment bit in the first TX descriptor */ @@ -1178,7 +1178,7 @@ static int tiva_transmit(FAR struct tiva_ethmac_s *priv) priv->inflight++; - nvdbg("txhead: %p txtail: %p inflight: %d\n", + ninfo("txhead: %p txtail: %p inflight: %d\n", priv->txhead, priv->txtail, priv->inflight); /* If all TX descriptors are in-flight, then we have to disable receive interrupts @@ -1477,7 +1477,7 @@ static void tiva_freesegment(FAR struct tiva_ethmac_s *priv, struct emac_rxdesc_s *rxdesc; int i; - nvdbg("rxfirst: %p segments: %d\n", rxfirst, segments); + ninfo("rxfirst: %p segments: %d\n", rxfirst, segments); /* Set OWN bit in RX descriptors. This gives the buffers back to DMA */ @@ -1535,7 +1535,7 @@ static int tiva_recvframe(FAR struct tiva_ethmac_s *priv) uint8_t *buffer; int i; - nvdbg("rxhead: %p rxcurr: %p segments: %d\n", + ninfo("rxhead: %p rxcurr: %p segments: %d\n", priv->rxhead, priv->rxcurr, priv->segments); /* Check if there are free buffers. We cannot receive new frames in this @@ -1601,7 +1601,7 @@ static int tiva_recvframe(FAR struct tiva_ethmac_s *priv) rxcurr = priv->rxcurr; } - nvdbg("rxhead: %p rxcurr: %p segments: %d\n", + ninfo("rxhead: %p rxcurr: %p segments: %d\n", priv->rxhead, priv->rxcurr, priv->segments); /* Check if any errors are reported in the frame */ @@ -1640,7 +1640,7 @@ static int tiva_recvframe(FAR struct tiva_ethmac_s *priv) priv->rxhead = (struct emac_rxdesc_s *)rxdesc->rdes3; tiva_freesegment(priv, rxcurr, priv->segments); - nvdbg("rxhead: %p d_buf: %p d_len: %d\n", + ninfo("rxhead: %p d_buf: %p d_len: %d\n", priv->rxhead, dev->d_buf, dev->d_len); return OK; @@ -1667,7 +1667,7 @@ static int tiva_recvframe(FAR struct tiva_ethmac_s *priv) priv->rxhead = rxdesc; - nvdbg("rxhead: %p rxcurr: %p segments: %d\n", + ninfo("rxhead: %p rxcurr: %p segments: %d\n", priv->rxhead, priv->rxcurr, priv->segments); return -EAGAIN; @@ -1721,7 +1721,7 @@ static void tiva_receive(FAR struct tiva_ethmac_s *priv) #ifdef CONFIG_NET_IPv4 if (BUF->type == HTONS(ETHTYPE_IP)) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); /* Handle ARP on input then give the IPv4 packet to the network * layer @@ -1760,7 +1760,7 @@ static void tiva_receive(FAR struct tiva_ethmac_s *priv) #ifdef CONFIG_NET_IPv6 if (BUF->type == HTONS(ETHTYPE_IP6)) { - nllvdbg("IPv6 frame\n"); + nllinfo("IPv6 frame\n"); /* Give the IPv6 packet to the network layer */ @@ -1797,7 +1797,7 @@ static void tiva_receive(FAR struct tiva_ethmac_s *priv) #ifdef CONFIG_NET_ARP if (BUF->type == htons(ETHTYPE_ARP)) { - nvdbg("ARP frame\n"); + ninfo("ARP frame\n"); /* Handle ARP packet */ @@ -1856,7 +1856,7 @@ static void tiva_freeframe(FAR struct tiva_ethmac_s *priv) FAR struct emac_txdesc_s *txdesc; int i; - nvdbg("txhead: %p txtail: %p inflight: %d\n", + ninfo("txhead: %p txtail: %p inflight: %d\n", priv->txhead, priv->txtail, priv->inflight); /* Scan for "in-flight" descriptors owned by the CPU */ @@ -1872,7 +1872,7 @@ static void tiva_freeframe(FAR struct tiva_ethmac_s *priv) * TX descriptors. */ - nvdbg("txtail: %p tdes0: %08x tdes2: %08x tdes3: %08x\n", + ninfo("txtail: %p tdes0: %08x tdes2: %08x tdes3: %08x\n", txdesc, txdesc->tdes0, txdesc->tdes2, txdesc->tdes3); DEBUGASSERT(txdesc->tdes2 != 0); @@ -1925,7 +1925,7 @@ static void tiva_freeframe(FAR struct tiva_ethmac_s *priv) priv->txtail = txdesc; - nvdbg("txhead: %p txtail: %p inflight: %d\n", + ninfo("txhead: %p txtail: %p inflight: %d\n", priv->txhead, priv->txtail, priv->inflight); } } @@ -2541,7 +2541,7 @@ static int tiva_ifdown(struct net_driver_s *dev) FAR struct tiva_ethmac_s *priv = (FAR struct tiva_ethmac_s *)dev->d_private; irqstate_t flags; - nvdbg("Taking the network down\n"); + ninfo("Taking the network down\n"); /* Disable the Ethernet interrupt */ @@ -2586,7 +2586,7 @@ static int tiva_ifdown(struct net_driver_s *dev) static inline void tiva_txavail_process(FAR struct tiva_ethmac_s *priv) { - nvdbg("ifup: %d\n", priv->ifup); + ninfo("ifup: %d\n", priv->ifup); /* Ignore the notification if the interface is not yet up */ @@ -2753,7 +2753,7 @@ static int tiva_addmac(struct net_driver_s *dev, FAR const uint8_t *mac) uint32_t temp; uint32_t registeraddress; - nvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + ninfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); /* Add the MAC address to the hardware multicast hash table */ @@ -2810,7 +2810,7 @@ static int tiva_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac) uint32_t temp; uint32_t registeraddress; - nvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + ninfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); /* Remove the MAC address to the hardware multicast hash table */ @@ -3416,7 +3416,7 @@ static int tiva_phyinit(FAR struct tiva_ethmac_s *priv) /* Remember the selected speed and duplex modes */ - nvdbg("PHYSR[%d]: %04x\n", CONFIG_TIVA_PHYSR, phyval); + ninfo("PHYSR[%d]: %04x\n", CONFIG_TIVA_PHYSR, phyval); /* Different PHYs present speed and mode information in different ways. IF * This CONFIG_TIVA_PHYSR_ALTCONFIG is selected, this indicates that the PHY @@ -3599,7 +3599,7 @@ static inline void tiva_phy_initialize(FAR struct tiva_ethmac_s *priv) { /* Enable the clock to the PHY module */ - nllvdbg("Enable EPHY clocking\n"); + nllinfo("Enable EPHY clocking\n"); tiva_ephy_enableclk(); /* What until the PREPHY register indicates that the PHY is ready before @@ -3611,7 +3611,7 @@ static inline void tiva_phy_initialize(FAR struct tiva_ethmac_s *priv) /* Enable power to the Ethernet PHY */ - nllvdbg("Enable EPHY power\n"); + nllinfo("Enable EPHY power\n"); tiva_ephy_enablepwr(); /* What until the PREPHY register indicates that the PHY registers are ready @@ -3621,11 +3621,11 @@ static inline void tiva_phy_initialize(FAR struct tiva_ethmac_s *priv) while (!tiva_ephy_periphrdy()); up_udelay(250); - nllvdbg("RCGCEPHY: %08x PCEPHY: %08x PREPHY: %08x\n", + nllinfo("RCGCEPHY: %08x PCEPHY: %08x PREPHY: %08x\n", getreg32(TIVA_SYSCON_RCGCEPHY), getreg32(TIVA_SYSCON_PCEPHY), getreg32(TIVA_SYSCON_PREPHY)); - nllvdbg("Configure PHY GPIOs\n"); + nllinfo("Configure PHY GPIOs\n"); #ifdef CONFIG_TIVA_PHY_INTERNAL /* Integrated PHY: @@ -3931,7 +3931,7 @@ static void tiva_macaddress(FAR struct tiva_ethmac_s *priv) FAR struct net_driver_s *dev = &priv->dev; uint32_t regval; - nvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + ninfo("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", dev->d_ifname, 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], @@ -3999,7 +3999,7 @@ static void tiva_ipv6multicast(FAR struct tiva_ethmac_s *priv) mac[4] = tmp16 & 0xff; mac[5] = tmp16 >> 8; - nvdbg("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n", + ninfo("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); (void)tiva_addmac(dev, mac); @@ -4129,12 +4129,12 @@ static int tive_emac_configure(FAR struct tiva_ethmac_s *priv) /* Reset the Ethernet block */ - nvdbg("Reset the Ethernet block\n"); + ninfo("Reset the Ethernet block\n"); tiva_ethreset(priv); /* Initialize the PHY */ - nvdbg("Initialize the PHY\n"); + ninfo("Initialize the PHY\n"); ret = tiva_phyinit(priv); if (ret < 0) { @@ -4143,7 +4143,7 @@ static int tive_emac_configure(FAR struct tiva_ethmac_s *priv) /* Initialize the MAC and DMA */ - nvdbg("Initialize the MAC and DMA\n"); + ninfo("Initialize the MAC and DMA\n"); ret = tiva_macconfig(priv); if (ret < 0) { @@ -4164,7 +4164,7 @@ static int tive_emac_configure(FAR struct tiva_ethmac_s *priv) /* Enable normal MAC operation */ - nvdbg("Enable normal operation\n"); + ninfo("Enable normal operation\n"); return tiva_macenable(priv); } @@ -4201,7 +4201,7 @@ int tiva_ethinitialize(int intf) struct tiva_ethmac_s *priv; uint32_t regval; - nllvdbg("intf: %d\n", intf); + nllinfo("intf: %d\n", intf); /* Get the interface structure associated with this interface number. */ @@ -4247,7 +4247,7 @@ int tiva_ethinitialize(int intf) * bringing it a fully functional state. */ - nllvdbg("Enable EMAC clocking\n"); + nllinfo("Enable EMAC clocking\n"); tiva_emac_enablepwr(); /* Ethernet MAC Power Control */ tiva_emac_enableclk(); /* Ethernet MAC Run Mode Clock Gating Control */ @@ -4260,7 +4260,7 @@ int tiva_ethinitialize(int intf) /* Show all EMAC clocks */ - nllvdbg("RCGCEMAC: %08x PCEMAC: %08x PREMAC: %08x MOSCCTL: %08x\n", + nllinfo("RCGCEMAC: %08x PCEMAC: %08x PREMAC: %08x MOSCCTL: %08x\n", getreg32(TIVA_SYSCON_RCGCEMAC), getreg32(TIVA_SYSCON_PCEMAC), getreg32(TIVA_SYSCON_PREMAC), @@ -4309,7 +4309,7 @@ int tiva_ethinitialize(int intf) /* Register the device with the OS so that socket IOCTLs can be performed */ - nllvdbg("Registering Ethernet device\n"); + nllinfo("Registering Ethernet device\n"); return netdev_register(&priv->dev, NET_LL_ETHERNET); } @@ -4411,7 +4411,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable) xcpt_t oldhandler; DEBUGASSERT(intf); - nvdbg("%s: handler=%p\n", intf, handler); + ninfo("%s: handler=%p\n", intf, handler); /* Get the interface structure associated with this interface. */ diff --git a/arch/avr/src/at90usb/at90usb_usbdev.c b/arch/avr/src/at90usb/at90usb_usbdev.c index 7bfe6639b4..98a8d2cd2f 100644 --- a/arch/avr/src/at90usb/at90usb_usbdev.c +++ b/arch/avr/src/at90usb/at90usb_usbdev.c @@ -1399,7 +1399,7 @@ static inline void avr_ep0setup(void) index = GETUINT16(ctrl.index); len = GETUINT16(ctrl.len); - ullvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n", + ullinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n", ctrl.type, ctrl.req, value, index, len); /* Dispatch any non-standard requests */ @@ -1596,7 +1596,7 @@ static inline void avr_ep0setup(void) #ifdef CONFIG_USBDEV_SELFPOWERED if (value == USB_FEATURE_TESTMODE) { - ullvdbg("test mode: %d\n", index); + ullinfo("test mode: %d\n", index); } else if (value == USB_FEATURE_REMOTEWAKEUP) { @@ -2386,7 +2386,7 @@ static int avr_epsubmit(FAR struct usbdev_ep_s *ep, if (!req || !req->callback || !req->buf || !ep) { usbtrace(TRACE_DEVERROR(AVR_TRACEERR_INVALIDPARMS), 0); - ullvdbg("req=%p callback=%p buf=%p ep=%p\n", + ullinfo("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); return -EINVAL; } diff --git a/arch/avr/src/avr/up_spi.c b/arch/avr/src/avr/up_spi.c index 94de828c15..0e78443012 100644 --- a/arch/avr/src/avr/up_spi.c +++ b/arch/avr/src/avr/up_spi.c @@ -74,14 +74,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /**************************************************************************** diff --git a/arch/hc/src/m9s12/m9s12_ethernet.c b/arch/hc/src/m9s12/m9s12_ethernet.c index ad3e1ef6b8..4b9dbfeef7 100644 --- a/arch/hc/src/m9s12/m9s12_ethernet.c +++ b/arch/hc/src/m9s12/m9s12_ethernet.c @@ -294,7 +294,7 @@ static void emac_receive(FAR struct emac_driver_s *priv) #ifdef CONFIG_NET_IPv4 if (BUF->type == HTONS(ETHTYPE_IP)) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); /* Handle ARP on input then give the IPv4 packet to the network * layer @@ -334,7 +334,7 @@ static void emac_receive(FAR struct emac_driver_s *priv) #ifdef CONFIG_NET_IPv6 if (BUF->type == HTONS(ETHTYPE_IP6)) { - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); /* Give the IPv6 packet to the network layer */ diff --git a/arch/mips/src/mips32/up_schedulesigaction.c b/arch/mips/src/mips32/up_schedulesigaction.c index 1c8612ffd9..86cba18c74 100644 --- a/arch/mips/src/mips32/up_schedulesigaction.c +++ b/arch/mips/src/mips32/up_schedulesigaction.c @@ -163,7 +163,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) up_savestate(tcb->xcp.regs); - svdbg("PC/STATUS Saved: %08x/%08x New: %08x/%08x\n", + sinfo("PC/STATUS Saved: %08x/%08x New: %08x/%08x\n", tcb->xcp.saved_epc, tcb->xcp.saved_status, g_current_regs[REG_EPC], g_current_regs[REG_STATUS]); } @@ -196,7 +196,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) status |= CP0_STATUS_IM_SWINTS; tcb->xcp.regs[REG_STATUS] = status; - svdbg("PC/STATUS Saved: %08x/%08x New: %08x/%08x\n", + sinfo("PC/STATUS Saved: %08x/%08x New: %08x/%08x\n", tcb->xcp.saved_epc, tcb->xcp.saved_status, tcb->xcp.regs[REG_EPC], tcb->xcp.regs[REG_STATUS]); } diff --git a/arch/mips/src/mips32/up_sigdeliver.c b/arch/mips/src/mips32/up_sigdeliver.c index a841a941b8..5237a697b7 100644 --- a/arch/mips/src/mips32/up_sigdeliver.c +++ b/arch/mips/src/mips32/up_sigdeliver.c @@ -127,7 +127,7 @@ void up_sigdeliver(void) * errno that is needed by the user logic (it is probably EINTR). */ - svdbg("Resuming EPC: %08x STATUS: %08x\n", regs[REG_EPC], regs[REG_STATUS]); + sinfo("Resuming EPC: %08x STATUS: %08x\n", regs[REG_EPC], regs[REG_STATUS]); (void)up_irq_save(); rtcb->pterrno = saved_errno; diff --git a/arch/mips/src/mips32/up_vfork.c b/arch/mips/src/mips32/up_vfork.c index dda54ae179..552ffa335a 100644 --- a/arch/mips/src/mips32/up_vfork.c +++ b/arch/mips/src/mips32/up_vfork.c @@ -123,26 +123,26 @@ pid_t up_vfork(const struct vfork_s *context) uint32_t stackutil; int ret; - svdbg("s0:%08x s1:%08x s2:%08x s3:%08x s4:%08x\n", + sinfo("s0:%08x s1:%08x s2:%08x s3:%08x s4:%08x\n", context->s0, context->s1, context->s2, context->s3, context->s4); #ifdef CONFIG_MIPS32_FRAMEPOINTER - svdbg("s5:%08x s6:%08x s7:%08x\n", + sinfo("s5:%08x s6:%08x s7:%08x\n", context->s5, context->s6, context->s7); #ifdef MIPS32_SAVE_GP - svdbg("fp:%08x sp:%08x ra:%08x gp:%08x\n", + sinfo("fp:%08x sp:%08x ra:%08x gp:%08x\n", context->fp, context->sp, context->ra, context->gp); #else - svdbg("fp:%08x sp:%08x ra:%08x\n", + sinfo("fp:%08x sp:%08x ra:%08x\n", context->fp context->sp, context->ra); #endif #else - svdbg("s5:%08x s6:%08x s7:%08x s8:%08x\n", + sinfo("s5:%08x s6:%08x s7:%08x s8:%08x\n", context->s5, context->s6, context->s7, context->s8); #ifdef MIPS32_SAVE_GP - svdbg("sp:%08x ra:%08x gp:%08x\n", + sinfo("sp:%08x ra:%08x gp:%08x\n", context->sp, context->ra, context->gp); #else - svdbg("sp:%08x ra:%08x\n", + sinfo("sp:%08x ra:%08x\n", context->sp, context->ra); #endif #endif @@ -156,7 +156,7 @@ pid_t up_vfork(const struct vfork_s *context) return (pid_t)ERROR; } - svdbg("Parent=%p Child=%p\n", parent, child); + sinfo("Parent=%p Child=%p\n", parent, child); /* Get the size of the parent task's stack. Due to alignment operations, * the adjusted stack size may be smaller than the stack size originally @@ -185,7 +185,7 @@ pid_t up_vfork(const struct vfork_s *context) DEBUGASSERT((uint32_t)parent->adj_stack_ptr > context->sp); stackutil = (uint32_t)parent->adj_stack_ptr - context->sp; - svdbg("stacksize:%d stackutil:%d\n", stacksize, stackutil); + sinfo("stacksize:%d stackutil:%d\n", stacksize, stackutil); /* Make some feeble effort to perserve the stack contents. This is * feeble because the stack surely contains invalid pointers and other @@ -211,14 +211,14 @@ pid_t up_vfork(const struct vfork_s *context) newfp = context->fp; } - svdbg("Old stack base:%08x SP:%08x FP:%08x\n", + sinfo("Old stack base:%08x SP:%08x FP:%08x\n", parent->adj_stack_ptr, context->sp, context->fp); - svdbg("New stack base:%08x SP:%08x FP:%08x\n", + sinfo("New stack base:%08x SP:%08x FP:%08x\n", child->cmn.adj_stack_ptr, newsp, newfp); #else - svdbg("Old stack base:%08x SP:%08x\n", + sinfo("Old stack base:%08x SP:%08x\n", parent->adj_stack_ptr, context->sp); - svdbg("New stack base:%08x SP:%08x\n", + sinfo("New stack base:%08x SP:%08x\n", child->cmn.adj_stack_ptr, newsp); #endif diff --git a/arch/mips/src/pic32mx/pic32mx-ethernet.c b/arch/mips/src/pic32mx/pic32mx-ethernet.c index 4c11f5c660..a5c7e48390 100644 --- a/arch/mips/src/pic32mx/pic32mx-ethernet.c +++ b/arch/mips/src/pic32mx/pic32mx-ethernet.c @@ -1428,7 +1428,7 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv) #ifdef CONFIG_NET_IPv4 if (BUF->type == HTONS(ETHTYPE_IP)) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); NETDEV_RXIPV4(&priv->pd_dev); /* Handle ARP on input then give the IPv4 packet to the network @@ -1470,7 +1470,7 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv) #ifdef CONFIG_NET_IPv6 if (BUF->type == HTONS(ETHTYPE_IP6)) { - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); NETDEV_RXIPV6(&priv->pd_dev); /* Give the IPv6 packet to the network layer */ @@ -2751,12 +2751,12 @@ static inline int pic32mx_phyinit(struct pic32mx_driver_s *priv) */ phyreg = (unsigned int)pic32mx_phyread(phyaddr, MII_PHYID1); - nvdbg("Addr: %d PHY ID1: %04x\n", phyaddr, phyreg); + ninfo("Addr: %d PHY ID1: %04x\n", phyaddr, phyreg); if (phyreg == PIC32MX_PHYID1) { phyreg = pic32mx_phyread(phyaddr, MII_PHYID2); - nvdbg("Addr: %d PHY ID2: %04x\n", phyaddr, phyreg); + ninfo("Addr: %d PHY ID2: %04x\n", phyaddr, phyreg); if (phyreg == PIC32MX_PHYID2) { @@ -2774,7 +2774,7 @@ static inline int pic32mx_phyinit(struct pic32mx_driver_s *priv) ndbg("No PHY detected\n"); return -ENODEV; } - nvdbg("phyaddr: %d\n", phyaddr); + ninfo("phyaddr: %d\n", phyaddr); /* Save the discovered PHY device address */ diff --git a/arch/mips/src/pic32mx/pic32mx-exception.c b/arch/mips/src/pic32mx/pic32mx-exception.c index 1b30e58985..71b76180cb 100644 --- a/arch/mips/src/pic32mx/pic32mx-exception.c +++ b/arch/mips/src/pic32mx/pic32mx-exception.c @@ -106,83 +106,83 @@ uint32_t *pic32mx_exception(uint32_t *regs) switch (cause & CP0_CAUSE_EXCCODE_MASK) { case CP0_CAUSE_EXCCODE_INT: /* Interrupt */ - llvdbg("EXCEPTION: Interrupt" + llinfo("EXCEPTION: Interrupt" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_TLBL: /* TLB exception (load or instruction fetch) */ - llvdbg("EXCEPTION: TLB exception (load or instruction fetch)" + llinfo("EXCEPTION: TLB exception (load or instruction fetch)" " CAUSE: %08x EPC:%08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_TLBS: /* TLB exception (store) */ - llvdbg("EXCEPTION: TLB exception (store)" + llinfo("EXCEPTION: TLB exception (store)" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_ADEL: /* Address error exception (load or instruction fetch) */ - llvdbg("EXCEPTION: Address error exception (load or instruction fetch)" + llinfo("EXCEPTION: Address error exception (load or instruction fetch)" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_ADES: /* Address error exception (store) */ - llvdbg("EXCEPTION: Address error exception (store)" + llinfo("EXCEPTION: Address error exception (store)" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_IBE: /* Bus error exception (instruction fetch) */ - llvdbg("EXCEPTION: Bus error exception (instruction fetch)" + llinfo("EXCEPTION: Bus error exception (instruction fetch)" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_DBE: /* Bus error exception (data reference: load or store) */ - llvdbg("EXCEPTION: Bus error exception (data reference: load or store)" + llinfo("EXCEPTION: Bus error exception (data reference: load or store)" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_SYS: /* Syscall exception */ - llvdbg("EXCEPTION: Syscall exception" + llinfo("EXCEPTION: Syscall exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_BP: /* Breakpoint exception */ - llvdbg("EXCEPTION: Breakpoint exception" + llinfo("EXCEPTION: Breakpoint exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_RI: /* Reserved instruction exception */ - llvdbg("EXCEPTION: Reserved instruction exception" + llinfo("EXCEPTION: Reserved instruction exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_CPU: /* Coprocessor Unusable exception */ - llvdbg("EXCEPTION: Coprocessor Unusable exception" + llinfo("EXCEPTION: Coprocessor Unusable exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_OV: /* Arithmetic Overflow exception */ - llvdbg("EXCEPTION: Arithmetic Overflow exception" + llinfo("EXCEPTION: Arithmetic Overflow exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_TR: /* Trap exception */ - llvdbg("EXCEPTION: Trap exception" + llinfo("EXCEPTION: Trap exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_FPE: /* Floating point exception */ - llvdbg("EXCEPTION: Floating point exception" + llinfo("EXCEPTION: Floating point exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_C2E: /* Precise Coprocessor 2 exceptions */ - llvdbg("EXCEPTION: Precise Coprocessor 2 exceptions" + llinfo("EXCEPTION: Precise Coprocessor 2 exceptions" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_MDMX: /* MDMX Unusable (MIPS64) */ - llvdbg("EXCEPTION: MDMX Unusable (MIPS64)" + llinfo("EXCEPTION: MDMX Unusable (MIPS64)" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_WATCH: /* WatchHi/WatchLo address */ - llvdbg("EXCEPTION: WatchHi/WatchLo address" + llinfo("EXCEPTION: WatchHi/WatchLo address" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_MCHECK: /* Machine check */ - llvdbg("EXCEPTION: Machine check" + llinfo("EXCEPTION: Machine check" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_CACHEERR: /* Cache error */ - llvdbg("EXCEPTION: Cache error" + llinfo("EXCEPTION: Cache error" " CAUSE: %08x EPC: %08x\n", cause, epc); break; default: - llvdbg("EXCEPTION: Unknown" + llinfo("EXCEPTION: Unknown" " CAUSE: %08x EPC: %08x\n", cause, epc); break; } diff --git a/arch/mips/src/pic32mx/pic32mx-spi.c b/arch/mips/src/pic32mx/pic32mx-spi.c index a4388914b1..2477936dfd 100644 --- a/arch/mips/src/pic32mx/pic32mx-spi.c +++ b/arch/mips/src/pic32mx/pic32mx-spi.c @@ -77,13 +77,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /**************************************************************************** @@ -476,7 +476,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency) uint32_t actual; uint32_t regval; - spivdbg("Old frequency: %d actual: %d New frequency: %d\n", + spiinfo("Old frequency: %d actual: %d New frequency: %d\n", priv->frequency, priv->actual, frequency); /* Check if the requested frequency is the same as the frequency selection */ @@ -511,7 +511,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency) /* Save the new BRG value */ spi_putreg(priv, PIC32MX_SPI_BRG_OFFSET, regval); - spivdbg("PBCLOCK: %d frequency: %d divisor: %d BRG: %d\n", + spiinfo("PBCLOCK: %d frequency: %d divisor: %d BRG: %d\n", BOARD_PBCLOCK, frequency, divisor, regval); /* Calculate the new actual frequency. @@ -550,7 +550,7 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) FAR struct pic32mx_dev_s *priv = (FAR struct pic32mx_dev_s *)dev; uint32_t regval; - spivdbg("Old mode: %d New mode: %d\n", priv->mode, mode); + spiinfo("Old mode: %d New mode: %d\n", priv->mode, mode); /* Has the mode changed? */ @@ -612,7 +612,7 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) } spi_putreg(priv, PIC32MX_SPI_CON_OFFSET, regval); - spivdbg("CON: %08x\n", regval); + spiinfo("CON: %08x\n", regval); /* Save the mode so that subsequent re-configuratins will be faster */ @@ -641,7 +641,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) uint32_t setting; uint32_t regval; - spivdbg("Old nbits: %d New nbits: %d\n", priv->nbits, nbits); + spiinfo("Old nbits: %d New nbits: %d\n", priv->nbits, nbits); /* Has the number of bits changed? */ @@ -673,7 +673,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) regval &= ~SPI_CON_MODE_MASK; regval |= setting; regval = spi_getreg(priv, PIC32MX_SPI_CON_OFFSET); - spivdbg("CON: %08x\n", regval); + spiinfo("CON: %08x\n", regval); /* Save the selection so the subsequence re-configurations will be faster */ @@ -701,7 +701,7 @@ static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t wd) { FAR struct pic32mx_dev_s *priv = (FAR struct pic32mx_dev_s *)dev; - spivdbg("wd: %04x\n", wd); + spiinfo("wd: %04x\n", wd); /* Write the data to transmitted to the SPI Data Register */ @@ -754,7 +754,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size uint32_t regval; uint8_t data; - spivdbg("nwords: %d\n", nwords); + spiinfo("nwords: %d\n", nwords); while (nwords) { /* Write the data to transmitted to the SPI Data Register */ @@ -809,7 +809,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw FAR struct pic32mx_dev_s *priv = (FAR struct pic32mx_dev_s *)dev; FAR uint8_t *ptr = (FAR uint8_t *)buffer; - spivdbg("nwords: %d\n", nwords); + spiinfo("nwords: %d\n", nwords); while (nwords) { /* Write some dummy data to the SPI Data Register in order to clock the @@ -864,7 +864,7 @@ FAR struct spi_dev_s *pic32mx_spibus_initialize(int port) irqstate_t flags; uint32_t regval; - spivdbg("port: %d\n", port); + spiinfo("port: %d\n", port); /* Select the SPI state structure for this port */ @@ -952,7 +952,7 @@ FAR struct spi_dev_s *pic32mx_spibus_initialize(int port) regval |= (SPI_CON_ENHBUF | SPI_CON_RTXISEL_HALF | SPI_CON_STXISEL_HALF); #endif spi_putreg(priv, PIC32MX_SPI_CON_OFFSET, regval); - spivdbg("CON: %08x\n", regval); + spiinfo("CON: %08x\n", regval); /* Set the initial SPI configuration */ diff --git a/arch/mips/src/pic32mx/pic32mx-usbdev.c b/arch/mips/src/pic32mx/pic32mx-usbdev.c index ca07c9eb56..0cf450fd01 100644 --- a/arch/mips/src/pic32mx/pic32mx-usbdev.c +++ b/arch/mips/src/pic32mx/pic32mx-usbdev.c @@ -291,9 +291,9 @@ # define regdbg lldbg # ifdef CONFIG_DEBUG_INFO -# define regvdbg lldbg +# define reginfo lldbg # else -# define regvdbg(x...) +# define reginfo(x...) # endif #else @@ -301,7 +301,7 @@ # define pic32mx_getreg(addr) getreg16(addr) # define pic32mx_putreg(val,addr) putreg16(val,addr) # define regdbg(x...) -# define regvdbg(x...) +# define reginfo(x...) #endif @@ -311,15 +311,15 @@ # define bdtdbg lldbg # ifdef CONFIG_DEBUG_INFO -# define bdtvdbg lldbg +# define bdtinfo lldbg # else -# define bdtvdbg(x...) +# define bdtinfo(x...) # endif #else # define bdtdbg(x...) -# define bdtvdbg(x...) +# define bdtinfo(x...) #endif @@ -908,10 +908,10 @@ static void pic32mx_wrcomplete(struct pic32mx_usbdev_s *priv, epno = USB_EPNO(privep->ep.eplog); #ifdef CONFIG_USBDEV_NOWRITEAHEAD - ullvdbg("EP%d: len=%d xfrd=%d inflight=%d\n", + ullinfo("EP%d: len=%d xfrd=%d inflight=%d\n", epno, privreq->req.len, privreq->req.xfrd, privreq->inflight[0]); #else - ullvdbg("EP%d: len=%d xfrd=%d inflight={%d, %d}\n", + ullinfo("EP%d: len=%d xfrd=%d inflight={%d, %d}\n", epno, privreq->req.len, privreq->req.xfrd, privreq->inflight[0], privreq->inflight[1]); #endif @@ -1224,7 +1224,7 @@ static int pic32mx_wrstart(struct pic32mx_usbdev_s *priv, bytesleft = privreq->req.len; } - ullvdbg("epno=%d req=%p: len=%d xfrd=%d index=%d nullpkt=%d\n", + ullinfo("epno=%d req=%p: len=%d xfrd=%d index=%d nullpkt=%d\n", epno, privreq, privreq->req.len, xfrd, index, privep->txnullpkt); /* Get the number of bytes left to be sent in the packet */ @@ -1338,7 +1338,7 @@ static int pic32mx_rdcomplete(struct pic32mx_usbdev_s *priv, bdtout = privep->bdtout; epno = USB_EPNO(privep->ep.eplog); - ullvdbg("EP%d: len=%d xfrd=%d\n", + ullinfo("EP%d: len=%d xfrd=%d\n", epno, privreq->req.len, privreq->req.xfrd); bdtdbg("EP%d BDT OUT [%p] {%08x, %08x}\n", epno, bdtout, bdtout->status, bdtout->addr); @@ -1626,7 +1626,7 @@ static int pic32mx_rdrequest(struct pic32mx_usbdev_s *priv, return OK; } - ullvdbg("EP%d: len=%d\n", USB_EPNO(privep->ep.eplog), privreq->req.len); + ullinfo("EP%d: len=%d\n", USB_EPNO(privep->ep.eplog), privreq->req.len); /* Ignore any attempt to receive a zero length packet */ @@ -1915,7 +1915,7 @@ static void pic32mx_ep0setup(struct pic32mx_usbdev_s *priv) index.w = GETUINT16(priv->ctrl.index); len.w = GETUINT16(priv->ctrl.len); - ullvdbg("SETUP: type=%02x req=%02x value=%04x index=%04x len=%04x\n", + ullinfo("SETUP: type=%02x req=%02x value=%04x index=%04x len=%04x\n", priv->ctrl.type, priv->ctrl.req, value.w, index.w, len.w); /* Dispatch any non-standard requests */ @@ -2159,7 +2159,7 @@ static void pic32mx_ep0setup(struct pic32mx_usbdev_s *priv) { /* Special case recipient=device test mode */ - ullvdbg("test mode: %d\n", index.w); + ullinfo("test mode: %d\n", index.w); } else { diff --git a/arch/mips/src/pic32mz/pic32mz-ethernet.c b/arch/mips/src/pic32mz/pic32mz-ethernet.c index 7d531efde9..4118fc7567 100644 --- a/arch/mips/src/pic32mz/pic32mz-ethernet.c +++ b/arch/mips/src/pic32mz/pic32mz-ethernet.c @@ -1445,7 +1445,7 @@ static void pic32mz_rxdone(struct pic32mz_driver_s *priv) #ifdef CONFIG_NET_IPv4 if (BUF->type == HTONS(ETHTYPE_IP)) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); NETDEV_RXIPV4(&priv->pd_dev); /* Handle ARP on input then give the IPv4 packet to the network @@ -1487,7 +1487,7 @@ static void pic32mz_rxdone(struct pic32mz_driver_s *priv) #ifdef CONFIG_NET_IPv6 if (BUF->type == HTONS(ETHTYPE_IP6)) { - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); NETDEV_RXIPV6(&priv->pd_dev); /* Give the IPv6 packet to the network layer */ @@ -2774,12 +2774,12 @@ static inline int pic32mz_phyinit(struct pic32mz_driver_s *priv) */ phyreg = (unsigned int)pic32mz_phyread(phyaddr, MII_PHYID1); - nvdbg("Addr: %d PHY ID1: %04x EXPECT: %04x\n", phyaddr, phyreg, PIC32MZ_PHYID1); + ninfo("Addr: %d PHY ID1: %04x EXPECT: %04x\n", phyaddr, phyreg, PIC32MZ_PHYID1); if (phyreg == PIC32MZ_PHYID1) { phyreg = pic32mz_phyread(phyaddr, MII_PHYID2); - nvdbg("Addr: %d PHY ID2: %04x EXPECT: %04x\n", phyaddr, phyreg, PIC32MZ_PHYID2); + ninfo("Addr: %d PHY ID2: %04x EXPECT: %04x\n", phyaddr, phyreg, PIC32MZ_PHYID2); if (phyreg == PIC32MZ_PHYID2) { @@ -2797,7 +2797,7 @@ static inline int pic32mz_phyinit(struct pic32mz_driver_s *priv) ndbg("No PHY detected\n"); return -ENODEV; } - nvdbg("phyaddr: %d\n", phyaddr); + ninfo("phyaddr: %d\n", phyaddr); /* Save the discovered PHY device address */ diff --git a/arch/mips/src/pic32mz/pic32mz-exception.c b/arch/mips/src/pic32mz/pic32mz-exception.c index c2ae2d8ed6..1c1a0b8512 100644 --- a/arch/mips/src/pic32mz/pic32mz-exception.c +++ b/arch/mips/src/pic32mz/pic32mz-exception.c @@ -106,83 +106,83 @@ uint32_t *pic32mz_exception(uint32_t *regs) switch (cause & CP0_CAUSE_EXCCODE_MASK) { case CP0_CAUSE_EXCCODE_INT: /* Interrupt */ - llvdbg("EXCEPTION: Interrupt" + llinfo("EXCEPTION: Interrupt" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_TLBL: /* TLB exception (load or instruction fetch) */ - llvdbg("EXCEPTION: TLB exception (load or instruction fetch)" + llinfo("EXCEPTION: TLB exception (load or instruction fetch)" " CAUSE: %08x EPC:%08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_TLBS: /* TLB exception (store) */ - llvdbg("EXCEPTION: TLB exception (store)" + llinfo("EXCEPTION: TLB exception (store)" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_ADEL: /* Address error exception (load or instruction fetch) */ - llvdbg("EXCEPTION: Address error exception (load or instruction fetch)" + llinfo("EXCEPTION: Address error exception (load or instruction fetch)" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_ADES: /* Address error exception (store) */ - llvdbg("EXCEPTION: Address error exception (store)" + llinfo("EXCEPTION: Address error exception (store)" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_IBE: /* Bus error exception (instruction fetch) */ - llvdbg("EXCEPTION: Bus error exception (instruction fetch)" + llinfo("EXCEPTION: Bus error exception (instruction fetch)" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_DBE: /* Bus error exception (data reference: load or store) */ - llvdbg("EXCEPTION: Bus error exception (data reference: load or store)" + llinfo("EXCEPTION: Bus error exception (data reference: load or store)" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_SYS: /* Syscall exception */ - llvdbg("EXCEPTION: Syscall exception" + llinfo("EXCEPTION: Syscall exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_BP: /* Breakpoint exception */ - llvdbg("EXCEPTION: Breakpoint exception" + llinfo("EXCEPTION: Breakpoint exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_RI: /* Reserved instruction exception */ - llvdbg("EXCEPTION: Reserved instruction exception" + llinfo("EXCEPTION: Reserved instruction exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_CPU: /* Coprocessor Unusable exception */ - llvdbg("EXCEPTION: Coprocessor Unusable exception" + llinfo("EXCEPTION: Coprocessor Unusable exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_OV: /* Arithmetic Overflow exception */ - llvdbg("EXCEPTION: Arithmetic Overflow exception" + llinfo("EXCEPTION: Arithmetic Overflow exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_TR: /* Trap exception */ - llvdbg("EXCEPTION: Trap exception" + llinfo("EXCEPTION: Trap exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_FPE: /* Floating point exception */ - llvdbg("EXCEPTION: Floating point exception" + llinfo("EXCEPTION: Floating point exception" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_C2E: /* Precise Coprocessor 2 exceptions */ - llvdbg("EXCEPTION: Precise Coprocessor 2 exceptions" + llinfo("EXCEPTION: Precise Coprocessor 2 exceptions" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_MDMX: /* MDMX Unusable (MIPS64) */ - llvdbg("EXCEPTION: MDMX Unusable (MIPS64)" + llinfo("EXCEPTION: MDMX Unusable (MIPS64)" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_WATCH: /* WatchHi/WatchLo address */ - llvdbg("EXCEPTION: WatchHi/WatchLo address" + llinfo("EXCEPTION: WatchHi/WatchLo address" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_MCHECK: /* Machine check */ - llvdbg("EXCEPTION: Machine check" + llinfo("EXCEPTION: Machine check" " CAUSE: %08x EPC: %08x\n", cause, epc); break; case CP0_CAUSE_EXCCODE_CACHEERR: /* Cache error */ - llvdbg("EXCEPTION: Cache error" + llinfo("EXCEPTION: Cache error" " CAUSE: %08x EPC: %08x\n", cause, epc); break; default: - llvdbg("EXCEPTION: Unknown" + llinfo("EXCEPTION: Unknown" " CAUSE: %08x EPC: %08x\n", cause, epc); break; } diff --git a/arch/mips/src/pic32mz/pic32mz-spi.c b/arch/mips/src/pic32mz/pic32mz-spi.c index 022eaebc3c..344a1d3e71 100644 --- a/arch/mips/src/pic32mz/pic32mz-spi.c +++ b/arch/mips/src/pic32mz/pic32mz-spi.c @@ -72,13 +72,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /**************************************************************************** @@ -652,7 +652,7 @@ static void spi_exchange8(FAR struct pic32mz_dev_s *priv, uint32_t regval; uint8_t data; - spivdbg("nbytes: %d\n", nbytes); + spiinfo("nbytes: %d\n", nbytes); while (nbytes) { /* Write the data to transmitted to the SPI Data Register */ @@ -723,7 +723,7 @@ static void spi_exchange16(FAR struct pic32mz_dev_s *priv, uint32_t regval; uint16_t data; - spivdbg("nwords: %d\n", nwords); + spiinfo("nwords: %d\n", nwords); while (nwords) { /* Write the data to transmitted to the SPI Data Register */ @@ -837,7 +837,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency) uint32_t actual; uint32_t regval; - spivdbg("Old frequency: %d actual: %d New frequency: %d\n", + spiinfo("Old frequency: %d actual: %d New frequency: %d\n", priv->frequency, priv->actual, frequency); /* Check if the requested frequency is the same as the frequency selection */ @@ -872,7 +872,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency) /* Save the new BRG value */ spi_putreg(priv, PIC32MZ_SPI_BRG_OFFSET, regval); - spivdbg("PBCLOCK: %d frequency: %d divisor: %d BRG: %d\n", + spiinfo("PBCLOCK: %d frequency: %d divisor: %d BRG: %d\n", BOARD_PBCLOCK, frequency, divisor, regval); /* Calculate the new actual frequency. @@ -911,7 +911,7 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) FAR struct pic32mz_dev_s *priv = (FAR struct pic32mz_dev_s *)dev; uint32_t regval; - spivdbg("Old mode: %d New mode: %d\n", priv->mode, mode); + spiinfo("Old mode: %d New mode: %d\n", priv->mode, mode); /* Has the mode changed? */ @@ -973,7 +973,7 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) } spi_putreg(priv, PIC32MZ_SPI_CON_OFFSET, regval); - spivdbg("CON: %08x\n", regval); + spiinfo("CON: %08x\n", regval); /* Save the mode so that subsequent re-configuratins will be faster */ @@ -1002,7 +1002,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) uint32_t setting; uint32_t regval; - spivdbg("Old nbits: %d New nbits: %d\n", priv->nbits, nbits); + spiinfo("Old nbits: %d New nbits: %d\n", priv->nbits, nbits); /* Has the number of bits changed? */ @@ -1033,7 +1033,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) regval &= ~SPI_CON_MODE_MASK; regval |= setting; regval = spi_getreg(priv, PIC32MZ_SPI_CON_OFFSET); - spivdbg("CON: %08x\n", regval); + spiinfo("CON: %08x\n", regval); /* Save the selection so the subsequence re-configurations will be * faster @@ -1075,7 +1075,7 @@ static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t wd) rxword = 0; spi_exchange16(priv, &txword, &rxword, 1); - spivdbg("Sent %04x received %04x\n", txword, rxword); + spiinfo("Sent %04x received %04x\n", txword, rxword); return rxword; } else @@ -1089,7 +1089,7 @@ static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t wd) rxbyte = (uint8_t)0; spi_exchange8(priv, &txbyte, &rxbyte, 1); - spivdbg("Sent %02x received %02x\n", txbyte, rxbyte); + spiinfo("Sent %02x received %02x\n", txbyte, rxbyte); return (uint16_t)rxbyte; } } @@ -1222,7 +1222,7 @@ FAR struct spi_dev_s *pic32mz_spibus_initialize(int port) irqstate_t flags; uint32_t regval; - spivdbg("port: %d\n", port); + spiinfo("port: %d\n", port); /* Select the SPI state structure and SDI PPS register for this port */ @@ -1354,7 +1354,7 @@ FAR struct spi_dev_s *pic32mz_spibus_initialize(int port) regval |= (SPI_CON_ENHBUF | SPI_CON_SRXISEL_HALF | SPI_CON_STXISEL_HALF); #endif spi_putreg(priv, PIC32MZ_SPI_CON_OFFSET, regval); - spivdbg("CON: %08x\n", regval); + spiinfo("CON: %08x\n", regval); /* Set the initial SPI configuration */ diff --git a/arch/sim/src/board_lcd.c b/arch/sim/src/board_lcd.c index 1058f7959f..d3dc5a54b1 100644 --- a/arch/sim/src/board_lcd.c +++ b/arch/sim/src/board_lcd.c @@ -116,7 +116,7 @@ #endif #ifdef CONFIG_DEBUG_LCD -# define lcddbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define lcddbg(format, ...) info(format, ##__VA_ARGS__) #else # define lcddbg(x...) #endif @@ -294,7 +294,7 @@ static int sim_getvideoinfo(FAR struct lcd_dev_s *dev, FAR struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); - gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n", + ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n", g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes); memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s)); return OK; @@ -312,7 +312,7 @@ static int sim_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, FAR struct lcd_planeinfo_s *pinfo) { DEBUGASSERT(dev && pinfo && planeno == 0); - gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); + ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s)); return OK; } @@ -328,7 +328,7 @@ static int sim_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, static int sim_getpower(struct lcd_dev_s *dev) { - gvdbg("power: %d\n", 0); + ginfo("power: %d\n", 0); return g_lcddev.power; } @@ -344,7 +344,7 @@ static int sim_getpower(struct lcd_dev_s *dev) static int sim_setpower(struct lcd_dev_s *dev, int power) { - gvdbg("power: %d\n", power); + ginfo("power: %d\n", power); DEBUGASSERT(power <= CONFIG_LCD_MAXPOWER); /* Set new power level */ @@ -363,7 +363,7 @@ static int sim_setpower(struct lcd_dev_s *dev, int power) static int sim_getcontrast(struct lcd_dev_s *dev) { - gvdbg("Not implemented\n"); + ginfo("Not implemented\n"); return -ENOSYS; } @@ -377,7 +377,7 @@ static int sim_getcontrast(struct lcd_dev_s *dev) static int sim_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) { - gvdbg("contrast: %d\n", contrast); + ginfo("contrast: %d\n", contrast); return -ENOSYS; } @@ -397,7 +397,7 @@ static int sim_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) int board_lcd_initialize(void) { - gvdbg("Initializing\n"); + ginfo("Initializing\n"); return OK; } diff --git a/arch/sim/src/up_netdriver.c b/arch/sim/src/up_netdriver.c index c785f49746..908cff3236 100644 --- a/arch/sim/src/up_netdriver.c +++ b/arch/sim/src/up_netdriver.c @@ -213,7 +213,7 @@ void netdriver_loop(void) #ifdef CONFIG_NET_IPv4 if (eth->type == HTONS(ETHTYPE_IP) && is_ours) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); /* Handle ARP on input then give the IPv4 packet to the network * layer @@ -254,7 +254,7 @@ void netdriver_loop(void) #ifdef CONFIG_NET_IPv6 if (eth->type == HTONS(ETHTYPE_IP6) && is_ours) { - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); /* Give the IPv6 packet to the network layer */ diff --git a/arch/sim/src/up_spiflash.c b/arch/sim/src/up_spiflash.c index 30f603b1ac..517081af9d 100644 --- a/arch/sim/src/up_spiflash.c +++ b/arch/sim/src/up_spiflash.c @@ -71,13 +71,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /* Define the FLASH SIZE in bytes */ @@ -479,7 +479,7 @@ static uint16_t spiflash_send(FAR struct spi_dev_s *dev, uint16_t wd) static void spiflash_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, FAR void *rxbuffer, size_t nwords) { - spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); + spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); /* 8-bit mode */ @@ -536,7 +536,7 @@ static void spiflash_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffe #ifndef CONFIG_SPI_EXCHANGE static void spiflash_sndblock(FAR struct spi_dev_s *dev, FAR const void *txbuffer, size_t nwords) { - spivdbg("txbuffer=%p nwords=%d\n", txbuffer, nwords); + spiinfo("txbuffer=%p nwords=%d\n", txbuffer, nwords); return spiflash_exchange(dev, txbuffer, NULL, nwords); } #endif @@ -565,7 +565,7 @@ static void spiflash_sndblock(FAR struct spi_dev_s *dev, FAR const void *txbuffe static void spiflash_recvblock(FAR struct spi_dev_s *dev, FAR void *rxbuffer, size_t nwords) { - spivdbg("rxbuffer=%p nwords=%d\n", rxbuffer, nwords); + spiinfo("rxbuffer=%p nwords=%d\n", rxbuffer, nwords); return spiflash_exchange(dev, NULL, rxbuffer, nwords); } #endif diff --git a/arch/sim/src/up_touchscreen.c b/arch/sim/src/up_touchscreen.c index 4b4e598f45..93218e45bb 100644 --- a/arch/sim/src/up_touchscreen.c +++ b/arch/sim/src/up_touchscreen.c @@ -194,7 +194,7 @@ static void up_notify(FAR struct up_dev_s *priv) * that the read data is available. */ - ivdbg("contact=%d nwaiters=%d\n", priv->sample.contact, priv->nwaiters); + iinfo("contact=%d nwaiters=%d\n", priv->sample.contact, priv->nwaiters); if (priv->nwaiters > 0) { /* After posting this semaphore, we need to exit because the touchscreen @@ -217,7 +217,7 @@ static void up_notify(FAR struct up_dev_s *priv) if (fds) { fds->revents |= POLLIN; - ivdbg("Report events: %02x\n", fds->revents); + iinfo("Report events: %02x\n", fds->revents); sem_post(fds->sem); } } @@ -235,7 +235,7 @@ static int up_sample(FAR struct up_dev_s *priv, /* Is there new touchscreen sample data available? */ - ivdbg("penchange=%d contact=%d id=%d\n", + iinfo("penchange=%d contact=%d id=%d\n", priv->penchange, sample->contact, priv->id); if (priv->penchange) @@ -263,7 +263,7 @@ static int up_sample(FAR struct up_dev_s *priv, } priv->penchange = false; - ivdbg("penchange=%d contact=%d id=%d\n", + iinfo("penchange=%d contact=%d id=%d\n", priv->penchange, priv->sample.contact, priv->id); ret = OK; @@ -308,11 +308,11 @@ static int up_waitsample(FAR struct up_dev_s *priv, { /* Wait for a change in the touchscreen state */ - ivdbg("Waiting...\n"); + iinfo("Waiting...\n"); priv->nwaiters++; ret = sem_wait(&priv->waitsem); priv->nwaiters--; - ivdbg("Awakened...\n"); + iinfo("Awakened...\n"); if (ret < 0) { @@ -357,7 +357,7 @@ errout: static int up_open(FAR struct file *filep) { - ivdbg("Opening...\n"); + iinfo("Opening...\n"); return OK; } @@ -367,7 +367,7 @@ static int up_open(FAR struct file *filep) static int up_close(FAR struct file *filep) { - ivdbg("Closing...\n"); + iinfo("Closing...\n"); return OK; } @@ -383,7 +383,7 @@ static ssize_t up_read(FAR struct file *filep, FAR char *buffer, size_t len) struct up_sample_s sample; int ret; - ivdbg("len=%d\n", len); + iinfo("len=%d\n", len); DEBUGASSERT(filep); inode = filep->f_inode; @@ -480,7 +480,7 @@ static ssize_t up_read(FAR struct file *filep, FAR char *buffer, size_t len) ret = SIZEOF_TOUCH_SAMPLE_S(1); errout: - ivdbg("Returning %d\n", ret); + iinfo("Returning %d\n", ret); sem_post(&priv->devsem); return ret; } @@ -495,7 +495,7 @@ static int up_ioctl(FAR struct file *filep, int cmd, unsigned long arg) FAR struct up_dev_s *priv; int ret; - ivdbg("cmd: %d arg: %ld\n", cmd, arg); + iinfo("cmd: %d arg: %ld\n", cmd, arg); DEBUGASSERT(filep); inode = filep->f_inode; @@ -539,7 +539,7 @@ static int up_poll(FAR struct file *filep, FAR struct pollfd *fds, int ret; int i; - ivdbg("setup: %d\n", (int)setup); + iinfo("setup: %d\n", (int)setup); DEBUGASSERT(filep && fds); inode = filep->f_inode; @@ -648,7 +648,7 @@ int board_tsc_setup(int minor) char devname[DEV_NAMELEN]; int ret; - ivdbg("minor: %d\n", minor); + iinfo("minor: %d\n", minor); /* Debug-only sanity checks */ @@ -665,7 +665,7 @@ int board_tsc_setup(int minor) /* Register the device as an input device */ (void)snprintf(devname, DEV_NAMELEN, DEV_FORMAT, minor); - ivdbg("Registering %s\n", devname); + iinfo("Registering %s\n", devname); ret = register_driver(devname, &up_fops, 0666, priv); if (ret < 0) @@ -732,7 +732,7 @@ void board_tsc_teardown(void) /* Un-register the device */ (void)snprintf(devname, DEV_NAMELEN, DEV_FORMAT, priv->minor); - ivdbg("Un-registering %s\n", devname); + iinfo("Un-registering %s\n", devname); ret = unregister_driver(devname); if (ret < 0) @@ -755,8 +755,8 @@ int up_buttonevent(int x, int y, int buttons) FAR struct up_dev_s *priv = (FAR struct up_dev_s *)&g_simtouchscreen; bool pendown; /* true: pen is down */ - ivdbg("x=%d y=%d buttons=%02x\n", x, y, buttons); - ivdbg("contact=%d nwaiters=%d\n", priv->sample.contact, priv->nwaiters); + iinfo("x=%d y=%d buttons=%02x\n", x, y, buttons); + iinfo("contact=%d nwaiters=%d\n", priv->sample.contact, priv->nwaiters); /* Any button press will count as pendown. */ diff --git a/arch/z16/src/z16f/z16f_espi.c b/arch/z16/src/z16f/z16f_espi.c index 96e7c487ba..d20c71a756 100644 --- a/arch/z16/src/z16f/z16f_espi.c +++ b/arch/z16/src/z16f/z16f_espi.c @@ -72,13 +72,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg (void) +# define spiinfo (void) # endif #else # define spidbg (void) -# define spivdbg (void) +# define spiinfo (void) #endif /**************************************************************************** @@ -330,11 +330,11 @@ static void spi_putreg16(FAR struct z16f_spi_s *priv, uint16_t regval, #if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO) static void spi_dumpregs(FAR struct z16f_spi_s *priv, FAR const char *msg) { - spivdbg("%s:\n", msg); - spivdbg(" DCR: %02x CTL: %02x MODE: %02x STAT: %02x\n", + spiinfo("%s:\n", msg); + spiinfo(" DCR: %02x CTL: %02x MODE: %02x STAT: %02x\n", getreg8(Z16F_ESPI_DCR), getreg8(Z16F_ESPI_CTL), getreg8(Z16F_ESPI_MODE), getreg8(Z16F_ESPI_STAT)); - spivdbg(" STATE: %02x BR: %02x %02x\n", + spiinfo(" STATE: %02x BR: %02x %02x\n", getreg8(Z16F_ESPI_STATE), getreg8(Z16F_ESPI_BRH), getreg8(Z16F_ESPI_BRL)); } @@ -395,7 +395,7 @@ static int spi_lock(FAR struct spi_dev_s *dev, bool lock) { FAR struct z16f_spi_s *priv = (FAR struct z16f_spi_s *)dev; - spivdbg("lock=%d\n", lock); + spiinfo("lock=%d\n", lock); if (lock) { /* Take the semaphore (perhaps waiting) */ @@ -438,7 +438,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency) uint32_t actual; uint32_t brg; - spivdbg("frequency=%d\n", frequency); + spiinfo("frequency=%d\n", frequency); /* Check if the requested frequency is the same as the frequency selection */ @@ -469,7 +469,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency) /* Calculate the new actual frequency */ actual = (BOARD_SYSTEM_FREQUENCY >> 1) / brg; - spivdbg("BR=%04x actual=%ld\n", (unsigned int)brg, (long)actual); + spiinfo("BR=%04x actual=%ld\n", (unsigned int)brg, (long)actual); /* Save the frequency setting */ @@ -500,7 +500,7 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) FAR struct z16f_spi_s *priv = (FAR struct z16f_spi_s *)dev; uint8_t regval; - spivdbg("mode=%d\n", mode); + spiinfo("mode=%d\n", mode); /* Has the mode changed? */ @@ -542,7 +542,7 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) } spi_putreg8(priv, regval, Z16F_ESPI_CTL); - spivdbg("ESPI CTL: %02x\n", regval); + spiinfo("ESPI CTL: %02x\n", regval); /* Save the mode so that subsequent re-configurations will be faster */ @@ -570,7 +570,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) FAR struct z16f_spi_s *priv = (FAR struct z16f_spi_s *)dev; uint8_t regval; - spivdbg("nbits=%d\n", nbits); + spiinfo("nbits=%d\n", nbits); DEBUGASSERT(priv && nbits > 0 && nbits <= 8); /* Has the number of bits changed? */ @@ -590,7 +590,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) } spi_putreg8(priv, regval, Z16F_ESPI_MODE); - spivdbg("ESPI MODE: %02x\n", regval); + spiinfo("ESPI MODE: %02x\n", regval); /* Save the selection so the subsequence re-configurations will be faster */ @@ -628,7 +628,7 @@ static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t wd) rxbyte = (uint8_t)0; spi_exchange(dev, &txbyte, &rxbyte, 1); - spivdbg("Sent %02x received %02x\n", txbyte, rxbyte); + spiinfo("Sent %02x received %02x\n", txbyte, rxbyte); return (uint16_t)rxbyte; } @@ -661,7 +661,7 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, FAR uint8_t *rxptr = rxbuffer; FAR const uint8_t *txptr = txbuffer; - spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); + spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); /* Make sure that any previous transfer is flushed from the hardware */ @@ -823,7 +823,7 @@ FAR struct spi_dev_s *z16_spibus_initialize(int port) irqstate_t flags; uint8_t regval; - spivdbg("port: %d\n", port); + spiinfo("port: %d\n", port); DEBUGASSERT(port == 0); /* Check if we have already initialized the ESPI */ diff --git a/arch/z80/src/ez80/ez80_emac.c b/arch/z80/src/ez80/ez80_emac.c index 0584aa0464..364ebfa95e 100644 --- a/arch/z80/src/ez80/ez80_emac.c +++ b/arch/z80/src/ez80/ez80_emac.c @@ -700,16 +700,16 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv) } dumpregs: - nvdbg("Am79c874 MII registers (FIAD=%lx)\n", CONFIG_EZ80_FIAD); - nvdbg(" MII_MCR: %04x\n", ez80emac_miiread(priv, MII_MCR)); - nvdbg(" MII_MSR: %04x\n", ez80emac_miiread(priv, MII_MSR)); - nvdbg(" MII_PHYID1: %04x\n", ez80emac_miiread(priv, MII_PHYID1)); - nvdbg(" MII_PHYID2: %04x\n", ez80emac_miiread(priv, MII_PHYID2)); - nvdbg(" MII_ADVERTISE: %04x\n", ez80emac_miiread(priv, MII_ADVERTISE)); - nvdbg(" MII_LPA: %04x\n", ez80emac_miiread(priv, MII_LPA)); - nvdbg(" MII_EXPANSION: %04x\n", ez80emac_miiread(priv, MII_EXPANSION)); - nvdbg(" MII_DIAGNOSTICS: %04x\n", ez80emac_miiread(priv, MII_AM79C874_DIAGNOSTIC)); - nvdbg("EMAC CFG1: %02x\n", inp(EZ80_EMAC_CFG1)); + ninfo("Am79c874 MII registers (FIAD=%lx)\n", CONFIG_EZ80_FIAD); + ninfo(" MII_MCR: %04x\n", ez80emac_miiread(priv, MII_MCR)); + ninfo(" MII_MSR: %04x\n", ez80emac_miiread(priv, MII_MSR)); + ninfo(" MII_PHYID1: %04x\n", ez80emac_miiread(priv, MII_PHYID1)); + ninfo(" MII_PHYID2: %04x\n", ez80emac_miiread(priv, MII_PHYID2)); + ninfo(" MII_ADVERTISE: %04x\n", ez80emac_miiread(priv, MII_ADVERTISE)); + ninfo(" MII_LPA: %04x\n", ez80emac_miiread(priv, MII_LPA)); + ninfo(" MII_EXPANSION: %04x\n", ez80emac_miiread(priv, MII_EXPANSION)); + ninfo(" MII_DIAGNOSTICS: %04x\n", ez80emac_miiread(priv, MII_AM79C874_DIAGNOSTIC)); + ninfo("EMAC CFG1: %02x\n", inp(EZ80_EMAC_CFG1)); return ret; } #else @@ -838,15 +838,15 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv) mcr |= MII_MCR_ANENABLE; ez80emac_miiwrite(priv, MII_MCR, mcr); - nvdbg("MII registers (FIAD=%lx)\n", CONFIG_EZ80_FIAD); - nvdbg(" MII_MCR: %04x\n", ez80emac_miiread(priv, MII_MCR)); - nvdbg(" MII_MSR: %04x\n", ez80emac_miiread(priv, MII_MSR)); - nvdbg(" MII_PHYID1: %04x\n", ez80emac_miiread(priv, MII_PHYID1)); - nvdbg(" MII_PHYID2: %04x\n", ez80emac_miiread(priv, MII_PHYID2)); - nvdbg(" MII_ADVERTISE: %04x\n", ez80emac_miiread(priv, MII_ADVERTISE)); - nvdbg(" MII_LPA: %04x\n", ez80emac_miiread(priv, MII_LPA)); - nvdbg(" MII_EXPANSION: %04x\n", ez80emac_miiread(priv, MII_EXPANSION)); - nvdbg("EMAC CFG1: %02x\n", inp(EZ80_EMAC_CFG11)); + ninfo("MII registers (FIAD=%lx)\n", CONFIG_EZ80_FIAD); + ninfo(" MII_MCR: %04x\n", ez80emac_miiread(priv, MII_MCR)); + ninfo(" MII_MSR: %04x\n", ez80emac_miiread(priv, MII_MSR)); + ninfo(" MII_PHYID1: %04x\n", ez80emac_miiread(priv, MII_PHYID1)); + ninfo(" MII_PHYID2: %04x\n", ez80emac_miiread(priv, MII_PHYID2)); + ninfo(" MII_ADVERTISE: %04x\n", ez80emac_miiread(priv, MII_ADVERTISE)); + ninfo(" MII_LPA: %04x\n", ez80emac_miiread(priv, MII_LPA)); + ninfo(" MII_EXPANSION: %04x\n", ez80emac_miiread(priv, MII_EXPANSION)); + ninfo("EMAC CFG1: %02x\n", inp(EZ80_EMAC_CFG11)); return OK; } #endif @@ -960,7 +960,7 @@ static int ez80emac_transmit(struct ez80emac_driver_s *priv) * handler and, therefore, may be suspended when debug output is generated! */ - nllvdbg("txnext=%p {%06x, %u, %04x} trp=%02x%02x\n", + nllinfo("txnext=%p {%06x, %u, %04x} trp=%02x%02x\n", priv->txnext, priv->txnext->np, priv->txnext->pktsize, priv->txnext->stat, inp(EZ80_EMAC_TRP_H), inp(EZ80_EMAC_TRP_L)); @@ -1039,9 +1039,9 @@ static int ez80emac_transmit(struct ez80emac_driver_s *priv) outp(EZ80_EMAC_PTMR, EMAC_PTMR); leave_critical_section(flags); - nllvdbg("txdesc=%p {%06x, %u, %04x}\n", + nllinfo("txdesc=%p {%06x, %u, %04x}\n", txdesc, txdesc->np, txdesc->pktsize, txdesc->stat); - nllvdbg("txnext=%p {%06x, %u, %04x} trp=%02x%02x\n", + nllinfo("txnext=%p {%06x, %u, %04x} trp=%02x%02x\n", txnext, txnext->np, txnext->pktsize, txnext->stat, inp(EZ80_EMAC_TRP_H), inp(EZ80_EMAC_TRP_L)); @@ -1082,7 +1082,7 @@ static int ez80emac_txpoll(struct net_driver_s *dev) * the field d_len is set to a value > 0. */ - nvdbg("Poll result: d_len=%d\n", priv->dev.d_len); + ninfo("Poll result: d_len=%d\n", priv->dev.d_len); if (priv->dev.d_len > 0) { /* Look up the destination MAC address and add it to the Ethernet @@ -1197,7 +1197,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv) */ rwp = ez80emac_rwp(); - nvdbg("rxnext=%p {%06x, %u, %04x} rrp=%06x rwp=%06x blkslft=%02x\n", + ninfo("rxnext=%p {%06x, %u, %04x} rrp=%06x rwp=%06x blkslft=%02x\n", rxdesc, rxdesc->np, rxdesc->pktsize, rxdesc->stat, ez80emac_rrp(), rwp, inp(EZ80_EMAC_BLKSLFT_H), inp(EZ80_EMAC_BLKSLFT_L)); @@ -1222,7 +1222,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv) if ((rxdesc->stat & EMAC_RXDESC_OK) == 0) { - nvdbg("Skipping bad RX pkt: %04x\n", rxdesc->stat); + ninfo("Skipping bad RX pkt: %04x\n", rxdesc->stat); EMAC_STAT(priv, rx_errors); EMAC_STAT(priv, rx_nok); continue; @@ -1234,7 +1234,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv) if (rxdesc->pktsize > CONFIG_NET_ETH_MTU) { - nvdbg("Truncated oversize RX pkt: %d->%d\n", rxdesc->pktsize, CONFIG_NET_ETH_MTU); + ninfo("Truncated oversize RX pkt: %d->%d\n", rxdesc->pktsize, CONFIG_NET_ETH_MTU); pktlen = CONFIG_NET_ETH_MTU; } else @@ -1252,7 +1252,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv) if ((FAR uint8_t*)(psrc + pktlen) > (FAR uint8_t*)priv->rxendp1) { int nbytes = (int)((FAR uint8_t*)priv->rxendp1 - (FAR uint8_t*)psrc); - nvdbg("RX wraps after %d bytes\n", nbytes + SIZEOF_EMACSDESC); + ninfo("RX wraps after %d bytes\n", nbytes + SIZEOF_EMACSDESC); memcpy(pdest, psrc, nbytes); memcpy(&pdest[nbytes], priv->rxstart, pktlen - nbytes); @@ -1288,7 +1288,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv) outp(EZ80_EMAC_RRP_L, (uint8_t)((uint24_t)rxdesc & 0xff)); outp(EZ80_EMAC_RRP_H, (uint8_t)(((uint24_t)rxdesc >> 8) & 0xff)); - nvdbg("rxnext=%p {%06x, %u, %04x} rrp=%06x rwp=%06x blkslft=%02x\n", + ninfo("rxnext=%p {%06x, %u, %04x} rrp=%06x rwp=%06x blkslft=%02x\n", rxdesc, rxdesc->np, rxdesc->pktsize, rxdesc->stat, ez80emac_rrp(), rwp, inp(EZ80_EMAC_BLKSLFT_H), inp(EZ80_EMAC_BLKSLFT_L)); @@ -1304,7 +1304,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv) #ifdef CONFIG_NET_IPv4 if (ETHBUF->type == HTONS(ETHTYPE_IP)) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); /* Handle ARP on input then give the IPv4 packet to the network * layer @@ -1345,7 +1345,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv) #ifdef CONFIG_NET_IPv6 if (ETHBUF->type == HTONS(ETHTYPE_IP6)) { - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); /* Give the IPv6 packet to the network layer */ @@ -1383,7 +1383,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv) #ifdef CONFIG_NET_ARP if (ETHBUF->type == htons(ETHTYPE_ARP)) { - nvdbg("ARP packet received (%02x)\n", ETHBUF->type); + ninfo("ARP packet received (%02x)\n", ETHBUF->type); EMAC_STAT(priv, rx_arp); arp_arpin(&priv->dev); @@ -1448,7 +1448,7 @@ static int ez80emac_txinterrupt(int irq, FAR void *context) /* All events are packet/control frame transmit complete events */ - nvdbg("txhead=%p {%06x, %u, %04x} trp=%02x%02x istat=%02x\n", + ninfo("txhead=%p {%06x, %u, %04x} trp=%02x%02x istat=%02x\n", txhead, txhead->np, txhead->pktsize, txhead->stat, inp(EZ80_EMAC_TRP_H), inp(EZ80_EMAC_TRP_L), istat); @@ -1471,7 +1471,7 @@ static int ez80emac_txinterrupt(int irq, FAR void *context) txhead = (FAR struct ez80emac_desc_s *)txhead->np; if (txhead) { - nvdbg("txhead=%p {%06x, %u, %04x} trp=%02x%02x\n", + ninfo("txhead=%p {%06x, %u, %04x} trp=%02x%02x\n", txhead, txhead->np, txhead->pktsize, txhead->stat, inp(EZ80_EMAC_TRP_H), inp(EZ80_EMAC_TRP_L)); } @@ -1484,7 +1484,7 @@ static int ez80emac_txinterrupt(int irq, FAR void *context) priv->txhead = txhead; if (!priv->txhead) { - nvdbg("No pending Tx.. Stopping XMIT function.\n"); + ninfo("No pending Tx.. Stopping XMIT function.\n"); /* Stop the Tx poll timer. (It will get restarted when we have * something to send @@ -2009,7 +2009,7 @@ static int ez80_emacinitialize(void) priv->txnext->pktsize = 0; priv->txnext->stat = 0; - nvdbg("txnext=%p {%06x, %u, %04x} tlbp=%02x%02x trp=%02x%02x\n", + ninfo("txnext=%p {%06x, %u, %04x} tlbp=%02x%02x trp=%02x%02x\n", priv->txnext, priv->txnext->np, priv->txnext->pktsize, priv->txnext->stat, inp(EZ80_EMAC_TLBP_H), inp(EZ80_EMAC_TLBP_L), inp(EZ80_EMAC_TRP_H), inp(EZ80_EMAC_TRP_L)); @@ -2030,7 +2030,7 @@ static int ez80_emacinitialize(void) priv->rxnext->pktsize = 0; priv->rxnext->stat = 0; - nvdbg("rxnext=%p {%06x, %u, %04x} bp=%02x%02x\n", + ninfo("rxnext=%p {%06x, %u, %04x} bp=%02x%02x\n", priv->rxnext, priv->rxnext->np, priv->rxnext->pktsize, priv->rxnext->stat, inp(EZ80_EMAC_BP_H), inp(EZ80_EMAC_BP_L)); @@ -2050,7 +2050,7 @@ static int ez80_emacinitialize(void) outp(EZ80_EMAC_RRP_L, (uint8_t)(addr & 0xff)); outp(EZ80_EMAC_RRP_H, (uint8_t)((addr >> 8) & 0xff)); - nvdbg("rrp=%02x%02x rwp=%02x%02x\n", + ninfo("rrp=%02x%02x rwp=%02x%02x\n", inp(EZ80_EMAC_RRP_H), inp(EZ80_EMAC_RRP_L), inp(EZ80_EMAC_RWP_H), inp(EZ80_EMAC_RWP_L)); @@ -2063,7 +2063,7 @@ static int ez80_emacinitialize(void) outp(EZ80_EMAC_RHBP_H, (uint8_t)((addr >> 8) & 0xff)); priv->rxendp1 = (FAR struct ez80emac_desc_s *)addr; - nvdbg("rxendp1=%p rhbp=%02x%02x\n", + ninfo("rxendp1=%p rhbp=%02x%02x\n", priv->rxendp1, inp(EZ80_EMAC_RHBP_H), inp(EZ80_EMAC_RHBP_L)); @@ -2072,7 +2072,7 @@ static int ez80_emacinitialize(void) */ outp(EZ80_EMAC_BUFSZ, EMAC_BUFSZ); - nvdbg("bufsz=%02x blksleft=%02x%02x\n", + ninfo("bufsz=%02x blksleft=%02x%02x\n", inp(EZ80_EMAC_BUFSZ), inp(EZ80_EMAC_BLKSLFT_H), inp(EZ80_EMAC_BLKSLFT_L)); /* Software reset */ @@ -2084,7 +2084,7 @@ static int ez80_emacinitialize(void) regval &= ~EMAC_RST_SRST; outp(EZ80_EMAC_RST, regval); - nvdbg("After soft reset: rwp=%02x%02x trp=%02x%02x\n", + ninfo("After soft reset: rwp=%02x%02x trp=%02x%02x\n", inp(EZ80_EMAC_RWP_H), inp(EZ80_EMAC_RWP_L), inp(EZ80_EMAC_TRP_H), inp(EZ80_EMAC_TRP_L)); diff --git a/audio/audio.c b/audio/audio.c index a1f0db3834..e8caf0a4b8 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -146,7 +146,7 @@ static int audio_open(FAR struct file *filep) uint8_t tmp; int ret; - audvdbg("crefs: %d\n", upper->crefs); + audinfo("crefs: %d\n", upper->crefs); /* Get exclusive access to the device structures */ @@ -198,7 +198,7 @@ static int audio_close(FAR struct file *filep) FAR struct audio_upperhalf_s *upper = inode->i_private; int ret; - audvdbg("crefs: %d\n", upper->crefs); + audinfo("crefs: %d\n", upper->crefs); /* Get exclusive access to the device structures */ @@ -228,7 +228,7 @@ static int audio_close(FAR struct file *filep) /* Disable the Audio device */ DEBUGASSERT(lower->ops->shutdown != NULL); - audvdbg("calling shutdown: %d\n"); + audinfo("calling shutdown: %d\n"); lower->ops->shutdown(lower); } @@ -358,7 +358,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg) #endif int ret; - audvdbg("cmd: %d arg: %ld\n", cmd, arg); + audinfo("cmd: %d arg: %ld\n", cmd, arg); /* Get exclusive access to the device structures */ @@ -382,7 +382,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg) FAR struct audio_caps_s *caps = (FAR struct audio_caps_s *)((uintptr_t)arg); DEBUGASSERT(lower->ops->getcaps != NULL); - audvdbg("AUDIOIOC_GETCAPS: Device=%d\n", caps->ac_type); + audinfo("AUDIOIOC_GETCAPS: Device=%d\n", caps->ac_type); /* Call the lower-half driver capabilities handler */ @@ -396,7 +396,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg) (FAR const struct audio_caps_desc_s *)((uintptr_t)arg); DEBUGASSERT(lower->ops->configure != NULL); - audvdbg("AUDIOIOC_INITIALIZE: Device=%d\n", caps->caps.ac_type); + audinfo("AUDIOIOC_INITIALIZE: Device=%d\n", caps->caps.ac_type); /* Call the lower-half driver configure handler */ @@ -412,7 +412,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg) { DEBUGASSERT(lower->ops->shutdown != NULL); - audvdbg("AUDIOIOC_SHUTDOWN\n"); + audinfo("AUDIOIOC_SHUTDOWN\n"); /* Call the lower-half driver initialize handler */ ret = lower->ops->shutdown(lower); @@ -427,7 +427,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case AUDIOIOC_START: { - audvdbg("AUDIOIOC_START\n"); + audinfo("AUDIOIOC_START\n"); DEBUGASSERT(lower->ops->start != NULL); /* Start the audio stream */ @@ -449,7 +449,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg) #ifndef CONFIG_AUDIO_EXCLUDE_STOP case AUDIOIOC_STOP: { - audvdbg("AUDIOIOC_STOP\n"); + audinfo("AUDIOIOC_STOP\n"); DEBUGASSERT(lower->ops->stop != NULL); if (upper->started) @@ -475,7 +475,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case AUDIOIOC_PAUSE: { - audvdbg("AUDIOIOC_PAUSE\n"); + audinfo("AUDIOIOC_PAUSE\n"); DEBUGASSERT(lower->ops->pause != NULL); if (upper->started) @@ -497,7 +497,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case AUDIOIOC_RESUME: { - audvdbg("AUDIOIOC_RESUME\n"); + audinfo("AUDIOIOC_RESUME\n"); DEBUGASSERT(lower->ops->resume != NULL); if (upper->started) @@ -521,7 +521,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case AUDIOIOC_ALLOCBUFFER: { - audvdbg("AUDIOIOC_ALLOCBUFFER\n"); + audinfo("AUDIOIOC_ALLOCBUFFER\n"); bufdesc = (FAR struct audio_buf_desc_s *) arg; if (lower->ops->allocbuffer) @@ -544,7 +544,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case AUDIOIOC_FREEBUFFER: { - audvdbg("AUDIOIOC_FREEBUFFER\n"); + audinfo("AUDIOIOC_FREEBUFFER\n"); bufdesc = (FAR struct audio_buf_desc_s *) arg; if (lower->ops->freebuffer) @@ -569,7 +569,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case AUDIOIOC_ENQUEUEBUFFER: { - audvdbg("AUDIOIOC_ENQUEUEBUFFER\n"); + audinfo("AUDIOIOC_ENQUEUEBUFFER\n"); DEBUGASSERT(lower->ops->enqueuebuffer != NULL); @@ -585,7 +585,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case AUDIOIOC_REGISTERMQ: { - audvdbg("AUDIOIOC_REGISTERMQ\n"); + audinfo("AUDIOIOC_REGISTERMQ\n"); upper->usermq = (mqd_t) arg; ret = OK; @@ -599,7 +599,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case AUDIOIOC_UNREGISTERMQ: { - audvdbg("AUDIOIOC_UNREGISTERMQ\n"); + audinfo("AUDIOIOC_UNREGISTERMQ\n"); upper->usermq = NULL; ret = OK; @@ -613,7 +613,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case AUDIOIOC_RESERVE: { - audvdbg("AUDIOIOC_RESERVE\n"); + audinfo("AUDIOIOC_RESERVE\n"); DEBUGASSERT(lower->ops->reserve != NULL); /* Call lower-half to perform the reservation */ @@ -633,7 +633,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case AUDIOIOC_RELEASE: { - audvdbg("AUDIOIOC_RELEASE\n"); + audinfo("AUDIOIOC_RELEASE\n"); DEBUGASSERT(lower->ops->release != NULL); /* Call lower-half to perform the release */ @@ -650,7 +650,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg) default: { - audvdbg("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg); + audinfo("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg); DEBUGASSERT(lower->ops->ioctl != NULL); ret = lower->ops->ioctl(lower, cmd, arg); } @@ -704,7 +704,7 @@ static inline void audio_dequeuebuffer(FAR struct audio_upperhalf_s *upper, { struct audio_msg_s msg; - audllvdbg("Entry\n"); + audllinfo("Entry\n"); /* Send a dequeue message to the user if a message queue is registered */ @@ -742,7 +742,7 @@ static inline void audio_complete(FAR struct audio_upperhalf_s *upper, { struct audio_msg_s msg; - audllvdbg("Entry\n"); + audllinfo("Entry\n"); /* Send a dequeue message to the user if a message queue is registered */ @@ -791,7 +791,7 @@ static void audio_callback(FAR void *handle, uint16_t reason, { FAR struct audio_upperhalf_s *upper = (FAR struct audio_upperhalf_s *)handle; - audllvdbg("Entry\n"); + audllinfo("Entry\n"); /* Perform operation based on reason code */ @@ -995,7 +995,7 @@ int audio_register(FAR const char *name, FAR struct audio_lowerhalf_s *dev) dev->upper = audio_callback; dev->priv = upper; - audvdbg("Registering %s\n", path); + audinfo("Registering %s\n", path); return register_driver(path, &g_audioops, 0666, upper); } diff --git a/audio/pcm_decode.c b/audio/pcm_decode.c index d57d5dbb9b..f650045dd5 100644 --- a/audio/pcm_decode.c +++ b/audio/pcm_decode.c @@ -432,7 +432,7 @@ static bool pcm_parsewav(FAR struct pcm_decode_s *priv, uint8_t *data) static void pcm_subsample_configure(FAR struct pcm_decode_s *priv, uint8_t subsample) { - audvdbg("subsample: %d\n", subsample); + audinfo("subsample: %d\n", subsample); /* Three possibilities: * @@ -448,7 +448,7 @@ static void pcm_subsample_configure(FAR struct pcm_decode_s *priv, if (subsample != AUDIO_SUBSAMPLE_NONE) { - audvdbg("Start sub-sampling\n"); + audinfo("Start sub-sampling\n"); /* Save the current subsample setting. Subsampling will begin on * then next audio buffer that we receive. @@ -466,7 +466,7 @@ static void pcm_subsample_configure(FAR struct pcm_decode_s *priv, else if (subsample == AUDIO_SUBSAMPLE_NONE) { - audvdbg("Stop sub-sampling\n"); + audinfo("Stop sub-sampling\n"); /* Indicate that we are in normal play mode. This will take effect * when the next audio buffer is received. @@ -758,7 +758,7 @@ static int pcm_configure(FAR struct audio_lowerhalf_s *dev, lower = priv->lower; DEBUGASSERT(lower && lower->ops->configure); - audvdbg("Defer to lower configure\n"); + audinfo("Defer to lower configure\n"); #ifdef CONFIG_AUDIO_MULTI_SESSION return lower->ops->configure(lower, session, caps); #else @@ -796,7 +796,7 @@ static int pcm_shutdown(FAR struct audio_lowerhalf_s *dev) lower = priv->lower; DEBUGASSERT(lower && lower->ops->start); - audvdbg("Defer to lower shutdown\n"); + audinfo("Defer to lower shutdown\n"); return lower->ops->shutdown(lower); } @@ -827,7 +827,7 @@ static int pcm_start(FAR struct audio_lowerhalf_s *dev) lower = priv->lower; DEBUGASSERT(lower && lower->ops->start); - audvdbg("Defer to lower start\n"); + audinfo("Defer to lower start\n"); #ifdef CONFIG_AUDIO_MULTI_SESSION return lower->ops->start(lower, session); #else @@ -866,7 +866,7 @@ static int pcm_stop(FAR struct audio_lowerhalf_s *dev) lower = priv->lower; DEBUGASSERT(lower && lower->ops->stop); - audvdbg("Defer to lower stop\n"); + audinfo("Defer to lower stop\n"); #ifdef CONFIG_AUDIO_MULTI_SESSION return lower->ops->stop(lower, session); #else @@ -900,7 +900,7 @@ static int pcm_pause(FAR struct audio_lowerhalf_s *dev) lower = priv->lower; DEBUGASSERT(lower && lower->ops->pause); - audvdbg("Defer to lower pause\n"); + audinfo("Defer to lower pause\n"); #ifdef CONFIG_AUDIO_MULTI_SESSION return lower->ops->pause(lower, session); #else @@ -933,7 +933,7 @@ static int pcm_resume(FAR struct audio_lowerhalf_s *dev) lower = priv->lower; DEBUGASSERT(lower && lower->ops->resume); - audvdbg("Defer to lower resume\n"); + audinfo("Defer to lower resume\n"); #ifdef CONFIG_AUDIO_MULTI_SESSION return lower->ops->resume(lower, session); #else @@ -967,7 +967,7 @@ static int pcm_allocbuffer(FAR struct audio_lowerhalf_s *dev, lower = priv->lower; DEBUGASSERT(lower && lower->ops->allocbuffer); - audvdbg("Defer to lower allocbuffer\n"); + audinfo("Defer to lower allocbuffer\n"); return lower->ops->allocbuffer(lower, apb); } @@ -994,7 +994,7 @@ static int pcm_freebuffer(FAR struct audio_lowerhalf_s *dev, lower = priv->lower; DEBUGASSERT(lower && lower->ops->freebuffer); - audvdbg("Defer to lower freebuffer, apb=%p\n", apb); + audinfo("Defer to lower freebuffer, apb=%p\n", apb); return lower->ops->freebuffer(lower, apb); } @@ -1026,7 +1026,7 @@ static int pcm_enqueuebuffer(FAR struct audio_lowerhalf_s *dev, int ret; DEBUGASSERT(priv); - audvdbg("Received buffer %p, streaming=%d\n", apb, priv->streaming); + audinfo("Received buffer %p, streaming=%d\n", apb, priv->streaming); lower = priv->lower; DEBUGASSERT(lower && lower->ops->enqueuebuffer && lower->ops->configure); @@ -1046,7 +1046,7 @@ static int pcm_enqueuebuffer(FAR struct audio_lowerhalf_s *dev, } #ifndef CONFIG_AUDIO_EXCLUDE_FFORWARD - audvdbg("Received: apb=%p curbyte=%d nbytes=%d flags=%04x\n", + audinfo("Received: apb=%p curbyte=%d nbytes=%d flags=%04x\n", apb, apb->curbyte, apb->nbytes, apb->flags); /* Perform any necessary sub-sampling operations */ @@ -1056,7 +1056,7 @@ static int pcm_enqueuebuffer(FAR struct audio_lowerhalf_s *dev, /* Then give the audio buffer to the lower driver */ - audvdbg("Pass to lower enqueuebuffer: apb=%p curbyte=%d nbytes=%d\n", + audinfo("Pass to lower enqueuebuffer: apb=%p curbyte=%d nbytes=%d\n", apb, apb->curbyte, apb->nbytes); return lower->ops->enqueuebuffer(lower, apb); @@ -1069,7 +1069,7 @@ static int pcm_enqueuebuffer(FAR struct audio_lowerhalf_s *dev, */ bytesleft = apb->nbytes - apb->curbyte; - audvdbg("curbyte=%d nbytes=%d nmaxbytes=%d bytesleft=%d\n", + audinfo("curbyte=%d nbytes=%d nmaxbytes=%d bytesleft=%d\n", apb->curbyte, apb->nbytes, apb->nmaxbytes, bytesleft); if (bytesleft >= sizeof(struct wav_header_s)) @@ -1109,7 +1109,7 @@ static int pcm_enqueuebuffer(FAR struct audio_lowerhalf_s *dev, apb->curbyte += sizeof(struct wav_header_s); #ifndef CONFIG_AUDIO_EXCLUDE_FFORWARD - audvdbg("Begin streaming: apb=%p curbyte=%d nbytes=%d\n", + audinfo("Begin streaming: apb=%p curbyte=%d nbytes=%d\n", apb, apb->curbyte, apb->nbytes); /* Perform any necessary sub-sampling operations */ @@ -1119,7 +1119,7 @@ static int pcm_enqueuebuffer(FAR struct audio_lowerhalf_s *dev, /* Then give the audio buffer to the lower driver */ - audvdbg("Pass to lower enqueuebuffer: apb=%p curbyte=%d nbytes=%d\n", + audinfo("Pass to lower enqueuebuffer: apb=%p curbyte=%d nbytes=%d\n", apb, apb->curbyte, apb->nbytes); ret = lower->ops->enqueuebuffer(lower, apb); @@ -1186,7 +1186,7 @@ static int pcm_cancelbuffer(FAR struct audio_lowerhalf_s *dev, lower = priv->lower; DEBUGASSERT(lower && lower->ops->cancelbuffer); - audvdbg("Defer to lower cancelbuffer, apb=%p\n", apb); + audinfo("Defer to lower cancelbuffer, apb=%p\n", apb); return lower->ops->cancelbuffer(lower, apb); } @@ -1211,7 +1211,7 @@ static int pcm_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd, lower = priv->lower; DEBUGASSERT(lower && lower->ops->ioctl); - audvdbg("Defer to lower ioctl, cmd=%d arg=%ld\n"); + audinfo("Defer to lower ioctl, cmd=%d arg=%ld\n"); return lower->ops->ioctl(lower, cmd, arg); } @@ -1256,7 +1256,7 @@ static int pcm_reserve(FAR struct audio_lowerhalf_s *dev) lower = priv->lower; DEBUGASSERT(lower && lower->ops->reserve); - audvdbg("Defer to lower reserve\n"); + audinfo("Defer to lower reserve\n"); #ifdef CONFIG_AUDIO_MULTI_SESSION ret = lower->ops->reserve(lower, &priv->session); @@ -1298,7 +1298,7 @@ static int pcm_release(FAR struct audio_lowerhalf_s *dev) lower = priv->lower; DEBUGASSERT(lower && lower->ops->release); - audvdbg("Defer to lower release\n"); + audinfo("Defer to lower release\n"); #ifdef CONFIG_AUDIO_MULTI_SESSION return lower->ops->release(lower, session); #else diff --git a/binfmt/binfmt_copyargv.c b/binfmt/binfmt_copyargv.c index 2fee46d047..612c0ec005 100644 --- a/binfmt/binfmt_copyargv.c +++ b/binfmt/binfmt_copyargv.c @@ -119,7 +119,7 @@ int binfmt_copyargv(FAR struct binary_s *bin, FAR char * const *argv) } } - bvdbg("args=%d argsize=%lu\n", nargs, (unsigned long)argsize); + binfo("args=%d argsize=%lu\n", nargs, (unsigned long)argsize); /* Allocate the argv array and an argument buffer */ diff --git a/binfmt/binfmt_execmodule.c b/binfmt/binfmt_execmodule.c index 971c47123c..03b10c89ab 100644 --- a/binfmt/binfmt_execmodule.c +++ b/binfmt/binfmt_execmodule.c @@ -109,7 +109,7 @@ static void exec_ctors(FAR void *arg) for (i = 0; i < binp->nctors; i++) { - bvdbg("Calling ctor %d at %p\n", i, (FAR void *)ctor); + binfo("Calling ctor %d at %p\n", i, (FAR void *)ctor); (*ctor)(); ctor++; @@ -155,7 +155,7 @@ int exec_module(FAR const struct binary_s *binp) } #endif - bvdbg("Executing %s\n", binp->filename); + binfo("Executing %s\n", binp->filename); /* Allocate a TCB for the new task. */ diff --git a/binfmt/binfmt_loadmodule.c b/binfmt/binfmt_loadmodule.c index 1b614838e6..3e73a01fb6 100644 --- a/binfmt/binfmt_loadmodule.c +++ b/binfmt/binfmt_loadmodule.c @@ -120,7 +120,7 @@ static int load_absmodule(FAR struct binary_s *bin) FAR struct binfmt_s *binfmt; int ret = -ENOENT; - bvdbg("Loading %s\n", bin->filename); + binfo("Loading %s\n", bin->filename); /* Disabling pre-emption should be sufficient protection while accessing * the list of registered binary format handlers. @@ -142,7 +142,7 @@ static int load_absmodule(FAR struct binary_s *bin) { /* Successfully loaded -- break out with ret == 0 */ - bvdbg("Successfully loaded module %s\n", bin->filename); + binfo("Successfully loaded module %s\n", bin->filename); /* Save the unload method for use by unload_module */ diff --git a/binfmt/binfmt_schedunload.c b/binfmt/binfmt_schedunload.c index f9da1349f6..5a459d79ae 100644 --- a/binfmt/binfmt_schedunload.c +++ b/binfmt/binfmt_schedunload.c @@ -284,7 +284,7 @@ int schedule_unload(pid_t pid, FAR struct binary_s *bin) /* The errno value will get trashed by the following debug output */ errorcode = get_errno(); - bvdbg("ERROR: sigprocmask failed: %d\n", ret); + binfo("ERROR: sigprocmask failed: %d\n", ret); goto errout; } @@ -310,7 +310,7 @@ int schedule_unload(pid_t pid, FAR struct binary_s *bin) /* The errno value will get trashed by the following debug output */ errorcode = get_errno(); - bvdbg("ERROR: sigaction failed: %d\n" , ret); + binfo("ERROR: sigaction failed: %d\n" , ret); /* Emergency removal from the list */ diff --git a/binfmt/binfmt_unloadmodule.c b/binfmt/binfmt_unloadmodule.c index 887d6d66c0..05e459d658 100644 --- a/binfmt/binfmt_unloadmodule.c +++ b/binfmt/binfmt_unloadmodule.c @@ -108,7 +108,7 @@ static inline int exec_dtors(FAR struct binary_s *binp) for (i = 0; i < binp->ndtors; i++) { - bvdbg("Calling dtor %d at %p\n", i, (FAR void *)dtor); + binfo("Calling dtor %d at %p\n", i, (FAR void *)dtor); (*dtor)(); dtor++; @@ -187,7 +187,7 @@ int unload_module(FAR struct binary_s *binp) if (binp->mapped) { - bvdbg("Unmapping address space: %p\n", binp->mapped); + binfo("Unmapping address space: %p\n", binp->mapped); munmap(binp->mapped, binp->mapsize); } @@ -198,7 +198,7 @@ int unload_module(FAR struct binary_s *binp) { if (binp->alloc[i]) { - bvdbg("Freeing alloc[%d]: %p\n", i, binp->alloc[i]); + binfo("Freeing alloc[%d]: %p\n", i, binp->alloc[i]); kumm_free((FAR void *)binp->alloc[i]); } } diff --git a/binfmt/builtin.c b/binfmt/builtin.c index 537556136b..695be24ef5 100644 --- a/binfmt/builtin.c +++ b/binfmt/builtin.c @@ -95,7 +95,7 @@ static int builtin_loadbinary(struct binary_s *binp) int index; int ret; - bvdbg("Loading file: %s\n", binp->filename); + binfo("Loading file: %s\n", binp->filename); /* Open the binary file for reading (only) */ @@ -171,7 +171,7 @@ int builtin_initialize(void) /* Register ourselves as a binfmt loader */ - bvdbg("Registering Builtin Loader\n"); + binfo("Registering Builtin Loader\n"); ret = register_binfmt(&g_builtin_binfmt); if (ret != 0) diff --git a/binfmt/elf.c b/binfmt/elf.c index 45154b0d4d..92f8b9b9e0 100644 --- a/binfmt/elf.c +++ b/binfmt/elf.c @@ -73,7 +73,7 @@ #endif #ifdef CONFIG_ELF_DUMPBUFFER -# define elf_dumpbuffer(m,b,n) bvdbgdumpbuffer(m,b,n) +# define elf_dumpbuffer(m,b,n) binfodumpbuffer(m,b,n) #else # define elf_dumpbuffer(m,b,n) #endif @@ -229,7 +229,7 @@ static int elf_loadbinary(FAR struct binary_s *binp) struct elf_loadinfo_s loadinfo; /* Contains globals for libelf */ int ret; - bvdbg("Loading file: %s\n", binp->filename); + binfo("Loading file: %s\n", binp->filename); /* Initialize the ELF library to load the program binary. */ @@ -338,7 +338,7 @@ int elf_initialize(void) /* Register ourselves as a binfmt loader */ - bvdbg("Registering ELF\n"); + binfo("Registering ELF\n"); ret = register_binfmt(&g_elfbinfmt); if (ret != 0) diff --git a/binfmt/libelf/libelf_bind.c b/binfmt/libelf/libelf_bind.c index 1890b78c73..7d63fa87a3 100644 --- a/binfmt/libelf/libelf_bind.c +++ b/binfmt/libelf/libelf_bind.c @@ -68,7 +68,7 @@ #endif #ifdef CONFIG_ELF_DUMPBUFFER -# define elf_dumpbuffer(m,b,n) bvdbgdumpbuffer(m,b,n) +# define elf_dumpbuffer(m,b,n) binfodumpbuffer(m,b,n) #else # define elf_dumpbuffer(m,b,n) #endif diff --git a/binfmt/libelf/libelf_ctors.c b/binfmt/libelf/libelf_ctors.c index 95f3884135..7d7a872027 100644 --- a/binfmt/libelf/libelf_ctors.c +++ b/binfmt/libelf/libelf_ctors.c @@ -121,7 +121,7 @@ int elf_loadctors(FAR struct elf_loadinfo_s *loadinfo) * static constructor section. */ - bvdbg("elf_findsection .ctors section failed: %d\n", ctoridx); + binfo("elf_findsection .ctors section failed: %d\n", ctoridx); return ret == -ENOENT ? OK : ret; } @@ -138,7 +138,7 @@ int elf_loadctors(FAR struct elf_loadinfo_s *loadinfo) ctorsize = shdr->sh_size; loadinfo->nctors = ctorsize / sizeof(binfmt_ctor_t); - bvdbg("ctoridx=%d ctorsize=%d sizeof(binfmt_ctor_t)=%d nctors=%d\n", + binfo("ctoridx=%d ctorsize=%d sizeof(binfmt_ctor_t)=%d nctors=%d\n", ctoridx, ctorsize, sizeof(binfmt_ctor_t), loadinfo->nctors); /* Check if there are any constructors. It is not an error if there @@ -191,7 +191,7 @@ int elf_loadctors(FAR struct elf_loadinfo_s *loadinfo) { FAR uintptr_t *ptr = (uintptr_t *)((FAR void *)(&loadinfo->ctors)[i]); - bvdbg("ctor %d: %08lx + %08lx = %08lx\n", + binfo("ctor %d: %08lx + %08lx = %08lx\n", i, *ptr, (unsigned long)loadinfo->textalloc, (unsigned long)(*ptr + loadinfo->textalloc)); diff --git a/binfmt/libelf/libelf_dtors.c b/binfmt/libelf/libelf_dtors.c index 1f4cdab7e3..75a6264b3c 100644 --- a/binfmt/libelf/libelf_dtors.c +++ b/binfmt/libelf/libelf_dtors.c @@ -121,7 +121,7 @@ int elf_loaddtors(FAR struct elf_loadinfo_s *loadinfo) * static destructor section. */ - bvdbg("elf_findsection .dtors section failed: %d\n", dtoridx); + binfo("elf_findsection .dtors section failed: %d\n", dtoridx); return ret == -ENOENT ? OK : ret; } @@ -138,7 +138,7 @@ int elf_loaddtors(FAR struct elf_loadinfo_s *loadinfo) dtorsize = shdr->sh_size; loadinfo->ndtors = dtorsize / sizeof(binfmt_dtor_t); - bvdbg("dtoridx=%d dtorsize=%d sizeof(binfmt_dtor_t)=%d ndtors=%d\n", + binfo("dtoridx=%d dtorsize=%d sizeof(binfmt_dtor_t)=%d ndtors=%d\n", dtoridx, dtorsize, sizeof(binfmt_dtor_t), loadinfo->ndtors); /* Check if there are any destructors. It is not an error if there @@ -191,7 +191,7 @@ int elf_loaddtors(FAR struct elf_loadinfo_s *loadinfo) { FAR uintptr_t *ptr = (uintptr_t *)((FAR void *)(&loadinfo->dtors)[i]); - bvdbg("dtor %d: %08lx + %08lx = %08lx\n", + binfo("dtor %d: %08lx + %08lx = %08lx\n", i, *ptr, (unsigned long)loadinfo->textalloc, (unsigned long)(*ptr + loadinfo->textalloc)); diff --git a/binfmt/libelf/libelf_init.c b/binfmt/libelf/libelf_init.c index 5ed774d3b0..fdbe328d60 100644 --- a/binfmt/libelf/libelf_init.c +++ b/binfmt/libelf/libelf_init.c @@ -65,7 +65,7 @@ #endif #ifdef CONFIG_ELF_DUMPBUFFER -# define elf_dumpbuffer(m,b,n) bvdbgdumpbuffer(m,b,n) +# define elf_dumpbuffer(m,b,n) binfodumpbuffer(m,b,n) #else # define elf_dumpbuffer(m,b,n) #endif @@ -145,7 +145,7 @@ int elf_init(FAR const char *filename, FAR struct elf_loadinfo_s *loadinfo) { int ret; - bvdbg("filename: %s loadinfo: %p\n", filename, loadinfo); + binfo("filename: %s loadinfo: %p\n", filename, loadinfo); /* Clear the load info structure */ diff --git a/binfmt/libelf/libelf_load.c b/binfmt/libelf/libelf_load.c index b5cef6c6e9..e8f19766ee 100644 --- a/binfmt/libelf/libelf_load.c +++ b/binfmt/libelf/libelf_load.c @@ -156,7 +156,7 @@ static inline int elf_loadfile(FAR struct elf_loadinfo_s *loadinfo) /* Read each section into memory that is marked SHF_ALLOC + SHT_NOBITS */ - bvdbg("Loaded sections:\n"); + binfo("Loaded sections:\n"); text = (FAR uint8_t *)loadinfo->textalloc; data = (FAR uint8_t *)loadinfo->dataalloc; @@ -212,7 +212,7 @@ static inline int elf_loadfile(FAR struct elf_loadinfo_s *loadinfo) /* Update sh_addr to point to copy in memory */ - bvdbg("%d. %08lx->%08lx\n", i, + binfo("%d. %08lx->%08lx\n", i, (unsigned long)shdr->sh_addr, (unsigned long)*pptr); shdr->sh_addr = (uintptr_t)*pptr; @@ -250,7 +250,7 @@ int elf_load(FAR struct elf_loadinfo_s *loadinfo) #endif int ret; - bvdbg("loadinfo: %p\n", loadinfo); + binfo("loadinfo: %p\n", loadinfo); DEBUGASSERT(loadinfo && loadinfo->filfd >= 0); /* Load section headers into memory */ @@ -335,7 +335,7 @@ int elf_load(FAR struct elf_loadinfo_s *loadinfo) exidx = elf_findsection(loadinfo, CONFIG_ELF_EXIDX_SECTNAME); if (exidx < 0) { - bvdbg("elf_findsection: Exception Index section not found: %d\n", exidx); + binfo("elf_findsection: Exception Index section not found: %d\n", exidx); } else { diff --git a/binfmt/libelf/libelf_read.c b/binfmt/libelf/libelf_read.c index 420c8f1808..d0b801768b 100644 --- a/binfmt/libelf/libelf_read.c +++ b/binfmt/libelf/libelf_read.c @@ -115,7 +115,7 @@ int elf_read(FAR struct elf_loadinfo_s *loadinfo, FAR uint8_t *buffer, ssize_t nbytes; /* Number of bytes read */ off_t rpos; /* Position returned by lseek */ - bvdbg("Read %ld bytes from offset %ld\n", (long)readsize, (long)offset); + binfo("Read %ld bytes from offset %ld\n", (long)readsize, (long)offset); /* Loop until all of the requested data has been read. */ diff --git a/binfmt/libelf/libelf_sections.c b/binfmt/libelf/libelf_sections.c index 26189d7247..a34bac2eb8 100644 --- a/binfmt/libelf/libelf_sections.c +++ b/binfmt/libelf/libelf_sections.c @@ -270,7 +270,7 @@ int elf_findsection(FAR struct elf_loadinfo_s *loadinfo, /* Check if the name of this section is 'sectname' */ - bvdbg("%d. Comparing \"%s\" and .\"%s\"\n", + binfo("%d. Comparing \"%s\" and .\"%s\"\n", i, loadinfo->iobuffer, sectname); if (strcmp((FAR const char *)loadinfo->iobuffer, sectname) == 0) diff --git a/binfmt/libelf/libelf_symbols.c b/binfmt/libelf/libelf_symbols.c index 1769481558..e63531a085 100644 --- a/binfmt/libelf/libelf_symbols.c +++ b/binfmt/libelf/libelf_symbols.c @@ -286,7 +286,7 @@ int elf_symvalue(FAR struct elf_loadinfo_s *loadinfo, FAR Elf32_Sym *sym, { /* st_value already holds the correct value */ - bvdbg("SHN_ABS: st_value=%08lx\n", (long)sym->st_value); + binfo("SHN_ABS: st_value=%08lx\n", (long)sym->st_value); return OK; } @@ -322,7 +322,7 @@ int elf_symvalue(FAR struct elf_loadinfo_s *loadinfo, FAR Elf32_Sym *sym, /* Yes... add the exported symbol value to the ELF symbol table entry */ - bvdbg("SHN_ABS: name=%s %08x+%08x=%08x\n", + binfo("SHN_ABS: name=%s %08x+%08x=%08x\n", loadinfo->iobuffer, sym->st_value, symbol->sym_value, sym->st_value + symbol->sym_value); @@ -334,7 +334,7 @@ int elf_symvalue(FAR struct elf_loadinfo_s *loadinfo, FAR Elf32_Sym *sym, { secbase = loadinfo->shdr[sym->st_shndx].sh_addr; - bvdbg("Other: %08x+%08x=%08x\n", + binfo("Other: %08x+%08x=%08x\n", sym->st_value, secbase, sym->st_value + secbase); sym->st_value += secbase; diff --git a/binfmt/libelf/libelf_verify.c b/binfmt/libelf/libelf_verify.c index 015d9d39fe..4e79991433 100644 --- a/binfmt/libelf/libelf_verify.c +++ b/binfmt/libelf/libelf_verify.c @@ -95,7 +95,7 @@ int elf_verifyheader(FAR const Elf32_Ehdr *ehdr) if (memcmp(ehdr->e_ident, g_elfmagic, EI_MAGIC_SIZE) != 0) { - bvdbg("Not ELF magic {%02x, %02x, %02x, %02x}\n", + binfo("Not ELF magic {%02x, %02x, %02x, %02x}\n", ehdr->e_ident[0], ehdr->e_ident[1], ehdr->e_ident[2], ehdr->e_ident[3]); return -ENOEXEC; } diff --git a/binfmt/libnxflat/libnxflat_bind.c b/binfmt/libnxflat/libnxflat_bind.c index ef45aa204d..25f251685d 100644 --- a/binfmt/libnxflat/libnxflat_bind.c +++ b/binfmt/libnxflat/libnxflat_bind.c @@ -67,7 +67,7 @@ #endif #ifdef CONFIG_NXFLAT_DUMPBUFFER -# define nxflat_dumpbuffer(m,b,n) bvdbgdumpbuffer(m,b,n) +# define nxflat_dumpbuffer(m,b,n) binfodumpbuffer(m,b,n) #else # define nxflat_dumpbuffer(m,b,n) #endif @@ -104,15 +104,15 @@ static inline int nxflat_bindrel32i(FAR struct nxflat_loadinfo_s *loadinfo, { FAR uint32_t *addr; - bvdbg("NXFLAT_RELOC_TYPE_REL32I Offset: %08x I-Space: %p\n", + binfo("NXFLAT_RELOC_TYPE_REL32I Offset: %08x I-Space: %p\n", offset, loadinfo->ispace + sizeof(struct nxflat_hdr_s)); if (offset < loadinfo->dsize) { addr = (FAR uint32_t *)(offset + loadinfo->dspace->region); - bvdbg(" Before: %08x\n", *addr); + binfo(" Before: %08x\n", *addr); *addr += (uint32_t)(loadinfo->ispace + sizeof(struct nxflat_hdr_s)); - bvdbg(" After: %08x\n", *addr); + binfo(" After: %08x\n", *addr); return OK; } else @@ -143,15 +143,15 @@ static inline int nxflat_bindrel32d(FAR struct nxflat_loadinfo_s *loadinfo, { FAR uint32_t *addr; - bvdbg("NXFLAT_RELOC_TYPE_REL32D Offset: %08x D-Space: %p\n", + binfo("NXFLAT_RELOC_TYPE_REL32D Offset: %08x D-Space: %p\n", offset, loadinfo->dspace->region); if (offset < loadinfo->dsize) { addr = (FAR uint32_t *)(offset + loadinfo->dspace->region); - bvdbg(" Before: %08x\n", *addr); + binfo(" Before: %08x\n", *addr); *addr += (uint32_t)(loadinfo->dspace->region); - bvdbg(" After: %08x\n", *addr); + binfo(" After: %08x\n", *addr); return OK; } else @@ -185,15 +185,15 @@ static inline int nxflat_bindrel32id(FAR struct nxflat_loadinfo_s *loadinfo, { FAR uint32_t *addr; - bvdbg("NXFLAT_RELOC_TYPE_REL32D Offset: %08x D-Space: %p\n", + binfo("NXFLAT_RELOC_TYPE_REL32D Offset: %08x D-Space: %p\n", offset, loadinfo->dspace->region); if (offset < loadinfo->dsize) { addr = (FAR uint32_t *)(offset + loadinfo->dspace->region); - bvdbg(" Before: %08x\n", *addr); + binfo(" Before: %08x\n", *addr); *addr += ((uint32_t)loadinfo->ispace - (uint32_t)(loadinfo->dspace->region)); - bvdbg(" After: %08x\n", *addr); + binfo(" After: %08x\n", *addr); return OK; } else @@ -237,7 +237,7 @@ static inline int nxflat_gotrelocs(FAR struct nxflat_loadinfo_s *loadinfo) offset = ntohl(hdr->h_relocstart); nrelocs = ntohs(hdr->h_reloccount); - bvdbg("offset: %08lx nrelocs: %d\n", (long)offset, nrelocs); + binfo("offset: %08lx nrelocs: %d\n", (long)offset, nrelocs); /* The value of the relocation list that we get from the header is a * file offset. We will have to convert this to an offset into the @@ -251,7 +251,7 @@ static inline int nxflat_gotrelocs(FAR struct nxflat_loadinfo_s *loadinfo) relocs = (FAR struct nxflat_reloc_s *) (offset - loadinfo->isize + loadinfo->dspace->region); - bvdbg("isize: %08lx dpsace: %p relocs: %p\n", + binfo("isize: %08lx dpsace: %p relocs: %p\n", (long)loadinfo->isize, loadinfo->dspace->region, relocs); /* All relocations are performed within the D-Space allocation. If @@ -405,7 +405,7 @@ static inline int nxflat_bindimports(FAR struct nxflat_loadinfo_s *loadinfo, offset = ntohl(hdr->h_importsymbols); nimports = ntohs(hdr->h_importcount); - bvdbg("Imports offset: %08x nimports: %d\n", offset, nimports); + binfo("Imports offset: %08x nimports: %d\n", offset, nimports); /* The import[] table resides within the D-Space allocation. If * CONFIG_ARCH_ADDRENV=y, then that D-Space allocation lies in an address @@ -450,7 +450,7 @@ static inline int nxflat_bindimports(FAR struct nxflat_loadinfo_s *loadinfo, for (i = 0; i < nimports; i++) { - bvdbg("Import[%d] (%08p) offset: %08x func: %08x\n", + binfo("Import[%d] (%08p) offset: %08x func: %08x\n", i, &imports[i], imports[i].i_funcname, imports[i].i_funcaddress); /* Get a pointer to the imported symbol name. The name itself @@ -484,7 +484,7 @@ static inline int nxflat_bindimports(FAR struct nxflat_loadinfo_s *loadinfo, imports[i].i_funcaddress = (uint32_t)symbol->sym_value; - bvdbg("Bound import[%d] (%08p) to export '%s' (%08x)\n", + binfo("Bound import[%d] (%08p) to export '%s' (%08x)\n", i, &imports[i], symname, imports[i].i_funcaddress); } } diff --git a/binfmt/libnxflat/libnxflat_init.c b/binfmt/libnxflat/libnxflat_init.c index c66cbe1189..af8fd102d2 100644 --- a/binfmt/libnxflat/libnxflat_init.c +++ b/binfmt/libnxflat/libnxflat_init.c @@ -63,7 +63,7 @@ #endif #ifdef CONFIG_NXFLAT_DUMPBUFFER -# define nxflat_dumpbuffer(m,b,n) bvdbgdumpbuffer(m,b,n) +# define nxflat_dumpbuffer(m,b,n) binfodumpbuffer(m,b,n) #else # define nxflat_dumpbuffer(m,b,n) #endif @@ -100,7 +100,7 @@ int nxflat_init(const char *filename, struct nxflat_loadinfo_s *loadinfo) uint32_t bssend; int ret; - bvdbg("filename: %s loadinfo: %p\n", filename, loadinfo); + binfo("filename: %s loadinfo: %p\n", filename, loadinfo); /* Clear the load info structure */ diff --git a/binfmt/libnxflat/libnxflat_load.c b/binfmt/libnxflat/libnxflat_load.c index a3e49d3ce1..8e5dea7062 100644 --- a/binfmt/libnxflat/libnxflat_load.c +++ b/binfmt/libnxflat/libnxflat_load.c @@ -154,7 +154,7 @@ int nxflat_load(struct nxflat_loadinfo_s *loadinfo) return -errno; } - bvdbg("Mapped ISpace (%d bytes) at %08x\n", loadinfo->isize, loadinfo->ispace); + binfo("Mapped ISpace (%d bytes) at %08x\n", loadinfo->isize, loadinfo->ispace); /* The following call allocate D-Space memory and will provide a pointer * to the allocated (but still uninitialized) D-Space memory. @@ -167,7 +167,7 @@ int nxflat_load(struct nxflat_loadinfo_s *loadinfo) return ret; } - bvdbg("Allocated DSpace (%d bytes) at %p\n", + binfo("Allocated DSpace (%d bytes) at %p\n", loadinfo->dsize, loadinfo->dspace->region); /* If CONFIG_ARCH_ADDRENV=y, then the D-Space allocation lies in an address @@ -197,7 +197,7 @@ int nxflat_load(struct nxflat_loadinfo_s *loadinfo) goto errout; } - bvdbg("TEXT: %08x Entry point offset: %08x Data offset: %08x\n", + binfo("TEXT: %08x Entry point offset: %08x Data offset: %08x\n", loadinfo->ispace, loadinfo->entryoffs, doffset); /* Restore the original address environment */ diff --git a/binfmt/libnxflat/libnxflat_read.c b/binfmt/libnxflat/libnxflat_read.c index 023b7c07e4..bb3d4b5b16 100644 --- a/binfmt/libnxflat/libnxflat_read.c +++ b/binfmt/libnxflat/libnxflat_read.c @@ -114,7 +114,7 @@ int nxflat_read(struct nxflat_loadinfo_s *loadinfo, char *buffer, int readsize, int bytesleft; /* Number of bytes of .data left to read */ int bytesread; /* Total number of bytes read */ - bvdbg("Read %d bytes from offset %d\n", readsize, offset); + binfo("Read %d bytes from offset %d\n", readsize, offset); /* Seek to the position in the object file where the initialized * data is saved. diff --git a/binfmt/nxflat.c b/binfmt/nxflat.c index 7eac76e65b..d2df7c1d11 100644 --- a/binfmt/nxflat.c +++ b/binfmt/nxflat.c @@ -65,7 +65,7 @@ #endif #ifdef CONFIG_NXFLAT_DUMPBUFFER -# define nxflat_dumpbuffer(m,b,n) bvdbgdumpbuffer(m,b,n) +# define nxflat_dumpbuffer(m,b,n) binfodumpbuffer(m,b,n) #else # define nxflat_dumpbuffer(m,b,n) #endif @@ -151,7 +151,7 @@ static int nxflat_loadbinary(struct binary_s *binp) struct nxflat_loadinfo_s loadinfo; /* Contains globals for libnxflat */ int ret; - bvdbg("Loading file: %s\n", binp->filename); + binfo("Loading file: %s\n", binp->filename); /* Initialize the xflat library to load the program binary. */ @@ -252,7 +252,7 @@ int nxflat_initialize(void) /* Register ourselves as a binfmt loader */ - bvdbg("Registering NXFLAT\n"); + binfo("Registering NXFLAT\n"); ret = register_binfmt(&g_nxflatbinfmt); if (ret != 0) { diff --git a/binfmt/pcode.c b/binfmt/pcode.c index 6023622440..74b42e4ca5 100644 --- a/binfmt/pcode.c +++ b/binfmt/pcode.c @@ -169,7 +169,7 @@ static int pcode_mount_testfs(void) /* Create a ROM disk for the ROMFS filesystem */ - bvdbg("Registering romdisk at /dev/ram%d\n", CONFIG_PCODE_TEST_DEVMINOR); + binfo("Registering romdisk at /dev/ram%d\n", CONFIG_PCODE_TEST_DEVMINOR); ret = romdisk_register(CONFIG_PCODE_TEST_DEVMINOR, (FAR uint8_t *)romfs_img, NSECTORS(ROMFS_IMG_LEN), SECTORSIZE); if (ret < 0) @@ -180,7 +180,7 @@ static int pcode_mount_testfs(void) /* Mount the test file system */ - bvdbg("Mounting ROMFS filesystem at target=%s with source=%s\n", + binfo("Mounting ROMFS filesystem at target=%s with source=%s\n", CONFIG_PCODE_TEST_MOUNTPOINT, CONFIG_PCODE_TEST_DEVPATH); ret = mount(CONFIG_PCODE_TEST_DEVPATH, CONFIG_PCODE_TEST_MOUNTPOINT, @@ -259,7 +259,7 @@ static int pcode_proxy(int argc, char **argv) sem_post(&g_pcode_handoff.exclsem); DEBUGASSERT(binp && fullpath); - bvdbg("Executing %s\n", fullpath); + binfo("Executing %s\n", fullpath); /* Set-up the on-exit handler that will unload the module on exit */ @@ -310,7 +310,7 @@ static int pcode_load(struct binary_s *binp) int fd; int ret; - bvdbg("Loading file: %s\n", binp->filename); + binfo("Loading file: %s\n", binp->filename); /* Open the binary file for reading (only) */ @@ -479,7 +479,7 @@ int pcode_initialize(void) /* Register ourselves as a binfmt loader */ - bvdbg("Registering P-Code Loader\n"); + binfo("Registering P-Code Loader\n"); ret = register_binfmt(&g_pcode_binfmt); if (ret != 0) diff --git a/configs/arduino-due/src/sam_autoleds.c b/configs/arduino-due/src/sam_autoleds.c index 8f14011c9c..9708b777fa 100644 --- a/configs/arduino-due/src/sam_autoleds.c +++ b/configs/arduino-due/src/sam_autoleds.c @@ -101,10 +101,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/arduino-due/src/sam_mmcsd.c b/configs/arduino-due/src/sam_mmcsd.c index 23787dd7dd..c0437411a9 100644 --- a/configs/arduino-due/src/sam_mmcsd.c +++ b/configs/arduino-due/src/sam_mmcsd.c @@ -254,7 +254,7 @@ int sam_sdinitialize(int minor) /* Get the SPI driver instance for the SD chip select */ - fvdbg("Initializing bit bang SPI for the MMC/SD slot\n"); + finfo("Initializing bit bang SPI for the MMC/SD slot\n"); spi = sam_mmcsd_spiinitialize(); if (!spi) @@ -263,11 +263,11 @@ int sam_sdinitialize(int minor) return -ENODEV; } - fvdbg("Successfully initialized bit bang SPI for the MMC/SD slot\n"); + finfo("Successfully initialized bit bang SPI for the MMC/SD slot\n"); /* Bind the SPI device for the chip select to the slot */ - fvdbg("Binding bit bang SPI device to MMC/SD slot %d\n", + finfo("Binding bit bang SPI device to MMC/SD slot %d\n", SAM34_MMCSDSLOTNO); ret = mmcsd_spislotinitialize(minor, SAM34_MMCSDSLOTNO, spi); @@ -278,7 +278,7 @@ int sam_sdinitialize(int minor) return ret; } - fvdbg("Successfuly bound bit bang SPI device to MMC/SD slot %d\n", + finfo("Successfuly bound bit bang SPI device to MMC/SD slot %d\n", SAM34_MMCSDSLOTNO); return OK; diff --git a/configs/arduino-due/src/sam_touchscreen.c b/configs/arduino-due/src/sam_touchscreen.c index d2a2c408ff..13ea83febe 100644 --- a/configs/arduino-due/src/sam_touchscreen.c +++ b/configs/arduino-due/src/sam_touchscreen.c @@ -266,7 +266,7 @@ static int tsc_attach(FAR struct ads7843e_config_s *state, xcpt_t isr) { /* Attach the XPT2046 interrupt */ - ivdbg("Attaching %p to IRQ %d\n", isr, SAM_TSC_IRQ); + iinfo("Attaching %p to IRQ %d\n", isr, SAM_TSC_IRQ); return irq_attach(SAM_TSC_IRQ, isr); } @@ -274,7 +274,7 @@ static void tsc_enable(FAR struct ads7843e_config_s *state, bool enable) { /* Attach and enable, or detach and disable */ - ivdbg("IRQ:%d enable:%d\n", SAM_TSC_IRQ, enable); + iinfo("IRQ:%d enable:%d\n", SAM_TSC_IRQ, enable); if (enable) { sam_gpioirqenable(SAM_TSC_IRQ); @@ -300,7 +300,7 @@ static bool tsc_pendown(FAR struct ads7843e_config_s *state) /* The /PENIRQ value is active low */ bool pendown = !sam_gpioread(GPIO_TSC_IRQ); - ivdbg("pendown:%d\n", pendown); + iinfo("pendown:%d\n", pendown); return pendown; } diff --git a/configs/arduino-due/src/sam_userleds.c b/configs/arduino-due/src/sam_userleds.c index 50360f678f..eecc9fae4e 100644 --- a/configs/arduino-due/src/sam_userleds.c +++ b/configs/arduino-due/src/sam_userleds.c @@ -61,10 +61,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/cc3200-launchpad/src/cc3200_autoleds.c b/configs/cc3200-launchpad/src/cc3200_autoleds.c index 6fe52de306..6155f84550 100644 --- a/configs/cc3200-launchpad/src/cc3200_autoleds.c +++ b/configs/cc3200-launchpad/src/cc3200_autoleds.c @@ -93,10 +93,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/cloudctrl/src/stm32_autoleds.c b/configs/cloudctrl/src/stm32_autoleds.c index 98d7af6d8f..9e1f000078 100644 --- a/configs/cloudctrl/src/stm32_autoleds.c +++ b/configs/cloudctrl/src/stm32_autoleds.c @@ -64,10 +64,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* The following definitions map the encoded LED setting to GPIO settings */ diff --git a/configs/cloudctrl/src/stm32_spi.c b/configs/cloudctrl/src/stm32_spi.c index 4695aa3a4a..dadb3fa8be 100644 --- a/configs/cloudctrl/src/stm32_spi.c +++ b/configs/cloudctrl/src/stm32_spi.c @@ -67,13 +67,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/cloudctrl/src/stm32_usb.c b/configs/cloudctrl/src/stm32_usb.c index 10ecdec7ca..49f25d4330 100644 --- a/configs/cloudctrl/src/stm32_usb.c +++ b/configs/cloudctrl/src/stm32_usb.c @@ -107,13 +107,13 @@ static int usbhost_waiter(int argc, char *argv[]) { struct usbhost_hubport_s *hport; - uvdbg("Running\n"); + uinfo("Running\n"); for (;;) { /* Wait for the device to change state */ DEBUGVERIFY(CONN_WAIT(g_usbconn, &hport)); - uvdbg("%s\n", hport->connected ? "connected" : "disconnected"); + uinfo("%s\n", hport->connected ? "connected" : "disconnected"); /* Did we just become connected? */ @@ -177,7 +177,7 @@ int stm32_usbhost_initialize(void) * that we care about: */ - uvdbg("Register class drivers\n"); + uinfo("Register class drivers\n"); #ifdef CONFIG_USBHOST_MSC /* Register the USB mass storage class */ @@ -201,13 +201,13 @@ int stm32_usbhost_initialize(void) /* Then get an instance of the USB host interface */ - uvdbg("Initialize USB host\n"); + uinfo("Initialize USB host\n"); g_usbconn = stm32_otgfshost_initialize(0); if (g_usbconn) { /* Start a thread to handle device connection. */ - uvdbg("Start usbhost_waiter\n"); + uinfo("Start usbhost_waiter\n"); pid = task_create("usbhost", CONFIG_USBHOST_DEFPRIO, CONFIG_USBHOST_STACKSIZE, diff --git a/configs/cloudctrl/src/stm32_userleds.c b/configs/cloudctrl/src/stm32_userleds.c index 43f847554c..e7bc159243 100644 --- a/configs/cloudctrl/src/stm32_userleds.c +++ b/configs/cloudctrl/src/stm32_userleds.c @@ -64,10 +64,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/compal_e99/src/ssd1783.c b/configs/compal_e99/src/ssd1783.c index e33cbd4f80..b858fef0c2 100644 --- a/configs/compal_e99/src/ssd1783.c +++ b/configs/compal_e99/src/ssd1783.c @@ -78,7 +78,7 @@ /* Debug ******************************************************************************/ #ifdef CONFIG_DEBUG_LCD -# define lcddbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define lcddbg(format, ...) info(format, ##__VA_ARGS__) #else # define lcddbg(x...) #endif @@ -307,7 +307,7 @@ int lcd_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer, int lcd_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, size_t npixels) { - gvdbg("Not implemented\n"); + ginfo("Not implemented\n"); return -ENOSYS; } @@ -322,7 +322,7 @@ int lcd_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, static int lcd_getvideoinfo(FAR struct lcd_dev_s *dev, FAR struct fb_videoinfo_s *vinfo) { - DEBUGASSERT(dev && vinfo);gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n", + DEBUGASSERT(dev && vinfo);ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n", g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes); memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s)); return OK; @@ -339,7 +339,7 @@ static int lcd_getvideoinfo(FAR struct lcd_dev_s *dev, static int lcd_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, FAR struct lcd_planeinfo_s *pinfo) { - DEBUGASSERT(dev && pinfo && planeno == 0);gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); + DEBUGASSERT(dev && pinfo && planeno == 0);ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s)); return OK; } @@ -355,7 +355,7 @@ static int lcd_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, static int lcd_getpower(struct lcd_dev_s *dev) { - gvdbg("power: %d\n", 0); + ginfo("power: %d\n", 0); return g_lcddev.power; } @@ -376,7 +376,7 @@ static int lcd_setpower(struct lcd_dev_s *dev, int power) return OK; } - gvdbg("power: %d\n", power); + ginfo("power: %d\n", power); DEBUGASSERT(power <= CONFIG_LCD_MAXPOWER); /* Set new power level */ @@ -405,7 +405,7 @@ static int lcd_setpower(struct lcd_dev_s *dev, int power) } else { - gvdbg("powering LCD off...\n"); + ginfo("powering LCD off...\n"); /* Switch pin from PWL to LT */ reg &= ~ASCONF_PWL_ENA; putreg8(reg, ASIC_CONF_REG); @@ -426,7 +426,7 @@ static int lcd_setpower(struct lcd_dev_s *dev, int power) static int lcd_getcontrast(struct lcd_dev_s *dev) { - gvdbg("Not implemented\n"); + ginfo("Not implemented\n"); return -ENOSYS; } @@ -440,7 +440,7 @@ static int lcd_getcontrast(struct lcd_dev_s *dev) static int lcd_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) { - gvdbg("Not implemented\n"); + ginfo("Not implemented\n"); return -ENOSYS; } @@ -453,7 +453,7 @@ static int lcd_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) **************************************************************************************/ static inline void lcd_initialize(void) { - gvdbg("%s: initializing LCD.\n",__FUNCTION__); + ginfo("%s: initializing LCD.\n",__FUNCTION__); calypso_reset_set(RESET_EXT, 0); usleep(5000); uwire_init(); @@ -478,7 +478,7 @@ static inline void lcd_initialize(void) int board_lcd_initialize(void) { - gvdbg("Initializing\n"); + ginfo("Initializing\n"); lcd_initialize(); diff --git a/configs/demo9s12ne64/src/m9s12_leds.c b/configs/demo9s12ne64/src/m9s12_leds.c index 069f9cd5a1..56c0df885f 100644 --- a/configs/demo9s12ne64/src/m9s12_leds.c +++ b/configs/demo9s12ne64/src/m9s12_leds.c @@ -56,10 +56,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/demo9s12ne64/src/m9s12_spi.c b/configs/demo9s12ne64/src/m9s12_spi.c index b418635021..3d029f14ea 100644 --- a/configs/demo9s12ne64/src/m9s12_spi.c +++ b/configs/demo9s12ne64/src/m9s12_spi.c @@ -62,14 +62,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/dk-tm4c129x/src/tm4c_ssi.c b/configs/dk-tm4c129x/src/tm4c_ssi.c index 0712075703..6b5dbe5d0b 100644 --- a/configs/dk-tm4c129x/src/tm4c_ssi.c +++ b/configs/dk-tm4c129x/src/tm4c_ssi.c @@ -70,10 +70,10 @@ /* Dump GPIO registers */ #if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO) -# define ssivdbg lldbg +# define ssiinfo lldbg # define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m) #else -# define ssivdbg(x...) +# define ssiinfo(x...) # define ssi_dumpgpio(m) #endif diff --git a/configs/dk-tm4c129x/src/tm4c_timer.c b/configs/dk-tm4c129x/src/tm4c_timer.c index e6cfe3e13c..2249293279 100644 --- a/configs/dk-tm4c129x/src/tm4c_timer.c +++ b/configs/dk-tm4c129x/src/tm4c_timer.c @@ -102,7 +102,7 @@ int tiva_timer_configure(void) { int ret; - timvdbg("Registering TIMER%d at %s\n", GPTM, CONFIG_DK_TM4C129X_TIMER_DEVNAME); + timinfo("Registering TIMER%d at %s\n", GPTM, CONFIG_DK_TM4C129X_TIMER_DEVNAME); ret = tiva_timer_register(CONFIG_DK_TM4C129X_TIMER_DEVNAME, GPTM, ALTCLK); if (ret < 0) diff --git a/configs/dk-tm4c129x/src/tm4c_userleds.c b/configs/dk-tm4c129x/src/tm4c_userleds.c index a4b66564c4..7d894ede63 100644 --- a/configs/dk-tm4c129x/src/tm4c_userleds.c +++ b/configs/dk-tm4c129x/src/tm4c_userleds.c @@ -72,10 +72,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/ea3131/src/lpc31_fillpage.c b/configs/ea3131/src/lpc31_fillpage.c index 3ca97433cf..91bad2c867 100644 --- a/configs/ea3131/src/lpc31_fillpage.c +++ b/configs/ea3131/src/lpc31_fillpage.c @@ -244,7 +244,7 @@ static inline void lpc31_initsrc(void) char devname[16]; #endif - pgllvdbg("Initializing %s\n", CONFIG_PAGING_BINPATH); + pgllinfo("Initializing %s\n", CONFIG_PAGING_BINPATH); /* No, do we need to mount an SD device? */ @@ -300,7 +300,7 @@ static inline void lpc31_initsrc(void) { /* No... the initialize now */ - pgllvdbg("Initializing\n"); + pgllinfo("Initializing\n"); /* First get an instance of the SPI device interface */ @@ -327,7 +327,7 @@ static inline void lpc31_initsrc(void) ret = MTD_IOCTL(g_pgsrc.mtd, MTDIOC_GEOMETRY, (unsigned long)&g_pgsrc.geo); DEBUGASSERT(ret >= 0); capacity = g_pgsrc.geo.erasesize*g_pgsrc.geo.neraseblocks; - pgllvdbg("capacity: %d\n", capacity); + pgllinfo("capacity: %d\n", capacity); DEBUGASSERT(capacity >= (CONFIG_EA3131_PAGING_BINOFFSET + PG_TEXT_VSIZE)); #endif diff --git a/configs/ea3131/src/lpc31_leds.c b/configs/ea3131/src/lpc31_leds.c index 0e4216cdc7..3b509575c3 100644 --- a/configs/ea3131/src/lpc31_leds.c +++ b/configs/ea3131/src/lpc31_leds.c @@ -61,10 +61,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/ea3131/src/lpc31_spi.c b/configs/ea3131/src/lpc31_spi.c index cda79ac9e6..fead540055 100644 --- a/configs/ea3131/src/lpc31_spi.c +++ b/configs/ea3131/src/lpc31_spi.c @@ -67,14 +67,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/ea3131/src/lpc31_usbhost.c b/configs/ea3131/src/lpc31_usbhost.c index 4c7b500233..9ab9dd7ffa 100644 --- a/configs/ea3131/src/lpc31_usbhost.c +++ b/configs/ea3131/src/lpc31_usbhost.c @@ -104,7 +104,7 @@ static int ehci_waiter(int argc, char *argv[]) { FAR struct usbhost_hubport_s *hport; - uvdbg("ehci_waiter: Running\n"); + uinfo("ehci_waiter: Running\n"); for (;;) { /* Wait for the device to change state */ @@ -262,7 +262,7 @@ int lpc31_usbhost_initialize(void) void lpc31_usbhost_vbusdrive(int rhport, bool enable) { - uvdbg("RHPort%d: enable=%d\n", rhport+1, enable); + uinfo("RHPort%d: enable=%d\n", rhport+1, enable); /* The LPC3131 has only a single root hub port */ diff --git a/configs/ea3152/src/lpc31_fillpage.c b/configs/ea3152/src/lpc31_fillpage.c index 647960cfa3..b964927c37 100644 --- a/configs/ea3152/src/lpc31_fillpage.c +++ b/configs/ea3152/src/lpc31_fillpage.c @@ -244,7 +244,7 @@ static inline void lpc31_initsrc(void) char devname[16]; #endif - pgllvdbg("Initializing %s\n", CONFIG_PAGING_BINPATH); + pgllinfo("Initializing %s\n", CONFIG_PAGING_BINPATH); /* No, do we need to mount an SD device? */ @@ -300,7 +300,7 @@ static inline void lpc31_initsrc(void) { /* No... the initialize now */ - pgllvdbg("Initializing\n"); + pgllinfo("Initializing\n"); /* First get an instance of the SPI device interface */ @@ -327,7 +327,7 @@ static inline void lpc31_initsrc(void) ret = MTD_IOCTL(g_pgsrc.mtd, MTDIOC_GEOMETRY, (unsigned long)&g_pgsrc.geo); DEBUGASSERT(ret >= 0); capacity = g_pgsrc.geo.erasesize*g_pgsrc.geo.neraseblocks; - pgllvdbg("capacity: %d\n", capacity); + pgllinfo("capacity: %d\n", capacity); DEBUGASSERT(capacity >= (CONFIG_EA3152_PAGING_BINOFFSET + PG_TEXT_VSIZE)); #endif diff --git a/configs/ea3152/src/lpc31_leds.c b/configs/ea3152/src/lpc31_leds.c index e33b3503f4..429c87abcd 100644 --- a/configs/ea3152/src/lpc31_leds.c +++ b/configs/ea3152/src/lpc31_leds.c @@ -61,10 +61,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/ea3152/src/lpc31_spi.c b/configs/ea3152/src/lpc31_spi.c index 5e81cc398d..68153a0655 100644 --- a/configs/ea3152/src/lpc31_spi.c +++ b/configs/ea3152/src/lpc31_spi.c @@ -67,14 +67,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/eagle100/src/lm_leds.c b/configs/eagle100/src/lm_leds.c index de942a61d0..9cd7ef8325 100644 --- a/configs/eagle100/src/lm_leds.c +++ b/configs/eagle100/src/lm_leds.c @@ -61,10 +61,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/eagle100/src/lm_ssi.c b/configs/eagle100/src/lm_ssi.c index adc5ad59ed..87b347b0d1 100644 --- a/configs/eagle100/src/lm_ssi.c +++ b/configs/eagle100/src/lm_ssi.c @@ -67,14 +67,14 @@ #ifdef SSI_DEBUG # define ssidbg lldbg # ifdef SSI_VERBOSE -# define ssivdbg lldbg +# define ssiinfo lldbg # else -# define ssivdbg(x...) +# define ssiinfo(x...) # endif #else # undef SSI_VERBOSE # define ssidbg(x...) -# define ssivdbg(x...) +# define ssiinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/efm32-g8xx-stk/src/efm32_autoleds.c b/configs/efm32-g8xx-stk/src/efm32_autoleds.c index f699d030da..54a4df6f3d 100644 --- a/configs/efm32-g8xx-stk/src/efm32_autoleds.c +++ b/configs/efm32-g8xx-stk/src/efm32_autoleds.c @@ -65,10 +65,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* The following definitions map the encoded LED setting to GPIO settings */ diff --git a/configs/efm32-g8xx-stk/src/efm32_userleds.c b/configs/efm32-g8xx-stk/src/efm32_userleds.c index 44908623d0..556556454f 100644 --- a/configs/efm32-g8xx-stk/src/efm32_userleds.c +++ b/configs/efm32-g8xx-stk/src/efm32_userleds.c @@ -65,10 +65,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/efm32gg-stk3700/src/efm32_autoleds.c b/configs/efm32gg-stk3700/src/efm32_autoleds.c index f55229cfb8..6fb6fb00ae 100644 --- a/configs/efm32gg-stk3700/src/efm32_autoleds.c +++ b/configs/efm32gg-stk3700/src/efm32_autoleds.c @@ -99,10 +99,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/efm32gg-stk3700/src/efm32_userleds.c b/configs/efm32gg-stk3700/src/efm32_userleds.c index a392099770..ab25dda6a8 100644 --- a/configs/efm32gg-stk3700/src/efm32_userleds.c +++ b/configs/efm32gg-stk3700/src/efm32_userleds.c @@ -76,10 +76,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/ekk-lm3s9b96/src/lm_leds.c b/configs/ekk-lm3s9b96/src/lm_leds.c index fb7fea3f8a..a70dd50dc2 100644 --- a/configs/ekk-lm3s9b96/src/lm_leds.c +++ b/configs/ekk-lm3s9b96/src/lm_leds.c @@ -62,10 +62,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/ekk-lm3s9b96/src/lm_ssi.c b/configs/ekk-lm3s9b96/src/lm_ssi.c index e2a26bc1b5..c8cd2a16d7 100644 --- a/configs/ekk-lm3s9b96/src/lm_ssi.c +++ b/configs/ekk-lm3s9b96/src/lm_ssi.c @@ -66,14 +66,14 @@ #ifdef SSI_DEBUG # define ssidbg lldbg # ifdef SSI_VERBOSE -# define ssivdbg lldbg +# define ssiinfo lldbg # else -# define ssivdbg(x...) +# define ssiinfo(x...) # endif #else # undef SSI_VERBOSE # define ssidbg(x...) -# define ssivdbg(x...) +# define ssiinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/fire-stm32v2/src/stm32_autoleds.c b/configs/fire-stm32v2/src/stm32_autoleds.c index 0aa9f273c7..c64c9f2f59 100644 --- a/configs/fire-stm32v2/src/stm32_autoleds.c +++ b/configs/fire-stm32v2/src/stm32_autoleds.c @@ -63,10 +63,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* The following definitions map the encoded LED setting to GPIO settings. diff --git a/configs/fire-stm32v2/src/stm32_enc28j60.c b/configs/fire-stm32v2/src/stm32_enc28j60.c index 40d7954b69..2094f35aab 100644 --- a/configs/fire-stm32v2/src/stm32_enc28j60.c +++ b/configs/fire-stm32v2/src/stm32_enc28j60.c @@ -206,7 +206,7 @@ void up_netinitialize(void) return; } - nllvdbg("Bound SPI port %d to ENC28J60 device %d\n", + nllinfo("Bound SPI port %d to ENC28J60 device %d\n", ENC28J60_SPI_PORTNO, ENC28J60_DEVNO); } diff --git a/configs/fire-stm32v2/src/stm32_mmcsd.c b/configs/fire-stm32v2/src/stm32_mmcsd.c index 356be40d55..a356d8eeb9 100644 --- a/configs/fire-stm32v2/src/stm32_mmcsd.c +++ b/configs/fire-stm32v2/src/stm32_mmcsd.c @@ -97,7 +97,7 @@ int stm32_sdinitialize(int minor) return -ENODEV; } - fvdbg("Initialized SDIO slot %d\n", STM32_MMCSDSLOTNO); + finfo("Initialized SDIO slot %d\n", STM32_MMCSDSLOTNO); /* Now bind the SDIO interface to the MMC/SD driver */ @@ -108,7 +108,7 @@ int stm32_sdinitialize(int minor) STM32_MMCSDSLOTNO, minor); } - fvdbg("Bound SDIO slot %d to the MMC/SD driver, minor=%d\n", + finfo("Bound SDIO slot %d to the MMC/SD driver, minor=%d\n", STM32_MMCSDSLOTNO, minor); /* Then let's guess and say that there is a card in the slot. I need to check to diff --git a/configs/fire-stm32v2/src/stm32_spi.c b/configs/fire-stm32v2/src/stm32_spi.c index e5f0497957..541f79ed84 100644 --- a/configs/fire-stm32v2/src/stm32_spi.c +++ b/configs/fire-stm32v2/src/stm32_spi.c @@ -65,14 +65,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/fire-stm32v2/src/stm32_userleds.c b/configs/fire-stm32v2/src/stm32_userleds.c index 05c8830eef..7092d02577 100644 --- a/configs/fire-stm32v2/src/stm32_userleds.c +++ b/configs/fire-stm32v2/src/stm32_userleds.c @@ -63,10 +63,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/freedom-kl25z/src/kl_adxl345.c b/configs/freedom-kl25z/src/kl_adxl345.c index 0b68d7a832..a6fab92a64 100644 --- a/configs/freedom-kl25z/src/kl_adxl345.c +++ b/configs/freedom-kl25z/src/kl_adxl345.c @@ -183,7 +183,7 @@ static int adxl345_attach(FAR struct adxl345_config_s *state, { FAR struct kl_adxl345config_s *priv = (FAR struct kl_adxl345config_s *)state; - snvdbg("Saving handler %p\n", handler); + sninfo("Saving handler %p\n", handler); DEBUGASSERT(priv); /* Just save the handler and its argument. We will use it when interrupts @@ -264,7 +264,7 @@ int adxl345_archinitialize(int minor) if (!g_adxl345config.handle) { - snvdbg("Initializing\n"); + sninfo("Initializing\n"); /* Configure the ADXL345 interrupt pin as an input */ diff --git a/configs/freedom-kl25z/src/kl_led.c b/configs/freedom-kl25z/src/kl_led.c index b9731da3e6..7480fab438 100644 --- a/configs/freedom-kl25z/src/kl_led.c +++ b/configs/freedom-kl25z/src/kl_led.c @@ -88,13 +88,13 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO -# define ledvdbg lldbg +# define ledinfo lldbg # else -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/freedom-kl25z/src/kl_spi.c b/configs/freedom-kl25z/src/kl_spi.c index 522e9d3387..7b5562c94b 100644 --- a/configs/freedom-kl25z/src/kl_spi.c +++ b/configs/freedom-kl25z/src/kl_spi.c @@ -60,13 +60,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /**************************************************************************** @@ -164,7 +164,7 @@ void weak_function kl_spidev_initialize(void) void kl_spi0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { - spivdbg("devid: %d CS: %s\n", + spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); #ifdef CONFIG_ADXL345_SPI @@ -190,7 +190,7 @@ void kl_spi0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, void kl_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { - spivdbg("devid: %d CS: %s\n", + spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } #endif diff --git a/configs/freedom-kl25z/src/kl_tsi.c b/configs/freedom-kl25z/src/kl_tsi.c index e030caa9e8..9f7f1f70cc 100644 --- a/configs/freedom-kl25z/src/kl_tsi.c +++ b/configs/freedom-kl25z/src/kl_tsi.c @@ -135,7 +135,7 @@ static void tsi_calibrate(void) while (!(getreg32(KL_TSI_GENCS) & TSI_GENCS_EOSF)); g_defcap[i] = getreg32(KL_TSI_DATA) & TSI_DATA_TSICNT_MASK; - ivdbg("Sensor %d = %d\n", i+1, g_defcap[i]); + iinfo("Sensor %d = %d\n", i+1, g_defcap[i]); } } @@ -187,7 +187,7 @@ static ssize_t tsi_read(FAR struct file *filep, FAR char *buf, size_t buflen) g_currdelta = (uint16_t)deltacap; - ivdbg("Delta for g_channel %d = %d\n", g_channel, g_currdelta); + iinfo("Delta for g_channel %d = %d\n", g_channel, g_currdelta); buf[0] = g_currdelta & 0xff; buf[1] = (g_currdelta & 0xff00) >> 8; diff --git a/configs/freedom-kl25z/src/kl_wifi.c b/configs/freedom-kl25z/src/kl_wifi.c index 461a681f88..fa59ac10ae 100644 --- a/configs/freedom-kl25z/src/kl_wifi.c +++ b/configs/freedom-kl25z/src/kl_wifi.c @@ -204,7 +204,7 @@ static void wl_enable_irq(FAR struct cc3000_config_s *state, bool enable) /* Attach and enable, or detach and disable */ - ivdbg("enable:%d\n", enable); + iinfo("enable:%d\n", enable); if (enable) { (void)kl_gpioirqattach(GPIO_WIFI_INT, priv->handler); @@ -219,7 +219,7 @@ static void wl_enable_irq(FAR struct cc3000_config_s *state, bool enable) static void wl_enable_power(FAR struct cc3000_config_s *state, bool enable) { - ivdbg("enable:%d\n", enable); + iinfo("enable:%d\n", enable); /* Active high enable */ @@ -228,7 +228,7 @@ static void wl_enable_power(FAR struct cc3000_config_s *state, bool enable) static void wl_select(FAR struct cc3000_config_s *state, bool enable) { - ivdbg("enable:%d\n", enable); + iinfo("enable:%d\n", enable); /* Active high enable */ diff --git a/configs/freedom-kl26z/src/kl_led.c b/configs/freedom-kl26z/src/kl_led.c index 5cdf989dd5..bc42e95e46 100644 --- a/configs/freedom-kl26z/src/kl_led.c +++ b/configs/freedom-kl26z/src/kl_led.c @@ -88,13 +88,13 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO -# define ledvdbg lldbg +# define ledinfo lldbg # else -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/freedom-kl26z/src/kl_spi.c b/configs/freedom-kl26z/src/kl_spi.c index f155b381a9..c54e51d5d1 100644 --- a/configs/freedom-kl26z/src/kl_spi.c +++ b/configs/freedom-kl26z/src/kl_spi.c @@ -60,13 +60,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /**************************************************************************** @@ -155,7 +155,7 @@ void weak_function kl_spidev_initialize(void) void kl_spi0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { - spivdbg("devid: %d CS: %s\n", + spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } #endif @@ -164,7 +164,7 @@ void kl_spi0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, void kl_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { - spivdbg("devid: %d CS: %s\n", + spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } #endif diff --git a/configs/freedom-kl26z/src/kl_tsi.c b/configs/freedom-kl26z/src/kl_tsi.c index 95392082e0..1d4a283772 100644 --- a/configs/freedom-kl26z/src/kl_tsi.c +++ b/configs/freedom-kl26z/src/kl_tsi.c @@ -135,7 +135,7 @@ static void tsi_calibrate(void) while (!(getreg32(KL_TSI_GENCS) & TSI_GENCS_EOSF)); g_defcap[i] = getreg32(KL_TSI_DATA) & TSI_DATA_TSICNT_MASK; - ivdbg("Sensor %d = %d\n", i+1, g_defcap[i]); + iinfo("Sensor %d = %d\n", i+1, g_defcap[i]); } } @@ -187,7 +187,7 @@ static ssize_t tsi_read(FAR struct file *filep, FAR char *buf, size_t buflen) g_currdelta = (uint16_t)deltacap; - ivdbg("Delta for g_channel %d = %d\n", g_channel, g_currdelta); + iinfo("Delta for g_channel %d = %d\n", g_channel, g_currdelta); buf[0] = g_currdelta & 0xff; buf[1] = (g_currdelta & 0xff00) >> 8; diff --git a/configs/hymini-stm32v/src/stm32_appinit.c b/configs/hymini-stm32v/src/stm32_appinit.c index 4a7b220633..bff825036b 100644 --- a/configs/hymini-stm32v/src/stm32_appinit.c +++ b/configs/hymini-stm32v/src/stm32_appinit.c @@ -216,7 +216,7 @@ int board_app_initialize(uintptr_t arg) /* Use SD card detect pin to check if a card is inserted */ cd_status = !stm32_gpioread(GPIO_SD_CD); - vdbg("Card detect : %hhu\n", cd_status); + info("Card detect : %hhu\n", cd_status); sdio_mediachange(g_sdiodev, cd_status); #endif diff --git a/configs/hymini-stm32v/src/stm32_leds.c b/configs/hymini-stm32v/src/stm32_leds.c index edc3c0d78b..19b6158e85 100644 --- a/configs/hymini-stm32v/src/stm32_leds.c +++ b/configs/hymini-stm32v/src/stm32_leds.c @@ -63,10 +63,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* The following definitions map the encoded LED setting to GPIO settings */ diff --git a/configs/hymini-stm32v/src/stm32_r61505u.c b/configs/hymini-stm32v/src/stm32_r61505u.c index be67d14ac9..579ff1f2ec 100644 --- a/configs/hymini-stm32v/src/stm32_r61505u.c +++ b/configs/hymini-stm32v/src/stm32_r61505u.c @@ -94,7 +94,7 @@ /* Debug ******************************************************************************/ #ifdef CONFIG_DEBUG_LCD -# define lcddbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define lcddbg(format, ...) info(format, ##__VA_ARGS__) #else # define lcddbg(x...) #endif @@ -562,7 +562,7 @@ static int lcd_getvideoinfo(FAR struct lcd_dev_s *dev, FAR struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); - gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n", + ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n", g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes); memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s)); @@ -581,7 +581,7 @@ static int lcd_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, FAR struct lcd_planeinfo_s *pinfo) { DEBUGASSERT(dev && pinfo && planeno == 0); - gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); + ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s)); return OK; @@ -598,7 +598,7 @@ static int lcd_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, static int lcd_getpower(struct lcd_dev_s *dev) { - gvdbg("power: %d\n", 0); + ginfo("power: %d\n", 0); return g_lcddev.power; } @@ -618,7 +618,7 @@ static int lcd_setpower(struct lcd_dev_s *dev, int power) return OK; } - gvdbg("power: %d\n", power); + ginfo("power: %d\n", power); DEBUGASSERT(power <= CONFIG_LCD_MAXPOWER); /* Set new power level */ @@ -639,7 +639,7 @@ static int lcd_setpower(struct lcd_dev_s *dev, int power) duty = LCD_BL_TIMER_PERIOD - 1; } - gvdbg("PWM duty: %d\n", duty); + ginfo("PWM duty: %d\n", duty); putreg16((uint16_t)duty, STM32_TIM3_CCR2); #endif /* TODO turn the display on */ @@ -648,7 +648,7 @@ static int lcd_setpower(struct lcd_dev_s *dev, int power) { /* FIXME: Turn display off ? */ - gvdbg("Force PWM to 0\n"); + ginfo("Force PWM to 0\n"); putreg16((uint16_t)0, STM32_TIM3_CCR2); } @@ -666,7 +666,7 @@ static int lcd_setpower(struct lcd_dev_s *dev, int power) static int lcd_getcontrast(struct lcd_dev_s *dev) { - gvdbg("Not implemented\n"); + ginfo("Not implemented\n"); return -ENOSYS; } @@ -680,7 +680,7 @@ static int lcd_getcontrast(struct lcd_dev_s *dev) static int lcd_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) { - gvdbg("Not implemented\n"); + ginfo("Not implemented\n"); return -ENOSYS; } @@ -921,7 +921,7 @@ int board_lcd_initialize(void) { unsigned short id; - gvdbg("Initializing\n"); + ginfo("Initializing\n"); /* Configure GPIO pins and configure the FSMC to support the LCD */ diff --git a/configs/hymini-stm32v/src/stm32_spi.c b/configs/hymini-stm32v/src/stm32_spi.c index 0f1852dd06..5e9d4c5748 100644 --- a/configs/hymini-stm32v/src/stm32_spi.c +++ b/configs/hymini-stm32v/src/stm32_spi.c @@ -66,14 +66,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ @@ -102,7 +102,7 @@ void stm32_spidev_initialize(void) #ifdef CONFIG_STM32_SPI1 /* Configure the SPI-based touch screen CS GPIO */ - spivdbg("Configure GPIO for SPI1/CS\n"); + spiinfo("Configure GPIO for SPI1/CS\n"); stm32_configgpio(GPIO_TS_CS); #endif } diff --git a/configs/hymini-stm32v/src/stm32_ssd1289.c b/configs/hymini-stm32v/src/stm32_ssd1289.c index 6d7662261c..2aa36b2ab1 100644 --- a/configs/hymini-stm32v/src/stm32_ssd1289.c +++ b/configs/hymini-stm32v/src/stm32_ssd1289.c @@ -105,10 +105,10 @@ /* Debug ******************************************************************************/ #ifdef CONFIG_DEBUG_LCD # define lcddbg dbg -# define lcdvdbg vdbg +# define lcdinfo info #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /************************************************************************************** @@ -482,7 +482,7 @@ int board_lcd_initialize(void) if (!g_ssd1289drvr) { - lcdvdbg("Initializing\n"); + lcdinfo("Initializing\n"); init_lcd_backlight(); diff --git a/configs/hymini-stm32v/src/stm32_ts.c b/configs/hymini-stm32v/src/stm32_ts.c index 1344c245cd..6edda3f41e 100644 --- a/configs/hymini-stm32v/src/stm32_ts.c +++ b/configs/hymini-stm32v/src/stm32_ts.c @@ -95,7 +95,7 @@ static xcpt_t tc_isr; /* Attach the ADS7843E interrupt handler to the GPIO interrupt */ static int hymini_ts_irq_attach(FAR struct ads7843e_config_s *state, xcpt_t isr) { - ivdbg("hymini_ts_irq_attach\n"); + iinfo("hymini_ts_irq_attach\n"); tc_isr = isr; stm32_gpiosetevent(GPIO_TS_IRQ, true, true, true, isr); @@ -106,7 +106,7 @@ static int hymini_ts_irq_attach(FAR struct ads7843e_config_s *state, xcpt_t isr) static void hymini_ts_irq_enable(FAR struct ads7843e_config_s *state, bool enable) { - illvdbg("%d\n", enable); + illinfo("%d\n", enable); stm32_gpiosetevent(GPIO_TS_IRQ, true, true, true, enable? tc_isr:NULL); } diff --git a/configs/kwikstik-k40/src/k40_lcd.c b/configs/kwikstik-k40/src/k40_lcd.c index bd955fb4fa..e9d4b00420 100644 --- a/configs/kwikstik-k40/src/k40_lcd.c +++ b/configs/kwikstik-k40/src/k40_lcd.c @@ -61,7 +61,7 @@ /* Debug ******************************************************************************/ #ifdef CONFIG_DEBUG_LCD -# define lcddbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define lcddbg(format, ...) info(format, ##__VA_ARGS__) #else # define lcddbg(x...) #endif @@ -98,7 +98,7 @@ int board_lcd_initialize(void) { - gvdbg("Initializing\n"); + ginfo("Initializing\n"); #warning "Missing logic" return OK; } diff --git a/configs/kwikstik-k40/src/k40_leds.c b/configs/kwikstik-k40/src/k40_leds.c index 2e724ccc4d..57d275ab21 100644 --- a/configs/kwikstik-k40/src/k40_leds.c +++ b/configs/kwikstik-k40/src/k40_leds.c @@ -53,10 +53,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/kwikstik-k40/src/k40_spi.c b/configs/kwikstik-k40/src/k40_spi.c index 7b14ea57b8..2a80ab0024 100644 --- a/configs/kwikstik-k40/src/k40_spi.c +++ b/configs/kwikstik-k40/src/k40_spi.c @@ -62,14 +62,14 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef CONFIG_DEBUG_SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/launchxl-tms57004/src/tms570_autoleds.c b/configs/launchxl-tms57004/src/tms570_autoleds.c index f3cd9fbaed..e99f81bcfa 100644 --- a/configs/launchxl-tms57004/src/tms570_autoleds.c +++ b/configs/launchxl-tms57004/src/tms570_autoleds.c @@ -99,10 +99,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/lincoln60/src/lpc17_leds.c b/configs/lincoln60/src/lpc17_leds.c index 2a7a9f0001..27b46bfbc0 100644 --- a/configs/lincoln60/src/lpc17_leds.c +++ b/configs/lincoln60/src/lpc17_leds.c @@ -67,13 +67,13 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO -# define ledvdbg lldbg +# define ledinfo lldbg # else -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/lm3s6432-s2e/src/lm_leds.c b/configs/lm3s6432-s2e/src/lm_leds.c index fd763e59d6..5ee88cc12b 100644 --- a/configs/lm3s6432-s2e/src/lm_leds.c +++ b/configs/lm3s6432-s2e/src/lm_leds.c @@ -61,10 +61,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/lm3s6432-s2e/src/lm_ssi.c b/configs/lm3s6432-s2e/src/lm_ssi.c index 66882e7f10..7df29e56ad 100644 --- a/configs/lm3s6432-s2e/src/lm_ssi.c +++ b/configs/lm3s6432-s2e/src/lm_ssi.c @@ -65,14 +65,14 @@ #ifdef SSI_DEBUG # define ssidbg lldbg # ifdef SSI_VERBOSE -# define ssivdbg lldbg +# define ssiinfo lldbg # else -# define ssivdbg(x...) +# define ssiinfo(x...) # endif #else # undef SSI_VERBOSE # define ssidbg(x...) -# define ssivdbg(x...) +# define ssiinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/lm3s6965-ek/src/lm_leds.c b/configs/lm3s6965-ek/src/lm_leds.c index 8a0b5659a9..2ff29036b1 100644 --- a/configs/lm3s6965-ek/src/lm_leds.c +++ b/configs/lm3s6965-ek/src/lm_leds.c @@ -61,10 +61,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/lm3s6965-ek/src/lm_oled.c b/configs/lm3s6965-ek/src/lm_oled.c index d2bd61374d..db662fd1a1 100644 --- a/configs/lm3s6965-ek/src/lm_oled.c +++ b/configs/lm3s6965-ek/src/lm_oled.c @@ -73,7 +73,7 @@ #endif #ifdef CONFIG_LCD_RITDEBUG -# define ritdbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define ritdbg(format, ...) info(format, ##__VA_ARGS__) # define oleddc_dumpgpio(m) tiva_dumpgpio(OLEDDC_GPIO, m) # define oledcs_dumpgpio(m) tiva_dumpgpio(OLEDCS_GPIO, m) #else @@ -127,7 +127,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) } else { - gllvdbg("Bound SSI port 0 to OLED %d\n", devno); + gllinfo("Bound SSI port 0 to OLED %d\n", devno); /* And turn the OLED on (CONFIG_LCD_MAXPOWER should be 1) */ diff --git a/configs/lm3s6965-ek/src/lm_ssi.c b/configs/lm3s6965-ek/src/lm_ssi.c index 5b105fed34..256d3a5482 100644 --- a/configs/lm3s6965-ek/src/lm_ssi.c +++ b/configs/lm3s6965-ek/src/lm_ssi.c @@ -67,14 +67,14 @@ #ifdef SSI_DEBUG # define ssidbg lldbg # ifdef SSI_VERBOSE -# define ssivdbg lldbg +# define ssiinfo lldbg # else -# define ssivdbg(x...) +# define ssiinfo(x...) # endif #else # undef SSI_VERBOSE # define ssidbg(x...) -# define ssivdbg(x...) +# define ssiinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/lm3s8962-ek/src/lm_leds.c b/configs/lm3s8962-ek/src/lm_leds.c index 5cc7a82f29..d7d6c3cd57 100644 --- a/configs/lm3s8962-ek/src/lm_leds.c +++ b/configs/lm3s8962-ek/src/lm_leds.c @@ -61,10 +61,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/lm3s8962-ek/src/lm_oled.c b/configs/lm3s8962-ek/src/lm_oled.c index f29657e76b..42871d17b3 100644 --- a/configs/lm3s8962-ek/src/lm_oled.c +++ b/configs/lm3s8962-ek/src/lm_oled.c @@ -72,7 +72,7 @@ #endif #ifdef CONFIG_LCD_RITDEBUG -# define ritdbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define ritdbg(format, ...) info(format, ##__VA_ARGS__) # define oleddc_dumpgpio(m) tiva_dumpgpio(OLEDDC_GPIO, m) # define oledcs_dumpgpio(m) tiva_dumpgpio(OLEDCS_GPIO, m) #else @@ -126,7 +126,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) } else { - gllvdbg("Bound SSI port 0 to OLED %d\n", devno); + gllinfo("Bound SSI port 0 to OLED %d\n", devno); /* And turn the OLED on (CONFIG_LCD_MAXPOWER should be 1) */ diff --git a/configs/lm3s8962-ek/src/lm_ssi.c b/configs/lm3s8962-ek/src/lm_ssi.c index fc9a1efb24..1149704dc8 100644 --- a/configs/lm3s8962-ek/src/lm_ssi.c +++ b/configs/lm3s8962-ek/src/lm_ssi.c @@ -67,14 +67,14 @@ #ifdef SSI_DEBUG # define ssidbg lldbg # ifdef SSI_VERBOSE -# define ssivdbg lldbg +# define ssiinfo lldbg # else -# define ssivdbg(x...) +# define ssiinfo(x...) # endif #else # undef SSI_VERBOSE # define ssidbg(x...) -# define ssivdbg(x...) +# define ssiinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/lm4f120-launchpad/src/lm4f_autoleds.c b/configs/lm4f120-launchpad/src/lm4f_autoleds.c index 309ee4526a..89684e1c24 100644 --- a/configs/lm4f120-launchpad/src/lm4f_autoleds.c +++ b/configs/lm4f120-launchpad/src/lm4f_autoleds.c @@ -103,10 +103,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/lm4f120-launchpad/src/lm4f_ssi.c b/configs/lm4f120-launchpad/src/lm4f_ssi.c index 5d3686df43..e23385e207 100644 --- a/configs/lm4f120-launchpad/src/lm4f_ssi.c +++ b/configs/lm4f120-launchpad/src/lm4f_ssi.c @@ -71,10 +71,10 @@ /* Dump GPIO registers */ #if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO) -# define ssivdbg lldbg +# define ssiinfo lldbg # define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m) #else -# define ssivdbg(x...) +# define ssiinfo(x...) # define ssi_dumpgpio(m) #endif diff --git a/configs/lpc4330-xplorer/src/lpc43_autoleds.c b/configs/lpc4330-xplorer/src/lpc43_autoleds.c index d3bb157ed6..85a537e3d6 100644 --- a/configs/lpc4330-xplorer/src/lpc43_autoleds.c +++ b/configs/lpc4330-xplorer/src/lpc43_autoleds.c @@ -98,15 +98,15 @@ # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO # define LED_VERBOSE 1 -# define ledvdbg lldbg +# define ledinfo lldbg # else # undef LED_VERBOSE -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # undef LED_VERBOSE # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/lpc4330-xplorer/src/lpc43_userleds.c b/configs/lpc4330-xplorer/src/lpc43_userleds.c index c056405f1d..d296cdf275 100644 --- a/configs/lpc4330-xplorer/src/lpc43_userleds.c +++ b/configs/lpc4330-xplorer/src/lpc43_userleds.c @@ -75,15 +75,15 @@ # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO # define LED_VERBOSE 1 -# define ledvdbg lldbg +# define ledinfo lldbg # else # undef LED_VERBOSE -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # undef LED_VERBOSE # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/lpc4357-evb/src/lpc43_autoleds.c b/configs/lpc4357-evb/src/lpc43_autoleds.c index 56bfcd9943..1ff5dc954b 100644 --- a/configs/lpc4357-evb/src/lpc43_autoleds.c +++ b/configs/lpc4357-evb/src/lpc43_autoleds.c @@ -95,15 +95,15 @@ # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO # define LED_VERBOSE 1 -# define ledvdbg lldbg +# define ledinfo lldbg # else # undef LED_VERBOSE -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # undef LED_VERBOSE # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/lpc4357-evb/src/lpc43_userleds.c b/configs/lpc4357-evb/src/lpc43_userleds.c index 5c05bac6ef..e7d4f672a0 100644 --- a/configs/lpc4357-evb/src/lpc43_userleds.c +++ b/configs/lpc4357-evb/src/lpc43_userleds.c @@ -86,15 +86,15 @@ # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO # define LED_VERBOSE 1 -# define ledvdbg lldbg +# define ledinfo lldbg # else # undef LED_VERBOSE -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # undef LED_VERBOSE # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/lpc4370-link2/src/lpc43_autoleds.c b/configs/lpc4370-link2/src/lpc43_autoleds.c index 198750faad..147a18316f 100644 --- a/configs/lpc4370-link2/src/lpc43_autoleds.c +++ b/configs/lpc4370-link2/src/lpc43_autoleds.c @@ -67,15 +67,15 @@ # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO # define LED_VERBOSE 1 -# define ledvdbg lldbg +# define ledinfo lldbg # else # undef LED_VERBOSE -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # undef LED_VERBOSE # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/lpc4370-link2/src/lpc43_userleds.c b/configs/lpc4370-link2/src/lpc43_userleds.c index 855c716996..1469e52ed6 100644 --- a/configs/lpc4370-link2/src/lpc43_userleds.c +++ b/configs/lpc4370-link2/src/lpc43_userleds.c @@ -68,15 +68,15 @@ # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO # define LED_VERBOSE 1 -# define ledvdbg lldbg +# define ledinfo lldbg # else # undef LED_VERBOSE -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # undef LED_VERBOSE # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_leds.c b/configs/lpcxpresso-lpc1115/src/lpc11_leds.c index 537468ca39..0c1abf192c 100644 --- a/configs/lpcxpresso-lpc1115/src/lpc11_leds.c +++ b/configs/lpcxpresso-lpc1115/src/lpc11_leds.c @@ -63,13 +63,13 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO -# define ledvdbg lldbg +# define ledinfo lldbg # else -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c b/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c index b88d9088e7..0cc48e117a 100644 --- a/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c +++ b/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c @@ -66,14 +66,14 @@ #ifdef SSP_DEBUG # define sspdbg lldbg # ifdef SSP_VERBOSE -# define sspvdbg lldbg +# define sspinfo lldbg # else -# define sspvdbg(x...) +# define sspinfo(x...) # endif #else # undef SSP_VERBOSE # define sspdbg(x...) -# define sspvdbg(x...) +# define sspinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_leds.c b/configs/lpcxpresso-lpc1768/src/lpc17_leds.c index 142ff6f9b8..d454e1db75 100644 --- a/configs/lpcxpresso-lpc1768/src/lpc17_leds.c +++ b/configs/lpcxpresso-lpc1768/src/lpc17_leds.c @@ -63,13 +63,13 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO -# define ledvdbg lldbg +# define ledinfo lldbg # else -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_oled.c b/configs/lpcxpresso-lpc1768/src/lpc17_oled.c index 8f180748fe..c61b67fb4b 100644 --- a/configs/lpcxpresso-lpc1768/src/lpc17_oled.c +++ b/configs/lpcxpresso-lpc1768/src/lpc17_oled.c @@ -85,7 +85,7 @@ #endif #ifdef CONFIG_DEBUG_LCD -# define ugdbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define ugdbg(format, ...) info(format, ##__VA_ARGS__) # define oleddc_dumpgpio(m) lpc17_dumpgpio(LPCXPRESSO_OLED_POWER, m) # define oledcs_dumpgpio(m) lpc17_dumpgpio(LPCXPRESSO_OLED_CS, m) #else @@ -141,7 +141,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) } else { - gllvdbg("Bound SPI port 1 to OLED %d\n", devno); + gllinfo("Bound SPI port 1 to OLED %d\n", devno); /* And turn the OLED on (dim) */ @@ -209,7 +209,7 @@ int lpc17_ssp1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) #ifdef CONFIG_UG9664HSWAG01_POWER void ug_power(unsigned int devno, bool on) { - gllvdbg("power %s\n", on ? "ON" : "OFF"); + gllinfo("power %s\n", on ? "ON" : "OFF"); (void)lpc17_gpiowrite(LPCXPRESSO_OLED_POWER, on); } #endif diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c b/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c index 9de1a6b86c..632200a77f 100644 --- a/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c +++ b/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c @@ -66,14 +66,14 @@ #ifdef SSP_DEBUG # define sspdbg lldbg # ifdef SSP_VERBOSE -# define sspvdbg lldbg +# define sspinfo lldbg # else -# define sspvdbg(x...) +# define sspinfo(x...) # endif #else # undef SSP_VERBOSE # define sspdbg(x...) -# define sspvdbg(x...) +# define sspinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/maple/src/stm32_lcd.c b/configs/maple/src/stm32_lcd.c index c878032d9b..567b5d5a56 100644 --- a/configs/maple/src/stm32_lcd.c +++ b/configs/maple/src/stm32_lcd.c @@ -84,7 +84,7 @@ #endif #ifdef CONFIG_DEBUG_LCD -# define lcddbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define lcddbg(format, ...) info(format, ##__VA_ARGS__) #else # define lcddbg(x...) #endif diff --git a/configs/maple/src/stm32_leds.c b/configs/maple/src/stm32_leds.c index 7e2453d802..e372dca1d8 100644 --- a/configs/maple/src/stm32_leds.c +++ b/configs/maple/src/stm32_leds.c @@ -63,10 +63,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** @@ -79,7 +79,7 @@ static inline void set_led(bool v) { - ledvdbg("Turn LED %s\n", v? "on":"off"); + ledinfo("Turn LED %s\n", v? "on":"off"); stm32_gpiowrite(GPIO_LED, v); } @@ -105,7 +105,7 @@ void board_autoled_initialize(void) void board_autoled_on(int led) { - ledvdbg("board_autoled_on(%d)\n", led); + ledinfo("board_autoled_on(%d)\n", led); switch (led) { case LED_STARTED: @@ -134,7 +134,7 @@ void board_autoled_on(int led) void board_autoled_off(int led) { - ledvdbg("board_autoled_off(%d)\n", led); + ledinfo("board_autoled_off(%d)\n", led); switch (led) { diff --git a/configs/maple/src/stm32_spi.c b/configs/maple/src/stm32_spi.c index aa9c3a03f9..90df022c7f 100644 --- a/configs/maple/src/stm32_spi.c +++ b/configs/maple/src/stm32_spi.c @@ -69,13 +69,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /**************************************************************************** diff --git a/configs/mbed/src/lpc17_leds.c b/configs/mbed/src/lpc17_leds.c index 5c2d80b50c..2262ac0de7 100644 --- a/configs/mbed/src/lpc17_leds.c +++ b/configs/mbed/src/lpc17_leds.c @@ -67,13 +67,13 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO -# define ledvdbg lldbg +# define ledinfo lldbg # else -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/mcu123-lpc214x/src/lpc2148_spi1.c b/configs/mcu123-lpc214x/src/lpc2148_spi1.c index c74dfba0cf..aeddd22b97 100644 --- a/configs/mcu123-lpc214x/src/lpc2148_spi1.c +++ b/configs/mcu123-lpc214x/src/lpc2148_spi1.c @@ -91,13 +91,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /* Clocking */ @@ -502,7 +502,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw * and (3) there are more bytes to be sent. */ - spivdbg("TX: rxpending: %d nwords: %d\n", rxpending, nwords); + spiinfo("TX: rxpending: %d nwords: %d\n", rxpending, nwords); while ((getreg8(LPC214X_SPI1_SR) & LPC214X_SPI1SR_TNF) && (rxpending < LPC214X_SPI1_FIFOSZ) && nwords) { @@ -513,7 +513,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw /* Now, read the RX data from the RX FIFO while the RX FIFO is not empty */ - spivdbg("RX: rxpending: %d\n", rxpending); + spiinfo("RX: rxpending: %d\n", rxpending); while (getreg8(LPC214X_SPI1_SR) & LPC214X_SPI1SR_RNE) { *ptr++ = (uint8_t)getreg16(LPC214X_SPI1_DR); diff --git a/configs/mikroe-stm32f4/src/stm32_mio283qt2.c b/configs/mikroe-stm32f4/src/stm32_mio283qt2.c index 2a7fdd6976..9cb05cddb4 100644 --- a/configs/mikroe-stm32f4/src/stm32_mio283qt2.c +++ b/configs/mikroe-stm32f4/src/stm32_mio283qt2.c @@ -121,10 +121,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg dbg -# define lcdvdbg vdbg +# define lcdinfo info #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /************************************************************************************** @@ -502,7 +502,7 @@ int board_lcd_initialize(void) if (!g_stm32f4_lcd.drvr) { - lcdvdbg("Initializing\n"); + lcdinfo("Initializing\n"); /* Hold the LCD in reset (active low) */ diff --git a/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c b/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c index c8754ae76f..e6336e3145 100644 --- a/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c +++ b/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c @@ -122,10 +122,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg dbg -# define lcdvdbg vdbg +# define lcdinfo info #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /************************************************************************************** @@ -503,7 +503,7 @@ int board_lcd_initialize(void) if (!g_stm32f4_lcd.drvr) { - lcdvdbg("Initializing\n"); + lcdinfo("Initializing\n"); /* Hold the LCD in reset (active low) */ diff --git a/configs/mikroe-stm32f4/src/stm32_qencoder.c b/configs/mikroe-stm32f4/src/stm32_qencoder.c index bcbb5dc438..e2014a7530 100644 --- a/configs/mikroe-stm32f4/src/stm32_qencoder.c +++ b/configs/mikroe-stm32f4/src/stm32_qencoder.c @@ -145,7 +145,7 @@ int qe_devinit(void) { /* Initialize a quadrature encoder interface. */ - snvdbg("Initializing the quadrature encoder using TIM%d\n", TIMID); + sninfo("Initializing the quadrature encoder using TIM%d\n", TIMID); ret = stm32_qeinitialize("/dev/qe0", TIMID); if (ret < 0) { diff --git a/configs/mikroe-stm32f4/src/stm32_spi.c b/configs/mikroe-stm32f4/src/stm32_spi.c index f56a075849..6c445f2c82 100644 --- a/configs/mikroe-stm32f4/src/stm32_spi.c +++ b/configs/mikroe-stm32f4/src/stm32_spi.c @@ -71,14 +71,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ @@ -150,7 +150,7 @@ void weak_function stm32_spidev_initialize(void) void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { - spivdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); + spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); #if defined(CONFIG_VS1053) if (devid == SPIDEV_AUDIO_DATA) diff --git a/configs/mikroe-stm32f4/src/stm32_touchscreen.c b/configs/mikroe-stm32f4/src/stm32_touchscreen.c index b9bba5f57a..9965812de8 100644 --- a/configs/mikroe-stm32f4/src/stm32_touchscreen.c +++ b/configs/mikroe-stm32f4/src/stm32_touchscreen.c @@ -623,7 +623,7 @@ static void tc_notify(FAR struct tc_dev_s *priv) if (fds) { fds->revents |= POLLIN; - ivdbg("Report events: %02x\n", fds->revents); + iinfo("Report events: %02x\n", fds->revents); sem_post(fds->sem); } } @@ -899,7 +899,7 @@ static void tc_worker(FAR void *arg) priv->newy = value / CONFIG_TOUCHSCREEN_AVG_SAMPLES; priv->value = 0; priv->sampcount = 0; - ivdbg("Y=%d\n", priv->newy); + iinfo("Y=%d\n", priv->newy); /* Configure YU and YD with drive voltages and disable XR drive. Note that * this is configuring the DRIVEA and DRIVEB outputs to enable the on-board @@ -978,7 +978,7 @@ static void tc_worker(FAR void *arg) } newx = value / CONFIG_TOUCHSCREEN_AVG_SAMPLES; - ivdbg("X=%d\n", newx); + iinfo("X=%d\n", newx); /* Samples are available */ @@ -1335,14 +1335,14 @@ errout: static int tc_ioctl(FAR struct file *filep, int cmd, unsigned long arg) { #if 1 - ivdbg("cmd: %d arg: %ld\n", cmd, arg); + iinfo("cmd: %d arg: %ld\n", cmd, arg); return -ENOTTY; /* None yet supported */ #else FAR struct inode *inode; FAR struct tc_dev_s *priv; int ret; - ivdbg("cmd: %d arg: %ld\n", cmd, arg); + iinfo("cmd: %d arg: %ld\n", cmd, arg); DEBUGASSERT(filep); inode = filep->f_inode; @@ -1389,7 +1389,7 @@ static int tc_poll(FAR struct file *filep, FAR struct pollfd *fds, int ret; int i; - ivdbg("setup: %d\n", (int)setup); + iinfo("setup: %d\n", (int)setup); DEBUGASSERT(filep && fds); inode = filep->f_inode; @@ -1501,7 +1501,7 @@ int board_tsc_setup(int minor) #endif int ret; - ivdbg("minor: %d\n", minor); + iinfo("minor: %d\n", minor); DEBUGASSERT(minor >= 0 && minor < 100); /* If we only have one touchscreen, check if we already did init */ @@ -1547,7 +1547,7 @@ int board_tsc_setup(int minor) /* Register the device as an input device */ (void)snprintf(devname, DEV_NAMELEN, DEV_FORMAT, minor); - ivdbg("Registering %s\n", devname); + iinfo("Registering %s\n", devname); ret = register_driver(devname, &tc_fops, 0666, priv); if (ret < 0) diff --git a/configs/mikroe-stm32f4/src/stm32_usb.c b/configs/mikroe-stm32f4/src/stm32_usb.c index 876fb19d9b..81e25dd12b 100644 --- a/configs/mikroe-stm32f4/src/stm32_usb.c +++ b/configs/mikroe-stm32f4/src/stm32_usb.c @@ -106,13 +106,13 @@ static int usbhost_waiter(int argc, char *argv[]) { struct usbhost_hubport_s *hport; - uvdbg("Running\n"); + uinfo("Running\n"); for (;;) { /* Wait for the device to change state */ DEBUGVERIFY(CONN_WAIT(g_usbconn, &hport)); - uvdbg("%s\n", hport->connected ? "connected" : "disconnected"); + uinfo("%s\n", hport->connected ? "connected" : "disconnected"); /* Did we just become connected? */ @@ -176,7 +176,7 @@ int stm32_usbhost_initialize(void) * that we care about: */ - uvdbg("Register class drivers\n"); + uinfo("Register class drivers\n"); #ifdef CONFIG_USBHOST_MSC /* Register the USB host Mass Storage Class */ @@ -200,13 +200,13 @@ int stm32_usbhost_initialize(void) /* Then get an instance of the USB host interface */ - uvdbg("Initialize USB host\n"); + uinfo("Initialize USB host\n"); g_usbconn = stm32_otgfshost_initialize(0); if (g_usbconn) { /* Start a thread to handle device connection. */ - uvdbg("Start usbhost_waiter\n"); + uinfo("Start usbhost_waiter\n"); pid = task_create("usbhost", CONFIG_USBHOST_DEFPRIO, CONFIG_USBHOST_STACKSIZE, diff --git a/configs/mikroe-stm32f4/src/stm32_vs1053.c b/configs/mikroe-stm32f4/src/stm32_vs1053.c index 08e9269512..7311ae07ed 100644 --- a/configs/mikroe-stm32f4/src/stm32_vs1053.c +++ b/configs/mikroe-stm32f4/src/stm32_vs1053.c @@ -200,7 +200,7 @@ void up_vs1053initialize(FAR struct spi_dev_s* spi) auddbg("up_vs1053initialize: Failed to register VS1053 Audio device\n"); } - audllvdbg("Bound SPI port to VS1053 device %s\n", name); + audllinfo("Bound SPI port to VS1053 device %s\n", name); } #endif /* CONFIG_VS1053 */ diff --git a/configs/mirtoo/src/pic32_leds.c b/configs/mirtoo/src/pic32_leds.c index 636d513953..65622c8bac 100644 --- a/configs/mirtoo/src/pic32_leds.c +++ b/configs/mirtoo/src/pic32_leds.c @@ -96,15 +96,15 @@ #if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS) # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO -# define ledvdbg lldbg +# define ledinfo lldbg # else -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # undef CONFIG_DEBUG_LEDS # undef CONFIG_DEBUG_INFO # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/mirtoo/src/pic32_spi2.c b/configs/mirtoo/src/pic32_spi2.c index 682ebfc88e..23f7578ff4 100644 --- a/configs/mirtoo/src/pic32_spi2.c +++ b/configs/mirtoo/src/pic32_spi2.c @@ -99,10 +99,10 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg -# define spivdbg llvdbg +# define spiinfo llinfo #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/moteino-mega/src/avr_leds.c b/configs/moteino-mega/src/avr_leds.c index 8fb2a91176..526f57c900 100644 --- a/configs/moteino-mega/src/avr_leds.c +++ b/configs/moteino-mega/src/avr_leds.c @@ -64,13 +64,13 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO -# define ledvdbg lldbg +# define ledinfo lldbg # else -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/ne64badge/src/m9s12_buttons.c b/configs/ne64badge/src/m9s12_buttons.c index f362b5d520..7871ecbb60 100644 --- a/configs/ne64badge/src/m9s12_buttons.c +++ b/configs/ne64badge/src/m9s12_buttons.c @@ -63,14 +63,14 @@ #ifdef BUTTON_DEBUG # define btndbg lldbg # ifdef BUTTON_VERBOSE -# define btnvdbg lldbg +# define btninfo lldbg # else -# define btnvdbg(x...) +# define btninfo(x...) # endif #else # undef BUTTON_VERBOSE # define btndbg(x...) -# define btnvdbg(x...) +# define btninfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/ne64badge/src/m9s12_leds.c b/configs/ne64badge/src/m9s12_leds.c index db498825a7..9fa059af1f 100644 --- a/configs/ne64badge/src/m9s12_leds.c +++ b/configs/ne64badge/src/m9s12_leds.c @@ -59,13 +59,13 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO -# define ledvdbg lldbg +# define ledinfo lldbg # else -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/ne64badge/src/m9s12_spi.c b/configs/ne64badge/src/m9s12_spi.c index bb4e3bc696..b76b8509b9 100644 --- a/configs/ne64badge/src/m9s12_spi.c +++ b/configs/ne64badge/src/m9s12_spi.c @@ -62,14 +62,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/nucleo-144/src/stm32_autoleds.c b/configs/nucleo-144/src/stm32_autoleds.c index c0822d6f7b..74334025a7 100644 --- a/configs/nucleo-144/src/stm32_autoleds.c +++ b/configs/nucleo-144/src/stm32_autoleds.c @@ -60,10 +60,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif #define ArraySize(x) (sizeof((x)) / sizeof((x)[0])) diff --git a/configs/nucleo-144/src/stm32_sdio.c b/configs/nucleo-144/src/stm32_sdio.c index 21c5d2eafd..84c34feae8 100644 --- a/configs/nucleo-144/src/stm32_sdio.c +++ b/configs/nucleo-144/src/stm32_sdio.c @@ -135,7 +135,7 @@ int stm32_sdio_initialize(void) /* Mount the SDIO-based MMC/SD block driver */ /* First, get an instance of the SDIO interface */ - fvdbg("Initializing SDIO slot %d\n", SDIO_SLOTNO); + finfo("Initializing SDIO slot %d\n", SDIO_SLOTNO); g_sdio_dev = sdio_initialize(SDIO_SLOTNO); if (!g_sdio_dev) @@ -146,7 +146,7 @@ int stm32_sdio_initialize(void) /* Now bind the SDIO interface to the MMC/SD driver */ - fvdbg("Bind SDIO to the MMC/SD driver, minor=%d\n", SDIO_MINOR); + finfo("Bind SDIO to the MMC/SD driver, minor=%d\n", SDIO_MINOR); ret = mmcsd_slotinitialize(SDIO_MINOR, g_sdio_dev); if (ret != OK) @@ -155,13 +155,13 @@ int stm32_sdio_initialize(void) return ret; } - fvdbg("Successfully bound SDIO to the MMC/SD driver\n"); + finfo("Successfully bound SDIO to the MMC/SD driver\n"); #ifdef HAVE_NCD /* Use SD card detect pin to check if a card is g_sd_inserted */ cd_status = !stm32_gpioread(GPIO_SDIO_NCD); - fvdbg("Card detect : %d\n", cd_status); + finfo("Card detect : %d\n", cd_status); sdio_mediachange(g_sdio_dev, cd_status); #else diff --git a/configs/nucleo-144/src/stm32_spi.c b/configs/nucleo-144/src/stm32_spi.c index 906815d532..498a664539 100644 --- a/configs/nucleo-144/src/stm32_spi.c +++ b/configs/nucleo-144/src/stm32_spi.c @@ -64,14 +64,14 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif #define ArraySize(x) (sizeof((x)) / sizeof((x)[0])) diff --git a/configs/nucleo-144/src/stm32_userleds.c b/configs/nucleo-144/src/stm32_userleds.c index 235cb6ef99..98d8020f63 100644 --- a/configs/nucleo-144/src/stm32_userleds.c +++ b/configs/nucleo-144/src/stm32_userleds.c @@ -62,10 +62,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif #define ArraySize(x) (sizeof((x)) / sizeof((x)[0])) diff --git a/configs/nucleo-f303re/src/stm32_autoleds.c b/configs/nucleo-f303re/src/stm32_autoleds.c index d90d9ae09d..ef1b3cdb07 100644 --- a/configs/nucleo-f303re/src/stm32_autoleds.c +++ b/configs/nucleo-f303re/src/stm32_autoleds.c @@ -63,10 +63,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/nucleo-f303re/src/stm32_can.c b/configs/nucleo-f303re/src/stm32_can.c index 430be9c69d..c99a6773d5 100644 --- a/configs/nucleo-f303re/src/stm32_can.c +++ b/configs/nucleo-f303re/src/stm32_can.c @@ -61,14 +61,14 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg -# define canvdbg vdbg +# define caninfo info # define canlldbg lldbg -# define canllvdbg llvdbg +# define canllinfo llinfo #else # define candbg(x...) -# define canvdbg(x...) +# define caninfo(x...) # define canlldbg(x...) -# define canllvdbg(x...) +# define canllinfo(x...) #endif /**************************************************************************** diff --git a/configs/nucleo-f303re/src/stm32_pwm.c b/configs/nucleo-f303re/src/stm32_pwm.c index 57e734d78b..58c8942f46 100644 --- a/configs/nucleo-f303re/src/stm32_pwm.c +++ b/configs/nucleo-f303re/src/stm32_pwm.c @@ -62,14 +62,14 @@ #ifdef CONFIG_DEBUG_PWM # define pwmdbg dbg -# define pwmvdbg vdbg +# define pwminfo info # define pwmlldbg lldbg -# define pwmllvdbg llvdbg +# define pwmllinfo llinfo #else # define pwmdbg(x...) -# define pwmvdbg(x...) +# define pwminfo(x...) # define pwmlldbg(x...) -# define pwmllvdbg(x...) +# define pwmllinfo(x...) #endif /**************************************************************************** diff --git a/configs/nucleo-f303re/src/stm32_spi.c b/configs/nucleo-f303re/src/stm32_spi.c index 51297ba426..d9bb2000b9 100644 --- a/configs/nucleo-f303re/src/stm32_spi.c +++ b/configs/nucleo-f303re/src/stm32_spi.c @@ -68,14 +68,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /**************************************************************************** diff --git a/configs/nucleo-f303re/src/stm32_ssd1351.c b/configs/nucleo-f303re/src/stm32_ssd1351.c index 417c4f4e8b..e58561c53d 100644 --- a/configs/nucleo-f303re/src/stm32_ssd1351.c +++ b/configs/nucleo-f303re/src/stm32_ssd1351.c @@ -75,10 +75,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg(format, ...) dbg(format, ##__VA_ARGS__) -# define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define lcdinfo(format, ...) info(format, ##__VA_ARGS__) #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /**************************************************************************** @@ -127,7 +127,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) } else { - lcdvdbg("Bound SPI port 1 to OLED %d\n", devno); + lcdinfo("Bound SPI port 1 to OLED %d\n", devno); /* And turn the OLED on */ diff --git a/configs/nucleo-f303re/src/stm32_userleds.c b/configs/nucleo-f303re/src/stm32_userleds.c index 8521294c7e..f7bc8dff30 100644 --- a/configs/nucleo-f303re/src/stm32_userleds.c +++ b/configs/nucleo-f303re/src/stm32_userleds.c @@ -62,10 +62,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/nucleo-f4x1re/src/stm32_ajoystick.c b/configs/nucleo-f4x1re/src/stm32_ajoystick.c index 61eaccf244..b412069d54 100644 --- a/configs/nucleo-f4x1re/src/stm32_ajoystick.c +++ b/configs/nucleo-f4x1re/src/stm32_ajoystick.c @@ -179,7 +179,7 @@ static FAR void *g_ajoyarg; static ajoy_buttonset_t ajoy_supported(FAR const struct ajoy_lowerhalf_s *lower) { - ivdbg("Supported: %02x\n", AJOY_SUPPORTED); + iinfo("Supported: %02x\n", AJOY_SUPPORTED); return (ajoy_buttonset_t)AJOY_SUPPORTED; } @@ -249,7 +249,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower, sample->as_x = (int16_t)tmp; have |= 1; - ivdbg("X sample: %ld -> %d\n", (long)tmp, (int)sample->as_x); + iinfo("X sample: %ld -> %d\n", (long)tmp, (int)sample->as_x); } #ifdef CONFIG_ADC_DMA @@ -259,7 +259,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower, sample->as_y = (int16_t)tmp; have |= 2; - ivdbg("Y sample: %ld -> %d\n", (long)tmp, (int)sample->as_y); + iinfo("Y sample: %ld -> %d\n", (long)tmp, (int)sample->as_y); } #endif } @@ -280,7 +280,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower, /* Sample the discrete button inputs */ sample->as_buttons = ajoy_buttons(lower); - ivdbg("Returning: %02x\n", sample->as_buttons); + iinfo("Returning: %02x\n", sample->as_buttons); return OK; } @@ -311,7 +311,7 @@ static ajoy_buttonset_t ajoy_buttons(FAR const struct ajoy_lowerhalf_s *lower) } } - ivdbg("Returning: %02x\n", ret); + iinfo("Returning: %02x\n", ret); return ret; } @@ -340,7 +340,7 @@ static void ajoy_enable(FAR const struct ajoy_lowerhalf_s *lower, flags = enter_critical_section(); ajoy_disable(); - illvdbg("press: %02x release: %02x handler: %p arg: %p\n", + illinfo("press: %02x release: %02x handler: %p arg: %p\n", press, release, handler, arg); /* If no events are indicated or if no handler is provided, then this @@ -372,7 +372,7 @@ static void ajoy_enable(FAR const struct ajoy_lowerhalf_s *lower, falling = ((press & bit) != 0); rising = ((release & bit) != 0); - illvdbg("GPIO %d: rising: %d falling: %d\n", + illinfo("GPIO %d: rising: %d falling: %d\n", i, rising, falling); (void)stm32_gpiosetevent(g_joygpio[i], rising, falling, @@ -453,7 +453,7 @@ int board_ajoy_initialize(void) #ifndef NO_JOYSTICK_ADC int fd; - ivdbg("Initialize ADC driver: /dev/adc0\n"); + iinfo("Initialize ADC driver: /dev/adc0\n"); /* Initialize ADC. We will need this to read the ADC inputs */ @@ -501,7 +501,7 @@ int board_ajoy_initialize(void) /* Register the joystick device as /dev/ajoy0 */ - ivdbg("Initialize joystick driver: /dev/ajoy0\n"); + iinfo("Initialize joystick driver: /dev/ajoy0\n"); ret = ajoy_register("/dev/ajoy0", &g_ajoylower); if (ret < 0) diff --git a/configs/nucleo-f4x1re/src/stm32_autoleds.c b/configs/nucleo-f4x1re/src/stm32_autoleds.c index ae2ac5e56d..cfec1f4e6e 100644 --- a/configs/nucleo-f4x1re/src/stm32_autoleds.c +++ b/configs/nucleo-f4x1re/src/stm32_autoleds.c @@ -64,10 +64,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/nucleo-f4x1re/src/stm32_spi.c b/configs/nucleo-f4x1re/src/stm32_spi.c index ab5faa739e..b2f268afbc 100644 --- a/configs/nucleo-f4x1re/src/stm32_spi.c +++ b/configs/nucleo-f4x1re/src/stm32_spi.c @@ -69,13 +69,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/nucleo-f4x1re/src/stm32_userleds.c b/configs/nucleo-f4x1re/src/stm32_userleds.c index 3348ac4e51..7aaa9954c5 100644 --- a/configs/nucleo-f4x1re/src/stm32_userleds.c +++ b/configs/nucleo-f4x1re/src/stm32_userleds.c @@ -64,10 +64,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/nucleo-f4x1re/src/stm32_wireless.c b/configs/nucleo-f4x1re/src/stm32_wireless.c index 7b90d024c6..2ed8a1bd69 100644 --- a/configs/nucleo-f4x1re/src/stm32_wireless.c +++ b/configs/nucleo-f4x1re/src/stm32_wireless.c @@ -197,7 +197,7 @@ static void wl_enable_irq(FAR struct cc3000_config_s *state, bool enable) /* Attach and enable, or detach and disable */ - ivdbg("enable:%d\n", enable); + iinfo("enable:%d\n", enable); if (enable) { (void)stm32_gpiosetevent(GPIO_WIFI_INT, false, true, false, priv->handler); @@ -210,7 +210,7 @@ static void wl_enable_irq(FAR struct cc3000_config_s *state, bool enable) static void wl_enable_power(FAR struct cc3000_config_s *state, bool enable) { - ivdbg("enable:%d\n", enable); + iinfo("enable:%d\n", enable); /* Active high enable */ @@ -219,7 +219,7 @@ static void wl_enable_power(FAR struct cc3000_config_s *state, bool enable) static void wl_select(FAR struct cc3000_config_s *state, bool enable) { - ivdbg("enable:%d\n", enable); + iinfo("enable:%d\n", enable); /* Active high enable */ diff --git a/configs/nucleo-l476rg/src/stm32_ajoystick.c b/configs/nucleo-l476rg/src/stm32_ajoystick.c index bd57040a78..460440323e 100644 --- a/configs/nucleo-l476rg/src/stm32_ajoystick.c +++ b/configs/nucleo-l476rg/src/stm32_ajoystick.c @@ -178,7 +178,7 @@ static FAR void *g_ajoyarg; static ajoy_buttonset_t ajoy_supported(FAR const struct ajoy_lowerhalf_s *lower) { - ivdbg("Supported: %02x\n", AJOY_SUPPORTED); + iinfo("Supported: %02x\n", AJOY_SUPPORTED); return (ajoy_buttonset_t)AJOY_SUPPORTED; } @@ -248,7 +248,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower, sample->as_x = (int16_t)tmp; have |= 1; - ivdbg("X sample: %ld -> %d\n", (long)tmp, (int)sample->as_x); + iinfo("X sample: %ld -> %d\n", (long)tmp, (int)sample->as_x); } #ifdef CONFIG_ADC_DMA @@ -258,7 +258,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower, sample->as_y = (int16_t)tmp; have |= 2; - ivdbg("Y sample: %ld -> %d\n", (long)tmp, (int)sample->as_y); + iinfo("Y sample: %ld -> %d\n", (long)tmp, (int)sample->as_y); } #endif } @@ -279,7 +279,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower, /* Sample the discrete button inputs */ sample->as_buttons = ajoy_buttons(lower); - ivdbg("Returning: %02x\n", sample->as_buttons); + iinfo("Returning: %02x\n", sample->as_buttons); return OK; } @@ -310,7 +310,7 @@ static ajoy_buttonset_t ajoy_buttons(FAR const struct ajoy_lowerhalf_s *lower) } } - ivdbg("Returning: %02x\n", ret); + iinfo("Returning: %02x\n", ret); return ret; } @@ -339,7 +339,7 @@ static void ajoy_enable(FAR const struct ajoy_lowerhalf_s *lower, flags = enter_critical_section(); ajoy_disable(); - illvdbg("press: %02x release: %02x handler: %p arg: %p\n", + illinfo("press: %02x release: %02x handler: %p arg: %p\n", press, release, handler, arg); /* If no events are indicated or if no handler is provided, then this @@ -371,7 +371,7 @@ static void ajoy_enable(FAR const struct ajoy_lowerhalf_s *lower, falling = ((press & bit) != 0); rising = ((release & bit) != 0); - illvdbg("GPIO %d: rising: %d falling: %d\n", + illinfo("GPIO %d: rising: %d falling: %d\n", i, rising, falling); (void)stm32_gpiosetevent(g_joygpio[i], rising, falling, @@ -452,7 +452,7 @@ int board_ajoy_initialize(void) #ifndef NO_JOYSTICK_ADC int fd; - ivdbg("Initialize ADC driver: /dev/adc0\n"); + iinfo("Initialize ADC driver: /dev/adc0\n"); /* Initialize ADC. We will need this to read the ADC inputs */ @@ -500,7 +500,7 @@ int board_ajoy_initialize(void) /* Register the joystick device as /dev/ajoy0 */ - ivdbg("Initialize joystick driver: /dev/ajoy0\n"); + iinfo("Initialize joystick driver: /dev/ajoy0\n"); ret = ajoy_register("/dev/ajoy0", &g_ajoylower); if (ret < 0) diff --git a/configs/nucleo-l476rg/src/stm32_autoleds.c b/configs/nucleo-l476rg/src/stm32_autoleds.c index 0c8dc4d328..af2a75424d 100644 --- a/configs/nucleo-l476rg/src/stm32_autoleds.c +++ b/configs/nucleo-l476rg/src/stm32_autoleds.c @@ -64,10 +64,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/nucleo-l476rg/src/stm32_spi.c b/configs/nucleo-l476rg/src/stm32_spi.c index 0c941a28b6..b86dd6091a 100644 --- a/configs/nucleo-l476rg/src/stm32_spi.c +++ b/configs/nucleo-l476rg/src/stm32_spi.c @@ -69,13 +69,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/nucleo-l476rg/src/stm32_userleds.c b/configs/nucleo-l476rg/src/stm32_userleds.c index 1a7af72a34..fab0f27850 100644 --- a/configs/nucleo-l476rg/src/stm32_userleds.c +++ b/configs/nucleo-l476rg/src/stm32_userleds.c @@ -64,10 +64,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/nucleo-l476rg/src/stm32_wireless.c b/configs/nucleo-l476rg/src/stm32_wireless.c index 228749c5e5..10c4c28c1b 100644 --- a/configs/nucleo-l476rg/src/stm32_wireless.c +++ b/configs/nucleo-l476rg/src/stm32_wireless.c @@ -197,7 +197,7 @@ static void wl_enable_irq(FAR struct cc3000_config_s *state, bool enable) /* Attach and enable, or detach and disable */ - ivdbg("enable:%d\n", enable); + iinfo("enable:%d\n", enable); if (enable) { (void)stm32_gpiosetevent(GPIO_WIFI_INT, false, true, false, priv->handler); @@ -210,7 +210,7 @@ static void wl_enable_irq(FAR struct cc3000_config_s *state, bool enable) static void wl_enable_power(FAR struct cc3000_config_s *state, bool enable) { - ivdbg("enable:%d\n", enable); + iinfo("enable:%d\n", enable); /* Active high enable */ @@ -219,7 +219,7 @@ static void wl_enable_power(FAR struct cc3000_config_s *state, bool enable) static void wl_select(FAR struct cc3000_config_s *state, bool enable) { - ivdbg("enable:%d\n", enable); + iinfo("enable:%d\n", enable); /* Active high enable */ diff --git a/configs/nutiny-nuc120/src/nuc_led.c b/configs/nutiny-nuc120/src/nuc_led.c index 2815f7dac0..bb797e8ce2 100644 --- a/configs/nutiny-nuc120/src/nuc_led.c +++ b/configs/nutiny-nuc120/src/nuc_led.c @@ -83,13 +83,13 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO -# define ledvdbg lldbg +# define ledinfo lldbg # else -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/olimex-lpc-h3131/src/lpc31_leds.c b/configs/olimex-lpc-h3131/src/lpc31_leds.c index 4ba0c58407..ac0659ab42 100644 --- a/configs/olimex-lpc-h3131/src/lpc31_leds.c +++ b/configs/olimex-lpc-h3131/src/lpc31_leds.c @@ -63,10 +63,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/olimex-lpc-h3131/src/lpc31_mmcsd.c b/configs/olimex-lpc-h3131/src/lpc31_mmcsd.c index 9b974f083f..9e243a9a61 100644 --- a/configs/olimex-lpc-h3131/src/lpc31_mmcsd.c +++ b/configs/olimex-lpc-h3131/src/lpc31_mmcsd.c @@ -76,7 +76,7 @@ int lpc31_mmcsd_initialize(int slot, int minor) /* First, get an instance of the SDIO interface */ - fvdbg("Initializing SDIO slot %d\n", slot); + finfo("Initializing SDIO slot %d\n", slot); sdio = sdio_initialize(slot); if (!sdio) { @@ -86,7 +86,7 @@ int lpc31_mmcsd_initialize(int slot, int minor) /* Now bind the SPI interface to the MMC/SD driver */ - fvdbg("Bind SDIO to the MMC/SD driver, minor=%d\n", minor); + finfo("Bind SDIO to the MMC/SD driver, minor=%d\n", minor); ret = mmcsd_slotinitialize(minor, sdio); if (ret != OK) { @@ -94,7 +94,7 @@ int lpc31_mmcsd_initialize(int slot, int minor) return ret; } - fvdbg("Successfully bound SDIO to the MMC/SD driver\n"); + finfo("Successfully bound SDIO to the MMC/SD driver\n"); /* Then let's guess and say that there is a card in the slot. I need to check to * see if the LPC-H3131 board supports a GPIO to detect if there is a card in diff --git a/configs/olimex-lpc-h3131/src/lpc31_spi.c b/configs/olimex-lpc-h3131/src/lpc31_spi.c index 91145242ed..d664922543 100644 --- a/configs/olimex-lpc-h3131/src/lpc31_spi.c +++ b/configs/olimex-lpc-h3131/src/lpc31_spi.c @@ -67,14 +67,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/olimex-lpc-h3131/src/lpc31_usbhost.c b/configs/olimex-lpc-h3131/src/lpc31_usbhost.c index f333af6049..cb98d49c06 100644 --- a/configs/olimex-lpc-h3131/src/lpc31_usbhost.c +++ b/configs/olimex-lpc-h3131/src/lpc31_usbhost.c @@ -104,7 +104,7 @@ static int ehci_waiter(int argc, char *argv[]) { FAR struct usbhost_hubport_s *hport; - uvdbg("ehci_waiter: Running\n"); + uinfo("ehci_waiter: Running\n"); for (;;) { /* Wait for the device to change state */ @@ -261,7 +261,7 @@ int lpc31_usbhost_initialize(void) void lpc31_usbhost_vbusdrive(int rhport, bool enable) { - uvdbg("RHPort%d: enable=%d\n", rhport+1, enable); + uinfo("RHPort%d: enable=%d\n", rhport+1, enable); /* The LPC3131 has only a single root hub port */ diff --git a/configs/olimex-lpc1766stk/src/lpc17_can.c b/configs/olimex-lpc1766stk/src/lpc17_can.c index ca0f8b05f1..7a5e6f7941 100644 --- a/configs/olimex-lpc1766stk/src/lpc17_can.c +++ b/configs/olimex-lpc1766stk/src/lpc17_can.c @@ -78,14 +78,14 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg -# define canvdbg vdbg +# define caninfo info # define canlldbg lldbg -# define canllvdbg llvdbg +# define canllinfo llinfo #else # define candbg(x...) -# define canvdbg(x...) +# define caninfo(x...) # define canlldbg(x...) -# define canllvdbg(x...) +# define canllinfo(x...) #endif /************************************************************************************ diff --git a/configs/olimex-lpc1766stk/src/lpc17_hidmouse.c b/configs/olimex-lpc1766stk/src/lpc17_hidmouse.c index 8c8f6f38ad..4bbd85984d 100644 --- a/configs/olimex-lpc1766stk/src/lpc17_hidmouse.c +++ b/configs/olimex-lpc1766stk/src/lpc17_hidmouse.c @@ -64,10 +64,10 @@ # define idbg udbg # undef illdbg # define illdbg ulldbg -# undef ivdbg -# define ivdbg uvdbg -# undef illvdbg -# define illvdbg ullvdbg +# undef iinfo +# define iinfo uinfo +# undef illinfo +# define illinfo ullinfo #endif /**************************************************************************** diff --git a/configs/olimex-lpc1766stk/src/lpc17_lcd.c b/configs/olimex-lpc1766stk/src/lpc17_lcd.c index 0c084ede73..3b2299f960 100644 --- a/configs/olimex-lpc1766stk/src/lpc17_lcd.c +++ b/configs/olimex-lpc1766stk/src/lpc17_lcd.c @@ -89,7 +89,7 @@ #endif #ifdef CONFIG_LCD_NOKIADBG -# define lcddbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define lcddbg(format, ...) info(format, ##__VA_ARGS__) # define lcd_dumpgpio(m) lpc17_dumpgpio(LPC1766STK_LCD_RST, m) #else # define lcddbg(x...) @@ -227,7 +227,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) } else { - gllvdbg("Bound SSP port 0 to LCD %d\n", devno); + gllinfo("Bound SSP port 0 to LCD %d\n", devno); /* And turn the LCD on (CONFIG_LCD_MAXPOWER should be 1) */ diff --git a/configs/olimex-lpc1766stk/src/lpc17_leds.c b/configs/olimex-lpc1766stk/src/lpc17_leds.c index 4e7c3ff866..1fce6e0512 100644 --- a/configs/olimex-lpc1766stk/src/lpc17_leds.c +++ b/configs/olimex-lpc1766stk/src/lpc17_leds.c @@ -65,13 +65,13 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO -# define ledvdbg lldbg +# define ledinfo lldbg # else -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/olimex-lpc1766stk/src/lpc17_ssp.c b/configs/olimex-lpc1766stk/src/lpc17_ssp.c index 14d426ed37..5fe86c7f05 100644 --- a/configs/olimex-lpc1766stk/src/lpc17_ssp.c +++ b/configs/olimex-lpc1766stk/src/lpc17_ssp.c @@ -83,14 +83,14 @@ #ifdef CONFIG_SSP_DEBUG # define sspdbg lldbg # ifdef CONFIG_SSP_VERBOSE -# define sspvdbg lldbg +# define sspinfo lldbg # else -# define sspvdbg(x...) +# define sspinfo(x...) # endif #else # undef CONFIG_SSP_VERBOSE # define sspdbg(x...) -# define sspvdbg(x...) +# define sspinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/olimex-stm32-h405/src/stm32_autoleds.c b/configs/olimex-stm32-h405/src/stm32_autoleds.c index 430076db4a..5a928b269f 100644 --- a/configs/olimex-stm32-h405/src/stm32_autoleds.c +++ b/configs/olimex-stm32-h405/src/stm32_autoleds.c @@ -61,10 +61,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/olimex-stm32-h405/src/stm32_can.c b/configs/olimex-stm32-h405/src/stm32_can.c index 6443bdb88d..4cc0324e6b 100644 --- a/configs/olimex-stm32-h405/src/stm32_can.c +++ b/configs/olimex-stm32-h405/src/stm32_can.c @@ -70,14 +70,14 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg -# define canvdbg vdbg +# define caninfo info # define canlldbg lldbg -# define canllvdbg llvdbg +# define canllinfo llinfo #else # define candbg(x...) -# define canvdbg(x...) +# define caninfo(x...) # define canlldbg(x...) -# define canllvdbg(x...) +# define canllinfo(x...) #endif /************************************************************************************ diff --git a/configs/olimex-stm32-h405/src/stm32_userleds.c b/configs/olimex-stm32-h405/src/stm32_userleds.c index 910b53b47d..f1ab8ed283 100644 --- a/configs/olimex-stm32-h405/src/stm32_userleds.c +++ b/configs/olimex-stm32-h405/src/stm32_userleds.c @@ -58,10 +58,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/olimex-stm32-h407/src/stm32_autoleds.c b/configs/olimex-stm32-h407/src/stm32_autoleds.c index 7e7bf697cb..67d5a75497 100644 --- a/configs/olimex-stm32-h407/src/stm32_autoleds.c +++ b/configs/olimex-stm32-h407/src/stm32_autoleds.c @@ -64,10 +64,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/olimex-stm32-h407/src/stm32_can.c b/configs/olimex-stm32-h407/src/stm32_can.c index 521c444511..d00cf068c8 100644 --- a/configs/olimex-stm32-h407/src/stm32_can.c +++ b/configs/olimex-stm32-h407/src/stm32_can.c @@ -70,14 +70,14 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg -# define canvdbg vdbg +# define caninfo info # define canlldbg lldbg -# define canllvdbg llvdbg +# define canllinfo llinfo #else # define candbg(x...) -# define canvdbg(x...) +# define caninfo(x...) # define canlldbg(x...) -# define canllvdbg(x...) +# define canllinfo(x...) #endif /************************************************************************************ diff --git a/configs/olimex-stm32-h407/src/stm32_sdio.c b/configs/olimex-stm32-h407/src/stm32_sdio.c index 919c503252..53598f5e80 100644 --- a/configs/olimex-stm32-h407/src/stm32_sdio.c +++ b/configs/olimex-stm32-h407/src/stm32_sdio.c @@ -134,7 +134,7 @@ int stm32_sdio_initialize(void) /* Mount the SDIO-based MMC/SD block driver */ /* First, get an instance of the SDIO interface */ - fvdbg("Initializing SDIO slot %d\n", SDIO_SLOTNO); + finfo("Initializing SDIO slot %d\n", SDIO_SLOTNO); g_sdio_dev = sdio_initialize(SDIO_SLOTNO); if (!g_sdio_dev) @@ -145,7 +145,7 @@ int stm32_sdio_initialize(void) /* Now bind the SDIO interface to the MMC/SD driver */ - fvdbg("Bind SDIO to the MMC/SD driver, minor=%d\n", SDIO_MINOR); + finfo("Bind SDIO to the MMC/SD driver, minor=%d\n", SDIO_MINOR); ret = mmcsd_slotinitialize(SDIO_MINOR, g_sdio_dev); if (ret != OK) @@ -154,13 +154,13 @@ int stm32_sdio_initialize(void) return ret; } - fvdbg("Successfully bound SDIO to the MMC/SD driver\n"); + finfo("Successfully bound SDIO to the MMC/SD driver\n"); #ifdef HAVE_NCD /* Use SD card detect pin to check if a card is g_sd_inserted */ cd_status = !stm32_gpioread(GPIO_SDIO_NCD); - fvdbg("Card detect : %d\n", cd_status); + finfo("Card detect : %d\n", cd_status); sdio_mediachange(g_sdio_dev, cd_status); #else diff --git a/configs/olimex-stm32-h407/src/stm32_usb.c b/configs/olimex-stm32-h407/src/stm32_usb.c index 22b246af38..adee4357b4 100644 --- a/configs/olimex-stm32-h407/src/stm32_usb.c +++ b/configs/olimex-stm32-h407/src/stm32_usb.c @@ -103,13 +103,13 @@ static int usbhost_waiter(int argc, char *argv[]) { struct usbhost_hubport_s *hport; - uvdbg("Running\n"); + uinfo("Running\n"); for (;;) { /* Wait for the device to change state */ DEBUGVERIFY(CONN_WAIT(g_usbconn, &hport)); - uvdbg("%s\n", hport->connected ? "connected" : "disconnected"); + uinfo("%s\n", hport->connected ? "connected" : "disconnected"); /* Did we just become connected? */ @@ -173,7 +173,7 @@ int stm32_usbhost_initialize(void) * that we care about: */ - uvdbg("Register class drivers\n"); + uinfo("Register class drivers\n"); #ifdef CONFIG_USBHOST_HUB /* Initialize USB hub class support */ @@ -207,13 +207,13 @@ int stm32_usbhost_initialize(void) /* Then get an instance of the USB host interface */ - uvdbg("Initialize USB host\n"); + uinfo("Initialize USB host\n"); g_usbconn = stm32_otghshost_initialize(0); if (g_usbconn) { /* Start a thread to handle device connection. */ - uvdbg("Start usbhost_waiter\n"); + uinfo("Start usbhost_waiter\n"); pid = task_create("usbhost", CONFIG_STM32H407_USBHOST_PRIO, CONFIG_STM32H407_USBHOST_STACKSIZE, diff --git a/configs/olimex-stm32-h407/src/stm32_userleds.c b/configs/olimex-stm32-h407/src/stm32_userleds.c index e771326ba5..02719fb94e 100644 --- a/configs/olimex-stm32-h407/src/stm32_userleds.c +++ b/configs/olimex-stm32-h407/src/stm32_userleds.c @@ -63,10 +63,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/olimex-stm32-p107/src/stm32_can.c b/configs/olimex-stm32-p107/src/stm32_can.c index 690417f9f5..635d3ad5ff 100644 --- a/configs/olimex-stm32-p107/src/stm32_can.c +++ b/configs/olimex-stm32-p107/src/stm32_can.c @@ -66,14 +66,14 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg -# define canvdbg vdbg +# define caninfo info # define canlldbg lldbg -# define canllvdbg llvdbg +# define canllinfo llinfo #else # define candbg(x...) -# define canvdbg(x...) +# define caninfo(x...) # define canlldbg(x...) -# define canllvdbg(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 9f37781990..39f3d012f0 100644 --- a/configs/olimex-stm32-p107/src/stm32_encx24j600.c +++ b/configs/olimex-stm32-p107/src/stm32_encx24j600.c @@ -195,7 +195,7 @@ void up_netinitialize(void) return; } - nllvdbg("Bound SPI port %d to ENCX24J600 device %d\n", + nllinfo("Bound SPI port %d to ENCX24J600 device %d\n", ENCX24J600_SPI_PORTNO, ENCX24J600_DEVNO); } diff --git a/configs/olimex-stm32-p107/src/stm32_spi.c b/configs/olimex-stm32-p107/src/stm32_spi.c index 8fea7b1ac9..372cd50450 100644 --- a/configs/olimex-stm32-p107/src/stm32_spi.c +++ b/configs/olimex-stm32-p107/src/stm32_spi.c @@ -66,14 +66,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# 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 8c3628b977..291759f60b 100644 --- a/configs/olimex-stm32-p207/src/stm32_autoleds.c +++ b/configs/olimex-stm32-p207/src/stm32_autoleds.c @@ -61,10 +61,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* The following definitions map the encoded LED setting to GPIO settings */ diff --git a/configs/olimex-stm32-p207/src/stm32_can.c b/configs/olimex-stm32-p207/src/stm32_can.c index 9728422aea..49fe8e8128 100644 --- a/configs/olimex-stm32-p207/src/stm32_can.c +++ b/configs/olimex-stm32-p207/src/stm32_can.c @@ -70,14 +70,14 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg -# define canvdbg vdbg +# define caninfo info # define canlldbg lldbg -# define canllvdbg llvdbg +# define canllinfo llinfo #else # define candbg(x...) -# define canvdbg(x...) +# define caninfo(x...) # define canlldbg(x...) -# define canllvdbg(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 c9b2c968aa..3f00e5a991 100644 --- a/configs/olimex-stm32-p207/src/stm32_usb.c +++ b/configs/olimex-stm32-p207/src/stm32_usb.c @@ -105,13 +105,13 @@ static int usbhost_waiter(int argc, char *argv[]) { struct usbhost_hubport_s *hport; - uvdbg("Running\n"); + uinfo("Running\n"); for (;;) { /* Wait for the device to change state */ DEBUGVERIFY(CONN_WAIT(g_usbconn, &hport)); - uvdbg("%s\n", hport->connected ? "connected" : "disconnected"); + uinfo("%s\n", hport->connected ? "connected" : "disconnected"); /* Did we just become connected? */ @@ -177,7 +177,7 @@ int stm32_usbhost_initialize(void) * that we care about: */ - uvdbg("Register class drivers\n"); + uinfo("Register class drivers\n"); #ifdef CONFIG_USBHOST_HUB /* Initialize USB hub class support */ @@ -211,13 +211,13 @@ int stm32_usbhost_initialize(void) /* Then get an instance of the USB host interface */ - uvdbg("Initialize USB host\n"); + uinfo("Initialize USB host\n"); g_usbconn = stm32_otgfshost_initialize(0); if (g_usbconn) { /* Start a thread to handle device connection. */ - uvdbg("Start usbhost_waiter\n"); + uinfo("Start usbhost_waiter\n"); pid = task_create("usbhost", CONFIG_USBHOST_DEFPRIO, CONFIG_USBHOST_STACKSIZE, diff --git a/configs/olimex-stm32-p207/src/stm32_userleds.c b/configs/olimex-stm32-p207/src/stm32_userleds.c index 7d01e00343..ba1f3d8cc7 100644 --- a/configs/olimex-stm32-p207/src/stm32_userleds.c +++ b/configs/olimex-stm32-p207/src/stm32_userleds.c @@ -58,10 +58,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/olimex-strp711/src/str71_enc28j60.c b/configs/olimex-strp711/src/str71_enc28j60.c index d36f61000a..bd98539b2e 100644 --- a/configs/olimex-strp711/src/str71_enc28j60.c +++ b/configs/olimex-strp711/src/str71_enc28j60.c @@ -245,7 +245,7 @@ void up_netinitialize(void) return; } - nllvdbg("Bound SPI port %d to ENC28J60 device %d\n", + nllinfo("Bound SPI port %d to ENC28J60 device %d\n", ENC28J60_SPI_PORTNO, ENC28J60_DEVNO); } #endif /* CONFIG_ENC28J60 */ diff --git a/configs/olimexino-stm32/src/stm32_can.c b/configs/olimexino-stm32/src/stm32_can.c index 00e5c374de..ebec02cda0 100644 --- a/configs/olimexino-stm32/src/stm32_can.c +++ b/configs/olimexino-stm32/src/stm32_can.c @@ -69,14 +69,14 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg -# define canvdbg vdbg +# define caninfo info # define canlldbg lldbg -# define canllvdbg llvdbg +# define canllinfo llinfo #else # define candbg(x...) -# define canvdbg(x...) +# define caninfo(x...) # define canlldbg(x...) -# define canllvdbg(x...) +# define canllinfo(x...) #endif /************************************************************************************ diff --git a/configs/olimexino-stm32/src/stm32_leds.c b/configs/olimexino-stm32/src/stm32_leds.c index 5cdf82be88..ff823e5262 100644 --- a/configs/olimexino-stm32/src/stm32_leds.c +++ b/configs/olimexino-stm32/src/stm32_leds.c @@ -61,13 +61,13 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO -# define ledvdbg lldbg +# define ledinfo lldbg # else -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/olimexino-stm32/src/stm32_spi.c b/configs/olimexino-stm32/src/stm32_spi.c index 59dc0db892..99b404326d 100644 --- a/configs/olimexino-stm32/src/stm32_spi.c +++ b/configs/olimexino-stm32/src/stm32_spi.c @@ -67,14 +67,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/open1788/src/lpc17_autoleds.c b/configs/open1788/src/lpc17_autoleds.c index 5edb1e3114..3f16d5cd06 100644 --- a/configs/open1788/src/lpc17_autoleds.c +++ b/configs/open1788/src/lpc17_autoleds.c @@ -141,13 +141,13 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO -# define ledvdbg lldbg +# define ledinfo lldbg # else -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/open1788/src/lpc17_ssp.c b/configs/open1788/src/lpc17_ssp.c index a3a54c4a10..c957a2442f 100644 --- a/configs/open1788/src/lpc17_ssp.c +++ b/configs/open1788/src/lpc17_ssp.c @@ -66,13 +66,13 @@ #ifdef CONFIG_DEBUG_SPI # define sspdbg lldbg # ifdef CONFIG_DEBUG_INFO -# define sspvdbg lldbg +# define sspinfo lldbg # else -# define sspvdbg(x...) +# define sspinfo(x...) # endif #else # define sspdbg(x...) -# define sspvdbg(x...) +# define sspinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/open1788/src/lpc17_touchscreen.c b/configs/open1788/src/lpc17_touchscreen.c index 1232507936..097ec3550f 100644 --- a/configs/open1788/src/lpc17_touchscreen.c +++ b/configs/open1788/src/lpc17_touchscreen.c @@ -175,7 +175,7 @@ static int tsc_attach(FAR struct ads7843e_config_s *state, xcpt_t handler) static void tsc_enable(FAR struct ads7843e_config_s *state, bool enable) { - ivdbg("enable:%d\n", enable); + iinfo("enable:%d\n", enable); if (enable) { /* Enable PENIRQ interrupts. NOTE: The pin interrupt is enabled from worker thread @@ -227,7 +227,7 @@ static bool tsc_busy(FAR struct ads7843e_config_s *state) #if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_INFO) if (busy != last) { - ivdbg("busy:%d\n", busy); + iinfo("busy:%d\n", busy); last = busy; } #endif @@ -245,7 +245,7 @@ static bool tsc_pendown(FAR struct ads7843e_config_s *state) */ bool pendown = !lpc17_gpioread(GPIO_TC_PENIRQ); - ivdbg("pendown:%d\n", pendown); + iinfo("pendown:%d\n", pendown); return pendown; } diff --git a/configs/open1788/src/lpc17_userleds.c b/configs/open1788/src/lpc17_userleds.c index bbc0569a0a..b7f1ca5d5b 100644 --- a/configs/open1788/src/lpc17_userleds.c +++ b/configs/open1788/src/lpc17_userleds.c @@ -67,13 +67,13 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO -# define ledvdbg lldbg +# define ledinfo lldbg # else -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c b/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c index 9a3bfd8ce3..517bfee6a9 100644 --- a/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c +++ b/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c @@ -141,10 +141,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg dbg -# define lcdvdbg vdbg +# define lcdinfo info #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /**************************************************************************** @@ -242,8 +242,8 @@ static void lcd_dumpstate(FAR const char *msg) int row; int column; - lcdvdbg("%s:\n", msg); - lcdvdbg(" currow: %d curcol: %d\n", + lcdinfo("%s:\n", msg); + lcdinfo(" currow: %d curcol: %d\n", g_lcd1602.currow, g_lcd1602.curcol); for (row = 0, column = 0; row < LCD_NROWS; ) @@ -252,7 +252,7 @@ static void lcd_dumpstate(FAR const char *msg) buffer[column] = isprint(ch) ? ch : '.'; if (++column >= LCD_NCOLUMNS) { - lcdvdbg(" [%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c]\n", + lcdinfo(" [%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c]\n", buffer[0], buffer[1], buffer[2], buffer[3], buffer[4], buffer[5], buffer[6], buffer[7], buffer[8], buffer[9], buffer[10], buffer[11], @@ -273,8 +273,8 @@ static void lcd_dumpstate(FAR const char *msg) static void lcd_dumpstream(FAR const char *msg, FAR const struct lcd_instream_s *stream) { - lcdvdbg("%s:\n", msg); - lcdvdbg(" nget: %d nbytes: %d\n", + lcdinfo("%s:\n", msg); + lcdinfo(" nget: %d nbytes: %d\n", stream->stream.nget, stream->nbytes); lib_dumpbuffer("STREAM", stream->buffer, stream->nbytes); } @@ -437,7 +437,7 @@ static void lcd_appendch(uint8_t ch) static void lcd_action(enum slcdcode_e code, uint8_t count) { - lcdvdbg("Action: %d count: %d\n", code, count); + lcdinfo("Action: %d count: %d\n", code, count); lcd_dumpstate("BEFORE ACTION"); switch (code) @@ -719,7 +719,7 @@ static ssize_t lcd_write(FAR struct file *filep, FAR const char *buffer, memset(&state, 0, sizeof(struct slcdstate_s)); while ((result = slcd_decode(&instream.stream, &state, &ch, &count)) != SLCDRET_EOF) { - lcdvdbg("slcd_decode returned result=%d char=%d count=%d\n", + lcdinfo("slcd_decode returned result=%d char=%d count=%d\n", result, ch, count); if (result == SLCDRET_CHAR) /* A normal character was returned */ @@ -796,7 +796,7 @@ static int lcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg) { FAR struct slcd_attributes_s *attr = (FAR struct slcd_attributes_s *)((uintptr_t)arg); - lcdvdbg("SLCDIOC_GETATTRIBUTES:\n"); + lcdinfo("SLCDIOC_GETATTRIBUTES:\n"); if (!attr) { @@ -822,7 +822,7 @@ static int lcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg) { FAR struct slcd_curpos_s *curpos = (FAR struct slcd_curpos_s *)((uintptr_t)arg); - lcdvdbg("SLCDIOC_CURPOS: row=%d column=%d\n", g_lcd1602.currow, g_lcd1602.curcol); + lcdinfo("SLCDIOC_CURPOS: row=%d column=%d\n", g_lcd1602.currow, g_lcd1602.curcol); if (!curpos) { @@ -890,7 +890,7 @@ int up_lcd1602_initialize(void) if (!g_lcd1602.initialized) { - lcdvdbg("Initializing\n"); + lcdinfo("Initializing\n"); /* PMP Master mode configuration */ /* Make sure that interrupts are disabled */ diff --git a/configs/pcduino-a10/src/a1x_leds.c b/configs/pcduino-a10/src/a1x_leds.c index 39af605278..ee13572a7a 100644 --- a/configs/pcduino-a10/src/a1x_leds.c +++ b/configs/pcduino-a10/src/a1x_leds.c @@ -96,10 +96,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/pic32mx-starterkit/src/pic32mx_leds.c b/configs/pic32mx-starterkit/src/pic32mx_leds.c index 9beeb57b64..07480043b5 100644 --- a/configs/pic32mx-starterkit/src/pic32mx_leds.c +++ b/configs/pic32mx-starterkit/src/pic32mx_leds.c @@ -100,15 +100,15 @@ #if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS) # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO -# define ledvdbg lldbg +# define ledinfo lldbg # else -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # undef CONFIG_DEBUG_LEDS # undef CONFIG_DEBUG_INFO # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/pic32mx-starterkit/src/pic32mx_spi.c b/configs/pic32mx-starterkit/src/pic32mx_spi.c index a9e2df2e6a..234f740d9e 100644 --- a/configs/pic32mx-starterkit/src/pic32mx_spi.c +++ b/configs/pic32mx-starterkit/src/pic32mx_spi.c @@ -67,14 +67,14 @@ #ifdef CONFIG_SPI_DEBUG # define spidbg lldbg # ifdef CONFIG_SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef CONFIG_SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/pic32mx7mmb/src/pic32_leds.c b/configs/pic32mx7mmb/src/pic32_leds.c index cf74cd0bff..c329b3a379 100644 --- a/configs/pic32mx7mmb/src/pic32_leds.c +++ b/configs/pic32mx7mmb/src/pic32_leds.c @@ -103,15 +103,15 @@ #if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS) # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO -# define ledvdbg lldbg +# define ledinfo lldbg # else -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # undef CONFIG_DEBUG_LEDS # undef CONFIG_DEBUG_INFO # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/pic32mx7mmb/src/pic32_mio283qt2.c b/configs/pic32mx7mmb/src/pic32_mio283qt2.c index 642d30aca4..11b156e5f8 100644 --- a/configs/pic32mx7mmb/src/pic32_mio283qt2.c +++ b/configs/pic32mx7mmb/src/pic32_mio283qt2.c @@ -140,10 +140,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg dbg -# define lcdvdbg vdbg +# define lcdinfo info #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif #ifdef CONFIG_LCD_MIO283QT2 @@ -430,7 +430,7 @@ int board_lcd_initialize(void) if (!g_pic32mx7mmb_lcd.drvr) { - lcdvdbg("Initializing\n"); + lcdinfo("Initializing\n"); /* Hold the LCD in reset (active low) */ diff --git a/configs/pic32mx7mmb/src/pic32_spi.c b/configs/pic32mx7mmb/src/pic32_spi.c index f89b06d93b..84a5db8b16 100644 --- a/configs/pic32mx7mmb/src/pic32_spi.c +++ b/configs/pic32mx7mmb/src/pic32_spi.c @@ -82,10 +82,10 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg -# define spivdbg llvdbg +# define spiinfo llinfo #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/pic32mx7mmb/src/pic32_touchscreen.c b/configs/pic32mx7mmb/src/pic32_touchscreen.c index 333325622e..1d07e0a06c 100644 --- a/configs/pic32mx7mmb/src/pic32_touchscreen.c +++ b/configs/pic32mx7mmb/src/pic32_touchscreen.c @@ -509,7 +509,7 @@ static void tc_notify(FAR struct tc_dev_s *priv) if (fds) { fds->revents |= POLLIN; - ivdbg("Report events: %02x\n", fds->revents); + iinfo("Report events: %02x\n", fds->revents); sem_post(fds->sem); } } @@ -771,7 +771,7 @@ static void tc_worker(FAR void *arg) { value = MAX_ADC - value; priv->newy = (value + priv->value) >> 1; - ivdbg("Y-=%d Y+=%d[%d] Y=%d\n", priv->value, value, MAX_ADC - value, priv->newy); + iinfo("Y-=%d Y+=%d[%d] Y=%d\n", priv->value, value, MAX_ADC - value, priv->newy); /* Start X+ sampling */ @@ -857,7 +857,7 @@ static void tc_worker(FAR void *arg) value = MAX_ADC - value; newx = (value + priv->value) >> 1; - ivdbg("X+=%d X-=%d[%d] X=%d\n", priv->value, value, MAX_ADC - value, newx); + iinfo("X+=%d X-=%d[%d] X=%d\n", priv->value, value, MAX_ADC - value, newx); /* Samples are available */ @@ -1204,14 +1204,14 @@ errout: static int tc_ioctl(FAR struct file *filep, int cmd, unsigned long arg) { #if 1 - ivdbg("cmd: %d arg: %ld\n", cmd, arg); + iinfo("cmd: %d arg: %ld\n", cmd, arg); return -ENOTTY; /* None yet supported */ #else FAR struct inode *inode; FAR struct tc_dev_s *priv; int ret; - ivdbg("cmd: %d arg: %ld\n", cmd, arg); + iinfo("cmd: %d arg: %ld\n", cmd, arg); DEBUGASSERT(filep); inode = filep->f_inode; @@ -1258,7 +1258,7 @@ static int tc_poll(FAR struct file *filep, FAR struct pollfd *fds, int ret; int i; - ivdbg("setup: %d\n", (int)setup); + iinfo("setup: %d\n", (int)setup); DEBUGASSERT(filep && fds); inode = filep->f_inode; @@ -1367,7 +1367,7 @@ int board_tsc_setup(int minor) char devname[DEV_NAMELEN]; int ret; - ivdbg("minor: %d\n", minor); + iinfo("minor: %d\n", minor); DEBUGASSERT(minor >= 0 && minor < 100); /* Configure all touchscreen pins as inputs, undriven */ @@ -1403,7 +1403,7 @@ int board_tsc_setup(int minor) /* Register the device as an input device */ (void)snprintf(devname, DEV_NAMELEN, DEV_FORMAT, minor); - ivdbg("Registering %s\n", devname); + iinfo("Registering %s\n", devname); ret = register_driver(devname, &tc_fops, 0666, priv); if (ret < 0) diff --git a/configs/pic32mz-starterkit/src/pic32mz_autoleds.c b/configs/pic32mz-starterkit/src/pic32mz_autoleds.c index 5435b1327e..f8aa219476 100644 --- a/configs/pic32mz-starterkit/src/pic32mz_autoleds.c +++ b/configs/pic32mz-starterkit/src/pic32mz_autoleds.c @@ -96,15 +96,15 @@ #if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS) # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO -# define ledvdbg lldbg +# define ledinfo lldbg # else -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # undef CONFIG_DEBUG_LEDS # undef CONFIG_DEBUG_INFO # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/pic32mz-starterkit/src/pic32mz_spi.c b/configs/pic32mz-starterkit/src/pic32mz_spi.c index 5a0b2599c6..04020e78d9 100644 --- a/configs/pic32mz-starterkit/src/pic32mz_spi.c +++ b/configs/pic32mz-starterkit/src/pic32mz_spi.c @@ -61,14 +61,14 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef CONFIG_SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/pic32mz-starterkit/src/pic32mz_userleds.c b/configs/pic32mz-starterkit/src/pic32mz_userleds.c index e785dc5708..a2bfc39e51 100644 --- a/configs/pic32mz-starterkit/src/pic32mz_userleds.c +++ b/configs/pic32mz-starterkit/src/pic32mz_userleds.c @@ -76,15 +76,15 @@ #if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS) # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO -# define ledvdbg lldbg +# define ledinfo lldbg # else -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # undef CONFIG_DEBUG_LEDS # undef CONFIG_DEBUG_INFO # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/sabre-6quad/src/imx_autoleds.c b/configs/sabre-6quad/src/imx_autoleds.c index 692dbdd152..65c45ef2cd 100644 --- a/configs/sabre-6quad/src/imx_autoleds.c +++ b/configs/sabre-6quad/src/imx_autoleds.c @@ -88,10 +88,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/sam3u-ek/src/sam_lcd.c b/configs/sam3u-ek/src/sam_lcd.c index 759209fbaa..4aa0e28d22 100644 --- a/configs/sam3u-ek/src/sam_lcd.c +++ b/configs/sam3u-ek/src/sam_lcd.c @@ -160,17 +160,17 @@ /* Debug ******************************************************************************/ #ifdef CONFIG_LCD_REGDEBUG -# define regdbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define regdbg(format, ...) info(format, ##__VA_ARGS__) #else # define regdbg(x...) #endif #ifdef CONFIG_DEBUG_LCD # define lcddbg(format, ...) dbg(format, ##__VA_ARGS__) -# define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define lcdinfo(format, ...) info(format, ##__VA_ARGS__) #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /* Graphics Capbilities ***************************************************************/ @@ -544,7 +544,7 @@ static void sam_lcdon(void) { /* Display ON Setting */ - lcdvdbg("ON\n"); + lcdinfo("ON\n"); sam_putreg(HX8347_R90H, 0x7f); /* SAP=0111 1111 */ sam_putreg(HX8347_R26H, 0x04); /* GON=0 DTE=0 D=01 */ up_mdelay(100); @@ -564,7 +564,7 @@ static void sam_lcdon(void) static void sam_lcdoff(void) { - lcdvdbg("OFF\n"); + lcdinfo("OFF\n"); sam_putreg(HX8347_R90H, 0x00); /* SAP=0000 0000 */ sam_putreg(HX8347_R26H, 0x00); /* GON=0 DTE=0 D=00 */ } @@ -613,7 +613,7 @@ static int sam_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer, /* Buffer must be provided and aligned to a 16-bit address boundary */ - lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0); #ifdef CONFIG_LCD_PORTRAIT @@ -679,7 +679,7 @@ static int sam_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, /* Buffer must be provided and aligned to a 16-bit address boundary */ - lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0); #ifdef CONFIG_LCD_PORTRAIT @@ -730,7 +730,7 @@ static int sam_getvideoinfo(FAR struct lcd_dev_s *dev, FAR struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); - lcdvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n", + lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n", g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes); memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s)); return OK; @@ -748,7 +748,7 @@ static int sam_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, FAR struct lcd_planeinfo_s *pinfo) { DEBUGASSERT(dev && pinfo && planeno == 0); - lcdvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); + lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s)); return OK; } @@ -766,7 +766,7 @@ static int sam_getpower(struct lcd_dev_s *dev) { struct sam_dev_s *priv = (struct sam_dev_s *)dev; DEBUGASSERT(dev); - lcdvdbg("power: %d\n", priv->power); + lcdinfo("power: %d\n", priv->power); return priv->power; } @@ -790,7 +790,7 @@ static int sam_setpower(struct lcd_dev_s *dev, int power) struct sam_dev_s *priv = (struct sam_dev_s *)dev; unsigned int i; - lcdvdbg("power: %d\n", power); + lcdinfo("power: %d\n", power); DEBUGASSERT(power <= CONFIG_LCD_MAXPOWER); /* Switch off backlight */ @@ -834,7 +834,7 @@ static int sam_setpower(struct lcd_dev_s *dev, int power) static int sam_getcontrast(struct lcd_dev_s *dev) { - lcdvdbg("Not implemented\n"); + lcdinfo("Not implemented\n"); return -ENOSYS; } @@ -848,7 +848,7 @@ static int sam_getcontrast(struct lcd_dev_s *dev) static int sam_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) { - lcdvdbg("contrast: %d\n", contrast); + lcdinfo("contrast: %d\n", contrast); return -ENOSYS; } @@ -874,7 +874,7 @@ int board_lcd_initialize(void) uint32_t regval; unsigned int i; - lcdvdbg("Initializing\n"); + lcdinfo("Initializing\n"); /* Enable LCD EXTCS2 pins */ @@ -943,7 +943,7 @@ int board_lcd_initialize(void) #ifdef CONFIG_DEBUG_LCD hxregval = sam_getreg(HX8347_R67H); - lcdvdbg("Chip ID: %04x\n", hxregval); + lcdinfo("Chip ID: %04x\n", hxregval); if (hxregval != HX8347_CHIPID) { lcddbg("Bad chip ID: %04x Expected: %04x\n", hxregval, HX8347_CHIPID); @@ -1049,7 +1049,7 @@ int board_lcd_initialize(void) FAR struct lcd_dev_s *board_lcd_getdev(int lcddev) { - lcdvdbg("lcddev: %d\n", lcddev); + lcdinfo("lcddev: %d\n", lcddev); return lcddev == 0 ? &g_lcddev_s.dev : NULL; } diff --git a/configs/sam3u-ek/src/sam_leds.c b/configs/sam3u-ek/src/sam_leds.c index 54c70f108b..8d702f5f20 100644 --- a/configs/sam3u-ek/src/sam_leds.c +++ b/configs/sam3u-ek/src/sam_leds.c @@ -64,10 +64,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif #define LED_OFF 0 diff --git a/configs/sam3u-ek/src/sam_mmcsd.c b/configs/sam3u-ek/src/sam_mmcsd.c index 2d44104cb0..c411e2f359 100644 --- a/configs/sam3u-ek/src/sam_mmcsd.c +++ b/configs/sam3u-ek/src/sam_mmcsd.c @@ -112,7 +112,7 @@ bool sam_cardinserted(unsigned char slot) { #ifdef GPIO_MCI_CD bool inserted = sam_gpioread(GPIO_MCI_CD); - fvdbg("inserted: %s\n", inserted ? "NO" : "YES"); + finfo("inserted: %s\n", inserted ? "NO" : "YES"); return !inserted; #else return true; @@ -135,7 +135,7 @@ bool sam_writeprotected(unsigned char slot) { #ifdef GPIO_MCI_WP bool protected = sam_gpioread(GPIO_MCI_WP); - fvdbg("protected: %s\n", inserted ? "YES" : "NO"); + finfo("protected: %s\n", inserted ? "YES" : "NO"); return protected; #else return false; diff --git a/configs/sam3u-ek/src/sam_spi.c b/configs/sam3u-ek/src/sam_spi.c index 014dff6635..39fb1da061 100644 --- a/configs/sam3u-ek/src/sam_spi.c +++ b/configs/sam3u-ek/src/sam_spi.c @@ -67,14 +67,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/sam3u-ek/src/sam_touchscreen.c b/configs/sam3u-ek/src/sam_touchscreen.c index eb32f3e766..8b7b042a70 100644 --- a/configs/sam3u-ek/src/sam_touchscreen.c +++ b/configs/sam3u-ek/src/sam_touchscreen.c @@ -156,7 +156,7 @@ static int tsc_attach(FAR struct ads7843e_config_s *state, xcpt_t isr) { /* Attach the ADS7843E interrupt */ - ivdbg("Attaching %p to IRQ %d\n", isr, SAM_TCS_IRQ); + iinfo("Attaching %p to IRQ %d\n", isr, SAM_TCS_IRQ); return irq_attach(SAM_TCS_IRQ, isr); } @@ -164,7 +164,7 @@ static void tsc_enable(FAR struct ads7843e_config_s *state, bool enable) { /* Attach and enable, or detach and disable */ - ivdbg("IRQ:%d enable:%d\n", SAM_TCS_IRQ, enable); + iinfo("IRQ:%d enable:%d\n", SAM_TCS_IRQ, enable); if (enable) { sam_gpioirqenable(SAM_TCS_IRQ); @@ -194,7 +194,7 @@ static bool tsc_busy(FAR struct ads7843e_config_s *state) #if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_INFO) if (busy != last) { - ivdbg("busy:%d\n", busy); + iinfo("busy:%d\n", busy); last = busy; } #endif @@ -207,7 +207,7 @@ static bool tsc_pendown(FAR struct ads7843e_config_s *state) /* The /PENIRQ value is active low */ bool pendown = !sam_gpioread(GPIO_TCS_IRQ); - ivdbg("pendown:%d\n", pendown); + iinfo("pendown:%d\n", pendown); return pendown; } diff --git a/configs/sam4e-ek/src/sam_ads7843e.c b/configs/sam4e-ek/src/sam_ads7843e.c index 82e2ee0ceb..6487c39b29 100644 --- a/configs/sam4e-ek/src/sam_ads7843e.c +++ b/configs/sam4e-ek/src/sam_ads7843e.c @@ -153,7 +153,7 @@ static int tsc_attach(FAR struct ads7843e_config_s *state, xcpt_t isr) { /* Attach the ADS7843E interrupt */ - ivdbg("Attaching %p to IRQ %d\n", isr, SAM_TCS_IRQ); + iinfo("Attaching %p to IRQ %d\n", isr, SAM_TCS_IRQ); return irq_attach(SAM_TCS_IRQ, isr); } @@ -161,7 +161,7 @@ static void tsc_enable(FAR struct ads7843e_config_s *state, bool enable) { /* Attach and enable, or detach and disable */ - ivdbg("IRQ:%d enable:%d\n", SAM_TCS_IRQ, enable); + iinfo("IRQ:%d enable:%d\n", SAM_TCS_IRQ, enable); if (enable) { sam_gpioirqenable(SAM_TCS_IRQ); @@ -191,7 +191,7 @@ static bool tsc_busy(FAR struct ads7843e_config_s *state) #if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_INFO) if (busy != last) { - ivdbg("busy:%d\n", busy); + iinfo("busy:%d\n", busy); last = busy; } #endif @@ -204,7 +204,7 @@ static bool tsc_pendown(FAR struct ads7843e_config_s *state) /* The /PENIRQ value is active low */ bool pendown = !sam_gpioread(GPIO_TCS_IRQ); - ivdbg("pendown:%d\n", pendown); + iinfo("pendown:%d\n", pendown); return pendown; } diff --git a/configs/sam4e-ek/src/sam_ethernet.c b/configs/sam4e-ek/src/sam_ethernet.c index 1e48b109b8..301cd94c37 100644 --- a/configs/sam4e-ek/src/sam_ethernet.c +++ b/configs/sam4e-ek/src/sam_ethernet.c @@ -205,7 +205,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable) DEBUGASSERT(intf); - nvdbg("%s: handler=%p\n", intf, handler); + ninfo("%s: handler=%p\n", intf, handler); phydbg("EMAC: devname=%s\n", SAM34_EMAC_DEVNAME); if (strcmp(intf, SAM34_EMAC_DEVNAME) == 0) diff --git a/configs/sam4e-ek/src/sam_hsmci.c b/configs/sam4e-ek/src/sam_hsmci.c index 8577c0a318..89f332e51f 100644 --- a/configs/sam4e-ek/src/sam_hsmci.c +++ b/configs/sam4e-ek/src/sam_hsmci.c @@ -194,7 +194,7 @@ bool sam_cardinserted(int slotno) /* Get the state of the GPIO pin */ removed = sam_gpioread(GPIO_MCI_CD); - fllvdbg("Slot %d inserted: %s\n", slotno, removed ? "NO" : "YES"); + fllinfo("Slot %d inserted: %s\n", slotno, removed ? "NO" : "YES"); return !removed; } diff --git a/configs/sam4e-ek/src/sam_ili9325.c b/configs/sam4e-ek/src/sam_ili9325.c index adb614c364..1aee4173ae 100644 --- a/configs/sam4e-ek/src/sam_ili9325.c +++ b/configs/sam4e-ek/src/sam_ili9325.c @@ -270,10 +270,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg dbg -# define lcdvdbg vdbg +# define lcdinfo info #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /************************************************************************************ @@ -703,7 +703,7 @@ static int sam_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer, /* Buffer must be provided and aligned to a 16-bit address boundary */ - lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0); /* Set the cursor position */ @@ -818,7 +818,7 @@ static int sam_getvideoinfo(FAR struct lcd_dev_s *dev, FAR struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); - lcdvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n", + lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n", g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes); memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s)); return OK; @@ -836,7 +836,7 @@ static int sam_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, FAR struct lcd_planeinfo_s *pinfo) { DEBUGASSERT(dev && pinfo && planeno == 0); - lcdvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); + lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s)); return OK; } @@ -854,7 +854,7 @@ static int sam_getpower(struct lcd_dev_s *dev) { FAR struct sam_dev_s *priv = (FAR struct sam_dev_s *)dev; - lcdvdbg("power: %d\n", 0); + lcdinfo("power: %d\n", 0); return priv->power; } @@ -871,7 +871,7 @@ static int sam_setpower(struct lcd_dev_s *dev, int power) { FAR struct sam_dev_s *priv = (FAR struct sam_dev_s *)dev; - lcdvdbg("power: %d\n", power); + lcdinfo("power: %d\n", power); DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER); /* Set new power level */ @@ -910,7 +910,7 @@ static int sam_setpower(struct lcd_dev_s *dev, int power) static int sam_getcontrast(struct lcd_dev_s *dev) { - lcdvdbg("Not implemented\n"); + lcdinfo("Not implemented\n"); return -ENOSYS; } @@ -924,7 +924,7 @@ static int sam_getcontrast(struct lcd_dev_s *dev) static int sam_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) { - lcdvdbg("contrast: %d\n", contrast); + lcdinfo("contrast: %d\n", contrast); return -ENOSYS; } @@ -1286,7 +1286,7 @@ static inline int sam_lcd_initialize(void) /* Check the LCD ID */ id = sam_read_reg(ILI9325_DEVICE_CODE_REG); - lcdvdbg("LCD ID: %04x\n", id); + lcdinfo("LCD ID: %04x\n", id); /* Initialize the LCD hardware */ @@ -1319,7 +1319,7 @@ int board_lcd_initialize(void) FAR struct sam_dev_s *priv = &g_lcddev; int ret; - lcdvdbg("Initializing\n"); + lcdinfo("Initializing\n"); /* Configure all LCD pins pins (backlight is initially off) */ diff --git a/configs/sam4e-ek/src/sam_ili9341.c b/configs/sam4e-ek/src/sam_ili9341.c index 2cfdc8df12..48d755e43b 100644 --- a/configs/sam4e-ek/src/sam_ili9341.c +++ b/configs/sam4e-ek/src/sam_ili9341.c @@ -273,10 +273,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg dbg -# define lcdvdbg vdbg +# define lcdinfo info #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /************************************************************************************ @@ -503,7 +503,7 @@ static void sam_setwindow(sam_color_t row, sam_color_t col, { uint8_t buffer[4]; - lcdvdbg("row=%d col=%d width=%d height=%d\n", row, col, width, height); + lcdinfo("row=%d col=%d width=%d height=%d\n", row, col, width, height); /* Set Column Address Position */ @@ -654,7 +654,7 @@ static void sam_set_backlight(unsigned int power) unsigned int level; int i; - lcdvdbg("power=%d\n", power); + lcdinfo("power=%d\n", power); /* Scale the power setting to the range 1...BKL_LEVELS */ @@ -696,7 +696,7 @@ static void sam_set_backlight(unsigned int power) static int sam_poweroff(FAR struct sam_dev_s *priv) { - lcdvdbg("OFF\n"); + lcdinfo("OFF\n"); /* Turn the display off */ @@ -739,7 +739,7 @@ static int sam_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer, /* Buffer must be provided and aligned to a 16-bit address boundary */ - lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels); #if defined(CONFIG_SAM4EEK_LCD_RGB565) DEBUGASSERT(src && ((uintptr_t)src & 1) == 0); @@ -797,7 +797,7 @@ static int sam_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, /* Buffer must be provided and aligned to a 16-bit address boundary */ - lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels); #if defined(CONFIG_SAM4EEK_LCD_RGB565) DEBUGASSERT(dest && ((uintptr_t)dest & 1) == 0); @@ -840,7 +840,7 @@ static int sam_getvideoinfo(FAR struct lcd_dev_s *dev, FAR struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); - lcdvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n", + lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n", g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes); memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s)); return OK; @@ -858,7 +858,7 @@ static int sam_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, FAR struct lcd_planeinfo_s *pinfo) { DEBUGASSERT(dev && pinfo && planeno == 0); - lcdvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); + lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s)); return OK; } @@ -876,7 +876,7 @@ static int sam_getpower(struct lcd_dev_s *dev) { FAR struct sam_dev_s *priv = (FAR struct sam_dev_s *)dev; - lcdvdbg("power: %d\n", 0); + lcdinfo("power: %d\n", 0); return priv->power; } @@ -893,7 +893,7 @@ static int sam_setpower(struct lcd_dev_s *dev, int power) { FAR struct sam_dev_s *priv = (FAR struct sam_dev_s *)dev; - lcdvdbg("power: %d\n", power); + lcdinfo("power: %d\n", power); DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER); /* Set new power level */ @@ -930,7 +930,7 @@ static int sam_setpower(struct lcd_dev_s *dev, int power) static int sam_getcontrast(struct lcd_dev_s *dev) { - lcdvdbg("Not implemented\n"); + lcdinfo("Not implemented\n"); return -ENOSYS; } @@ -944,7 +944,7 @@ static int sam_getcontrast(struct lcd_dev_s *dev) static int sam_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) { - lcdvdbg("contrast: %d\n", contrast); + lcdinfo("contrast: %d\n", contrast); return -ENOSYS; } @@ -1198,7 +1198,7 @@ int board_lcd_initialize(void) FAR struct sam_dev_s *priv = &g_lcddev; int ret; - lcdvdbg("Initializing\n"); + lcdinfo("Initializing\n"); /* Configure all LCD pins pins (backlight is initially off) */ diff --git a/configs/sam4e-ek/src/sam_leds.c b/configs/sam4e-ek/src/sam_leds.c index 12eb79fec7..747428abac 100644 --- a/configs/sam4e-ek/src/sam_leds.c +++ b/configs/sam4e-ek/src/sam_leds.c @@ -104,10 +104,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/sam4e-ek/src/sam_spi.c b/configs/sam4e-ek/src/sam_spi.c index 01b3860828..42e92ac917 100644 --- a/configs/sam4e-ek/src/sam_spi.c +++ b/configs/sam4e-ek/src/sam_spi.c @@ -67,14 +67,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/sam4l-xplained/src/sam_autoleds.c b/configs/sam4l-xplained/src/sam_autoleds.c index 7ffe5a3771..91d59db7e5 100644 --- a/configs/sam4l-xplained/src/sam_autoleds.c +++ b/configs/sam4l-xplained/src/sam_autoleds.c @@ -87,10 +87,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/sam4l-xplained/src/sam_mmcsd.c b/configs/sam4l-xplained/src/sam_mmcsd.c index bc5fd368c7..c752a35622 100644 --- a/configs/sam4l-xplained/src/sam_mmcsd.c +++ b/configs/sam4l-xplained/src/sam_mmcsd.c @@ -94,7 +94,7 @@ int sam_sdinitialize(int minor) /* Get the SPI driver instance for the SD chip select */ - fvdbg("Initializing SPI chip select %d\n", SD_CSNO); + finfo("Initializing SPI chip select %d\n", SD_CSNO); spi = sam_spibus_initialize(SD_CSNO); if (!spi) @@ -103,11 +103,11 @@ int sam_sdinitialize(int minor) return -ENODEV; } - fvdbg("Successfully initialized SPI chip select %d\n", SD_CSNO); + finfo("Successfully initialized SPI chip select %d\n", SD_CSNO); /* Bind the SPI device for the chip select to the slot */ - fvdbg("Binding SPI chip select %d to MMC/SD slot %d\n", + finfo("Binding SPI chip select %d to MMC/SD slot %d\n", SD_CSNO, SAM34_MMCSDSLOTNO); ret = mmcsd_spislotinitialize(minor, SAM34_MMCSDSLOTNO, spi); @@ -118,7 +118,7 @@ int sam_sdinitialize(int minor) return ret; } - fvdbg("Successfuly bound SPI chip select %d to MMC/SD slot %d\n", + finfo("Successfuly bound SPI chip select %d to MMC/SD slot %d\n", SD_CSNO, SAM34_MMCSDSLOTNO); return OK; diff --git a/configs/sam4l-xplained/src/sam_slcd.c b/configs/sam4l-xplained/src/sam_slcd.c index 26c8474c04..844d438821 100644 --- a/configs/sam4l-xplained/src/sam_slcd.c +++ b/configs/sam4l-xplained/src/sam_slcd.c @@ -252,10 +252,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg dbg -# define lcdvdbg vdbg +# define lcdinfo info #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /**************************************************************************** @@ -408,13 +408,13 @@ static const struct slcd_pixel_s g_einfo[SLCD_NE] = #if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_INFO) static void slcd_dumpstate(FAR const char *msg) { - lcdvdbg("%s:\n", msg); - lcdvdbg(" curpos: %d\n", + lcdinfo("%s:\n", msg); + lcdinfo(" curpos: %d\n", g_slcdstate.curpos); - lcdvdbg(" Display: [%c%c%c%c%c]\n", + lcdinfo(" Display: [%c%c%c%c%c]\n", g_slcdstate.buffer[0], g_slcdstate.buffer[1], g_slcdstate.buffer[2], g_slcdstate.buffer[3], g_slcdstate.buffer[4]); - lcdvdbg(" Options: [%d%d%d%d%d]\n", + lcdinfo(" Options: [%d%d%d%d%d]\n", g_slcdstate.options[0], g_slcdstate.options[1], g_slcdstate.options[2], g_slcdstate.options[3], g_slcdstate.options[4]); } @@ -427,20 +427,20 @@ static void slcd_dumpstate(FAR const char *msg) #if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_INFO) static void slcd_dumpslcd(FAR const char *msg) { - lcdvdbg("%s:\n", msg); - lcdvdbg(" CFG: %08x TIM: %08x SR: %08x\n", + lcdinfo("%s:\n", msg); + lcdinfo(" CFG: %08x TIM: %08x SR: %08x\n", getreg32(SAM_LCDCA_CFG), getreg32(SAM_LCDCA_TIM), getreg32(SAM_LCDCA_SR)); - lcdvdbg(" DR0: %02x %08x DR1: %02x %08x\n", + lcdinfo(" DR0: %02x %08x DR1: %02x %08x\n", getreg32(SAM_LCDCA_DRH0), getreg32(SAM_LCDCA_DRL0), getreg32(SAM_LCDCA_DRH1), getreg32(SAM_LCDCA_DRL1)); - lcdvdbg(" DR2: %02x %08x DR3: %02x %08x\n", + lcdinfo(" DR2: %02x %08x DR3: %02x %08x\n", getreg32(SAM_LCDCA_DRH2), getreg32(SAM_LCDCA_DRL2), getreg32(SAM_LCDCA_DRH3), getreg32(SAM_LCDCA_DRL3)); - lcdvdbg(" BCFG: %08x CSRCFG: %08x CMCFG: %08x ACMCFG: %08x\n", + lcdinfo(" BCFG: %08x CSRCFG: %08x CMCFG: %08x ACMCFG: %08x\n", getreg32(SAM_LCDCA_BCFG), getreg32(SAM_LCDCA_CSRCFG), getreg32(SAM_LCDCA_CMCFG), getreg32(SAM_LCDCA_ACMCFG)); - lcdvdbg(" ABMCFG: %08x IMR: %08x VER: %08x\n", + lcdinfo(" ABMCFG: %08x IMR: %08x VER: %08x\n", getreg32(SAM_LCDCA_ABMCFG), getreg32(SAM_LCDCA_IMR), getreg32(SAM_LCDCA_VERSION)); } @@ -453,7 +453,7 @@ static void slcd_dumpslcd(FAR const char *msg) #if 0 /* Not used */ static void slcd_clear(void) { - lvdbg("Clearing\n"); + linfo("Clearing\n"); /* Clear display memory */ @@ -611,7 +611,7 @@ static int slcd_setcontrast(unsigned int contrast) regval |= LCDCA_CFG_FCST(scontrast); putreg32(regval, SAM_LCDCA_CFG); - lcdvdbg("contrast: %d CFG: %08x\n", contrast, getreg32(SAM_LCDCA_CFG)); + lcdinfo("contrast: %d CFG: %08x\n", contrast, getreg32(SAM_LCDCA_CFG)); return ret; } @@ -666,7 +666,7 @@ static void slcd_writech(uint8_t ch, uint8_t curpos, uint8_t options) static void slcd_action(enum slcdcode_e code, uint8_t count) { - lcdvdbg("Action: %d count: %d\n", code, count); + lcdinfo("Action: %d count: %d\n", code, count); slcd_dumpstate("BEFORE ACTION"); switch (code) @@ -918,7 +918,7 @@ static ssize_t slcd_write(FAR struct file *filep, options = 0; while ((result = slcd_decode(&instream.stream, &state, &ch, &count)) != SLCDRET_EOF) { - lcdvdbg("slcd_decode returned result=%d char=%d count=%d\n", + lcdinfo("slcd_decode returned result=%d char=%d count=%d\n", result, ch, count); if (result == SLCDRET_CHAR) /* A normal character was returned */ @@ -970,7 +970,7 @@ static ssize_t slcd_write(FAR struct file *filep, else if (ch < 128) { - lcdvdbg("ch: %c[%02x] options: %02x\n", ch, ch, options); + lcdinfo("ch: %c[%02x] options: %02x\n", ch, ch, options); /* Write the character at the current cursor position */ @@ -1021,7 +1021,7 @@ static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg) { FAR struct slcd_attributes_s *attr = (FAR struct slcd_attributes_s *)((uintptr_t)arg); - lcdvdbg("SLCDIOC_GETATTRIBUTES:\n"); + lcdinfo("SLCDIOC_GETATTRIBUTES:\n"); if (!attr) { @@ -1046,7 +1046,7 @@ static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg) { FAR struct slcd_curpos_s *curpos = (FAR struct slcd_curpos_s *)((uintptr_t)arg); - lcdvdbg("SLCDIOC_CURPOS: row=0 column=%d\n", g_slcdstate.curpos); + lcdinfo("SLCDIOC_CURPOS: row=0 column=%d\n", g_slcdstate.curpos); if (!curpos) { @@ -1065,7 +1065,7 @@ static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case SLCDIOC_SETBAR: { - lcdvdbg("SLCDIOC_SETBAR: arg=0x%02lx\n", arg); + lcdinfo("SLCDIOC_SETBAR: arg=0x%02lx\n", arg); if ((arg & 1) != 0) { @@ -1120,7 +1120,7 @@ static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg) } *contrast = (int)slcd_getcontrast(); - lcdvdbg("SLCDIOC_GETCONTRAST: contrast=%d\n", *contrast); + lcdinfo("SLCDIOC_GETCONTRAST: contrast=%d\n", *contrast); } break; @@ -1131,7 +1131,7 @@ static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case SLCDIOC_SETCONTRAST: { - lcdvdbg("SLCDIOC_SETCONTRAST: arg=%ld\n", arg); + lcdinfo("SLCDIOC_SETCONTRAST: arg=%ld\n", arg); if (arg > SLCD_MAXCONTRAST) { @@ -1197,7 +1197,7 @@ int sam_slcd_initialize(void) if (!g_slcdstate.initialized) { - lcdvdbg("Initializing\n"); + lcdinfo("Initializing\n"); /* Configure LCD GPIO pins */ diff --git a/configs/sam4l-xplained/src/sam_spi.c b/configs/sam4l-xplained/src/sam_spi.c index 8c45e010e3..1c74d8e9f8 100644 --- a/configs/sam4l-xplained/src/sam_spi.c +++ b/configs/sam4l-xplained/src/sam_spi.c @@ -62,14 +62,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/sam4l-xplained/src/sam_ug2832hsweg04.c b/configs/sam4l-xplained/src/sam_ug2832hsweg04.c index 1d60b6710c..8cf093533b 100644 --- a/configs/sam4l-xplained/src/sam_ug2832hsweg04.c +++ b/configs/sam4l-xplained/src/sam_ug2832hsweg04.c @@ -118,10 +118,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg(format, ...) dbg(format, ##__VA_ARGS__) -# define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define lcdinfo(format, ...) info(format, ##__VA_ARGS__) #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /**************************************************************************** @@ -170,7 +170,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) } else { - lcdvdbg("Bound SPI port 1 to OLED %d\n", devno); + lcdinfo("Bound SPI port 1 to OLED %d\n", devno); /* And turn the OLED on */ diff --git a/configs/sam4l-xplained/src/sam_userleds.c b/configs/sam4l-xplained/src/sam_userleds.c index 0b5a832d2b..8e5ab2e699 100644 --- a/configs/sam4l-xplained/src/sam_userleds.c +++ b/configs/sam4l-xplained/src/sam_userleds.c @@ -72,10 +72,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/sam4s-xplained-pro/src/sam_autoleds.c b/configs/sam4s-xplained-pro/src/sam_autoleds.c index 455d572b4b..aabf3fca5e 100644 --- a/configs/sam4s-xplained-pro/src/sam_autoleds.c +++ b/configs/sam4s-xplained-pro/src/sam_autoleds.c @@ -80,10 +80,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/sam4s-xplained-pro/src/sam_hsmci.c b/configs/sam4s-xplained-pro/src/sam_hsmci.c index eedc7a475a..40cfd428d0 100644 --- a/configs/sam4s-xplained-pro/src/sam_hsmci.c +++ b/configs/sam4s-xplained-pro/src/sam_hsmci.c @@ -207,7 +207,7 @@ bool sam_cardinserted(int slotno) /* Get the state of the GPIO pin */ removed = sam_gpioread(GPIO_MCI_CD); - fllvdbg("Slot %d inserted: %s\n", slotno, removed ? "NO" : "YES"); + fllinfo("Slot %d inserted: %s\n", slotno, removed ? "NO" : "YES"); return !removed; } diff --git a/configs/sam4s-xplained-pro/src/sam_tc.c b/configs/sam4s-xplained-pro/src/sam_tc.c index fd8a930d58..06a5ae8668 100644 --- a/configs/sam4s-xplained-pro/src/sam_tc.c +++ b/configs/sam4s-xplained-pro/src/sam_tc.c @@ -110,17 +110,17 @@ # define tcdbg dbg # define tclldbg lldbg # ifdef CONFIG_DEBUG_INFO -# define tcvdbg vdbg -# define tcllvdbg llvdbg +# define tcinfo info +# define tcllinfo llinfo # else -# define tcvdbg(x...) -# define tcllvdbg(x...) +# define tcinfo(x...) +# define tcllinfo(x...) # endif #else # define tcdbg(x...) # define tclldbg(x...) -# define tcvdbg(x...) -# define tcllvdbg(x...) +# define tcinfo(x...) +# define tcllinfo(x...) #endif /**************************************************************************** @@ -168,37 +168,37 @@ int sam_timerinitialize(void) /* Initialize and register the timer devices */ #if defined(CONFIG_SAM34_TC0) - tcvdbg("Initializing %s...\n", CONFIG_TIMER0_DEVPATH); + tcinfo("Initializing %s...\n", CONFIG_TIMER0_DEVPATH); sam_tcinitialize(CONFIG_TIMER0_DEVPATH, SAM_IRQ_TC0); #endif #if defined(CONFIG_SAM34_TC1) - tcvdbg("Initializing %s...\n", CONFIG_TIMER1_DEVPATH); + tcinfo("Initializing %s...\n", CONFIG_TIMER1_DEVPATH); sam_tcinitialize(CONFIG_TIMER1_DEVPATH, SAM_IRQ_TC1); #endif #if defined(CONFIG_SAM34_TC2) - tcvdbg("Initializing %s...\n", CONFIG_TIMER2_DEVPATH); + tcinfo("Initializing %s...\n", CONFIG_TIMER2_DEVPATH); sam_tcinitialize(CONFIG_TIMER2_DEVPATH, SAM_IRQ_TC2); #endif #if defined(CONFIG_SAM34_TC3) - tcvdbg("Initializing %s...\n", CONFIG_TIMER3_DEVPATH); + tcinfo("Initializing %s...\n", CONFIG_TIMER3_DEVPATH); sam_tcinitialize(CONFIG_TIMER3_DEVPATH, SAM_IRQ_TC3); #endif #if defined(CONFIG_SAM34_TC4) - tcvdbg("Initializing %s...\n", CONFIG_TIMER4_DEVPATH); + tcinfo("Initializing %s...\n", CONFIG_TIMER4_DEVPATH); sam_tcinitialize(CONFIG_TIMER4_DEVPATH, SAM_IRQ_TC4); #endif #if defined(CONFIG_SAM34_TC5) - tcvdbg("Initializing %s...\n", CONFIG_TIMER5_DEVPATH); + tcinfo("Initializing %s...\n", CONFIG_TIMER5_DEVPATH); sam_tcinitialize(CONFIG_TIMER5_DEVPATH, SAM_IRQ_TC5); #endif #if defined(CONFIG_SAM34_RTT) - tcvdbg("Initializing %s...\n", CONFIG_RTT_DEVPATH); + tcinfo("Initializing %s...\n", CONFIG_RTT_DEVPATH); sam_rttinitialize(CONFIG_RTT_DEVPATH); #endif @@ -206,7 +206,7 @@ int sam_timerinitialize(void) !defined(CONFIG_SUPPRESS_TIMER_INTS) /* System Timer Initialization */ - tcvdbg("Opening %s\n", CONFIG_SAM4S_XPLAINED_PRO_SCHED_TIMER_DEVPATH); + tcinfo("Opening %s\n", CONFIG_SAM4S_XPLAINED_PRO_SCHED_TIMER_DEVPATH); fd = open(CONFIG_SAM4S_XPLAINED_PRO_SCHED_TIMER_DEVPATH, O_RDONLY); if (fd < 0) @@ -218,7 +218,7 @@ int sam_timerinitialize(void) /* Set the timeout */ - tcvdbg("Interval = %d us.\n", (unsigned long)USEC_PER_TICK); + tcinfo("Interval = %d us.\n", (unsigned long)USEC_PER_TICK); ret = ioctl(fd, TCIOC_SETTIMEOUT, (unsigned long)USEC_PER_TICK); if (ret < 0) { @@ -242,7 +242,7 @@ int sam_timerinitialize(void) /* Start the timer */ - tcvdbg("Starting.\n"); + tcinfo("Starting.\n"); ret = ioctl(fd, TCIOC_START, 0); if (ret < 0) { @@ -254,7 +254,7 @@ int sam_timerinitialize(void) #if defined(CONFIG_SCHED_CPULOAD) && defined(CONFIG_SCHED_CPULOAD_EXTCLK) /* CPU Load initialization */ - tcvdbg("Opening %s\n", CONFIG_SAM4S_XPLAINED_PRO_CPULOAD_TIMER_DEVPATH); + tcinfo("Opening %s\n", CONFIG_SAM4S_XPLAINED_PRO_CPULOAD_TIMER_DEVPATH); fd = open(CONFIG_SAM4S_XPLAINED_PRO_CPULOAD_TIMER_DEVPATH, O_RDONLY); if (fd < 0) @@ -266,7 +266,7 @@ int sam_timerinitialize(void) /* Set the timeout */ - tcvdbg("Interval = %d us.\n", (unsigned long)1000000 / CONFIG_SCHED_CPULOAD_TICKSPERSEC); + tcinfo("Interval = %d us.\n", (unsigned long)1000000 / CONFIG_SCHED_CPULOAD_TICKSPERSEC); ret = ioctl(fd, TCIOC_SETTIMEOUT, (unsigned long)1000000 / CONFIG_SCHED_CPULOAD_TICKSPERSEC); @@ -293,7 +293,7 @@ int sam_timerinitialize(void) /* Start the timer */ - tcvdbg("Starting.\n"); + tcinfo("Starting.\n"); ret = ioctl(fd, TCIOC_START, 0); if (ret < 0) { diff --git a/configs/sam4s-xplained-pro/src/sam_userleds.c b/configs/sam4s-xplained-pro/src/sam_userleds.c index 3176b35d00..aa67cc33a1 100644 --- a/configs/sam4s-xplained-pro/src/sam_userleds.c +++ b/configs/sam4s-xplained-pro/src/sam_userleds.c @@ -62,10 +62,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/sam4s-xplained-pro/src/sam_wdt.c b/configs/sam4s-xplained-pro/src/sam_wdt.c index 3b987ed3f7..e0f845e337 100644 --- a/configs/sam4s-xplained-pro/src/sam_wdt.c +++ b/configs/sam4s-xplained-pro/src/sam_wdt.c @@ -93,17 +93,17 @@ # define wdgdbg dbg # define wdglldbg lldbg # ifdef CONFIG_DEBUG_INFO -# define wdgvdbg vdbg -# define wdgllvdbg llvdbg +# define wdginfo info +# define wdgllinfo llinfo # else -# define wdgvdbg(x...) -# define wdgllvdbg(x...) +# define wdginfo(x...) +# define wdgllinfo(x...) # endif #else # define wdgdbg(x...) # define wdglldbg(x...) -# define wdgvdbg(x...) -# define wdgllvdbg(x...) +# define wdginfo(x...) +# define wdgllinfo(x...) #endif /************************************************************************************ @@ -124,7 +124,7 @@ static int wdog_daemon(int argc, char *argv[]) /* Open the watchdog device for reading */ - wdgvdbg("Opening.\n"); + wdginfo("Opening.\n"); fd = open(CONFIG_WATCHDOG_DEVPATH, O_RDONLY); if (fd < 0) { @@ -134,7 +134,7 @@ static int wdog_daemon(int argc, char *argv[]) /* Start the watchdog timer. */ - wdgvdbg("Starting.\n"); + wdginfo("Starting.\n"); ret = ioctl(fd, WDIOC_START, 0); if (ret < 0) { @@ -147,7 +147,7 @@ static int wdog_daemon(int argc, char *argv[]) { usleep((CONFIG_WDT_THREAD_INTERVAL)*1000); - wdgvdbg("ping\n"); + wdginfo("ping\n"); ret = ioctl(fd, WDIOC_KEEPALIVE, 0); if (ret < 0) { @@ -181,12 +181,12 @@ int sam_watchdog_initialize(void) /* Initialize tha register the watchdog timer device */ - wdgvdbg("Initializing Watchdog driver...\n"); + wdginfo("Initializing Watchdog driver...\n"); sam_wdtinitialize(CONFIG_WATCHDOG_DEVPATH); /* Open the watchdog device */ - wdgvdbg("Opening.\n"); + wdginfo("Opening.\n"); fd = open(CONFIG_WATCHDOG_DEVPATH, O_RDONLY); if (fd < 0) { @@ -196,7 +196,7 @@ int sam_watchdog_initialize(void) /* Set the watchdog timeout */ - wdgvdbg("Timeout = %d.\n", CONFIG_WDT_TIMEOUT); + wdginfo("Timeout = %d.\n", CONFIG_WDT_TIMEOUT); ret = ioctl(fd, WDIOC_SETTIMEOUT, (unsigned long)CONFIG_WDT_TIMEOUT); if (ret < 0) { @@ -206,7 +206,7 @@ int sam_watchdog_initialize(void) /* Set the watchdog minimum time */ - wdgvdbg("MinTime = %d.\n", CONFIG_WDT_MINTIME); + wdginfo("MinTime = %d.\n", CONFIG_WDT_MINTIME); ret = ioctl(fd, WDIOC_MINTIME, (unsigned long)CONFIG_WDT_MINTIME); if (ret < 0) { diff --git a/configs/sam4s-xplained/src/sam_autoleds.c b/configs/sam4s-xplained/src/sam_autoleds.c index c5bbda1f79..fd1a2a448a 100644 --- a/configs/sam4s-xplained/src/sam_autoleds.c +++ b/configs/sam4s-xplained/src/sam_autoleds.c @@ -79,10 +79,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/sam4s-xplained/src/sam_userleds.c b/configs/sam4s-xplained/src/sam_userleds.c index c2f694d6c4..e501a0db3e 100644 --- a/configs/sam4s-xplained/src/sam_userleds.c +++ b/configs/sam4s-xplained/src/sam_userleds.c @@ -61,10 +61,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/sama5d2-xult/src/sam_autoleds.c b/configs/sama5d2-xult/src/sam_autoleds.c index 2f6cd07bfc..4336f047fd 100644 --- a/configs/sama5d2-xult/src/sam_autoleds.c +++ b/configs/sama5d2-xult/src/sam_autoleds.c @@ -95,10 +95,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/sama5d2-xult/src/sam_userleds.c b/configs/sama5d2-xult/src/sam_userleds.c index fe55247be6..bc29bcb7b6 100644 --- a/configs/sama5d2-xult/src/sam_userleds.c +++ b/configs/sama5d2-xult/src/sam_userleds.c @@ -71,10 +71,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/sama5d3-xplained/src/sam_ajoystick.c b/configs/sama5d3-xplained/src/sam_ajoystick.c index d05f46eeaf..e1e1a1c485 100644 --- a/configs/sama5d3-xplained/src/sam_ajoystick.c +++ b/configs/sama5d3-xplained/src/sam_ajoystick.c @@ -161,7 +161,7 @@ static FAR void *g_ajoyarg; static ajoy_buttonset_t ajoy_supported(FAR const struct ajoy_lowerhalf_s *lower) { - ivdbg("Supported: %02x\n", AJOY_SUPPORTED); + iinfo("Supported: %02x\n", AJOY_SUPPORTED); return (ajoy_buttonset_t)AJOY_SUPPORTED; } @@ -220,7 +220,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower, sample->as_x = (int16_t)tmp; have |= 1; - ivdbg("X sample: %ld -> %d\n", (long)tmp, (int)sample->as_x); + iinfo("X sample: %ld -> %d\n", (long)tmp, (int)sample->as_x); } if ((have & 2) == 0 && ptr->am_channel == 1) @@ -229,7 +229,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower, sample->as_y = (int16_t)tmp; have |= 2; - ivdbg("Y sample: %ld -> %d\n", (long)tmp, (int)sample->as_y); + iinfo("Y sample: %ld -> %d\n", (long)tmp, (int)sample->as_y); } } @@ -243,7 +243,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower, /* Sample the discrete button inputs */ sample->as_buttons = ajoy_buttons(lower); - ivdbg("Returning: %02x\n", AJOY_SUPPORTED); + iinfo("Returning: %02x\n", AJOY_SUPPORTED); return OK; } @@ -274,7 +274,7 @@ static ajoy_buttonset_t ajoy_buttons(FAR const struct ajoy_lowerhalf_s *lower) } } - ivdbg("Returning: %02x\n", ret); + iinfo("Returning: %02x\n", ret); return ret; } @@ -301,7 +301,7 @@ static void ajoy_enable(FAR const struct ajoy_lowerhalf_s *lower, flags = enter_critical_section(); ajoy_disable(); - illvdbg("press: %02x release: %02x handler: %p arg: %p\n", + illinfo("press: %02x release: %02x handler: %p arg: %p\n", press, release, handler, arg); /* If no events are indicated or if no handler is provided, then this diff --git a/configs/sama5d3-xplained/src/sam_autoleds.c b/configs/sama5d3-xplained/src/sam_autoleds.c index e618b20723..208761c25c 100644 --- a/configs/sama5d3-xplained/src/sam_autoleds.c +++ b/configs/sama5d3-xplained/src/sam_autoleds.c @@ -97,10 +97,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/sama5d3-xplained/src/sam_can.c b/configs/sama5d3-xplained/src/sam_can.c index 9fc10f9d2b..390bd02e74 100644 --- a/configs/sama5d3-xplained/src/sam_can.c +++ b/configs/sama5d3-xplained/src/sam_can.c @@ -74,14 +74,14 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg -# define canvdbg vdbg +# define caninfo info # define canlldbg lldbg -# define canllvdbg llvdbg +# define canllinfo llinfo #else # define candbg(x...) -# define canvdbg(x...) +# define caninfo(x...) # define canlldbg(x...) -# define canllvdbg(x...) +# define canllinfo(x...) #endif /************************************************************************************ diff --git a/configs/sama5d3-xplained/src/sam_ethernet.c b/configs/sama5d3-xplained/src/sam_ethernet.c index 3a820b3101..bcab38459f 100644 --- a/configs/sama5d3-xplained/src/sam_ethernet.c +++ b/configs/sama5d3-xplained/src/sam_ethernet.c @@ -276,7 +276,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable) DEBUGASSERT(intf); - nvdbg("%s: handler=%p\n", intf, handler); + ninfo("%s: handler=%p\n", intf, handler); #ifdef CONFIG_SAMA5_EMACA phydbg("EMAC: devname=%s\n", SAMA5_EMAC_DEVNAME); #endif diff --git a/configs/sama5d3-xplained/src/sam_hsmci.c b/configs/sama5d3-xplained/src/sam_hsmci.c index 4ba3e529d1..2db5dd8d16 100644 --- a/configs/sama5d3-xplained/src/sam_hsmci.c +++ b/configs/sama5d3-xplained/src/sam_hsmci.c @@ -154,7 +154,7 @@ bool sam_cardinserted_internal(struct sam_hsmci_state_s *state) /* Get the state of the PIO pin */ inserted = sam_pioread(state->pincfg); - fllvdbg("Slot %d inserted: %s\n", state->slotno, inserted ? "NO" : "YES"); + fllinfo("Slot %d inserted: %s\n", state->slotno, inserted ? "NO" : "YES"); return !inserted; } diff --git a/configs/sama5d3-xplained/src/sam_spi.c b/configs/sama5d3-xplained/src/sam_spi.c index 24672d8c33..903f8b93aa 100644 --- a/configs/sama5d3-xplained/src/sam_spi.c +++ b/configs/sama5d3-xplained/src/sam_spi.c @@ -67,14 +67,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/sama5d3-xplained/src/sam_usb.c b/configs/sama5d3-xplained/src/sam_usb.c index ac747277ff..2b1a7267f9 100644 --- a/configs/sama5d3-xplained/src/sam_usb.c +++ b/configs/sama5d3-xplained/src/sam_usb.c @@ -115,13 +115,13 @@ static int usbhost_waiter(struct usbhost_connection_s *dev) { struct usbhost_hubport_s *hport; - uvdbg("Running\n"); + uinfo("Running\n"); for (;;) { /* Wait for the device to change state */ DEBUGVERIFY(CONN_WAIT(dev, &hport)); - uvdbg("%s\n", hport->connected ? "connected" : "disconnected"); + uinfo("%s\n", hport->connected ? "connected" : "disconnected"); /* Did we just become connected? */ @@ -415,7 +415,7 @@ void sam_usbhost_vbusdrive(int rhport, bool enable) { pio_pinset_t pinset = 0; - uvdbg("RHPort%d: enable=%d\n", rhport+1, enable); + uinfo("RHPort%d: enable=%d\n", rhport+1, enable); /* Pick the PIO configuration associated with the selected root hub port */ diff --git a/configs/sama5d3-xplained/src/sam_userleds.c b/configs/sama5d3-xplained/src/sam_userleds.c index df91027790..c8464c6ad0 100644 --- a/configs/sama5d3-xplained/src/sam_userleds.c +++ b/configs/sama5d3-xplained/src/sam_userleds.c @@ -73,10 +73,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/sama5d3x-ek/src/sam_at24.c b/configs/sama5d3x-ek/src/sam_at24.c index ea59b48b33..39a57464a5 100644 --- a/configs/sama5d3x-ek/src/sam_at24.c +++ b/configs/sama5d3x-ek/src/sam_at24.c @@ -102,7 +102,7 @@ int sam_at24_automount(int minor) { /* No.. Get the I2C bus driver */ - fvdbg("Initialize TWI%d\n", AT24_BUS); + finfo("Initialize TWI%d\n", AT24_BUS); i2c = sam_i2cbus_initialize(AT24_BUS); if (!i2c) { @@ -112,7 +112,7 @@ int sam_at24_automount(int minor) /* Now bind the I2C interface to the AT24 I2C EEPROM driver */ - fvdbg("Bind the AT24 EEPROM driver to TWI%d\n", AT24_BUS); + finfo("Bind the AT24 EEPROM driver to TWI%d\n", AT24_BUS); mtd = at24c_initialize(i2c); if (!mtd) { @@ -124,7 +124,7 @@ int sam_at24_automount(int minor) #if defined(CONFIG_SAMA5D3xEK_AT24_FTL) /* And finally, use the FTL layer to wrap the MTD driver as a block driver */ - fvdbg("Initialize the FTL layer to create /dev/mtdblock%d\n", AT24_MINOR); + finfo("Initialize the FTL layer to create /dev/mtdblock%d\n", AT24_MINOR); ret = ftl_initialize(AT24_MINOR, mtd); if (ret < 0) { @@ -135,7 +135,7 @@ int sam_at24_automount(int minor) #elif defined(CONFIG_SAMA5D3xEK_AT24_NXFFS) /* Initialize to provide NXFFS on the MTD interface */ - fvdbg("Initialize the NXFFS file system\n"); + finfo("Initialize the NXFFS file system\n"); ret = nxffs_initialize(mtd); if (ret < 0) { @@ -145,7 +145,7 @@ int sam_at24_automount(int minor) /* Mount the file system at /mnt/at24 */ - fvdbg("Mount the NXFFS file system at /dev/at24\n"); + finfo("Mount the NXFFS file system at /dev/at24\n"); ret = mount(NULL, "/mnt/at24", "nxffs", 0, NULL); if (ret < 0) { diff --git a/configs/sama5d3x-ek/src/sam_autoleds.c b/configs/sama5d3x-ek/src/sam_autoleds.c index 1c893146b7..6859ff0772 100644 --- a/configs/sama5d3x-ek/src/sam_autoleds.c +++ b/configs/sama5d3x-ek/src/sam_autoleds.c @@ -97,10 +97,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/sama5d3x-ek/src/sam_can.c b/configs/sama5d3x-ek/src/sam_can.c index d904d12d83..e6cc5093e3 100644 --- a/configs/sama5d3x-ek/src/sam_can.c +++ b/configs/sama5d3x-ek/src/sam_can.c @@ -74,14 +74,14 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg -# define canvdbg vdbg +# define caninfo info # define canlldbg lldbg -# define canllvdbg llvdbg +# define canllinfo llinfo #else # define candbg(x...) -# define canvdbg(x...) +# define caninfo(x...) # define canlldbg(x...) -# define canllvdbg(x...) +# define canllinfo(x...) #endif /************************************************************************************ diff --git a/configs/sama5d3x-ek/src/sam_ethernet.c b/configs/sama5d3x-ek/src/sam_ethernet.c index 324633eaaf..57e304d75d 100644 --- a/configs/sama5d3x-ek/src/sam_ethernet.c +++ b/configs/sama5d3x-ek/src/sam_ethernet.c @@ -276,7 +276,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable) DEBUGASSERT(intf); - nvdbg("%s: handler=%p\n", intf, handler); + ninfo("%s: handler=%p\n", intf, handler); #ifdef CONFIG_SAMA5_EMACA phydbg("EMAC: devname=%s\n", SAMA5_EMAC_DEVNAME); #endif diff --git a/configs/sama5d3x-ek/src/sam_hsmci.c b/configs/sama5d3x-ek/src/sam_hsmci.c index a999da2f9a..693563f5ca 100644 --- a/configs/sama5d3x-ek/src/sam_hsmci.c +++ b/configs/sama5d3x-ek/src/sam_hsmci.c @@ -154,7 +154,7 @@ bool sam_cardinserted_internal(struct sam_hsmci_state_s *state) /* Get the state of the PIO pin */ inserted = sam_pioread(state->pincfg); - fllvdbg("Slot %d inserted: %s\n", state->slotno, inserted ? "NO" : "YES"); + fllinfo("Slot %d inserted: %s\n", state->slotno, inserted ? "NO" : "YES"); return !inserted; } diff --git a/configs/sama5d3x-ek/src/sam_ov2640.c b/configs/sama5d3x-ek/src/sam_ov2640.c index ad55d0a4a6..f7015f2a3b 100644 --- a/configs/sama5d3x-ek/src/sam_ov2640.c +++ b/configs/sama5d3x-ek/src/sam_ov2640.c @@ -196,7 +196,7 @@ static inline int ov2640_camera_initialize(void) /* Configure and enable the PCK1 output */ actual = sam_pck_configure(PCK1, PCKSRC_MCK, OV2640_FREQUENCY); - gvdbg("Desired PCK1 frequency: %ld Actual: %ld\n", + ginfo("Desired PCK1 frequency: %ld Actual: %ld\n", (long)OV2640_FREQUENCY, (long)actual); UNUSED(actual); diff --git a/configs/sama5d3x-ek/src/sam_spi.c b/configs/sama5d3x-ek/src/sam_spi.c index 9a0ba344a8..2ffa429913 100644 --- a/configs/sama5d3x-ek/src/sam_spi.c +++ b/configs/sama5d3x-ek/src/sam_spi.c @@ -67,14 +67,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/sama5d3x-ek/src/sam_usb.c b/configs/sama5d3x-ek/src/sam_usb.c index b9883e8561..a3a774f036 100644 --- a/configs/sama5d3x-ek/src/sam_usb.c +++ b/configs/sama5d3x-ek/src/sam_usb.c @@ -115,13 +115,13 @@ static int usbhost_waiter(struct usbhost_connection_s *dev) { struct usbhost_hubport_s *hport; - uvdbg("Running\n"); + uinfo("Running\n"); for (;;) { /* Wait for the device to change state */ DEBUGVERIFY(CONN_WAIT(dev, &hport)); - uvdbg("%s\n", hport->connected ? "connected" : "disconnected"); + uinfo("%s\n", hport->connected ? "connected" : "disconnected"); /* Did we just become connected? */ @@ -413,7 +413,7 @@ void sam_usbhost_vbusdrive(int rhport, bool enable) { pio_pinset_t pinset = 0; - uvdbg("RHPort%d: enable=%d\n", rhport+1, enable); + uinfo("RHPort%d: enable=%d\n", rhport+1, enable); /* Pick the PIO configuration associated with the selected root hub port */ diff --git a/configs/sama5d3x-ek/src/sam_userleds.c b/configs/sama5d3x-ek/src/sam_userleds.c index 4a4438da07..d98ef8955a 100644 --- a/configs/sama5d3x-ek/src/sam_userleds.c +++ b/configs/sama5d3x-ek/src/sam_userleds.c @@ -73,10 +73,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/sama5d3x-ek/src/sam_wm8904.c b/configs/sama5d3x-ek/src/sam_wm8904.c index 5639a5a402..70707a3aee 100644 --- a/configs/sama5d3x-ek/src/sam_wm8904.c +++ b/configs/sama5d3x-ek/src/sam_wm8904.c @@ -157,13 +157,13 @@ static int wm8904_attach(FAR const struct wm8904_lower_s *lower, * new handler will called via wm8904_interrupt() when the interrupt occurs. */ - audvdbg("Attaching %p\n", isr); + audinfo("Attaching %p\n", isr); g_wm8904info.handler = isr; g_wm8904info.arg = arg; } else { - audvdbg("Detaching %p\n", g_wm8904info.handler); + audinfo("Detaching %p\n", g_wm8904info.handler); (void)wm8904_enable(lower, false); g_wm8904info.handler = NULL; g_wm8904info.arg = NULL; @@ -187,13 +187,13 @@ static bool wm8904_enable(FAR const struct wm8904_lower_s *lower, bool enable) if (enable && g_wm8904info.handler) { - audvdbg("Enabling\n"); + audinfo("Enabling\n"); sam_pioirqenable(IRQ_INT_WM8904); enabled = true; } else { - audvdbg("Disabling\n"); + audinfo("Disabling\n"); sam_pioirqdisable(IRQ_INT_WM8904); enabled = false; } @@ -208,7 +208,7 @@ static int wm8904_interrupt(int irq, FAR void *context) { /* Just forward the interrupt to the WM8904 driver */ - audvdbg("handler %p\n", g_wm8904info.handler); + audinfo("handler %p\n", g_wm8904info.handler); if (g_wm8904info.handler) { return g_wm8904info.handler(&g_wm8904info.lower, g_wm8904info.arg); diff --git a/configs/sama5d4-ek/src/sam_autoleds.c b/configs/sama5d4-ek/src/sam_autoleds.c index 9f7e836ee1..773800694d 100644 --- a/configs/sama5d4-ek/src/sam_autoleds.c +++ b/configs/sama5d4-ek/src/sam_autoleds.c @@ -102,10 +102,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/sama5d4-ek/src/sam_automount.c b/configs/sama5d4-ek/src/sam_automount.c index e4890687cb..89b8b20fcc 100644 --- a/configs/sama5d4-ek/src/sam_automount.c +++ b/configs/sama5d4-ek/src/sam_automount.c @@ -285,7 +285,7 @@ void sam_automount_initialize(void) { FAR void *handle; - fvdbg("Initializing automounter(s)\n"); + finfo("Initializing automounter(s)\n"); #ifdef CONFIG_SAMA5D4EK_HSMCI0_AUTOMOUNT /* Initialize the HSMCI0 auto-mounter */ diff --git a/configs/sama5d4-ek/src/sam_ethernet.c b/configs/sama5d4-ek/src/sam_ethernet.c index 8b90c71248..87b2a91dc8 100644 --- a/configs/sama5d4-ek/src/sam_ethernet.c +++ b/configs/sama5d4-ek/src/sam_ethernet.c @@ -245,7 +245,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable) DEBUGASSERT(intf); - nvdbg("%s: handler=%p\n", intf, handler); + ninfo("%s: handler=%p\n", intf, handler); #ifdef CONFIG_SAMA5_EMAC0 phydbg("EMAC0: devname=%s\n", SAMA5_EMAC0_DEVNAME); #endif diff --git a/configs/sama5d4-ek/src/sam_hsmci.c b/configs/sama5d4-ek/src/sam_hsmci.c index fe74bcf528..c3fbf9671c 100644 --- a/configs/sama5d4-ek/src/sam_hsmci.c +++ b/configs/sama5d4-ek/src/sam_hsmci.c @@ -167,7 +167,7 @@ bool sam_cardinserted_internal(struct sam_hsmci_state_s *state) /* Get the state of the PIO pin */ inserted = sam_pioread(state->cdcfg); - fllvdbg("Slot %d inserted: %s\n", state->slotno, inserted ? "NO" : "YES"); + fllinfo("Slot %d inserted: %s\n", state->slotno, inserted ? "NO" : "YES"); return !inserted; } diff --git a/configs/sama5d4-ek/src/sam_maxtouch.c b/configs/sama5d4-ek/src/sam_maxtouch.c index 391e7b0b80..c725f1f17b 100644 --- a/configs/sama5d4-ek/src/sam_maxtouch.c +++ b/configs/sama5d4-ek/src/sam_maxtouch.c @@ -163,13 +163,13 @@ static int mxt_attach(FAR const struct mxt_lower_s *lower, mxt_handler_t isr, * new handler will called via mxt_interrupt() when the interrupt occurs. */ - ivdbg("Attaching %p\n", isr); + iinfo("Attaching %p\n", isr); g_mxtinfo.handler = isr; g_mxtinfo.arg = arg; } else { - ivdbg("Detaching %p\n", g_mxtinfo.handler); + iinfo("Detaching %p\n", g_mxtinfo.handler); mxt_enable(lower, false); g_mxtinfo.handler = NULL; g_mxtinfo.arg = NULL; diff --git a/configs/sama5d4-ek/src/sam_spi.c b/configs/sama5d4-ek/src/sam_spi.c index a56c477507..c0efcfa1ce 100644 --- a/configs/sama5d4-ek/src/sam_spi.c +++ b/configs/sama5d4-ek/src/sam_spi.c @@ -67,14 +67,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/sama5d4-ek/src/sam_usb.c b/configs/sama5d4-ek/src/sam_usb.c index c043e057a9..c0cf5af788 100644 --- a/configs/sama5d4-ek/src/sam_usb.c +++ b/configs/sama5d4-ek/src/sam_usb.c @@ -115,13 +115,13 @@ static int usbhost_waiter(struct usbhost_connection_s *dev) { struct usbhost_hubport_s *hport; - uvdbg("Running\n"); + uinfo("Running\n"); for (;;) { /* Wait for the device to change state */ DEBUGVERIFY(CONN_WAIT(dev, &hport)); - uvdbg("%s\n", hport->connected ? "connected" : "disconnected"); + uinfo("%s\n", hport->connected ? "connected" : "disconnected"); /* Did we just become connected? */ @@ -414,7 +414,7 @@ void sam_usbhost_vbusdrive(int rhport, bool enable) { pio_pinset_t pinset = 0; - uvdbg("RHPort%d: enable=%d\n", rhport+1, enable); + uinfo("RHPort%d: enable=%d\n", rhport+1, enable); /* Pick the PIO configuration associated with the selected root hub port */ diff --git a/configs/sama5d4-ek/src/sam_userleds.c b/configs/sama5d4-ek/src/sam_userleds.c index 5cf7b0d9d6..04bcc1a260 100644 --- a/configs/sama5d4-ek/src/sam_userleds.c +++ b/configs/sama5d4-ek/src/sam_userleds.c @@ -77,10 +77,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/sama5d4-ek/src/sam_wm8904.c b/configs/sama5d4-ek/src/sam_wm8904.c index de0a2194d5..951adc9c86 100644 --- a/configs/sama5d4-ek/src/sam_wm8904.c +++ b/configs/sama5d4-ek/src/sam_wm8904.c @@ -157,13 +157,13 @@ static int wm8904_attach(FAR const struct wm8904_lower_s *lower, * new handler will called via wm8904_interrupt() when the interrupt occurs. */ - audvdbg("Attaching %p\n", isr); + audinfo("Attaching %p\n", isr); g_wm8904info.handler = isr; g_wm8904info.arg = arg; } else { - audvdbg("Detaching %p\n", g_wm8904info.handler); + audinfo("Detaching %p\n", g_wm8904info.handler); (void)wm8904_enable(lower, false); g_wm8904info.handler = NULL; g_wm8904info.arg = NULL; @@ -187,13 +187,13 @@ static bool wm8904_enable(FAR const struct wm8904_lower_s *lower, bool enable) if (enable && g_wm8904info.handler) { - audvdbg("Enabling\n"); + audinfo("Enabling\n"); sam_pioirqenable(IRQ_INT_WM8904); enabled = true; } else { - audvdbg("Disabling\n"); + audinfo("Disabling\n"); sam_pioirqdisable(IRQ_INT_WM8904); enabled = false; } @@ -208,7 +208,7 @@ static int wm8904_interrupt(int irq, FAR void *context) { /* Just forward the interrupt to the WM8904 driver */ - audvdbg("handler %p\n", g_wm8904info.handler); + audinfo("handler %p\n", g_wm8904info.handler); if (g_wm8904info.handler) { return g_wm8904info.handler(&g_wm8904info.lower, g_wm8904info.arg); diff --git a/configs/samd20-xplained/src/sam_autoleds.c b/configs/samd20-xplained/src/sam_autoleds.c index b9e3b9f7a1..ff0b699ba2 100644 --- a/configs/samd20-xplained/src/sam_autoleds.c +++ b/configs/samd20-xplained/src/sam_autoleds.c @@ -87,10 +87,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/samd20-xplained/src/sam_mmcsd.c b/configs/samd20-xplained/src/sam_mmcsd.c index b183eda742..ef37c260b8 100644 --- a/configs/samd20-xplained/src/sam_mmcsd.c +++ b/configs/samd20-xplained/src/sam_mmcsd.c @@ -95,7 +95,7 @@ int sam_sdinitialize(int port, int minor) /* Get the SPI driver instance for the SD chip select */ - fvdbg("Initializing SERCOM SPI%d\n", port); + finfo("Initializing SERCOM SPI%d\n", port); spi = sam_spibus_initialize(port); if (!spi) @@ -104,11 +104,11 @@ int sam_sdinitialize(int port, int minor) return -ENODEV; } - fvdbg("Successfully initialized SPI%d\n", port); + finfo("Successfully initialized SPI%d\n", port); /* Bind the SPI device for the chip select to the slot */ - fvdbg("Binding SPI%d to MMC/SD slot %d\n", port, SAMDL_MMCSDSLOTNO); + finfo("Binding SPI%d to MMC/SD slot %d\n", port, SAMDL_MMCSDSLOTNO); ret = mmcsd_spislotinitialize(minor, SAMDL_MMCSDSLOTNO, spi); if (ret < 0) @@ -118,7 +118,7 @@ int sam_sdinitialize(int port, int minor) return ret; } - fvdbg("Successfuly bound SPI%d to MMC/SD slot %d\n", + finfo("Successfuly bound SPI%d to MMC/SD slot %d\n", port, SAMDL_MMCSDSLOTNO); return OK; diff --git a/configs/samd20-xplained/src/sam_spi.c b/configs/samd20-xplained/src/sam_spi.c index 21a9f681fa..d6fb6d6329 100644 --- a/configs/samd20-xplained/src/sam_spi.c +++ b/configs/samd20-xplained/src/sam_spi.c @@ -65,14 +65,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /**************************************************************************** diff --git a/configs/samd20-xplained/src/sam_ug2832hsweg04.c b/configs/samd20-xplained/src/sam_ug2832hsweg04.c index ee1f37d0f6..900c6aefbd 100644 --- a/configs/samd20-xplained/src/sam_ug2832hsweg04.c +++ b/configs/samd20-xplained/src/sam_ug2832hsweg04.c @@ -148,10 +148,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg(format, ...) dbg(format, ##__VA_ARGS__) -# define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define lcdinfo(format, ...) info(format, ##__VA_ARGS__) #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /**************************************************************************** @@ -200,7 +200,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) } else { - lcdvdbg("Bound SPI port 1 to OLED %d\n", devno); + lcdinfo("Bound SPI port 1 to OLED %d\n", devno); /* And turn the OLED on */ diff --git a/configs/samd20-xplained/src/sam_userleds.c b/configs/samd20-xplained/src/sam_userleds.c index 04f9352b41..fe9157aea7 100644 --- a/configs/samd20-xplained/src/sam_userleds.c +++ b/configs/samd20-xplained/src/sam_userleds.c @@ -72,10 +72,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/samd21-xplained/src/sam_autoleds.c b/configs/samd21-xplained/src/sam_autoleds.c index aa6d62a635..b1ce7f5236 100644 --- a/configs/samd21-xplained/src/sam_autoleds.c +++ b/configs/samd21-xplained/src/sam_autoleds.c @@ -87,10 +87,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/samd21-xplained/src/sam_mmcsd.c b/configs/samd21-xplained/src/sam_mmcsd.c index f763f44c0a..e6e3922b5e 100644 --- a/configs/samd21-xplained/src/sam_mmcsd.c +++ b/configs/samd21-xplained/src/sam_mmcsd.c @@ -95,7 +95,7 @@ int sam_sdinitialize(int port, int minor) /* Get the SPI driver instance for the SD chip select */ - fvdbg("Initializing SERCOM SPI%d\n", port); + finfo("Initializing SERCOM SPI%d\n", port); spi = sam_spibus_initialize(port); if (!spi) @@ -104,11 +104,11 @@ int sam_sdinitialize(int port, int minor) return -ENODEV; } - fvdbg("Successfully initialized SPI%d\n", port); + finfo("Successfully initialized SPI%d\n", port); /* Bind the SPI device for the chip select to the slot */ - fvdbg("Binding SPI%d to MMC/SD slot %d\n", port, SAMDL_MMCSDSLOTNO); + finfo("Binding SPI%d to MMC/SD slot %d\n", port, SAMDL_MMCSDSLOTNO); ret = mmcsd_spislotinitialize(minor, SAMDL_MMCSDSLOTNO, spi); if (ret < 0) @@ -118,7 +118,7 @@ int sam_sdinitialize(int port, int minor) return ret; } - fvdbg("Successfuly bound SPI%d to MMC/SD slot %d\n", + finfo("Successfuly bound SPI%d to MMC/SD slot %d\n", port, SAMDL_MMCSDSLOTNO); return OK; diff --git a/configs/samd21-xplained/src/sam_spi.c b/configs/samd21-xplained/src/sam_spi.c index 6352367dcc..d4ad01a64f 100644 --- a/configs/samd21-xplained/src/sam_spi.c +++ b/configs/samd21-xplained/src/sam_spi.c @@ -65,14 +65,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /**************************************************************************** diff --git a/configs/samd21-xplained/src/sam_ug2832hsweg04.c b/configs/samd21-xplained/src/sam_ug2832hsweg04.c index b5cfcf26e7..481c7ec50d 100644 --- a/configs/samd21-xplained/src/sam_ug2832hsweg04.c +++ b/configs/samd21-xplained/src/sam_ug2832hsweg04.c @@ -148,10 +148,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg(format, ...) dbg(format, ##__VA_ARGS__) -# define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define lcdinfo(format, ...) info(format, ##__VA_ARGS__) #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /**************************************************************************** @@ -200,7 +200,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) } else { - lcdvdbg("Bound SPI port 1 to OLED %d\n", devno); + lcdinfo("Bound SPI port 1 to OLED %d\n", devno); /* And turn the OLED on */ diff --git a/configs/samd21-xplained/src/sam_userleds.c b/configs/samd21-xplained/src/sam_userleds.c index 8edefcc077..78aa6e6d0b 100644 --- a/configs/samd21-xplained/src/sam_userleds.c +++ b/configs/samd21-xplained/src/sam_userleds.c @@ -72,10 +72,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/same70-xplained/src/sam_autoleds.c b/configs/same70-xplained/src/sam_autoleds.c index 5c726c2b12..005c93bb3d 100644 --- a/configs/same70-xplained/src/sam_autoleds.c +++ b/configs/same70-xplained/src/sam_autoleds.c @@ -87,10 +87,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/same70-xplained/src/sam_ethernet.c b/configs/same70-xplained/src/sam_ethernet.c index de5b5b6c6e..12c5846344 100644 --- a/configs/same70-xplained/src/sam_ethernet.c +++ b/configs/same70-xplained/src/sam_ethernet.c @@ -217,7 +217,7 @@ int sam_emac0_setmac(void) ndbg("ERROR: Failed to release the I2C interface: %d\n", ret); } - nvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + ninfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); /* Now configure the EMAC driver to use this MAC address */ @@ -309,7 +309,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable) DEBUGASSERT(intf); - nvdbg("%s: handler=%p\n", intf, handler); + ninfo("%s: handler=%p\n", intf, handler); phydbg("EMAC0: devname=%s\n", SAMV7_EMAC0_DEVNAME); if (strcmp(intf, SAMV7_EMAC0_DEVNAME) == 0) diff --git a/configs/same70-xplained/src/sam_hsmci.c b/configs/same70-xplained/src/sam_hsmci.c index 6c134309de..7d02dd8cc1 100644 --- a/configs/same70-xplained/src/sam_hsmci.c +++ b/configs/same70-xplained/src/sam_hsmci.c @@ -129,7 +129,7 @@ bool sam_cardinserted_internal(struct sam_hsmci_state_s *state) /* Get the state of the PIO pin */ inserted = sam_gpioread(state->cdcfg); - fllvdbg("Slot %d inserted: %s\n", state->slotno, inserted ? "NO" : "YES"); + fllinfo("Slot %d inserted: %s\n", state->slotno, inserted ? "NO" : "YES"); return !inserted; } diff --git a/configs/same70-xplained/src/sam_mcan.c b/configs/same70-xplained/src/sam_mcan.c index d0430ed1ce..1b0d2ef011 100644 --- a/configs/same70-xplained/src/sam_mcan.c +++ b/configs/same70-xplained/src/sam_mcan.c @@ -72,14 +72,14 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg -# define canvdbg vdbg +# define caninfo info # define canlldbg lldbg -# define canllvdbg llvdbg +# define canllinfo llinfo #else # define candbg(x...) -# define canvdbg(x...) +# define caninfo(x...) # define canlldbg(x...) -# define canllvdbg(x...) +# define canllinfo(x...) #endif /************************************************************************************ diff --git a/configs/same70-xplained/src/sam_spi.c b/configs/same70-xplained/src/sam_spi.c index df0ba7b489..7357f3a6fd 100644 --- a/configs/same70-xplained/src/sam_spi.c +++ b/configs/same70-xplained/src/sam_spi.c @@ -67,14 +67,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/saml21-xplained/src/sam_autoleds.c b/configs/saml21-xplained/src/sam_autoleds.c index 5d8fe4eed7..80b43043a4 100644 --- a/configs/saml21-xplained/src/sam_autoleds.c +++ b/configs/saml21-xplained/src/sam_autoleds.c @@ -87,10 +87,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/saml21-xplained/src/sam_mmcsd.c b/configs/saml21-xplained/src/sam_mmcsd.c index a8ca098282..c86b61e440 100644 --- a/configs/saml21-xplained/src/sam_mmcsd.c +++ b/configs/saml21-xplained/src/sam_mmcsd.c @@ -95,7 +95,7 @@ int sam_sdinitialize(int port, int minor) /* Get the SPI driver instance for the SD chip select */ - fvdbg("Initializing SERCOM SPI%d\n", port); + finfo("Initializing SERCOM SPI%d\n", port); spi = sam_spibus_initialize(port); if (!spi) @@ -104,11 +104,11 @@ int sam_sdinitialize(int port, int minor) return -ENODEV; } - fvdbg("Successfully initialized SPI%d\n", port); + finfo("Successfully initialized SPI%d\n", port); /* Bind the SPI device for the chip select to the slot */ - fvdbg("Binding SPI%d to MMC/SD slot %d\n", port, SAMDL_MMCSDSLOTNO); + finfo("Binding SPI%d to MMC/SD slot %d\n", port, SAMDL_MMCSDSLOTNO); ret = mmcsd_spislotinitialize(minor, SAMDL_MMCSDSLOTNO, spi); if (ret < 0) @@ -118,7 +118,7 @@ int sam_sdinitialize(int port, int minor) return ret; } - fvdbg("Successfuly bound SPI%d to MMC/SD slot %d\n", + finfo("Successfuly bound SPI%d to MMC/SD slot %d\n", port, SAMDL_MMCSDSLOTNO); return OK; diff --git a/configs/saml21-xplained/src/sam_spi.c b/configs/saml21-xplained/src/sam_spi.c index 00eea22563..2fd0c0923d 100644 --- a/configs/saml21-xplained/src/sam_spi.c +++ b/configs/saml21-xplained/src/sam_spi.c @@ -65,14 +65,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /**************************************************************************** diff --git a/configs/saml21-xplained/src/sam_ug2832hsweg04.c b/configs/saml21-xplained/src/sam_ug2832hsweg04.c index 3e67622d16..9ab22a7984 100644 --- a/configs/saml21-xplained/src/sam_ug2832hsweg04.c +++ b/configs/saml21-xplained/src/sam_ug2832hsweg04.c @@ -148,10 +148,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg(format, ...) dbg(format, ##__VA_ARGS__) -# define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define lcdinfo(format, ...) info(format, ##__VA_ARGS__) #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /**************************************************************************** @@ -200,7 +200,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) } else { - lcdvdbg("Bound SPI port 1 to OLED %d\n", devno); + lcdinfo("Bound SPI port 1 to OLED %d\n", devno); /* And turn the OLED on */ diff --git a/configs/saml21-xplained/src/sam_userleds.c b/configs/saml21-xplained/src/sam_userleds.c index 81e118456a..35b4fdc099 100644 --- a/configs/saml21-xplained/src/sam_userleds.c +++ b/configs/saml21-xplained/src/sam_userleds.c @@ -72,10 +72,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/samv71-xult/src/sam_autoleds.c b/configs/samv71-xult/src/sam_autoleds.c index 58cc34f1ed..3381fe8cc6 100644 --- a/configs/samv71-xult/src/sam_autoleds.c +++ b/configs/samv71-xult/src/sam_autoleds.c @@ -103,10 +103,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/samv71-xult/src/sam_ethernet.c b/configs/samv71-xult/src/sam_ethernet.c index e0ff9354f4..86639b2894 100644 --- a/configs/samv71-xult/src/sam_ethernet.c +++ b/configs/samv71-xult/src/sam_ethernet.c @@ -221,7 +221,7 @@ int sam_emac0_setmac(void) ndbg("ERROR: Failed to release the I2C interface: %d\n", ret); } - nvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + ninfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); /* Now configure the EMAC driver to use this MAC address */ @@ -313,7 +313,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable) DEBUGASSERT(intf); - nvdbg("%s: handler=%p\n", intf, handler); + ninfo("%s: handler=%p\n", intf, handler); phydbg("EMAC0: devname=%s\n", SAMV7_EMAC0_DEVNAME); if (strcmp(intf, SAMV7_EMAC0_DEVNAME) == 0) diff --git a/configs/samv71-xult/src/sam_hsmci.c b/configs/samv71-xult/src/sam_hsmci.c index f4e26ff016..7389e166c6 100644 --- a/configs/samv71-xult/src/sam_hsmci.c +++ b/configs/samv71-xult/src/sam_hsmci.c @@ -129,7 +129,7 @@ bool sam_cardinserted_internal(struct sam_hsmci_state_s *state) /* Get the state of the PIO pin */ inserted = sam_gpioread(state->cdcfg); - fllvdbg("Slot %d inserted: %s\n", state->slotno, inserted ? "NO" : "YES"); + fllinfo("Slot %d inserted: %s\n", state->slotno, inserted ? "NO" : "YES"); return !inserted; } diff --git a/configs/samv71-xult/src/sam_ili9488.c b/configs/samv71-xult/src/sam_ili9488.c index cf36e89294..14e12ca690 100644 --- a/configs/samv71-xult/src/sam_ili9488.c +++ b/configs/samv71-xult/src/sam_ili9488.c @@ -302,10 +302,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg dbg -# define lcdvdbg vdbg +# define lcdinfo info #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif #ifdef CONFIG_DEBUG_DMA @@ -674,7 +674,7 @@ static int sam_setwindow(FAR struct sam_dev_s *priv, sam_color_t row, uint16_t buffer[4]; int ret; - lcdvdbg("row=%d col=%d width=%d height=%d\n", row, col, width, height); + lcdinfo("row=%d col=%d width=%d height=%d\n", row, col, width, height); /* Set Column Address Position */ @@ -770,7 +770,7 @@ static void sam_disable_backlight(void) static int sam_set_backlight(unsigned int power) { - lcdvdbg("power=%d\n", power); + lcdinfo("power=%d\n", power); /* PWM support is not yet available. Backlight is currently just * configured as a GPIO output. @@ -803,7 +803,7 @@ static int sam_poweroff(FAR struct sam_dev_s *priv) { int ret; - lcdvdbg("OFF\n"); + lcdinfo("OFF\n"); /* Turn the display off */ @@ -1152,7 +1152,7 @@ static int sam_putrun(fb_coord_t row, fb_coord_t col, /* Buffer must be provided and aligned to a 16-bit address boundary */ - lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0); /* Determine the refresh window area */ @@ -1193,7 +1193,7 @@ static int sam_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, /* Buffer must be provided and aligned to a 16-bit address boundary */ - lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0); /* Determine the refresh window area */ @@ -1223,7 +1223,7 @@ static int sam_getvideoinfo(FAR struct lcd_dev_s *dev, FAR struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); - lcdvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n", + lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n", g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes); @@ -1243,7 +1243,7 @@ static int sam_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, FAR struct lcd_planeinfo_s *pinfo) { DEBUGASSERT(dev && pinfo && planeno == 0); - lcdvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); + lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s)); return OK; } @@ -1262,7 +1262,7 @@ static int sam_getpower(struct lcd_dev_s *dev) { FAR struct sam_dev_s *priv = (FAR struct sam_dev_s *)dev; - lcdvdbg("power: %d\n", 0); + lcdinfo("power: %d\n", 0); return priv->power; } @@ -1281,7 +1281,7 @@ static int sam_setpower(struct lcd_dev_s *dev, int power) FAR struct sam_dev_s *priv = (FAR struct sam_dev_s *)dev; int ret; - lcdvdbg("power: %d\n", power); + lcdinfo("power: %d\n", power); DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER); /* Set new power level */ @@ -1340,7 +1340,7 @@ static int sam_setpower(struct lcd_dev_s *dev, int power) static int sam_getcontrast(struct lcd_dev_s *dev) { - lcdvdbg("Not implemented\n"); + lcdinfo("Not implemented\n"); return -ENOSYS; } @@ -1354,7 +1354,7 @@ static int sam_getcontrast(struct lcd_dev_s *dev) static int sam_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) { - lcdvdbg("contrast: %d\n", contrast); + lcdinfo("contrast: %d\n", contrast); return -ENOSYS; } @@ -1480,7 +1480,7 @@ static inline int sam_lcd_initialize(void) } id = ((uint16_t)buffer[2] << 8) | ((uint16_t)buffer[3] & 0xff); - lcdvdbg("ID: %04x\n", id); + lcdinfo("ID: %04x\n", id); if (id != ILI9488_DEVICE_CODE) { @@ -1556,7 +1556,7 @@ int board_lcd_initialize(void) FAR struct sam_dev_s *priv = &g_lcddev; int ret; - lcdvdbg("Initializing\n"); + lcdinfo("Initializing\n"); /* Configure all LCD pins pins (backlight is initially off) */ diff --git a/configs/samv71-xult/src/sam_maxtouch.c b/configs/samv71-xult/src/sam_maxtouch.c index e9512e98d3..d085ee6a33 100644 --- a/configs/samv71-xult/src/sam_maxtouch.c +++ b/configs/samv71-xult/src/sam_maxtouch.c @@ -162,13 +162,13 @@ static int mxt_attach(FAR const struct mxt_lower_s *lower, mxt_handler_t isr, * new handler will called via mxt_interrupt() when the interrupt occurs. */ - ivdbg("Attaching %p\n", isr); + iinfo("Attaching %p\n", isr); g_mxtinfo.handler = isr; g_mxtinfo.arg = arg; } else { - ivdbg("Detaching %p\n", g_mxtinfo.handler); + iinfo("Detaching %p\n", g_mxtinfo.handler); mxt_enable(lower, false); g_mxtinfo.handler = NULL; g_mxtinfo.arg = NULL; diff --git a/configs/samv71-xult/src/sam_mcan.c b/configs/samv71-xult/src/sam_mcan.c index dd4e8e7c3a..3a46d55d9f 100644 --- a/configs/samv71-xult/src/sam_mcan.c +++ b/configs/samv71-xult/src/sam_mcan.c @@ -72,14 +72,14 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg -# define canvdbg vdbg +# define caninfo info # define canlldbg lldbg -# define canllvdbg llvdbg +# define canllinfo llinfo #else # define candbg(x...) -# define canvdbg(x...) +# define caninfo(x...) # define canlldbg(x...) -# define canllvdbg(x...) +# define canllinfo(x...) #endif /************************************************************************************ diff --git a/configs/samv71-xult/src/sam_spi.c b/configs/samv71-xult/src/sam_spi.c index 03dd5ead1e..0edc2f45a2 100644 --- a/configs/samv71-xult/src/sam_spi.c +++ b/configs/samv71-xult/src/sam_spi.c @@ -67,14 +67,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/samv71-xult/src/sam_wm8904.c b/configs/samv71-xult/src/sam_wm8904.c index dff1f69519..f7b3dfc847 100644 --- a/configs/samv71-xult/src/sam_wm8904.c +++ b/configs/samv71-xult/src/sam_wm8904.c @@ -157,13 +157,13 @@ static int wm8904_attach(FAR const struct wm8904_lower_s *lower, * new handler will called via wm8904_interrupt() when the interrupt occurs. */ - audvdbg("Attaching %p\n", isr); + audinfo("Attaching %p\n", isr); g_wm8904info.handler = isr; g_wm8904info.arg = arg; } else { - audvdbg("Detaching %p\n", g_wm8904info.handler); + audinfo("Detaching %p\n", g_wm8904info.handler); (void)wm8904_enable(lower, false); g_wm8904info.handler = NULL; g_wm8904info.arg = NULL; @@ -187,13 +187,13 @@ static bool wm8904_enable(FAR const struct wm8904_lower_s *lower, bool enable) if (enable && g_wm8904info.handler) { - audvdbg("Enabling\n"); + audinfo("Enabling\n"); sam_gpioirqenable(IRQ_INT_WM8904); enabled = true; } else { - audvdbg("Disabling\n"); + audinfo("Disabling\n"); sam_gpioirqdisable(IRQ_INT_WM8904); enabled = false; } @@ -208,7 +208,7 @@ static int wm8904_interrupt(int irq, FAR void *context) { /* Just forward the interrupt to the WM8904 driver */ - audvdbg("handler %p\n", g_wm8904info.handler); + audinfo("handler %p\n", g_wm8904info.handler); if (g_wm8904info.handler) { return g_wm8904info.handler(&g_wm8904info.lower, g_wm8904info.arg); diff --git a/configs/shenzhou/src/stm32_autoleds.c b/configs/shenzhou/src/stm32_autoleds.c index ff2496cc2c..4d521f68e2 100644 --- a/configs/shenzhou/src/stm32_autoleds.c +++ b/configs/shenzhou/src/stm32_autoleds.c @@ -63,10 +63,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* The following definitions map the encoded LED setting to GPIO settings */ diff --git a/configs/shenzhou/src/stm32_can.c b/configs/shenzhou/src/stm32_can.c index fa05af42fa..b1e6120512 100644 --- a/configs/shenzhou/src/stm32_can.c +++ b/configs/shenzhou/src/stm32_can.c @@ -67,14 +67,14 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg -# define canvdbg vdbg +# define caninfo info # define canlldbg lldbg -# define canllvdbg llvdbg +# define canllinfo llinfo #else # define candbg(x...) -# define canvdbg(x...) +# define caninfo(x...) # define canlldbg(x...) -# define canllvdbg(x...) +# define canllinfo(x...) #endif /************************************************************************************ diff --git a/configs/shenzhou/src/stm32_ili93xx.c b/configs/shenzhou/src/stm32_ili93xx.c index f6f95c6d5d..e92b29042f 100644 --- a/configs/shenzhou/src/stm32_ili93xx.c +++ b/configs/shenzhou/src/stm32_ili93xx.c @@ -372,10 +372,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg dbg -# define lcdvdbg vdbg +# define lcdinfo info #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /************************************************************************************ @@ -870,7 +870,7 @@ static int stm32_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffe /* Buffer must be provided and aligned to a 16-bit address boundary */ - lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0); /* Write the run to GRAM */ @@ -979,7 +979,7 @@ static int stm32_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, /* Buffer must be provided and aligned to a 16-bit address boundary */ - lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0); /* Configure according to the LCD type. Kind of silly with only one LCD type */ @@ -1106,7 +1106,7 @@ static int stm32_getvideoinfo(FAR struct lcd_dev_s *dev, FAR struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); - lcdvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n", + lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n", g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes); memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s)); return OK; @@ -1124,7 +1124,7 @@ static int stm32_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, FAR struct lcd_planeinfo_s *pinfo) { DEBUGASSERT(dev && pinfo && planeno == 0); - lcdvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); + lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s)); return OK; } @@ -1142,7 +1142,7 @@ static int stm32_getpower(struct lcd_dev_s *dev) { FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev; - lcdvdbg("power: %d\n", 0); + lcdinfo("power: %d\n", 0); return priv->power; } @@ -1180,7 +1180,7 @@ static int stm32_setpower(struct lcd_dev_s *dev, int power) { FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev; - lcdvdbg("power: %d\n", power); + lcdinfo("power: %d\n", power); DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER); /* Set new power level */ @@ -1280,7 +1280,7 @@ static int stm32_setpower(struct lcd_dev_s *dev, int power) static int stm32_getcontrast(struct lcd_dev_s *dev) { - lcdvdbg("Not implemented\n"); + lcdinfo("Not implemented\n"); return -ENOSYS; } @@ -1294,7 +1294,7 @@ static int stm32_getcontrast(struct lcd_dev_s *dev) static int stm32_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) { - lcdvdbg("contrast: %d\n", contrast); + lcdinfo("contrast: %d\n", contrast); return -ENOSYS; } @@ -1880,7 +1880,7 @@ int board_lcd_initialize(void) int ret; int i; - lcdvdbg("Initializing\n"); + lcdinfo("Initializing\n"); /* Configure GPIO pins. The initial state of priv->output is false, so * we need to configure pins for output initially. diff --git a/configs/shenzhou/src/stm32_mmcsd.c b/configs/shenzhou/src/stm32_mmcsd.c index a585e31ad3..6307bf3391 100644 --- a/configs/shenzhou/src/stm32_mmcsd.c +++ b/configs/shenzhou/src/stm32_mmcsd.c @@ -95,7 +95,7 @@ int stm32_sdinitialize(int minor) /* Get the SPI port */ - fvdbg("Initializing SPI port %d\n", STM32_MMCSDSPIPORTNO); + finfo("Initializing SPI port %d\n", STM32_MMCSDSPIPORTNO); spi = stm32_spibus_initialize(STM32_MMCSDSPIPORTNO); if (!spi) @@ -104,11 +104,11 @@ int stm32_sdinitialize(int minor) return -ENODEV; } - fvdbg("Successfully initialized SPI port %d\n", STM32_MMCSDSPIPORTNO); + finfo("Successfully initialized SPI port %d\n", STM32_MMCSDSPIPORTNO); /* Bind the SPI port to the slot */ - fvdbg("Binding SPI port %d to MMC/SD slot %d\n", + finfo("Binding SPI port %d to MMC/SD slot %d\n", STM32_MMCSDSPIPORTNO, STM32_MMCSDSLOTNO); ret = mmcsd_spislotinitialize(minor, STM32_MMCSDSLOTNO, spi); @@ -119,7 +119,7 @@ int stm32_sdinitialize(int minor) return ret; } - fvdbg("Successfuly bound SPI port %d to MMC/SD slot %d\n", + finfo("Successfuly bound SPI port %d to MMC/SD slot %d\n", STM32_MMCSDSPIPORTNO, STM32_MMCSDSLOTNO); #endif return OK; diff --git a/configs/shenzhou/src/stm32_spi.c b/configs/shenzhou/src/stm32_spi.c index 5e2ba81dbb..6992fc3835 100644 --- a/configs/shenzhou/src/stm32_spi.c +++ b/configs/shenzhou/src/stm32_spi.c @@ -66,13 +66,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/shenzhou/src/stm32_ssd1289.c b/configs/shenzhou/src/stm32_ssd1289.c index 5501067f0c..221e0821ec 100644 --- a/configs/shenzhou/src/stm32_ssd1289.c +++ b/configs/shenzhou/src/stm32_ssd1289.c @@ -90,10 +90,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg dbg -# define lcdvdbg vdbg +# define lcdinfo info #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /************************************************************************************ @@ -548,7 +548,7 @@ int board_lcd_initialize(void) if (!priv->drvr) { - lcdvdbg("Initializing\n"); + lcdinfo("Initializing\n"); /* Configure GPIO pins */ diff --git a/configs/shenzhou/src/stm32_touchscreen.c b/configs/shenzhou/src/stm32_touchscreen.c index abfe6ebdd7..df3943812e 100644 --- a/configs/shenzhou/src/stm32_touchscreen.c +++ b/configs/shenzhou/src/stm32_touchscreen.c @@ -181,7 +181,7 @@ static void tsc_enable(FAR struct ads7843e_config_s *state, bool enable) /* Attach and enable, or detach and disable */ - ivdbg("enable:%d\n", enable); + iinfo("enable:%d\n", enable); if (enable) { (void)stm32_gpiosetevent(GPIO_TP_INT, true, true, false, @@ -220,7 +220,7 @@ static bool tsc_pendown(FAR struct ads7843e_config_s *state) */ bool pendown = !stm32_gpioread(GPIO_TP_INT); - ivdbg("pendown:%d\n", pendown); + iinfo("pendown:%d\n", pendown); return pendown; } diff --git a/configs/shenzhou/src/stm32_usb.c b/configs/shenzhou/src/stm32_usb.c index 80ed3c53dd..c63e80cda0 100644 --- a/configs/shenzhou/src/stm32_usb.c +++ b/configs/shenzhou/src/stm32_usb.c @@ -106,13 +106,13 @@ static int usbhost_waiter(int argc, char *argv[]) { struct usbhost_hubport_s *hport; - uvdbg("Running\n"); + uinfo("Running\n"); for (;;) { /* Wait for the device to change state */ DEBUGVERIFY(CONN_WAIT(g_usbconn, &hport)); - uvdbg("%s\n", hport->connected ? "connected" : "disconnected"); + uinfo("%s\n", hport->connected ? "connected" : "disconnected"); /* Did we just become connected? */ @@ -176,7 +176,7 @@ int stm32_usbhost_initialize(void) * that we care about: */ - uvdbg("Register class drivers\n"); + uinfo("Register class drivers\n"); #ifdef CONFIG_USBHOST_MSC /* Register the USB mass storage class class */ @@ -200,13 +200,13 @@ int stm32_usbhost_initialize(void) /* Then get an instance of the USB host interface */ - uvdbg("Initialize USB host\n"); + uinfo("Initialize USB host\n"); g_usbconn = stm32_otgfshost_initialize(0); if (g_usbconn) { /* Start a thread to handle device connection. */ - uvdbg("Start usbhost_waiter\n"); + uinfo("Start usbhost_waiter\n"); pid = task_create("usbhost", CONFIG_USBHOST_DEFPRIO, CONFIG_USBHOST_STACKSIZE, diff --git a/configs/shenzhou/src/stm32_userleds.c b/configs/shenzhou/src/stm32_userleds.c index 0f56906f61..3cf360d7fb 100644 --- a/configs/shenzhou/src/stm32_userleds.c +++ b/configs/shenzhou/src/stm32_userleds.c @@ -63,10 +63,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/sim/src/sim_touchscreen.c b/configs/sim/src/sim_touchscreen.c index c6afc35528..d52b4133d9 100644 --- a/configs/sim/src/sim_touchscreen.c +++ b/configs/sim/src/sim_touchscreen.c @@ -107,7 +107,7 @@ int board_tsc_setup(int minor) * X11 window to support the mouse-driven touchscreen simulation. */ - ivdbg("Initializing framebuffer\n"); + iinfo("Initializing framebuffer\n"); ret = up_fbinitialize(0); if (ret < 0) { @@ -125,7 +125,7 @@ int board_tsc_setup(int minor) /* Then open NX */ - ivdbg("Open NX\n"); + iinfo("Open NX\n"); g_simtc.hnx = nx_open(dev); if (!g_simtc.hnx) { @@ -147,7 +147,7 @@ int board_tsc_setup(int minor) /* Set the background to the configured background color */ - ivdbg("Set background color=%d\n", CONFIG_EXAMPLES_TOUCHSCREEN_BGCOLOR); + iinfo("Set background color=%d\n", CONFIG_EXAMPLES_TOUCHSCREEN_BGCOLOR); color = CONFIG_EXAMPLES_TOUCHSCREEN_BGCOLOR; ret = nx_setbgcolor(g_simtc.hnx, &color); diff --git a/configs/spark/src/stm32_autoleds.c b/configs/spark/src/stm32_autoleds.c index e2368c9f6c..8ccf2f3141 100644 --- a/configs/spark/src/stm32_autoleds.c +++ b/configs/spark/src/stm32_autoleds.c @@ -65,10 +65,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* The following definitions map the encoded LED setting to bit sets used to diff --git a/configs/spark/src/stm32_composite.c b/configs/spark/src/stm32_composite.c index 2720de1af4..8893c12c92 100644 --- a/configs/spark/src/stm32_composite.c +++ b/configs/spark/src/stm32_composite.c @@ -140,7 +140,7 @@ static int stm32_composite_initialize(void) /* Get the SPI port */ - fvdbg("Initializing SPI port %d\n", CONFIG_SPARK_FLASH_SPI); + finfo("Initializing SPI port %d\n", CONFIG_SPARK_FLASH_SPI); spi = stm32_spibus_initialize(CONFIG_SPARK_FLASH_SPI); if (!spi) @@ -150,11 +150,11 @@ static int stm32_composite_initialize(void) return -ENODEV; } - fvdbg("Successfully initialized SPI port %d\n", CONFIG_SPARK_FLASH_SPI); + finfo("Successfully initialized SPI port %d\n", CONFIG_SPARK_FLASH_SPI); /* Now bind the SPI interface to the SST25 SPI FLASH driver */ - fvdbg("Bind SPI to the SPI flash driver\n"); + finfo("Bind SPI to the SPI flash driver\n"); mtd = sst25_initialize(spi); if (!mtd) { @@ -163,7 +163,7 @@ static int stm32_composite_initialize(void) } else { - fvdbg("Successfully bound SPI port %d to the SPI FLASH driver\n", + finfo("Successfully bound SPI port %d to the SPI FLASH driver\n", CONFIG_SPARK_FLASH_SPI); } diff --git a/configs/spark/src/stm32_spi.c b/configs/spark/src/stm32_spi.c index 0dd71f1c16..bdbb5b229a 100644 --- a/configs/spark/src/stm32_spi.c +++ b/configs/spark/src/stm32_spi.c @@ -71,14 +71,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/spark/src/stm32_userleds.c b/configs/spark/src/stm32_userleds.c index 1d97b97416..995feb06f3 100644 --- a/configs/spark/src/stm32_userleds.c +++ b/configs/spark/src/stm32_userleds.c @@ -64,10 +64,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/spark/src/stm32_wireless.c b/configs/spark/src/stm32_wireless.c index 912670b916..3feb345e5a 100644 --- a/configs/spark/src/stm32_wireless.c +++ b/configs/spark/src/stm32_wireless.c @@ -197,7 +197,7 @@ static void wl_enable_irq(FAR struct cc3000_config_s *state, bool enable) /* Attach and enable, or detach and disable */ - ivdbg("enable:%d\n", enable); + iinfo("enable:%d\n", enable); if (enable) { (void)stm32_gpiosetevent(GPIO_WIFI_INT, false, true, false, priv->handler); @@ -210,7 +210,7 @@ static void wl_enable_irq(FAR struct cc3000_config_s *state, bool enable) static void wl_enable_power(FAR struct cc3000_config_s *state, bool enable) { - ivdbg("enable:%d\n", enable); + iinfo("enable:%d\n", enable); /* Active high enable */ @@ -219,7 +219,7 @@ static void wl_enable_power(FAR struct cc3000_config_s *state, bool enable) static void wl_select(FAR struct cc3000_config_s *state, bool enable) { - ivdbg("enable:%d\n", enable); + iinfo("enable:%d\n", enable); /* Active high enable */ diff --git a/configs/stm3210e-eval/src/stm32_can.c b/configs/stm3210e-eval/src/stm32_can.c index 2efb493ca1..c29c5b2a17 100644 --- a/configs/stm3210e-eval/src/stm32_can.c +++ b/configs/stm3210e-eval/src/stm32_can.c @@ -67,14 +67,14 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg -# define canvdbg vdbg +# define caninfo info # define canlldbg lldbg -# define canllvdbg llvdbg +# define canllinfo llinfo #else # define candbg(x...) -# define canvdbg(x...) +# define caninfo(x...) # define canlldbg(x...) -# define canllvdbg(x...) +# define canllinfo(x...) #endif /************************************************************************************ diff --git a/configs/stm3210e-eval/src/stm32_djoystick.c b/configs/stm3210e-eval/src/stm32_djoystick.c index a8d9001f7e..8e367c5e3a 100644 --- a/configs/stm3210e-eval/src/stm32_djoystick.c +++ b/configs/stm3210e-eval/src/stm32_djoystick.c @@ -120,7 +120,7 @@ static const struct djoy_lowerhalf_s g_djoylower = static djoy_buttonset_t djoy_supported(FAR const struct djoy_lowerhalf_s *lower) { - ivdbg("Supported: %02x\n", DJOY_SUPPORTED); + iinfo("Supported: %02x\n", DJOY_SUPPORTED); return (djoy_buttonset_t)DJOY_SUPPORTED; } @@ -148,7 +148,7 @@ static djoy_buttonset_t djoy_sample(FAR const struct djoy_lowerhalf_s *lower) } } - ivdbg("Retuning: %02x\n", DJOY_SUPPORTED); + iinfo("Retuning: %02x\n", DJOY_SUPPORTED); return ret; } @@ -177,7 +177,7 @@ static void djoy_enable(FAR const struct djoy_lowerhalf_s *lower, flags = enter_critical_section(); djoy_disable(); - illvdbg("press: %02x release: %02x handler: %p arg: %p\n", + illinfo("press: %02x release: %02x handler: %p arg: %p\n", press, release, handler, arg); /* If no events are indicated or if no handler is provided, then this @@ -209,7 +209,7 @@ static void djoy_enable(FAR const struct djoy_lowerhalf_s *lower, falling = ((press & bit) != 0); rising = ((release & bit) != 0); - illvdbg("GPIO %d: rising: %d falling: %d\n", + illinfo("GPIO %d: rising: %d falling: %d\n", i, rising, falling); (void)stm32_gpiosetevent(g_joygpio[i], rising, falling, diff --git a/configs/stm3210e-eval/src/stm32_idle.c b/configs/stm3210e-eval/src/stm32_idle.c index aba327a64c..c6352c221b 100644 --- a/configs/stm3210e-eval/src/stm32_idle.c +++ b/configs/stm3210e-eval/src/stm32_idle.c @@ -290,7 +290,7 @@ static void stm32_idlepm(void) if (newstate != oldstate) { - llvdbg("newstate= %d oldstate=%d\n", newstate, oldstate); + llinfo("newstate= %d oldstate=%d\n", newstate, oldstate); sched_lock(); diff --git a/configs/stm3210e-eval/src/stm32_lcd.c b/configs/stm3210e-eval/src/stm32_lcd.c index f86e722872..b6aab70639 100644 --- a/configs/stm3210e-eval/src/stm32_lcd.c +++ b/configs/stm3210e-eval/src/stm32_lcd.c @@ -312,7 +312,7 @@ /* Debug ******************************************************************************/ #ifdef CONFIG_DEBUG_LCD -# define lcddbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define lcddbg(format, ...) info(format, ##__VA_ARGS__) #else # define lcddbg(x...) #endif @@ -952,7 +952,7 @@ static int stm3210e_getvideoinfo(FAR struct lcd_dev_s *dev, FAR struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); - gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n", + ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n", g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes); memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s)); return OK; @@ -970,7 +970,7 @@ static int stm3210e_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno FAR struct lcd_planeinfo_s *pinfo) { DEBUGASSERT(dev && pinfo && planeno == 0); - gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); + ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s)); return OK; } @@ -986,7 +986,7 @@ static int stm3210e_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno static int stm3210e_getpower(struct lcd_dev_s *dev) { - gvdbg("power: %d\n", 0); + ginfo("power: %d\n", 0); return g_lcddev.power; } @@ -1038,7 +1038,7 @@ static int stm3210e_poweroff(void) static int stm3210e_setpower(struct lcd_dev_s *dev, int power) { - gvdbg("power: %d\n", power); + ginfo("power: %d\n", power); DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER); /* Set new power level */ @@ -1114,7 +1114,7 @@ static int stm3210e_setpower(struct lcd_dev_s *dev, int power) static int stm3210e_getcontrast(struct lcd_dev_s *dev) { - gvdbg("Not implemented\n"); + ginfo("Not implemented\n"); return -ENOSYS; } @@ -1128,7 +1128,7 @@ static int stm3210e_getcontrast(struct lcd_dev_s *dev) static int stm3210e_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) { - gvdbg("contrast: %d\n", contrast); + ginfo("contrast: %d\n", contrast); return -ENOSYS; } @@ -1786,7 +1786,7 @@ int board_lcd_initialize(void) int ret; #endif - gvdbg("Initializing\n"); + ginfo("Initializing\n"); /* Register to receive power management callbacks */ diff --git a/configs/stm3210e-eval/src/stm32_leds.c b/configs/stm3210e-eval/src/stm32_leds.c index 5d228edb1c..99d86cf97f 100644 --- a/configs/stm3210e-eval/src/stm32_leds.c +++ b/configs/stm3210e-eval/src/stm32_leds.c @@ -63,10 +63,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* The following definitions map the encoded LED setting to GPIO settings */ diff --git a/configs/stm3210e-eval/src/stm32_spi.c b/configs/stm3210e-eval/src/stm32_spi.c index b64df8d679..934137ee57 100644 --- a/configs/stm3210e-eval/src/stm32_spi.c +++ b/configs/stm3210e-eval/src/stm32_spi.c @@ -65,14 +65,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/stm3220g-eval/src/stm32_autoleds.c b/configs/stm3220g-eval/src/stm32_autoleds.c index b59ade2cd1..02d3ff18af 100644 --- a/configs/stm3220g-eval/src/stm32_autoleds.c +++ b/configs/stm3220g-eval/src/stm32_autoleds.c @@ -64,10 +64,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* The following definitions map the encoded LED setting to GPIO settings */ diff --git a/configs/stm3220g-eval/src/stm32_can.c b/configs/stm3220g-eval/src/stm32_can.c index 1c9b4fda77..192ccfa228 100644 --- a/configs/stm3220g-eval/src/stm32_can.c +++ b/configs/stm3220g-eval/src/stm32_can.c @@ -75,14 +75,14 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg -# define canvdbg vdbg +# define caninfo info # define canlldbg lldbg -# define canllvdbg llvdbg +# define canllinfo llinfo #else # define candbg(x...) -# define canvdbg(x...) +# define caninfo(x...) # define canlldbg(x...) -# define canllvdbg(x...) +# define canllinfo(x...) #endif /************************************************************************************ diff --git a/configs/stm3220g-eval/src/stm32_lcd.c b/configs/stm3220g-eval/src/stm32_lcd.c index bb572f7eda..3ea0d3dcd4 100644 --- a/configs/stm3220g-eval/src/stm32_lcd.c +++ b/configs/stm3220g-eval/src/stm32_lcd.c @@ -266,10 +266,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg dbg -# define lcdvdbg vdbg +# define lcdinfo info #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /************************************************************************************** @@ -586,7 +586,7 @@ static int stm3220g_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *bu /* Buffer must be provided and aligned to a 16-bit address boundary */ - lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0); /* Write the run to GRAM. */ @@ -704,7 +704,7 @@ static int stm3220g_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, /* Buffer must be provided and aligned to a 16-bit address boundary */ - lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0); /* Configure according to the LCD type. Kind of silly with only one LCD type. */ @@ -830,7 +830,7 @@ static int stm3220g_getvideoinfo(FAR struct lcd_dev_s *dev, FAR struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); - lcdvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n", + lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n", g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes); memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s)); return OK; @@ -848,7 +848,7 @@ static int stm3220g_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno FAR struct lcd_planeinfo_s *pinfo) { DEBUGASSERT(dev && pinfo && planeno == 0); - lcdvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); + lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s)); return OK; } @@ -864,7 +864,7 @@ static int stm3220g_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno static int stm3220g_getpower(struct lcd_dev_s *dev) { - lcdvdbg("power: %d\n", 0); + lcdinfo("power: %d\n", 0); return g_lcddev.power; } @@ -900,7 +900,7 @@ static int stm3220g_poweroff(void) static int stm3220g_setpower(struct lcd_dev_s *dev, int power) { - lcdvdbg("power: %d\n", power); + lcdinfo("power: %d\n", power); DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER); /* Set new power level */ @@ -934,7 +934,7 @@ static int stm3220g_setpower(struct lcd_dev_s *dev, int power) static int stm3220g_getcontrast(struct lcd_dev_s *dev) { - lcdvdbg("Not implemented\n"); + lcdinfo("Not implemented\n"); return -ENOSYS; } @@ -948,7 +948,7 @@ static int stm3220g_getcontrast(struct lcd_dev_s *dev) static int stm3220g_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) { - lcdvdbg("contrast: %d\n", contrast); + lcdinfo("contrast: %d\n", contrast); return -ENOSYS; } @@ -1134,7 +1134,7 @@ static inline void stm3220g_lcdinitialize(void) int board_lcd_initialize(void) { - lcdvdbg("Initializing\n"); + lcdinfo("Initializing\n"); /* Configure GPIO pins and configure the FSMC to support the LCD */ diff --git a/configs/stm3220g-eval/src/stm32_spi.c b/configs/stm3220g-eval/src/stm32_spi.c index 5f6332c7fc..ba00efe80d 100644 --- a/configs/stm3220g-eval/src/stm32_spi.c +++ b/configs/stm3220g-eval/src/stm32_spi.c @@ -65,14 +65,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/stm3220g-eval/src/stm32_stmpe811.c b/configs/stm3220g-eval/src/stm32_stmpe811.c index c3fcf6de4b..b8832734c8 100644 --- a/configs/stm3220g-eval/src/stm32_stmpe811.c +++ b/configs/stm3220g-eval/src/stm32_stmpe811.c @@ -211,7 +211,7 @@ static int stmpe811_attach(FAR struct stmpe811_config_s *state, xcpt_t isr) { FAR struct stm32_stmpe811config_s *priv = (FAR struct stm32_stmpe811config_s *)state; - ivdbg("Saving handler %p\n", isr); + iinfo("Saving handler %p\n", isr); DEBUGASSERT(priv); /* Just save the handler. We will use it when EXTI interruptsare enabled */ @@ -286,7 +286,7 @@ int board_tsc_setup(int minor) if (!g_stmpe811config.handle) { - ivdbg("Initializing\n"); + iinfo("Initializing\n"); /* Configure the STMPE811 interrupt pin as an input */ diff --git a/configs/stm3220g-eval/src/stm32_usb.c b/configs/stm3220g-eval/src/stm32_usb.c index 3d0e183b61..e4ecae395d 100644 --- a/configs/stm3220g-eval/src/stm32_usb.c +++ b/configs/stm3220g-eval/src/stm32_usb.c @@ -106,13 +106,13 @@ static int usbhost_waiter(int argc, char *argv[]) { struct usbhost_hubport_s *hport; - uvdbg("Running\n"); + uinfo("Running\n"); for (;;) { /* Wait for the device to change state */ DEBUGVERIFY(CONN_WAIT(g_usbconn, &hport)); - uvdbg("%s\n", hport->connected ? "connected" : "disconnected"); + uinfo("%s\n", hport->connected ? "connected" : "disconnected"); /* Did we just become connected? */ @@ -176,7 +176,7 @@ int stm32_usbhost_initialize(void) * that we care about: */ - uvdbg("Register class drivers\n"); + uinfo("Register class drivers\n"); #ifdef CONFIG_USBHOST_MSC /* Register the USB mass storage class class */ @@ -200,13 +200,13 @@ int stm32_usbhost_initialize(void) /* Then get an instance of the USB host interface */ - uvdbg("Initialize USB host\n"); + uinfo("Initialize USB host\n"); g_usbconn = stm32_otgfshost_initialize(0); if (g_usbconn) { /* Start a thread to handle device connection. */ - uvdbg("Start usbhost_waiter\n"); + uinfo("Start usbhost_waiter\n"); pid = task_create("usbhost", CONFIG_USBHOST_DEFPRIO, CONFIG_USBHOST_STACKSIZE, diff --git a/configs/stm3220g-eval/src/stm32_userleds.c b/configs/stm3220g-eval/src/stm32_userleds.c index fe667383cc..3eda42599a 100644 --- a/configs/stm3220g-eval/src/stm32_userleds.c +++ b/configs/stm3220g-eval/src/stm32_userleds.c @@ -63,10 +63,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/stm3240g-eval/src/stm32_autoleds.c b/configs/stm3240g-eval/src/stm32_autoleds.c index 49a2692fb0..a20e979628 100644 --- a/configs/stm3240g-eval/src/stm32_autoleds.c +++ b/configs/stm3240g-eval/src/stm32_autoleds.c @@ -64,10 +64,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* The following definitions map the encoded LED setting to GPIO settings */ diff --git a/configs/stm3240g-eval/src/stm32_can.c b/configs/stm3240g-eval/src/stm32_can.c index 40a29e50d8..e4071bf0d6 100644 --- a/configs/stm3240g-eval/src/stm32_can.c +++ b/configs/stm3240g-eval/src/stm32_can.c @@ -75,14 +75,14 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg -# define canvdbg vdbg +# define caninfo info # define canlldbg lldbg -# define canllvdbg llvdbg +# define canllinfo llinfo #else # define candbg(x...) -# define canvdbg(x...) +# define caninfo(x...) # define canlldbg(x...) -# define canllvdbg(x...) +# define canllinfo(x...) #endif /************************************************************************************ diff --git a/configs/stm3240g-eval/src/stm32_lcd.c b/configs/stm3240g-eval/src/stm32_lcd.c index 4c4491e047..89e7bd508c 100644 --- a/configs/stm3240g-eval/src/stm32_lcd.c +++ b/configs/stm3240g-eval/src/stm32_lcd.c @@ -266,10 +266,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg dbg -# define lcdvdbg vdbg +# define lcdinfo info #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /************************************************************************************** @@ -585,7 +585,7 @@ static int stm3240g_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *bu /* Buffer must be provided and aligned to a 16-bit address boundary */ - lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0); /* Write the run to GRAM. */ @@ -703,7 +703,7 @@ static int stm3240g_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, /* Buffer must be provided and aligned to a 16-bit address boundary */ - lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0); /* Configure according to the LCD type. Kind of silly with only one LCD type. */ @@ -829,7 +829,7 @@ static int stm3240g_getvideoinfo(FAR struct lcd_dev_s *dev, FAR struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); - lcdvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n", + lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n", g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes); memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s)); return OK; @@ -847,7 +847,7 @@ static int stm3240g_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno FAR struct lcd_planeinfo_s *pinfo) { DEBUGASSERT(dev && pinfo && planeno == 0); - lcdvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); + lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s)); return OK; } @@ -863,7 +863,7 @@ static int stm3240g_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno static int stm3240g_getpower(struct lcd_dev_s *dev) { - lcdvdbg("power: %d\n", 0); + lcdinfo("power: %d\n", 0); return g_lcddev.power; } @@ -899,7 +899,7 @@ static int stm3240g_poweroff(void) static int stm3240g_setpower(struct lcd_dev_s *dev, int power) { - lcdvdbg("power: %d\n", power); + lcdinfo("power: %d\n", power); DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER); /* Set new power level */ @@ -933,7 +933,7 @@ static int stm3240g_setpower(struct lcd_dev_s *dev, int power) static int stm3240g_getcontrast(struct lcd_dev_s *dev) { - lcdvdbg("Not implemented\n"); + lcdinfo("Not implemented\n"); return -ENOSYS; } @@ -947,7 +947,7 @@ static int stm3240g_getcontrast(struct lcd_dev_s *dev) static int stm3240g_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) { - lcdvdbg("contrast: %d\n", contrast); + lcdinfo("contrast: %d\n", contrast); return -ENOSYS; } @@ -1133,7 +1133,7 @@ static inline void stm3240g_lcdinitialize(void) int board_lcd_initialize(void) { - lcdvdbg("Initializing\n"); + lcdinfo("Initializing\n"); /* Configure GPIO pins and configure the FSMC to support the LCD */ diff --git a/configs/stm3240g-eval/src/stm32_spi.c b/configs/stm3240g-eval/src/stm32_spi.c index 5e247d8c35..04ec6d37f6 100644 --- a/configs/stm3240g-eval/src/stm32_spi.c +++ b/configs/stm3240g-eval/src/stm32_spi.c @@ -65,14 +65,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/stm3240g-eval/src/stm32_stmpe811.c b/configs/stm3240g-eval/src/stm32_stmpe811.c index 30b06c1250..87a4a3e4b9 100644 --- a/configs/stm3240g-eval/src/stm32_stmpe811.c +++ b/configs/stm3240g-eval/src/stm32_stmpe811.c @@ -211,7 +211,7 @@ static int stmpe811_attach(FAR struct stmpe811_config_s *state, xcpt_t isr) { FAR struct stm32_stmpe811config_s *priv = (FAR struct stm32_stmpe811config_s *)state; - ivdbg("Saving handler %p\n", isr); + iinfo("Saving handler %p\n", isr); DEBUGASSERT(priv); /* Just save the handler. We will use it when EXTI interruptsare enabled */ @@ -286,7 +286,7 @@ int board_tsc_setup(int minor) if (!g_stmpe811config.handle) { - ivdbg("Initializing\n"); + iinfo("Initializing\n"); /* Configure the STMPE811 interrupt pin as an input */ diff --git a/configs/stm3240g-eval/src/stm32_usb.c b/configs/stm3240g-eval/src/stm32_usb.c index 449c80af8e..d4943f02ce 100644 --- a/configs/stm3240g-eval/src/stm32_usb.c +++ b/configs/stm3240g-eval/src/stm32_usb.c @@ -106,13 +106,13 @@ static int usbhost_waiter(int argc, char *argv[]) { struct usbhost_hubport_s *hport; - uvdbg("Running\n"); + uinfo("Running\n"); for (;;) { /* Wait for the device to change state */ DEBUGVERIFY(CONN_WAIT(g_usbconn, &hport)); - uvdbg("%s\n", hport->connected ? "connected" : "disconnected"); + uinfo("%s\n", hport->connected ? "connected" : "disconnected"); /* Did we just become connected? */ @@ -176,7 +176,7 @@ int stm32_usbhost_initialize(void) * that we care about: */ - uvdbg("Register class drivers\n"); + uinfo("Register class drivers\n"); #ifdef CONFIG_USBHOST_MSC /* Register the USB mass storage class class */ @@ -200,13 +200,13 @@ int stm32_usbhost_initialize(void) /* Then get an instance of the USB host interface */ - uvdbg("Initialize USB host\n"); + uinfo("Initialize USB host\n"); g_usbconn = stm32_otgfshost_initialize(0); if (g_usbconn) { /* Start a thread to handle device connection. */ - uvdbg("Start usbhost_waiter\n"); + uinfo("Start usbhost_waiter\n"); pid = task_create("usbhost", CONFIG_USBHOST_DEFPRIO, CONFIG_USBHOST_STACKSIZE, diff --git a/configs/stm3240g-eval/src/stm32_userleds.c b/configs/stm3240g-eval/src/stm32_userleds.c index dfe40d9bdb..dd3d70ea52 100644 --- a/configs/stm3240g-eval/src/stm32_userleds.c +++ b/configs/stm3240g-eval/src/stm32_userleds.c @@ -63,10 +63,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/stm32_tiny/src/stm32_leds.c b/configs/stm32_tiny/src/stm32_leds.c index 0b0e464368..21329e76e9 100644 --- a/configs/stm32_tiny/src/stm32_leds.c +++ b/configs/stm32_tiny/src/stm32_leds.c @@ -62,10 +62,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** @@ -78,7 +78,7 @@ static inline void set_led(bool v) { - ledvdbg("Turn LED %s\n", v? "on":"off"); + ledinfo("Turn LED %s\n", v? "on":"off"); stm32_gpiowrite(GPIO_LED, v); } @@ -103,7 +103,7 @@ void board_autoled_initialize(void) void board_autoled_on(int led) { - ledvdbg("board_autoled_on(%d)\n",led); + ledinfo("board_autoled_on(%d)\n",led); switch (led) { case LED_STARTED: diff --git a/configs/stm32_tiny/src/stm32_spi.c b/configs/stm32_tiny/src/stm32_spi.c index 4a20fe6a1a..a5867cd70a 100644 --- a/configs/stm32_tiny/src/stm32_spi.c +++ b/configs/stm32_tiny/src/stm32_spi.c @@ -68,13 +68,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ @@ -104,7 +104,7 @@ void stm32_spidev_initialize(void) #ifdef CONFIG_STM32_SPI2 # ifdef CONFIG_WL_NRF24L01 /* Configure the SPI-based NRF24L01 chip select GPIO */ - spivdbg("Configure GPIO for SPI2/CS\n"); + spiinfo("Configure GPIO for SPI2/CS\n"); stm32_configgpio(GPIO_NRF24L01_CS); # endif #endif @@ -153,7 +153,7 @@ void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sele { #ifdef CONFIG_WL_NRF24L01 case SPIDEV_WIRELESS: - spivdbg("nRF24L01 device %s\n", selected ? "asserted" : "de-asserted"); + spiinfo("nRF24L01 device %s\n", selected ? "asserted" : "de-asserted"); /* Set the GPIO low to select and high to de-select */ diff --git a/configs/stm32_tiny/src/stm32_wireless.c b/configs/stm32_tiny/src/stm32_wireless.c index 5a8b6b0da9..81e51afc85 100644 --- a/configs/stm32_tiny/src/stm32_wireless.c +++ b/configs/stm32_tiny/src/stm32_wireless.c @@ -79,7 +79,7 @@ static xcpt_t g_isr; static int stm32tiny_wl_irq_attach(xcpt_t isr) { - vdbg("Attach IRQ\n"); + info("Attach IRQ\n"); g_isr = isr; stm32_gpiosetevent(GPIO_NRF24L01_IRQ, false, true, false, g_isr); return OK; @@ -87,7 +87,7 @@ static int stm32tiny_wl_irq_attach(xcpt_t isr) static void stm32tiny_wl_chip_enable(bool enable) { - vdbg("CE:%d\n", enable); + info("CE:%d\n", enable); stm32_gpiowrite(GPIO_NRF24L01_CE, enable); } diff --git a/configs/stm32f103-minimum/src/stm32_autoleds.c b/configs/stm32f103-minimum/src/stm32_autoleds.c index 73e84298bf..5be7c7c885 100644 --- a/configs/stm32f103-minimum/src/stm32_autoleds.c +++ b/configs/stm32f103-minimum/src/stm32_autoleds.c @@ -62,10 +62,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** @@ -74,7 +74,7 @@ static inline void set_led(bool v) { - ledvdbg("Turn LED %s\n", v? "on":"off"); + ledinfo("Turn LED %s\n", v? "on":"off"); stm32_gpiowrite(GPIO_LED, !v); } @@ -100,7 +100,7 @@ void board_autoled_initialize(void) void board_autoled_on(int led) { - ledvdbg("board_autoled_on(%d)\n",led); + ledinfo("board_autoled_on(%d)\n",led); switch (led) { diff --git a/configs/stm32f103-minimum/src/stm32_spi.c b/configs/stm32f103-minimum/src/stm32_spi.c index 78f9a96265..6781b25ed8 100644 --- a/configs/stm32f103-minimum/src/stm32_spi.c +++ b/configs/stm32f103-minimum/src/stm32_spi.c @@ -68,13 +68,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/stm32f3discovery/src/stm32_autoleds.c b/configs/stm32f3discovery/src/stm32_autoleds.c index 5012ccdd14..f62159c156 100644 --- a/configs/stm32f3discovery/src/stm32_autoleds.c +++ b/configs/stm32f3discovery/src/stm32_autoleds.c @@ -62,10 +62,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/stm32f3discovery/src/stm32_qencoder.c b/configs/stm32f3discovery/src/stm32_qencoder.c index 88a45c0722..c3773e552c 100644 --- a/configs/stm32f3discovery/src/stm32_qencoder.c +++ b/configs/stm32f3discovery/src/stm32_qencoder.c @@ -145,7 +145,7 @@ int qe_devinit(void) { /* Initialize a quadrature encoder interface. */ - snvdbg("Initializing the quadrature encoder using TIM%d\n", TIMID); + sninfo("Initializing the quadrature encoder using TIM%d\n", TIMID); ret = stm32_qeinitialize("/dev/qe0", TIMID); if (ret < 0) { diff --git a/configs/stm32f3discovery/src/stm32_spi.c b/configs/stm32f3discovery/src/stm32_spi.c index 6c8b28869e..2a9f8e1464 100644 --- a/configs/stm32f3discovery/src/stm32_spi.c +++ b/configs/stm32f3discovery/src/stm32_spi.c @@ -66,14 +66,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/stm32f3discovery/src/stm32_userleds.c b/configs/stm32f3discovery/src/stm32_userleds.c index 68e9105f67..1dbe43d762 100644 --- a/configs/stm32f3discovery/src/stm32_userleds.c +++ b/configs/stm32f3discovery/src/stm32_userleds.c @@ -61,10 +61,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/stm32f429i-disco/src/stm32_autoleds.c b/configs/stm32f429i-disco/src/stm32_autoleds.c index ccc969c027..6c417c9856 100644 --- a/configs/stm32f429i-disco/src/stm32_autoleds.c +++ b/configs/stm32f429i-disco/src/stm32_autoleds.c @@ -64,10 +64,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* The following definitions map the encoded LED setting to GPIO settings */ diff --git a/configs/stm32f429i-disco/src/stm32_ili93414ws.c b/configs/stm32f429i-disco/src/stm32_ili93414ws.c index 58dad6eae2..b83d16b061 100644 --- a/configs/stm32f429i-disco/src/stm32_ili93414ws.c +++ b/configs/stm32f429i-disco/src/stm32_ili93414ws.c @@ -136,10 +136,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg dbg -# define lcdvdbg vdbg +# define lcdinfo info #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /**************************************************************************** @@ -1021,7 +1021,7 @@ static int stm32_ili93414ws_sendcmd( stm32_ili93414ws_set8bitmode(priv); - lcdvdbg("cmd=%04x\n", bw); + lcdinfo("cmd=%04x\n", bw); stm32_ili93414ws_cmddata(lcd, true); ret = stm32_ili93414ws_sendblock(priv, &bw, 1); stm32_ili93414ws_cmddata(lcd, false); @@ -1055,7 +1055,7 @@ static int stm32_ili93414ws_sendparam(FAR struct ili9341_lcd_s *lcd, stm32_ili93414ws_set8bitmode(priv); - lcdvdbg("param=%04x\n", bw); + lcdinfo("param=%04x\n", bw); return stm32_ili93414ws_sendblock(priv, &bw, 1); } @@ -1081,7 +1081,7 @@ static int stm32_ili93414ws_sendgram(FAR struct ili9341_lcd_s *lcd, { FAR struct ili93414ws_lcd_s *priv = (FAR struct ili93414ws_lcd_s *)lcd; - lcdvdbg("wd=%p, nwords=%d\n", wd, nwords); + lcdinfo("wd=%p, nwords=%d\n", wd, nwords); /* Set to 16-bit mode transfer mode, spi device is in disabled state */ @@ -1117,7 +1117,7 @@ static int stm32_ili93414ws_recvparam(FAR struct ili9341_lcd_s *lcd, stm32_ili93414ws_set8bitmode(priv); #endif - lcdvdbg("param=%04x\n", param); + lcdinfo("param=%04x\n", param); return stm32_ili93414ws_recvblock(priv, (uint16_t*)param, 1); } @@ -1143,7 +1143,7 @@ static int stm32_ili93414ws_recvgram(FAR struct ili9341_lcd_s *lcd, { FAR struct ili93414ws_lcd_s *priv = (FAR struct ili93414ws_lcd_s *)lcd; - lcdvdbg("wd=%p, nwords=%d\n", wd, nwords); + lcdinfo("wd=%p, nwords=%d\n", wd, nwords); /* Set to 16-bit mode in disabled state */ @@ -1176,7 +1176,7 @@ FAR struct ili9341_lcd_s *stm32_ili93414ws_initialize(void) lcddbg("initialize ili9341 4-wire serial subdriver\n"); - lcdvdbg("initialize spi device: %d\n", ILI93414WS_SPI_DEVICE); + lcdinfo("initialize spi device: %d\n", ILI93414WS_SPI_DEVICE); spi = stm32_spi5initialize(); if (spi) @@ -1236,7 +1236,7 @@ FAR struct ili9341_lcd_s *stm32_ili93414ws_initialize(void) /* Configure to bidirectional transfer mode */ - lcdvdbg("Configure spi device %d to bidirectional transfer mode\n", + lcdinfo("Configure spi device %d to bidirectional transfer mode\n", ILI93414WS_SPI_DEVICE); stm32_ili93414ws_spiconfig(&priv->dev); diff --git a/configs/stm32f429i-disco/src/stm32_lcd.c b/configs/stm32f429i-disco/src/stm32_lcd.c index 2f527abc81..40edd632c4 100644 --- a/configs/stm32f429i-disco/src/stm32_lcd.c +++ b/configs/stm32f429i-disco/src/stm32_lcd.c @@ -336,25 +336,25 @@ static int stm32_ili9341_initialize(void) /* Reset the lcd display to the default state */ - vdbg("ili9341 LCD driver: Software Reset\n"); + info("ili9341 LCD driver: Software Reset\n"); lcd->sendcmd(lcd, ILI9341_SOFTWARE_RESET); up_mdelay(5); - vdbg("ili9341 LCD driver: set Memory Access Control %08x\n", + info("ili9341 LCD driver: set Memory Access Control %08x\n", STM32_ILI9341_MADCTL_PARAM); lcd->sendcmd(lcd, ILI9341_MEMORY_ACCESS_CONTROL); lcd->sendparam(lcd, STM32_ILI9341_MADCTL_PARAM); /* Pixel Format */ - vdbg("ili9341 LCD driver: Set Pixel Format: %02x\n", + info("ili9341 LCD driver: Set Pixel Format: %02x\n", STM32_ILI9341_PIXSET_PARAM); lcd->sendcmd(lcd, ILI9341_PIXEL_FORMAT_SET); lcd->sendparam(lcd, STM32_ILI9341_PIXSET_PARAM); /* Select column */ - vdbg("ili9341 LCD driver: Set Column Address\n"); + info("ili9341 LCD driver: Set Column Address\n"); lcd->sendcmd(lcd, ILI9341_COLUMN_ADDRESS_SET); lcd->sendparam(lcd, 0); lcd->sendparam(lcd, 0); @@ -363,7 +363,7 @@ static int stm32_ili9341_initialize(void) /* Select page */ - vdbg("ili9341 LCD driver: Set Page Address\n"); + info("ili9341 LCD driver: Set Page Address\n"); lcd->sendcmd(lcd, ILI9341_PAGE_ADDRESS_SET); lcd->sendparam(lcd, 0); lcd->sendparam(lcd, 0); @@ -372,14 +372,14 @@ static int stm32_ili9341_initialize(void) /* RGB Interface signal control */ - vdbg("ili9341 LCD driver: Set RGB Interface signal control: %02x\n", + info("ili9341 LCD driver: Set RGB Interface signal control: %02x\n", STM32_ILI9341_IFMODE_PARAM); lcd->sendcmd(lcd, ILI9341_RGB_SIGNAL_CONTROL); lcd->sendparam(lcd, STM32_ILI9341_IFMODE_PARAM); /* Interface control */ - vdbg("ili9341 LCD driver: Set Interface control: %d:%d:%d\n", + info("ili9341 LCD driver: Set Interface control: %d:%d:%d\n", STM32_ILI9341_IFCTL_PARAM1, STM32_ILI9341_IFCTL_PARAM2, STM32_ILI9341_IFCTL_PARAM3); @@ -391,13 +391,13 @@ static int stm32_ili9341_initialize(void) /* Sleep out set to the end */ - vdbg("ili9341 LCD driver: Sleep Out\n"); + info("ili9341 LCD driver: Sleep Out\n"); lcd->sendcmd(lcd, ILI9341_SLEEP_OUT); up_mdelay(5); /* 120? */ /* Display on */ - vdbg("ili9341 LCD driver: Display On\n"); + info("ili9341 LCD driver: Display On\n"); lcd->sendcmd(lcd, ILI9341_DISPLAY_ON); /* Deselect spi device */ diff --git a/configs/stm32f429i-disco/src/stm32_spi.c b/configs/stm32f429i-disco/src/stm32_spi.c index 5021da5108..f0d4890eec 100644 --- a/configs/stm32f429i-disco/src/stm32_spi.c +++ b/configs/stm32f429i-disco/src/stm32_spi.c @@ -68,14 +68,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/stm32f429i-disco/src/stm32_usb.c b/configs/stm32f429i-disco/src/stm32_usb.c index 291c025730..0295efd903 100644 --- a/configs/stm32f429i-disco/src/stm32_usb.c +++ b/configs/stm32f429i-disco/src/stm32_usb.c @@ -102,13 +102,13 @@ static int usbhost_waiter(int argc, char *argv[]) { struct usbhost_hubport_s *hport; - uvdbg("Running\n"); + uinfo("Running\n"); for (;;) { /* Wait for the device to change state */ DEBUGVERIFY(CONN_WAIT(g_usbconn, &hport)); - uvdbg("%s\n", hport->connected ? "connected" : "disconnected"); + uinfo("%s\n", hport->connected ? "connected" : "disconnected"); /* Did we just become connected? */ @@ -172,7 +172,7 @@ int stm32_usbhost_initialize(void) * that we care about: */ - uvdbg("Register class drivers\n"); + uinfo("Register class drivers\n"); #ifdef CONFIG_USBHOST_HUB /* Initialize USB hub class support */ @@ -206,13 +206,13 @@ int stm32_usbhost_initialize(void) /* Then get an instance of the USB host interface */ - uvdbg("Initialize USB host\n"); + uinfo("Initialize USB host\n"); g_usbconn = stm32_otghshost_initialize(0); if (g_usbconn) { /* Start a thread to handle device connection. */ - uvdbg("Start usbhost_waiter\n"); + uinfo("Start usbhost_waiter\n"); pid = task_create("usbhost", CONFIG_STM32F429IDISCO_USBHOST_PRIO, CONFIG_STM32F429IDISCO_USBHOST_STACKSIZE, diff --git a/configs/stm32f429i-disco/src/stm32_userleds.c b/configs/stm32f429i-disco/src/stm32_userleds.c index 39a13c477e..11513057f8 100644 --- a/configs/stm32f429i-disco/src/stm32_userleds.c +++ b/configs/stm32f429i-disco/src/stm32_userleds.c @@ -64,10 +64,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/stm32f4discovery/src/stm32_autoleds.c b/configs/stm32f4discovery/src/stm32_autoleds.c index 69d78d70bb..70888d40a3 100644 --- a/configs/stm32f4discovery/src/stm32_autoleds.c +++ b/configs/stm32f4discovery/src/stm32_autoleds.c @@ -64,10 +64,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* The following definitions map the encoded LED setting to GPIO settings */ diff --git a/configs/stm32f4discovery/src/stm32_ethernet.c b/configs/stm32f4discovery/src/stm32_ethernet.c index b3bf643434..e9d53a9a49 100644 --- a/configs/stm32f4discovery/src/stm32_ethernet.c +++ b/configs/stm32f4discovery/src/stm32_ethernet.c @@ -217,7 +217,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable) xcpt_t oldhandler; irqstate_t flags; - nvdbg("%s: handler=%p\n", intf, handler); + ninfo("%s: handler=%p\n", intf, handler); phydbg("ETHMAC: devname=%s\n", STM32_ETHMAC_DEVNAME); DEBUGASSERT(intf); diff --git a/configs/stm32f4discovery/src/stm32_qencoder.c b/configs/stm32f4discovery/src/stm32_qencoder.c index 823c846cf7..3ff1a64656 100644 --- a/configs/stm32f4discovery/src/stm32_qencoder.c +++ b/configs/stm32f4discovery/src/stm32_qencoder.c @@ -145,7 +145,7 @@ int qe_devinit(void) { /* Initialize a quadrature encoder interface. */ - snvdbg("Initializing the quadrature encoder using TIM%d\n", TIMID); + sninfo("Initializing the quadrature encoder using TIM%d\n", TIMID); ret = stm32_qeinitialize("/dev/qe0", TIMID); if (ret < 0) { diff --git a/configs/stm32f4discovery/src/stm32_sdio.c b/configs/stm32f4discovery/src/stm32_sdio.c index 7d28442cf3..9ba6931767 100644 --- a/configs/stm32f4discovery/src/stm32_sdio.c +++ b/configs/stm32f4discovery/src/stm32_sdio.c @@ -134,7 +134,7 @@ int stm32_sdio_initialize(void) /* Mount the SDIO-based MMC/SD block driver */ /* First, get an instance of the SDIO interface */ - fvdbg("Initializing SDIO slot %d\n", SDIO_SLOTNO); + finfo("Initializing SDIO slot %d\n", SDIO_SLOTNO); g_sdio_dev = sdio_initialize(SDIO_SLOTNO); if (!g_sdio_dev) @@ -145,7 +145,7 @@ int stm32_sdio_initialize(void) /* Now bind the SDIO interface to the MMC/SD driver */ - fvdbg("Bind SDIO to the MMC/SD driver, minor=%d\n", SDIO_MINOR); + finfo("Bind SDIO to the MMC/SD driver, minor=%d\n", SDIO_MINOR); ret = mmcsd_slotinitialize(SDIO_MINOR, g_sdio_dev); if (ret != OK) @@ -154,13 +154,13 @@ int stm32_sdio_initialize(void) return ret; } - fvdbg("Successfully bound SDIO to the MMC/SD driver\n"); + finfo("Successfully bound SDIO to the MMC/SD driver\n"); #ifdef HAVE_NCD /* Use SD card detect pin to check if a card is g_sd_inserted */ cd_status = !stm32_gpioread(GPIO_SDIO_NCD); - fvdbg("Card detect : %d\n", cd_status); + finfo("Card detect : %d\n", cd_status); sdio_mediachange(g_sdio_dev, cd_status); #else diff --git a/configs/stm32f4discovery/src/stm32_spi.c b/configs/stm32f4discovery/src/stm32_spi.c index f057b874d4..62713692ef 100644 --- a/configs/stm32f4discovery/src/stm32_spi.c +++ b/configs/stm32f4discovery/src/stm32_spi.c @@ -67,14 +67,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/stm32f4discovery/src/stm32_ssd1289.c b/configs/stm32f4discovery/src/stm32_ssd1289.c index a9ceb9f90a..dbb1642ec2 100644 --- a/configs/stm32f4discovery/src/stm32_ssd1289.c +++ b/configs/stm32f4discovery/src/stm32_ssd1289.c @@ -111,10 +111,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg dbg -# define lcdvdbg vdbg +# define lcdinfo info #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /************************************************************************************** @@ -355,7 +355,7 @@ int board_lcd_initialize(void) if (!g_ssd1289drvr) { - lcdvdbg("Initializing\n"); + lcdinfo("Initializing\n"); /* Configure GPIO pins and configure the FSMC to support the LCD */ diff --git a/configs/stm32f4discovery/src/stm32_ssd1351.c b/configs/stm32f4discovery/src/stm32_ssd1351.c index 26e77e8ee0..a40f72bebc 100644 --- a/configs/stm32f4discovery/src/stm32_ssd1351.c +++ b/configs/stm32f4discovery/src/stm32_ssd1351.c @@ -75,10 +75,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg(format, ...) dbg(format, ##__VA_ARGS__) -# define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define lcdinfo(format, ...) info(format, ##__VA_ARGS__) #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /**************************************************************************** @@ -127,7 +127,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) } else { - lcdvdbg("Bound SPI port 1 to OLED %d\n", devno); + lcdinfo("Bound SPI port 1 to OLED %d\n", devno); /* And turn the OLED on */ diff --git a/configs/stm32f4discovery/src/stm32_ug2864ambag01.c b/configs/stm32f4discovery/src/stm32_ug2864ambag01.c index 24e5c84034..b3a82051f4 100644 --- a/configs/stm32f4discovery/src/stm32_ug2864ambag01.c +++ b/configs/stm32f4discovery/src/stm32_ug2864ambag01.c @@ -97,10 +97,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg(format, ...) dbg(format, ##__VA_ARGS__) -# define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define lcdinfo(format, ...) info(format, ##__VA_ARGS__) #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /**************************************************************************** @@ -149,7 +149,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) } else { - lcdvdbg("Bound SPI port 1 to OLED %d\n", devno); + lcdinfo("Bound SPI port 1 to OLED %d\n", devno); /* And turn the OLED on */ diff --git a/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c b/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c index 78c24bc368..1366879530 100644 --- a/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c +++ b/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c @@ -97,10 +97,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg(format, ...) dbg(format, ##__VA_ARGS__) -# define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define lcdinfo(format, ...) info(format, ##__VA_ARGS__) #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /**************************************************************************** @@ -149,7 +149,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) } else { - lcdvdbg("Bound SPI port 1 to OLED %d\n", devno); + lcdinfo("Bound SPI port 1 to OLED %d\n", devno); /* And turn the OLED on */ diff --git a/configs/stm32f4discovery/src/stm32_usb.c b/configs/stm32f4discovery/src/stm32_usb.c index 24f35f726a..11a722aa13 100644 --- a/configs/stm32f4discovery/src/stm32_usb.c +++ b/configs/stm32f4discovery/src/stm32_usb.c @@ -102,13 +102,13 @@ static int usbhost_waiter(int argc, char *argv[]) { struct usbhost_hubport_s *hport; - uvdbg("Running\n"); + uinfo("Running\n"); for (;;) { /* Wait for the device to change state */ DEBUGVERIFY(CONN_WAIT(g_usbconn, &hport)); - uvdbg("%s\n", hport->connected ? "connected" : "disconnected"); + uinfo("%s\n", hport->connected ? "connected" : "disconnected"); /* Did we just become connected? */ @@ -175,7 +175,7 @@ int stm32_usbhost_initialize(void) * that we care about: */ - uvdbg("Register class drivers\n"); + uinfo("Register class drivers\n"); #ifdef CONFIG_USBHOST_HUB /* Initialize USB hub class support */ @@ -229,13 +229,13 @@ int stm32_usbhost_initialize(void) /* Then get an instance of the USB host interface */ - uvdbg("Initialize USB host\n"); + uinfo("Initialize USB host\n"); g_usbconn = stm32_otgfshost_initialize(0); if (g_usbconn) { /* Start a thread to handle device connection. */ - uvdbg("Start usbhost_waiter\n"); + uinfo("Start usbhost_waiter\n"); pid = task_create("usbhost", CONFIG_STM32F4DISCO_USBHOST_PRIO, CONFIG_STM32F4DISCO_USBHOST_STACKSIZE, diff --git a/configs/stm32f4discovery/src/stm32_userleds.c b/configs/stm32f4discovery/src/stm32_userleds.c index 93a7d8c35b..1359e81689 100644 --- a/configs/stm32f4discovery/src/stm32_userleds.c +++ b/configs/stm32f4discovery/src/stm32_userleds.c @@ -65,10 +65,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/stm32f4discovery/src/stm32_zerocross.c b/configs/stm32f4discovery/src/stm32_zerocross.c index 2315476448..e31ebbd066 100644 --- a/configs/stm32f4discovery/src/stm32_zerocross.c +++ b/configs/stm32f4discovery/src/stm32_zerocross.c @@ -111,7 +111,7 @@ static void zcross_enable(FAR const struct zc_lowerhalf_s *lower, flags = enter_critical_section(); zcross_disable(); - snllvdbg("handler: %p arg: %p\n", handler, arg); + snllinfo("handler: %p arg: %p\n", handler, arg); if (handler) { diff --git a/configs/stm32f746g-disco/src/stm32_autoleds.c b/configs/stm32f746g-disco/src/stm32_autoleds.c index 4f3a3573bc..5cb07a6939 100644 --- a/configs/stm32f746g-disco/src/stm32_autoleds.c +++ b/configs/stm32f746g-disco/src/stm32_autoleds.c @@ -59,10 +59,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/stm32f746g-disco/src/stm32_spi.c b/configs/stm32f746g-disco/src/stm32_spi.c index 38f62be076..3530c3c5d7 100644 --- a/configs/stm32f746g-disco/src/stm32_spi.c +++ b/configs/stm32f746g-disco/src/stm32_spi.c @@ -64,14 +64,14 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/stm32f746g-disco/src/stm32_userleds.c b/configs/stm32f746g-disco/src/stm32_userleds.c index 0bccc352d6..5107c78900 100644 --- a/configs/stm32f746g-disco/src/stm32_userleds.c +++ b/configs/stm32f746g-disco/src/stm32_userleds.c @@ -57,10 +57,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/stm32l476vg-disco/src/stm32_autoleds.c b/configs/stm32l476vg-disco/src/stm32_autoleds.c index 21f8aaac78..4114e983a5 100644 --- a/configs/stm32l476vg-disco/src/stm32_autoleds.c +++ b/configs/stm32l476vg-disco/src/stm32_autoleds.c @@ -64,10 +64,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/stm32l476vg-disco/src/stm32_spi.c b/configs/stm32l476vg-disco/src/stm32_spi.c index 612bd76c65..ed1d224c7b 100644 --- a/configs/stm32l476vg-disco/src/stm32_spi.c +++ b/configs/stm32l476vg-disco/src/stm32_spi.c @@ -69,13 +69,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/stm32l476vg-disco/src/stm32_userleds.c b/configs/stm32l476vg-disco/src/stm32_userleds.c index f7d0822b4f..da3d0a389c 100644 --- a/configs/stm32l476vg-disco/src/stm32_userleds.c +++ b/configs/stm32l476vg-disco/src/stm32_userleds.c @@ -64,10 +64,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/stm32ldiscovery/src/stm32_autoleds.c b/configs/stm32ldiscovery/src/stm32_autoleds.c index 10b717725c..d59ffbea7d 100644 --- a/configs/stm32ldiscovery/src/stm32_autoleds.c +++ b/configs/stm32ldiscovery/src/stm32_autoleds.c @@ -79,10 +79,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/stm32ldiscovery/src/stm32_lcd.c b/configs/stm32ldiscovery/src/stm32_lcd.c index cc6ff19d43..e90f9b018b 100644 --- a/configs/stm32ldiscovery/src/stm32_lcd.c +++ b/configs/stm32ldiscovery/src/stm32_lcd.c @@ -263,10 +263,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg dbg -# define lcdvdbg vdbg +# define lcdinfo info #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /**************************************************************************** @@ -443,16 +443,16 @@ static uint32_t g_slcdgpio[BOARD_SLCD_NGPIOS] = #if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_INFO) static void slcd_dumpstate(FAR const char *msg) { - lcdvdbg("%s:\n", msg); - lcdvdbg(" curpos: %d\n", + lcdinfo("%s:\n", msg); + lcdinfo(" curpos: %d\n", g_slcdstate.curpos); - lcdvdbg(" Display: [%c%c%c%c%c%c]\n", + lcdinfo(" Display: [%c%c%c%c%c%c]\n", g_slcdstate.buffer[0], g_slcdstate.buffer[1], g_slcdstate.buffer[2], g_slcdstate.buffer[3], g_slcdstate.buffer[4], g_slcdstate.buffer[5]); - lcdvdbg(" Options: [%d%d%d%d%d%d]\n", + lcdinfo(" Options: [%d%d%d%d%d%d]\n", g_slcdstate.options[0], g_slcdstate.options[1], g_slcdstate.options[2], g_slcdstate.options[3], g_slcdstate.options[4], g_slcdstate.options[5]); - lcdvdbg(" Bar: %02x %02x\n", + lcdinfo(" Bar: %02x %02x\n", g_slcdstate.bar[0], g_slcdstate.bar[1]); } #endif @@ -464,11 +464,11 @@ static void slcd_dumpstate(FAR const char *msg) #if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_INFO) static void slcd_dumpslcd(FAR const char *msg) { - lcdvdbg("%s:\n", msg); - lcdvdbg(" CR: %08x FCR: %08x SR: %08x CLR: %08x\n", + lcdinfo("%s:\n", msg); + lcdinfo(" CR: %08x FCR: %08x SR: %08x CLR: %08x\n", getreg32(STM32_LCD_CR), getreg32(STM32_LCD_FCR), getreg32(STM32_LCD_SR), getreg32(STM32_LCD_CLR)); - lcdvdbg(" RAM0L: %08x RAM1L: %08x RAM2L: %08x RAM3L: %08x\n", + lcdinfo(" RAM0L: %08x RAM1L: %08x RAM2L: %08x RAM3L: %08x\n", getreg32(STM32_LCD_RAM0L), getreg32(STM32_LCD_RAM1L), getreg32(STM32_LCD_RAM2L), getreg32(STM32_LCD_RAM3L)); } @@ -482,7 +482,7 @@ static void slcd_clear(void) { uint32_t regaddr; - lvdbg("Clearing\n"); + linfo("Clearing\n"); /* Make sure that any previous transfer is complete. The firmware sets * the UDR each it modifies the LCD_RAM. The UDR bit stays set until the @@ -565,7 +565,7 @@ static int slcd_setcontrast(uint8_t contrast) regval |= contrast << LCD_FCR_CC_SHIFT; putreg32(regval, STM32_LCD_FCR); - lcdvdbg("contrast: %d FCR: %08x\n", + lcdinfo("contrast: %d FCR: %08x\n", getreg32(STM32_LCD_FCR), contrast); return ret; @@ -579,7 +579,7 @@ static void slcd_writebar(void) { uint32_t regval; - lcdvdbg("bar: %02x %02x\n", g_slcdstate.bar[0], g_slcdstate.bar[1]); + lcdinfo("bar: %02x %02x\n", g_slcdstate.bar[0], g_slcdstate.bar[1]); slcd_dumpslcd("BEFORE WRITE"); /* Make sure that any previous transfer is complete. The firmware sets @@ -695,7 +695,7 @@ static inline void slcd_writemem(uint16_t segset, int curpos) int i; int j; - lcdvdbg("segset: %04x curpos: %d\n", segset, curpos); + lcdinfo("segset: %04x curpos: %d\n", segset, curpos); slcd_dumpslcd("BEFORE WRITE"); /* Isolate the least significant bits @@ -714,7 +714,7 @@ static inline void slcd_writemem(uint16_t segset, int curpos) segments[j] = (segset >> i) & 0x0f; } - lcdvdbg("segments: %02x %02x %02x %02x\n", + lcdinfo("segments: %02x %02x %02x %02x\n", segments[0], segments[1], segments[2], segments[3]); /* Make sure that any previous transfer is complete. The firmware sets @@ -859,7 +859,7 @@ static void slcd_writech(uint8_t ch, uint8_t curpos, uint8_t options) segset |= 0x0020; } - lcdvdbg("ch: [%c] options: %02x segset: %04x\n", ch, options, segset); + lcdinfo("ch: [%c] options: %02x segset: %04x\n", ch, options, segset); /* Decode the value and write it to the SLCD segment memory */ @@ -879,7 +879,7 @@ static void slcd_writech(uint8_t ch, uint8_t curpos, uint8_t options) static void slcd_appendch(uint8_t ch, uint8_t options) { - lcdvdbg("ch: [%c] options: %02x\n", ch, options); + lcdinfo("ch: [%c] options: %02x\n", ch, options); /* Write the character at the current cursor position */ @@ -898,7 +898,7 @@ static void slcd_appendch(uint8_t ch, uint8_t options) static void slcd_action(enum slcdcode_e code, uint8_t count) { - lcdvdbg("Action: %d count: %d\n", code, count); + lcdinfo("Action: %d count: %d\n", code, count); slcd_dumpstate("BEFORE ACTION"); switch (code) @@ -1152,7 +1152,7 @@ static ssize_t slcd_write(FAR struct file *filep, memset(&state, 0, sizeof(struct slcdstate_s)); result = slcd_decode(&instream.stream, &state, &prev, &count); - lcdvdbg("slcd_decode returned result=%d char=%d count=%d\n", + lcdinfo("slcd_decode returned result=%d char=%d count=%d\n", result, prev, count); switch (result) @@ -1176,7 +1176,7 @@ static ssize_t slcd_write(FAR struct file *filep, while ((result = slcd_decode(&instream.stream, &state, &ch, &count)) != SLCDRET_EOF) { - lcdvdbg("slcd_decode returned result=%d char=%d count=%d\n", + lcdinfo("slcd_decode returned result=%d char=%d count=%d\n", result, ch, count); if (result == SLCDRET_CHAR) /* A normal character was returned */ @@ -1329,7 +1329,7 @@ static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg) { FAR struct slcd_attributes_s *attr = (FAR struct slcd_attributes_s *)((uintptr_t)arg); - lcdvdbg("SLCDIOC_GETATTRIBUTES:\n"); + lcdinfo("SLCDIOC_GETATTRIBUTES:\n"); if (!attr) { @@ -1354,7 +1354,7 @@ static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg) { FAR struct slcd_curpos_s *curpos = (FAR struct slcd_curpos_s *)((uintptr_t)arg); - lcdvdbg("SLCDIOC_CURPOS: row=0 column=%d\n", g_slcdstate.curpos); + lcdinfo("SLCDIOC_CURPOS: row=0 column=%d\n", g_slcdstate.curpos); if (!curpos) { @@ -1373,7 +1373,7 @@ static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case SLCDIOC_SETBAR: { - lcdvdbg("SLCDIOC_SETBAR: arg=0x%02lx\n", arg); + lcdinfo("SLCDIOC_SETBAR: arg=0x%02lx\n", arg); /* Format the bar */ @@ -1421,7 +1421,7 @@ static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg) } *contrast = (int)slcd_getcontrast(); - lcdvdbg("SLCDIOC_GETCONTRAST: contrast=%d\n", *contrast); + lcdinfo("SLCDIOC_GETCONTRAST: contrast=%d\n", *contrast); } break; @@ -1432,7 +1432,7 @@ static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case SLCDIOC_SETCONTRAST: { - lcdvdbg("SLCDIOC_SETCONTRAST: arg=%ld\n", arg); + lcdinfo("SLCDIOC_SETCONTRAST: arg=%ld\n", arg); if (arg > SLCD_MAXCONTRAST) { @@ -1498,7 +1498,7 @@ int stm32_slcd_initialize(void) if (!g_slcdstate.initialized) { - lcdvdbg("Initializing\n"); + lcdinfo("Initializing\n"); /* Configure LCD GPIO pins */ @@ -1515,7 +1515,7 @@ int stm32_slcd_initialize(void) stm32_rcc_enablelse(); - lcdvdbg("APB1ENR: %08x CSR: %08x\n", + lcdinfo("APB1ENR: %08x CSR: %08x\n", getreg32(STM32_RCC_APB1ENR), getreg32(STM32_RCC_CSR)); /* Set the LCD prescaler and divider values */ @@ -1527,7 +1527,7 @@ int stm32_slcd_initialize(void) /* Wait for the FCRSF flag to be set */ - lcdvdbg("Wait for FCRSF, FSR: %08x SR: %08x\n", + lcdinfo("Wait for FCRSF, FSR: %08x SR: %08x\n", getreg32(STM32_LCD_FCR), getreg32(STM32_LCD_SR)); while ((getreg32(STM32_LCD_SR) & LCD_SR_FCRSF) == 0); @@ -1564,7 +1564,7 @@ int stm32_slcd_initialize(void) /* Wait Until the LCD FCR register is synchronized */ - lcdvdbg("Wait for FCRSF, FSR: %08x SR: %08x\n", + lcdinfo("Wait for FCRSF, FSR: %08x SR: %08x\n", getreg32(STM32_LCD_FCR), getreg32(STM32_LCD_SR)); while ((getreg32(STM32_LCD_SR) & LCD_SR_FCRSF) == 0); @@ -1575,7 +1575,7 @@ int stm32_slcd_initialize(void) /* Wait Until the LCD is enabled and the LCD booster is ready */ - lcdvdbg("Wait for LCD_SR_ENS and LCD_SR_RDY, CR: %08x SR: %08x\n", + lcdinfo("Wait for LCD_SR_ENS and LCD_SR_RDY, CR: %08x SR: %08x\n", getreg32(STM32_LCD_CR), getreg32(STM32_LCD_SR)); while ((getreg32(STM32_LCD_SR) & (LCD_SR_ENS | LCD_SR_RDY)) != (LCD_SR_ENS | LCD_SR_RDY)); diff --git a/configs/stm32ldiscovery/src/stm32_qencoder.c b/configs/stm32ldiscovery/src/stm32_qencoder.c index e765750692..c1336ac6fc 100644 --- a/configs/stm32ldiscovery/src/stm32_qencoder.c +++ b/configs/stm32ldiscovery/src/stm32_qencoder.c @@ -146,7 +146,7 @@ int qe_devinit(void) { /* Initialize a quadrature encoder interface. */ - snvdbg("Initializing the quadrature encoder using TIM%d\n", TIMID); + sninfo("Initializing the quadrature encoder using TIM%d\n", TIMID); ret = stm32_qeinitialize("/dev/qe0", TIMID); if (ret < 0) { diff --git a/configs/stm32ldiscovery/src/stm32_spi.c b/configs/stm32ldiscovery/src/stm32_spi.c index b56ed221fb..deb88a0339 100644 --- a/configs/stm32ldiscovery/src/stm32_spi.c +++ b/configs/stm32ldiscovery/src/stm32_spi.c @@ -67,14 +67,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/stm32ldiscovery/src/stm32_userleds.c b/configs/stm32ldiscovery/src/stm32_userleds.c index 759b78a803..8ba7f81ecd 100644 --- a/configs/stm32ldiscovery/src/stm32_userleds.c +++ b/configs/stm32ldiscovery/src/stm32_userleds.c @@ -61,10 +61,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/stm32vldiscovery/src/stm32_leds.c b/configs/stm32vldiscovery/src/stm32_leds.c index 65158af6d1..e4392c1c93 100644 --- a/configs/stm32vldiscovery/src/stm32_leds.c +++ b/configs/stm32vldiscovery/src/stm32_leds.c @@ -64,10 +64,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/sure-pic32mx/src/pic32mx_autoleds.c b/configs/sure-pic32mx/src/pic32mx_autoleds.c index 9f1619e5c8..f03ebd1f09 100644 --- a/configs/sure-pic32mx/src/pic32mx_autoleds.c +++ b/configs/sure-pic32mx/src/pic32mx_autoleds.c @@ -91,15 +91,15 @@ #if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS) # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO -# define ledvdbg lldbg +# define ledinfo lldbg # else -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # undef CONFIG_DEBUG_LEDS # undef CONFIG_DEBUG_INFO # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/sure-pic32mx/src/pic32mx_lcd1602.c b/configs/sure-pic32mx/src/pic32mx_lcd1602.c index afd1f1696c..7c6480505c 100644 --- a/configs/sure-pic32mx/src/pic32mx_lcd1602.c +++ b/configs/sure-pic32mx/src/pic32mx_lcd1602.c @@ -145,10 +145,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg dbg -# define lcdvdbg vdbg +# define lcdinfo info #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /**************************************************************************** @@ -251,8 +251,8 @@ static void lcd_dumpstate(FAR const char *msg) int row; int column; - lcdvdbg("%s:\n", msg); - lcdvdbg(" currow: %d curcol: %d\n", + lcdinfo("%s:\n", msg); + lcdinfo(" currow: %d curcol: %d\n", g_lcd1602.currow, g_lcd1602.curcol); for (row = 0, column = 0; row < LCD_NROWS; ) @@ -261,7 +261,7 @@ static void lcd_dumpstate(FAR const char *msg) buffer[column] = isprint(ch) ? ch : '.'; if (++column >= LCD_NCOLUMNS) { - lcdvdbg(" [%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c]\n", + lcdinfo(" [%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c]\n", buffer[0], buffer[1], buffer[2], buffer[3], buffer[4], buffer[5], buffer[6], buffer[7], buffer[8], buffer[9], buffer[10], buffer[11], @@ -282,8 +282,8 @@ static void lcd_dumpstate(FAR const char *msg) static void lcd_dumpstream(FAR const char *msg, FAR const struct lcd_instream_s *stream) { - lcdvdbg("%s:\n", msg); - lcdvdbg(" nget: %d nbytes: %d\n", + lcdinfo("%s:\n", msg); + lcdinfo(" nget: %d nbytes: %d\n", stream->stream.nget, stream->nbytes); lib_dumpbuffer("STREAM", stream->buffer, stream->nbytes); } @@ -592,7 +592,7 @@ static void lcd_appendch(uint8_t ch) static void lcd_action(enum slcdcode_e code, uint8_t count) { - lcdvdbg("Action: %d count: %d\n", code, count); + lcdinfo("Action: %d count: %d\n", code, count); lcd_dumpstate("BEFORE ACTION"); switch (code) @@ -874,7 +874,7 @@ static ssize_t lcd_write(FAR struct file *filep, FAR const char *buffer, memset(&state, 0, sizeof(struct slcdstate_s)); while ((result = slcd_decode(&instream.stream, &state, &ch, &count)) != SLCDRET_EOF) { - lcdvdbg("slcd_decode returned result=%d char=%d count=%d\n", + lcdinfo("slcd_decode returned result=%d char=%d count=%d\n", result, ch, count); if (result == SLCDRET_CHAR) /* A normal character was returned */ @@ -951,7 +951,7 @@ static int lcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg) { FAR struct slcd_attributes_s *attr = (FAR struct slcd_attributes_s *)((uintptr_t)arg); - lcdvdbg("SLCDIOC_GETATTRIBUTES:\n"); + lcdinfo("SLCDIOC_GETATTRIBUTES:\n"); if (!attr) { @@ -977,7 +977,7 @@ static int lcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg) { FAR struct slcd_curpos_s *curpos = (FAR struct slcd_curpos_s *)((uintptr_t)arg); - lcdvdbg("SLCDIOC_CURPOS: row=%d column=%d\n", g_lcd1602.currow, g_lcd1602.curcol); + lcdinfo("SLCDIOC_CURPOS: row=%d column=%d\n", g_lcd1602.currow, g_lcd1602.curcol); if (!curpos) { @@ -1004,7 +1004,7 @@ static int lcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg) } *brightness = (int)g_lcd1602.brightness; - lcdvdbg("SLCDIOC_GETCONTRAST: brightness=%d\n", *brightness); + lcdinfo("SLCDIOC_GETCONTRAST: brightness=%d\n", *brightness); } break; @@ -1015,7 +1015,7 @@ static int lcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case SLCDIOC_SETBRIGHTNESS: { - lcdvdbg("SLCDIOC_SETCONTRAST: arg=%ld\n", arg); + lcdinfo("SLCDIOC_SETCONTRAST: arg=%ld\n", arg); if (arg > CONFIG_LCD_MAXPOWER) { @@ -1079,7 +1079,7 @@ int up_lcd1602_initialize(void) if (!g_lcd1602.initialized) { - lcdvdbg("Initializing\n"); + lcdinfo("Initializing\n"); /* Configure GPIO pins */ diff --git a/configs/sure-pic32mx/src/pic32mx_spi.c b/configs/sure-pic32mx/src/pic32mx_spi.c index a959d083f4..28207c49ef 100644 --- a/configs/sure-pic32mx/src/pic32mx_spi.c +++ b/configs/sure-pic32mx/src/pic32mx_spi.c @@ -132,13 +132,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ @@ -203,7 +203,7 @@ void weak_function pic32mx_spidev_initialize(void) #ifdef CONFIG_PIC32MX_SPI2 void pic32mx_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { - spivdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); + spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); /* The SD card chip select is pulled high and active low */ @@ -263,7 +263,7 @@ uint8_t pic32mx_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) } #endif - spivdbg("Returning %d\n", ret); + spiinfo("Returning %d\n", ret); return ret; } #endif diff --git a/configs/teensy-2.0/src/at90usb_leds.c b/configs/teensy-2.0/src/at90usb_leds.c index ad564a2cda..19aa4eb5a9 100644 --- a/configs/teensy-2.0/src/at90usb_leds.c +++ b/configs/teensy-2.0/src/at90usb_leds.c @@ -64,13 +64,13 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO -# define ledvdbg lldbg +# define ledinfo lldbg # else -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # define leddbg(x...) -# define ledvdbg(x...) +# 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 77422d601e..015ace6b4d 100644 --- a/configs/teensy-2.0/src/at90usb_spi.c +++ b/configs/teensy-2.0/src/at90usb_spi.c @@ -89,14 +89,14 @@ #ifdef CONFIG_SPI_DEBUG # define sspdbg lldbg # ifdef CONFIG_SPI_VERBOSE -# define sspvdbg lldbg +# define sspinfo lldbg # else -# define sspvdbg(x...) +# define sspinfo(x...) # endif #else # undef CONFIG_SPI_VERBOSE # define sspdbg(x...) -# define sspvdbg(x...) +# 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 edd63b4135..8e3c3fb222 100644 --- a/configs/teensy-3.x/src/k20_spi.c +++ b/configs/teensy-3.x/src/k20_spi.c @@ -62,14 +62,14 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef CONFIG_DEBUG_SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/teensy-lc/src/kl_led.c b/configs/teensy-lc/src/kl_led.c index 4c417a76e6..783df86163 100644 --- a/configs/teensy-lc/src/kl_led.c +++ b/configs/teensy-lc/src/kl_led.c @@ -63,13 +63,13 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO -# define ledvdbg lldbg +# define ledinfo lldbg # else -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/teensy-lc/src/kl_spi.c b/configs/teensy-lc/src/kl_spi.c index 0b2a1d3cc5..2dcb86c62c 100644 --- a/configs/teensy-lc/src/kl_spi.c +++ b/configs/teensy-lc/src/kl_spi.c @@ -60,13 +60,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /**************************************************************************** @@ -155,7 +155,7 @@ void weak_function kl_spidev_initialize(void) void kl_spi0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { - spivdbg("devid: %d CS: %s\n", + spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } #endif @@ -164,7 +164,7 @@ void kl_spi0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, void kl_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { - spivdbg("devid: %d CS: %s\n", + spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } #endif diff --git a/configs/tm4c123g-launchpad/src/tm4c_autoleds.c b/configs/tm4c123g-launchpad/src/tm4c_autoleds.c index 4189f7297a..918de86f7d 100644 --- a/configs/tm4c123g-launchpad/src/tm4c_autoleds.c +++ b/configs/tm4c123g-launchpad/src/tm4c_autoleds.c @@ -103,10 +103,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/tm4c123g-launchpad/src/tm4c_ssi.c b/configs/tm4c123g-launchpad/src/tm4c_ssi.c index f49c9f9eb5..52c049f984 100644 --- a/configs/tm4c123g-launchpad/src/tm4c_ssi.c +++ b/configs/tm4c123g-launchpad/src/tm4c_ssi.c @@ -70,10 +70,10 @@ /* Dump GPIO registers */ #if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO) -# define ssivdbg lldbg +# define ssiinfo lldbg # define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m) #else -# define ssivdbg(x...) +# define ssiinfo(x...) # define ssi_dumpgpio(m) #endif diff --git a/configs/tm4c1294-launchpad/src/tm4c_timer.c b/configs/tm4c1294-launchpad/src/tm4c_timer.c index 0d661307c3..39b20919cb 100644 --- a/configs/tm4c1294-launchpad/src/tm4c_timer.c +++ b/configs/tm4c1294-launchpad/src/tm4c_timer.c @@ -101,7 +101,7 @@ int tiva_timer_configure(void) { int ret; - timvdbg("Registering TIMER%d at %s\n", + timinfo("Registering TIMER%d at %s\n", GPTM, CONFIG_TM4C1294_LAUNCHPAD_TIMER_DEVNAME); ret = tiva_timer_register(CONFIG_TM4C1294_LAUNCHPAD_TIMER_DEVNAME, diff --git a/configs/tm4c1294-launchpad/src/tm4c_userleds.c b/configs/tm4c1294-launchpad/src/tm4c_userleds.c index 743fcce239..d5c79ef522 100644 --- a/configs/tm4c1294-launchpad/src/tm4c_userleds.c +++ b/configs/tm4c1294-launchpad/src/tm4c_userleds.c @@ -73,10 +73,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/twr-k60n512/src/k60_leds.c b/configs/twr-k60n512/src/k60_leds.c index b8274c1eb3..5e7cc58e65 100644 --- a/configs/twr-k60n512/src/k60_leds.c +++ b/configs/twr-k60n512/src/k60_leds.c @@ -125,10 +125,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/twr-k60n512/src/k60_spi.c b/configs/twr-k60n512/src/k60_spi.c index 8aa48e369b..2e08636ce6 100644 --- a/configs/twr-k60n512/src/k60_spi.c +++ b/configs/twr-k60n512/src/k60_spi.c @@ -62,14 +62,14 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef CONFIG_DEBUG_SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/u-blox-c027/src/lpc17_leds.c b/configs/u-blox-c027/src/lpc17_leds.c index bd92242ddc..0b141fe6c8 100644 --- a/configs/u-blox-c027/src/lpc17_leds.c +++ b/configs/u-blox-c027/src/lpc17_leds.c @@ -63,13 +63,13 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO -# define ledvdbg lldbg +# define ledinfo lldbg # else -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # define leddbg(x...) -# define ledvdbg(x...) +# 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 640732aa47..2655f043be 100644 --- a/configs/u-blox-c027/src/lpc17_ssp.c +++ b/configs/u-blox-c027/src/lpc17_ssp.c @@ -66,14 +66,14 @@ #ifdef SSP_DEBUG # define sspdbg lldbg # ifdef SSP_VERBOSE -# define sspvdbg lldbg +# define sspinfo lldbg # else -# define sspvdbg(x...) +# define sspinfo(x...) # endif #else # undef SSP_VERBOSE # define sspdbg(x...) -# define sspvdbg(x...) +# define sspinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/u-blox-c027/src/lpc17_ubxmdm.c b/configs/u-blox-c027/src/lpc17_ubxmdm.c index a6615e54aa..0bcd837b4a 100644 --- a/configs/u-blox-c027/src/lpc17_ubxmdm.c +++ b/configs/u-blox-c027/src/lpc17_ubxmdm.c @@ -63,14 +63,14 @@ #ifdef CONFIG_MODEM_U_BLOX_DEBUG # define m_dbg dbg -# define m_vdbg vdbg +# define m_info info # define m_vlldbg lldbg -# define m_vllvdbg llvdbg +# define m_vllinfo llinfo #else # define m_dbg(x...) -# define m_vdbg(x...) +# define m_info(x...) # define m_lldbg(x...) -# define m_llvdbg(x...) +# define m_llinfo(x...) #endif #define UBXMDM_REGISTER_COUNT \ diff --git a/configs/ubw32/src/pic32_leds.c b/configs/ubw32/src/pic32_leds.c index fdcf200f9f..d6d492cda5 100644 --- a/configs/ubw32/src/pic32_leds.c +++ b/configs/ubw32/src/pic32_leds.c @@ -100,15 +100,15 @@ #if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS) # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO -# define ledvdbg lldbg +# define ledinfo lldbg # else -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # undef CONFIG_DEBUG_LEDS # undef CONFIG_DEBUG_INFO # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/us7032evb1/shterm/shterm.c b/configs/us7032evb1/shterm/shterm.c index 83284d493b..0913f61dcf 100644 --- a/configs/us7032evb1/shterm/shterm.c +++ b/configs/us7032evb1/shterm/shterm.c @@ -63,7 +63,7 @@ #define DEFAULT_BAUD 9600 #define dbg(format, ...) if (debug > 0) printconsole(format, ##__VA_ARGS__) -#define vdbg(format, ...) if (debug > 1) printconsole(format, ##__VA_ARGS__) +#define info(format, ...) if (debug > 1) printconsole(format, ##__VA_ARGS__) /**************************************************************************** * Private Types diff --git a/configs/viewtool-stm32f107/src/stm32_can.c b/configs/viewtool-stm32f107/src/stm32_can.c index c6d0616ee3..8e3a6b38a0 100644 --- a/configs/viewtool-stm32f107/src/stm32_can.c +++ b/configs/viewtool-stm32f107/src/stm32_can.c @@ -66,14 +66,14 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg -# define canvdbg vdbg +# define caninfo info # define canlldbg lldbg -# define canllvdbg llvdbg +# define canllinfo llinfo #else # define candbg(x...) -# define canvdbg(x...) +# define caninfo(x...) # define canlldbg(x...) -# define canllvdbg(x...) +# define canllinfo(x...) #endif /************************************************************************************ diff --git a/configs/viewtool-stm32f107/src/stm32_leds.c b/configs/viewtool-stm32f107/src/stm32_leds.c index 7a565bf5b7..49cac84523 100644 --- a/configs/viewtool-stm32f107/src/stm32_leds.c +++ b/configs/viewtool-stm32f107/src/stm32_leds.c @@ -59,10 +59,10 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg -# define ledvdbg llvdbg +# define ledinfo llinfo #else # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** diff --git a/configs/viewtool-stm32f107/src/stm32_mmcsd.c b/configs/viewtool-stm32f107/src/stm32_mmcsd.c index 0ca39d6b06..bc10a38cee 100644 --- a/configs/viewtool-stm32f107/src/stm32_mmcsd.c +++ b/configs/viewtool-stm32f107/src/stm32_mmcsd.c @@ -104,7 +104,7 @@ int stm32_sdinitialize(int minor) return -ENODEV; } - fvdbg("Initialized SDIO slot %d\n", STM32_MMCSDSLOTNO); + finfo("Initialized SDIO slot %d\n", STM32_MMCSDSLOTNO); /* Now bind the SDIO interface to the MMC/SD driver */ @@ -115,7 +115,7 @@ int stm32_sdinitialize(int minor) STM32_MMCSDSLOTNO, minor); } - fvdbg("Bound SDIO slot %d to the MMC/SD driver, minor=%d\n", + finfo("Bound SDIO slot %d to the MMC/SD driver, minor=%d\n", STM32_MMCSDSLOTNO, minor); /* Then let's guess and say that there is a card in the slot. I need to check to diff --git a/configs/viewtool-stm32f107/src/stm32_spi.c b/configs/viewtool-stm32f107/src/stm32_spi.c index 6f9cca78b2..398416010b 100644 --- a/configs/viewtool-stm32f107/src/stm32_spi.c +++ b/configs/viewtool-stm32f107/src/stm32_spi.c @@ -65,14 +65,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /************************************************************************************ diff --git a/configs/viewtool-stm32f107/src/stm32_ssd1289.c b/configs/viewtool-stm32f107/src/stm32_ssd1289.c index 8c83d34ea9..69fe2590a0 100644 --- a/configs/viewtool-stm32f107/src/stm32_ssd1289.c +++ b/configs/viewtool-stm32f107/src/stm32_ssd1289.c @@ -105,10 +105,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg dbg -# define lcdvdbg vdbg +# define lcdinfo info #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /************************************************************************************** @@ -548,7 +548,7 @@ int board_lcd_initialize(void) if (!g_ssd1289drvr) { - lcdvdbg("Initializing\n"); + lcdinfo("Initializing\n"); /* Initialize the backlight */ diff --git a/configs/viewtool-stm32f107/src/stm32_touchscreen.c b/configs/viewtool-stm32f107/src/stm32_touchscreen.c index 7106fcdc96..85b7295427 100644 --- a/configs/viewtool-stm32f107/src/stm32_touchscreen.c +++ b/configs/viewtool-stm32f107/src/stm32_touchscreen.c @@ -173,12 +173,12 @@ static int tsc_attach(FAR struct ads7843e_config_s *state, xcpt_t isr) * be attached when the interrupt is next enabled. */ - ivdbg("Attaching %p\n", isr); + iinfo("Attaching %p\n", isr); priv->handler = isr; } else { - ivdbg("Detaching %p\n", priv->handler); + iinfo("Detaching %p\n", priv->handler); tsc_enable(state, false); priv->handler = NULL; } @@ -228,7 +228,7 @@ static bool tsc_pendown(FAR struct ads7843e_config_s *state) /* The /PENIRQ value is active low */ bool pendown = !stm32_gpioread(GPIO_LCDTP_IRQ); - ivdbg("pendown=%d\n", pendown); + iinfo("pendown=%d\n", pendown); return pendown; } diff --git a/configs/zkit-arm-1769/src/lpc17_can.c b/configs/zkit-arm-1769/src/lpc17_can.c index 4d63da365b..89e5550973 100644 --- a/configs/zkit-arm-1769/src/lpc17_can.c +++ b/configs/zkit-arm-1769/src/lpc17_can.c @@ -71,14 +71,14 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg -# define canvdbg vdbg +# define caninfo info # define canlldbg lldbg -# define canllvdbg llvdbg +# define canllinfo llinfo #else # define candbg(x...) -# define canvdbg(x...) +# define caninfo(x...) # define canlldbg(x...) -# define canllvdbg(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 80da662a76..a196c48e61 100644 --- a/configs/zkit-arm-1769/src/lpc17_lcd.c +++ b/configs/zkit-arm-1769/src/lpc17_lcd.c @@ -78,14 +78,14 @@ #ifdef LCD_DEBUG # define leddbg lldbg # ifdef LCD_VERBOSE -# define ledvdbg lldbg +# define ledinfo lldbg # else -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # undef LCD_VERBOSE # define leddbg(x...) -# define ledvdbg(x...) +# define ledinfo(x...) #endif /**************************************************************************** @@ -141,7 +141,7 @@ FAR struct lcd_dev_s *board_lcd_getdev(int lcddev) } else { - gllvdbg("Bound SSI port 0 to OLCD %d\n", lcddev); + gllinfo("Bound SSI port 0 to OLCD %d\n", lcddev); /* And turn the OLCD on (CONFIG_LCD_MAXPOWER should be 1) */ (void)g_lcddev->setpower(g_lcddev, CONFIG_LCD_MAXPOWER); diff --git a/configs/zkit-arm-1769/src/lpc17_leds.c b/configs/zkit-arm-1769/src/lpc17_leds.c index a96f0678fb..75f62c931a 100644 --- a/configs/zkit-arm-1769/src/lpc17_leds.c +++ b/configs/zkit-arm-1769/src/lpc17_leds.c @@ -69,13 +69,13 @@ #ifdef CONFIG_DEBUG_LEDS # define leddbg lldbg # ifdef CONFIG_DEBUG_INFO -# define ledvdbg lldbg +# define ledinfo lldbg # else -# define ledvdbg(x...) +# define ledinfo(x...) # endif #else # define leddbg(x...) -# define ledvdbg(x...) +# 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 98a2cc7839..8a74fa0880 100644 --- a/configs/zkit-arm-1769/src/lpc17_spi.c +++ b/configs/zkit-arm-1769/src/lpc17_spi.c @@ -68,13 +68,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/zkit-arm-1769/src/lpc17_ssp.c b/configs/zkit-arm-1769/src/lpc17_ssp.c index fdf95550a5..b0e65a378b 100644 --- a/configs/zkit-arm-1769/src/lpc17_ssp.c +++ b/configs/zkit-arm-1769/src/lpc17_ssp.c @@ -68,13 +68,13 @@ #ifdef CONFIG_DEBUG_SPI # define sspdbg lldbg # ifdef CONFIG_DEBUG_INFO -# define sspvdbg lldbg +# define sspinfo lldbg # else -# define sspvdbg(x...) +# define sspinfo(x...) # endif #else # define sspdbg(x...) -# define sspvdbg(x...) +# define sspinfo(x...) #endif /* Dump GPIO registers */ diff --git a/configs/zp214xpa/src/lpc2148_spi1.c b/configs/zp214xpa/src/lpc2148_spi1.c index 1b621d9263..06d4853c87 100644 --- a/configs/zp214xpa/src/lpc2148_spi1.c +++ b/configs/zp214xpa/src/lpc2148_spi1.c @@ -92,13 +92,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /* Clocking */ @@ -546,7 +546,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw * and (3) there are more bytes to be sent. */ - spivdbg("TX: rxpending: %d nwords: %d\n", rxpending, nwords); + spiinfo("TX: rxpending: %d nwords: %d\n", rxpending, nwords); while ((getreg8(LPC214X_SPI1_SR) & LPC214X_SPI1SR_TNF) && (rxpending < LPC214X_SPI1_FIFOSZ) && nwords) { @@ -557,7 +557,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw /* Now, read the RX data from the RX FIFO while the RX FIFO is not empty */ - spivdbg("RX: rxpending: %d\n", rxpending); + spiinfo("RX: rxpending: %d\n", rxpending); while (getreg8(LPC214X_SPI1_SR) & LPC214X_SPI1SR_RNE) { *ptr++ = (uint8_t)getreg16(LPC214X_SPI1_DR); diff --git a/configs/zp214xpa/src/lpc2148_ug2864ambag01.c b/configs/zp214xpa/src/lpc2148_ug2864ambag01.c index c857b43ba8..ed20003a58 100644 --- a/configs/zp214xpa/src/lpc2148_ug2864ambag01.c +++ b/configs/zp214xpa/src/lpc2148_ug2864ambag01.c @@ -101,10 +101,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg(format, ...) dbg(format, ##__VA_ARGS__) -# define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define lcdinfo(format, ...) info(format, ##__VA_ARGS__) #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /**************************************************************************** @@ -143,7 +143,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) regval32 = getreg32(RESET_DIR_REGISTER); putreg32(regval32 | bits32, RESET_DIR_REGISTER); - lcdvdbg("RESET Pin Config: PINSEL1: %08x PIN: %08x DIR: %08x\n", + lcdinfo("RESET Pin Config: PINSEL1: %08x PIN: %08x DIR: %08x\n", getreg32(LPC214X_PINSEL1), getreg32(RESET_PIN_REGISTER), getreg32(RESET_DIR_REGISTER)); @@ -152,7 +152,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) up_mdelay(20); putreg32(bits32, RESET_SET_REGISTER); - lcdvdbg("RESET release: PIN: %08x DIR: %08x\n", + lcdinfo("RESET release: PIN: %08x DIR: %08x\n", getreg32(RESET_PIN_REGISTER), getreg32(RESET_DIR_REGISTER)); /* Get the SPI1 port interface */ @@ -173,7 +173,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) } else { - lcdvdbg("Bound SPI port 1 to OLED %d\n", devno); + lcdinfo("Bound SPI port 1 to OLED %d\n", devno); /* And turn the OLED on */ diff --git a/crypto/crypto.c b/crypto/crypto.c index 401417d874..e7c5594eb1 100644 --- a/crypto/crypto.c +++ b/crypto/crypto.c @@ -85,7 +85,7 @@ int up_cryptoinitialize(void) } else { - cryptllvdbg("crypto test OK\n"); + cryptllinfo("crypto test OK\n"); } #endif diff --git a/drivers/analog/adc.c b/drivers/analog/adc.c index 3dc8a4e42c..92dd84d2b2 100644 --- a/drivers/analog/adc.c +++ b/drivers/analog/adc.c @@ -233,7 +233,7 @@ static ssize_t adc_read(FAR struct file *filep, FAR char *buffer, size_t buflen) int ret = 0; int msglen; - avdbg("buflen: %d\n", (int)buflen); + ainfo("buflen: %d\n", (int)buflen); if (buflen % 5 == 0) msglen = 5; @@ -351,7 +351,7 @@ return_with_irqdisabled: leave_critical_section(flags); } - avdbg("Returning: %d\n", ret); + ainfo("Returning: %d\n", ret); return ret; } diff --git a/drivers/analog/pga11x.c b/drivers/analog/pga11x.c index 355cd9b041..ec991e0d06 100644 --- a/drivers/analog/pga11x.c +++ b/drivers/analog/pga11x.c @@ -112,13 +112,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg dbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg dbg +# define spiinfo dbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /**************************************************************************** @@ -138,7 +138,7 @@ static void pga11x_configure(FAR struct spi_dev_s *spi) { - spivdbg("MODE: %d BITS: 8 Frequency: %d\n", + spiinfo("MODE: %d BITS: 8 Frequency: %d\n", CONFIG_PGA11X_SPIMODE, CONFIG_PGA11X_SPIFREQUENCY); /* Call the setfrequency, setbits, and setmode methods to make sure that @@ -164,7 +164,7 @@ static void pga11x_configure(FAR struct spi_dev_s *spi) static void pga11x_lock(FAR struct spi_dev_s *spi) { - spivdbg("Locking\n"); + spiinfo("Locking\n"); /* On SPI busses where there are multiple devices, it will be necessary to * lock SPI to have exclusive access to the busses for a sequence of @@ -198,7 +198,7 @@ static void pga11x_lock(FAR struct spi_dev_s *spi) static inline void pga11x_unlock(FAR struct spi_dev_s *spi) { - spivdbg("Unlocking\n"); + spiinfo("Unlocking\n"); SPI_LOCK(spi, false); } @@ -223,7 +223,7 @@ static inline void pga11x_unlock(FAR struct spi_dev_s *spi) static void pga11x_send16(FAR struct spi_dev_s *spi, uint16_t word) { - spivdbg("Send %04x\n", word); + spiinfo("Send %04x\n", word); /* The logical interface is 16-bits wide. However, this driver uses a * 8-bit configuration for greaer portability. @@ -265,7 +265,7 @@ static uint16_t pga11x_recv16(FAR struct spi_dev_s *spi) msb = SPI_SEND(spi, SPI_DUMMY); lsb = SPI_SEND(spi, SPI_DUMMY); - spivdbg("Received %02x %02x\n", msb, lsb); + spiinfo("Received %02x %02x\n", msb, lsb); return ((uint16_t)msb << 8) | (uint16_t)lsb; } @@ -293,7 +293,7 @@ static uint16_t pga11x_recv16(FAR struct spi_dev_s *spi) #ifndef CONFIG_PGA11X_DAISYCHAIN static void pga11x_write(FAR struct spi_dev_s *spi, uint16_t cmd) { - spivdbg("cmd %04x\n", cmd); + spiinfo("cmd %04x\n", cmd); /* Lock, select, send the 16-bit command, de-select, and un-lock. */ @@ -306,7 +306,7 @@ static void pga11x_write(FAR struct spi_dev_s *spi, uint16_t cmd) #else static void pga11x_write(FAR struct spi_dev_s *spi, uint16_t u1cmd, uint16_t u2cmd) { - spivdbg("U1 cmd: %04x U2 cmd: %04x\n", u1cmd, u2cmd); + spiinfo("U1 cmd: %04x U2 cmd: %04x\n", u1cmd, u2cmd); /* Lock, select, send the U2 16-bit command, the U1 16-bit command, de-select, * and un-lock. @@ -343,7 +343,7 @@ static void pga11x_write(FAR struct spi_dev_s *spi, uint16_t u1cmd, uint16_t u2c PGA11X_HANDLE pga11x_initialize(FAR struct spi_dev_s *spi) { - spivdbg("Entry\n"); + spiinfo("Entry\n"); /* No Special state is required, just return the SPI driver instance as * the handle. This gives us a place to extend functionality in the @@ -380,7 +380,7 @@ int pga11x_select(PGA11X_HANDLE handle, uint16_t cmd; DEBUGASSERT(handle && settings); - spivdbg("channel: %d gain: %d\n", settings->channel, settings->gain); + spiinfo("channel: %d gain: %d\n", settings->channel, settings->gain); /* Format the command */ @@ -398,8 +398,8 @@ int pga11x_select(PGA11X_HANDLE handle, uint16_t u2cmd; DEBUGASSERT(handle && settings); - spivdbg("U1 channel: %d gain: %d\n", settings->u1.channel, settings->u1.gain); - spivdbg("U1 channel: %d gain: %d\n", settings->u1.channel, settings->u1.gain); + spiinfo("U1 channel: %d gain: %d\n", settings->u1.channel, settings->u1.gain); + spiinfo("U1 channel: %d gain: %d\n", settings->u1.channel, settings->u1.gain); /* Format the commands */ @@ -445,7 +445,7 @@ int pga11x_uselect(PGA11X_HANDLE handle, int pos, uint16_t u1cmd; uint16_t u2cmd; - spivdbg("channel: %d gain: %d\n", settings->channel, settings->gain); + spiinfo("channel: %d gain: %d\n", settings->channel, settings->gain); DEBUGASSERT(handle); /* Format the commands */ @@ -498,7 +498,7 @@ int pga11x_read(PGA11X_HANDLE handle, FAR struct pga11x_settings_s *settings) uint16_t u1value; uint16_t u2value; - spivdbg("Entry\n"); + spiinfo("Entry\n"); DEBUGASSERT(handle && settings); /* Lock the bus and read the configuration */ @@ -526,7 +526,7 @@ int pga11x_read(PGA11X_HANDLE handle, FAR struct pga11x_settings_s *settings) /* Decode the returned value */ - spivdbg("Returning %04x %04x\n", u2value, u1value); + spiinfo("Returning %04x %04x\n", u2value, u1value); settings->u1.channel = (uint8_t)((u1value & PGA11X_CHAN_MASK) >> PGA11X_CHAN_SHIFT); settings->u1.gain = (uint8_t)((u1value & PGA11X_GAIN_MASK) >> PGA11X_GAIN_SHIFT); settings->u2.channel = (uint8_t)((u2value & PGA11X_CHAN_MASK) >> PGA11X_CHAN_SHIFT); @@ -536,7 +536,7 @@ int pga11x_read(PGA11X_HANDLE handle, FAR struct pga11x_settings_s *settings) FAR struct spi_dev_s *spi = (FAR struct spi_dev_s *)handle; uint16_t value; - spivdbg("Entry\n"); + spiinfo("Entry\n"); DEBUGASSERT(handle); /* Lock the bus and read the configuration */ @@ -561,7 +561,7 @@ int pga11x_read(PGA11X_HANDLE handle, FAR struct pga11x_settings_s *settings) /* Decode the returned value */ - spivdbg("Returning: %04x\n", value); + spiinfo("Returning: %04x\n", value); settings->channel = (uint8_t)((value & PGA11X_CHAN_MASK) >> PGA11X_CHAN_SHIFT); settings->gain = (uint8_t)((value & PGA11X_GAIN_MASK) >> PGA11X_GAIN_SHIFT); return OK; @@ -633,7 +633,7 @@ int pga11x_shutdown(PGA11X_HANDLE handle) { FAR struct spi_dev_s *spi = (FAR struct spi_dev_s *)handle; - spivdbg("Entry\n"); + spiinfo("Entry\n"); DEBUGASSERT(handle); /* Enter shutdown mode by issuing an SDN_EN command */ @@ -669,7 +669,7 @@ int pga11x_ushutdown(PGA11X_HANDLE handle, int pos) { FAR struct spi_dev_s *spi = (FAR struct spi_dev_s *)handle; - spivdbg("Entry\n"); + spiinfo("Entry\n"); DEBUGASSERT(handle); /* Enter shutdown mode by issuing an SDN_EN command */ @@ -709,7 +709,7 @@ int pga11x_enable(PGA11X_HANDLE handle) { FAR struct spi_dev_s *spi = (FAR struct spi_dev_s *)handle; - spivdbg("Entry\n"); + spiinfo("Entry\n"); DEBUGASSERT(handle); /* Lock the bus and send the shutdown disable command. Shutdown mode is @@ -748,7 +748,7 @@ int pga11x_uenable(PGA11X_HANDLE handle, int pos) { FAR struct spi_dev_s *spi = (FAR struct spi_dev_s *)handle; - spivdbg("Entry\n"); + spiinfo("Entry\n"); DEBUGASSERT(handle); /* Enter shutdown mode by issuing an SDN_EN command */ diff --git a/drivers/audio/audio_null.c b/drivers/audio/audio_null.c index f5a1337f5c..393eaa1399 100644 --- a/drivers/audio/audio_null.c +++ b/drivers/audio/audio_null.c @@ -178,7 +178,7 @@ static const struct audio_ops_s g_audioops = static int null_getcaps(FAR struct audio_lowerhalf_s *dev, int type, FAR struct audio_caps_s *caps) { - audvdbg("type=%d\n", type); + audinfo("type=%d\n", type); /* Validate the structure */ @@ -324,7 +324,7 @@ static int null_getcaps(FAR struct audio_lowerhalf_s *dev, int type, * proper Audio device type. */ - audvdbg("Return %d\n", caps->ac_len); + audinfo("Return %d\n", caps->ac_len); return caps->ac_len; } @@ -345,14 +345,14 @@ static int null_configure(FAR struct audio_lowerhalf_s *dev, FAR const struct audio_caps_s *caps) #endif { - audvdbg("ac_type: %d\n", caps->ac_type); + audinfo("ac_type: %d\n", caps->ac_type); /* Process the configure operation */ switch (caps->ac_type) { case AUDIO_TYPE_FEATURE: - audvdbg(" AUDIO_TYPE_FEATURE\n"); + audinfo(" AUDIO_TYPE_FEATURE\n"); /* Process based on Feature Unit */ @@ -360,17 +360,17 @@ static int null_configure(FAR struct audio_lowerhalf_s *dev, { #ifndef CONFIG_AUDIO_EXCLUDE_VOLUME case AUDIO_FU_VOLUME: - audvdbg(" Volume: %d\n", caps->ac_controls.hw[0]); + audinfo(" Volume: %d\n", caps->ac_controls.hw[0]); break; #endif /* CONFIG_AUDIO_EXCLUDE_VOLUME */ #ifndef CONFIG_AUDIO_EXCLUDE_TONE case AUDIO_FU_BASS: - audvdbg(" Bass: %d\n", caps->ac_controls.b[0]); + audinfo(" Bass: %d\n", caps->ac_controls.b[0]); break; case AUDIO_FU_TREBLE: - audvdbg(" Treble: %d\n", caps->ac_controls.b[0]); + audinfo(" Treble: %d\n", caps->ac_controls.b[0]); break; #endif /* CONFIG_AUDIO_EXCLUDE_TONE */ @@ -381,18 +381,18 @@ static int null_configure(FAR struct audio_lowerhalf_s *dev, break; case AUDIO_TYPE_OUTPUT: - audvdbg(" AUDIO_TYPE_OUTPUT:\n"); - audvdbg(" Number of channels: %u\n", caps->ac_channels); - audvdbg(" Sample rate: %u\n", caps->ac_controls.hw[0]); - audvdbg(" Sample width: %u\n", caps->ac_controls.b[2]); + audinfo(" AUDIO_TYPE_OUTPUT:\n"); + audinfo(" Number of channels: %u\n", caps->ac_channels); + audinfo(" Sample rate: %u\n", caps->ac_controls.hw[0]); + audinfo(" Sample width: %u\n", caps->ac_controls.b[2]); break; case AUDIO_TYPE_PROCESSING: - audvdbg(" AUDIO_TYPE_PROCESSING:\n"); + audinfo(" AUDIO_TYPE_PROCESSING:\n"); break; } - audvdbg("Return OK\n"); + audinfo("Return OK\n"); return OK; } @@ -406,7 +406,7 @@ static int null_configure(FAR struct audio_lowerhalf_s *dev, static int null_shutdown(FAR struct audio_lowerhalf_s *dev) { - audvdbg("Return OK\n"); + audinfo("Return OK\n"); return OK; } @@ -425,7 +425,7 @@ static void *null_workerthread(pthread_addr_t pvarg) int msglen; int prio; - audvdbg("Entry\n"); + audinfo("Entry\n"); /* Loop as long as we are supposed to be running */ @@ -486,7 +486,7 @@ static void *null_workerthread(pthread_addr_t pvarg) priv->dev.upper(priv->dev.priv, AUDIO_CALLBACK_COMPLETE, NULL, OK); #endif - audvdbg("Exit\n"); + audinfo("Exit\n"); return NULL; } @@ -511,7 +511,7 @@ static int null_start(FAR struct audio_lowerhalf_s *dev) FAR void *value; int ret; - audvdbg("Entry\n"); + audinfo("Entry\n"); /* Create a message queue for the worker thread */ @@ -535,7 +535,7 @@ static int null_start(FAR struct audio_lowerhalf_s *dev) if (priv->threadid != 0) { - audvdbg("Joining old thread\n"); + audinfo("Joining old thread\n"); pthread_join(priv->threadid, &value); } @@ -546,7 +546,7 @@ static int null_start(FAR struct audio_lowerhalf_s *dev) (void)pthread_attr_setschedparam(&tattr, &sparam); (void)pthread_attr_setstacksize(&tattr, CONFIG_AUDIO_NULL_WORKER_STACKSIZE); - audvdbg("Starting worker thread\n"); + audinfo("Starting worker thread\n"); ret = pthread_create(&priv->threadid, &tattr, null_workerthread, (pthread_addr_t)priv); if (ret != OK) @@ -556,10 +556,10 @@ static int null_start(FAR struct audio_lowerhalf_s *dev) else { pthread_setname_np(priv->threadid, "null audio"); - audvdbg("Created worker thread\n"); + audinfo("Created worker thread\n"); } - audvdbg("Return %d\n", ret); + audinfo("Return %d\n", ret); return ret; } @@ -597,7 +597,7 @@ static int null_stop(FAR struct audio_lowerhalf_s *dev) pthread_join(priv->threadid, &value); priv->threadid = 0; - audvdbg("Return OK\n"); + audinfo("Return OK\n"); return OK; } #endif @@ -616,7 +616,7 @@ static int null_pause(FAR struct audio_lowerhalf_s *dev, FAR void *session) static int null_pause(FAR struct audio_lowerhalf_s *dev) #endif { - audvdbg("Return OK\n"); + audinfo("Return OK\n"); return OK; } #endif /* CONFIG_AUDIO_EXCLUDE_PAUSE_RESUME */ @@ -635,7 +635,7 @@ static int null_resume(FAR struct audio_lowerhalf_s *dev, FAR void *session) static int null_resume(FAR struct audio_lowerhalf_s *dev) #endif { - audvdbg("Return OK\n"); + audinfo("Return OK\n"); return OK; } #endif /* CONFIG_AUDIO_EXCLUDE_PAUSE_RESUME */ @@ -653,7 +653,7 @@ static int null_enqueuebuffer(FAR struct audio_lowerhalf_s *dev, FAR struct null_dev_s *priv = (FAR struct null_dev_s *)dev; bool done; - audvdbg("apb=%p curbyte=%d nbytes=%d\n", apb, apb->curbyte, apb->nbytes); + audinfo("apb=%p curbyte=%d nbytes=%d\n", apb, apb->curbyte, apb->nbytes); /* Say that we consumed all of the data */ @@ -688,7 +688,7 @@ static int null_enqueuebuffer(FAR struct audio_lowerhalf_s *dev, #endif } - audvdbg("Return OK\n"); + audinfo("Return OK\n"); return OK; } @@ -702,7 +702,7 @@ static int null_enqueuebuffer(FAR struct audio_lowerhalf_s *dev, static int null_cancelbuffer(FAR struct audio_lowerhalf_s *dev, FAR struct ap_buffer_s *apb) { - audvdbg("apb=%p curbyte=%d nbytes=%d, return OK\n", + audinfo("apb=%p curbyte=%d nbytes=%d, return OK\n", apb, apb->curbyte, apb->nbytes); return OK; @@ -722,7 +722,7 @@ static int null_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd, FAR struct ap_buffer_info_s *bufinfo; #endif - audvdbg("cmd=%d arg=%ld\n"); + audinfo("cmd=%d arg=%ld\n"); /* Deal with ioctls passed from the upper-half driver */ @@ -734,7 +734,7 @@ static int null_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd, case AUDIOIOC_HWRESET: { - audvdbg("AUDIOIOC_HWRESET:\n"); + audinfo("AUDIOIOC_HWRESET:\n"); } break; @@ -743,7 +743,7 @@ static int null_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd, #ifdef CONFIG_AUDIO_DRIVER_SPECIFIC_BUFFERS case AUDIOIOC_GETBUFFERINFO: { - audvdbg("AUDIOIOC_GETBUFFERINFO:\n"); + audinfo("AUDIOIOC_GETBUFFERINFO:\n"); bufinfo = (FAR struct ap_buffer_info_s *) arg; bufinfo->buffer_size = CONFIG_AUDIO_NULL_BUFFER_SIZE; bufinfo->nbuffers = CONFIG_AUDIO_NULL_NUM_BUFFERS; @@ -755,7 +755,7 @@ static int null_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd, break; } - audvdbg("Return OK\n"); + audinfo("Return OK\n"); return OK; } @@ -773,7 +773,7 @@ static int null_reserve(FAR struct audio_lowerhalf_s *dev, static int null_reserve(FAR struct audio_lowerhalf_s *dev) #endif { - audvdbg("Return OK\n"); + audinfo("Return OK\n"); return OK; } diff --git a/drivers/audio/i2schar.c b/drivers/audio/i2schar.c index a047171428..8e11dd1149 100644 --- a/drivers/audio/i2schar.c +++ b/drivers/audio/i2schar.c @@ -89,16 +89,16 @@ # define i2sdbg dbg # define i2slldbg lldbg # ifdef CONFIG_DEBUG_INFO -# define i2svdbg dbg -# define i2sllvdbg lldbg +# define i2sinfo dbg +# define i2sllinfo lldbg # else -# define i2svdbg(x...) +# define i2sinfo(x...) # endif #else # define i2sdbg(x...) # define i2slldbg(x...) -# define i2svdbg(x...) -# define i2sllvdbg(x...) +# define i2sinfo(x...) +# define i2sllinfo(x...) #endif /**************************************************************************** @@ -174,7 +174,7 @@ static void i2schar_rxcallback(FAR struct i2s_dev_s *dev, FAR struct i2schar_dev_s *priv = (FAR struct i2schar_dev_s *)arg; DEBUGASSERT(priv && apb); - i2svdbg("apb=%p nbytes=%d result=%d\n", apb, apb->nbytes, result); + i2sinfo("apb=%p nbytes=%d result=%d\n", apb, apb->nbytes, result); /* REVISIT: If you want this to actually do something other than * test I2S data transfer, then this is the point where you would @@ -185,7 +185,7 @@ static void i2schar_rxcallback(FAR struct i2s_dev_s *dev, * now. */ - i2svdbg("Freeing apb=%p crefs=%d\n", apb, apb->crefs); + i2sinfo("Freeing apb=%p crefs=%d\n", apb, apb->crefs); apb_free(apb); } @@ -209,7 +209,7 @@ static void i2schar_txcallback(FAR struct i2s_dev_s *dev, FAR struct i2schar_dev_s *priv = (FAR struct i2schar_dev_s *)arg; DEBUGASSERT(priv && apb); - i2svdbg("apb=%p nbytes=%d result=%d\n", apb, apb->nbytes, result); + i2sinfo("apb=%p nbytes=%d result=%d\n", apb, apb->nbytes, result); /* REVISIT: If you want this to actually do something other than * test I2S data transfer, then this is the point where you would @@ -220,7 +220,7 @@ static void i2schar_txcallback(FAR struct i2s_dev_s *dev, * now. */ - i2svdbg("Freeing apb=%p crefs=%d\n", apb, apb->crefs); + i2sinfo("Freeing apb=%p crefs=%d\n", apb, apb->crefs); apb_free(apb); } @@ -241,7 +241,7 @@ static ssize_t i2schar_read(FAR struct file *filep, FAR char *buffer, size_t nbytes; int ret; - i2svdbg("buffer=%p buflen=%d\n", buffer, (int)buflen); + i2sinfo("buffer=%p buflen=%d\n", buffer, (int)buflen); /* Get our private data structure */ @@ -316,7 +316,7 @@ static ssize_t i2schar_write(FAR struct file *filep, FAR const char *buffer, size_t nbytes; int ret; - i2svdbg("buffer=%p buflen=%d\n", buffer, (int)buflen); + i2sinfo("buffer=%p buflen=%d\n", buffer, (int)buflen); /* Get our private data structure */ diff --git a/drivers/audio/vs1053.c b/drivers/audio/vs1053.c index 68167ca31e..3af6418b79 100644 --- a/drivers/audio/vs1053.c +++ b/drivers/audio/vs1053.c @@ -329,7 +329,7 @@ static void vs1053_writereg(FAR struct vs1053_struct_s *dev, uint8_t reg, uint16 /* Select the AUDIO_CTRL device on the SPI bus */ - audvdbg("Write Reg %d = 0x%0X\n", reg, val); + audinfo("Write Reg %d = 0x%0X\n", reg, val); SPI_SELECT(spi, SPIDEV_AUDIO_CTRL, true); @@ -365,7 +365,7 @@ static int vs1053_setfrequency(FAR struct vs1053_struct_s *dev, uint32_t freq) uint16_t reg; uint8_t timeout; - audvdbg("Entry\n"); + audinfo("Entry\n"); /* Calculate the clock divisor based on the input frequency */ @@ -375,7 +375,7 @@ static int vs1053_setfrequency(FAR struct vs1053_struct_s *dev, uint32_t freq) if (factor > 50.0) { - audvdbg("Frequency too high! Limiting to XTALI * 5\n"); + audinfo("Frequency too high! Limiting to XTALI * 5\n"); factor = 50.0; return -EINVAL; } @@ -566,7 +566,7 @@ static void vs1053_setbass(FAR struct vs1053_struct_s *dev) static int vs1053_getcaps(FAR struct audio_lowerhalf_s *lower, int type, FAR struct audio_caps_s *pCaps) { - audvdbg("Entry\n"); + audinfo("Entry\n"); /* Validate the structure */ @@ -769,7 +769,7 @@ static int vs1053_configure(FAR struct audio_lowerhalf_s *lower, FAR struct vs1053_struct_s *dev = (struct vs1053_struct_s *) lower; #endif - audvdbg("Entry\n"); + audinfo("Entry\n"); /* Process the configure operation */ @@ -924,7 +924,7 @@ static int vs1053_shutdown(FAR struct audio_lowerhalf_s *lower) FAR struct vs1053_struct_s *dev = (struct vs1053_struct_s *) lower; FAR struct spi_dev_s *spi = dev->spi; - audvdbg("Entry\n"); + audinfo("Entry\n"); vs1053_spi_lock(spi, dev->spi_freq); /* Lock the device */ vs1053_setfrequency(dev, CONFIG_VS1053_XTALI); /* Reduce speed to minimum */ vs1053_writereg(dev, VS1053_SCI_VOL, 0xFEFE); /* Power down the DAC outputs */ @@ -1630,7 +1630,7 @@ static int vs1053_enqueuebuffer(FAR struct audio_lowerhalf_s *lower, struct audio_msg_s term_msg; int ret; - audvdbg("Entry\n"); + audinfo("Entry\n"); /* Lock access to the apbq */ diff --git a/drivers/audio/wm8904.c b/drivers/audio/wm8904.c index a437c137e8..de116ac9b9 100644 --- a/drivers/audio/wm8904.c +++ b/drivers/audio/wm8904.c @@ -304,11 +304,11 @@ uint16_t wm8904_readreg(FAR struct wm8904_dev_s *priv, uint8_t regaddr) */ regval = ((uint16_t)data[0] << 8) | (uint16_t)data[1]; - audvdbg("Read: %02x -> %04x\n", regaddr, regval); + audinfo("Read: %02x -> %04x\n", regaddr, regval); return regval; } - audvdbg("retries=%d regaddr=%02x\n", retries, regaddr); + audinfo("retries=%d regaddr=%02x\n", retries, regaddr); } /* No error indication is returned on a failure... just return zero */ @@ -377,11 +377,11 @@ static void wm8904_writereg(FAR struct wm8904_dev_s *priv, uint8_t regaddr, * return the value read. */ - audvdbg("Write: %02x <- %04x\n", regaddr, regval); + audinfo("Write: %02x <- %04x\n", regaddr, regval); return; } - audvdbg("retries=%d regaddr=%02x\n", retries, regaddr); + audinfo("retries=%d regaddr=%02x\n", retries, regaddr); } } @@ -439,7 +439,7 @@ static void wm8904_setvolume(FAR struct wm8904_dev_s *priv, uint16_t volume, uint32_t rightlevel; uint16_t regval; - audvdbg("volume=%u mute=%u\n", volume, mute); + audinfo("volume=%u mute=%u\n", volume, mute); #ifndef CONFIG_AUDIO_EXCLUDE_BALANCE /* Calculate the left channel volume level {0..1000} */ @@ -514,7 +514,7 @@ static void wm8904_setvolume(FAR struct wm8904_dev_s *priv, uint16_t volume, #ifndef CONFIG_AUDIO_EXCLUDE_TONE static void wm8904_setbass(FAR struct wm8904_dev_s *priv, uint8_t bass) { - audvdbg("bass=%u\n", bass); + audinfo("bass=%u\n", bass); #warning Missing logic } #endif /* CONFIG_AUDIO_EXCLUDE_TONE */ @@ -532,7 +532,7 @@ static void wm8904_setbass(FAR struct wm8904_dev_s *priv, uint8_t bass) #ifndef CONFIG_AUDIO_EXCLUDE_TONE static void wm8904_settreble(FAR struct wm8904_dev_s *priv, uint8_t treble) { - audvdbg("treble=%u\n", treble); + audinfo("treble=%u\n", treble); #warning Missing logic } #endif /* CONFIG_AUDIO_EXCLUDE_TONE */ @@ -658,7 +658,7 @@ static void wm8904_setbitrate(FAR struct wm8904_dev_s *priv) regval = WM8904_LRCLK_DIR | WM8904_LRCLK_RATE(framelen << 1); wm8904_writereg(priv, WM8904_AIF3, regval); - audvdbg("sample rate=%u nchannels=%u bpsamp=%u framelen=%d fout=%lu\n", + audinfo("sample rate=%u nchannels=%u bpsamp=%u framelen=%d fout=%lu\n", priv->samprate, priv->nchannels, priv->bpsamp, framelen, (unsigned long)fout); @@ -815,10 +815,10 @@ static void wm8904_setbitrate(FAR struct wm8904_dev_s *priv) tmp64 = ((uint64_t)fvco << 16) / (g_fllratio[fllndx] * fref); nk = (b16_t)tmp64; - audvdbg("mclk=%lu fref=%lu fvco=%lu fout=%lu divndx=%u\n", + audinfo("mclk=%lu fref=%lu fvco=%lu fout=%lu divndx=%u\n", (unsigned long)priv->lower->mclk, (unsigned long)fref, (unsigned long)fvco, (unsigned long)fout, divndx); - audvdbg("N.K=%08lx outdiv=%u fllratio=%u\n", + audinfo("N.K=%08lx outdiv=%u fllratio=%u\n", (unsigned long)nk, outdiv, g_fllratio[fllndx]); /* Save the actual bit rate that we are using. This will be used by the @@ -961,7 +961,7 @@ static int wm8904_getcaps(FAR struct audio_lowerhalf_s *dev, int type, /* Validate the structure */ DEBUGASSERT(caps && caps->ac_len >= sizeof(struct audio_caps_s)); - audvdbg("type=%d ac_type=%d\n", type, caps->ac_type); + audinfo("type=%d ac_type=%d\n", type, caps->ac_type); /* Fill in the caller's structure based on requested info */ @@ -1129,14 +1129,14 @@ static int wm8904_configure(FAR struct audio_lowerhalf_s *dev, int ret = OK; DEBUGASSERT(priv && caps); - audvdbg("ac_type: %d\n", caps->ac_type); + audinfo("ac_type: %d\n", caps->ac_type); /* Process the configure operation */ switch (caps->ac_type) { case AUDIO_TYPE_FEATURE: - audvdbg(" AUDIO_TYPE_FEATURE\n"); + audinfo(" AUDIO_TYPE_FEATURE\n"); /* Process based on Feature Unit */ @@ -1148,7 +1148,7 @@ static int wm8904_configure(FAR struct audio_lowerhalf_s *dev, /* Set the volume */ uint16_t volume = caps->ac_controls.hw[0]; - audvdbg(" Volume: %d\n", volume); + audinfo(" Volume: %d\n", volume); if (volume >= 0 && volume <= 1000) { @@ -1172,7 +1172,7 @@ static int wm8904_configure(FAR struct audio_lowerhalf_s *dev, */ uint8_t bass = caps->ac_controls.b[0]; - audvdbg(" Bass: %d\n", bass); + audinfo(" Bass: %d\n", bass); if (bass <= 100) { @@ -1192,7 +1192,7 @@ static int wm8904_configure(FAR struct audio_lowerhalf_s *dev, */ uint8_t treble = caps->ac_controls.b[0]; - audvdbg(" Treble: %d\n", treble); + audinfo(" Treble: %d\n", treble); if (treble <= 100) { @@ -1215,10 +1215,10 @@ static int wm8904_configure(FAR struct audio_lowerhalf_s *dev, case AUDIO_TYPE_OUTPUT: { - audvdbg(" AUDIO_TYPE_OUTPUT:\n"); - audvdbg(" Number of channels: %u\n", caps->ac_channels); - audvdbg(" Sample rate: %u\n", caps->ac_controls.hw[0]); - audvdbg(" Sample width: %u\n", caps->ac_controls.b[2]); + audinfo(" AUDIO_TYPE_OUTPUT:\n"); + audinfo(" Number of channels: %u\n", caps->ac_channels); + audinfo(" Sample rate: %u\n", caps->ac_controls.hw[0]); + audinfo(" Sample width: %u\n", caps->ac_controls.b[2]); /* Verify that all of the requested values are supported */ @@ -1308,7 +1308,7 @@ static void wm8904_senddone(FAR struct i2s_dev_s *i2s, int ret; DEBUGASSERT(i2s && priv && priv->running && apb); - audvdbg("apb=%p inflight=%d result=%d\n", apb, priv->inflight, result); + audinfo("apb=%p inflight=%d result=%d\n", apb, priv->inflight, result); /* We do not place any restriction on the context in which this function * is called. It may be called from an interrupt handler. Therefore, the @@ -1377,7 +1377,7 @@ static void wm8904_returnbuffers(FAR struct wm8904_dev_s *priv) apb = (FAR struct ap_buffer_s *)dq_remfirst(&priv->doneq); leave_critical_section(flags); - audvdbg("Returning: apb=%p curbyte=%d nbytes=%d flags=%04x\n", + audinfo("Returning: apb=%p curbyte=%d nbytes=%d flags=%04x\n", apb, apb->curbyte, apb->nbytes, apb->flags); /* Are we returning the final buffer in the stream? */ @@ -1395,7 +1395,7 @@ static void wm8904_returnbuffers(FAR struct wm8904_dev_s *priv) * worker thread to exit (if it is not already terminating). */ - audvdbg("Terminating\n"); + audinfo("Terminating\n"); priv->terminating = true; } @@ -1454,7 +1454,7 @@ static int wm8904_sendbuffer(FAR struct wm8904_dev_s *priv) /* Take next buffer from the queue of pending transfers */ apb = (FAR struct ap_buffer_s *)dq_remfirst(&priv->pendq); - audvdbg("Sending apb=%p, size=%d inflight=%d\n", + audinfo("Sending apb=%p, size=%d inflight=%d\n", apb, apb->nbytes, priv->inflight); /* Increment the number of buffers in-flight before sending in order @@ -1526,7 +1526,7 @@ static int wm8904_start(FAR struct audio_lowerhalf_s *dev) FAR void *value; int ret; - audvdbg("Entry\n"); + audinfo("Entry\n"); /* Exit reduced power modes of operation */ /* REVISIT */ @@ -1553,7 +1553,7 @@ static int wm8904_start(FAR struct audio_lowerhalf_s *dev) if (priv->threadid != 0) { - audvdbg("Joining old thread\n"); + audinfo("Joining old thread\n"); pthread_join(priv->threadid, &value); } @@ -1564,7 +1564,7 @@ static int wm8904_start(FAR struct audio_lowerhalf_s *dev) (void)pthread_attr_setschedparam(&tattr, &sparam); (void)pthread_attr_setstacksize(&tattr, CONFIG_WM8904_WORKER_STACKSIZE); - audvdbg("Starting worker thread\n"); + audinfo("Starting worker thread\n"); ret = pthread_create(&priv->threadid, &tattr, wm8904_workerthread, (pthread_addr_t)priv); if (ret != OK) @@ -1574,7 +1574,7 @@ static int wm8904_start(FAR struct audio_lowerhalf_s *dev) else { pthread_setname_np(priv->threadid, "wm8904"); - audvdbg("Created worker thread\n"); + audinfo("Created worker thread\n"); } return ret; @@ -1694,7 +1694,7 @@ static int wm8904_enqueuebuffer(FAR struct audio_lowerhalf_s *dev, struct audio_msg_s term_msg; int ret; - audvdbg("Enqueueing: apb=%p curbyte=%d nbytes=%d flags=%04x\n", + audinfo("Enqueueing: apb=%p curbyte=%d nbytes=%d flags=%04x\n", apb, apb->curbyte, apb->nbytes, apb->flags); /* Take a reference on the new audio buffer */ @@ -1744,7 +1744,7 @@ static int wm8904_enqueuebuffer(FAR struct audio_lowerhalf_s *dev, static int wm8904_cancelbuffer(FAR struct audio_lowerhalf_s *dev, FAR struct ap_buffer_s *apb) { - audvdbg("apb=%p\n", apb); + audinfo("apb=%p\n", apb); return OK; } @@ -1777,7 +1777,7 @@ static int wm8904_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd, * registers back in their default state. */ - audvdbg("AUDIOIOC_HWRESET:\n"); + audinfo("AUDIOIOC_HWRESET:\n"); } break; @@ -1786,7 +1786,7 @@ static int wm8904_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd, #ifdef CONFIG_AUDIO_DRIVER_SPECIFIC_BUFFERS case AUDIOIOC_GETBUFFERINFO: { - audvdbg("AUDIOIOC_GETBUFFERINFO:\n"); + audinfo("AUDIOIOC_GETBUFFERINFO:\n"); bufinfo = (FAR struct ap_buffer_info_s *) arg; bufinfo->buffer_size = CONFIG_WM8904_BUFFER_SIZE; bufinfo->nbuffers = CONFIG_WM8904_NUM_BUFFERS; @@ -1795,7 +1795,7 @@ static int wm8904_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd, #endif default: - audvdbg("Ignored\n"); + audinfo("Ignored\n"); break; } @@ -1908,7 +1908,7 @@ static void wm8904_interrupt_work(FAR void *arg) /* Sample the interrupt status */ regval = wm8904_readreg(priv, WM8904_INT_STATUS); - audvdbg("INT_STATUS: %04x\n", regval); + audinfo("INT_STATUS: %04x\n", regval); /* Check for the FLL lock interrupt. We are sloppy here since at * present, only the FLL lock interrupt is used. @@ -1994,7 +1994,7 @@ static void *wm8904_workerthread(pthread_addr_t pvarg) int msglen; int prio; - audvdbg("Entry\n"); + audinfo("Entry\n"); #ifndef CONFIG_AUDIO_EXCLUDE_STOP priv->terminating = false; @@ -2055,7 +2055,7 @@ static void *wm8904_workerthread(pthread_addr_t pvarg) */ case AUDIO_MSG_DATA_REQUEST: - audvdbg("AUDIO_MSG_DATA_REQUEST\n"); + audinfo("AUDIO_MSG_DATA_REQUEST\n"); break; /* Stop the playback */ @@ -2064,7 +2064,7 @@ static void *wm8904_workerthread(pthread_addr_t pvarg) case AUDIO_MSG_STOP: /* Indicate that we are terminating */ - audvdbg("AUDIO_MSG_STOP: Terminating\n"); + audinfo("AUDIO_MSG_STOP: Terminating\n"); priv->terminating = true; break; #endif @@ -2074,13 +2074,13 @@ static void *wm8904_workerthread(pthread_addr_t pvarg) */ case AUDIO_MSG_ENQUEUE: - audvdbg("AUDIO_MSG_ENQUEUE\n"); + audinfo("AUDIO_MSG_ENQUEUE\n"); break; /* We will wake up from the I2S callback with this message */ case AUDIO_MSG_COMPLETE: - audvdbg("AUDIO_MSG_COMPLETE\n"); + audinfo("AUDIO_MSG_COMPLETE\n"); wm8904_returnbuffers(priv); break; @@ -2132,7 +2132,7 @@ static void *wm8904_workerthread(pthread_addr_t pvarg) priv->dev.upper(priv->dev.priv, AUDIO_CALLBACK_COMPLETE, NULL, OK); #endif - audvdbg("Exit\n"); + audinfo("Exit\n"); return NULL; } diff --git a/drivers/can.c b/drivers/can.c index 2454f06c2d..3e5e0750be 100644 --- a/drivers/can.c +++ b/drivers/can.c @@ -101,14 +101,14 @@ #ifdef CONFIG_DEBUG_CAN # define candbg dbg -# define canvdbg vdbg +# define caninfo info # define canlldbg lldbg -# define canllvdbg llvdbg +# define canllinfo llinfo #else # define candbg(x...) -# define canvdbg(x...) +# define caninfo(x...) # define canlldbg(x...) -# define canllvdbg(x...) +# define canllinfo(x...) #endif /* Timing Definitions *******************************************************/ @@ -296,7 +296,7 @@ static void can_txready_work(FAR void *arg) irqstate_t flags; int ret; - canllvdbg("xmit head: %d queue: %d tail: %d\n", + canllinfo("xmit head: %d queue: %d tail: %d\n", dev->cd_xmit.tx_head, dev->cd_xmit.tx_queue, dev->cd_xmit.tx_tail); @@ -348,7 +348,7 @@ static int can_open(FAR struct file *filep) uint8_t tmp; int ret = OK; - canvdbg("ocount: %d\n", dev->cd_ocount); + caninfo("ocount: %d\n", dev->cd_ocount); /* If the port is the middle of closing, wait until the close is finished */ @@ -431,7 +431,7 @@ static int can_close(FAR struct file *filep) irqstate_t flags; int ret = OK; - canvdbg("ocount: %d\n", dev->cd_ocount); + caninfo("ocount: %d\n", dev->cd_ocount); if (sem_wait(&dev->cd_closesem) != OK) { @@ -510,7 +510,7 @@ static ssize_t can_read(FAR struct file *filep, FAR char *buffer, irqstate_t flags; int ret = 0; - canvdbg("buflen: %d\n", buflen); + caninfo("buflen: %d\n", buflen); /* The caller must provide enough memory to catch the smallest possible * message. This is not a system error condition, but we won't permit @@ -649,7 +649,7 @@ static int can_xmit(FAR struct can_dev_s *dev) int tmpndx; int ret = -EBUSY; - canllvdbg("xmit head: %d queue: %d tail: %d\n", + canllinfo("xmit head: %d queue: %d tail: %d\n", dev->cd_xmit.tx_head, dev->cd_xmit.tx_queue, dev->cd_xmit.tx_tail); /* If there is nothing to send, then just disable interrupts and return */ @@ -732,7 +732,7 @@ static ssize_t can_write(FAR struct file *filep, FAR const char *buffer, int msglen; int ret = 0; - canvdbg("buflen: %d\n", buflen); + caninfo("buflen: %d\n", buflen); /* Interrupts must disabled throughout the following */ @@ -915,7 +915,7 @@ static int can_ioctl(FAR struct file *filep, int cmd, unsigned long arg) FAR struct can_dev_s *dev = inode->i_private; int ret = OK; - canvdbg("cmd: %d arg: %ld\n", cmd, arg); + caninfo("cmd: %d arg: %ld\n", cmd, arg); /* Handle built-in ioctl commands */ @@ -986,7 +986,7 @@ int can_register(FAR const char *path, FAR struct can_dev_s *dev) /* Register the CAN device */ - canvdbg("Registering %s\n", path); + caninfo("Registering %s\n", path); return register_driver(path, &g_canops, 0666, dev); } @@ -1018,7 +1018,7 @@ int can_receive(FAR struct can_dev_s *dev, FAR struct can_hdr_s *hdr, int err = -ENOMEM; int i; - canllvdbg("ID: %d DLC: %d\n", hdr->ch_id, hdr->ch_dlc); + canllinfo("ID: %d DLC: %d\n", hdr->ch_id, hdr->ch_dlc); /* Check if adding this new message would over-run the drivers ability to * enqueue read data. @@ -1203,7 +1203,7 @@ int can_txdone(FAR struct can_dev_s *dev) { int ret = -ENOENT; - canllvdbg("xmit head: %d queue: %d tail: %d\n", + canllinfo("xmit head: %d queue: %d tail: %d\n", dev->cd_xmit.tx_head, dev->cd_xmit.tx_queue, dev->cd_xmit.tx_tail); /* Verify that the xmit FIFO is not empty */ @@ -1307,7 +1307,7 @@ int can_txready(FAR struct can_dev_s *dev) { int ret = -ENOENT; - canllvdbg("xmit head: %d queue: %d tail: %d waiters: %d\n", + canllinfo("xmit head: %d queue: %d tail: %d waiters: %d\n", dev->cd_xmit.tx_head, dev->cd_xmit.tx_queue, dev->cd_xmit.tx_tail, dev->cd_ntxwaiters); diff --git a/drivers/eeprom/spi_xx25xx.c b/drivers/eeprom/spi_xx25xx.c index 1f9335b856..67a38b9784 100644 --- a/drivers/eeprom/spi_xx25xx.c +++ b/drivers/eeprom/spi_xx25xx.c @@ -388,7 +388,7 @@ static void ee25xx_waitwritecomplete(struct ee25xx_dev_s *priv) } while ((status & EE25XX_SR_WIP) != 0); - fvdbg("Complete\n"); + finfo("Complete\n"); } /**************************************************************************** diff --git a/drivers/i2c/i2c_driver.c b/drivers/i2c/i2c_driver.c index ac53f0f1f1..e6571b0006 100644 --- a/drivers/i2c/i2c_driver.c +++ b/drivers/i2c/i2c_driver.c @@ -67,10 +67,10 @@ #ifdef CONFIG_DEBUG_I2C # define i2cdbg dbg -# define i2cvdbg vdbg +# define i2cinfo info #else # define i2cdbg(x...) -# define i2cvdbg(x...) +# define i2cinfo(x...) #endif /**************************************************************************** @@ -254,7 +254,7 @@ static int i2cdrvr_ioctl(FAR struct file *filep, int cmd, unsigned long arg) FAR struct i2c_transfer_s *transfer; int ret; - i2cvdbg("cmd=%d arg=%lu\n", cmd, arg); + i2cinfo("cmd=%d arg=%lu\n", cmd, arg); /* Get our private data structure */ diff --git a/drivers/input/ads7843e.c b/drivers/input/ads7843e.c index 22b7606e63..2097c0774c 100644 --- a/drivers/input/ads7843e.c +++ b/drivers/input/ads7843e.c @@ -279,7 +279,7 @@ static uint16_t ads7843e_sendcmd(FAR struct ads7843e_dev_s *priv, uint8_t cmd) result = ((uint16_t)buffer[0] << 8) | (uint16_t)buffer[1]; result = result >> 4; - ivdbg("cmd:%02x response:%04x\n", cmd, result); + iinfo("cmd:%02x response:%04x\n", cmd, result); return result; } @@ -319,7 +319,7 @@ static void ads7843e_notify(FAR struct ads7843e_dev_s *priv) if (fds) { fds->revents |= POLLIN; - ivdbg("Report events: %02x\n", fds->revents); + iinfo("Report events: %02x\n", fds->revents); sem_post(fds->sem); } } @@ -416,7 +416,7 @@ static int ads7843e_waitsample(FAR struct ads7843e_dev_s *priv, { /* Wait for a change in the ADS7843E state */ - ivdbg("Waiting..\n"); + iinfo("Waiting..\n"); priv->nwaiters++; ret = sem_wait(&priv->waitsem); priv->nwaiters--; @@ -434,7 +434,7 @@ static int ads7843e_waitsample(FAR struct ads7843e_dev_s *priv, } } - ivdbg("Sampled\n"); + iinfo("Sampled\n"); /* Re-acquire the semaphore that manages mutually exclusive access to * the device structure. We may have to wait here. But we have our sample. @@ -749,7 +749,7 @@ static int ads7843e_open(FAR struct file *filep) uint8_t tmp; int ret; - ivdbg("Opening\n"); + iinfo("Opening\n"); DEBUGASSERT(filep); inode = filep->f_inode; @@ -791,7 +791,7 @@ errout_with_sem: sem_post(&priv->devsem); return ret; #else - ivdbg("Opening\n"); + iinfo("Opening\n"); return OK; #endif } @@ -807,7 +807,7 @@ static int ads7843e_close(FAR struct file *filep) FAR struct ads7843e_dev_s *priv; int ret; - ivdbg("Closing\n"); + iinfo("Closing\n"); DEBUGASSERT(filep); inode = filep->f_inode; @@ -837,7 +837,7 @@ static int ads7843e_close(FAR struct file *filep) sem_post(&priv->devsem); #endif - ivdbg("Closing\n"); + iinfo("Closing\n"); return OK; } @@ -853,7 +853,7 @@ static ssize_t ads7843e_read(FAR struct file *filep, FAR char *buffer, size_t le struct ads7843e_sample_s sample; int ret; - ivdbg("buffer:%p len:%d\n", buffer, len); + iinfo("buffer:%p len:%d\n", buffer, len); DEBUGASSERT(filep); inode = filep->f_inode; @@ -896,7 +896,7 @@ static ssize_t ads7843e_read(FAR struct file *filep, FAR char *buffer, size_t le * option, then just return an error. */ - ivdbg("Sample data is not available\n"); + iinfo("Sample data is not available\n"); if (filep->f_oflags & O_NONBLOCK) { ret = -EAGAIN; @@ -957,16 +957,16 @@ static ssize_t ads7843e_read(FAR struct file *filep, FAR char *buffer, size_t le report->point[0].flags = TOUCH_MOVE | TOUCH_ID_VALID | TOUCH_POS_VALID; } - ivdbg(" id: %d\n", report->point[0].id); - ivdbg(" flags: %02x\n", report->point[0].flags); - ivdbg(" x: %d\n", report->point[0].x); - ivdbg(" y: %d\n", report->point[0].y); + iinfo(" id: %d\n", report->point[0].id); + iinfo(" flags: %02x\n", report->point[0].flags); + iinfo(" x: %d\n", report->point[0].x); + iinfo(" y: %d\n", report->point[0].y); ret = SIZEOF_TOUCH_SAMPLE_S(1); errout: sem_post(&priv->devsem); - ivdbg("Returning: %d\n", ret); + iinfo("Returning: %d\n", ret); return ret; } @@ -980,7 +980,7 @@ static int ads7843e_ioctl(FAR struct file *filep, int cmd, unsigned long arg) FAR struct ads7843e_dev_s *priv; int ret; - ivdbg("cmd: %d arg: %ld\n", cmd, arg); + iinfo("cmd: %d arg: %ld\n", cmd, arg); DEBUGASSERT(filep); inode = filep->f_inode; @@ -1040,7 +1040,7 @@ static int ads7843e_poll(FAR struct file *filep, FAR struct pollfd *fds, int ret; int i; - ivdbg("setup: %d\n", (int)setup); + iinfo("setup: %d\n", (int)setup); DEBUGASSERT(filep && fds); inode = filep->f_inode; @@ -1156,7 +1156,7 @@ int ads7843e_register(FAR struct spi_dev_s *spi, #endif int ret; - ivdbg("spi: %p minor: %d\n", spi, minor); + iinfo("spi: %p minor: %d\n", spi, minor); /* Debug-only sanity checks */ @@ -1219,7 +1219,7 @@ int ads7843e_register(FAR struct spi_dev_s *spi, /* Register the device as an input device */ (void)snprintf(devname, DEV_NAMELEN, DEV_FORMAT, minor); - ivdbg("Registering %s\n", devname); + iinfo("Registering %s\n", devname); ret = register_driver(devname, &ads7843e_fops, 0666, priv); if (ret < 0) diff --git a/drivers/input/ajoystick.c b/drivers/input/ajoystick.c index 6c916d9f39..b0ce4f15ae 100644 --- a/drivers/input/ajoystick.c +++ b/drivers/input/ajoystick.c @@ -352,7 +352,7 @@ static void ajoy_sample(FAR struct ajoy_upperhalf_s *priv) fds->revents |= (fds->events & POLLIN); if (fds->revents != 0) { - ivdbg("Report events: %02x\n", fds->revents); + iinfo("Report events: %02x\n", fds->revents); sem_post(fds->sem); } } @@ -414,7 +414,7 @@ static int ajoy_open(FAR struct file *filep) ret = ajoy_takesem(&priv->au_exclsem); if (ret < 0) { - ivdbg("ERROR: ajoy_takesem failed: %d\n", ret); + iinfo("ERROR: ajoy_takesem failed: %d\n", ret); return ret; } @@ -423,7 +423,7 @@ static int ajoy_open(FAR struct file *filep) opriv = (FAR struct ajoy_open_s *)kmm_zalloc(sizeof(struct ajoy_open_s)); if (!opriv) { - ivdbg("ERROR: Failled to allocate open structure\n"); + iinfo("ERROR: Failled to allocate open structure\n"); ret = -ENOMEM; goto errout_with_sem; } @@ -502,7 +502,7 @@ static int ajoy_close(FAR struct file *filep) ret = ajoy_takesem(&priv->au_exclsem); if (ret < 0) { - ivdbg("ERROR: ajoy_takesem failed: %d\n", ret); + iinfo("ERROR: ajoy_takesem failed: %d\n", ret); return ret; } @@ -515,7 +515,7 @@ static int ajoy_close(FAR struct file *filep) DEBUGASSERT(curr); if (!curr) { - ivdbg("ERROR: Failed to find open entry\n"); + iinfo("ERROR: Failed to find open entry\n"); ret = -ENOENT; goto errout_with_exclsem; } @@ -570,7 +570,7 @@ static ssize_t ajoy_read(FAR struct file *filep, FAR char *buffer, if (len < sizeof(struct ajoy_sample_s)) { - ivdbg("ERROR: buffer too small: %lu\n", (unsigned long)len); + iinfo("ERROR: buffer too small: %lu\n", (unsigned long)len); return -EINVAL; } @@ -579,7 +579,7 @@ static ssize_t ajoy_read(FAR struct file *filep, FAR char *buffer, ret = ajoy_takesem(&priv->au_exclsem); if (ret < 0) { - ivdbg("ERROR: ajoy_takesem failed: %d\n", ret); + iinfo("ERROR: ajoy_takesem failed: %d\n", ret); return ret; } @@ -620,7 +620,7 @@ static int ajoy_ioctl(FAR struct file *filep, int cmd, unsigned long arg) ret = ajoy_takesem(&priv->au_exclsem); if (ret < 0) { - ivdbg("ERROR: ajoy_takesem failed: %d\n", ret); + iinfo("ERROR: ajoy_takesem failed: %d\n", ret); return ret; } @@ -720,7 +720,7 @@ static int ajoy_ioctl(FAR struct file *filep, int cmd, unsigned long arg) #endif default: - ivdbg("ERROR: Unrecognized command: %ld\n", cmd); + iinfo("ERROR: Unrecognized command: %ld\n", cmd); ret = -ENOTTY; break; } @@ -754,7 +754,7 @@ static int ajoy_poll(FAR struct file *filep, FAR struct pollfd *fds, ret = ajoy_takesem(&priv->au_exclsem); if (ret < 0) { - ivdbg("ERROR: ajoy_takesem failed: %d\n", ret); + iinfo("ERROR: ajoy_takesem failed: %d\n", ret); return ret; } @@ -782,7 +782,7 @@ static int ajoy_poll(FAR struct file *filep, FAR struct pollfd *fds, if (i >= CONFIG_AJOYSTICK_NPOLLWAITERS) { - ivdbg("ERROR: Too man poll waiters\n"); + iinfo("ERROR: Too man poll waiters\n"); fds->priv = NULL; ret = -EBUSY; goto errout_with_dusem; @@ -797,7 +797,7 @@ static int ajoy_poll(FAR struct file *filep, FAR struct pollfd *fds, #ifdef CONFIG_DEBUG if (!slot) { - ivdbg("ERROR: Poll slot not found\n"); + iinfo("ERROR: Poll slot not found\n"); ret = -EIO; goto errout_with_dusem; } @@ -856,7 +856,7 @@ int ajoy_register(FAR const char *devname, if (!priv) { - ivdbg("ERROR: Failed to allocate device structure\n"); + iinfo("ERROR: Failed to allocate device structure\n"); return -ENOMEM; } @@ -878,7 +878,7 @@ int ajoy_register(FAR const char *devname, ret = register_driver(devname, &ajoy_fops, 0666, priv); if (ret < 0) { - ivdbg("ERROR: register_driver failed: %d\n", ret); + iinfo("ERROR: register_driver failed: %d\n", ret); goto errout_with_priv; } diff --git a/drivers/input/button_lower.c b/drivers/input/button_lower.c index 868e1681a6..ae338d542d 100644 --- a/drivers/input/button_lower.c +++ b/drivers/input/button_lower.c @@ -98,7 +98,7 @@ static FAR void *g_btnarg; static btn_buttonset_t btn_supported(FAR const struct btn_lowerhalf_s *lower) { - ivdbg("NUM_BUTTONS: %02x\n", NUM_BUTTONS); + iinfo("NUM_BUTTONS: %02x\n", NUM_BUTTONS); return (btn_buttonset_t)((1 << NUM_BUTTONS) - 1); } @@ -138,7 +138,7 @@ static void btn_enable(FAR const struct btn_lowerhalf_s *lower, flags = enter_critical_section(); btn_disable(); - illvdbg("press: %02x release: %02x handler: %p arg: %p\n", + illinfo("press: %02x release: %02x handler: %p arg: %p\n", press, release, handler, arg); /* If no events are indicated or if no handler is provided, then this diff --git a/drivers/input/button_upper.c b/drivers/input/button_upper.c index 07c11307e0..98adf18b7a 100644 --- a/drivers/input/button_upper.c +++ b/drivers/input/button_upper.c @@ -348,7 +348,7 @@ static void btn_sample(FAR struct btn_upperhalf_s *priv) fds->revents |= (fds->events & POLLIN); if (fds->revents != 0) { - ivdbg("Report events: %02x\n", fds->revents); + iinfo("Report events: %02x\n", fds->revents); sem_post(fds->sem); } } @@ -410,7 +410,7 @@ static int btn_open(FAR struct file *filep) ret = btn_takesem(&priv->bu_exclsem); if (ret < 0) { - ivdbg("ERROR: btn_takesem failed: %d\n", ret); + iinfo("ERROR: btn_takesem failed: %d\n", ret); return ret; } @@ -419,7 +419,7 @@ static int btn_open(FAR struct file *filep) opriv = (FAR struct btn_open_s *)kmm_zalloc(sizeof(struct btn_open_s)); if (!opriv) { - ivdbg("ERROR: Failled to allocate open structure\n"); + iinfo("ERROR: Failled to allocate open structure\n"); ret = -ENOMEM; goto errout_with_sem; } @@ -498,7 +498,7 @@ static int btn_close(FAR struct file *filep) ret = btn_takesem(&priv->bu_exclsem); if (ret < 0) { - ivdbg("ERROR: btn_takesem failed: %d\n", ret); + iinfo("ERROR: btn_takesem failed: %d\n", ret); return ret; } @@ -511,7 +511,7 @@ static int btn_close(FAR struct file *filep) DEBUGASSERT(curr); if (!curr) { - ivdbg("ERROR: Failed to find open entry\n"); + iinfo("ERROR: Failed to find open entry\n"); ret = -ENOENT; goto errout_with_exclsem; } @@ -566,7 +566,7 @@ static ssize_t btn_read(FAR struct file *filep, FAR char *buffer, if (len < sizeof(btn_buttonset_t)) { - ivdbg("ERROR: buffer too small: %lu\n", (unsigned long)len); + iinfo("ERROR: buffer too small: %lu\n", (unsigned long)len); return -EINVAL; } @@ -575,7 +575,7 @@ static ssize_t btn_read(FAR struct file *filep, FAR char *buffer, ret = btn_takesem(&priv->bu_exclsem); if (ret < 0) { - ivdbg("ERROR: btn_takesem failed: %d\n", ret); + iinfo("ERROR: btn_takesem failed: %d\n", ret); return ret; } @@ -612,7 +612,7 @@ static int btn_ioctl(FAR struct file *filep, int cmd, unsigned long arg) ret = btn_takesem(&priv->bu_exclsem); if (ret < 0) { - ivdbg("ERROR: btn_takesem failed: %d\n", ret); + iinfo("ERROR: btn_takesem failed: %d\n", ret); return ret; } @@ -712,7 +712,7 @@ static int btn_ioctl(FAR struct file *filep, int cmd, unsigned long arg) #endif default: - ivdbg("ERROR: Unrecognized command: %ld\n", cmd); + iinfo("ERROR: Unrecognized command: %ld\n", cmd); ret = -ENOTTY; break; } @@ -746,7 +746,7 @@ static int btn_poll(FAR struct file *filep, FAR struct pollfd *fds, ret = btn_takesem(&priv->bu_exclsem); if (ret < 0) { - ivdbg("ERROR: btn_takesem failed: %d\n", ret); + iinfo("ERROR: btn_takesem failed: %d\n", ret); return ret; } @@ -774,7 +774,7 @@ static int btn_poll(FAR struct file *filep, FAR struct pollfd *fds, if (i >= CONFIG_BUTTONS_NPOLLWAITERS) { - ivdbg("ERROR: Too man poll waiters\n"); + iinfo("ERROR: Too man poll waiters\n"); fds->priv = NULL; ret = -EBUSY; goto errout_with_dusem; @@ -789,7 +789,7 @@ static int btn_poll(FAR struct file *filep, FAR struct pollfd *fds, #ifdef CONFIG_DEBUG if (!slot) { - ivdbg("ERROR: Poll slot not found\n"); + iinfo("ERROR: Poll slot not found\n"); ret = -EIO; goto errout_with_dusem; } @@ -847,7 +847,7 @@ int btn_register(FAR const char *devname, if (!priv) { - ivdbg("ERROR: Failed to allocate device structure\n"); + iinfo("ERROR: Failed to allocate device structure\n"); return -ENOMEM; } @@ -869,7 +869,7 @@ int btn_register(FAR const char *devname, ret = register_driver(devname, &btn_fops, 0666, priv); if (ret < 0) { - ivdbg("ERROR: register_driver failed: %d\n", ret); + iinfo("ERROR: register_driver failed: %d\n", ret); goto errout_with_priv; } diff --git a/drivers/input/djoystick.c b/drivers/input/djoystick.c index 5ea4cd7d28..a20451c13e 100644 --- a/drivers/input/djoystick.c +++ b/drivers/input/djoystick.c @@ -352,7 +352,7 @@ static void djoy_sample(FAR struct djoy_upperhalf_s *priv) fds->revents |= (fds->events & POLLIN); if (fds->revents != 0) { - illvdbg("Report events: %02x\n", fds->revents); + illinfo("Report events: %02x\n", fds->revents); sem_post(fds->sem); } } @@ -414,7 +414,7 @@ static int djoy_open(FAR struct file *filep) ret = djoy_takesem(&priv->du_exclsem); if (ret < 0) { - ivdbg("ERROR: djoy_takesem failed: %d\n", ret); + iinfo("ERROR: djoy_takesem failed: %d\n", ret); return ret; } @@ -423,7 +423,7 @@ static int djoy_open(FAR struct file *filep) opriv = (FAR struct djoy_open_s *)kmm_zalloc(sizeof(struct djoy_open_s)); if (!opriv) { - ivdbg("ERROR: Failled to allocate open structure\n"); + iinfo("ERROR: Failled to allocate open structure\n"); ret = -ENOMEM; goto errout_with_sem; } @@ -502,7 +502,7 @@ static int djoy_close(FAR struct file *filep) ret = djoy_takesem(&priv->du_exclsem); if (ret < 0) { - ivdbg("ERROR: djoy_takesem failed: %d\n", ret); + iinfo("ERROR: djoy_takesem failed: %d\n", ret); return ret; } @@ -515,7 +515,7 @@ static int djoy_close(FAR struct file *filep) DEBUGASSERT(curr); if (!curr) { - ivdbg("ERROR: Failed to find open entry\n"); + iinfo("ERROR: Failed to find open entry\n"); ret = -ENOENT; goto errout_with_exclsem; } @@ -568,7 +568,7 @@ static ssize_t djoy_read(FAR struct file *filep, FAR char *buffer, if (len < sizeof(djoy_buttonset_t)) { - ivdbg("ERROR: buffer too small: %lu\n", (unsigned long)len); + iinfo("ERROR: buffer too small: %lu\n", (unsigned long)len); return -EINVAL; } @@ -577,7 +577,7 @@ static ssize_t djoy_read(FAR struct file *filep, FAR char *buffer, ret = djoy_takesem(&priv->du_exclsem); if (ret < 0) { - ivdbg("ERROR: djoy_takesem failed: %d\n", ret); + iinfo("ERROR: djoy_takesem failed: %d\n", ret); return ret; } @@ -616,7 +616,7 @@ static int djoy_ioctl(FAR struct file *filep, int cmd, unsigned long arg) ret = djoy_takesem(&priv->du_exclsem); if (ret < 0) { - ivdbg("ERROR: djoy_takesem failed: %d\n", ret); + iinfo("ERROR: djoy_takesem failed: %d\n", ret); return ret; } @@ -716,7 +716,7 @@ static int djoy_ioctl(FAR struct file *filep, int cmd, unsigned long arg) #endif default: - ivdbg("ERROR: Unrecognized command: %ld\n", cmd); + iinfo("ERROR: Unrecognized command: %ld\n", cmd); ret = -ENOTTY; break; } @@ -750,7 +750,7 @@ static int djoy_poll(FAR struct file *filep, FAR struct pollfd *fds, ret = djoy_takesem(&priv->du_exclsem); if (ret < 0) { - ivdbg("ERROR: djoy_takesem failed: %d\n", ret); + iinfo("ERROR: djoy_takesem failed: %d\n", ret); return ret; } @@ -778,7 +778,7 @@ static int djoy_poll(FAR struct file *filep, FAR struct pollfd *fds, if (i >= CONFIG_DJOYSTICK_NPOLLWAITERS) { - ivdbg("ERROR: Too man poll waiters\n"); + iinfo("ERROR: Too man poll waiters\n"); fds->priv = NULL; ret = -EBUSY; goto errout_with_dusem; @@ -793,7 +793,7 @@ static int djoy_poll(FAR struct file *filep, FAR struct pollfd *fds, #ifdef CONFIG_DEBUG if (!slot) { - ivdbg("ERROR: Poll slot not found\n"); + iinfo("ERROR: Poll slot not found\n"); ret = -EIO; goto errout_with_dusem; } @@ -852,7 +852,7 @@ int djoy_register(FAR const char *devname, if (!priv) { - ivdbg("ERROR: Failed to allocate device structure\n"); + iinfo("ERROR: Failed to allocate device structure\n"); return -ENOMEM; } @@ -874,7 +874,7 @@ int djoy_register(FAR const char *devname, ret = register_driver(devname, &djoy_fops, 0666, priv); if (ret < 0) { - ivdbg("ERROR: register_driver failed: %d\n", ret); + iinfo("ERROR: register_driver failed: %d\n", ret); sem_destroy(&priv->du_exclsem); kmm_free(priv); } diff --git a/drivers/input/max11802.c b/drivers/input/max11802.c index 2c3c1f7813..1acee40807 100644 --- a/drivers/input/max11802.c +++ b/drivers/input/max11802.c @@ -244,7 +244,7 @@ static uint16_t max11802_sendcmd(FAR struct max11802_dev_s *priv, *tags = result & 0xF; result >>= 4; /* Get rid of tags */ - ivdbg("cmd:%02x response:%04x\n", cmd, result); + iinfo("cmd:%02x response:%04x\n", cmd, result); return result; } @@ -284,7 +284,7 @@ static void max11802_notify(FAR struct max11802_dev_s *priv) if (fds) { fds->revents |= POLLIN; - ivdbg("Report events: %02x\n", fds->revents); + iinfo("Report events: %02x\n", fds->revents); sem_post(fds->sem); } } @@ -381,7 +381,7 @@ static int max11802_waitsample(FAR struct max11802_dev_s *priv, { /* Wait for a change in the MAX11802 state */ - ivdbg("Waiting..\n"); + iinfo("Waiting..\n"); priv->nwaiters++; ret = sem_wait(&priv->waitsem); priv->nwaiters--; @@ -399,7 +399,7 @@ static int max11802_waitsample(FAR struct max11802_dev_s *priv, } } - ivdbg("Sampled\n"); + iinfo("Sampled\n"); /* Re-acquire the semaphore that manages mutually exclusive access to * the device structure. We may have to wait here. But we have our @@ -540,11 +540,11 @@ static void max11802_worker(FAR void *arg) if (pendown) { - ivdbg("\nPD\n"); + iinfo("\nPD\n"); } else { - ivdbg("\nPU\n"); + iinfo("\nPU\n"); } if (!pendown) @@ -559,7 +559,7 @@ static void max11802_worker(FAR void *arg) * reported). */ - ivdbg("\nPC%d\n", priv->sample.contact); + iinfo("\nPC%d\n", priv->sample.contact); if (priv->sample.contact == CONTACT_NONE || priv->sample.contact == CONTACT_UP) @@ -589,7 +589,7 @@ static void max11802_worker(FAR void *arg) * again later. */ - ivdbg("Previous pen up event still in buffer\n"); + iinfo("Previous pen up event still in buffer\n"); max11802_notify(priv); wd_start(priv->wdog, MAX11802_WDOG_DELAY, max11802_wdog, 1, (uint32_t)priv); @@ -636,7 +636,7 @@ static void max11802_worker(FAR void *arg) if ((tags & 0x03) != 0) { - ivdbg("Touch ended before measurement\n"); + iinfo("Touch ended before measurement\n"); goto ignored; } @@ -755,7 +755,7 @@ static int max11802_open(FAR struct file *filep) uint8_t tmp; int ret; - ivdbg("Opening\n"); + iinfo("Opening\n"); DEBUGASSERT(filep); inode = filep->f_inode; @@ -797,7 +797,7 @@ errout_with_sem: sem_post(&priv->devsem); return ret; #else - ivdbg("Opening\n"); + iinfo("Opening\n"); return OK; #endif } @@ -813,7 +813,7 @@ static int max11802_close(FAR struct file *filep) FAR struct max11802_dev_s *priv; int ret; - ivdbg("Closing\n"); + iinfo("Closing\n"); DEBUGASSERT(filep); inode = filep->f_inode; @@ -843,7 +843,7 @@ static int max11802_close(FAR struct file *filep) sem_post(&priv->devsem); #endif - ivdbg("Closing\n"); + iinfo("Closing\n"); return OK; } @@ -860,7 +860,7 @@ static ssize_t max11802_read(FAR struct file *filep, FAR char *buffer, struct max11802_sample_s sample; int ret; - ivdbg("buffer:%p len:%d\n", buffer, len); + iinfo("buffer:%p len:%d\n", buffer, len); DEBUGASSERT(filep); inode = filep->f_inode; @@ -903,7 +903,7 @@ static ssize_t max11802_read(FAR struct file *filep, FAR char *buffer, * option, then just return an error. */ - ivdbg("Sample data is not available\n"); + iinfo("Sample data is not available\n"); if (filep->f_oflags & O_NONBLOCK) { ret = -EAGAIN; @@ -964,16 +964,16 @@ static ssize_t max11802_read(FAR struct file *filep, FAR char *buffer, report->point[0].flags = TOUCH_MOVE | TOUCH_ID_VALID | TOUCH_POS_VALID; } - ivdbg(" id: %d\n", report->point[0].id); - ivdbg(" flags: %02x\n", report->point[0].flags); - ivdbg(" x: %d\n", report->point[0].x); - ivdbg(" y: %d\n", report->point[0].y); + iinfo(" id: %d\n", report->point[0].id); + iinfo(" flags: %02x\n", report->point[0].flags); + iinfo(" x: %d\n", report->point[0].x); + iinfo(" y: %d\n", report->point[0].y); ret = SIZEOF_TOUCH_SAMPLE_S(1); errout: sem_post(&priv->devsem); - ivdbg("Returning: %d\n", ret); + iinfo("Returning: %d\n", ret); return ret; } @@ -987,7 +987,7 @@ static int max11802_ioctl(FAR struct file *filep, int cmd, unsigned long arg) FAR struct max11802_dev_s *priv; int ret; - ivdbg("cmd: %d arg: %ld\n", cmd, arg); + iinfo("cmd: %d arg: %ld\n", cmd, arg); DEBUGASSERT(filep); inode = filep->f_inode; @@ -1047,7 +1047,7 @@ static int max11802_poll(FAR struct file *filep, FAR struct pollfd *fds, int ret; int i; - ivdbg("setup: %d\n", (int)setup); + iinfo("setup: %d\n", (int)setup); DEBUGASSERT(filep && fds); inode = filep->f_inode; @@ -1159,7 +1159,7 @@ int max11802_register(FAR struct spi_dev_s *spi, #endif int ret; - ivdbg("spi: %p minor: %d\n", spi, minor); + iinfo("spi: %p minor: %d\n", spi, minor); /* Debug-only sanity checks */ @@ -1253,7 +1253,7 @@ int max11802_register(FAR struct spi_dev_s *spi, /* Register the device as an input device */ (void)snprintf(devname, DEV_NAMELEN, DEV_FORMAT, minor); - ivdbg("Registering %s\n", devname); + iinfo("Registering %s\n", devname); ret = register_driver(devname, &max11802_fops, 0666, priv); if (ret < 0) diff --git a/drivers/input/mxt.c b/drivers/input/mxt.c index cd761ec271..f09455b4c9 100644 --- a/drivers/input/mxt.c +++ b/drivers/input/mxt.c @@ -312,7 +312,7 @@ static int mxt_getreg(FAR struct mxt_dev_s *priv, uint16_t regaddr, for (retries = 1; retries <= 3; retries++) { - ivdbg("retries=%d regaddr=%04x buflen=%d\n", retries, regaddr, buflen); + iinfo("retries=%d regaddr=%04x buflen=%d\n", retries, regaddr, buflen); /* Set up to write the address */ @@ -386,7 +386,7 @@ static int mxt_putreg(FAR struct mxt_dev_s *priv, uint16_t regaddr, for (retries = 1; retries <= 3; retries++) { - ivdbg("retries=%d regaddr=%04x buflen=%d\n", retries, regaddr, buflen); + iinfo("retries=%d regaddr=%04x buflen=%d\n", retries, regaddr, buflen); /* Set up to write the address */ @@ -611,7 +611,7 @@ static void mxt_notify(FAR struct mxt_dev_s *priv) if (fds) { fds->revents |= POLLIN; - ivdbg("Report events: %02x\n", fds->revents); + iinfo("Report events: %02x\n", fds->revents); sem_post(fds->sem); } } @@ -796,7 +796,7 @@ static void mxt_touch_event(FAR struct mxt_dev_s *priv, pressure = msg->body[5]; status = msg->body[0]; - ivdbg("ndx=%u status=%02x pos(%u,%u) area=%u pressure=%u\n", + iinfo("ndx=%u status=%02x pos(%u,%u) area=%u pressure=%u\n", ndx, status, x, y, area, pressure); /* The normal sequence that we would see for a touch would be something @@ -1017,7 +1017,7 @@ static void mxt_worker(FAR void *arg) ((uint32_t)msg.body[2] << 8) | ((uint32_t)msg.body[3] << 16); - ivdbg("T6: status: %02x checksum: %06lx\n", + iinfo("T6: status: %02x checksum: %06lx\n", status, (unsigned long)chksum); retries = 0; @@ -1049,7 +1049,7 @@ static void mxt_worker(FAR void *arg) else if (msg.id != 0xff) { - ivdbg("Ignored: id=%u message={%02x %02x %02x %02x %02x %02x %02x}\n", + iinfo("Ignored: id=%u message={%02x %02x %02x %02x %02x %02x %02x}\n", msg.id, msg.body[0], msg.body[1], msg.body[2], msg.body[3], msg.body[4], msg.body[5], msg.body[6]); @@ -1490,7 +1490,7 @@ static int mxt_ioctl(FAR struct file *filep, int cmd, unsigned long arg) FAR struct mxt_dev_s *priv; int ret; - ivdbg("cmd: %d arg: %ld\n", cmd, arg); + iinfo("cmd: %d arg: %ld\n", cmd, arg); DEBUGASSERT(filep); inode = filep->f_inode; @@ -1551,7 +1551,7 @@ static int mxt_poll(FAR struct file *filep, FAR struct pollfd *fds, int ret; int i; - ivdbg("setup: %d\n", (int)setup); + iinfo("setup: %d\n", (int)setup); DEBUGASSERT(filep && fds); inode = filep->f_inode; @@ -1697,7 +1697,7 @@ static int mxt_getobjtab(FAR struct mxt_dev_s *priv) idmax = 0; } - ivdbg("%2d. type %2d addr %04x size: %d instances: %d IDs: %u-%u\n", + iinfo("%2d. type %2d addr %04x size: %d instances: %d IDs: %u-%u\n", i, object->type, MXT_GETUINT16(object->addr), object->size + 1, object->ninstances + 1, idmin, idmax); @@ -1799,10 +1799,10 @@ static int mxt_hwinitialize(FAR struct mxt_dev_s *priv) info->ysize = regval; - ivdbg("Family: %u variant: %u version: %u.%u.%02x\n", + iinfo("Family: %u variant: %u version: %u.%u.%02x\n", info->family, info->variant, info->version >> 4, info->version & 0x0f, info->build); - ivdbg("Matrix size: (%u,%u) objects: %u\n", + iinfo("Matrix size: (%u,%u) objects: %u\n", info->xsize, info->ysize, info->nobjects); /* How many multi touch "slots" */ @@ -1863,7 +1863,7 @@ int mxt_register(FAR struct i2c_master_s *i2c, char devname[DEV_NAMELEN]; int ret; - ivdbg("i2c: %p minor: %d\n", i2c, minor); + iinfo("i2c: %p minor: %d\n", i2c, minor); /* Debug-only sanity checks */ @@ -1913,7 +1913,7 @@ int mxt_register(FAR struct i2c_master_s *i2c, /* Register the device as an input device */ (void)snprintf(devname, DEV_NAMELEN, DEV_FORMAT, minor); - ivdbg("Registering %s\n", devname); + iinfo("Registering %s\n", devname); ret = register_driver(devname, &mxt_fops, 0666, priv); if (ret < 0) diff --git a/drivers/input/stmpe811_base.c b/drivers/input/stmpe811_base.c index 224b9eaefc..b491fe5b2e 100644 --- a/drivers/input/stmpe811_base.c +++ b/drivers/input/stmpe811_base.c @@ -226,7 +226,7 @@ static int stmpe811_checkid(FAR struct stmpe811_dev_s *priv) devid = stmpe811_getreg8(priv, STMPE811_CHIP_ID); devid = (uint32_t)(devid << 8); devid |= (uint32_t)stmpe811_getreg8(priv, STMPE811_CHIP_ID+1); - ivdbg("devid: %04x\n", devid); + iinfo("devid: %04x\n", devid); if (devid != (uint16_t)CHIP_ID) { diff --git a/drivers/input/stmpe811_tsc.c b/drivers/input/stmpe811_tsc.c index 55dce44272..60362da51c 100644 --- a/drivers/input/stmpe811_tsc.c +++ b/drivers/input/stmpe811_tsc.c @@ -196,7 +196,7 @@ static void stmpe811_notify(FAR struct stmpe811_dev_s *priv) if (fds) { fds->revents |= POLLIN; - ivdbg("Report events: %02x\n", fds->revents); + iinfo("Report events: %02x\n", fds->revents); sem_post(fds->sem); } } @@ -464,7 +464,7 @@ static ssize_t stmpe811_read(FAR struct file *filep, FAR char *buffer, size_t le struct stmpe811_sample_s sample; int ret; - ivdbg("len=%d\n", len); + iinfo("len=%d\n", len); DEBUGASSERT(filep); inode = filep->f_inode; @@ -589,7 +589,7 @@ static int stmpe811_ioctl(FAR struct file *filep, int cmd, unsigned long arg) FAR struct stmpe811_dev_s *priv; int ret; - ivdbg("cmd: %d arg: %ld\n", cmd, arg); + iinfo("cmd: %d arg: %ld\n", cmd, arg); DEBUGASSERT(filep); inode = filep->f_inode; @@ -653,7 +653,7 @@ static int stmpe811_poll(FAR struct file *filep, FAR struct pollfd *fds, int ret; int i; - ivdbg("setup: %d\n", (int)setup); + iinfo("setup: %d\n", (int)setup); DEBUGASSERT(filep && fds); inode = filep->f_inode; @@ -805,7 +805,7 @@ static inline void stmpe811_tscinitialize(FAR struct stmpe811_dev_s *priv) { uint8_t regval; - ivdbg("Initializing touchscreen controller\n"); + iinfo("Initializing touchscreen controller\n"); /* Enable TSC and ADC functions */ @@ -898,7 +898,7 @@ int stmpe811_register(STMPE811_HANDLE handle, int minor) char devname[DEV_NAMELEN]; int ret; - ivdbg("handle=%p minor=%d\n", handle, minor); + iinfo("handle=%p minor=%d\n", handle, minor); DEBUGASSERT(priv); /* Get exclusive access to the device structure */ diff --git a/drivers/input/tsc2007.c b/drivers/input/tsc2007.c index a27042400f..8ab76b8e7e 100644 --- a/drivers/input/tsc2007.c +++ b/drivers/input/tsc2007.c @@ -278,7 +278,7 @@ static void tsc2007_notify(FAR struct tsc2007_dev_s *priv) if (fds) { fds->revents |= POLLIN; - ivdbg("Report events: %02x\n", fds->revents); + iinfo("Report events: %02x\n", fds->revents); sem_post(fds->sem); } } @@ -550,7 +550,7 @@ static int tsc2007_transfer(FAR struct tsc2007_dev_s *priv, uint8_t cmd) */ ret = (unsigned int)data12[0] << 4 | (unsigned int)data12[1] >> 4; - ivdbg("data: 0x%04x\n", ret); + iinfo("data: 0x%04x\n", ret); return ret; } @@ -680,7 +680,7 @@ static void tsc2007_worker(FAR void *arg) pressure = (x * config->rxplate * (z2 - z1)) / z1; pressure = (pressure + 2048) >> 12; - ivdbg("Position: (%d,%4d) pressure: %u z1/2: (%d,%d)\n", + iinfo("Position: (%d,%4d) pressure: %u z1/2: (%d,%d)\n", x, y, pressure, z1, z2); /* Ignore out of range caculcations */ @@ -1031,7 +1031,7 @@ static int tsc2007_ioctl(FAR struct file *filep, int cmd, unsigned long arg) FAR struct tsc2007_dev_s *priv; int ret; - ivdbg("cmd: %d arg: %ld\n", cmd, arg); + iinfo("cmd: %d arg: %ld\n", cmd, arg); DEBUGASSERT(filep); inode = filep->f_inode; @@ -1107,7 +1107,7 @@ static int tsc2007_poll(FAR struct file *filep, FAR struct pollfd *fds, int ret; int i; - ivdbg("setup: %d\n", (int)setup); + iinfo("setup: %d\n", (int)setup); DEBUGASSERT(filep && fds); inode = filep->f_inode; @@ -1225,7 +1225,7 @@ int tsc2007_register(FAR struct i2c_master_s *dev, #endif int ret; - ivdbg("dev: %p minor: %d\n", dev, minor); + iinfo("dev: %p minor: %d\n", dev, minor); /* Debug-only sanity checks */ @@ -1283,7 +1283,7 @@ int tsc2007_register(FAR struct i2c_master_s *dev, /* Register the device as an input device */ (void)snprintf(devname, DEV_NAMELEN, DEV_FORMAT, minor); - ivdbg("Registering %s\n", devname); + iinfo("Registering %s\n", devname); ret = register_driver(devname, &tsc2007_fops, 0666, priv); if (ret < 0) diff --git a/drivers/lcd/ili9341.c b/drivers/lcd/ili9341.c index 1c19187ab5..e802057f46 100644 --- a/drivers/lcd/ili9341.c +++ b/drivers/lcd/ili9341.c @@ -371,10 +371,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg dbg -# define lcdvdbg vdbg +# define lcdinfo info #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /**************************************************************************** @@ -791,11 +791,11 @@ static int ili9341_hwinitialize(FAR struct ili9341_dev_s *dev) /* Reset the lcd display to the default state */ - lcdvdbg("ili9341 LCD driver: Software Reset\n"); + lcdinfo("ili9341 LCD driver: Software Reset\n"); lcd->sendcmd(lcd, ILI9341_SOFTWARE_RESET); up_mdelay(5); - lcdvdbg("ili9341 LCD driver: set Memory Access Control: %04x\n", dev->orient); + lcdinfo("ili9341 LCD driver: set Memory Access Control: %04x\n", dev->orient); lcd->sendcmd(lcd, ILI9341_MEMORY_ACCESS_CONTROL); lcd->sendparam(lcd, dev->orient); @@ -809,13 +809,13 @@ static int ili9341_hwinitialize(FAR struct ili9341_dev_s *dev) /* 16 bit RGB565 */ - lcdvdbg("ili9341 LCD driver: Set Pixel Format: %04x\n", + lcdinfo("ili9341 LCD driver: Set Pixel Format: %04x\n", ILI9341_PIXSET_16BITMCU_PARAM1); lcd->sendparam(lcd, ILI9341_PIXSET_16BITMCU_PARAM1); /* 18 bit RGB666, add settings here */ - lcdvdbg("ili9341 LCD driver: Set Interface control\n"); + lcdinfo("ili9341 LCD driver: Set Interface control\n"); lcd->sendcmd(lcd, ILI9341_INTERFACE_CONTROL); lcd->sendparam(lcd, ILI9341_IFCTL_PARAM1); lcd->sendparam(lcd, ILI9341_IFCTL_PARAM2); @@ -823,7 +823,7 @@ static int ili9341_hwinitialize(FAR struct ili9341_dev_s *dev) /* Sleep out */ - lcdvdbg("ili9341 LCD driver: Sleep Out\n"); + lcdinfo("ili9341 LCD driver: Sleep Out\n"); lcd->sendcmd(lcd, ILI9341_SLEEP_OUT); up_mdelay(120); @@ -948,7 +948,7 @@ static int ili9341_getvideoinfo(FAR struct lcd_dev_s *dev, vinfo->yres = ili9341_getyres(priv); vinfo->nplanes = 1; - lcdvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n", + lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n", vinfo->fmt, vinfo->xres, vinfo->yres, vinfo->nplanes); return OK; @@ -989,7 +989,7 @@ static int ili9341_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, pinfo->bpp = priv->bpp; pinfo->buffer = (FAR uint8_t *)priv->runbuffer; /* Run scratch buffer */ - lcdvdbg("planeno: %d bpp: %d\n", planeno, pinfo->bpp); + lcdinfo("planeno: %d bpp: %d\n", planeno, pinfo->bpp); return OK; } @@ -1103,7 +1103,7 @@ static int ili9341_setpower(FAR struct lcd_dev_s *dev, int power) static int ili9341_getcontrast(struct lcd_dev_s *dev) { - lcdvdbg("Not implemented\n"); + lcdinfo("Not implemented\n"); return -ENOSYS; } @@ -1125,7 +1125,7 @@ static int ili9341_getcontrast(struct lcd_dev_s *dev) static int ili9341_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) { - lcdvdbg("contrast: %d\n", contrast); + lcdinfo("contrast: %d\n", contrast); return -ENOSYS; } diff --git a/drivers/lcd/memlcd.c b/drivers/lcd/memlcd.c index e960e27612..32bdd216a1 100644 --- a/drivers/lcd/memlcd.c +++ b/drivers/lcd/memlcd.c @@ -113,10 +113,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg(format, ...) dbg(format, ##__VA_ARGS__) -# define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define lcdinfo(format, ...) info(format, ##__VA_ARGS__) #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /**************************************************************************** @@ -408,7 +408,7 @@ static int memlcd_putrun(fb_coord_t row, fb_coord_t col, int i; DEBUGASSERT(buffer); - lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels); #ifdef CONFIG_NX_PACKEDMSFIRST usrmask = MS_BIT; @@ -499,7 +499,7 @@ static int memlcd_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t * buffer, int i; DEBUGASSERT(buffer); - lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels); #ifdef CONFIG_NX_PACKEDMSFIRST usrmask = MS_BIT; @@ -557,7 +557,7 @@ static int memlcd_getvideoinfo(FAR struct lcd_dev_s *dev, FAR struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); - lcdvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n", + lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n", g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes); memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s)); @@ -576,7 +576,7 @@ static int memlcd_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, FAR struct lcd_planeinfo_s *pinfo) { DEBUGASSERT(pinfo && planeno == 0); - lcdvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); + lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s)); return OK; } diff --git a/drivers/lcd/mio283qt2.c b/drivers/lcd/mio283qt2.c index c725a9dab1..49ff6f5884 100644 --- a/drivers/lcd/mio283qt2.c +++ b/drivers/lcd/mio283qt2.c @@ -241,10 +241,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg dbg -# define lcdvdbg vdbg +# define lcdinfo info #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /************************************************************************************** @@ -534,7 +534,7 @@ static int mio283qt2_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *b /* Buffer must be provided and aligned to a 16-bit address boundary */ - lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0); /* Select the LCD */ @@ -584,7 +584,7 @@ static int mio283qt2_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, /* Buffer must be provided and aligned to a 16-bit address boundary */ - lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0); /* Select the LCD */ @@ -632,7 +632,7 @@ static int mio283qt2_getvideoinfo(FAR struct lcd_dev_s *dev, FAR struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); - lcdvdbg("fmt: %d xres: %d yres: %d nplanes: 1\n", + lcdinfo("fmt: %d xres: %d yres: %d nplanes: 1\n", MIO283QT2_COLORFMT, MIO283QT2_XRES, MIO283QT2_XRES); vinfo->fmt = MIO283QT2_COLORFMT; /* Color format: RGB16-565: RRRR RGGG GGGB BBBB */ @@ -656,7 +656,7 @@ static int mio283qt2_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planen FAR struct mio283qt2_dev_s *priv = (FAR struct mio283qt2_dev_s *)dev; DEBUGASSERT(dev && pinfo && planeno == 0); - lcdvdbg("planeno: %d bpp: %d\n", planeno, MIO283QT2_BPP); + lcdinfo("planeno: %d bpp: %d\n", planeno, MIO283QT2_BPP); pinfo->putrun = mio283qt2_putrun; /* Put a run into LCD memory */ pinfo->getrun = mio283qt2_getrun; /* Get a run from LCD memory */ @@ -676,7 +676,7 @@ static int mio283qt2_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planen static int mio283qt2_getpower(FAR struct lcd_dev_s *dev) { - lcdvdbg("power: %d\n", 0); + lcdinfo("power: %d\n", 0); return g_lcddev.power; } @@ -727,7 +727,7 @@ static int mio283qt2_setpower(FAR struct lcd_dev_s *dev, int power) FAR struct mio283qt2_dev_s *priv = (FAR struct mio283qt2_dev_s *)dev; FAR struct mio283qt2_lcd_s *lcd = priv->lcd; - lcdvdbg("power: %d\n", power); + lcdinfo("power: %d\n", power); DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER); /* Set new power level */ @@ -778,7 +778,7 @@ static int mio283qt2_setpower(FAR struct lcd_dev_s *dev, int power) static int mio283qt2_getcontrast(FAR struct lcd_dev_s *dev) { - lcdvdbg("Not implemented\n"); + lcdinfo("Not implemented\n"); return -ENOSYS; } @@ -792,7 +792,7 @@ static int mio283qt2_getcontrast(FAR struct lcd_dev_s *dev) static int mio283qt2_setcontrast(FAR struct lcd_dev_s *dev, unsigned int contrast) { - lcdvdbg("contrast: %d\n", contrast); + lcdinfo("contrast: %d\n", contrast); return -ENOSYS; } @@ -955,7 +955,7 @@ FAR struct lcd_dev_s *mio283qt2_lcdinitialize(FAR struct mio283qt2_lcd_s *lcd) { int ret; - lcdvdbg("Initializing\n"); + lcdinfo("Initializing\n"); /* If we ccould support multiple MIO283QT2 devices, this is where we would allocate * a new driver data structure... but we can't. Why not? Because of a bad should diff --git a/drivers/lcd/mio283qt9a.c b/drivers/lcd/mio283qt9a.c index 0770cc852e..a474a899de 100644 --- a/drivers/lcd/mio283qt9a.c +++ b/drivers/lcd/mio283qt9a.c @@ -140,10 +140,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg dbg -# define lcdvdbg vdbg +# define lcdinfo info #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /************************************************************************************** @@ -498,7 +498,7 @@ static int mio283qt9a_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer /* Buffer must be provided and aligned to a 16-bit address boundary */ - lcdvdbg("mio283qt9a_getrun row: %d col: %d npixels: %d\n", row, col, npixels); + lcdinfo("mio283qt9a_getrun row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0); /* Read the run from GRAM. */ @@ -543,7 +543,7 @@ static int mio283qt9a_getvideoinfo(FAR struct lcd_dev_s *dev, FAR struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); - lcdvdbg("fmt: %d xres: %d yres: %d nplanes: 1\n", + lcdinfo("fmt: %d xres: %d yres: %d nplanes: 1\n", MIO283QT9A_COLORFMT, MIO283QT9A_XRES, MIO283QT9A_YRES); vinfo->fmt = MIO283QT9A_COLORFMT; /* Color format: RGB16-565: RRRR RGGG GGGB BBBB */ @@ -567,7 +567,7 @@ static int mio283qt9a_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int plane FAR struct mio283qt9a_dev_s *priv = (FAR struct mio283qt9a_dev_s *)dev; DEBUGASSERT(dev && pinfo && planeno == 0); - lcdvdbg("planeno: %d bpp: %d\n", planeno, MIO283QT9A_BPP); + lcdinfo("planeno: %d bpp: %d\n", planeno, MIO283QT9A_BPP); pinfo->putrun = mio283qt9a_putrun; /* Put a run into LCD memory */ pinfo->getrun = mio283qt9a_getrun; /* Get a run from LCD memory */ @@ -588,7 +588,7 @@ static int mio283qt9a_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int plane static int mio283qt9a_getpower(FAR struct lcd_dev_s *dev) { - lcdvdbg("getpower: %d\n", 0); + lcdinfo("getpower: %d\n", 0); return g_lcddev.power; } @@ -604,7 +604,7 @@ static int mio283qt9a_getpower(FAR struct lcd_dev_s *dev) static int mio283qt9a_poweroff(FAR struct mio283qt9a_lcd_s *lcd) { /* Select the LCD */ - lcdvdbg("mio283qt9a_poweroff\n"); + lcdinfo("mio283qt9a_poweroff\n"); lcd->select(lcd); @@ -640,7 +640,7 @@ static int mio283qt9a_setpower(FAR struct lcd_dev_s *dev, int power) FAR struct mio283qt9a_dev_s *priv = (FAR struct mio283qt9a_dev_s *)dev; FAR struct mio283qt9a_lcd_s *lcd = priv->lcd; - lcdvdbg("setpower: %d\n", power); + lcdinfo("setpower: %d\n", power); DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER); /* Set new power level */ @@ -687,7 +687,7 @@ static int mio283qt9a_setpower(FAR struct lcd_dev_s *dev, int power) static int mio283qt9a_getcontrast(FAR struct lcd_dev_s *dev) { - lcdvdbg("Not implemented\n"); + lcdinfo("Not implemented\n"); return -ENOSYS; } @@ -701,7 +701,7 @@ static int mio283qt9a_getcontrast(FAR struct lcd_dev_s *dev) static int mio283qt9a_setcontrast(FAR struct lcd_dev_s *dev, unsigned int contrast) { - lcdvdbg("contrast: %d\n", contrast); + lcdinfo("contrast: %d\n", contrast); return -ENOSYS; } @@ -739,7 +739,7 @@ static inline int mio283qt9a_hwinitialize(FAR struct mio283qt9a_dev_s *priv) id_c = lcd->read(lcd); id_d = lcd->read(lcd); - lcdvdbg("LCD ID: %04x %04x %04x %04x\n", id_a, id_b, id_c, id_d); + lcdinfo("LCD ID: %04x %04x %04x %04x\n", id_a, id_b, id_c, id_d); UNUSED(id_a); UNUSED(id_b); @@ -781,38 +781,38 @@ static inline int mio283qt9a_hwinitialize(FAR struct mio283qt9a_dev_s *priv) id_b = lcd->read(lcd); id_c = lcd->read(lcd); id_d = lcd->read(lcd); - lcdvdbg("LCD man ID: %02x, version: %02x, driver ID: %02x\n", id_b, id_c, id_d); + lcdinfo("LCD man ID: %02x, version: %02x, driver ID: %02x\n", id_b, id_c, id_d); id_a = mio283qt9a_readreg(lcd, 0x09); /* Read display status */ id_b = lcd->read(lcd); id_c = lcd->read(lcd); id_d = lcd->read(lcd); id_e = lcd->read(lcd); - lcdvdbg("Display status %02x, %02x, %02x, %02x, %02x\n", id_a, id_b, id_c, id_d, id_e); + lcdinfo("Display status %02x, %02x, %02x, %02x, %02x\n", id_a, id_b, id_c, id_d, id_e); id_a = mio283qt9a_readreg(lcd, 0x0a); /* Read power status */ id_b = lcd->read(lcd); - lcdvdbg("Power status %02x, %02x\n", id_a, id_b); + lcdinfo("Power status %02x, %02x\n", id_a, id_b); id_a = mio283qt9a_readreg(lcd, 0x0b); /* Read MADCTL */ id_b = lcd->read(lcd); - lcdvdbg("MADCTL %02x, %02x\n", id_a, id_b); + lcdinfo("MADCTL %02x, %02x\n", id_a, id_b); id_a = mio283qt9a_readreg(lcd, 0x0c); /* Read pixel format */ id_b = lcd->read(lcd); - lcdvdbg("Pixel format %02x, %02x\n", id_a, id_b); + lcdinfo("Pixel format %02x, %02x\n", id_a, id_b); id_a = mio283qt9a_readreg(lcd, 0x0d); /* Read image format */ id_b = lcd->read(lcd); - lcdvdbg("Image format %02x, %02x\n", id_a, id_b); + lcdinfo("Image format %02x, %02x\n", id_a, id_b); id_a = mio283qt9a_readreg(lcd, 0x0e); /* read signal mode */ id_b = lcd->read(lcd); - lcdvdbg("Signal mode %02x, %02x\n", id_a, id_b); + lcdinfo("Signal mode %02x, %02x\n", id_a, id_b); id_a = mio283qt9a_readreg(lcd, 0x0f); /* read self diag */ id_b = lcd->read(lcd); - lcdvdbg("Self diag %02x, %02x\n", id_a, id_b); + lcdinfo("Self diag %02x, %02x\n", id_a, id_b); #endif ret = OK; } @@ -849,7 +849,7 @@ FAR struct lcd_dev_s *mio283qt9a_lcdinitialize(FAR struct mio283qt9a_lcd_s *lcd) FAR struct mio283qt9a_dev_s *priv; int ret; - lcdvdbg("Initializing\n"); + lcdinfo("Initializing\n"); /* If we could support multiple MIO283QT9A devices, this is where we would allocate * a new driver data structure... but we can't. Why not? Because of a bad should diff --git a/drivers/lcd/nokia6100.c b/drivers/lcd/nokia6100.c index 51cb39fe10..8a21afa396 100644 --- a/drivers/lcd/nokia6100.c +++ b/drivers/lcd/nokia6100.c @@ -308,7 +308,7 @@ /* Debug ******************************************************************************/ #ifdef CONFIG_LCD_REGDEBUG -# define lcddbg(format, ...) llvdbg(format, ##__VA_ARGS__) +# define lcddbg(format, ...) llinfo(format, ##__VA_ARGS__) #else # define lcddbg(x...) #endif @@ -866,7 +866,7 @@ static int nokia_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffe FAR struct spi_dev_s *spi = priv->spi; uint16_t cmd[3]; - gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + ginfo("row: %d col: %d npixels: %d\n", row, col, npixels); #if NOKIA_XBIAS > 0 col += NOKIA_XBIAS; @@ -917,7 +917,7 @@ static int nokia_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffe static int nokia_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, size_t npixels) { - gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + ginfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0); /* At present, this is a write-only LCD driver */ @@ -938,7 +938,7 @@ static int nokia_getvideoinfo(FAR struct lcd_dev_s *dev, FAR struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); - gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n", + ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n", g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes); memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s)); return OK; @@ -956,7 +956,7 @@ static int nokia_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, FAR struct lcd_planeinfo_s *pinfo) { DEBUGASSERT(dev && pinfo && planeno == 0); - gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); + ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s)); return OK; } @@ -973,7 +973,7 @@ static int nokia_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, static int nokia_getpower(struct lcd_dev_s *dev) { struct nokia_dev_s *priv = (struct nokia_dev_s *)dev; - gvdbg("power: %d\n", priv->power); + ginfo("power: %d\n", priv->power); return priv->power; } @@ -991,7 +991,7 @@ static int nokia_setpower(struct lcd_dev_s *dev, int power) struct nokia_dev_s *priv = (struct nokia_dev_s *)dev; int ret; - gvdbg("power: %d\n", power); + ginfo("power: %d\n", power); DEBUGASSERT(power <= CONFIG_LCD_MAXPOWER); /* Set new power level. The backlight power is controlled outside of the LCD @@ -1017,7 +1017,7 @@ static int nokia_setpower(struct lcd_dev_s *dev, int power) static int nokia_getcontrast(struct lcd_dev_s *dev) { struct nokia_dev_s *priv = (struct nokia_dev_s *)dev; - gvdbg("contrast: %d\n", priv->contrast); + ginfo("contrast: %d\n", priv->contrast); return priv->contrast; } @@ -1056,7 +1056,7 @@ static int nokia_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) #endif } - gvdbg("contrast: %d\n", contrast); + ginfo("contrast: %d\n", contrast); return -ENOSYS; } @@ -1169,7 +1169,7 @@ FAR struct lcd_dev_s *nokia_lcdinitialize(FAR struct spi_dev_s *spi, unsigned in { struct nokia_dev_s *priv = &g_lcddev; - gvdbg("Initializing\n"); + ginfo("Initializing\n"); DEBUGASSERT(devno == 0); /* Initialize the driver data structure */ diff --git a/drivers/lcd/p14201.c b/drivers/lcd/p14201.c index 7cb7ad299d..dbc54f547c 100644 --- a/drivers/lcd/p14201.c +++ b/drivers/lcd/p14201.c @@ -180,7 +180,7 @@ /* Debug ******************************************************************************/ #ifdef CONFIG_LCD_RITDEBUG -# define ritdbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define ritdbg(format, ...) info(format, ##__VA_ARGS__) #else # define ritdbg(x...) #endif @@ -990,7 +990,7 @@ static int rit_getvideoinfo(FAR struct lcd_dev_s *dev, FAR struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); - gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n", + ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n", g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes); memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s)); return OK; @@ -1008,7 +1008,7 @@ static int rit_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, FAR struct lcd_planeinfo_s *pinfo) { DEBUGASSERT(pinfo && planeno == 0); - gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); + ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s)); return OK; } @@ -1027,7 +1027,7 @@ static int rit_getpower(FAR struct lcd_dev_s *dev) FAR struct rit_dev_s *priv = (FAR struct rit_dev_s *)dev; DEBUGASSERT(priv); - gvdbg("power: %s\n", priv->on ? "ON" : "OFF"); + ginfo("power: %s\n", priv->on ? "ON" : "OFF"); return priv->on ? CONFIG_LCD_MAXPOWER : 0; } @@ -1045,7 +1045,7 @@ static int rit_setpower(struct lcd_dev_s *dev, int power) struct rit_dev_s *priv = (struct rit_dev_s *)dev; DEBUGASSERT(priv && (unsigned)power <= CONFIG_LCD_MAXPOWER && priv->spi); - gvdbg("power: %d\n", power); + ginfo("power: %d\n", power); /* Select the SD1329 controller */ @@ -1090,7 +1090,7 @@ static int rit_getcontrast(struct lcd_dev_s *dev) { struct rit_dev_s *priv = (struct rit_dev_s *)dev; - gvdbg("contrast: %d\n", priv->contrast); + ginfo("contrast: %d\n", priv->contrast); return priv->contrast; } @@ -1107,7 +1107,7 @@ static int rit_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) struct rit_dev_s *priv = (struct rit_dev_s *)dev; uint8_t cmd[3]; - gvdbg("contrast: %d\n", contrast); + ginfo("contrast: %d\n", contrast); DEBUGASSERT(contrast <= CONFIG_LCD_MAXCONTRAST); /* Select the SD1329 controller */ @@ -1156,7 +1156,7 @@ FAR struct lcd_dev_s *rit_initialize(FAR struct spi_dev_s *spi, unsigned int dev FAR struct rit_dev_s *priv = (FAR struct rit_dev_s *)&g_oleddev; DEBUGASSERT(devno == 0 && spi); - gvdbg("Initializing devno: %d\n", devno); + ginfo("Initializing devno: %d\n", devno); /* Driver state data */ diff --git a/drivers/lcd/pcf8574_lcd_backpack.c b/drivers/lcd/pcf8574_lcd_backpack.c index a8e288c6cc..8cda5412ec 100644 --- a/drivers/lcd/pcf8574_lcd_backpack.c +++ b/drivers/lcd/pcf8574_lcd_backpack.c @@ -80,10 +80,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg dbg -# define lcdvdbg vdbg +# define lcdinfo info #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif #define MAX_OPENCNT (255) /* Limit of uint8_t */ @@ -185,7 +185,7 @@ static void pca8574_write(FAR struct pcf8574_lcd_dev_s *priv, uint8_t data) ret = i2c_write(priv->i2c, &config, &data, 1); if (ret < 0) { - lcdvdbg("pca8574_write() failed: %d\n", ret); + lcdinfo("pca8574_write() failed: %d\n", ret); return; } @@ -222,7 +222,7 @@ static int pca8574_read(FAR struct pcf8574_lcd_dev_s *priv, uint8_t* data) ret = i2c_read(priv->i2c, &config, data, 1); if (ret < 0) { - lcdvdbg("pca8574_read() failed: %d\n", ret); + lcdinfo("pca8574_read() failed: %d\n", ret); } return ret; @@ -704,7 +704,7 @@ static void lcd_scroll_up(FAR struct pcf8574_lcd_dev_s *priv) data = (uint8_t *)malloc(priv->cfg.cols); if (NULL == data) { - lcdvdbg("Failed to allocate buffer in lcd_scroll_up()\n"); + lcdinfo("Failed to allocate buffer in lcd_scroll_up()\n"); return; } @@ -1428,7 +1428,7 @@ static int pcf8574_lcd_ioctl(FAR struct file *filep, int cmd, FAR struct pcf8574_lcd_dev_s *priv = (FAR struct pcf8574_lcd_dev_s *)inode->i_private; FAR struct slcd_attributes_s *attr = (FAR struct slcd_attributes_s *)((uintptr_t)arg); - lcdvdbg("SLCDIOC_GETATTRIBUTES:\n"); + lcdinfo("SLCDIOC_GETATTRIBUTES:\n"); if (!attr) { @@ -1578,13 +1578,13 @@ int pcf8574_lcd_backpack_register(FAR const char *devpath, if (cfg->rows < 1 || cfg->rows > 4) { - lcdvdbg("Display rows must be 1-4\n"); + lcdinfo("Display rows must be 1-4\n"); return -EINVAL; } if ((cfg->cols < 1 || cfg->cols > 64) || (cfg->rows == 4 && cfg->cols > 32)) { - lcdvdbg("Display cols must be 1-64, and may not be part of a 4x40 configuration\n"); + lcdinfo("Display cols must be 1-64, and may not be part of a 4x40 configuration\n"); return -EINVAL; } @@ -1593,7 +1593,7 @@ int pcf8574_lcd_backpack_register(FAR const char *devpath, priv = (FAR struct pcf8574_lcd_dev_s *)kmm_malloc(sizeof(struct pcf8574_lcd_dev_s)); if (!priv) { - lcdvdbg("Failed to allocate instance\n"); + lcdinfo("Failed to allocate instance\n"); return -ENOMEM; } @@ -1613,10 +1613,10 @@ int pcf8574_lcd_backpack_register(FAR const char *devpath, ret = register_driver(devpath, &g_pcf8574_lcd_fops, 0666, priv); if (ret < 0) { - lcdvdbg("Failed to register driver: %d\n", ret); + lcdinfo("Failed to register driver: %d\n", ret); kmm_free(priv); } - lcdvdbg("pcf8574_lcd_backpack driver loaded successfully!\n"); + lcdinfo("pcf8574_lcd_backpack driver loaded successfully!\n"); return ret; } diff --git a/drivers/lcd/ra8875.c b/drivers/lcd/ra8875.c index ed1897ef62..309a7fb546 100644 --- a/drivers/lcd/ra8875.c +++ b/drivers/lcd/ra8875.c @@ -176,10 +176,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg dbg -# define lcdvdbg vdbg +# define lcdinfo info #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /************************************************************************************** @@ -334,7 +334,7 @@ static void ra8875_putreg(FAR struct ra8875_lcd_s *lcd, uint8_t regaddr, { /* Set the index register to the register address and write the register contents */ - lcdvdbg("putreg 0x%02x = 0x%02x\n", regaddr, regval); + lcdinfo("putreg 0x%02x = 0x%02x\n", regaddr, regval); lcd->write_reg(lcd, regaddr, regval); } @@ -352,7 +352,7 @@ static void ra8875_putreg16(FAR struct ra8875_lcd_s *lcd, uint8_t regaddr, { /* Set the index register to the register address and write the register contents */ - lcdvdbg("putreg 0x%02x = 0x%04x\n", regaddr, regval); + lcdinfo("putreg 0x%02x = 0x%04x\n", regaddr, regval); lcd->write_reg16(lcd, regaddr, regval); } @@ -373,7 +373,7 @@ static uint8_t ra8875_readreg(FAR struct ra8875_lcd_s *lcd, uint8_t regaddr) regval = lcd->read_reg(lcd, regaddr); - lcdvdbg("readreg 0x%02x = 0x%02x\n", regaddr, regval); + lcdinfo("readreg 0x%02x = 0x%02x\n", regaddr, regval); return regval; } #endif @@ -533,13 +533,13 @@ static inline void ra8875_setforeground(FAR struct ra8875_lcd_s *lcd, uint16_t c static void ra8875_clearmem(FAR struct ra8875_lcd_s *lcd) { - lcdvdbg("clearmem start\n"); + lcdinfo("clearmem start\n"); ra8875_putreg(lcd, RA8875_MCLR, RA8875_MCLR_CLEAR | RA8875_MCLR_FULL); /* Wait for operation to finish */ ra8875_waitreg(lcd, RA8875_MCLR, RA8875_MCLR_CLEAR); - lcdvdbg("clearmem done\n"); + lcdinfo("clearmem done\n"); } /************************************************************************************** @@ -829,7 +829,7 @@ static int ra8875_getvideoinfo(FAR struct lcd_dev_s *dev, FAR struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); - lcdvdbg("fmt: %d xres: %d yres: %d nplanes: 1\n", + lcdinfo("fmt: %d xres: %d yres: %d nplanes: 1\n", RA8875_COLORFMT, RA8875_XRES, RA8875_YRES); vinfo->fmt = RA8875_COLORFMT; /* Color format: RGB16-565: RRRR RGGG GGGB BBBB */ @@ -853,7 +853,7 @@ static int ra8875_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, FAR struct ra8875_dev_s *priv = (FAR struct ra8875_dev_s *)dev; DEBUGASSERT(dev && pinfo && planeno == 0); - lcdvdbg("planeno: %d bpp: %d\n", planeno, RA8875_BPP); + lcdinfo("planeno: %d bpp: %d\n", planeno, RA8875_BPP); pinfo->putrun = ra8875_putrun; /* Put a run into LCD memory */ pinfo->getrun = ra8875_getrun; /* Get a run from LCD memory */ @@ -873,7 +873,7 @@ static int ra8875_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, static int ra8875_getpower(FAR struct lcd_dev_s *dev) { - lcdvdbg("power: %d\n", 0); + lcdinfo("power: %d\n", 0); return g_lcddev.power; } @@ -917,7 +917,7 @@ static int ra8875_setpower(FAR struct lcd_dev_s *dev, int power) FAR struct ra8875_dev_s *priv = (FAR struct ra8875_dev_s *)dev; FAR struct ra8875_lcd_s *lcd = priv->lcd; - lcdvdbg("power: %d\n", power); + lcdinfo("power: %d\n", power); DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER); /* Set new power level */ @@ -960,7 +960,7 @@ static int ra8875_setpower(FAR struct lcd_dev_s *dev, int power) static int ra8875_getcontrast(FAR struct lcd_dev_s *dev) { - lcdvdbg("Not implemented\n"); + lcdinfo("Not implemented\n"); return -ENOSYS; } @@ -974,7 +974,7 @@ static int ra8875_getcontrast(FAR struct lcd_dev_s *dev) static int ra8875_setcontrast(FAR struct lcd_dev_s *dev, unsigned int contrast) { - lcdvdbg("contrast: %d\n", contrast); + lcdinfo("contrast: %d\n", contrast); return -ENOSYS; } @@ -993,7 +993,7 @@ static inline int ra8875_hwinitialize(FAR struct ra8875_dev_s *priv) /* REVISIT: Maybe some of these values needs to be configurable?? */ - lcdvdbg("hwinitialize\n"); + lcdinfo("hwinitialize\n"); /* Reset */ @@ -1076,7 +1076,7 @@ static inline int ra8875_hwinitialize(FAR struct ra8875_dev_s *priv) priv->shadow_w_curh = 0; priv->shadow_w_curv = 0; - lcdvdbg("hwinitialize done\n"); + lcdinfo("hwinitialize done\n"); return OK; } @@ -1098,7 +1098,7 @@ FAR struct lcd_dev_s *ra8875_lcdinitialize(FAR struct ra8875_lcd_s *lcd) { int ret; - lcdvdbg("Initializing\n"); + lcdinfo("Initializing\n"); /* If we could support multiple RA8875 devices, this is where we would allocate * a new driver data structure... but we can't. Why not? Because of a bad should @@ -1130,7 +1130,7 @@ FAR struct lcd_dev_s *ra8875_lcdinitialize(FAR struct ra8875_lcd_s *lcd) ra8875_poweroff(lcd); - lcdvdbg("Initialized\n"); + lcdinfo("Initialized\n"); return &g_lcddev.dev; } diff --git a/drivers/lcd/skeleton.c b/drivers/lcd/skeleton.c index 0c38ac441e..f0bd831137 100644 --- a/drivers/lcd/skeleton.c +++ b/drivers/lcd/skeleton.c @@ -90,7 +90,7 @@ /* Debug ******************************************************************************/ #ifdef CONFIG_LCD_SKELDEBUG -# define skeldbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define skeldbg(format, ...) info(format, ##__VA_ARGS__) #else # define skeldbg(x...) #endif @@ -230,7 +230,7 @@ static int skel_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer { /* Buffer must be provided and aligned to a 16-bit address boundary */ - gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + ginfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0); /* Set up to write the run. */ @@ -259,7 +259,7 @@ static int skel_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, { /* Buffer must be provided and aligned to a 16-bit address boundary */ - gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + ginfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0); #warning "Missing logic" @@ -278,7 +278,7 @@ static int skel_getvideoinfo(FAR struct lcd_dev_s *dev, FAR struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); - gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n", + ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n", g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes); memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s)); return OK; @@ -296,7 +296,7 @@ static int skel_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, FAR struct lcd_planeinfo_s *pinfo) { DEBUGASSERT(dev && pinfo && planeno == 0); - gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); + ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s)); return OK; } @@ -313,7 +313,7 @@ static int skel_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, static int skel_getpower(struct lcd_dev_s *dev) { struct skel_dev_s *priv = (struct skel_dev_s *)dev; - gvdbg("power: %d\n", 0); + ginfo("power: %d\n", 0); #warning "Missing logic" return 0; } @@ -331,7 +331,7 @@ static int skel_setpower(struct lcd_dev_s *dev, int power) { struct skel_dev_s *priv = (struct skel_dev_s *)dev; - gvdbg("power: %d\n", power); + ginfo("power: %d\n", power); DEBUGASSERT(power <= CONFIG_LCD_MAXPOWER); /* Set new power level */ @@ -350,7 +350,7 @@ static int skel_setpower(struct lcd_dev_s *dev, int power) static int skel_getcontrast(struct lcd_dev_s *dev) { - gvdbg("Not implemented\n"); + ginfo("Not implemented\n"); #warning "Missing logic" return -ENOSYS; } @@ -365,7 +365,7 @@ static int skel_getcontrast(struct lcd_dev_s *dev) static int skel_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) { - gvdbg("contrast: %d\n", contrast); + ginfo("contrast: %d\n", contrast); #warning "Missing logic" return -ENOSYS; } @@ -386,7 +386,7 @@ static int skel_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) FAR struct lcd_dev_s *up_oledinitialize(FAR struct spi_dev_s *spi) { - gvdbg("Initializing\n"); + ginfo("Initializing\n"); /* Configure GPIO pins */ #warning "Missing logic" diff --git a/drivers/lcd/ssd1289.c b/drivers/lcd/ssd1289.c index 6ef171b306..8c4800d5fe 100644 --- a/drivers/lcd/ssd1289.c +++ b/drivers/lcd/ssd1289.c @@ -230,10 +230,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg dbg -# define lcdvdbg vdbg +# define lcdinfo info #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /************************************************************************************** @@ -846,7 +846,7 @@ static int ssd1289_getvideoinfo(FAR struct lcd_dev_s *dev, FAR struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); - lcdvdbg("fmt: %d xres: %d yres: %d nplanes: 1\n", + lcdinfo("fmt: %d xres: %d yres: %d nplanes: 1\n", SSD1289_COLORFMT, SSD1289_XRES, SSD1289_YRES); vinfo->fmt = SSD1289_COLORFMT; /* Color format: RGB16-565: RRRR RGGG GGGB BBBB */ @@ -870,7 +870,7 @@ static int ssd1289_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, FAR struct ssd1289_dev_s *priv = (FAR struct ssd1289_dev_s *)dev; DEBUGASSERT(dev && pinfo && planeno == 0); - lcdvdbg("planeno: %d bpp: %d\n", planeno, SSD1289_BPP); + lcdinfo("planeno: %d bpp: %d\n", planeno, SSD1289_BPP); pinfo->putrun = ssd1289_putrun; /* Put a run into LCD memory */ pinfo->getrun = ssd1289_getrun; /* Get a run from LCD memory */ @@ -890,7 +890,7 @@ static int ssd1289_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, static int ssd1289_getpower(FAR struct lcd_dev_s *dev) { - lcdvdbg("power: %d\n", 0); + lcdinfo("power: %d\n", 0); return g_lcddev.power; } @@ -933,7 +933,7 @@ static int ssd1289_setpower(FAR struct lcd_dev_s *dev, int power) FAR struct ssd1289_dev_s *priv = (FAR struct ssd1289_dev_s *)dev; FAR struct ssd1289_lcd_s *lcd = priv->lcd; - lcdvdbg("power: %d\n", power); + lcdinfo("power: %d\n", power); DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER); /* Set new power level */ @@ -974,7 +974,7 @@ static int ssd1289_setpower(FAR struct lcd_dev_s *dev, int power) static int ssd1289_getcontrast(FAR struct lcd_dev_s *dev) { - lcdvdbg("Not implemented\n"); + lcdinfo("Not implemented\n"); return -ENOSYS; } @@ -988,7 +988,7 @@ static int ssd1289_getcontrast(FAR struct lcd_dev_s *dev) static int ssd1289_setcontrast(FAR struct lcd_dev_s *dev, unsigned int contrast) { - lcdvdbg("contrast: %d\n", contrast); + lcdinfo("contrast: %d\n", contrast); return -ENOSYS; } @@ -1302,7 +1302,7 @@ FAR struct lcd_dev_s *ssd1289_lcdinitialize(FAR struct ssd1289_lcd_s *lcd) { int ret; - lcdvdbg("Initializing\n"); + lcdinfo("Initializing\n"); /* If we ccould support multiple SSD1289 devices, this is where we would allocate * a new driver data structure... but we can't. Why not? Because of a bad should diff --git a/drivers/lcd/ssd1306.h b/drivers/lcd/ssd1306.h index 6c008e7a9b..fb71377279 100644 --- a/drivers/lcd/ssd1306.h +++ b/drivers/lcd/ssd1306.h @@ -213,10 +213,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg(format, ...) dbg(format, ##__VA_ARGS__) -# define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define lcdinfo(format, ...) info(format, ##__VA_ARGS__) #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /************************************************************************************** diff --git a/drivers/lcd/ssd1306_base.c b/drivers/lcd/ssd1306_base.c index db94d9ea83..345b5f5695 100644 --- a/drivers/lcd/ssd1306_base.c +++ b/drivers/lcd/ssd1306_base.c @@ -272,7 +272,7 @@ static int ssd1306_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buf int pixlen; uint8_t i; - lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer); /* Clip the run to the display */ @@ -480,7 +480,7 @@ static int ssd1306_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, int pixlen; uint8_t i; - lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer); /* Clip the run to the display */ @@ -625,7 +625,7 @@ static int ssd1306_getvideoinfo(FAR struct lcd_dev_s *dev, FAR struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); - lcdvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n", + lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n", g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes); memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s)); return OK; @@ -643,7 +643,7 @@ static int ssd1306_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, FAR struct lcd_planeinfo_s *pinfo) { DEBUGASSERT(pinfo && planeno == 0); - lcdvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); + lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s)); return OK; } @@ -662,7 +662,7 @@ static int ssd1306_getpower(FAR struct lcd_dev_s *dev) FAR struct ssd1306_dev_s *priv = (FAR struct ssd1306_dev_s *)dev; DEBUGASSERT(priv); - lcdvdbg("power: %s\n", priv->on ? "ON" : "OFF"); + lcdinfo("power: %s\n", priv->on ? "ON" : "OFF"); return priv->on ? CONFIG_LCD_MAXPOWER : 0; } @@ -680,7 +680,7 @@ static int ssd1306_setpower(FAR struct lcd_dev_s *dev, int power) struct ssd1306_dev_s *priv = (struct ssd1306_dev_s *)dev; DEBUGASSERT(priv && (unsigned)power <= CONFIG_LCD_MAXPOWER); - lcdvdbg("power: %d [%d]\n", power, priv->on ? CONFIG_LCD_MAXPOWER : 0); + lcdinfo("power: %d [%d]\n", power, priv->on ? CONFIG_LCD_MAXPOWER : 0); /* Lock and select device */ @@ -720,7 +720,7 @@ static int ssd1306_getcontrast(struct lcd_dev_s *dev) struct ssd1306_dev_s *priv = (struct ssd1306_dev_s *)dev; DEBUGASSERT(priv); - lcdvdbg("contrast: %d\n", priv->contrast); + lcdinfo("contrast: %d\n", priv->contrast); return priv->contrast; } @@ -737,7 +737,7 @@ static int ssd1306_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) struct ssd1306_dev_s *priv = (struct ssd1306_dev_s *)dev; unsigned int scaled; - lcdvdbg("contrast: %d\n", contrast); + lcdinfo("contrast: %d\n", contrast); DEBUGASSERT(priv); /* Verify the contrast value */ @@ -812,7 +812,7 @@ FAR struct lcd_dev_s *ssd1306_initialize(FAR struct i2c_master_s *dev, unsigned { FAR struct ssd1306_dev_s *priv = &g_oleddev; - lcdvdbg("Initializing\n"); + lcdinfo("Initializing\n"); DEBUGASSERT(spi && devno == 0); #ifdef CONFIG_LCD_SSD1306_SPI diff --git a/drivers/lcd/ssd1306_spi.c b/drivers/lcd/ssd1306_spi.c index b17466c40e..f40a59cdf8 100644 --- a/drivers/lcd/ssd1306_spi.c +++ b/drivers/lcd/ssd1306_spi.c @@ -63,7 +63,7 @@ static inline void ssd1306_configspi(FAR struct spi_dev_s *spi) { - lcdvdbg("Mode: %d Bits: 8 Frequency: %d\n", + lcdinfo("Mode: %d Bits: 8 Frequency: %d\n", CONFIG_SSD1306_SPIMODE, CONFIG_SSD1306_FREQUENCY); /* Configure SPI for the SSD1306 */ diff --git a/drivers/lcd/ssd1351.c b/drivers/lcd/ssd1351.c index c56cc2b682..00908cee66 100644 --- a/drivers/lcd/ssd1351.c +++ b/drivers/lcd/ssd1351.c @@ -821,7 +821,7 @@ static int ssd1351_getvideoinfo(FAR struct lcd_dev_s *dev, vinfo->yres = SSD1351_YRES; vinfo->nplanes = 1; - gvdbg("fmt: %u xres: %u yres: %u nplanes: %u\n", + ginfo("fmt: %u xres: %u yres: %u nplanes: %u\n", vinfo->fmt, vinfo->xres, vinfo->yres, vinfo->nplanes); return OK; } @@ -847,7 +847,7 @@ static int ssd1351_getplaneinfo(FAR struct lcd_dev_s *dev, pinfo->buffer = (uint8_t *)priv->runbuffer; pinfo->bpp = SSD1351_BPP; - gvdbg("planeno: %u bpp: %u\n", planeno, pinfo->bpp); + ginfo("planeno: %u bpp: %u\n", planeno, pinfo->bpp); return OK; } @@ -868,7 +868,7 @@ static int ssd1351_getpower(FAR struct lcd_dev_s *dev) /* Sanity check */ DEBUGASSERT(priv != NULL); - gvdbg("power: %d\n", priv->power); + ginfo("power: %d\n", priv->power); return priv->power; } @@ -890,7 +890,7 @@ static int ssd1351_setpower(FAR struct lcd_dev_s *dev, int power) /* Sanity check */ DEBUGASSERT(priv != NULL && (unsigned int)power <= LCD_FULL_ON); - gvdbg("power: %d\n", power); + ginfo("power: %d\n", power); /* Select and lock the device */ diff --git a/drivers/lcd/st7565.c b/drivers/lcd/st7565.c index 62736e38c3..6350e0bda7 100644 --- a/drivers/lcd/st7565.c +++ b/drivers/lcd/st7565.c @@ -179,7 +179,7 @@ /* Debug ******************************************************************************/ #ifdef CONFIG_LCD_ST7565DEBUG -# define st7565dbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define st7565dbg(format, ...) info(format, ##__VA_ARGS__) #else # define st7565dbg(x...) #endif @@ -475,7 +475,7 @@ static int st7565_putrun(fb_coord_t row, fb_coord_t col, uint8_t i; int pixlen; - gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + ginfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer); /* Clip the run to the display */ @@ -627,7 +627,7 @@ static int st7565_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t * buffer, uint8_t i; int pixlen; - gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + ginfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer); /* Clip the run to the display */ @@ -736,7 +736,7 @@ static int st7565_getvideoinfo(FAR struct lcd_dev_s *dev, FAR struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); - gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n", + ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n", g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes); memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s)); @@ -755,7 +755,7 @@ static int st7565_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, FAR struct lcd_planeinfo_s *pinfo) { DEBUGASSERT(dev && pinfo && planeno == 0); - gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); + ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s)); return OK; } @@ -773,7 +773,7 @@ static int st7565_getpower(struct lcd_dev_s *dev) { struct st7565_dev_s *priv = (struct st7565_dev_s *)dev; DEBUGASSERT(priv); - gvdbg("powered: %s\n", priv->power_level); + ginfo("powered: %s\n", priv->power_level); return priv->power_level; } @@ -791,7 +791,7 @@ static int st7565_setpower(struct lcd_dev_s *dev, int power) struct st7565_dev_s *priv = (struct st7565_dev_s *)dev; DEBUGASSERT(priv && (unsigned)power <= CONFIG_LCD_MAXPOWER); - gvdbg("power: %s powered: %s\n", power, priv->power_level); + ginfo("power: %s powered: %s\n", power, priv->power_level); /* Select and lock the device */ @@ -859,7 +859,7 @@ static int st7565_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) { struct st7565_dev_s *priv = (struct st7565_dev_s *)dev; - gvdbg("contrast: %d\n", contrast); + ginfo("contrast: %d\n", contrast); DEBUGASSERT(priv); if (contrast > 255) @@ -974,7 +974,7 @@ FAR struct lcd_dev_s *st7565_initialize(FAR struct st7565_lcd_s *lcd, FAR struct st7565_dev_s *priv = &g_st7565dev; - gvdbg("Initializing\n"); + ginfo("Initializing\n"); DEBUGASSERT(lcd && devno == 0); /* Save the reference to the SPI device */ diff --git a/drivers/lcd/st7567.c b/drivers/lcd/st7567.c index 4447b1ef4e..004f0deae4 100644 --- a/drivers/lcd/st7567.c +++ b/drivers/lcd/st7567.c @@ -209,7 +209,7 @@ /* Debug ******************************************************************************/ #ifdef CONFIG_LCD_ST7567DEBUG -# define st7567dbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define st7567dbg(format, ...) info(format, ##__VA_ARGS__) #else # define st7567dbg(x...) #endif @@ -439,7 +439,7 @@ static int st7567_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buff uint8_t i; int pixlen; - gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + ginfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer); /* Clip the run to the display */ @@ -587,7 +587,7 @@ static int st7567_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, uint8_t i; int pixlen; - gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + ginfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer); /* Clip the run to the display */ @@ -698,7 +698,7 @@ static int st7567_getvideoinfo(FAR struct lcd_dev_s *dev, FAR struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); - gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n", + ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n", g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes); memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s)); return OK; @@ -716,7 +716,7 @@ static int st7567_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, FAR struct lcd_planeinfo_s *pinfo) { DEBUGASSERT(dev && pinfo && planeno == 0); - gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); + ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s)); return OK; } @@ -734,7 +734,7 @@ static int st7567_getpower(struct lcd_dev_s *dev) { struct st7567_dev_s *priv = (struct st7567_dev_s *)dev; DEBUGASSERT(priv); - gvdbg("powered: %s\n", st7567_powerstring(priv->powered)); + ginfo("powered: %s\n", st7567_powerstring(priv->powered)); return priv->powered; } @@ -752,7 +752,7 @@ static int st7567_setpower(struct lcd_dev_s *dev, int power) struct st7567_dev_s *priv = (struct st7567_dev_s *)dev; DEBUGASSERT(priv && (unsigned)power <= CONFIG_LCD_MAXPOWER); - gvdbg("power: %s powered: %s\n", + ginfo("power: %s powered: %s\n", st7567_powerstring(power), st7567_powerstring(priv->powered)); /* Select and lock the device */ @@ -806,7 +806,7 @@ static int st7567_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) { struct st7567_dev_s *priv = (struct st7567_dev_s *)dev; - gvdbg("contrast: %d\n", contrast); + ginfo("contrast: %d\n", contrast); DEBUGASSERT(priv); if (contrast > 255) @@ -915,7 +915,7 @@ FAR struct lcd_dev_s *st7567_initialize(FAR struct spi_dev_s *spi, unsigned int FAR struct st7567_dev_s *priv = &g_st7567dev; - gvdbg("Initializing\n"); + ginfo("Initializing\n"); DEBUGASSERT(spi && devno == 0); /* Save the reference to the SPI device */ diff --git a/drivers/lcd/ug-2864ambag01.c b/drivers/lcd/ug-2864ambag01.c index ab53fbc024..7019ddbc5a 100644 --- a/drivers/lcd/ug-2864ambag01.c +++ b/drivers/lcd/ug-2864ambag01.c @@ -264,10 +264,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg(format, ...) dbg(format, ##__VA_ARGS__) -# define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define lcdinfo(format, ...) info(format, ##__VA_ARGS__) #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /************************************************************************************** @@ -487,7 +487,7 @@ static int ug2864ambag01_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_ int pixlen; uint8_t i; - lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer); /* Clip the run to the display */ @@ -697,7 +697,7 @@ static int ug2864ambag01_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buf int pixlen; uint8_t i; - lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer); /* Clip the run to the display */ @@ -842,7 +842,7 @@ static int ug2864ambag01_getvideoinfo(FAR struct lcd_dev_s *dev, FAR struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); - lcdvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n", + lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n", g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes); memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s)); return OK; @@ -860,7 +860,7 @@ static int ug2864ambag01_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int pl FAR struct lcd_planeinfo_s *pinfo) { DEBUGASSERT(pinfo && planeno == 0); - lcdvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); + lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s)); return OK; } @@ -879,7 +879,7 @@ static int ug2864ambag01_getpower(FAR struct lcd_dev_s *dev) FAR struct ug2864ambag01_dev_s *priv = (FAR struct ug2864ambag01_dev_s *)dev; DEBUGASSERT(priv); - lcdvdbg("power: %s\n", priv->on ? "ON" : "OFF"); + lcdinfo("power: %s\n", priv->on ? "ON" : "OFF"); return priv->on ? CONFIG_LCD_MAXPOWER : 0; } @@ -897,7 +897,7 @@ static int ug2864ambag01_setpower(struct lcd_dev_s *dev, int power) struct ug2864ambag01_dev_s *priv = (struct ug2864ambag01_dev_s *)dev; DEBUGASSERT(priv && (unsigned)power <= CONFIG_LCD_MAXPOWER && priv->spi); - lcdvdbg("power: %d [%d]\n", power, priv->on ? CONFIG_LCD_MAXPOWER : 0); + lcdinfo("power: %d [%d]\n", power, priv->on ? CONFIG_LCD_MAXPOWER : 0); /* Lock and select device */ @@ -939,7 +939,7 @@ static int ug2864ambag01_getcontrast(struct lcd_dev_s *dev) struct ug2864ambag01_dev_s *priv = (struct ug2864ambag01_dev_s *)dev; DEBUGASSERT(priv); - lcdvdbg("contrast: %d\n", priv->contrast); + lcdinfo("contrast: %d\n", priv->contrast); return priv->contrast; } @@ -956,7 +956,7 @@ static int ug2864ambag01_setcontrast(struct lcd_dev_s *dev, unsigned int contras struct ug2864ambag01_dev_s *priv = (struct ug2864ambag01_dev_s *)dev; unsigned int scaled; - lcdvdbg("contrast: %d\n", contrast); + lcdinfo("contrast: %d\n", contrast); DEBUGASSERT(priv); /* Verify the contrast value */ @@ -1029,7 +1029,7 @@ FAR struct lcd_dev_s *ug2864ambag01_initialize(FAR struct spi_dev_s *spi, unsign { FAR struct ug2864ambag01_dev_s *priv = &g_oleddev; - lcdvdbg("Initializing\n"); + lcdinfo("Initializing\n"); DEBUGASSERT(spi && devno == 0); /* Save the reference to the SPI device */ diff --git a/drivers/lcd/ug-9664hswag01.c b/drivers/lcd/ug-9664hswag01.c index 89e7ba5a62..9fa03989f6 100644 --- a/drivers/lcd/ug-9664hswag01.c +++ b/drivers/lcd/ug-9664hswag01.c @@ -224,7 +224,7 @@ /* Debug ******************************************************************************/ #ifdef CONFIG_DEBUG_LCD -# define lcddbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define lcddbg(format, ...) info(format, ##__VA_ARGS__) #else # define lcddbg(x...) #endif @@ -484,7 +484,7 @@ static int ug_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer, uint8_t i; int pixlen; - gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + ginfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer); /* Clip the run to the display */ @@ -681,7 +681,7 @@ static int ug_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, uint8_t i; int pixlen; - gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels); + ginfo("row: %d col: %d npixels: %d\n", row, col, npixels); DEBUGASSERT(buffer); /* Clip the run to the display */ @@ -824,7 +824,7 @@ static int ug_getvideoinfo(FAR struct lcd_dev_s *dev, FAR struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); - gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n", + ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n", g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes); memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s)); return OK; @@ -842,7 +842,7 @@ static int ug_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, FAR struct lcd_planeinfo_s *pinfo) { DEBUGASSERT(dev && pinfo && planeno == 0); - gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); + ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s)); return OK; } @@ -860,7 +860,7 @@ static int ug_getpower(struct lcd_dev_s *dev) { struct ug_dev_s *priv = (struct ug_dev_s *)dev; DEBUGASSERT(priv); - gvdbg("powered: %s\n", ug_powerstring(priv->powered)); + ginfo("powered: %s\n", ug_powerstring(priv->powered)); return priv->powered; } @@ -878,7 +878,7 @@ static int ug_setpower(struct lcd_dev_s *dev, int power) struct ug_dev_s *priv = (struct ug_dev_s *)dev; DEBUGASSERT(priv && (unsigned)power <= CONFIG_LCD_MAXPOWER); - gvdbg("power: %s powered: %s\n", + ginfo("power: %s powered: %s\n", ug_powerstring(power), ug_powerstring(priv->powered)); /* Select and lock the device */ @@ -947,7 +947,7 @@ static int ug_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) { struct ug_dev_s *priv = (struct ug_dev_s *)dev; - gvdbg("contrast: %d\n", contrast); + ginfo("contrast: %d\n", contrast); DEBUGASSERT(priv); if (contrast > 255) @@ -1056,7 +1056,7 @@ FAR struct lcd_dev_s *ug_initialize(FAR struct spi_dev_s *spi, unsigned int devn FAR struct ug_dev_s *priv = &g_ugdev; - gvdbg("Initializing\n"); + ginfo("Initializing\n"); DEBUGASSERT(spi && devno == 0); /* Save the reference to the SPI device */ diff --git a/drivers/leds/rgbled.c b/drivers/leds/rgbled.c index 27e7a1a9eb..4760abf207 100644 --- a/drivers/leds/rgbled.c +++ b/drivers/leds/rgbled.c @@ -74,14 +74,14 @@ #ifdef CONFIG_DEBUG_RGBLED # define pwmdbg dbg -# define pwmvdbg vdbg +# define pwminfo info # define pwmlldbg lldbg -# define pwmllvdbg llvdbg +# define pwmllinfo llinfo #else # define pwmdbg(x...) -# define pwmvdbg(x...) +# define pwminfo(x...) # define pwmlldbg(x...) -# define pwmllvdbg(x...) +# define pwmllinfo(x...) #endif /**************************************************************************** @@ -150,7 +150,7 @@ static int rgbled_open(FAR struct file *filep) uint8_t tmp; int ret; - pwmvdbg("crefs: %d\n", upper->crefs); + pwminfo("crefs: %d\n", upper->crefs); /* Get exclusive access to the device structures */ @@ -201,7 +201,7 @@ static int rgbled_close(FAR struct file *filep) FAR struct rgbled_upperhalf_s *upper = inode->i_private; int ret; - pwmvdbg("crefs: %d\n", upper->crefs); + pwminfo("crefs: %d\n", upper->crefs); /* Get exclusive access to the device structures */ @@ -410,7 +410,7 @@ int rgbled_register(FAR const char *path, FAR struct pwm_lowerhalf_s *ledr, /* Register the PWM device */ - pwmvdbg("Registering %s\n", path); + pwminfo("Registering %s\n", path); return register_driver(path, &g_rgbledops, 0666, upper); } diff --git a/drivers/leds/userled_lower.c b/drivers/leds/userled_lower.c index 69e349f64d..32cff16e10 100644 --- a/drivers/leds/userled_lower.c +++ b/drivers/leds/userled_lower.c @@ -88,7 +88,7 @@ static const struct userled_lowerhalf_s g_userled_lower = static userled_set_t userled_supported(FAR const struct userled_lowerhalf_s *lower) { - ivdbg("BOARD_NLEDS: %02x\n", BOARD_NLEDS); + iinfo("BOARD_NLEDS: %02x\n", BOARD_NLEDS); return (userled_set_t)((1 << BOARD_NLEDS) - 1); } diff --git a/drivers/leds/userled_upper.c b/drivers/leds/userled_upper.c index e0843100e7..43954bd63a 100644 --- a/drivers/leds/userled_upper.c +++ b/drivers/leds/userled_upper.c @@ -69,13 +69,13 @@ #ifdef CONFIG_DEBUG_LEDS # define ddbg lldbg # ifdef CONFIG_DEBUG_INFO -# define dvdbg lldbg +# define dinfo lldbg # else -# define dvdbg(x...) +# define dinfo(x...) # endif #else # define ddbg(x...) -# define dvdbg(x...) +# define dinfo(x...) #endif /**************************************************************************** @@ -197,7 +197,7 @@ static int userled_open(FAR struct file *filep) ret = userled_takesem(&priv->lu_exclsem); if (ret < 0) { - dvdbg("ERROR: userled_takesem failed: %d\n", ret); + dinfo("ERROR: userled_takesem failed: %d\n", ret); return ret; } @@ -206,7 +206,7 @@ static int userled_open(FAR struct file *filep) opriv = (FAR struct userled_open_s *)kmm_zalloc(sizeof(struct userled_open_s)); if (!opriv) { - dvdbg("ERROR: Failled to allocate open structure\n"); + dinfo("ERROR: Failled to allocate open structure\n"); ret = -ENOMEM; goto errout_with_sem; } @@ -274,7 +274,7 @@ static int userled_close(FAR struct file *filep) ret = userled_takesem(&priv->lu_exclsem); if (ret < 0) { - dvdbg("ERROR: userled_takesem failed: %d\n", ret); + dinfo("ERROR: userled_takesem failed: %d\n", ret); return ret; } @@ -287,7 +287,7 @@ static int userled_close(FAR struct file *filep) DEBUGASSERT(curr); if (!curr) { - dvdbg("ERROR: Failed to find open entry\n"); + dinfo("ERROR: Failed to find open entry\n"); ret = -ENOENT; goto errout_with_exclsem; } @@ -339,7 +339,7 @@ static ssize_t userled_write(FAR struct file *filep, FAR const char *buffer, if (len < sizeof(userled_set_t)) { - dvdbg("ERROR: buffer too small: %lu\n", (unsigned long)len); + dinfo("ERROR: buffer too small: %lu\n", (unsigned long)len); return -EINVAL; } @@ -356,7 +356,7 @@ static ssize_t userled_write(FAR struct file *filep, FAR const char *buffer, ret = userled_takesem(&priv->lu_exclsem); if (ret < 0) { - dvdbg("ERROR: userled_takesem failed: %d\n", ret); + dinfo("ERROR: userled_takesem failed: %d\n", ret); return ret; } @@ -391,7 +391,7 @@ static int userled_ioctl(FAR struct file *filep, int cmd, unsigned long arg) ret = userled_takesem(&priv->lu_exclsem); if (ret < 0) { - dvdbg("ERROR: userled_takesem failed: %d\n", ret); + dinfo("ERROR: userled_takesem failed: %d\n", ret); return ret; } @@ -521,7 +521,7 @@ static int userled_ioctl(FAR struct file *filep, int cmd, unsigned long arg) break; default: - dvdbg("ERROR: Unrecognized command: %ld\n", cmd); + dinfo("ERROR: Unrecognized command: %ld\n", cmd); ret = -ENOTTY; break; } @@ -569,7 +569,7 @@ int userled_register(FAR const char *devname, if (!priv) { - dvdbg("ERROR: Failed to allocate device structure\n"); + dinfo("ERROR: Failed to allocate device structure\n"); return -ENOMEM; } @@ -590,7 +590,7 @@ int userled_register(FAR const char *devname, ret = register_driver(devname, &userled_fops, 0666, priv); if (ret < 0) { - dvdbg("ERROR: register_driver failed: %d\n", ret); + dinfo("ERROR: register_driver failed: %d\n", ret); goto errout_with_priv; } diff --git a/drivers/mmcsd/mmcsd.h b/drivers/mmcsd/mmcsd.h index b9dba016bf..fb52726d4e 100644 --- a/drivers/mmcsd/mmcsd.h +++ b/drivers/mmcsd/mmcsd.h @@ -87,7 +87,7 @@ extern "C" { #endif #ifdef CONFIG_MMCSD_DUMPALL -# define mmcsd_dumpbuffer(m,b,l) fvdbgdumpbuffer(m,b,l) +# define mmcsd_dumpbuffer(m,b,l) finfodumpbuffer(m,b,l) #else # define mmcsd_dumpbuffer(m,b,l) #endif diff --git a/drivers/mmcsd/mmcsd_debug.c b/drivers/mmcsd/mmcsd_debug.c index fdea1dfdaf..817c0272c1 100644 --- a/drivers/mmcsd/mmcsd_debug.c +++ b/drivers/mmcsd/mmcsd_debug.c @@ -87,90 +87,90 @@ void mmcsd_dmpcsd(FAR const uint8_t *csd, uint8_t cardtype) bool mmc = (cardtype == MMCSD_CARDTYPE_MMC); bool sd2 = (MMCSD_CSD_CSDSTRUCT(csd) == 1); - fvdbg("CSD\n"); - fvdbg(" CSD_STRUCTURE: 1.%d\n", MMCSD_CSD_CSDSTRUCT(csd)); + finfo("CSD\n"); + finfo(" CSD_STRUCTURE: 1.%d\n", MMCSD_CSD_CSDSTRUCT(csd)); if (mmc) { - fvdbg(" MMC SPEC_VERS: %d\n", MMC_CSD_SPECVERS(csd)); + finfo(" MMC SPEC_VERS: %d\n", MMC_CSD_SPECVERS(csd)); } - fvdbg(" TAAC:\n", + finfo(" TAAC:\n", sd2 ? SD20_CSD_TAC_TIMEVALUE(csd) : MMCSD_CSD_TAAC_TIMEVALUE(csd)); - fvdbg(" TIME_VALUE: 0x%02x\n", + finfo(" TIME_VALUE: 0x%02x\n", sd2 ? SD20_CSD_TAC_TIMEVALUE(csd) : MMCSD_CSD_TAAC_TIMEVALUE(csd)); - fvdbg(" TIME_UNIT: 0x%02x\n", + finfo(" TIME_UNIT: 0x%02x\n", sd2 ? SD20_CSD_TAC_TIMEUNIT(csd) : MMCSD_CSD_TAAC_TIMEUNIT(csd)); - fvdbg(" NSAC: 0x%02x\n", + finfo(" NSAC: 0x%02x\n", sd2 ? SD20_CSD_NSAC(csd) : MMCSD_CSD_NSAC(csd)); - fvdbg(" TRAN_SPEED:\n"); - fvdbg(" TIME_VALUE: 0x%02x\n", + finfo(" TRAN_SPEED:\n"); + finfo(" TIME_VALUE: 0x%02x\n", sd2 ? SD20_CSD_TRANSPEED_TIMEVALUE(csd) : MMCSD_CSD_TRANSPEED_TIMEVALUE(csd)); - fvdbg(" RATE_UNIT: 0x%02x\n", + finfo(" RATE_UNIT: 0x%02x\n", sd2 ? SD20_CSD_TRANSPEED_TRANSFERRATEUNIT(csd) : MMCSD_CSD_TRANSPEED_TRANSFERRATEUNIT(csd)); - fvdbg(" CCC: 0x%03x\n", + finfo(" CCC: 0x%03x\n", sd2 ? SD20_CSD_CCC(csd) : MMCSD_CSD_CCC(csd)); - fvdbg(" READ_BL_LEN: %d\n", + finfo(" READ_BL_LEN: %d\n", sd2 ? SD20_CSD_READBLLEN(csd) : MMCSD_CSD_READBLLEN(csd)); - fvdbg(" READ_BL_PARTIAL: %d\n", + finfo(" READ_BL_PARTIAL: %d\n", sd2 ? SD20_CSD_READBLPARTIAL(csd) : MMCSD_CSD_READBLPARTIAL(csd)); - fvdbg(" WRITE_BLK_MISALIGN: %d\n", + finfo(" WRITE_BLK_MISALIGN: %d\n", sd2 ? SD20_CSD_WRITEBLKMISALIGN(csd) : MMCSD_CSD_WRITEBLKMISALIGN(csd)); - fvdbg(" READ_BLK_MISALIGN: %d\n", + finfo(" READ_BLK_MISALIGN: %d\n", sd2 ? SD20_CSD_READBLKMISALIGN(csd) : MMCSD_CSD_READBLKMISALIGN(csd)); - fvdbg(" DSR_IMP: %d\n", + finfo(" DSR_IMP: %d\n", sd2 ? SD20_CSD_DSRIMP(csd) : MMCSD_CSD_DSRIMP(csd)); - fvdbg(" C_SIZE: %d\n", + finfo(" C_SIZE: %d\n", sd2 ? SD20_CSD_CSIZE(csd) : MMCSD_CSD_CSIZE(csd)); - fvdbg(" VDD_R_CURR_MIN: %d\n", + finfo(" VDD_R_CURR_MIN: %d\n", sd2 ? SD20_CSD_VDDRCURRMIN(csd) : MMCSD_CSD_VDDRCURRMIN(csd)); - fvdbg(" VDD_R_CURR_MAX: %d\n", + finfo(" VDD_R_CURR_MAX: %d\n", sd2 ? SD20_CSD_VDDRCURRMAX(csd) : MMCSD_CSD_VDDRCURRMAX(csd)); - fvdbg(" VDD_W_CURR_MIN: %d\n", + finfo(" VDD_W_CURR_MIN: %d\n", sd2 ? SD20_CSD_VDDWCURRMIN(csd) : MMCSD_CSD_VDDWCURRMIN(csd)); - fvdbg(" VDD_W_CURR_MAX: %d\n", + finfo(" VDD_W_CURR_MAX: %d\n", sd2 ? SD20_CSD_VDDWCURRMAX(csd) : MMCSD_CSD_VDDWCURRMAX(csd)); - fvdbg(" C_SIZE_MULT: %d\n", + finfo(" C_SIZE_MULT: %d\n", sd2 ? SD20_CSD_CSIZEMULT(csd) : MMCSD_CSD_CSIZEMULT(csd)); if (mmc) { - fvdbg(" MMC SECTOR_SIZE: %d\n", MMC_CSD_SECTORSIZE(csd)); - fvdbg(" MMC ER_GRP_SIZE: %d\n", MMC_CSD_ERGRPSIZE(csd)); - fvdbg(" MMC WP_GRP_SIZE: %d\n", MMC_CSD_WPGRPSIZE(csd)); - fvdbg(" MMC DFLT_ECC: %d\n", MMC_CSD_DFLTECC(csd)); + finfo(" MMC SECTOR_SIZE: %d\n", MMC_CSD_SECTORSIZE(csd)); + finfo(" MMC ER_GRP_SIZE: %d\n", MMC_CSD_ERGRPSIZE(csd)); + finfo(" MMC WP_GRP_SIZE: %d\n", MMC_CSD_WPGRPSIZE(csd)); + finfo(" MMC DFLT_ECC: %d\n", MMC_CSD_DFLTECC(csd)); } else { - fvdbg(" SD ER_BLK_EN: %d\n", + finfo(" SD ER_BLK_EN: %d\n", sd2 ? SD20_CSD_SDERBLKEN(csd) : SD_CSD_SDERBLKEN(csd)); - fvdbg(" SD SECTOR_SIZE: %d\n", + finfo(" SD SECTOR_SIZE: %d\n", sd2 ? SD20_CSD_SECTORSIZE(csd) : SD_CSD_SECTORSIZE(csd)); - fvdbg(" SD WP_GRP_SIZE: %d\n", + finfo(" SD WP_GRP_SIZE: %d\n", sd2 ? SD_CSD_WPGRPSIZE(csd) : SD_CSD_WPGRPSIZE(csd)); } - fvdbg(" WP_GRP_EN: %d\n", + finfo(" WP_GRP_EN: %d\n", sd2 ? SD20_WPGRPEN(csd) : MMCSD_WPGRPEN(csd)); - fvdbg(" R2W_FACTOR: %d\n", + finfo(" R2W_FACTOR: %d\n", sd2 ? SD20_CSD_R2WFACTOR(csd) : MMCSD_CSD_R2WFACTOR(csd)); - fvdbg(" WRITE_BL_LEN: %d\n", + finfo(" WRITE_BL_LEN: %d\n", sd2 ? SD20_CSD_WRITEBLLEN(csd) : MMCSD_CSD_WRITEBLLEN(csd)); - fvdbg(" WRITE_BL_PARTIAL: %d\n", + finfo(" WRITE_BL_PARTIAL: %d\n", sd2 ? SD20_CSD_WRITEBLPARTIAL(csd) : MMCSD_CSD_WRITEBLPARTIAL(csd)); - fvdbg(" FILE_FORMAT_GROUP: %d\n", + finfo(" FILE_FORMAT_GROUP: %d\n", sd2 ? SD20_CSD_FILEFORMATGRP(csd) : MMCSD_CSD_FILEFORMATGRP(csd)); - fvdbg(" COPY: %d\n", + finfo(" COPY: %d\n", sd2 ? SD20_CSD_COPY(csd) : MMCSD_CSD_COPY(csd)); - fvdbg(" PERM_WRITE_PROTECT: %d\n", + finfo(" PERM_WRITE_PROTECT: %d\n", sd2 ? SD20_CSD_PERMWRITEPROTECT(csd) : MMCSD_CSD_PERMWRITEPROTECT(csd)); - fvdbg(" TMP_WRITE_PROTECT: %d\n", + finfo(" TMP_WRITE_PROTECT: %d\n", sd2 ?SD20_CSD_TMPWRITEPROTECT(csd) : MMCSD_CSD_TMPWRITEPROTECT(csd)); - fvdbg(" FILE_FORMAT: %d\n", + finfo(" FILE_FORMAT: %d\n", sd2 ? SD20_CSD_FILEFORMAT(csd) : MMCSD_CSD_FILEFORMAT(csd)); if (mmc) { - fvdbg(" MMC ECC: %d\n", + finfo(" MMC ECC: %d\n", sd2 ? MMC_CSD_ECC(csd) : MMC_CSD_ECC(csd)); } - fvdbg(" CRC: %02x\n", + finfo(" CRC: %02x\n", sd2 ? SD20_CSD_CRC(csd) : MMCSD_CSD_CRC(csd)); } #endif diff --git a/drivers/mmcsd/mmcsd_sdio.c b/drivers/mmcsd/mmcsd_sdio.c index 53d59985df..1471208a59 100644 --- a/drivers/mmcsd/mmcsd_sdio.c +++ b/drivers/mmcsd/mmcsd_sdio.c @@ -413,7 +413,7 @@ static int mmcsd_recvR1(FAR struct mmcsd_state_s *priv, uint32_t cmd) * indication for later use. */ - fvdbg("ERROR: R1=%08x\n", r1); + finfo("ERROR: R1=%08x\n", r1); priv->locked = ((r1 & MMCSD_R1_CARDISLOCKED) != 0); ret = -EIO; } @@ -767,69 +767,69 @@ static void mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv, uint32_t csd[4]) decoded.mmcecc = (csd[3] >> 8) & 3; decoded.crc = (csd[3] >> 1) & 0x7f; - fvdbg("CSD:\n"); - fvdbg(" CSD_STRUCTURE: %d SPEC_VERS: %d (MMC)\n", + finfo("CSD:\n"); + finfo(" CSD_STRUCTURE: %d SPEC_VERS: %d (MMC)\n", decoded.csdstructure, decoded.mmcspecvers); - fvdbg(" TAAC {TIME_UNIT: %d TIME_VALUE: %d} NSAC: %d\n", + finfo(" TAAC {TIME_UNIT: %d TIME_VALUE: %d} NSAC: %d\n", decoded.taac.timeunit, decoded.taac.timevalue, decoded.nsac); - fvdbg(" TRAN_SPEED {TRANSFER_RATE_UNIT: %d TIME_VALUE: %d}\n", + finfo(" TRAN_SPEED {TRANSFER_RATE_UNIT: %d TIME_VALUE: %d}\n", decoded.transpeed.transferrateunit, decoded.transpeed.timevalue); - fvdbg(" CCC: %d\n", decoded.ccc); - fvdbg(" READ_BL_LEN: %d READ_BL_PARTIAL: %d\n", + finfo(" CCC: %d\n", decoded.ccc); + finfo(" READ_BL_LEN: %d READ_BL_PARTIAL: %d\n", decoded.readbllen, decoded.readblpartial); - fvdbg(" WRITE_BLK_MISALIGN: %d READ_BLK_MISALIGN: %d\n", + finfo(" WRITE_BLK_MISALIGN: %d READ_BLK_MISALIGN: %d\n", decoded.writeblkmisalign, decoded.readblkmisalign); - fvdbg(" DSR_IMP: %d\n", + finfo(" DSR_IMP: %d\n", decoded.dsrimp); if (IS_BLOCK(priv->type)) { - fvdbg(" SD Block Addressing:\n"); - fvdbg(" C_SIZE: %d SD_ER_BLK_EN: %d\n", + finfo(" SD Block Addressing:\n"); + finfo(" C_SIZE: %d SD_ER_BLK_EN: %d\n", decoded.u.sdblock.csize, decoded.u.sdblock.sderblen); - fvdbg(" SD_SECTOR_SIZE: %d SD_WP_GRP_SIZE: %d\n", + finfo(" SD_SECTOR_SIZE: %d SD_WP_GRP_SIZE: %d\n", decoded.u.sdblock.sdsectorsize, decoded.u.sdblock.sdwpgrpsize); } else if (IS_SD(priv->type)) { - fvdbg(" SD Byte Addressing:\n"); - fvdbg(" C_SIZE: %d C_SIZE_MULT: %d\n", + finfo(" SD Byte Addressing:\n"); + finfo(" C_SIZE: %d C_SIZE_MULT: %d\n", decoded.u.sdbyte.csize, decoded.u.sdbyte.csizemult); - fvdbg(" VDD_R_CURR_MIN: %d VDD_R_CURR_MAX: %d\n", + finfo(" VDD_R_CURR_MIN: %d VDD_R_CURR_MAX: %d\n", decoded.u.sdbyte.vddrcurrmin, decoded.u.sdbyte.vddrcurrmax); - fvdbg(" VDD_W_CURR_MIN: %d VDD_W_CURR_MAX: %d\n", + finfo(" VDD_W_CURR_MIN: %d VDD_W_CURR_MAX: %d\n", decoded.u.sdbyte.vddwcurrmin, decoded.u.sdbyte.vddwcurrmax); - fvdbg(" SD_ER_BLK_EN: %d SD_SECTOR_SIZE: %d (SD) SD_WP_GRP_SIZE: %d\n", + finfo(" SD_ER_BLK_EN: %d SD_SECTOR_SIZE: %d (SD) SD_WP_GRP_SIZE: %d\n", decoded.u.sdbyte.sderblen, decoded.u.sdbyte.sdsectorsize, decoded.u.sdbyte.sdwpgrpsize); } #ifdef CONFIG_MMCSD_MMCSUPPORT else if (IS_MMC(priv->type)) { - fvdbg(" MMC:\n"); - fvdbg(" C_SIZE: %d C_SIZE_MULT: %d\n", + finfo(" MMC:\n"); + finfo(" C_SIZE: %d C_SIZE_MULT: %d\n", decoded.u.mmc.csize, decoded.u.mmc.csizemult); - fvdbg(" VDD_R_CURR_MIN: %d VDD_R_CURR_MAX: %d\n", + finfo(" VDD_R_CURR_MIN: %d VDD_R_CURR_MAX: %d\n", decoded.u.mmc.vddrcurrmin, decoded.u.mmc.vddrcurrmax); - fvdbg(" VDD_W_CURR_MIN: %d VDD_W_CURR_MAX: %d\n", + finfo(" VDD_W_CURR_MIN: %d VDD_W_CURR_MAX: %d\n", decoded.u.mmc.vddwcurrmin, decoded.u.mmc.vddwcurrmax); - fvdbg(" MMC_SECTOR_SIZE: %d MMC_ER_GRP_SIZE: %d MMC_WP_GRP_SIZE: %d\n", + finfo(" MMC_SECTOR_SIZE: %d MMC_ER_GRP_SIZE: %d MMC_WP_GRP_SIZE: %d\n", decoded.u.mmc.er.mmc22.sectorsize, decoded.u.mmc.er.mmc22.ergrpsize, decoded.u.mmc.mmcwpgrpsize); } #endif - fvdbg(" WP_GRP_EN: %d MMC DFLT_ECC: %d (MMC) R2W_FACTOR: %d\n", + finfo(" WP_GRP_EN: %d MMC DFLT_ECC: %d (MMC) R2W_FACTOR: %d\n", decoded.wpgrpen, decoded.mmcdfltecc, decoded.r2wfactor); - fvdbg(" WRITE_BL_LEN: %d WRITE_BL_PARTIAL: %d\n", + finfo(" WRITE_BL_LEN: %d WRITE_BL_PARTIAL: %d\n", decoded.writebllen, decoded.writeblpartial); - fvdbg(" FILE_FORMAT_GROUP: %d COPY: %d\n", + finfo(" FILE_FORMAT_GROUP: %d COPY: %d\n", decoded.fileformatgrp, decoded.copy); - fvdbg(" PERM_WRITE_PROTECT: %d TMP_WRITE_PROTECT: %d\n", + finfo(" PERM_WRITE_PROTECT: %d TMP_WRITE_PROTECT: %d\n", decoded.permwriteprotect, decoded.tmpwriteprotect); - fvdbg(" FILE_FORMAT: %d ECC: %d (MMC) CRC: %d\n", + finfo(" FILE_FORMAT: %d ECC: %d (MMC) CRC: %d\n", decoded.fileformat, decoded.mmcecc, decoded.crc); - fvdbg("Capacity: %luKb, Block size: %db, nblocks: %d wrprotect: %d\n", + finfo("Capacity: %luKb, Block size: %db, nblocks: %d wrprotect: %d\n", (unsigned long)(priv->capacity / 1024), priv->blocksize, priv->nblocks, priv->wrprotect); #endif @@ -893,7 +893,7 @@ static void mmcsd_decodeCID(FAR struct mmcsd_state_s *priv, uint32_t cid[4]) decoded.mdt = (cid[3] >> 8) & 0x0fff; decoded.crc = (cid[3] >> 1) & 0x7f; - fvdbg("mid: %02x oid: %04x pnm: %s prv: %d psn: %d mdt: %02x crc: %02x\n", + finfo("mid: %02x oid: %04x pnm: %s prv: %d psn: %d mdt: %02x crc: %02x\n", decoded.mid, decoded.oid, decoded.pnm, decoded.prv, decoded.psn, decoded.mdt, decoded.crc); } @@ -955,12 +955,12 @@ struct mmcsd_scr_s decoded; #if defined(CONFIG_DEBUG) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS) decoded.mfgdata = scr[1]; /* Might be byte reversed! */ - fvdbg("SCR:\n"); - fvdbg(" SCR_STRUCTURE: %d SD_VERSION: %d\n", + finfo("SCR:\n"); + finfo(" SCR_STRUCTURE: %d SD_VERSION: %d\n", decoded.scrversion, decoded.sdversion); - fvdbg(" DATA_STATE_AFTER_ERASE: %d SD_SECURITY: %d SD_BUS_WIDTHS: %x\n", + finfo(" DATA_STATE_AFTER_ERASE: %d SD_SECURITY: %d SD_BUS_WIDTHS: %x\n", decoded.erasestate, decoded.security, decoded.buswidth); - fvdbg(" Manufacturing data: %08x\n", + finfo(" Manufacturing data: %08x\n", decoded.mfgdata); #endif } @@ -1288,7 +1288,7 @@ static ssize_t mmcsd_readsingle(FAR struct mmcsd_state_s *priv, off_t offset; int ret; - fvdbg("startblock=%d\n", startblock); + finfo("startblock=%d\n", startblock); DEBUGASSERT(priv != NULL && buffer != NULL); /* Check if the card is locked */ @@ -1342,7 +1342,7 @@ static ssize_t mmcsd_readsingle(FAR struct mmcsd_state_s *priv, offset = startblock << priv->blockshift; } - fvdbg("offset=%d\n", offset); + finfo("offset=%d\n", offset); /* Select the block size for the card */ @@ -1365,7 +1365,7 @@ static ssize_t mmcsd_readsingle(FAR struct mmcsd_state_s *priv, ret = SDIO_DMARECVSETUP(priv->dev, buffer, priv->blocksize); if (ret != OK) { - fvdbg("SDIO_DMARECVSETUP: error %d\n", ret); + finfo("SDIO_DMARECVSETUP: error %d\n", ret); return ret; } } @@ -1422,7 +1422,7 @@ static ssize_t mmcsd_readmultiple(FAR struct mmcsd_state_s *priv, off_t offset; int ret; - fvdbg("startblock=%d nblocks=%d\n", startblock, nblocks); + finfo("startblock=%d nblocks=%d\n", startblock, nblocks); DEBUGASSERT(priv != NULL && buffer != NULL && nblocks > 1); /* Check if the card is locked */ @@ -1476,7 +1476,7 @@ static ssize_t mmcsd_readmultiple(FAR struct mmcsd_state_s *priv, { offset = startblock << priv->blockshift; } - fvdbg("nbytes=%d byte offset=%d\n", nbytes, offset); + finfo("nbytes=%d byte offset=%d\n", nbytes, offset); /* Select the block size for the card */ @@ -1499,7 +1499,7 @@ static ssize_t mmcsd_readmultiple(FAR struct mmcsd_state_s *priv, ret = SDIO_DMARECVSETUP(priv->dev, buffer, nbytes); if (ret != OK) { - fvdbg("SDIO_DMARECVSETUP: error %d\n", ret); + finfo("SDIO_DMARECVSETUP: error %d\n", ret); return ret; } } @@ -1625,7 +1625,7 @@ static ssize_t mmcsd_writesingle(FAR struct mmcsd_state_s *priv, off_t offset; int ret; - fvdbg("startblock=%d\n", startblock); + finfo("startblock=%d\n", startblock); DEBUGASSERT(priv != NULL && buffer != NULL); /* Check if the card is locked or write protected (either via software or @@ -1681,7 +1681,7 @@ static ssize_t mmcsd_writesingle(FAR struct mmcsd_state_s *priv, offset = startblock << priv->blockshift; } - fvdbg("offset=%d\n", offset); + finfo("offset=%d\n", offset); /* Select the block size for the card */ @@ -1713,7 +1713,7 @@ static ssize_t mmcsd_writesingle(FAR struct mmcsd_state_s *priv, ret = SDIO_DMASENDSETUP(priv->dev, buffer, priv->blocksize); if (ret != OK) { - fvdbg("SDIO_DMASENDSETUP: error %d\n", ret); + finfo("SDIO_DMASENDSETUP: error %d\n", ret); return ret; } } @@ -1768,7 +1768,7 @@ static ssize_t mmcsd_writemultiple(FAR struct mmcsd_state_s *priv, size_t nbytes; int ret; - fvdbg("startblock=%d nblocks=%d\n", startblock, nblocks); + finfo("startblock=%d nblocks=%d\n", startblock, nblocks); DEBUGASSERT(priv != NULL && buffer != NULL && nblocks > 1); /* Check if the card is locked or write protected (either via software or @@ -1825,7 +1825,7 @@ static ssize_t mmcsd_writemultiple(FAR struct mmcsd_state_s *priv, offset = startblock << priv->blockshift; } - fvdbg("nbytes=%d byte offset=%d\n", nbytes, offset); + finfo("nbytes=%d byte offset=%d\n", nbytes, offset); /* Select the block size for the card */ @@ -1876,7 +1876,7 @@ static ssize_t mmcsd_writemultiple(FAR struct mmcsd_state_s *priv, ret = SDIO_DMASENDSETUP(priv->dev, buffer, nbytes); if (ret != OK) { - fvdbg("SDIO_DMASENDSETUP: error %d\n", ret); + finfo("SDIO_DMASENDSETUP: error %d\n", ret); return ret; } } @@ -2003,7 +2003,7 @@ static int mmcsd_open(FAR struct inode *inode) { FAR struct mmcsd_state_s *priv; - fvdbg("Entry\n"); + finfo("Entry\n"); DEBUGASSERT(inode && inode->i_private); priv = (FAR struct mmcsd_state_s *)inode->i_private; @@ -2027,7 +2027,7 @@ static int mmcsd_close(FAR struct inode *inode) { FAR struct mmcsd_state_s *priv; - fvdbg("Entry\n"); + finfo("Entry\n"); DEBUGASSERT(inode && inode->i_private); priv = (FAR struct mmcsd_state_s *)inode->i_private; @@ -2061,7 +2061,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer, DEBUGASSERT(inode && inode->i_private); priv = (FAR struct mmcsd_state_s *)inode->i_private; - fvdbg("startsector: %d nsectors: %d sectorsize: %d\n", + finfo("startsector: %d nsectors: %d sectorsize: %d\n", startsector, nsectors, priv->blocksize); if (nsectors > 0) @@ -2137,7 +2137,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode, FAR const unsigned char *buf DEBUGASSERT(inode && inode->i_private); priv = (FAR struct mmcsd_state_s *)inode->i_private; - fvdbg("sector: %lu nsectors: %u sectorsize: %u\n", + finfo("sector: %lu nsectors: %u sectorsize: %u\n", (unsigned long)startsector, nsectors, priv->blocksize); mmcsd_takesem(priv); @@ -2200,7 +2200,7 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry) FAR struct mmcsd_state_s *priv; int ret = -EINVAL; - fvdbg("Entry\n"); + finfo("Entry\n"); DEBUGASSERT(inode && inode->i_private); if (geometry) @@ -2213,7 +2213,7 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry) { /* No.. return ENODEV */ - fvdbg("IS_EMPTY\n"); + finfo("IS_EMPTY\n"); ret = -ENODEV; } else @@ -2230,10 +2230,10 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry) geometry->geo_nsectors = priv->nblocks; geometry->geo_sectorsize = priv->blocksize; - fvdbg("available: true mediachanged: %s writeenabled: %s\n", + finfo("available: true mediachanged: %s writeenabled: %s\n", geometry->geo_mediachanged ? "true" : "false", geometry->geo_writeenabled ? "true" : "false"); - fvdbg("nsectors: %lu sectorsize: %d\n", + finfo("nsectors: %lu sectorsize: %d\n", (long)geometry->geo_nsectors, geometry->geo_sectorsize); priv->mediachanged = false; @@ -2258,7 +2258,7 @@ static int mmcsd_ioctl(FAR struct inode *inode, int cmd, unsigned long arg) FAR struct mmcsd_state_s *priv; int ret; - fvdbg("Entry\n"); + finfo("Entry\n"); DEBUGASSERT(inode && inode->i_private); priv = (FAR struct mmcsd_state_s *)inode->i_private; @@ -2269,7 +2269,7 @@ static int mmcsd_ioctl(FAR struct inode *inode, int cmd, unsigned long arg) { case BIOC_PROBE: /* Check for media in the slot */ { - fvdbg("BIOC_PROBE\n"); + finfo("BIOC_PROBE\n"); /* Probe the MMC/SD slot for media */ @@ -2283,7 +2283,7 @@ static int mmcsd_ioctl(FAR struct inode *inode, int cmd, unsigned long arg) case BIOC_EJECT: /* Media has been removed from the slot */ { - fvdbg("BIOC_EJECT\n"); + finfo("BIOC_EJECT\n"); /* Process the removal of the card */ @@ -2330,7 +2330,7 @@ static void mmcsd_mediachange(FAR void *arg) { FAR struct mmcsd_state_s *priv = (FAR struct mmcsd_state_s *)arg; - fvdbg("arg: %p\n", arg); + finfo("arg: %p\n", arg); DEBUGASSERT(priv); /* Is there a card present in the slot? */ @@ -2411,7 +2411,7 @@ static int mmcsd_widebus(FAR struct mmcsd_state_s *priv) ret = mmcsd_recvR1(priv, SD_ACMD42); if (ret != OK) { - fvdbg("WARNING: SD card does not support ACMD42: %d\n", ret); + finfo("WARNING: SD card does not support ACMD42: %d\n", ret); return ret; } @@ -2438,7 +2438,7 @@ static int mmcsd_widebus(FAR struct mmcsd_state_s *priv) /* Configure the SDIO peripheral */ - fvdbg("Wide bus operation selected\n"); + finfo("Wide bus operation selected\n"); SDIO_WIDEBUS(priv->dev, true); priv->widebus = true; @@ -2454,7 +2454,7 @@ static int mmcsd_widebus(FAR struct mmcsd_state_s *priv) #else /* CONFIG_SDIO_WIDTH_D1_ONLY */ - fvdbg("Wide-bus operation is disabled\n"); + finfo("Wide-bus operation is disabled\n"); return -ENOSYS; #endif /* CONFIG_SDIO_WIDTH_D1_ONLY */ @@ -2615,7 +2615,7 @@ static int mmcsd_sdinitialize(FAR struct mmcsd_state_s *priv) return ret; } - fvdbg("RCA: %04x\n", priv->rca); + finfo("RCA: %04x\n", priv->rca); /* This should have caused a transition to standby state. However, this will * not be reflected in the present R1 status. R1/6 contains the state of @@ -2729,7 +2729,7 @@ static int mmcsd_cardidentify(FAR struct mmcsd_state_s *priv) if (!SDIO_PRESENT(priv->dev)) { - fvdbg("No card present\n"); + finfo("No card present\n"); return -ENODEV; } @@ -2779,7 +2779,7 @@ static int mmcsd_cardidentify(FAR struct mmcsd_state_s *priv) if (((response & MMCSD_R7VOLTAGE_MASK) == MMCSD_R7VOLTAGE_27) && ((response & MMCSD_R7ECHO_MASK) == MMCSD_R7CHECKPATTERN)) { - fvdbg("SD V2.x card\n"); + finfo("SD V2.x card\n"); priv->type = MMCSD_CARDTYPE_SDV2; sdcapacity = MMCSD_ACMD41_HIGHCAPACITY; } @@ -2844,10 +2844,10 @@ static int mmcsd_cardidentify(FAR struct mmcsd_state_s *priv) * an SD V2.x (via CMD8), then this must be SD V1.x */ - fvdbg("R3: %08x\n", response); + finfo("R3: %08x\n", response); if (priv->type == MMCSD_CARDTYPE_UNKNOWN) { - fvdbg("SD V1.x card\n"); + finfo("SD V1.x card\n"); priv->type = MMCSD_CARDTYPE_SDV1; } @@ -2869,7 +2869,7 @@ static int mmcsd_cardidentify(FAR struct mmcsd_state_s *priv) if ((response & MMCSD_R3_HIGHCAPACITY) != 0) { - fvdbg("SD V2.x card with block addressing\n"); + finfo("SD V2.x card with block addressing\n"); DEBUGASSERT(priv->type == MMCSD_CARDTYPE_SDV2); priv->type |= MMCSD_CARDTYPE_BLOCK; } @@ -2977,7 +2977,7 @@ static int mmcsd_probe(FAR struct mmcsd_state_s *priv) { int ret; - fvdbg("type: %d probed: %d\n", priv->type, priv->probed); + finfo("type: %d probed: %d\n", priv->type, priv->probed); /* If we have reliable card detection events and if we have * already probed the card, then we don't need to do anything @@ -3045,7 +3045,7 @@ static int mmcsd_probe(FAR struct mmcsd_state_s *priv) { /* Yes... */ - fvdbg("Capacity: %lu Kbytes\n", (unsigned long)(priv->capacity / 1024)); + finfo("Capacity: %lu Kbytes\n", (unsigned long)(priv->capacity / 1024)); priv->mediachanged = true; /* Set up to receive asynchronous, media removal events */ @@ -3066,7 +3066,7 @@ static int mmcsd_probe(FAR struct mmcsd_state_s *priv) { /* There is no card in the slot */ - fvdbg("No card\n"); + finfo("No card\n"); #ifdef CONFIG_MMCSD_HAVECARDDETECT SDIO_CALLBACKENABLE(priv->dev, SDIOMEDIA_INSERTED); #endif @@ -3088,7 +3088,7 @@ static int mmcsd_probe(FAR struct mmcsd_state_s *priv) static int mmcsd_removed(FAR struct mmcsd_state_s *priv) { - fvdbg("type: %d present: %d\n", priv->type, SDIO_PRESENT(priv->dev)); + finfo("type: %d present: %d\n", priv->type, SDIO_PRESENT(priv->dev)); /* Forget the card geometry, pretend the slot is empty (it might not * be), and that the card has never been initialized. @@ -3131,7 +3131,7 @@ static int mmcsd_hwinitialize(FAR struct mmcsd_state_s *priv) /* Does this architecture support DMA with the MMC/SD device? */ priv->dma = SDIO_DMASUPPORTED(priv->dev); - fvdbg("DMA supported: %d\n", priv->dma); + finfo("DMA supported: %d\n", priv->dma); #endif /* Attach and prepare MMC/SD interrupts */ @@ -3143,7 +3143,7 @@ static int mmcsd_hwinitialize(FAR struct mmcsd_state_s *priv) return -EBUSY; } - fvdbg("Attached MMC/SD interrupts\n"); + finfo("Attached MMC/SD interrupts\n"); /* Register a callback so that we get informed if media is inserted or * removed from the slot (Initially all callbacks are disabled). @@ -3174,7 +3174,7 @@ static int mmcsd_hwinitialize(FAR struct mmcsd_state_s *priv) ret = mmcsd_probe(priv); if (ret != OK) { - fvdbg("Slot not empty, but initialization failed: %d\n", ret); + finfo("Slot not empty, but initialization failed: %d\n", ret); /* NOTE: The failure to initialize a card does not mean that * initialization has failed! A card could be installed in the slot @@ -3247,7 +3247,7 @@ int mmcsd_slotinitialize(int minor, FAR struct sdio_dev_s *dev) char devname[16]; int ret = -ENOMEM; - fvdbg("minor: %d\n", minor); + finfo("minor: %d\n", minor); /* Sanity check */ @@ -3293,7 +3293,7 @@ int mmcsd_slotinitialize(int minor, FAR struct sdio_dev_s *dev) SDIO_CALLBACKENABLE(priv->dev, SDIOMEDIA_INSERTED); - fvdbg("MMC/SD slot is empty\n"); + finfo("MMC/SD slot is empty\n"); } else { diff --git a/drivers/mmcsd/mmcsd_spi.c b/drivers/mmcsd/mmcsd_spi.c index 9a44011f42..bcd67e555b 100644 --- a/drivers/mmcsd/mmcsd_spi.c +++ b/drivers/mmcsd/mmcsd_spi.c @@ -535,7 +535,7 @@ static uint32_t mmcsd_sendcmd(FAR struct mmcsd_slot_s *slot, return (uint32_t)-1; } - fvdbg("CMD%d[%08x] R1B=%02x\n", + finfo("CMD%d[%08x] R1B=%02x\n", cmd->cmd & 0x3f, arg, response); } break; @@ -544,7 +544,7 @@ static uint32_t mmcsd_sendcmd(FAR struct mmcsd_slot_s *slot, case MMCSD_CMDRESP_R1: { - fvdbg("CMD%d[%08x] R1=%02x\n", + finfo("CMD%d[%08x] R1=%02x\n", cmd->cmd & 0x3f, arg, response); } break; @@ -556,7 +556,7 @@ static uint32_t mmcsd_sendcmd(FAR struct mmcsd_slot_s *slot, result = ((uint32_t)(response & 0xff) << 8); result |= SPI_SEND(spi, 0xff) & 0xff; - fvdbg("CMD%d[%08x] R2=%04x\n", + finfo("CMD%d[%08x] R2=%04x\n", cmd->cmd & 0x3f, arg, result); } break; @@ -570,7 +570,7 @@ static uint32_t mmcsd_sendcmd(FAR struct mmcsd_slot_s *slot, slot->ocr |= ((uint32_t)(SPI_SEND(spi, 0xff) & 0xff) << 8); slot->ocr |= SPI_SEND(spi, 0xff) & 0xff; - fvdbg("CMD%d[%08x] R1=%02x OCR=%08x\n", + finfo("CMD%d[%08x] R1=%02x OCR=%08x\n", cmd->cmd & 0x3f, arg, response, slot->ocr); } break; @@ -585,7 +585,7 @@ static uint32_t mmcsd_sendcmd(FAR struct mmcsd_slot_s *slot, slot->r7 |= ((uint32_t)(SPI_SEND(spi, 0xff) & 0xff) << 8); slot->r7 |= SPI_SEND(spi, 0xff) & 0xff; - fvdbg("CMD%d[%08x] R1=%02x R7=%08x\n", + finfo("CMD%d[%08x] R1=%02x R7=%08x\n", cmd->cmd & 0x3f, arg, response, slot->r7); } break; @@ -609,7 +609,7 @@ static void mmcsd_setblklen(FAR struct mmcsd_slot_s *slot, uint32_t length) { uint32_t response; - fvdbg("Set block length to %d\n", length); + finfo("Set block length to %d\n", length); response = mmcsd_sendcmd(slot, &g_cmd16, length); if (response != MMCSD_SPIR1_OK) { @@ -750,11 +750,11 @@ static void mmcsd_decodecsd(FAR struct mmcsd_slot_s *slot, uint8_t *csd) slot->twrite = SD_WRITEACCESS; } - fvdbg("SPI Frequency\n"); - fvdbg(" Maximum: %d Hz\n", maxfrequency); - fvdbg(" Actual: %d Hz\n", frequency); - fvdbg("Read access time: %d ticks\n", slot->taccess); - fvdbg("Write access time: %d ticks\n", slot->twrite); + finfo("SPI Frequency\n"); + finfo(" Maximum: %d Hz\n", maxfrequency); + finfo(" Actual: %d Hz\n", frequency); + finfo("Read access time: %d ticks\n", slot->taccess); + finfo("Write access time: %d ticks\n", slot->twrite); /* Get the physical geometry of the card: sector size and number of * sectors. The card's total capacity is computed from @@ -822,8 +822,8 @@ static void mmcsd_decodecsd(FAR struct mmcsd_slot_s *slot, uint8_t *csd) slot->sectorsize = 1 << readbllen; #endif slot->nsectors = csize << csizemult; - fvdbg("Sector size: %d\n", SECTORSIZE(slot)); - fvdbg("Number of sectors: %d\n", slot->nsectors); + finfo("Sector size: %d\n", SECTORSIZE(slot)); + finfo("Number of sectors: %d\n", slot->nsectors); } /**************************************************************************** @@ -889,7 +889,7 @@ static int mmcsd_getcardinfo(FAR struct mmcsd_slot_s *slot, uint8_t *buffer, for (i = 0; i < 8; i++) { response = SPI_SEND(spi, 0xff); - fvdbg("%d. SPI send returned %02x\n", i, response); + finfo("%d. SPI send returned %02x\n", i, response); /* If a read operation fails and the card cannot provide the requested * data, it will send a data error token instead. The 4 least @@ -1029,7 +1029,7 @@ static int mmcsd_open(FAR struct inode *inode) FAR struct spi_dev_s *spi; int ret; - fvdbg("Entry\n"); + finfo("Entry\n"); #ifdef CONFIG_DEBUG if (!inode || !inode->i_private) @@ -1067,7 +1067,7 @@ static int mmcsd_open(FAR struct inode *inode) ret = mmcsd_mediainitialize(slot); if (ret < 0) { - fvdbg("Failed to initialize card\n"); + finfo("Failed to initialize card\n"); goto errout_with_sem; } } @@ -1093,7 +1093,7 @@ errout_with_sem: static int mmcsd_close(FAR struct inode *inode) { - fvdbg("Entry\n"); + finfo("Entry\n"); return OK; } @@ -1114,7 +1114,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer, uint8_t response; int i; - fvdbg("start_sector=%d nsectors=%d\n", start_sector, nsectors); + finfo("start_sector=%d nsectors=%d\n", start_sector, nsectors); #ifdef CONFIG_DEBUG if (!buffer) @@ -1166,12 +1166,12 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer, if (IS_BLOCK(slot->type)) { offset = start_sector; - fvdbg("nbytes=%d sector offset=%d\n", nbytes, offset); + finfo("nbytes=%d sector offset=%d\n", nbytes, offset); } else { offset = start_sector * SECTORSIZE(slot); - fvdbg("nbytes=%d byte offset=%d\n", nbytes, offset); + finfo("nbytes=%d byte offset=%d\n", nbytes, offset); } /* Select the slave */ @@ -1239,7 +1239,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer, SPI_SEND(spi, 0xff); mmcsd_semgive(slot); - fvdbg("Read %d bytes:\n", nbytes); + finfo("Read %d bytes:\n", nbytes); mmcsd_dumpbuffer("Read buffer", buffer, nbytes); return nsectors; @@ -1268,7 +1268,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer, uint8_t response; int i; - fvdbg("start_sector=%d nsectors=%d\n", start_sector, nsectors); + finfo("start_sector=%d nsectors=%d\n", start_sector, nsectors); #ifdef CONFIG_DEBUG if (!buffer) @@ -1328,12 +1328,12 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer, if (IS_BLOCK(slot->type)) { offset = start_sector; - fvdbg("nbytes=%d sector offset=%d\n", nbytes, offset); + finfo("nbytes=%d sector offset=%d\n", nbytes, offset); } else { offset = start_sector * SECTORSIZE(slot); - fvdbg("nbytes=%d byte offset=%d\n", nbytes, offset); + finfo("nbytes=%d byte offset=%d\n", nbytes, offset); } mmcsd_dumpbuffer("Write buffer", buffer, nbytes); @@ -1519,11 +1519,11 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry) slot->state &= ~MMCSD_SLOTSTATUS_MEDIACHGD; mmcsd_semgive(slot); - fvdbg("geo_available: %d\n", geometry->geo_available); - fvdbg("geo_mediachanged: %d\n", geometry->geo_mediachanged); - fvdbg("geo_writeenabled: %d\n", geometry->geo_writeenabled); - fvdbg("geo_nsectors: %d\n", geometry->geo_nsectors); - fvdbg("geo_sectorsize: %d\n", geometry->geo_sectorsize); + finfo("geo_available: %d\n", geometry->geo_available); + finfo("geo_mediachanged: %d\n", geometry->geo_mediachanged); + finfo("geo_writeenabled: %d\n", geometry->geo_writeenabled); + finfo("geo_nsectors: %d\n", geometry->geo_nsectors); + finfo("geo_sectorsize: %d\n", geometry->geo_sectorsize); return OK; } @@ -1601,14 +1601,14 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot) * show IDLE STATE */ - fvdbg("Send CMD0\n"); + finfo("Send CMD0\n"); SPI_SELECT(spi, SPIDEV_MMCSD, true); result = mmcsd_sendcmd(slot, &g_cmd0, 0); if (result == MMCSD_SPIR1_IDLESTATE) { /* Break out of the loop with card selected */ - fvdbg("Card is in IDLE state\n"); + finfo("Card is in IDLE state\n"); break; } @@ -1633,7 +1633,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot) * MMC. */ - fvdbg("Send CMD8\n"); + finfo("Send CMD8\n"); result = mmcsd_sendcmd(slot, &g_cmd8, 0x1aa); if (result == MMCSD_SPIR1_IDLESTATE) { @@ -1650,7 +1650,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot) elapsed = 0; do { - fvdbg("%d. Send CMD55/ACMD41\n", elapsed); + finfo("%d. Send CMD55/ACMD41\n", elapsed); result = mmcsd_sendcmd(slot, &g_cmd55, 0); if (result == MMCSD_SPIR1_IDLESTATE || result == MMCSD_SPIR1_OK) { @@ -1669,13 +1669,13 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot) if (elapsed < MMCSD_DELAY_1SEC) { - fvdbg("Send CMD58\n"); + finfo("Send CMD58\n"); SPI_SEND(spi, 0xff); result = mmcsd_sendcmd(slot, &g_cmd58, 0); if (result == MMCSD_SPIR1_OK) { - fvdbg("OCR: %08x\n", slot->ocr); + finfo("OCR: %08x\n", slot->ocr); if ((slot->ocr & MMCSD_OCR_CCS) != 0) { fdbg("Identified SD ver2 card/with block access\n"); @@ -1697,7 +1697,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot) { /* Both the MMC card and the SD card support CMD55 */ - fvdbg("Send CMD55/ACMD41\n"); + finfo("Send CMD55/ACMD41\n"); result = mmcsd_sendcmd(slot, &g_cmd55, 0); if (result == MMCSD_SPIR1_IDLESTATE || result == MMCSD_SPIR1_OK) { @@ -1719,7 +1719,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot) { if (IS_SD(slot->type)) { - fvdbg("%d. Send CMD55/ACMD41\n", elapsed); + finfo("%d. Send CMD55/ACMD41\n", elapsed); result = mmcsd_sendcmd(slot, &g_cmd55, 0); if (result == MMCSD_SPIR1_IDLESTATE || result == MMCSD_SPIR1_OK) { @@ -1732,7 +1732,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot) } else { - fvdbg("%d. Send CMD1\n", i); + finfo("%d. Send CMD1\n", i); result = mmcsd_sendcmd(slot, &g_cmd1, 0); if (result == MMCSD_SPIR1_OK) { @@ -1765,7 +1765,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot) /* Read CSD. CSD must always be valid */ - fvdbg("Get CSD\n"); + finfo("Get CSD\n"); result = mmcsd_getcsd(slot, csd); if (result != OK) { @@ -1879,7 +1879,7 @@ static void mmcsd_mediachanged(void *arg) ret = mmcsd_mediainitialize(slot); if (ret == 0) { - fvdbg("mmcsd_mediainitialize returned OK\n"); + finfo("mmcsd_mediainitialize returned OK\n"); slot->state |= MMCSD_SLOTSTATUS_MEDIACHGD; } } @@ -1954,7 +1954,7 @@ int mmcsd_spislotinitialize(int minor, int slotno, FAR struct spi_dev_s *spi) mmcsd_semgive(slot); if (ret == 0) { - fvdbg("mmcsd_mediainitialize returned OK\n"); + finfo("mmcsd_mediainitialize returned OK\n"); slot->state |= MMCSD_SLOTSTATUS_MEDIACHGD; } diff --git a/drivers/modem/u-blox.c b/drivers/modem/u-blox.c index 05e4453ba9..6fedc5645a 100644 --- a/drivers/modem/u-blox.c +++ b/drivers/modem/u-blox.c @@ -59,14 +59,14 @@ #ifdef CONFIG_MODEM_U_BLOX_DEBUG # define m_dbg dbg -# define m_vdbg vdbg +# define m_info info # define m_vlldbg lldbg -# define m_vllvdbg llvdbg +# define m_vllinfo llinfo #else # define m_dbg(x...) -# define m_vdbg(x...) +# define m_info(x...) # define m_lldbg(x...) -# define m_llvdbg(x...) +# define m_llinfo(x...) #endif /**************************************************************************** @@ -149,7 +149,7 @@ static int ubxmdm_ioctl(FAR struct file* filep, int ret; FAR struct ubxmdm_status* status; - m_vdbg("cmd: %d arg: %ld\n", cmd, arg); + m_info("cmd: %d arg: %ld\n", cmd, arg); DEBUGASSERT(upper && lower); switch (cmd) @@ -235,7 +235,7 @@ static int ubxmdm_ioctl(FAR struct file* filep, */ default: - m_vdbg("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg); + m_info("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg); if (lower->ops->ioctl) { @@ -326,7 +326,7 @@ void ubxmdm_unregister(FAR void *handle) lower = upper->lower; DEBUGASSERT(upper && lower); - m_vdbg("Unregistering: %s\n", upper->path); + m_info("Unregistering: %s\n", upper->path); DEBUGASSERT(lower->ops->poweroff); (void) lower->ops->poweroff(lower); diff --git a/drivers/mtd/at24xx.c b/drivers/mtd/at24xx.c index 76d2cf2659..a7b38883e5 100644 --- a/drivers/mtd/at24xx.c +++ b/drivers/mtd/at24xx.c @@ -302,7 +302,7 @@ static ssize_t at24c_read_internal(FAR struct at24c_dev_s *priv, off_t offset, uint8_t buf[AT24XX_ADDRSIZE]; uint16_t at24addr; - fvdbg("offset: %lu nbytes: %lu address: %02x\n", + finfo("offset: %lu nbytes: %lu address: %02x\n", (unsigned long)offset, (unsigned long)nbytes, address); /* "Random Read: A Random Read requires a dummy byte write sequence to load in the @@ -329,7 +329,7 @@ static ssize_t at24c_read_internal(FAR struct at24c_dev_s *priv, off_t offset, while (at24c_i2c_write(priv, at24addr, buf, AT24XX_ADDRSIZE) < 0) { - fvdbg("wait\n"); + finfo("wait\n"); usleep(1000); } @@ -356,7 +356,7 @@ static ssize_t at24c_bread(FAR struct mtd_dev_s *dev, off_t startblock, nblocks *= (CONFIG_AT24XX_MTD_BLOCKSIZE / AT24XX_PAGESIZE); #endif - fvdbg("startblock: %08lx nblocks: %lu\n", + finfo("startblock: %08lx nblocks: %lu\n", (unsigned long)startblock, (unsigned long)nblocks); if (startblock >= priv->npages) @@ -427,7 +427,7 @@ static ssize_t at24c_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblocks = priv->npages - startblock; } - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); while (blocksleft-- > 0) { @@ -445,7 +445,7 @@ static ssize_t at24c_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_t while (at24c_i2c_write(priv, at24addr, buf, AT24XX_ADDRSIZE) < 0) { - fvdbg("wait\n"); + finfo("wait\n"); usleep(1000); } @@ -474,7 +474,7 @@ static ssize_t at24c_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes size_t memsize; uint8_t addr; - fvdbg("offset: %lu nbytes: %lu\n", (unsigned long)offset, (unsigned long)nbytes); + finfo("offset: %lu nbytes: %lu\n", (unsigned long)offset, (unsigned long)nbytes); /* Don't permit reads beyond the end of the memory region */ @@ -520,7 +520,7 @@ static int at24c_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) FAR struct at24c_dev_s *priv = (FAR struct at24c_dev_s *)dev; int ret = -EINVAL; /* Assume good command with bad parameters */ - fvdbg("cmd: %d \n", cmd); + finfo("cmd: %d \n", cmd); switch (cmd) { @@ -561,7 +561,7 @@ static int at24c_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) #endif ret = OK; - fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n", + finfo("blocksize: %d erasesize: %d neraseblocks: %d\n", geo->blocksize, geo->erasesize, geo->neraseblocks); } } @@ -610,7 +610,7 @@ FAR struct mtd_dev_s *at24c_initialize(FAR struct i2c_master_s *dev) FAR struct at24c_dev_s *priv; #ifdef CONFIG_AT24XX_MULTI - fvdbg("dev: %p address: %02x\n", dev, address); + finfo("dev: %p address: %02x\n", dev, address); /* Allocate a state structure (we allocate the structure instead of using * a fixed, static allocation so that we can handle multiple FLASH devices. @@ -627,7 +627,7 @@ FAR struct mtd_dev_s *at24c_initialize(FAR struct i2c_master_s *dev) } #else - fvdbg("dev: %p\n", dev); + finfo("dev: %p\n", dev); /* If only a signal AT24 part is supported then a statically allocated state * structure is used. @@ -669,7 +669,7 @@ FAR struct mtd_dev_s *at24c_initialize(FAR struct i2c_master_s *dev) /* Return the implementation-specific state structure as the MTD device */ - fvdbg("Return %p\n", priv); + finfo("Return %p\n", priv); return (FAR struct mtd_dev_s *)priv; } diff --git a/drivers/mtd/at25.c b/drivers/mtd/at25.c index e085ca8b89..9b1efde666 100644 --- a/drivers/mtd/at25.c +++ b/drivers/mtd/at25.c @@ -213,7 +213,7 @@ static inline int at25_readid(struct at25_dev_s *priv) uint16_t manufacturer; uint16_t memory; - fvdbg("priv: %p\n", priv); + finfo("priv: %p\n", priv); /* Lock the SPI bus, configure the bus, and select this FLASH part. */ @@ -231,7 +231,7 @@ static inline int at25_readid(struct at25_dev_s *priv) SPI_SELECT(priv->dev, SPIDEV_FLASH, false); at25_unlock(priv->dev); - fvdbg("manufacturer: %02x memory: %02x\n", + finfo("manufacturer: %02x memory: %02x\n", manufacturer, memory); /* Check for a valid manufacturer and memory type */ @@ -295,7 +295,7 @@ static void at25_waitwritecomplete(struct at25_dev_s *priv) fdbg("ERROR: Write error, status: 0x%02x\n", status); } - fvdbg("Complete, status: 0x%02x\n", status); + finfo("Complete, status: 0x%02x\n", status); } /************************************************************************************ @@ -307,7 +307,7 @@ static void at25_writeenable(struct at25_dev_s *priv) SPI_SELECT(priv->dev, SPIDEV_FLASH, true); (void)SPI_SEND(priv->dev, AT25_WREN); SPI_SELECT(priv->dev, SPIDEV_FLASH, false); - fvdbg("Enabled\n"); + finfo("Enabled\n"); } /************************************************************************************ @@ -318,7 +318,7 @@ static inline void at25_sectorerase(struct at25_dev_s *priv, off_t sector) { off_t offset = sector << priv->sectorshift; - fvdbg("sector: %08lx\n", (long)sector); + finfo("sector: %08lx\n", (long)sector); /* Wait for any preceding write to complete. We could simplify things by * perform this wait at the end of each write operation (rather than at @@ -352,7 +352,7 @@ static inline void at25_sectorerase(struct at25_dev_s *priv, off_t sector) /* Deselect the FLASH */ SPI_SELECT(priv->dev, SPIDEV_FLASH, false); - fvdbg("Erased\n"); + finfo("Erased\n"); } /************************************************************************************ @@ -361,7 +361,7 @@ static inline void at25_sectorerase(struct at25_dev_s *priv, off_t sector) static inline int at25_bulkerase(struct at25_dev_s *priv) { - fvdbg("priv: %p\n", priv); + finfo("priv: %p\n", priv); /* Wait for any preceding write to complete. We could simplify things by * perform this wait at the end of each write operation (rather than at @@ -386,7 +386,7 @@ static inline int at25_bulkerase(struct at25_dev_s *priv) /* Deselect the FLASH */ SPI_SELECT(priv->dev, SPIDEV_FLASH, false); - fvdbg("Return: OK\n"); + finfo("Return: OK\n"); return OK; } @@ -399,7 +399,7 @@ static inline void at25_pagewrite(struct at25_dev_s *priv, FAR const uint8_t *bu { off_t offset = page << 8; - fvdbg("page: %08lx offset: %08lx\n", (long)page, (long)offset); + finfo("page: %08lx offset: %08lx\n", (long)page, (long)offset); /* Wait for any preceding write to complete. We could simplify things by * perform this wait at the end of each write operation (rather than at @@ -434,7 +434,7 @@ static inline void at25_pagewrite(struct at25_dev_s *priv, FAR const uint8_t *bu /* Deselect the FLASH: Chip Select high */ SPI_SELECT(priv->dev, SPIDEV_FLASH, false); - fvdbg("Written\n"); + finfo("Written\n"); } /************************************************************************************ @@ -446,7 +446,7 @@ static int at25_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblock FAR struct at25_dev_s *priv = (FAR struct at25_dev_s *)dev; size_t blocksleft = nblocks; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* Lock access to the SPI bus until we complete the erase */ @@ -473,7 +473,7 @@ static ssize_t at25_bread(FAR struct mtd_dev_s *dev, off_t startblock, size_t nb FAR struct at25_dev_s *priv = (FAR struct at25_dev_s *)dev; ssize_t nbytes; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* On this device, we can handle the block read just like the byte-oriented read */ @@ -496,7 +496,7 @@ static ssize_t at25_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_t n FAR struct at25_dev_s *priv = (FAR struct at25_dev_s *)dev; size_t blocksleft = nblocks; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* Lock the SPI bus and write each page to FLASH */ @@ -522,7 +522,7 @@ static ssize_t at25_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes, { FAR struct at25_dev_s *priv = (FAR struct at25_dev_s *)dev; - fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); + finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); /* Wait for any preceding write to complete. We could simplify things by * perform this wait at the end of each write operation (rather than at @@ -556,7 +556,7 @@ static ssize_t at25_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes, SPI_SELECT(priv->dev, SPIDEV_FLASH, false); at25_unlock(priv->dev); - fvdbg("return nbytes: %d\n", (int)nbytes); + finfo("return nbytes: %d\n", (int)nbytes); return nbytes; } @@ -569,7 +569,7 @@ static int at25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) FAR struct at25_dev_s *priv = (FAR struct at25_dev_s *)dev; int ret = -EINVAL; /* Assume good command with bad parameters */ - fvdbg("cmd: %d \n", cmd); + finfo("cmd: %d \n", cmd); switch (cmd) { @@ -592,7 +592,7 @@ static int at25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) geo->neraseblocks = priv->nsectors; ret = OK; - fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n", + finfo("blocksize: %d erasesize: %d neraseblocks: %d\n", geo->blocksize, geo->erasesize, geo->neraseblocks); } } @@ -614,7 +614,7 @@ static int at25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) break; } - fvdbg("return %d\n", ret); + finfo("return %d\n", ret); return ret; } @@ -637,7 +637,7 @@ FAR struct mtd_dev_s *at25_initialize(FAR struct spi_dev_s *dev) FAR struct at25_dev_s *priv; int ret; - fvdbg("dev: %p\n", dev); + finfo("dev: %p\n", dev); /* Allocate a state structure (we allocate the structure instead of using * a fixed, static allocation so that we can handle multiple FLASH devices. @@ -695,6 +695,6 @@ FAR struct mtd_dev_s *at25_initialize(FAR struct spi_dev_s *dev) /* Return the implementation-specific state structure as the MTD device */ - fvdbg("Return %p\n", priv); + finfo("Return %p\n", priv); return (FAR struct mtd_dev_s *)priv; } diff --git a/drivers/mtd/at45db.c b/drivers/mtd/at45db.c index a76994d5e4..4fac5863b3 100644 --- a/drivers/mtd/at45db.c +++ b/drivers/mtd/at45db.c @@ -341,7 +341,7 @@ static inline int at45db_rdid(FAR struct at45db_dev_s *priv) uint8_t capacity; uint8_t devid[3]; - fvdbg("priv: %p\n", priv); + finfo("priv: %p\n", priv); /* Configure the bus, and select this FLASH part. (The caller should already have * locked the bus for exclusive access) @@ -360,7 +360,7 @@ static inline int at45db_rdid(FAR struct at45db_dev_s *priv) SPI_SELECT(priv->spi, SPIDEV_FLASH, false); - fvdbg("manufacturer: %02x devid1: %02x devid2: %02x\n", + finfo("manufacturer: %02x devid1: %02x devid2: %02x\n", devid[0], devid[1], devid[2]); /* Check for a valid manufacturer and memory family */ @@ -474,7 +474,7 @@ static inline void at45db_pgerase(FAR struct at45db_dev_s *priv, off_t sector) uint8_t erasecmd[4]; off_t offset = sector << priv->pageshift; - fvdbg("sector: %08lx\n", (long)sector); + finfo("sector: %08lx\n", (long)sector); /* Higher performance write logic: We leave the chip busy after write and erase * operations. This improves write and erase performance because we do not have @@ -514,7 +514,7 @@ static inline void at45db_pgerase(FAR struct at45db_dev_s *priv, off_t sector) #ifndef CONFIG_AT45DB_PREWAIT at45db_waitbusy(priv); #endif - fvdbg("Erased\n"); + finfo("Erased\n"); } /************************************************************************************ @@ -523,7 +523,7 @@ static inline void at45db_pgerase(FAR struct at45db_dev_s *priv, off_t sector) static inline int at32db_chiperase(FAR struct at45db_dev_s *priv) { - fvdbg("priv: %p\n", priv); + finfo("priv: %p\n", priv); /* Higher performance write logic: We leave the chip busy after write and erase * operations. This improves write and erase performance because we do not have @@ -569,7 +569,7 @@ static inline void at45db_pgwrite(FAR struct at45db_dev_s *priv, uint8_t wrcmd [4]; off_t offset = page << priv->pageshift; - fvdbg("page: %08lx offset: %08lx\n", (long)page, (long)offset); + finfo("page: %08lx offset: %08lx\n", (long)page, (long)offset); /* We assume that sectors are not write protected */ @@ -601,7 +601,7 @@ static inline void at45db_pgwrite(FAR struct at45db_dev_s *priv, #ifndef CONFIG_AT45DB_PREWAIT at45db_waitbusy(priv); #endif - fvdbg("Written\n"); + finfo("Written\n"); } /************************************************************************************ @@ -613,7 +613,7 @@ static int at45db_erase(FAR struct mtd_dev_s *mtd, off_t startblock, size_t nblo FAR struct at45db_dev_s *priv = (FAR struct at45db_dev_s *)mtd; size_t pgsleft = nblocks; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* Take the lock so that we have exclusive access to the bus, then power up the * FLASH device. @@ -669,7 +669,7 @@ static ssize_t at45db_bwrite(FAR struct mtd_dev_s *mtd, off_t startblock, FAR struct at45db_dev_s *priv = (FAR struct at45db_dev_s *)mtd; size_t pgsleft = nblocks; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* Take the lock so that we have exclusive access to the bus, then power up the * FLASH device. @@ -703,7 +703,7 @@ static ssize_t at45db_read(FAR struct mtd_dev_s *mtd, off_t offset, size_t nbyte FAR struct at45db_dev_s *priv = (FAR struct at45db_dev_s *)mtd; uint8_t rdcmd [5]; - fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); + finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); /* Set up for the read */ @@ -741,7 +741,7 @@ static ssize_t at45db_read(FAR struct mtd_dev_s *mtd, off_t offset, size_t nbyte at45db_pwrdown(priv); at45db_unlock(priv); - fvdbg("return nbytes: %d\n", (int)nbytes); + finfo("return nbytes: %d\n", (int)nbytes); return nbytes; } @@ -754,7 +754,7 @@ static int at45db_ioctl(FAR struct mtd_dev_s *mtd, int cmd, unsigned long arg) FAR struct at45db_dev_s *priv = (FAR struct at45db_dev_s *)mtd; int ret = -EINVAL; /* Assume good command with bad parameters */ - fvdbg("cmd: %d \n", cmd); + finfo("cmd: %d \n", cmd); switch (cmd) { @@ -777,7 +777,7 @@ static int at45db_ioctl(FAR struct mtd_dev_s *mtd, int cmd, unsigned long arg) geo->neraseblocks = priv->npages; ret = OK; - fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n", + finfo("blocksize: %d erasesize: %d neraseblocks: %d\n", geo->blocksize, geo->erasesize, geo->neraseblocks); } } @@ -806,7 +806,7 @@ static int at45db_ioctl(FAR struct mtd_dev_s *mtd, int cmd, unsigned long arg) break; } - fvdbg("return %d\n", ret); + finfo("return %d\n", ret); return ret; } @@ -830,7 +830,7 @@ FAR struct mtd_dev_s *at45db_initialize(FAR struct spi_dev_s *spi) uint8_t sr; int ret; - fvdbg("spi: %p\n", spi); + finfo("spi: %p\n", spi); /* Allocate a state structure (we allocate the structure instead of using a fixed, * static allocation so that we can handle multiple FLASH devices. The current @@ -906,7 +906,7 @@ FAR struct mtd_dev_s *at45db_initialize(FAR struct spi_dev_s *spi) mtd_register(&priv->mtd, "at45db"); #endif - fvdbg("Return %p\n", priv); + finfo("Return %p\n", priv); return (FAR struct mtd_dev_s *)priv; /* On any failure, we need free memory allocations and release the lock that diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c index b18767f013..cf22b4477d 100644 --- a/drivers/mtd/ftl.c +++ b/drivers/mtd/ftl.c @@ -133,7 +133,7 @@ static const struct block_operations g_bops = static int ftl_open(FAR struct inode *inode) { - fvdbg("Entry\n"); + finfo("Entry\n"); return OK; } @@ -146,7 +146,7 @@ static int ftl_open(FAR struct inode *inode) static int ftl_close(FAR struct inode *inode) { - fvdbg("Entry\n"); + finfo("Entry\n"); return OK; } @@ -187,7 +187,7 @@ static ssize_t ftl_read(FAR struct inode *inode, unsigned char *buffer, { FAR struct ftl_struct_s *dev; - fvdbg("sector: %d nsectors: %d\n", start_sector, nsectors); + finfo("sector: %d nsectors: %d\n", start_sector, nsectors); DEBUGASSERT(inode && inode->i_private); @@ -271,7 +271,7 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer, nbytes = dev->geo.erasesize - offset; } - fvdbg("Copy %d bytes into erase block=%d at offset=%d\n", + finfo("Copy %d bytes into erase block=%d at offset=%d\n", nbytes, eraseblock, offset); memcpy(dev->eblock + offset, buffer, nbytes); @@ -315,7 +315,7 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer, /* Write a full erase back to flash */ - fvdbg("Write %d bytes into erase block=%d at offset=0\n", + finfo("Write %d bytes into erase block=%d at offset=0\n", dev->geo.erasesize, alignedblock); nxfrd = MTD_BWRITE(dev->mtd, alignedblock, dev->blkper, buffer); @@ -358,7 +358,7 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer, /* Copy the user data at the beginning the buffered erase block */ nbytes = remaining * dev->geo.blocksize; - fvdbg("Copy %d bytes into erase block=%d at offset=0\n", + finfo("Copy %d bytes into erase block=%d at offset=0\n", nbytes, alignedblock); memcpy(dev->eblock, buffer, nbytes); @@ -389,7 +389,7 @@ static ssize_t ftl_write(FAR struct inode *inode, const unsigned char *buffer, { struct ftl_struct_s *dev; - fvdbg("sector: %d nsectors: %d\n", start_sector, nsectors); + finfo("sector: %d nsectors: %d\n", start_sector, nsectors); DEBUGASSERT(inode && inode->i_private); dev = (struct ftl_struct_s *)inode->i_private; @@ -412,7 +412,7 @@ static int ftl_geometry(FAR struct inode *inode, struct geometry *geometry) { struct ftl_struct_s *dev; - fvdbg("Entry\n"); + finfo("Entry\n"); DEBUGASSERT(inode); if (geometry) @@ -428,9 +428,9 @@ static int ftl_geometry(FAR struct inode *inode, struct geometry *geometry) geometry->geo_nsectors = dev->geo.neraseblocks * dev->blkper; geometry->geo_sectorsize = dev->geo.blocksize; - fvdbg("available: true mediachanged: false writeenabled: %s\n", + finfo("available: true mediachanged: false writeenabled: %s\n", geometry->geo_writeenabled ? "true" : "false"); - fvdbg("nsectors: %d sectorsize: %d\n", + finfo("nsectors: %d sectorsize: %d\n", geometry->geo_nsectors, geometry->geo_sectorsize); return OK; @@ -451,7 +451,7 @@ static int ftl_ioctl(FAR struct inode *inode, int cmd, unsigned long arg) struct ftl_struct_s *dev ; int ret; - fvdbg("Entry\n"); + finfo("Entry\n"); DEBUGASSERT(inode && inode->i_private); /* Only one block driver ioctl command is supported by this driver (and diff --git a/drivers/mtd/hamming.c b/drivers/mtd/hamming.c index 95d4a5a699..087bd472be 100644 --- a/drivers/mtd/hamming.c +++ b/drivers/mtd/hamming.c @@ -301,11 +301,11 @@ static int hamming_verify256(FAR uint8_t *data, FAR const uint8_t *original) /* There are bit errors */ - fvdbg("Read: %02x %02x %02x\n", + finfo("Read: %02x %02x %02x\n", original[0], original[1], original[2]); - fvdbg("Computed: %02x %02x %02x\n", + finfo("Computed: %02x %02x %02x\n", computed[0], computed[1], computed[2]); - fvdbg("Correction: %02x %02x %02x\n", + finfo("Correction: %02x %02x %02x\n", correction[0], correction[1], correction[2]); /* If there is a single bit error, there are 11 bits set to 1 */ diff --git a/drivers/mtd/is25xp.c b/drivers/mtd/is25xp.c index 0c685d3ef0..e26f859b49 100644 --- a/drivers/mtd/is25xp.c +++ b/drivers/mtd/is25xp.c @@ -248,7 +248,7 @@ static inline int is25xp_readid(struct is25xp_dev_s *priv) uint16_t memory; uint16_t capacity; - fvdbg("priv: %p\n", priv); + finfo("priv: %p\n", priv); /* Lock the SPI bus, configure the bus, and select this FLASH part. */ @@ -267,7 +267,7 @@ static inline int is25xp_readid(struct is25xp_dev_s *priv) SPI_SELECT(priv->dev, SPIDEV_FLASH, false); is25xp_unlock(priv->dev); - fvdbg("manufacturer: %02x memory: %02x capacity: %02x\n", + finfo("manufacturer: %02x memory: %02x capacity: %02x\n", manufacturer, memory, capacity); /* Check for a valid manufacturer and memory type */ @@ -383,7 +383,7 @@ static void is25xp_waitwritecomplete(struct is25xp_dev_s *priv) priv->lastwaswrite = false; - fvdbg("Complete\n"); + finfo("Complete\n"); } /************************************************************************************ @@ -403,7 +403,7 @@ static void is25xp_writeenable(struct is25xp_dev_s *priv) /* Deselect the FLASH */ SPI_SELECT(priv->dev, SPIDEV_FLASH, false); - fvdbg("Enabled\n"); + finfo("Enabled\n"); } /************************************************************************************ @@ -438,7 +438,7 @@ static void is25xp_sectorerase(struct is25xp_dev_s *priv, off_t sector, uint8_t offset = sector << priv->sectorshift; - fvdbg("sector: %08lx\n", (long)sector); + finfo("sector: %08lx\n", (long)sector); /* Wait for any preceding write to complete. We could simplify things by * perform this wait at the end of each write operation (rather than at @@ -475,7 +475,7 @@ static void is25xp_sectorerase(struct is25xp_dev_s *priv, off_t sector, uint8_t /* Deselect the FLASH */ SPI_SELECT(priv->dev, SPIDEV_FLASH, false); - fvdbg("Erased\n"); + finfo("Erased\n"); } /************************************************************************************ @@ -484,7 +484,7 @@ static void is25xp_sectorerase(struct is25xp_dev_s *priv, off_t sector, uint8_t static inline int is25xp_bulkerase(struct is25xp_dev_s *priv) { - fvdbg("priv: %p\n", priv); + finfo("priv: %p\n", priv); /* Wait for any preceding write to complete. We could simplify things by * perform this wait at the end of each write operation (rather than at @@ -511,7 +511,7 @@ static inline int is25xp_bulkerase(struct is25xp_dev_s *priv) SPI_SELECT(priv->dev, SPIDEV_FLASH, false); is25xp_waitwritecomplete(priv); - fvdbg("Return: OK\n"); + finfo("Return: OK\n"); return OK; } @@ -524,7 +524,7 @@ static inline void is25xp_pagewrite(struct is25xp_dev_s *priv, FAR const uint8_t { off_t offset = page << priv->pageshift; - fvdbg("page: %08lx offset: %08lx\n", (long)page, (long)offset); + finfo("page: %08lx offset: %08lx\n", (long)page, (long)offset); /* Wait for any preceding write to complete. We could simplify things by * perform this wait at the end of each write operation (rather than at @@ -560,7 +560,7 @@ static inline void is25xp_pagewrite(struct is25xp_dev_s *priv, FAR const uint8_t /* Deselect the FLASH: Chip Select high */ SPI_SELECT(priv->dev, SPIDEV_FLASH, false); - fvdbg("Written\n"); + finfo("Written\n"); } /************************************************************************************ @@ -571,7 +571,7 @@ static inline void is25xp_pagewrite(struct is25xp_dev_s *priv, FAR const uint8_t static inline void is25xp_bytewrite(struct is25xp_dev_s *priv, FAR const uint8_t *buffer, off_t offset, uint16_t count) { - fvdbg("offset: %08lx count:%d\n", (long)offset, count); + finfo("offset: %08lx count:%d\n", (long)offset, count); /* Wait for any preceding write to complete. We could simplify things by * perform this wait at the end of each write operation (rather than at @@ -607,7 +607,7 @@ static inline void is25xp_bytewrite(struct is25xp_dev_s *priv, FAR const uint8_t /* Deselect the FLASH: Chip Select high */ SPI_SELECT(priv->dev, SPIDEV_FLASH, false); - fvdbg("Written\n"); + finfo("Written\n"); } #endif @@ -620,7 +620,7 @@ static int is25xp_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblo FAR struct is25xp_dev_s *priv = (FAR struct is25xp_dev_s *)dev; size_t blocksleft = nblocks; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* Lock access to the SPI bus until we complete the erase */ @@ -697,7 +697,7 @@ static ssize_t is25xp_bread(FAR struct mtd_dev_s *dev, off_t startblock, size_t FAR struct is25xp_dev_s *priv = (FAR struct is25xp_dev_s *)dev; ssize_t nbytes; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* On this device, we can handle the block read just like the byte-oriented read */ @@ -721,7 +721,7 @@ static ssize_t is25xp_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_t size_t blocksleft = nblocks; size_t pagesize = 1 << priv->pageshift; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* Lock the SPI bus and write each page to FLASH */ @@ -746,7 +746,7 @@ static ssize_t is25xp_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyte { FAR struct is25xp_dev_s *priv = (FAR struct is25xp_dev_s *)dev; - fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); + finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); /* Wait for any preceding write to complete. We could simplify things by * perform this wait at the end of each write operation (rather than at @@ -782,7 +782,7 @@ static ssize_t is25xp_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyte SPI_SELECT(priv->dev, SPIDEV_FLASH, false); is25xp_unlock(priv->dev); - fvdbg("return nbytes: %d\n", (int)nbytes); + finfo("return nbytes: %d\n", (int)nbytes); return nbytes; } @@ -802,7 +802,7 @@ static ssize_t is25xp_write(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyt int pagesize; int bytestowrite; - fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); + finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); /* We must test if the offset + count crosses one or more pages * and perform individual writes. The devices can only write in @@ -869,7 +869,7 @@ static int is25xp_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) FAR struct is25xp_dev_s *priv = (FAR struct is25xp_dev_s *)dev; int ret = -EINVAL; /* Assume good command with bad parameters */ - fvdbg("cmd: %d \n", cmd); + finfo("cmd: %d \n", cmd); switch (cmd) { @@ -893,7 +893,7 @@ static int is25xp_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) ret = OK; - fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n", + finfo("blocksize: %d erasesize: %d neraseblocks: %d\n", geo->blocksize, geo->erasesize, geo->neraseblocks); } } @@ -915,7 +915,7 @@ static int is25xp_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) break; } - fvdbg("return %d\n", ret); + finfo("return %d\n", ret); return ret; } @@ -938,7 +938,7 @@ FAR struct mtd_dev_s *is25xp_initialize(FAR struct spi_dev_s *dev) FAR struct is25xp_dev_s *priv; int ret; - fvdbg("dev: %p\n", dev); + finfo("dev: %p\n", dev); /* Allocate a state structure (we allocate the structure instead of using * a fixed, static allocation so that we can handle multiple FLASH devices. @@ -996,7 +996,7 @@ FAR struct mtd_dev_s *is25xp_initialize(FAR struct spi_dev_s *dev) /* Return the implementation-specific state structure as the MTD device */ - fvdbg("Return %p\n", priv); + finfo("Return %p\n", priv); return (FAR struct mtd_dev_s *)priv; } diff --git a/drivers/mtd/m25px.c b/drivers/mtd/m25px.c index f117c10d91..c1b523541b 100644 --- a/drivers/mtd/m25px.c +++ b/drivers/mtd/m25px.c @@ -312,7 +312,7 @@ static inline int m25p_readid(struct m25p_dev_s *priv) uint16_t memory; uint16_t capacity; - fvdbg("priv: %p\n", priv); + finfo("priv: %p\n", priv); /* Lock the SPI bus, configure the bus, and select this FLASH part. */ @@ -331,7 +331,7 @@ static inline int m25p_readid(struct m25p_dev_s *priv) SPI_SELECT(priv->dev, SPIDEV_FLASH, false); m25p_unlock(priv->dev); - fvdbg("manufacturer: %02x memory: %02x capacity: %02x\n", + finfo("manufacturer: %02x memory: %02x capacity: %02x\n", manufacturer, memory, capacity); /* Check for a valid manufacturer and memory type */ @@ -460,7 +460,7 @@ static void m25p_waitwritecomplete(struct m25p_dev_s *priv) } while ((status & M25P_SR_WIP) != 0); - fvdbg("Complete\n"); + finfo("Complete\n"); } /************************************************************************************ @@ -480,7 +480,7 @@ static void m25p_writeenable(struct m25p_dev_s *priv) /* Deselect the FLASH */ SPI_SELECT(priv->dev, SPIDEV_FLASH, false); - fvdbg("Enabled\n"); + finfo("Enabled\n"); } /************************************************************************************ @@ -502,7 +502,7 @@ static void m25p_sectorerase(struct m25p_dev_s *priv, off_t sector, uint8_t type offset = sector << priv->sectorshift; } - fvdbg("sector: %08lx\n", (long)sector); + finfo("sector: %08lx\n", (long)sector); /* Wait for any preceding write to complete. We could simplify things by * perform this wait at the end of each write operation (rather than at @@ -538,7 +538,7 @@ static void m25p_sectorerase(struct m25p_dev_s *priv, off_t sector, uint8_t type /* Deselect the FLASH */ SPI_SELECT(priv->dev, SPIDEV_FLASH, false); - fvdbg("Erased\n"); + finfo("Erased\n"); } /************************************************************************************ @@ -547,7 +547,7 @@ static void m25p_sectorerase(struct m25p_dev_s *priv, off_t sector, uint8_t type static inline int m25p_bulkerase(struct m25p_dev_s *priv) { - fvdbg("priv: %p\n", priv); + finfo("priv: %p\n", priv); /* Wait for any preceding write to complete. We could simplify things by * perform this wait at the end of each write operation (rather than at @@ -572,7 +572,7 @@ static inline int m25p_bulkerase(struct m25p_dev_s *priv) /* Deselect the FLASH */ SPI_SELECT(priv->dev, SPIDEV_FLASH, false); - fvdbg("Return: OK\n"); + finfo("Return: OK\n"); return OK; } @@ -585,7 +585,7 @@ static inline void m25p_pagewrite(struct m25p_dev_s *priv, FAR const uint8_t *bu { off_t offset = page << priv->pageshift; - fvdbg("page: %08lx offset: %08lx\n", (long)page, (long)offset); + finfo("page: %08lx offset: %08lx\n", (long)page, (long)offset); /* Wait for any preceding write to complete. We could simplify things by * perform this wait at the end of each write operation (rather than at @@ -620,7 +620,7 @@ static inline void m25p_pagewrite(struct m25p_dev_s *priv, FAR const uint8_t *bu /* Deselect the FLASH: Chip Select high */ SPI_SELECT(priv->dev, SPIDEV_FLASH, false); - fvdbg("Written\n"); + finfo("Written\n"); } /************************************************************************************ @@ -631,7 +631,7 @@ static inline void m25p_pagewrite(struct m25p_dev_s *priv, FAR const uint8_t *bu static inline void m25p_bytewrite(struct m25p_dev_s *priv, FAR const uint8_t *buffer, off_t offset, uint16_t count) { - fvdbg("offset: %08lx count:%d\n", (long)offset, count); + finfo("offset: %08lx count:%d\n", (long)offset, count); /* Wait for any preceding write to complete. We could simplify things by * perform this wait at the end of each write operation (rather than at @@ -666,7 +666,7 @@ static inline void m25p_bytewrite(struct m25p_dev_s *priv, FAR const uint8_t *bu /* Deselect the FLASH: Chip Select high */ SPI_SELECT(priv->dev, SPIDEV_FLASH, false); - fvdbg("Written\n"); + finfo("Written\n"); } #endif @@ -679,7 +679,7 @@ static int m25p_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblock FAR struct m25p_dev_s *priv = (FAR struct m25p_dev_s *)dev; size_t blocksleft = nblocks; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* Lock access to the SPI bus until we complete the erase */ @@ -747,7 +747,7 @@ static ssize_t m25p_bread(FAR struct mtd_dev_s *dev, off_t startblock, size_t nb FAR struct m25p_dev_s *priv = (FAR struct m25p_dev_s *)dev; ssize_t nbytes; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* On this device, we can handle the block read just like the byte-oriented read */ @@ -771,7 +771,7 @@ static ssize_t m25p_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_t n size_t blocksleft = nblocks; size_t pagesize = 1 << priv->pageshift; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* Lock the SPI bus and write each page to FLASH */ @@ -796,7 +796,7 @@ static ssize_t m25p_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes, { FAR struct m25p_dev_s *priv = (FAR struct m25p_dev_s *)dev; - fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); + finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); /* Wait for any preceding write to complete. We could simplify things by * perform this wait at the end of each write operation (rather than at @@ -829,7 +829,7 @@ static ssize_t m25p_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes, SPI_SELECT(priv->dev, SPIDEV_FLASH, false); m25p_unlock(priv->dev); - fvdbg("return nbytes: %d\n", (int)nbytes); + finfo("return nbytes: %d\n", (int)nbytes); return nbytes; } @@ -849,7 +849,7 @@ static ssize_t m25p_write(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes int pagesize; int bytestowrite; - fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); + finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); /* We must test if the offset + count crosses one or more pages * and perform individual writes. The devices can only write in @@ -914,7 +914,7 @@ static int m25p_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) FAR struct m25p_dev_s *priv = (FAR struct m25p_dev_s *)dev; int ret = -EINVAL; /* Assume good command with bad parameters */ - fvdbg("cmd: %d \n", cmd); + finfo("cmd: %d \n", cmd); switch (cmd) { @@ -949,7 +949,7 @@ static int m25p_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) ret = OK; - fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n", + finfo("blocksize: %d erasesize: %d neraseblocks: %d\n", geo->blocksize, geo->erasesize, geo->neraseblocks); } } @@ -971,7 +971,7 @@ static int m25p_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) break; } - fvdbg("return %d\n", ret); + finfo("return %d\n", ret); return ret; } @@ -994,7 +994,7 @@ FAR struct mtd_dev_s *m25p_initialize(FAR struct spi_dev_s *dev) FAR struct m25p_dev_s *priv; int ret; - fvdbg("dev: %p\n", dev); + finfo("dev: %p\n", dev); /* Allocate a state structure (we allocate the structure instead of using * a fixed, static allocation so that we can handle multiple FLASH devices. @@ -1045,6 +1045,6 @@ FAR struct mtd_dev_s *m25p_initialize(FAR struct spi_dev_s *dev) /* Return the implementation-specific state structure as the MTD device */ - fvdbg("Return %p\n", priv); + finfo("Return %p\n", priv); return (FAR struct mtd_dev_s *)priv; } diff --git a/drivers/mtd/mtd_nand.c b/drivers/mtd/mtd_nand.c index 7797cd22ba..206cf97e54 100644 --- a/drivers/mtd/mtd_nand.c +++ b/drivers/mtd/mtd_nand.c @@ -207,7 +207,7 @@ static int nand_checkblock(FAR struct nand_dev_s *nand, off_t block) nandscheme_readbadblockmarker(scheme, spare, &marker); if (marker != 0xff) { - fvdbg("Page 0 block %d marker=%02x\n", block, marker); + finfo("Page 0 block %d marker=%02x\n", block, marker); return BADBLOCK; } @@ -223,7 +223,7 @@ static int nand_checkblock(FAR struct nand_dev_s *nand, off_t block) nandscheme_readbadblockmarker(scheme, spare, &marker); if (marker != 0xff) { - fvdbg("Page 1 block %d marker=%02x\n", block, marker); + finfo("Page 1 block %d marker=%02x\n", block, marker); return BADBLOCK; } @@ -275,7 +275,7 @@ static int nand_devscan(FAR struct nand_dev_s *nand) /* Initialize block statuses */ - fvdbg("Retrieving bad block information. nblocks=%d\n", nblocks); + finfo("Retrieving bad block information. nblocks=%d\n", nblocks); /* Retrieve block status from their first page spare area */ @@ -293,13 +293,13 @@ static int nand_devscan(FAR struct nand_dev_s *nand) #if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS) if (ngood > 0) { - fvdbg("Good blocks: %u - %u\n", good, good + ngood); + finfo("Good blocks: %u - %u\n", good, good + ngood); ngood = 0; } #endif if (ret == BADBLOCK) { - fvdbg("Block %u is bad\n", (unsigned int)block); + finfo("Block %u is bad\n", (unsigned int)block); } else { @@ -323,7 +323,7 @@ static int nand_devscan(FAR struct nand_dev_s *nand) #if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS) if (ngood > 0) { - fvdbg("Good blocks: %u - %u\n", good, good + ngood); + finfo("Good blocks: %u - %u\n", good, good + ngood); } #endif @@ -360,7 +360,7 @@ static uint32_t nand_chipid(struct nand_raw_s *raw) id[3] = READ_DATA8(raw); id[4] = READ_DATA8(raw); - fvdbg("Chip ID: %02x %02x %02x %02x %02x\n", + finfo("Chip ID: %02x %02x %02x %02x %02x\n", id[0], id[1], id[2], id[3], id[4]); return (uint32_t)id[0] | @@ -394,7 +394,7 @@ static int nand_eraseblock(FAR struct nand_dev_s *nand, off_t block, FAR struct nand_raw_s *raw; int ret; - /* fvdbg("Block %d\n", block); */ + /* finfo("Block %d\n", block); */ DEBUGASSERT(nand && nand->raw); #ifdef CONFIG_MTD_NAND_BLOCKCHECK @@ -404,7 +404,7 @@ static int nand_eraseblock(FAR struct nand_dev_s *nand, off_t block, if (nand_checkblock(nand, block) != GOODBLOCK) { - fvdbg("Block is BAD\n"); + finfo("Block is BAD\n"); return -EAGAIN; } } @@ -460,7 +460,7 @@ static int nand_eraseblock(FAR struct nand_dev_s *nand, off_t block, static int nand_readpage(FAR struct nand_dev_s *nand, off_t block, unsigned int page, FAR uint8_t *data) { - fvdbg("block=%d page=%d data=%p\n", (int)block, page, data); + finfo("block=%d page=%d data=%p\n", (int)block, page, data); #ifdef CONFIG_MTD_NAND_BLOCKCHECK /* Check that the block is not BAD if data is requested */ @@ -562,7 +562,7 @@ static int nand_erase(struct mtd_dev_s *dev, off_t startblock, size_t blocksleft = nblocks; int ret; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* Lock access to the NAND until we complete the erase */ @@ -609,7 +609,7 @@ static ssize_t nand_bread(struct mtd_dev_s *dev, off_t startpage, off_t block; int ret; - fvdbg("startpage: %ld npages: %d\n", (long)startpage, (int)npages); + finfo("startpage: %ld npages: %d\n", (long)startpage, (int)npages); DEBUGASSERT(nand && nand->raw); /* Retrieve the model */ @@ -705,7 +705,7 @@ static ssize_t nand_bwrite(struct mtd_dev_s *dev, off_t startpage, off_t block; int ret; - fvdbg("startpage: %08lx npages: %d\n", (long)startpage, (int)npages); + finfo("startpage: %08lx npages: %d\n", (long)startpage, (int)npages); DEBUGASSERT(nand && nand->raw); /* Retrieve the model */ @@ -864,7 +864,7 @@ FAR struct mtd_dev_s *nand_initialize(FAR struct nand_raw_s *raw) struct onfi_pgparam_s onfi; int ret; - fvdbg("cmdaddr=%p addraddr=%p dataaddr=%p\n", + finfo("cmdaddr=%p addraddr=%p dataaddr=%p\n", (FAR void *)raw->cmdaddr, (FAR void *)raw->addraddr, (FAR void *)raw->dataaddr); @@ -885,7 +885,7 @@ FAR struct mtd_dev_s *nand_initialize(FAR struct nand_raw_s *raw) { uint32_t chipid; - fvdbg("Failed to get ONFI page parameters: %d\n", ret); + finfo("Failed to get ONFI page parameters: %d\n", ret); /* If the ONFI model is not supported, determine the NAND * model from a lookup of known FLASH parts. @@ -904,7 +904,7 @@ FAR struct mtd_dev_s *nand_initialize(FAR struct nand_raw_s *raw) FAR struct nand_model_s *model = &raw->model; uint64_t size; - fvdbg("Found ONFI compliant NAND FLASH\n"); + finfo("Found ONFI compliant NAND FLASH\n"); /* Construct the NAND model structure */ diff --git a/drivers/mtd/mtd_nandecc.c b/drivers/mtd/mtd_nandecc.c index 55286b7460..7820feb481 100644 --- a/drivers/mtd/mtd_nandecc.c +++ b/drivers/mtd/mtd_nandecc.c @@ -97,7 +97,7 @@ int nandecc_readpage(FAR struct nand_dev_s *nand, off_t block, unsigned int sparesize; int ret; - fvdbg("block=%d page=%d data=%p spare=%d\n", (int)block, page, data, spare); + finfo("block=%d page=%d data=%p spare=%d\n", (int)block, page, data, spare); /* Get convenience pointers */ @@ -189,7 +189,7 @@ int nandecc_writepage(FAR struct nand_dev_s *nand, off_t block, unsigned int sparesize; int ret; - fvdbg("block=%d page=%d data=%p spare=%d\n", (int)block, page, data, spare); + finfo("block=%d page=%d data=%p spare=%d\n", (int)block, page, data, spare); /* Get convenience pointers */ diff --git a/drivers/mtd/mtd_nandmodel.c b/drivers/mtd/mtd_nandmodel.c index f2dd2c259f..cd3c324c9c 100644 --- a/drivers/mtd/mtd_nandmodel.c +++ b/drivers/mtd/mtd_nandmodel.c @@ -92,13 +92,13 @@ int nandmodel_find(FAR const struct nand_model_s *modeltab, size_t size, id2 = (uint8_t)(chipid >> 8); id4 = (uint8_t)(chipid >> 24); - fvdbg("NAND ID is 0x%08x\n", (int)chipid); + finfo("NAND ID is 0x%08x\n", (int)chipid); for (i = 0; i < size; i++) { if (modeltab[i].devid == id2) { - fvdbg("NAND Model found: ID2=0x%02x ID4=0x%02x\n", id2, id4); + finfo("NAND Model found: ID2=0x%02x ID4=0x%02x\n", id2, id4); found = true; if (model) @@ -155,11 +155,11 @@ int nandmodel_find(FAR const struct nand_model_s *modeltab, size_t size, } } - fvdbg(" devid: 0x%02x\n", model->devid); - fvdbg(" devsize: %d (MB)\n", model->devsize); - fvdbg(" blocksize: %d (KB)\n", model->blocksize); - fvdbg(" pagesize: %d (B)\n", model->pagesize); - fvdbg(" options: 0x%02x\n", model->options); + finfo(" devid: 0x%02x\n", model->devid); + finfo(" devsize: %d (MB)\n", model->devsize); + finfo(" blocksize: %d (KB)\n", model->blocksize); + finfo(" pagesize: %d (B)\n", model->pagesize); + finfo(" options: 0x%02x\n", model->options); } break; } @@ -205,7 +205,7 @@ int nandmodel_translate(FAR const struct nand_model_s *model, off_t address, if ((address + size) > nandmodel_getdevbytesize(model)) { - fvdbg("nandmodel_translate: out-of-bounds access.\n"); + finfo("nandmodel_translate: out-of-bounds access.\n"); return -ESPIPE; } diff --git a/drivers/mtd/mtd_onfi.c b/drivers/mtd/mtd_onfi.c index aa4c6a09c0..3f1b9f43a6 100644 --- a/drivers/mtd/mtd_onfi.c +++ b/drivers/mtd/mtd_onfi.c @@ -273,7 +273,7 @@ int onfi_read(uintptr_t cmdaddr, uintptr_t addraddr, uintptr_t dataaddr, uint8_t parmtab[ONFI_PARAM_TABLE_SIZE]; int i; - fvdbg("cmdaddr=%08x addraddr=%08x dataaddr=%08x\n", + finfo("cmdaddr=%08x addraddr=%08x dataaddr=%08x\n", (int)cmdaddr, (int)addraddr, (int)dataaddr); if (!onfi_compatible(cmdaddr, addraddr, dataaddr)) @@ -356,16 +356,16 @@ int onfi_read(uintptr_t cmdaddr, uintptr_t addraddr, uintptr_t dataaddr, onfi->model = *(FAR uint8_t *)(parmtab + 49); - fvdbg("Returning:\n"); - fvdbg(" manufacturer: 0x%02x\n", onfi->manufacturer); - fvdbg(" buswidth: %d\n", onfi->buswidth); - fvdbg(" luns: %d\n", onfi->luns); - fvdbg(" eccsize: %d\n", onfi->eccsize); - fvdbg(" model: 0x%02s\n", onfi->model); - fvdbg(" sparesize: %d\n", onfi->sparesize); - fvdbg(" pagesperblock: %d\n", onfi->pagesperblock); - fvdbg(" blocksperlun: %d\n", onfi->blocksperlun); - fvdbg(" pagesize: %d\n", onfi->pagesize); + finfo("Returning:\n"); + finfo(" manufacturer: 0x%02x\n", onfi->manufacturer); + finfo(" buswidth: %d\n", onfi->buswidth); + finfo(" luns: %d\n", onfi->luns); + finfo(" eccsize: %d\n", onfi->eccsize); + finfo(" model: 0x%02s\n", onfi->model); + finfo(" sparesize: %d\n", onfi->sparesize); + finfo(" pagesperblock: %d\n", onfi->pagesperblock); + finfo(" blocksperlun: %d\n", onfi->blocksperlun); + finfo(" pagesize: %d\n", onfi->pagesize); return OK; } @@ -455,7 +455,7 @@ bool onfi_ebidetect(uintptr_t cmdaddr, uintptr_t addraddr, uint8_t ids[4]; uint8_t i; - fvdbg("cmdaddr=%08x addraddr=%08x dataaddr=%08x\n", + finfo("cmdaddr=%08x addraddr=%08x dataaddr=%08x\n", (int)cmdaddr, (int)addraddr, (int)dataaddr); /* Send Reset command */ diff --git a/drivers/mtd/mtd_partition.c b/drivers/mtd/mtd_partition.c index f6a148c753..60e29870fe 100644 --- a/drivers/mtd/mtd_partition.c +++ b/drivers/mtd/mtd_partition.c @@ -479,7 +479,7 @@ static int part_procfs_open(FAR struct file *filep, FAR const char *relpath, { FAR struct part_procfs_file_s *attr; - fvdbg("Open '%s'\n", relpath); + finfo("Open '%s'\n", relpath); /* PROCFS is read-only. Any attempt to open with any kind of write * access is not permitted. @@ -550,7 +550,7 @@ static ssize_t part_procfs_read(FAR struct file *filep, FAR char *buffer, uint8_t x; #endif - fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen); + finfo("buffer=%p buflen=%d\n", buffer, (int)buflen); /* Recover our private data from the struct file instance */ @@ -702,7 +702,7 @@ static int part_procfs_dup(FAR const struct file *oldp, FAR struct file *newp) FAR struct part_procfs_file_s *oldattr; FAR struct part_procfs_file_s *newattr; - fvdbg("Dup %p->%p\n", oldp, newp); + finfo("Dup %p->%p\n", oldp, newp); /* Recover our private data from the old struct file instance */ diff --git a/drivers/mtd/mtd_procfs.c b/drivers/mtd/mtd_procfs.c index bc3071c7e0..e604a19b97 100644 --- a/drivers/mtd/mtd_procfs.c +++ b/drivers/mtd/mtd_procfs.c @@ -139,7 +139,7 @@ static int mtd_open(FAR struct file *filep, FAR const char *relpath, { FAR struct mtd_file_s *attr; - fvdbg("Open '%s'\n", relpath); + finfo("Open '%s'\n", relpath); /* PROCFS is read-only. Any attempt to open with any kind of write * access is not permitted. @@ -201,7 +201,7 @@ static ssize_t mtd_read(FAR struct file *filep, FAR char *buffer, ssize_t total = 0; ssize_t ret; - fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen); + finfo("buffer=%p buflen=%d\n", buffer, (int)buflen); /* Recover our private data from the struct file instance */ @@ -266,7 +266,7 @@ static int mtd_dup(FAR const struct file *oldp, FAR struct file *newp) FAR struct mtd_file_s *oldattr; FAR struct mtd_file_s *newattr; - fvdbg("Dup %p->%p\n", oldp, newp); + finfo("Dup %p->%p\n", oldp, newp); /* Recover our private data from the old struct file instance */ diff --git a/drivers/mtd/mtd_rwbuffer.c b/drivers/mtd/mtd_rwbuffer.c index 0e05a7c92b..28d05c619d 100644 --- a/drivers/mtd/mtd_rwbuffer.c +++ b/drivers/mtd/mtd_rwbuffer.c @@ -174,7 +174,7 @@ static int mtd_erase(FAR struct mtd_dev_s *dev, off_t block, size_t nblocks) size_t nsectors; int ret; - fvdbg("block: %08lx nsectors: %lu\n", + finfo("block: %08lx nsectors: %lu\n", (unsigned long)block, (unsigned int)nsectors); /* Convert to logical sectors and sector numbers */ @@ -253,7 +253,7 @@ static int mtd_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) FAR struct mtd_rwbuffer_s *priv = (FAR struct mtd_rwbuffer_s *)dev; int ret = -EINVAL; /* Assume good command with bad parameters */ - fvdbg("cmd: %d \n", cmd); + finfo("cmd: %d \n", cmd); switch (cmd) { @@ -276,7 +276,7 @@ static int mtd_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) geo->neraseblocks = priv->rwb.nblocks / priv->spb; ret = OK; - fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n", + finfo("blocksize: %d erasesize: %d neraseblocks: %d\n", geo->blocksize, geo->erasesize, geo->neraseblocks); } } @@ -309,7 +309,7 @@ static int mtd_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) break; } - fvdbg("return %d\n", ret); + finfo("return %d\n", ret); return ret; } @@ -337,7 +337,7 @@ FAR struct mtd_dev_s *mtd_rwb_initialize(FAR struct mtd_dev_s *mtd) struct mtd_geometry_s geo; int ret; - fvdbg("mtd: %p\n", mtd); + finfo("mtd: %p\n", mtd); DEBUGASSERT(mtd && mtd->ioctl); /* Get the device geometry */ @@ -418,7 +418,7 @@ FAR struct mtd_dev_s *mtd_rwb_initialize(FAR struct mtd_dev_s *mtd) /* Return the implementation-specific state structure as the MTD device */ - fvdbg("Return %p\n", priv); + finfo("Return %p\n", priv); return &priv->mtd; } diff --git a/drivers/mtd/n25qxxx.c b/drivers/mtd/n25qxxx.c index d79f2877b9..f0db0481a6 100644 --- a/drivers/mtd/n25qxxx.c +++ b/drivers/mtd/n25qxxx.c @@ -391,7 +391,7 @@ static int n25qxxx_command(FAR struct qspi_dev_s *qspi, uint8_t cmd) { struct qspi_cmdinfo_s cmdinfo; - fvdbg("CMD: %02x\n", cmd); + finfo("CMD: %02x\n", cmd); cmdinfo.flags = 0; cmdinfo.addrlen = 0; @@ -412,7 +412,7 @@ static int n25qxxx_command_address(FAR struct qspi_dev_s *qspi, uint8_t cmd, { struct qspi_cmdinfo_s cmdinfo; - fvdbg("CMD: %02x Address: %04lx addrlen=%d\n", cmd, (unsigned long)addr, addrlen); + finfo("CMD: %02x Address: %04lx addrlen=%d\n", cmd, (unsigned long)addr, addrlen); cmdinfo.flags = QSPICMD_ADDRESS; cmdinfo.addrlen = addrlen; @@ -433,7 +433,7 @@ static int n25qxxx_command_read(FAR struct qspi_dev_s *qspi, uint8_t cmd, { struct qspi_cmdinfo_s cmdinfo; - fvdbg("CMD: %02x buflen: %lu\n", cmd, (unsigned long)buflen); + finfo("CMD: %02x buflen: %lu\n", cmd, (unsigned long)buflen); cmdinfo.flags = QSPICMD_READDATA; cmdinfo.addrlen = 0; @@ -454,7 +454,7 @@ static int n25qxxx_command_write(FAR struct qspi_dev_s *qspi, uint8_t cmd, { struct qspi_cmdinfo_s cmdinfo; - fvdbg("CMD: %02x buflen: %lu\n", cmd, (unsigned long)buflen); + finfo("CMD: %02x buflen: %lu\n", cmd, (unsigned long)buflen); cmdinfo.flags = QSPICMD_WRITEDATA; cmdinfo.addrlen = 0; @@ -567,7 +567,7 @@ static inline int n25qxxx_readid(struct n25qxxx_dev_s *priv) n25qxxx_unlock(priv->qspi); - fvdbg("Manufacturer: %02x Device Type %02x, Capacity: %02x\n", + finfo("Manufacturer: %02x Device Type %02x, Capacity: %02x\n", priv->cmdbuf[0], priv->cmdbuf[1], priv->cmdbuf[2]); /* Check for a recognized memory device type */ @@ -795,7 +795,7 @@ static int n25qxxx_erase_sector(struct n25qxxx_dev_s *priv, off_t sector) off_t address; uint8_t status; - fvdbg("sector: %08lx\n", (unsigned long)sector); + finfo("sector: %08lx\n", (unsigned long)sector); /* Check that the flash is ready and unprotected */ @@ -872,7 +872,7 @@ static int n25qxxx_read_byte(FAR struct n25qxxx_dev_s *priv, FAR uint8_t *buffer { struct qspi_meminfo_s meminfo; - fvdbg("address: %08lx nbytes: %d\n", (long)address, (int)buflen); + finfo("address: %08lx nbytes: %d\n", (long)address, (int)buflen); meminfo.flags = QSPIMEM_READ | QSPIMEM_QUADIO; meminfo.addrlen = 3; @@ -898,7 +898,7 @@ static int n25qxxx_write_page(struct n25qxxx_dev_s *priv, FAR const uint8_t *buf int ret; int i; - fvdbg("address: %08lx buflen: %u\n", (unsigned long)address, (unsigned)buflen); + finfo("address: %08lx buflen: %u\n", (unsigned long)address, (unsigned)buflen); npages = (buflen >> priv->pageshift); pagesize = (1 << priv->pageshift); @@ -1008,7 +1008,7 @@ static FAR uint8_t *n25qxxx_read_cache(struct n25qxxx_dev_s *priv, off_t sector) shift = priv->sectorshift - N25QXXX_SECTOR512_SHIFT; esectno = sector >> shift; - fvdbg("sector: %ld esectno: %d shift=%d\n", sector, esectno, shift); + finfo("sector: %ld esectno: %d shift=%d\n", sector, esectno, shift); /* Check if the requested erase block is already in the cache */ @@ -1076,7 +1076,7 @@ static void n25qxxx_erase_cache(struct n25qxxx_dev_s *priv, off_t sector) if (!IS_ERASED(priv)) { off_t esectno = sector >> (priv->sectorshift - N25QXXX_SECTOR512_SHIFT); - fvdbg("sector: %ld esectno: %d\n", sector, esectno); + finfo("sector: %ld esectno: %d\n", sector, esectno); DEBUGVERIFY(n25qxxx_erase_sector(priv, esectno)); SET_ERASED(priv); @@ -1120,7 +1120,7 @@ static int n25qxxx_write_cache(FAR struct n25qxxx_dev_s *priv, if (!IS_ERASED(priv)) { off_t esectno = sector >> (priv->sectorshift - N25QXXX_SECTOR512_SHIFT); - fvdbg("sector: %ld esectno: %d\n", sector, esectno); + finfo("sector: %ld esectno: %d\n", sector, esectno); ret = n25qxxx_erase_sector(priv, esectno); if (ret < 0) @@ -1161,7 +1161,7 @@ static int n25qxxx_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nbl int ret; #endif - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* Lock access to the SPI bus until we complete the erase */ @@ -1206,7 +1206,7 @@ static ssize_t n25qxxx_bread(FAR struct mtd_dev_s *dev, off_t startblock, #endif ssize_t nbytes; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* On this device, we can handle the block read just like the byte-oriented read */ @@ -1239,7 +1239,7 @@ static ssize_t n25qxxx_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, FAR struct n25qxxx_dev_s *priv = (FAR struct n25qxxx_dev_s *)dev; int ret = (int)nblocks; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* Lock the QuadSPI bus and write all of the pages to FLASH */ @@ -1276,7 +1276,7 @@ static ssize_t n25qxxx_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyt FAR struct n25qxxx_dev_s *priv = (FAR struct n25qxxx_dev_s *)dev; int ret; - fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); + finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); /* Lock the QuadSPI bus and select this FLASH part */ @@ -1290,7 +1290,7 @@ static ssize_t n25qxxx_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyt return (ssize_t)ret; } - fvdbg("return nbytes: %d\n", (int)nbytes); + finfo("return nbytes: %d\n", (int)nbytes); return (ssize_t)nbytes; } @@ -1303,7 +1303,7 @@ static int n25qxxx_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) FAR struct n25qxxx_dev_s *priv = (FAR struct n25qxxx_dev_s *)dev; int ret = -EINVAL; /* Assume good command with bad parameters */ - fvdbg("cmd: %d \n", cmd); + finfo("cmd: %d \n", cmd); switch (cmd) { @@ -1334,7 +1334,7 @@ static int n25qxxx_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) #endif ret = OK; - fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n", + finfo("blocksize: %d erasesize: %d neraseblocks: %d\n", geo->blocksize, geo->erasesize, geo->neraseblocks); } } @@ -1375,7 +1375,7 @@ static int n25qxxx_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) break; } - fvdbg("return %d\n", ret); + finfo("return %d\n", ret); return ret; } @@ -1401,7 +1401,7 @@ FAR struct mtd_dev_s *n25qxxx_initialize(FAR struct qspi_dev_s *qspi, bool unpro FAR struct n25qxxx_dev_s *priv; int ret; - fvdbg("qspi: %p\n", qspi); + finfo("qspi: %p\n", qspi); DEBUGASSERT(qspi != NULL); /* Allocate a state structure (we allocate the structure instead of using @@ -1496,7 +1496,7 @@ FAR struct mtd_dev_s *n25qxxx_initialize(FAR struct qspi_dev_s *qspi, bool unpro /* Return the implementation-specific state structure as the MTD device */ - fvdbg("Return %p\n", priv); + finfo("Return %p\n", priv); return (FAR struct mtd_dev_s *)priv; errout_with_readbuf: diff --git a/drivers/mtd/ramtron.c b/drivers/mtd/ramtron.c index 89e0ade859..84f8828276 100644 --- a/drivers/mtd/ramtron.c +++ b/drivers/mtd/ramtron.c @@ -368,7 +368,7 @@ static inline int ramtron_readid(struct ramtron_dev_s *priv) uint16_t part; int i; - fvdbg("priv: %p\n", priv); + finfo("priv: %p\n", priv); /* Lock the SPI bus, configure the bus, and select this FLASH part. */ @@ -418,7 +418,7 @@ static inline int ramtron_readid(struct ramtron_dev_s *priv) UNUSED(manufacturer); /* Eliminate warnings when debug is off */ UNUSED(memory); /* Eliminate warnings when debug is off */ - fvdbg("RAMTRON %s of size %d bytes (mf:%02x mem:%02x cap:%02x part:%02x)\n", + finfo("RAMTRON %s of size %d bytes (mf:%02x mem:%02x cap:%02x part:%02x)\n", priv->part->name, priv->part->size, manufacturer, memory, capacity, part); priv->sectorshift = RAMTRON_EMULATE_SECTOR_SHIFT; @@ -429,7 +429,7 @@ static inline int ramtron_readid(struct ramtron_dev_s *priv) return OK; } - fvdbg("RAMTRON device not found\n"); + finfo("RAMTRON device not found\n"); return -ENODEV; } @@ -471,7 +471,7 @@ static int ramtron_waitwritecomplete(struct ramtron_dev_s *priv) if (retries > 0) { - fvdbg("Complete\n"); + finfo("Complete\n"); retries = OK; } else @@ -500,7 +500,7 @@ static void ramtron_writeenable(struct ramtron_dev_s *priv) /* Deselect the FLASH */ SPI_SELECT(priv->dev, SPIDEV_FLASH, false); - fvdbg("Enabled\n"); + finfo("Enabled\n"); } /************************************************************************************ @@ -529,7 +529,7 @@ static inline int ramtron_pagewrite(struct ramtron_dev_s *priv, FAR const uint8_ { off_t offset = page << priv->pageshift; - fvdbg("page: %08lx offset: %08lx\n", (long)page, (long)offset); + finfo("page: %08lx offset: %08lx\n", (long)page, (long)offset); #ifndef RAMTRON_WRITEWAIT /* Wait for any preceding write to complete. We could simplify things by @@ -564,7 +564,7 @@ static inline int ramtron_pagewrite(struct ramtron_dev_s *priv, FAR const uint8_ /* Deselect the FLASH: Chip Select high */ SPI_SELECT(priv->dev, SPIDEV_FLASH, false); - fvdbg("Written\n"); + finfo("Written\n"); #ifdef RAMTRON_WRITEWAIT /* Wait for write completion now so we can report any errors to the caller. Thus @@ -583,8 +583,8 @@ static inline int ramtron_pagewrite(struct ramtron_dev_s *priv, FAR const uint8_ static int ramtron_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblocks) { - fvdbg("startblock: %08lx nblocks: %d\n", (unsigned long)startblock, (int)nblocks); - fvdbg("On RAMTRON devices erasing makes no sense, returning as OK\n"); + finfo("startblock: %08lx nblocks: %d\n", (unsigned long)startblock, (int)nblocks); + finfo("On RAMTRON devices erasing makes no sense, returning as OK\n"); return (int)nblocks; } @@ -598,7 +598,7 @@ static ssize_t ramtron_bread(FAR struct mtd_dev_s *dev, off_t startblock, FAR struct ramtron_dev_s *priv = (FAR struct ramtron_dev_s *)dev; ssize_t nbytes; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* On this device, we can handle the block read just like the byte-oriented read */ @@ -622,7 +622,7 @@ static ssize_t ramtron_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, FAR struct ramtron_dev_s *priv = (FAR struct ramtron_dev_s *)dev; size_t blocksleft = nblocks; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* Lock the SPI bus and write each page to FLASH */ @@ -653,7 +653,7 @@ static ssize_t ramtron_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyt uint8_t status; #endif - fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); + finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); #ifndef RAMTRON_WRITEWAIT /* Wait for any preceding write to complete. We could simplify things by @@ -704,7 +704,7 @@ static ssize_t ramtron_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyt SPI_SELECT(priv->dev, SPIDEV_FLASH, false); ramtron_unlock(priv->dev); - fvdbg("return nbytes: %d\n", (int)nbytes); + finfo("return nbytes: %d\n", (int)nbytes); return nbytes; } @@ -717,7 +717,7 @@ static int ramtron_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) FAR struct ramtron_dev_s *priv = (FAR struct ramtron_dev_s *)dev; int ret = -EINVAL; /* Assume good command with bad parameters */ - fvdbg("cmd: %d \n", cmd); + finfo("cmd: %d \n", cmd); switch (cmd) { @@ -740,14 +740,14 @@ static int ramtron_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) geo->neraseblocks = priv->nsectors; ret = OK; - fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n", + finfo("blocksize: %d erasesize: %d neraseblocks: %d\n", geo->blocksize, geo->erasesize, geo->neraseblocks); } } break; case MTDIOC_BULKERASE: - fvdbg("BULDERASE: Makes no sense in ramtron. Let's confirm operation as OK\n"); + finfo("BULDERASE: Makes no sense in ramtron. Let's confirm operation as OK\n"); ret = OK; break; @@ -757,7 +757,7 @@ static int ramtron_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) if (arg > 0 && arg <= RAMTRON_INIT_CLK_MAX) { priv->speed = arg; - fvdbg("set bus speed to %lu\n", priv->speed); + finfo("set bus speed to %lu\n", priv->speed); ret = OK; } } @@ -770,7 +770,7 @@ static int ramtron_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) break; } - fvdbg("return %d\n", ret); + finfo("return %d\n", ret); return ret; } @@ -792,7 +792,7 @@ FAR struct mtd_dev_s *ramtron_initialize(FAR struct spi_dev_s *dev) { FAR struct ramtron_dev_s *priv; - fvdbg("dev: %p\n", dev); + finfo("dev: %p\n", dev); /* Allocate a state structure (we allocate the structure instead of using * a fixed, static allocation so that we can handle multiple FLASH devices. @@ -838,6 +838,6 @@ FAR struct mtd_dev_s *ramtron_initialize(FAR struct spi_dev_s *dev) /* Return the implementation-specific state structure as the MTD device */ - fvdbg("Return %p\n", priv); + finfo("Return %p\n", priv); return (FAR struct mtd_dev_s *)priv; } diff --git a/drivers/mtd/s25fl1.c b/drivers/mtd/s25fl1.c index 5a89c0d9e8..ae9a47cbe4 100644 --- a/drivers/mtd/s25fl1.c +++ b/drivers/mtd/s25fl1.c @@ -443,7 +443,7 @@ static int s25fl1_command(FAR struct qspi_dev_s *qspi, uint8_t cmd) { struct qspi_cmdinfo_s cmdinfo; - fvdbg("CMD: %02x\n", cmd); + finfo("CMD: %02x\n", cmd); cmdinfo.flags = 0; cmdinfo.addrlen = 0; @@ -464,7 +464,7 @@ static int s25fl1_command_address(FAR struct qspi_dev_s *qspi, uint8_t cmd, { struct qspi_cmdinfo_s cmdinfo; - fvdbg("CMD: %02x Address: %04lx addrlen=%d\n", cmd, (unsigned long)addr, addrlen); + finfo("CMD: %02x Address: %04lx addrlen=%d\n", cmd, (unsigned long)addr, addrlen); cmdinfo.flags = QSPICMD_ADDRESS; cmdinfo.addrlen = addrlen; @@ -485,7 +485,7 @@ static int s25fl1_command_read(FAR struct qspi_dev_s *qspi, uint8_t cmd, { struct qspi_cmdinfo_s cmdinfo; - fvdbg("CMD: %02x buflen: %lu\n", cmd, (unsigned long)buflen); + finfo("CMD: %02x buflen: %lu\n", cmd, (unsigned long)buflen); cmdinfo.flags = QSPICMD_READDATA; cmdinfo.addrlen = 0; @@ -506,7 +506,7 @@ static int s25fl1_command_write(FAR struct qspi_dev_s *qspi, uint8_t cmd, { struct qspi_cmdinfo_s cmdinfo; - fvdbg("CMD: %02x buflen: %lu\n", cmd, (unsigned long)buflen); + finfo("CMD: %02x buflen: %lu\n", cmd, (unsigned long)buflen); cmdinfo.flags = QSPICMD_WRITEDATA; cmdinfo.addrlen = 0; @@ -613,7 +613,7 @@ static inline int s25fl1_readid(struct s25fl1_dev_s *priv) s25fl1_unlock(priv->qspi); - fvdbg("Manufacturer: %02x Device Type %02x, Capacity: %02x", + finfo("Manufacturer: %02x Device Type %02x, Capacity: %02x", priv->cmdbuf[0], priv->cmdbuf[1], priv->cmdbuf[2]); /* Check for a recognized memory device type */ @@ -830,7 +830,7 @@ static int s25fl1_erase_sector(struct s25fl1_dev_s *priv, off_t sector) off_t address; uint8_t status; - fvdbg("sector: %08lx\n", (unsigned long)sector); + finfo("sector: %08lx\n", (unsigned long)sector); /* Check that the flash is ready and unprotected */ @@ -906,7 +906,7 @@ static int s25fl1_read_byte(FAR struct s25fl1_dev_s *priv, FAR uint8_t *buffer, { struct qspi_meminfo_s meminfo; - fvdbg("address: %08lx nbytes: %d\n", (long)address, (int)buflen); + finfo("address: %08lx nbytes: %d\n", (long)address, (int)buflen); #ifdef CONFIG_S25FL1_SCRAMBLE meminfo.flags = QSPIMEM_READ | QSPIMEM_QUADIO | QSPIMEM_SCRAMBLE; @@ -939,7 +939,7 @@ static int s25fl1_write_page(struct s25fl1_dev_s *priv, FAR const uint8_t *buffe int ret; int i; - fvdbg("address: %08lx buflen: %u\n", (unsigned long)address, (unsigned)buflen); + finfo("address: %08lx buflen: %u\n", (unsigned long)address, (unsigned)buflen); npages = (buflen >> priv->pageshift); pagesize = (1 << priv->pageshift); @@ -1055,7 +1055,7 @@ static FAR uint8_t *s25fl1_read_cache(struct s25fl1_dev_s *priv, off_t sector) shift = priv->sectorshift - S25FL1_SECTOR512_SHIFT; esectno = sector >> shift; - fvdbg("sector: %ld esectno: %d shift=%d\n", sector, esectno, shift); + finfo("sector: %ld esectno: %d shift=%d\n", sector, esectno, shift); /* Check if the requested erase block is already in the cache */ @@ -1123,7 +1123,7 @@ static void s25fl1_erase_cache(struct s25fl1_dev_s *priv, off_t sector) if (!IS_ERASED(priv)) { off_t esectno = sector >> (priv->sectorshift - S25FL1_SECTOR512_SHIFT); - fvdbg("sector: %ld esectno: %d\n", sector, esectno); + finfo("sector: %ld esectno: %d\n", sector, esectno); DEBUGVERIFY(s25fl1_erase_sector(priv, esectno)); SET_ERASED(priv); @@ -1167,7 +1167,7 @@ static int s25fl1_write_cache(FAR struct s25fl1_dev_s *priv, if (!IS_ERASED(priv)) { off_t esectno = sector >> (priv->sectorshift - S25FL1_SECTOR512_SHIFT); - fvdbg("sector: %ld esectno: %d\n", sector, esectno); + finfo("sector: %ld esectno: %d\n", sector, esectno); ret = s25fl1_erase_sector(priv, esectno); if (ret < 0) @@ -1208,7 +1208,7 @@ static int s25fl1_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblo int ret; #endif - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* Lock access to the SPI bus until we complete the erase */ @@ -1252,7 +1252,7 @@ static ssize_t s25fl1_bread(FAR struct mtd_dev_s *dev, off_t startblock, #endif ssize_t nbytes; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* On this device, we can handle the block read just like the byte-oriented read */ @@ -1285,7 +1285,7 @@ static ssize_t s25fl1_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, FAR struct s25fl1_dev_s *priv = (FAR struct s25fl1_dev_s *)dev; int ret = (int)nblocks; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* Lock the QuadSPI bus and write all of the pages to FLASH */ @@ -1322,7 +1322,7 @@ static ssize_t s25fl1_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyte FAR struct s25fl1_dev_s *priv = (FAR struct s25fl1_dev_s *)dev; int ret; - fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); + finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); /* Lock the QuadSPI bus and select this FLASH part */ @@ -1336,7 +1336,7 @@ static ssize_t s25fl1_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyte return (ssize_t)ret; } - fvdbg("return nbytes: %d\n", (int)nbytes); + finfo("return nbytes: %d\n", (int)nbytes); return (ssize_t)nbytes; } @@ -1349,7 +1349,7 @@ static int s25fl1_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) FAR struct s25fl1_dev_s *priv = (FAR struct s25fl1_dev_s *)dev; int ret = -EINVAL; /* Assume good command with bad parameters */ - fvdbg("cmd: %d \n", cmd); + finfo("cmd: %d \n", cmd); switch (cmd) { @@ -1380,7 +1380,7 @@ static int s25fl1_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) #endif ret = OK; - fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n", + finfo("blocksize: %d erasesize: %d neraseblocks: %d\n", geo->blocksize, geo->erasesize, geo->neraseblocks); } } @@ -1421,7 +1421,7 @@ static int s25fl1_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) break; } - fvdbg("return %d\n", ret); + finfo("return %d\n", ret); return ret; } @@ -1447,7 +1447,7 @@ FAR struct mtd_dev_s *s25fl1_initialize(FAR struct qspi_dev_s *qspi, bool unprot FAR struct s25fl1_dev_s *priv; int ret; - fvdbg("qspi: %p\n", qspi); + finfo("qspi: %p\n", qspi); DEBUGASSERT(qspi != NULL); /* Allocate a state structure (we allocate the structure instead of using @@ -1547,7 +1547,7 @@ FAR struct mtd_dev_s *s25fl1_initialize(FAR struct qspi_dev_s *qspi, bool unprot /* Return the implementation-specific state structure as the MTD device */ - fvdbg("Return %p\n", priv); + finfo("Return %p\n", priv); return (FAR struct mtd_dev_s *)priv; errout_with_readbuf: diff --git a/drivers/mtd/sector512.c b/drivers/mtd/sector512.c index 3705efb769..11f317c256 100644 --- a/drivers/mtd/sector512.c +++ b/drivers/mtd/sector512.c @@ -155,7 +155,7 @@ static FAR uint8_t *s512_cacheread(struct s512_dev_s *priv, off_t sector512) /* Get the erase block containing this sector */ eblockno = sector512 / priv->stdperblock; - fvdbg("sector512: %lu eblockno: %lu\n", + finfo("sector512: %lu eblockno: %lu\n", (unsigned long)sector512, (unsigned long)eblockno); /* Check if the requested erase block is already in the cache */ @@ -251,7 +251,7 @@ static int s512_erase(FAR struct mtd_dev_s *dev, off_t sector512, size_t nsector size_t eblockno; int ret; - fvdbg("sector512: %08lx nsectors: %lu\n", + finfo("sector512: %08lx nsectors: %lu\n", (unsigned long)sector512, (unsigned int)nsectors); while (sectorsleft-- > 0) @@ -276,7 +276,7 @@ static int s512_erase(FAR struct mtd_dev_s *dev, off_t sector512, size_t nsector if (!IS_ERASED(priv)) { eblockno = sector512 / priv->stdperblock; - fvdbg("sector512: %lu eblockno: %lu\n", + finfo("sector512: %lu eblockno: %lu\n", (unsigned long)sector512, (unsigned long)eblockno); ret = priv->dev->erase(priv->dev, eblockno, 1); @@ -320,7 +320,7 @@ static ssize_t s512_bread(FAR struct mtd_dev_s *dev, off_t sector512, ssize_t remaining; ssize_t result = nsectors; - fvdbg("sector512: %08lx nsectors: %d\n", (long)sector512, (int)nsectors); + finfo("sector512: %08lx nsectors: %d\n", (long)sector512, (int)nsectors); /* Read each 512 byte sector from the block via the erase block cache */ @@ -369,7 +369,7 @@ static ssize_t s512_bwrite(FAR struct mtd_dev_s *dev, off_t sector512, size_t ns ssize_t result; off_t eblockno; - fvdbg("sector512: %08lx nsectors: %d\n", (long)sector512, (int)nsectors); + finfo("sector512: %08lx nsectors: %d\n", (long)sector512, (int)nsectors); FAR uint8_t *dest; @@ -399,7 +399,7 @@ static ssize_t s512_bwrite(FAR struct mtd_dev_s *dev, off_t sector512, size_t ns if (!IS_ERASED(priv)) { eblockno = sector512 / priv->stdperblock; - fvdbg("sector512: %lu eblockno: %lu\n", + finfo("sector512: %lu eblockno: %lu\n", (unsigned long)sector512, (unsigned long)eblockno); result = priv->dev->erase(priv->dev, eblockno, 1); @@ -445,7 +445,7 @@ static ssize_t s512_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes, off_t sectoffset; off_t sector; - fvdbg("offset: %08lx nbytes: %lu\n", + finfo("offset: %08lx nbytes: %lu\n", (unsigned long)offset, (unsigned long)nbytes); /* Convert the offset into 512 byte sector address and a byte offset */ @@ -488,7 +488,7 @@ static ssize_t s512_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes, buffer += xfrsize; } - fvdbg("return nbytes: %d\n", (int)nbytes); + finfo("return nbytes: %d\n", (int)nbytes); return nbytes; } @@ -501,7 +501,7 @@ static int s512_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) FAR struct s512_dev_s *priv = (FAR struct s512_dev_s *)dev; int ret = -EINVAL; /* Assume good command with bad parameters */ - fvdbg("cmd: %d \n", cmd); + finfo("cmd: %d \n", cmd); switch (cmd) { @@ -524,7 +524,7 @@ static int s512_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) geo->neraseblocks = priv->neblocks * priv->stdperblock; ret = OK; - fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n", + finfo("blocksize: %d erasesize: %d neraseblocks: %d\n", geo->blocksize, geo->erasesize, geo->neraseblocks); } } @@ -550,7 +550,7 @@ static int s512_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) break; } - fvdbg("return %d\n", ret); + finfo("return %d\n", ret); return ret; } @@ -578,7 +578,7 @@ FAR struct mtd_dev_s *s512_initialize(FAR struct mtd_dev_s *mtd) FAR struct mtd_geometry_s geo; int ret; - fvdbg("mtd: %p\n", mtd); + finfo("mtd: %p\n", mtd); /* Get the device geometry */ @@ -643,6 +643,6 @@ FAR struct mtd_dev_s *s512_initialize(FAR struct mtd_dev_s *mtd) /* Return the implementation-specific state structure as the MTD device */ - fvdbg("Return %p\n", priv); + finfo("Return %p\n", priv); return &priv->mtd; } diff --git a/drivers/mtd/smart.c b/drivers/mtd/smart.c index 50804cc3ab..7e54bf71fa 100644 --- a/drivers/mtd/smart.c +++ b/drivers/mtd/smart.c @@ -441,7 +441,7 @@ static const struct file_operations g_fops = static int smart_open(FAR struct inode *inode) { - fvdbg("Entry\n"); + finfo("Entry\n"); return OK; } @@ -454,7 +454,7 @@ static int smart_open(FAR struct inode *inode) static int smart_close(FAR struct inode *inode) { - fvdbg("Entry\n"); + finfo("Entry\n"); return OK; } @@ -767,7 +767,7 @@ static ssize_t smart_reload(struct smart_struct_s *dev, FAR uint8_t *buffer, /* Read the full erase block into the buffer */ - fvdbg("Read %d blocks starting at block %d\n", mtdBlocks, mtdStartBlock); + finfo("Read %d blocks starting at block %d\n", mtdBlocks, mtdStartBlock); nread = MTD_BREAD(dev->mtd, mtdStartBlock, mtdBlocks, buffer); if (nread != mtdBlocks) { @@ -790,7 +790,7 @@ static ssize_t smart_read(FAR struct inode *inode, unsigned char *buffer, { FAR struct smart_struct_s *dev; - fvdbg("SMART: sector: %d nsectors: %d\n", start_sector, nsectors); + finfo("SMART: sector: %d nsectors: %d\n", start_sector, nsectors); DEBUGASSERT(inode && inode->i_private); #ifdef CONFIG_SMARTFS_MULTI_ROOT_DIRS @@ -826,7 +826,7 @@ static ssize_t smart_write(FAR struct inode *inode, int ret; off_t mtdstartblock, mtdblockcount; - fvdbg("sector: %d nsectors: %d\n", start_sector, nsectors); + finfo("sector: %d nsectors: %d\n", start_sector, nsectors); DEBUGASSERT(inode && inode->i_private); #ifdef CONFIG_SMARTFS_MULTI_ROOT_DIRS @@ -851,7 +851,7 @@ static ssize_t smart_write(FAR struct inode *inode, mtdblockcount = nsectors * dev->mtdBlksPerSector; mtdBlksPerErase = dev->mtdBlksPerSector * dev->sectorsPerBlk; - fvdbg("mtdsector: %d mtdnsectors: %d\n", mtdstartblock, mtdblockcount); + finfo("mtdsector: %d mtdnsectors: %d\n", mtdstartblock, mtdblockcount); /* Start at first block to be written */ @@ -933,7 +933,7 @@ static int smart_geometry(FAR struct inode *inode, struct geometry *geometry) FAR struct smart_struct_s *dev; uint32_t erasesize; - fvdbg("Entry\n"); + finfo("Entry\n"); DEBUGASSERT(inode); if (geometry) @@ -956,9 +956,9 @@ static int smart_geometry(FAR struct inode *inode, struct geometry *geometry) dev->sectorsize; geometry->geo_sectorsize = dev->sectorsize; - fvdbg("available: true mediachanged: false writeenabled: %s\n", + finfo("available: true mediachanged: false writeenabled: %s\n", geometry->geo_writeenabled ? "true" : "false"); - fvdbg("nsectors: %d sectorsize: %d\n", + finfo("nsectors: %d sectorsize: %d\n", geometry->geo_nsectors, geometry->geo_sectorsize); return OK; @@ -1767,7 +1767,7 @@ static int smart_set_wear_level(FAR struct smart_struct_s *dev, uint16_t block, smart_find_wear_minmax(dev); if (oldlevel != dev->minwearlevel) - fvdbg("##### New min wear level = %d\n", dev->minwearlevel); + finfo("##### New min wear level = %d\n", dev->minwearlevel); } } @@ -1807,7 +1807,7 @@ static int smart_scan(FAR struct smart_struct_s *dev) FAR struct smart_multiroot_device_s *rootdirdev; #endif - fvdbg("Entry\n"); + finfo("Entry\n"); /* Find the sector size on the volume by reading headers from * sectors of decreasing size. On a formatted volume, the sector @@ -1909,7 +1909,7 @@ static int smart_scan(FAR struct smart_struct_s *dev) for (sector = 0; sector < totalsectors; sector++) { - fvdbg("Scan sector %d\n", sector); + finfo("Scan sector %d\n", sector); /* Calculate the read address for this sector */ @@ -2373,7 +2373,7 @@ static inline int smart_getformat(FAR struct smart_struct_s *dev, { int ret; - fvdbg("Entry\n"); + finfo("Entry\n"); DEBUGASSERT(fmt); /* Test if we know the format status or not. If we don't know the @@ -2630,7 +2630,7 @@ static int smart_relocate_static_data(FAR struct smart_struct_s *dev, uint16_t b nextsector = dev->freecount[x]; newsector = dev->releasecount[x]; #endif - fvdbg("Moving block %d, wear %d, free %d, released %d to block %d, wear %d\n", + finfo("Moving block %d, wear %d, free %d, released %d to block %d, wear %d\n", x, smart_get_wear_level(dev, x), nextsector, newsector, block, smart_get_wear_level(dev, block)); @@ -2842,7 +2842,7 @@ static inline int smart_llformat(FAR struct smart_struct_s *dev, unsigned long a uint8_t sectsize, prerelease; uint16_t sectorsize; - fvdbg("Entry\n"); + finfo("Entry\n"); /* Get the sector size from the provided arg */ @@ -3747,11 +3747,11 @@ static int smart_garbagecollect(FAR struct smart_struct_s *dev) #endif #ifdef CONFIG_MTD_SMART_PACK_COUNTS - fvdbg("Collecting block %d, free=%d released=%d, totalfree=%d, totalrelease=%d\n", + finfo("Collecting block %d, free=%d released=%d, totalfree=%d, totalrelease=%d\n", collectblock, smart_get_count(dev, dev->freecount, collectblock), smart_get_count(dev, dev->releasecount, collectblock), dev->freesectors, dev->releasesectors); #else - fvdbg("Collecting block %d, free=%d released=%d\n", + finfo("Collecting block %d, free=%d released=%d\n", collectblock, dev->freecount[collectblock], dev->releasecount[collectblock]); #endif @@ -4088,7 +4088,7 @@ static int smart_write_alloc_sector(FAR struct smart_struct_s *dev, /* Write the header to the physical sector location */ #ifndef CONFIG_MTD_SMART_ENABLE_CRC - fvdbg("Write MTD block %d\n", physical * dev->mtdBlksPerSector); + finfo("Write MTD block %d\n", physical * dev->mtdBlksPerSector); ret = MTD_BWRITE(dev->mtd, physical * dev->mtdBlksPerSector, 1, (FAR uint8_t *) dev->rwbuffer); if (ret != 1) @@ -4191,7 +4191,7 @@ static int smart_writesector(FAR struct smart_struct_s *dev, FAR struct smart_allocsector_s *allocsector; #endif - fvdbg("Entry\n"); + finfo("Entry\n"); req = (FAR struct smart_read_write_s *) arg; DEBUGASSERT(req->offset <= dev->sectorsize); DEBUGASSERT(req->offset+req->count <= dev->sectorsize); @@ -4216,7 +4216,7 @@ static int smart_writesector(FAR struct smart_struct_s *dev, /* Subtract dev->minwearlevel from all wear levels */ offset = dev->minwearlevel; - fvdbg("Reducing wear level bits by %d\n", offset); + finfo("Reducing wear level bits by %d\n", offset); for (x = 0; x < dev->geo.neraseblocks; x++) { smart_set_wear_level(dev, x, smart_get_wear_level(dev, x) - offset); @@ -4462,7 +4462,7 @@ static int smart_writesector(FAR struct smart_struct_s *dev, ret = smart_bytewrite(dev, offset, 1, &byte); if (ret != 1) { - fvdbg("Error committing physical sector %d\n", physsector); + finfo("Error committing physical sector %d\n", physsector); ret = -EIO; goto errout; } @@ -4592,7 +4592,7 @@ static int smart_readsector(FAR struct smart_struct_s *dev, struct smart_sect_header_s header; #endif - fvdbg("Entry\n"); + finfo("Entry\n"); req = (FAR struct smart_read_write_s *) arg; DEBUGASSERT(req->offset < dev->sectorsize); DEBUGASSERT(req->offset+req->count+ sizeof(struct smart_sect_header_s) <= @@ -4677,7 +4677,7 @@ static int smart_readsector(FAR struct smart_struct_s *dev, sizeof(struct smart_sect_header_s), (FAR uint8_t *) &header); if (ret != sizeof(struct smart_sect_header_s)) { - fvdbg("Error reading sector %d header\n", physsector); + finfo("Error reading sector %d header\n", physsector); ret = -EIO; goto errout; } @@ -4891,7 +4891,7 @@ static inline int smart_allocsector(FAR struct smart_struct_s *dev, /* Find a free physical sector */ physicalsector = smart_findfreephyssector(dev, FALSE); - fvdbg("Alloc: log=%d, phys=%d, erase block=%d, free=%d, released=%d\n", + finfo("Alloc: log=%d, phys=%d, erase block=%d, free=%d, released=%d\n", logsector, physicalsector, physicalsector / dev->sectorsPerBlk, dev->freesectors, dev->releasecount); @@ -5083,7 +5083,7 @@ static int smart_ioctl(FAR struct inode *inode, int cmd, unsigned long arg) FAR struct mtd_smart_debug_data_s *debug_data; #endif - fvdbg("Entry\n"); + finfo("Entry\n"); DEBUGASSERT(inode && inode->i_private); #ifdef CONFIG_SMARTFS_MULTI_ROOT_DIRS diff --git a/drivers/mtd/sst25.c b/drivers/mtd/sst25.c index 61a79a63b5..24105a01b7 100644 --- a/drivers/mtd/sst25.c +++ b/drivers/mtd/sst25.c @@ -309,7 +309,7 @@ static inline int sst25_readid(struct sst25_dev_s *priv) uint16_t memory; uint16_t capacity; - fvdbg("priv: %p\n", priv); + finfo("priv: %p\n", priv); /* Lock the SPI bus, configure the bus, and select this FLASH part. */ @@ -328,7 +328,7 @@ static inline int sst25_readid(struct sst25_dev_s *priv) SPI_SELECT(priv->dev, SPIDEV_FLASH, false); sst25_unlock(priv->dev); - fvdbg("manufacturer: %02x memory: %02x capacity: %02x\n", + finfo("manufacturer: %02x memory: %02x capacity: %02x\n", manufacturer, memory, capacity); /* Check for a valid manufacturer and memory type */ @@ -486,7 +486,7 @@ static void sst25_sectorerase(struct sst25_dev_s *priv, off_t sector) { off_t address = sector << priv->sectorshift; - fvdbg("sector: %08lx\n", (long)sector); + finfo("sector: %08lx\n", (long)sector); /* Wait for any preceding write or erase operation to complete. */ @@ -523,7 +523,7 @@ static void sst25_sectorerase(struct sst25_dev_s *priv, off_t sector) static inline int sst25_chiperase(struct sst25_dev_s *priv) { - fvdbg("priv: %p\n", priv); + finfo("priv: %p\n", priv); /* Wait for any preceding write or erase operation to complete. */ @@ -537,7 +537,7 @@ static inline int sst25_chiperase(struct sst25_dev_s *priv) sst25_cmd(priv, SST25_CE); - fvdbg("Return: OK\n"); + finfo("Return: OK\n"); return OK; } @@ -550,7 +550,7 @@ static void sst25_byteread(FAR struct sst25_dev_s *priv, FAR uint8_t *buffer, { uint8_t status; - fvdbg("address: %08lx nbytes: %d\n", (long)address, (int)nbytes); + finfo("address: %08lx nbytes: %d\n", (long)address, (int)nbytes); /* Wait for any preceding write or erase operation to complete. */ @@ -601,7 +601,7 @@ static void sst25_bytewrite(struct sst25_dev_s *priv, FAR const uint8_t *buffer, { uint8_t status; - fvdbg("address: %08lx nwords: %d\n", (long)address, (int)nbytes); + finfo("address: %08lx nwords: %d\n", (long)address, (int)nbytes); DEBUGASSERT(priv && buffer); /* Write each byte individually */ @@ -663,7 +663,7 @@ static void sst25_wordwrite(struct sst25_dev_s *priv, FAR const uint8_t *buffer, size_t nwords = (nbytes + 1) >> 1; uint8_t status; - fvdbg("address: %08lx nwords: %d\n", (long)address, (int)nwords); + finfo("address: %08lx nwords: %d\n", (long)address, (int)nwords); DEBUGASSERT(priv && buffer); /* Loop until all of the bytes have been written */ @@ -834,7 +834,7 @@ static FAR uint8_t *sst25_cacheread(struct sst25_dev_s *priv, off_t sector) shift = priv->sectorshift - SST25_SECTOR_SHIFT; esectno = sector >> shift; - fvdbg("sector: %ld esectno: %d shift=%d\n", sector, esectno, shift); + finfo("sector: %ld esectno: %d shift=%d\n", sector, esectno, shift); /* Check if the requested erase block is already in the cache */ @@ -890,7 +890,7 @@ static void sst25_cacheerase(struct sst25_dev_s *priv, off_t sector) if (!IS_ERASED(priv)) { off_t esectno = sector >> (priv->sectorshift - SST25_SECTOR_SHIFT); - fvdbg("sector: %ld esectno: %d\n", sector, esectno); + finfo("sector: %ld esectno: %d\n", sector, esectno); sst25_sectorerase(priv, esectno); SET_ERASED(priv); @@ -932,7 +932,7 @@ static void sst25_cachewrite(FAR struct sst25_dev_s *priv, FAR const uint8_t *bu if (!IS_ERASED(priv)) { off_t esectno = sector >> (priv->sectorshift - SST25_SECTOR_SHIFT); - fvdbg("sector: %ld esectno: %d\n", sector, esectno); + finfo("sector: %ld esectno: %d\n", sector, esectno); sst25_sectorerase(priv, esectno); SET_ERASED(priv); @@ -967,7 +967,7 @@ static int sst25_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nbloc FAR struct sst25_dev_s *priv = (FAR struct sst25_dev_s *)dev; size_t blocksleft = nblocks; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* Lock access to the SPI bus until we complete the erase */ @@ -1006,7 +1006,7 @@ static ssize_t sst25_bread(FAR struct mtd_dev_s *dev, off_t startblock, size_t n #ifdef CONFIG_SST25_SECTOR512 ssize_t nbytes; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* On this device, we can handle the block read just like the byte-oriented read */ @@ -1021,7 +1021,7 @@ static ssize_t sst25_bread(FAR struct mtd_dev_s *dev, off_t startblock, size_t n FAR struct sst25_dev_s *priv = (FAR struct sst25_dev_s *)dev; ssize_t nbytes; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* On this device, we can handle the block read just like the byte-oriented read */ @@ -1047,7 +1047,7 @@ static ssize_t sst25_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_t #else FAR struct sst25_dev_s *priv = (FAR struct sst25_dev_s *)dev; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* Lock the SPI bus and write all of the pages to FLASH */ @@ -1077,7 +1077,7 @@ static ssize_t sst25_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes { FAR struct sst25_dev_s *priv = (FAR struct sst25_dev_s *)dev; - fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); + finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); /* Lock the SPI bus and select this FLASH part */ @@ -1085,7 +1085,7 @@ static ssize_t sst25_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes sst25_byteread(priv, buffer, offset, nbytes); sst25_unlock(priv->dev); - fvdbg("return nbytes: %d\n", (int)nbytes); + finfo("return nbytes: %d\n", (int)nbytes); return nbytes; } @@ -1098,7 +1098,7 @@ static int sst25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) FAR struct sst25_dev_s *priv = (FAR struct sst25_dev_s *)dev; int ret = -EINVAL; /* Assume good command with bad parameters */ - fvdbg("cmd: %d \n", cmd); + finfo("cmd: %d \n", cmd); switch (cmd) { @@ -1127,7 +1127,7 @@ static int sst25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) #endif ret = OK; - fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n", + finfo("blocksize: %d erasesize: %d neraseblocks: %d\n", geo->blocksize, geo->erasesize, geo->neraseblocks); } } @@ -1149,7 +1149,7 @@ static int sst25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) break; } - fvdbg("return %d\n", ret); + finfo("return %d\n", ret); return ret; } @@ -1172,7 +1172,7 @@ FAR struct mtd_dev_s *sst25_initialize(FAR struct spi_dev_s *dev) FAR struct sst25_dev_s *priv; int ret; - fvdbg("dev: %p\n", dev); + finfo("dev: %p\n", dev); /* Allocate a state structure (we allocate the structure instead of using * a fixed, static allocation so that we can handle multiple FLASH devices. @@ -1242,6 +1242,6 @@ FAR struct mtd_dev_s *sst25_initialize(FAR struct spi_dev_s *dev) /* Return the implementation-specific state structure as the MTD device */ - fvdbg("Return %p\n", priv); + finfo("Return %p\n", priv); return (FAR struct mtd_dev_s *)priv; } diff --git a/drivers/mtd/sst25xx.c b/drivers/mtd/sst25xx.c index ebbcfd33f2..ee6f6a55fa 100644 --- a/drivers/mtd/sst25xx.c +++ b/drivers/mtd/sst25xx.c @@ -259,7 +259,7 @@ static inline int sst25xx_readid(struct sst25xx_dev_s *priv) uint16_t memory; uint16_t capacity; - fvdbg("priv: %p\n", priv); + finfo("priv: %p\n", priv); /* Lock the SPI bus, configure the bus, and select this FLASH part. */ @@ -279,7 +279,7 @@ static inline int sst25xx_readid(struct sst25xx_dev_s *priv) SPI_SELECT(priv->dev, SPIDEV_FLASH, false); sst25xx_unlock(priv->dev); - fvdbg("manufacturer: %02x memory: %02x capacity: %02x\n", + finfo("manufacturer: %02x memory: %02x capacity: %02x\n", manufacturer, memory, capacity); /* Check for a valid manufacturer and memory type */ @@ -356,7 +356,7 @@ static void sst25xx_waitwritecomplete(struct sst25xx_dev_s *priv) priv->lastwaswrite = false; - fvdbg("Complete\n"); + finfo("Complete\n"); } /************************************************************************************ @@ -376,7 +376,7 @@ static void sst25xx_writeenable(struct sst25xx_dev_s *priv) /* Deselect the FLASH */ SPI_SELECT(priv->dev, SPIDEV_FLASH, false); - fvdbg("Enabled\n"); + finfo("Enabled\n"); } /************************************************************************************ @@ -416,7 +416,7 @@ static void sst25xx_sectorerase(struct sst25xx_dev_s *priv, off_t sector, uint8_ offset = sector << priv->sectorshift; - fvdbg("sector: %08lx\n", (long)sector); + finfo("sector: %08lx\n", (long)sector); /* Wait for any preceding write to complete. We could simplify things by * perform this wait at the end of each write operation (rather than at @@ -453,7 +453,7 @@ static void sst25xx_sectorerase(struct sst25xx_dev_s *priv, off_t sector, uint8_ /* Deselect the FLASH */ SPI_SELECT(priv->dev, SPIDEV_FLASH, false); - fvdbg("Erased\n"); + finfo("Erased\n"); } /************************************************************************************ @@ -462,7 +462,7 @@ static void sst25xx_sectorerase(struct sst25xx_dev_s *priv, off_t sector, uint8_ static inline int sst25xx_bulkerase(struct sst25xx_dev_s *priv) { - fvdbg("priv: %p\n", priv); + finfo("priv: %p\n", priv); /* Wait for any preceding write to complete. We could simplify things by * perform this wait at the end of each write operation (rather than at @@ -489,7 +489,7 @@ static inline int sst25xx_bulkerase(struct sst25xx_dev_s *priv) SPI_SELECT(priv->dev, SPIDEV_FLASH, false); sst25xx_waitwritecomplete(priv); - fvdbg("Return: OK\n"); + finfo("Return: OK\n"); return OK; } @@ -502,7 +502,7 @@ static inline void sst25xx_pagewrite(struct sst25xx_dev_s *priv, FAR const uint8 { off_t offset = page << priv->pageshift; - fvdbg("page: %08lx offset: %08lx\n", (long)page, (long)offset); + finfo("page: %08lx offset: %08lx\n", (long)page, (long)offset); /* Wait for any preceding write to complete. We could simplify things by * perform this wait at the end of each write operation (rather than at @@ -538,7 +538,7 @@ static inline void sst25xx_pagewrite(struct sst25xx_dev_s *priv, FAR const uint8 /* Deselect the FLASH: Chip Select high */ SPI_SELECT(priv->dev, SPIDEV_FLASH, false); - fvdbg("Written\n"); + finfo("Written\n"); } /************************************************************************************ @@ -549,7 +549,7 @@ static inline void sst25xx_pagewrite(struct sst25xx_dev_s *priv, FAR const uint8 static inline void sst25xx_bytewrite(struct sst25xx_dev_s *priv, FAR const uint8_t *buffer, off_t offset, uint16_t count) { - fvdbg("offset: %08lx count:%d\n", (long)offset, count); + finfo("offset: %08lx count:%d\n", (long)offset, count); /* Wait for any preceding write to complete. We could simplify things by * perform this wait at the end of each write operation (rather than at @@ -585,7 +585,7 @@ static inline void sst25xx_bytewrite(struct sst25xx_dev_s *priv, FAR const uint8 /* Deselect the FLASH: Chip Select high */ SPI_SELECT(priv->dev, SPIDEV_FLASH, false); - fvdbg("Written\n"); + finfo("Written\n"); } #endif @@ -598,7 +598,7 @@ static int sst25xx_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nbl FAR struct sst25xx_dev_s *priv = (FAR struct sst25xx_dev_s *)dev; size_t blocksleft = nblocks; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* Lock access to the SPI bus until we complete the erase */ @@ -675,7 +675,7 @@ static ssize_t sst25xx_bread(FAR struct mtd_dev_s *dev, off_t startblock, size_t FAR struct sst25xx_dev_s *priv = (FAR struct sst25xx_dev_s *)dev; ssize_t nbytes; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* On this device, we can handle the block read just like the byte-oriented read */ @@ -699,7 +699,7 @@ static ssize_t sst25xx_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_ size_t blocksleft = nblocks; size_t pagesize = 1 << priv->pageshift; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* Lock the SPI bus and write each page to FLASH */ @@ -724,7 +724,7 @@ static ssize_t sst25xx_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyt { FAR struct sst25xx_dev_s *priv = (FAR struct sst25xx_dev_s *)dev; - fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); + finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); /* Wait for any preceding write to complete. We could simplify things by * perform this wait at the end of each write operation (rather than at @@ -760,7 +760,7 @@ static ssize_t sst25xx_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyt SPI_SELECT(priv->dev, SPIDEV_FLASH, false); sst25xx_unlock(priv->dev); - fvdbg("return nbytes: %d\n", (int)nbytes); + finfo("return nbytes: %d\n", (int)nbytes); return nbytes; } @@ -780,7 +780,7 @@ static ssize_t sst25xx_write(FAR struct mtd_dev_s *dev, off_t offset, size_t nby int pagesize; int bytestowrite; - fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); + finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); /* We must test if the offset + count crosses one or more pages * and perform individual writes. The devices can only write in @@ -847,7 +847,7 @@ static int sst25xx_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) FAR struct sst25xx_dev_s *priv = (FAR struct sst25xx_dev_s *)dev; int ret = -EINVAL; /* Assume good command with bad parameters */ - fvdbg("cmd: %d \n", cmd); + finfo("cmd: %d \n", cmd); switch (cmd) { @@ -871,7 +871,7 @@ static int sst25xx_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) ret = OK; - fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n", + finfo("blocksize: %d erasesize: %d neraseblocks: %d\n", geo->blocksize, geo->erasesize, geo->neraseblocks); } } @@ -893,7 +893,7 @@ static int sst25xx_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) break; } - fvdbg("return %d\n", ret); + finfo("return %d\n", ret); return ret; } @@ -916,7 +916,7 @@ FAR struct mtd_dev_s *sst25xx_initialize(FAR struct spi_dev_s *dev) FAR struct sst25xx_dev_s *priv; int ret; - fvdbg("dev: %p\n", dev); + finfo("dev: %p\n", dev); /* Allocate a state structure (we allocate the structure instead of using * a fixed, static allocation so that we can handle multiple FLASH devices. @@ -974,6 +974,6 @@ FAR struct mtd_dev_s *sst25xx_initialize(FAR struct spi_dev_s *dev) /* Return the implementation-specific state structure as the MTD device */ - fvdbg("Return %p\n", priv); + finfo("Return %p\n", priv); return (FAR struct mtd_dev_s *)priv; } diff --git a/drivers/mtd/sst26.c b/drivers/mtd/sst26.c index 94226064cc..16d867c0ab 100644 --- a/drivers/mtd/sst26.c +++ b/drivers/mtd/sst26.c @@ -210,13 +210,13 @@ #ifdef CONFIG_SST26_DEBUG # define sstdbg(format, ...) dbg(format, ##__VA_ARGS__) # define sstlldbg(format, ...) lldbg(format, ##__VA_ARGS__) -# define sstvdbg(format, ...) vdbg(format, ##__VA_ARGS__) -# define sstllvdbg(format, ...) llvdbg(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 sstvdbg(x...) -# define sstllvdbg(x...) +# define sstinfo(x...) +# define sstllinfo(x...) #endif /************************************************************************************ @@ -321,7 +321,7 @@ static inline int sst26_readid(struct sst26_dev_s *priv) uint16_t memory; uint16_t capacity; - sstvdbg("priv: %p\n", priv); + sstinfo("priv: %p\n", priv); /* Lock the SPI bus, configure the bus, and select this FLASH part. */ @@ -416,7 +416,7 @@ static void sst26_waitwritecomplete(struct sst26_dev_s *priv) } while ((status & SST26_SR_WIP) != 0); - sstvdbg("Complete\n"); + sstinfo("Complete\n"); } /************************************************************************************ @@ -439,7 +439,7 @@ static void sst26_globalunlock(struct sst26_dev_s *priv) SPI_SELECT(priv->dev, SPIDEV_FLASH, false); - sstvdbg("Device unlocked.\n"); + sstinfo("Device unlocked.\n"); } /************************************************************************************ @@ -460,7 +460,7 @@ static void sst26_writeenable(struct sst26_dev_s *priv) SPI_SELECT(priv->dev, SPIDEV_FLASH, false); - sstvdbg("Enabled\n"); + sstinfo("Enabled\n"); } /************************************************************************************ @@ -473,7 +473,7 @@ static void sst26_sectorerase(struct sst26_dev_s *priv, off_t sector, uint8_t ty offset = sector << priv->sectorshift; - sstvdbg("sector: %08lx\n", (long)sector); + sstinfo("sector: %08lx\n", (long)sector); /* Send write enable instruction */ @@ -504,7 +504,7 @@ static void sst26_sectorerase(struct sst26_dev_s *priv, off_t sector, uint8_t ty sst26_waitwritecomplete(priv); - sstvdbg("Erased\n"); + sstinfo("Erased\n"); } /************************************************************************************ @@ -513,7 +513,7 @@ static void sst26_sectorerase(struct sst26_dev_s *priv, off_t sector, uint8_t ty static inline int sst26_chiperase(struct sst26_dev_s *priv) { - sstvdbg("priv: %p\n", priv); + sstinfo("priv: %p\n", priv); /* Send write enable instruction */ @@ -533,7 +533,7 @@ static inline int sst26_chiperase(struct sst26_dev_s *priv) sst26_waitwritecomplete(priv); - sstvdbg("Return: OK\n"); + sstinfo("Return: OK\n"); return OK; } @@ -546,7 +546,7 @@ static inline void sst26_pagewrite(struct sst26_dev_s *priv, { off_t offset = page << priv->pageshift; - sstvdbg("page: %08lx offset: %08lx\n", (long)page, (long)offset); + sstinfo("page: %08lx offset: %08lx\n", (long)page, (long)offset); /* Enable the write access to the FLASH */ @@ -576,7 +576,7 @@ static inline void sst26_pagewrite(struct sst26_dev_s *priv, sst26_waitwritecomplete(priv); - sstvdbg("Written\n"); + sstinfo("Written\n"); } /************************************************************************************ @@ -588,7 +588,7 @@ static inline void sst26_bytewrite(struct sst26_dev_s *priv, FAR const uint8_t *buffer, off_t offset, uint16_t count) { - sstvdbg("offset: %08lx count:%d\n", (long)offset, count); + sstinfo("offset: %08lx count:%d\n", (long)offset, count); /* Enable the write access to the FLASH */ @@ -619,7 +619,7 @@ static inline void sst26_bytewrite(struct sst26_dev_s *priv, sst26_waitwritecomplete(priv); - sstvdbg("Written\n"); + sstinfo("Written\n"); } #endif @@ -634,7 +634,7 @@ static int sst26_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nbloc FAR struct sst26_dev_s *priv = (FAR struct sst26_dev_s *)dev; size_t blocksleft = nblocks; - sstvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + sstinfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* Lock access to the SPI bus until we complete the erase */ @@ -664,7 +664,7 @@ static ssize_t sst26_bread(FAR struct mtd_dev_s *dev, off_t startblock, FAR struct sst26_dev_s *priv = (FAR struct sst26_dev_s *)dev; ssize_t nbytes; - sstvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + sstinfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* On this device, we can handle the block read just like the byte-oriented read */ @@ -689,7 +689,7 @@ static ssize_t sst26_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_t size_t blocksleft = nblocks; size_t pagesize = 1 << priv->pageshift; - sstvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + sstinfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* Lock the SPI bus and write each page to FLASH */ @@ -714,7 +714,7 @@ static ssize_t sst26_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes { FAR struct sst26_dev_s *priv = (FAR struct sst26_dev_s *)dev; - sstvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); + sstinfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); /* Lock the SPI bus and select this FLASH part */ @@ -743,7 +743,7 @@ static ssize_t sst26_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes SPI_SELECT(priv->dev, SPIDEV_FLASH, false); sst26_unlock(priv->dev); - sstvdbg("return nbytes: %d\n", (int)nbytes); + sstinfo("return nbytes: %d\n", (int)nbytes); return nbytes; } @@ -763,7 +763,7 @@ static ssize_t sst26_write(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyte int pagesize; int bytestowrite; - sstvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); + sstinfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); /* We must test if the offset + count crosses one or more pages * and perform individual writes. The devices can only write in @@ -830,7 +830,7 @@ static int sst26_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) FAR struct sst26_dev_s *priv = (FAR struct sst26_dev_s *)dev; int ret = -EINVAL; /* Assume good command with bad parameters */ - sstvdbg("cmd: %d \n", cmd); + sstinfo("cmd: %d \n", cmd); switch (cmd) { @@ -854,7 +854,7 @@ static int sst26_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) ret = OK; - sstvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n", + sstinfo("blocksize: %d erasesize: %d neraseblocks: %d\n", geo->blocksize, geo->erasesize, geo->neraseblocks); } } @@ -876,7 +876,7 @@ static int sst26_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) break; } - sstvdbg("return %d\n", ret); + sstinfo("return %d\n", ret); return ret; } @@ -899,7 +899,7 @@ FAR struct mtd_dev_s *sst26_initialize_spi(FAR struct spi_dev_s *dev) FAR struct sst26_dev_s *priv; int ret; - sstvdbg("dev: %p\n", dev); + sstinfo("dev: %p\n", dev); /* Allocate a state structure (we allocate the structure instead of using * a fixed, static allocation so that we can handle multiple FLASH devices. @@ -956,6 +956,6 @@ FAR struct mtd_dev_s *sst26_initialize_spi(FAR struct spi_dev_s *dev) /* Return the implementation-specific state structure as the MTD device */ - sstvdbg("Return %p\n", priv); + sstinfo("Return %p\n", priv); return (FAR struct mtd_dev_s *)priv; } diff --git a/drivers/mtd/sst39vf.c b/drivers/mtd/sst39vf.c index 5386427587..53a12f0a02 100644 --- a/drivers/mtd/sst39vf.c +++ b/drivers/mtd/sst39vf.c @@ -814,8 +814,8 @@ FAR struct mtd_dev_s *sst39vf_initialize(void) /* Now see if we can suport the part */ - fvdbg("Manufacturer: %02x\n", manufacturer); - fvdbg("Chip ID: %04x\n", chipid); + finfo("Manufacturer: %02x\n", manufacturer); + finfo("Chip ID: %04x\n", chipid); if (manufacturer != SST_MANUFACTURER_ID) { diff --git a/drivers/mtd/w25.c b/drivers/mtd/w25.c index 09a7c015d2..0f3696ffd8 100644 --- a/drivers/mtd/w25.c +++ b/drivers/mtd/w25.c @@ -333,7 +333,7 @@ static inline int w25_readid(struct w25_dev_s *priv) uint16_t memory; uint16_t capacity; - fvdbg("priv: %p\n", priv); + finfo("priv: %p\n", priv); /* Lock the SPI bus, configure the bus, and select this FLASH part. */ @@ -352,7 +352,7 @@ static inline int w25_readid(struct w25_dev_s *priv) SPI_SELECT(priv->spi, SPIDEV_FLASH, false); w25_unlock(priv->spi); - fvdbg("manufacturer: %02x memory: %02x capacity: %02x\n", + finfo("manufacturer: %02x memory: %02x capacity: %02x\n", manufacturer, memory, capacity); /* Check for a valid manufacturer and memory type */ @@ -557,7 +557,7 @@ static void w25_sectorerase(struct w25_dev_s *priv, off_t sector) { off_t address = sector << W25_SECTOR_SHIFT; - fvdbg("sector: %08lx\n", (long)sector); + finfo("sector: %08lx\n", (long)sector); /* Wait for any preceding write or erase operation to complete. */ @@ -594,7 +594,7 @@ static void w25_sectorerase(struct w25_dev_s *priv, off_t sector) static inline int w25_chiperase(struct w25_dev_s *priv) { - fvdbg("priv: %p\n", priv); + finfo("priv: %p\n", priv); /* Wait for any preceding write or erase operation to complete. */ @@ -615,7 +615,7 @@ static inline int w25_chiperase(struct w25_dev_s *priv) /* Deselect the FLASH */ SPI_SELECT(priv->spi, SPIDEV_FLASH, false); - fvdbg("Return: OK\n"); + finfo("Return: OK\n"); return OK; } @@ -628,7 +628,7 @@ static void w25_byteread(FAR struct w25_dev_s *priv, FAR uint8_t *buffer, { uint8_t status; - fvdbg("address: %08lx nbytes: %d\n", (long)address, (int)nbytes); + finfo("address: %08lx nbytes: %d\n", (long)address, (int)nbytes); /* Wait for any preceding write or erase operation to complete. */ @@ -682,7 +682,7 @@ static void w25_pagewrite(struct w25_dev_s *priv, FAR const uint8_t *buffer, { uint8_t status; - fvdbg("address: %08lx nwords: %d\n", (long)address, (int)nbytes); + finfo("address: %08lx nwords: %d\n", (long)address, (int)nbytes); DEBUGASSERT(priv && buffer && (address & 0xff) == 0 && (nbytes & 0xff) == 0); @@ -739,7 +739,7 @@ static void w25_pagewrite(struct w25_dev_s *priv, FAR const uint8_t *buffer, static inline void w25_bytewrite(struct w25_dev_s *priv, FAR const uint8_t *buffer, off_t offset, uint16_t count) { - fvdbg("offset: %08lx count:%d\n", (long)offset, count); + finfo("offset: %08lx count:%d\n", (long)offset, count); /* Wait for any preceding write to complete. We could simplify things by * perform this wait at the end of each write operation (rather than at @@ -774,7 +774,7 @@ static inline void w25_bytewrite(struct w25_dev_s *priv, FAR const uint8_t *buff /* Deselect the FLASH: Chip Select high */ SPI_SELECT(priv->spi, SPIDEV_FLASH, false); - fvdbg("Written\n"); + finfo("Written\n"); } #endif /* defined(CONFIG_MTD_BYTE_WRITE) && !defined(CONFIG_W25_READONLY) */ @@ -823,7 +823,7 @@ static FAR uint8_t *w25_cacheread(struct w25_dev_s *priv, off_t sector) shift = W25_SECTOR_SHIFT - W25_SECTOR512_SHIFT; esectno = sector >> shift; - fvdbg("sector: %ld esectno: %d shift=%d\n", sector, esectno, shift); + finfo("sector: %ld esectno: %d shift=%d\n", sector, esectno, shift); /* Check if the requested erase block is already in the cache */ @@ -879,7 +879,7 @@ static void w25_cacheerase(struct w25_dev_s *priv, off_t sector) if (!IS_ERASED(priv)) { off_t esectno = sector >> (W25_SECTOR_SHIFT - W25_SECTOR512_SHIFT); - fvdbg("sector: %ld esectno: %d\n", sector, esectno); + finfo("sector: %ld esectno: %d\n", sector, esectno); w25_sectorerase(priv, esectno); SET_ERASED(priv); @@ -921,7 +921,7 @@ static void w25_cachewrite(FAR struct w25_dev_s *priv, FAR const uint8_t *buffer if (!IS_ERASED(priv)) { off_t esectno = sector >> (W25_SECTOR_SHIFT - W25_SECTOR512_SHIFT); - fvdbg("sector: %ld esectno: %d\n", sector, esectno); + finfo("sector: %ld esectno: %d\n", sector, esectno); w25_sectorerase(priv, esectno); SET_ERASED(priv); @@ -956,7 +956,7 @@ static int w25_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblocks FAR struct w25_dev_s *priv = (FAR struct w25_dev_s *)dev; size_t blocksleft = nblocks; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* Lock access to the SPI bus until we complete the erase */ @@ -994,7 +994,7 @@ static ssize_t w25_bread(FAR struct mtd_dev_s *dev, off_t startblock, size_t nbl { ssize_t nbytes; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* On this device, we can handle the block read just like the byte-oriented read */ @@ -1027,7 +1027,7 @@ static ssize_t w25_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_t nb #else FAR struct w25_dev_s *priv = (FAR struct w25_dev_s *)dev; - fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); + finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); /* Lock the SPI bus and write all of the pages to FLASH */ @@ -1054,7 +1054,7 @@ static ssize_t w25_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes, { FAR struct w25_dev_s *priv = (FAR struct w25_dev_s *)dev; - fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); + finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); /* Lock the SPI bus and select this FLASH part */ @@ -1062,7 +1062,7 @@ static ssize_t w25_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes, w25_byteread(priv, buffer, offset, nbytes); w25_unlock(priv->spi); - fvdbg("return nbytes: %d\n", (int)nbytes); + finfo("return nbytes: %d\n", (int)nbytes); return nbytes; } @@ -1081,7 +1081,7 @@ static ssize_t w25_write(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes, int index; int bytestowrite; - fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); + finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); /* We must test if the offset + count crosses one or more pages * and perform individual writes. The devices can only write in @@ -1145,7 +1145,7 @@ static int w25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) FAR struct w25_dev_s *priv = (FAR struct w25_dev_s *)dev; int ret = -EINVAL; /* Assume good command with bad parameters */ - fvdbg("cmd: %d \n", cmd); + finfo("cmd: %d \n", cmd); switch (cmd) { @@ -1174,7 +1174,7 @@ static int w25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) #endif ret = OK; - fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n", + finfo("blocksize: %d erasesize: %d neraseblocks: %d\n", geo->blocksize, geo->erasesize, geo->neraseblocks); } } @@ -1196,7 +1196,7 @@ static int w25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) break; } - fvdbg("return %d\n", ret); + finfo("return %d\n", ret); return ret; } @@ -1219,7 +1219,7 @@ FAR struct mtd_dev_s *w25_initialize(FAR struct spi_dev_s *spi) FAR struct w25_dev_s *priv; int ret; - fvdbg("spi: %p\n", spi); + finfo("spi: %p\n", spi); /* Allocate a state structure (we allocate the structure instead of using * a fixed, static allocation so that we can handle multiple FLASH devices. @@ -1292,6 +1292,6 @@ FAR struct mtd_dev_s *w25_initialize(FAR struct spi_dev_s *spi) /* Return the implementation-specific state structure as the MTD device */ - fvdbg("Return %p\n", priv); + finfo("Return %p\n", priv); return (FAR struct mtd_dev_s *)priv; } diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index be6a890d1b..c10782fbe6 100644 --- a/drivers/net/cs89x0.c +++ b/drivers/net/cs89x0.c @@ -467,7 +467,7 @@ static void cs89x0_receive(FAR struct cs89x0_driver_s *cs89x0, uint16_t isq) #ifdef CONFIG_NET_IPv4 if (BUF->type == HTONS(ETHTYPE_IP)) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); NETDEV_RXIPV4(&priv->cs_dev); /* Handle ARP on input then give the IPv4 packet to the network @@ -508,7 +508,7 @@ static void cs89x0_receive(FAR struct cs89x0_driver_s *cs89x0, uint16_t isq) #ifdef CONFIG_NET_IPv6 if (BUF->type == HTONS(ETHTYPE_IP6)) { - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); NETDEV_RXIPV6(&priv->cs_dev); /* Give the IPv6 packet to the network layer */ @@ -561,7 +561,7 @@ static void cs89x0_receive(FAR struct cs89x0_driver_s *cs89x0, uint16_t isq) else #endif { - nllvdbg("Unrecognized packet type %02x\n", BUF->type); + nllinfo("Unrecognized packet type %02x\n", BUF->type); NETDEV_RXDROPPED(&priv->cs_dev); } } @@ -690,7 +690,7 @@ static int cs89x0_interrupt(int irq, FAR void *context) while ((isq = cs89x0_getreg(dev, CS89x0_ISQ_OFFSET)) != 0) { - nvdbg("ISQ: %04x\n", isq); + ninfo("ISQ: %04x\n", isq); switch (isq & ISQ_EVENTMASK) { case ISQ_RXEVENT: diff --git a/drivers/net/dm90x0.c b/drivers/net/dm90x0.c index c1807b5303..798bb3e38f 100644 --- a/drivers/net/dm90x0.c +++ b/drivers/net/dm90x0.c @@ -433,7 +433,7 @@ static void putreg(int reg, uint8_t value) static void read8(FAR uint8_t *ptr, int len) { - nvdbg("Read %d bytes (8-bit mode)\n", len); + ninfo("Read %d bytes (8-bit mode)\n", len); for (; len > 0; len--) { *ptr++ = DM9X_DATA; @@ -444,7 +444,7 @@ static void read16(FAR uint8_t *ptr, int len) { FAR uint16_t *ptr16 = (FAR uint16_t *)ptr; - nvdbg("Read %d bytes (16-bit mode)\n", len); + ninfo("Read %d bytes (16-bit mode)\n", len); for (; len > 0; len -= sizeof(uint16_t)) { *ptr16++ = DM9X_DATA; @@ -455,7 +455,7 @@ static void read32(FAR uint8_t *ptr, int len) { FAR uint32_t *ptr32 = (FAR uint32_t *)ptr; - nvdbg("Read %d bytes (32-bit mode)\n", len); + ninfo("Read %d bytes (32-bit mode)\n", len); for (; len > 0; len -= sizeof(uint32_t)) { *ptr32++ = DM9X_DATA; @@ -481,7 +481,7 @@ static void read32(FAR uint8_t *ptr, int len) static void discard8(int len) { - nvdbg("Discard %d bytes (8-bit mode)\n", len); + ninfo("Discard %d bytes (8-bit mode)\n", len); for (; len > 0; len--) { DM9X_DATA; @@ -490,7 +490,7 @@ static void discard8(int len) static void discard16(int len) { - nvdbg("Discard %d bytes (16-bit mode)\n", len); + ninfo("Discard %d bytes (16-bit mode)\n", len); for (; len > 0; len -= sizeof(uint16_t)) { DM9X_DATA; @@ -499,7 +499,7 @@ static void discard16(int len) static void discard32(int len) { - nvdbg("Discard %d bytes (32-bit mode)\n", len); + ninfo("Discard %d bytes (32-bit mode)\n", len); for (; len > 0; len -= sizeof(uint32_t)) { DM9X_DATA; @@ -525,7 +525,7 @@ static void discard32(int len) static void write8(FAR const uint8_t *ptr, int len) { - nvdbg("Write %d bytes (8-bit mode)\n", len); + ninfo("Write %d bytes (8-bit mode)\n", len); for (; len > 0; len--) { @@ -537,7 +537,7 @@ static void write16(const uint8_t *ptr, int len) { FAR uint16_t *ptr16 = (FAR uint16_t *)ptr; - nvdbg("Write %d bytes (16-bit mode)\n", len); + ninfo("Write %d bytes (16-bit mode)\n", len); for (; len > 0; len -= sizeof(uint16_t)) { @@ -549,7 +549,7 @@ static void write32(FAR const uint8_t *ptr, int len) { FAR uint32_t *ptr32 = (FAR uint32_t *)ptr; - nvdbg("Write %d bytes (32-bit mode)\n", len); + ninfo("Write %d bytes (32-bit mode)\n", len); for (; len > 0; len -= sizeof(uint32_t)) { @@ -831,7 +831,7 @@ static void dm9x_receive(FAR struct dm9x_driver_s *dm9x) bool bchecksumready; uint8_t rxbyte; - nvdbg("Packet received\n"); + ninfo("Packet received\n"); do { @@ -902,7 +902,7 @@ static void dm9x_receive(FAR struct dm9x_driver_s *dm9x) #ifdef CONFIG_NET_IPv4 if (BUF->type == HTONS(ETHTYPE_IP)) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); NETDEV_RXIPV4(&priv->dm_dev); /* Handle ARP on input then give the IPv4 packet to the network @@ -943,7 +943,7 @@ static void dm9x_receive(FAR struct dm9x_driver_s *dm9x) #ifdef CONFIG_NET_IPv6 if (BUF->type == HTONS(ETHTYPE_IP6)) { - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); NETDEV_RXIPV6(&priv->dm_dev); /* Give the IPv6 packet to the network layer */ @@ -1004,7 +1004,7 @@ static void dm9x_receive(FAR struct dm9x_driver_s *dm9x) dm9x->ncrxpackets++; } while ((rxbyte & 0x01) == DM9X_PKTRDY && dm9x->ncrxpackets < DM9X_CRXTHRES); - nvdbg("All RX packets processed\n"); + ninfo("All RX packets processed\n"); } /**************************************************************************** @@ -1027,7 +1027,7 @@ static void dm9x_txdone(struct dm9x_driver_s *dm9x) { int nsr; - nvdbg("TX done\n"); + ninfo("TX done\n"); /* Another packet has completed transmission. Decrement the count of * of pending TX transmissions. @@ -1110,7 +1110,7 @@ static int dm9x_interrupt(int irq, FAR void *context) isr = getreg(DM9X_ISR); putreg(DM9X_ISR, isr); - nvdbg("Interrupt status: %02x\n", isr); + ninfo("Interrupt status: %02x\n", isr); /* Check for link status change */ diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index e7f3e2385c..6f605554eb 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -602,7 +602,7 @@ static void e1000_receive(struct e1000_dev *e1000) #ifdef CONFIG_NET_IPv4 if (BUF->type == HTONS(ETHTYPE_IP)) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); /* Handle ARP on input then give the IPv4 packet to the network * layer @@ -642,7 +642,7 @@ static void e1000_receive(struct e1000_dev *e1000) #ifdef CONFIG_NET_IPv6 if (BUF->type == HTONS(ETHTYPE_IP6)) { - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); /* Give the IPv6 packet to the network layer */ diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c index df1fe7db47..225cf13d7a 100644 --- a/drivers/net/enc28j60.c +++ b/drivers/net/enc28j60.c @@ -1092,7 +1092,7 @@ static int enc_transmit(FAR struct enc_driver_s *priv) /* Increment statistics */ - nllvdbg("Sending packet, pktlen: %d\n", priv->dev.d_len); + nllinfo("Sending packet, pktlen: %d\n", priv->dev.d_len); NETDEV_TXPACKETS(&priv->dev); /* Verify that the hardware is ready to send another packet. The driver @@ -1180,7 +1180,7 @@ static int enc_txpoll(struct net_driver_s *dev) * the field d_len is set to a value > 0. */ - nllvdbg("Poll result: d_len=%d\n", priv->dev.d_len); + nllinfo("Poll result: d_len=%d\n", priv->dev.d_len); if (priv->dev.d_len > 0) { /* Look up the destination MAC address and add it to the Ethernet @@ -1388,7 +1388,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv) #ifdef CONFIG_NET_IPv4 if (BUF->type == HTONS(ETHTYPE_IP)) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); NETDEV_RXIPV4(&priv->dev); /* Handle ARP on input then give the IPv4 packet to the network @@ -1429,7 +1429,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv) #ifdef CONFIG_NET_IPv6 if (BUF->type == HTONS(ETHTYPE_IP6)) { - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); NETDEV_RXIPV6(&priv->dev); /* Give the IPv6 packet to the network layer */ @@ -1467,7 +1467,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv) #ifdef CONFIG_NET_ARP if (BUF->type == htons(ETHTYPE_ARP)) { - nllvdbg("ARP packet received (%02x)\n", BUF->type); + nllinfo("ARP packet received (%02x)\n", BUF->type); NETDEV_RXARP(&priv->dev); arp_arpin(&priv->dev); @@ -1543,7 +1543,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv) pktlen = (uint16_t)rsv[3] << 8 | (uint16_t)rsv[2]; rxstat = (uint16_t)rsv[5] << 8 | (uint16_t)rsv[4]; - nllvdbg("Receiving packet, nextpkt: %04x pktlen: %d rxstat: %04x\n", + nllinfo("Receiving packet, nextpkt: %04x pktlen: %d rxstat: %04x\n", priv->nextpkt, pktlen, rxstat); /* Check if the packet was received OK */ @@ -1647,7 +1647,7 @@ static void enc_irqworker(FAR void *arg) * settings. */ - nllvdbg("EIR: %02x\n", eir); + nllinfo("EIR: %02x\n", eir); /* DMAIF: The DMA interrupt indicates that the DMA module has completed * its memory copy or checksum calculation. Additionally, this interrupt @@ -1767,7 +1767,7 @@ static void enc_irqworker(FAR void *arg) uint8_t pktcnt = enc_rdbreg(priv, ENC_EPKTCNT); if (pktcnt > 0) { - nllvdbg("EPKTCNT: %02x\n", pktcnt); + nllinfo("EPKTCNT: %02x\n", pktcnt); /* Handle packet receipt */ @@ -2336,7 +2336,7 @@ static int enc_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac) static void enc_pwrsave(FAR struct enc_driver_s *priv) { - nllvdbg("Set PWRSV\n"); + nllinfo("Set PWRSV\n"); /* 1. Turn off packet reception by clearing ECON1.RXEN. */ @@ -2396,7 +2396,7 @@ static void enc_pwrsave(FAR struct enc_driver_s *priv) static void enc_pwrfull(FAR struct enc_driver_s *priv) { - nllvdbg("Clear PWRSV\n"); + nllinfo("Clear PWRSV\n"); /* 1. Wake-up by clearing ECON2.PWRSV. */ @@ -2528,7 +2528,7 @@ static int enc_reset(FAR struct enc_driver_s *priv) return -ENODEV; } - nllvdbg("Rev ID: %02x\n", regval); + nllinfo("Rev ID: %02x\n", regval); /* Set filter mode: unicast OR broadcast AND crc valid */ diff --git a/drivers/net/encx24j600.c b/drivers/net/encx24j600.c index c341c5486f..b0fa6b430a 100644 --- a/drivers/net/encx24j600.c +++ b/drivers/net/encx24j600.c @@ -1165,7 +1165,7 @@ static int enc_txpoll(struct net_driver_s *dev) * the field d_len is set to a value > 0. */ - nllvdbg("Poll result: d_len=%d\n", priv->dev.d_len); + nllinfo("Poll result: d_len=%d\n", priv->dev.d_len); if (priv->dev.d_len > 0) { @@ -1331,7 +1331,7 @@ static void enc_rxldpkt(FAR struct enc_driver_s *priv, { DEBUGASSERT(priv != NULL && descr != NULL); - nllvdbg("load packet @%04x len: %d\n", descr->addr, descr->len); + nllinfo("load packet @%04x len: %d\n", descr->addr, descr->len); /* Set the rx data pointer to the start of the received packet (ERXRDPT) */ @@ -1403,7 +1403,7 @@ static void enc_rxrmpkt(FAR struct enc_driver_s *priv, FAR struct enc_descr_s *d { uint16_t addr; - nllvdbg("free descr: %p\n", descr); + nllinfo("free descr: %p\n", descr); /* If it is the last descriptor in the queue, advance ERXTAIL. * This way it is possible that gaps occcur. Maybe pending packets @@ -1420,7 +1420,7 @@ static void enc_rxrmpkt(FAR struct enc_driver_s *priv, FAR struct enc_descr_s *d DEBUGASSERT(addr >= PKTMEM_RX_START && addr < PKTMEM_RX_END); - nllvdbg("ERXTAIL %04x\n", addr); + nllinfo("ERXTAIL %04x\n", addr); enc_wrreg(priv, ENC_ERXTAIL, addr); @@ -1490,7 +1490,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv) #ifdef CONFIG_NET_IPv4 if (BUF->type == HTONS(ETHTYPE_IP)) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); NETDEV_RXIPV4(&priv->dev); /* Handle ARP on input then give the IPv4 packet to the network @@ -1540,7 +1540,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv) #ifdef CONFIG_NET_IPv6 if (BUF->type == HTONS(ETHTYPE_IP6)) { - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); NETDEV_RXIPV6(&priv->dev); /* Give the IPv6 packet to the network layer */ @@ -1587,7 +1587,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv) #ifdef CONFIG_NET_ARP if (BUF->type == htons(ETHTYPE_ARP)) { - nllvdbg("ARP packet received (%02x)\n", BUF->type); + nllinfo("ARP packet received (%02x)\n", BUF->type); NETDEV_RXARP(&priv->dev); arp_arpin(&priv->dev); @@ -1684,7 +1684,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv) rxstat = (uint32_t)rsv[7] << 24 | (uint32_t)rsv[6] << 16 | (uint32_t)rsv[5] << 8 | (uint32_t)rsv[4]; - nllvdbg("Receiving packet, nextpkt: %04x pktlen: %d rxstat: %08x pktcnt: %d\n", + nllinfo("Receiving packet, nextpkt: %04x pktlen: %d rxstat: %08x pktcnt: %d\n", priv->nextpkt, pktlen, rxstat, pktcnt); /* We enqueue the packet first and remove it later if its faulty. @@ -1859,7 +1859,7 @@ static void enc_irqworker(FAR void *arg) * settings. */ - nllvdbg("EIR: %04x\n", eir); + nllinfo("EIR: %04x\n", eir); if ((eir & EIR_DMAIF) != 0) /* DMA interrupt */ { @@ -2420,7 +2420,7 @@ static int enc_rxavail(struct net_driver_s *dev) if (!sq_empty(&priv->rxqueue)) { - nllvdbg("RX queue not empty, trying to dispatch\n"); + nllinfo("RX queue not empty, trying to dispatch\n"); enc_rxdispatch(priv); } @@ -2546,7 +2546,7 @@ static void enc_pwrsave(FAR struct enc_driver_s *priv) { uint16_t regval; - nllvdbg("Set PWRSV\n"); + nllinfo("Set PWRSV\n"); /* 1. Turn off AES */ @@ -2597,7 +2597,7 @@ static void enc_ldmacaddr(FAR struct enc_driver_s *priv) uint16_t regval; uint8_t *mac = priv->dev.d_mac.ether_addr_octet; - nvdbg("Using ENCX24J600's built in MAC address\n"); + ninfo("Using ENCX24J600's built in MAC address\n"); regval = enc_rdreg(priv, ENC_MAADR1); mac[0] = regval & 0xff; @@ -2648,7 +2648,7 @@ static void enc_setmacaddr(FAR struct enc_driver_s *priv) { /* There is a user defined mac address. Write it to the ENCXJ600 */ - nvdbg("Using an user defined MAC address\n"); + ninfo("Using an user defined MAC address\n"); enc_wrreg(priv, ENC_MAADR1, (uint16_t)mac[1] << 8 | (uint16_t)mac[0]); enc_wrreg(priv, ENC_MAADR2, (uint16_t)mac[3] << 8 | (uint16_t)mac[2]); @@ -2728,7 +2728,7 @@ static int enc_reset(FAR struct enc_driver_s *priv) int ret; uint16_t regval; - nllvdbg("Reset\n"); + nllinfo("Reset\n"); do { @@ -2793,7 +2793,7 @@ static int enc_reset(FAR struct enc_driver_s *priv) } while ((regval & PHSTAT1_ANDONE) != 0); - nllvdbg("Auto-negotation completed\n"); + nllinfo("Auto-negotation completed\n"); #endif diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index 9cbdba7022..f6ad670b2c 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -285,7 +285,7 @@ static int ftmac100_transmit(FAR struct ftmac100_driver_s *priv) int len = priv->ft_dev.d_len; //irqstate_t flags; //flags = enter_critical_section(); -//nvdbg("flags=%08x\n", flags); +//ninfo("flags=%08x\n", flags); txdes = ftmac100_current_txdes(priv); @@ -307,7 +307,7 @@ static int ftmac100_transmit(FAR struct ftmac100_driver_s *priv) FTMAC100_TXDES1_TXBUF_SIZE(len)); txdes->txdes0 |= FTMAC100_TXDES0_TXDMA_OWN; - nvdbg("ftmac100_transmit[%x]: copy %08x to %08x %04x\n", + ninfo("ftmac100_transmit[%x]: copy %08x to %08x %04x\n", priv->tx_pointer, priv->ft_dev.d_buf, txdes->txdes2, len); priv->tx_pointer = (priv->tx_pointer + 1) & (CONFIG_FTMAC100_TX_DESC - 1); @@ -422,7 +422,7 @@ static void ftmac100_reset(FAR struct ftmac100_driver_s *priv) { FAR struct ftmac100_register_s *iobase = (FAR struct ftmac100_register_s *)priv->iobase; - nvdbg("%s(): iobase=%p\n", __func__, iobase); + ninfo("%s(): iobase=%p\n", __func__, iobase); putreg32 (FTMAC100_MACCR_SW_RST, &iobase->maccr); @@ -472,7 +472,7 @@ static void ftmac100_init(FAR struct ftmac100_driver_s *priv) kmem = memalign(RX_BUF_SIZE, CONFIG_FTMAC100_RX_DESC * RX_BUF_SIZE); - nvdbg("KMEM=%08x\n", kmem); + ninfo("KMEM=%08x\n", kmem); for (i = 0; i < CONFIG_FTMAC100_RX_DESC; i++) { @@ -502,7 +502,7 @@ static void ftmac100_init(FAR struct ftmac100_driver_s *priv) /* transmit ring */ - nvdbg("priv=%08x txdes=%08x rxdes=%08x\n", priv, txdes, rxdes); + ninfo("priv=%08x txdes=%08x rxdes=%08x\n", priv, txdes, rxdes); putreg32 ((unsigned int)txdes, &iobase->txr_badr); @@ -568,7 +568,7 @@ static uint32_t ftmac100_mdio_read(FAR struct ftmac100_register_s *iobase, int r for (i = 0; i < 10; i++) { phycr = getreg32(&iobase->phycr); - nvdbg("%02x %d phycr=%08x\n", reg, i, phycr); + ninfo("%02x %d phycr=%08x\n", reg, i, phycr); if ((phycr & FTMAC100_PHYCR_MIIRD) == 0) { @@ -603,7 +603,7 @@ static void ftmac100_set_mac(FAR struct ftmac100_driver_s *priv, unsigned int maddr = mac[0] << 8 | mac[1]; unsigned int laddr = mac[2] << 24 | mac[3] << 16 | mac[4] << 8 | mac[5]; - nvdbg("%s(%x %x)\n", __func__, maddr, laddr); + ninfo("%s(%x %x)\n", __func__, maddr, laddr); putreg32(maddr, &iobase->mac_madr); putreg32(laddr, &iobase->mac_ladr); @@ -656,7 +656,7 @@ static void ftmac100_receive(FAR struct ftmac100_driver_s *priv) if (!found) { - nvdbg("\nNOT FOUND\nCurrent RX %d rxdes0=%08x\n", + ninfo("\nNOT FOUND\nCurrent RX %d rxdes0=%08x\n", priv->rx_pointer, rxdes->rxdes0); return; } @@ -664,7 +664,7 @@ static void ftmac100_receive(FAR struct ftmac100_driver_s *priv) len = FTMAC100_RXDES0_RFL(rxdes->rxdes0); data = (uint8_t *)rxdes->rxdes2; - nvdbg ("RX buffer %d (%08x), %x received (%d)\n", + ninfo ("RX buffer %d (%08x), %x received (%d)\n", priv->rx_pointer, data, len, (rxdes->rxdes0 & FTMAC100_RXDES0_LRS)); /* Copy the data data from the hardware to priv->ft_dev.d_buf. Set @@ -685,7 +685,7 @@ static void ftmac100_receive(FAR struct ftmac100_driver_s *priv) #ifdef CONFIG_NET_IPv4 if (BUF->type == HTONS(ETHTYPE_IP)) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); /* Handle ARP on input then give the IPv4 packet to the network * layer @@ -725,7 +725,7 @@ static void ftmac100_receive(FAR struct ftmac100_driver_s *priv) #ifdef CONFIG_NET_IPv6 if (BUF->type == HTONS(ETHTYPE_IP6)) { - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); /* Give the IPv6 packet to the network layer */ @@ -835,7 +835,7 @@ static void ftmac100_txdone(FAR struct ftmac100_driver_s *priv) * disable further Tx interrupts. */ - nvdbg("txpending=%d\n", priv->tx_pending); + ninfo("txpending=%d\n", priv->tx_pending); /* Cancel the TX timeout */ @@ -884,7 +884,7 @@ static inline void ftmac100_interrupt_process(FAR struct ftmac100_driver_s *priv status = getreg32 (&iobase->isr); #endif - nvdbg("status=%08x(%08x) BASE=%p ISR=%p PHYCR=%p\n", + ninfo("status=%08x(%08x) BASE=%p ISR=%p PHYCR=%p\n", status, getreg32(&iobase->isr), iobase, &iobase->isr, &iobase->phycr); if (!status) @@ -913,7 +913,7 @@ static inline void ftmac100_interrupt_process(FAR struct ftmac100_driver_s *priv if (status & (FTMAC100_INT_XPKT_OK)) { - nvdbg("\n\nTXDONE\n\n"); + ninfo("\n\nTXDONE\n\n"); ftmac100_txdone(priv); } @@ -931,27 +931,27 @@ static inline void ftmac100_interrupt_process(FAR struct ftmac100_driver_s *priv priv->ft_bifup = false; } - nvdbg("Link: %s\n", priv->ft_bifup ? "UP" : "DOWN"); + ninfo("Link: %s\n", priv->ft_bifup ? "UP" : "DOWN"); ftmac100_mdio_read(iobase, 5); } #if 0 #define REG(x) (*(volatile uint32_t *)(x)) - nvdbg("\n=============================================================\n"); - nvdbg("TM CNTL=%08x INTRS=%08x MASK=%08x LOAD=%08x COUNT=%08x M1=%08x\n", + ninfo("\n=============================================================\n"); + ninfo("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)); - nvdbg("IRQ STATUS=%08x MASK=%08x MODE=%08x LEVEL=%08x\n", + ninfo("IRQ STATUS=%08x MASK=%08x MODE=%08x LEVEL=%08x\n", REG(0x98800014), REG(0x98800004), REG(0x9880000C), REG(0x98800010)); - nvdbg("FIQ STATUS=%08x MASK=%08x MODE=%08x LEVEL=%08x\n", REG(0x98800034), + ninfo("FIQ STATUS=%08x MASK=%08x MODE=%08x LEVEL=%08x\n", REG(0x98800034), REG(0x98800024), REG(0x9880002C), REG(0x98800020)); - nvdbg("=============================================================\n"); + ninfo("=============================================================\n"); #endif out: putreg32 (INT_MASK_ALL_ENABLED, &iobase->imr); - nvdbg("ISR-done\n"); + ninfo("ISR-done\n"); } /**************************************************************************** @@ -1034,7 +1034,7 @@ static int ftmac100_interrupt(int irq, FAR void *context) /* TODO: Determine if a TX transfer just completed */ - nvdbg("===> status=%08x\n", priv->status); + ninfo("===> status=%08x\n", priv->status); if (priv->status & (FTMAC100_INT_XPKT_OK)) { @@ -1043,7 +1043,7 @@ static int ftmac100_interrupt(int irq, FAR void *context) * expiration and the deferred interrupt processing. */ - nvdbg("\n\nTXDONE 0\n\n"); + ninfo("\n\nTXDONE 0\n\n"); wd_cancel(priv->ft_txtimeout); } @@ -1087,7 +1087,7 @@ static inline void ftmac100_txtimeout_process(FAR struct ftmac100_driver_s *priv { /* Then reset the hardware */ - nvdbg("TXTIMEOUT\n"); + ninfo("TXTIMEOUT\n"); /* Then poll the network for new XMIT data */ @@ -1658,7 +1658,7 @@ static void ftmac100_ipv6multicast(FAR struct ftmac100_driver_s *priv) mac[4] = tmp16 & 0xff; mac[5] = tmp16 >> 8; - nvdbg("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n", + ninfo("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); (void)ftmac100_addmac(dev, mac); diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index 5b275474d0..c963f9e7b8 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c @@ -187,7 +187,7 @@ static int lo_txpoll(FAR struct net_driver_s *dev) #ifdef CONFIG_NET_IPv4 if ((IPv4BUF->vhl & IP_VERSION_MASK) == IPv4_VERSION) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); NETDEV_RXIPV4(&priv->lo_dev); ipv4_input(&priv->lo_dev); } @@ -196,7 +196,7 @@ static int lo_txpoll(FAR struct net_driver_s *dev) #ifdef CONFIG_NET_IPv6 if ((IPv6BUF->vtc & IP_VERSION_MASK) == IPv6_VERSION) { - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); NETDEV_RXIPV6(&priv->lo_dev); ipv6_input(&priv->lo_dev); } diff --git a/drivers/net/phy_notify.c b/drivers/net/phy_notify.c index e59f58c364..73cf2af033 100644 --- a/drivers/net/phy_notify.c +++ b/drivers/net/phy_notify.c @@ -360,7 +360,7 @@ int phy_notify_subscribe(FAR const char *intf, pid_t pid, int signo, FAR struct phy_notify_s *client; DEBUGASSERT(intf); - nvdbg("%s: PID=%d signo=%d arg=%p\n", intf, pid, signo, arg); + ninfo("%s: PID=%d signo=%d arg=%p\n", intf, pid, signo, arg); /* The special value pid == 0 means to use the pid of the current task. */ @@ -439,7 +439,7 @@ int phy_notify_unsubscribe(FAR const char *intf, pid_t pid) { FAR struct phy_notify_s *client; - nvdbg("%s: PID=%d\n", intf, pid); + ninfo("%s: PID=%d\n", intf, pid); /* Find the client entry for this interface */ diff --git a/drivers/net/skeleton.c b/drivers/net/skeleton.c index 6194fbce34..4b49514da3 100644 --- a/drivers/net/skeleton.c +++ b/drivers/net/skeleton.c @@ -334,7 +334,7 @@ static void skel_receive(FAR struct skel_driver_s *priv) #ifdef CONFIG_NET_IPv4 if (BUF->type == HTONS(ETHTYPE_IP)) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); NETDEV_RXIPV4(&priv->sk_dev); /* Handle ARP on input then give the IPv4 packet to the network @@ -375,7 +375,7 @@ static void skel_receive(FAR struct skel_driver_s *priv) #ifdef CONFIG_NET_IPv6 if (BUF->type == HTONS(ETHTYPE_IP6)) { - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); NETDEV_RXIPV6(&priv->sk_dev); /* Give the IPv6 packet to the network layer */ @@ -1152,7 +1152,7 @@ static void skel_ipv6multicast(FAR struct skel_driver_s *priv) mac[4] = tmp16 & 0xff; mac[5] = tmp16 >> 8; - nvdbg("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n", + ninfo("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); (void)skel_addmac(dev, mac); diff --git a/drivers/net/slip.c b/drivers/net/slip.c index 3691580341..98cd0117e4 100644 --- a/drivers/net/slip.c +++ b/drivers/net/slip.c @@ -287,7 +287,7 @@ static int slip_transmit(FAR struct slip_driver_s *priv) /* Increment statistics */ - nvdbg("Sending packet size %d\n", priv->dev.d_len); + ninfo("Sending packet size %d\n", priv->dev.d_len); NETDEV_TXPACKETS(&priv->dev); /* Send an initial END character to flush out any data that may have @@ -555,7 +555,7 @@ static inline void slip_receive(FAR struct slip_driver_s *priv) * packet if we run out of room. */ - nvdbg("Receiving packet\n"); + ninfo("Receiving packet\n"); for (; ; ) { /* Get the next character in the stream. */ @@ -572,7 +572,7 @@ static inline void slip_receive(FAR struct slip_driver_s *priv) case SLIP_END: { - nvdbg("END\n"); + ninfo("END\n"); /* A minor optimization: if there is no data in the packet, * ignore it. This is meant to avoid bothering IP with all the @@ -582,7 +582,7 @@ static inline void slip_receive(FAR struct slip_driver_s *priv) if (priv->rxlen > 0) { - nvdbg("Received packet size %d\n", priv->rxlen); + ninfo("Received packet size %d\n", priv->rxlen); return; } } @@ -595,7 +595,7 @@ static inline void slip_receive(FAR struct slip_driver_s *priv) case SLIP_ESC: { - nvdbg("ESC\n"); + ninfo("ESC\n"); ch = slip_getc(priv); /* if "ch" is not one of these two, then we have a protocol @@ -606,12 +606,12 @@ static inline void slip_receive(FAR struct slip_driver_s *priv) switch (ch) { case SLIP_ESC_END: - nvdbg("ESC-END\n"); + ninfo("ESC-END\n"); ch = SLIP_END; break; case SLIP_ESC_ESC: - nvdbg("ESC-ESC\n"); + ninfo("ESC-ESC\n"); ch = SLIP_ESC; break; @@ -677,7 +677,7 @@ static int slip_rxtask(int argc, FAR char *argv[]) { /* Wait for the next character to be available on the input stream. */ - nvdbg("Waiting...\n"); + ninfo("Waiting...\n"); ch = slip_getc(priv); /* Ignore any input that we receive before the interface is up. */ diff --git a/drivers/net/telnet.c b/drivers/net/telnet.c index bdf6fcf82e..27c313038a 100644 --- a/drivers/net/telnet.c +++ b/drivers/net/telnet.c @@ -234,7 +234,7 @@ static inline void telnet_dumpbuffer(FAR const char *msg, * defined or the following does nothing. */ - nvdbgdumpbuffer(msg, (FAR const uint8_t*)buffer, nbytes); + ninfodumpbuffer(msg, (FAR const uint8_t*)buffer, nbytes); } #endif @@ -277,12 +277,12 @@ static ssize_t telnet_receive(FAR struct telnet_dev_s *priv, FAR const char *src int nread; uint8_t ch; - nllvdbg("srclen: %d destlen: %d\n", srclen, destlen); + nllinfo("srclen: %d destlen: %d\n", srclen, destlen); for (nread = 0; srclen > 0 && nread < destlen; srclen--) { ch = *src++; - nllvdbg("ch=%02x state=%d\n", ch, priv->td_state); + nllinfo("ch=%02x state=%d\n", ch, priv->td_state); switch (priv->td_state) { @@ -462,7 +462,7 @@ static int telnet_open(FAR struct file *filep) int tmp; int ret; - nllvdbg("td_crefs: %d\n", priv->td_crefs); + nllinfo("td_crefs: %d\n", priv->td_crefs); /* O_NONBLOCK is not supported */ @@ -518,7 +518,7 @@ static int telnet_close(FAR struct file *filep) FAR char *devpath; int ret; - nllvdbg("td_crefs: %d\n", priv->td_crefs); + nllinfo("td_crefs: %d\n", priv->td_crefs); /* Get exclusive access to the device structures */ @@ -608,7 +608,7 @@ static ssize_t telnet_read(FAR struct file *filep, FAR char *buffer, size_t len) FAR struct telnet_dev_s *priv = inode->i_private; ssize_t ret; - nllvdbg("len: %d\n", len); + nllinfo("len: %d\n", len); /* First, handle the case where there are still valid bytes left in the * I/O buffer from the last time that read was called. NOTE: Much of @@ -681,7 +681,7 @@ static ssize_t telnet_write(FAR struct file *filep, FAR const char *buffer, size char ch; bool eol; - nllvdbg("len: %d\n", len); + nllinfo("len: %d\n", len); /* Process each character from the user buffer */ diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 9435f4a617..96de54844c 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -425,7 +425,7 @@ static void tun_receive(FAR struct tun_device_s *priv) /* We only accept IP packets of the configured type and ARP packets */ #if defined(CONFIG_NET_IPv4) - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); NETDEV_RXIPV4(&priv->dev); /* Give the IPv4 packet to the network layer */ @@ -448,7 +448,7 @@ static void tun_receive(FAR struct tun_device_s *priv) } #elif defined(CONFIG_NET_IPv6) - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); NETDEV_RXIPV6(&priv->dev); /* Give the IPv6 packet to the network layer */ diff --git a/drivers/net/vnet.c b/drivers/net/vnet.c index eec509ec87..a21fa91d12 100644 --- a/drivers/net/vnet.c +++ b/drivers/net/vnet.c @@ -332,7 +332,7 @@ void rtos_vnet_recv(struct rgmp_vnet *rgmp_vnet, char *data, int len) #ifdef CONFIG_NET_IPv4 if (BUF->type == HTONS(ETHTYPE_IP)) { - nllvdbg("IPv4 frame\n"); + nllinfo("IPv4 frame\n"); /* Handle ARP on input then give the IPv4 packet to the network * layer @@ -372,7 +372,7 @@ void rtos_vnet_recv(struct rgmp_vnet *rgmp_vnet, char *data, int len) #ifdef CONFIG_NET_IPv6 if (BUF->type == HTONS(ETHTYPE_IP6)) { - nllvdbg("Iv6 frame\n"); + nllinfo("Iv6 frame\n"); /* Give the IPv6 packet to the network layer */ diff --git a/drivers/pipes/pipe_common.c b/drivers/pipes/pipe_common.c index 862d244527..1541fecd46 100644 --- a/drivers/pipes/pipe_common.c +++ b/drivers/pipes/pipe_common.c @@ -135,7 +135,7 @@ static void pipecommon_pollnotify(FAR struct pipe_dev_s *dev, if (fds->revents != 0) { - fvdbg("Report events: %02x\n", fds->revents); + finfo("Report events: %02x\n", fds->revents); sem_post(fds->sem); } } diff --git a/drivers/pwm.c b/drivers/pwm.c index b07e44ae2c..103b78755a 100644 --- a/drivers/pwm.c +++ b/drivers/pwm.c @@ -72,14 +72,14 @@ #ifdef CONFIG_DEBUG_PWM # define pwmdbg dbg -# define pwmvdbg vdbg +# define pwminfo info # define pwmlldbg lldbg -# define pwmllvdbg llvdbg +# define pwmllinfo llinfo #else # define pwmdbg(x...) -# define pwmvdbg(x...) +# define pwminfo(x...) # define pwmlldbg(x...) -# define pwmllvdbg(x...) +# define pwmllinfo(x...) #endif /**************************************************************************** @@ -152,23 +152,23 @@ static void pwm_dump(FAR const char *msg, FAR const struct pwm_info_s *info, int i; #endif - pwmvdbg("%s: frequency: %d", msg, info->frequency); + pwminfo("%s: frequency: %d", msg, info->frequency); #ifdef CONFIG_PWM_MULTICHAN for (i = 0; i < CONFIG_PWM_NCHANNELS; i++) { - pwmvdbg(" channel: %d duty: %08x", + pwminfo(" channel: %d duty: %08x", info->channels[i].channel, info->channels[i].duty); } #else - pwmvdbg(" duty: %08x", info->duty); + pwminfo(" duty: %08x", info->duty); #endif #ifdef CONFIG_PWM_PULSECOUNT - pwmvdbg(" count: %d\n", info->count); + pwminfo(" count: %d\n", info->count); #endif - pwmvdbg(" started: %d\n", started); + pwminfo(" started: %d\n", started); } /**************************************************************************** @@ -186,7 +186,7 @@ static int pwm_open(FAR struct file *filep) uint8_t tmp; int ret; - pwmvdbg("crefs: %d\n", upper->crefs); + pwminfo("crefs: %d\n", upper->crefs); /* Get exclusive access to the device structures */ @@ -220,7 +220,7 @@ static int pwm_open(FAR struct file *filep) /* Yes.. perform one time hardware initialization. */ DEBUGASSERT(lower->ops->setup != NULL); - pwmvdbg("calling setup\n"); + pwminfo("calling setup\n"); ret = lower->ops->setup(lower); if (ret < 0) @@ -255,7 +255,7 @@ static int pwm_close(FAR struct file *filep) FAR struct pwm_upperhalf_s *upper = inode->i_private; int ret; - pwmvdbg("crefs: %d\n", upper->crefs); + pwminfo("crefs: %d\n", upper->crefs); /* Get exclusive access to the device structures */ @@ -285,7 +285,7 @@ static int pwm_close(FAR struct file *filep) /* Disable the PWM device */ DEBUGASSERT(lower->ops->shutdown != NULL); - pwmvdbg("calling shutdown: %d\n"); + pwminfo("calling shutdown: %d\n"); lower->ops->shutdown(lower); } @@ -393,7 +393,7 @@ static int pwm_start(FAR struct pwm_upperhalf_s *upper, unsigned int oflags) { /* Looks like we won't be waiting after all */ - pwmvdbg("start failed: %d\n", ret); + pwminfo("start failed: %d\n", ret); upper->started = false; upper->waiting = false; } @@ -450,7 +450,7 @@ static int pwm_ioctl(FAR struct file *filep, int cmd, unsigned long arg) FAR struct pwm_lowerhalf_s *lower = upper->dev; int ret; - pwmvdbg("cmd: %d arg: %ld\n", cmd, arg); + pwminfo("cmd: %d arg: %ld\n", cmd, arg); /* Get exclusive access to the device structures */ @@ -540,7 +540,7 @@ static int pwm_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case PWMIOC_STOP: { - pwmvdbg("PWMIOC_STOP: started: %d\n", upper->started); + pwminfo("PWMIOC_STOP: started: %d\n", upper->started); DEBUGASSERT(lower->ops->stop != NULL); if (upper->started) @@ -561,7 +561,7 @@ static int pwm_ioctl(FAR struct file *filep, int cmd, unsigned long arg) default: { - pwmvdbg("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg); + pwminfo("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg); DEBUGASSERT(lower->ops->ioctl != NULL); ret = lower->ops->ioctl(lower, cmd, arg); } @@ -624,7 +624,7 @@ int pwm_register(FAR const char *path, FAR struct pwm_lowerhalf_s *dev) /* Register the PWM device */ - pwmvdbg("Registering %s\n", path); + pwminfo("Registering %s\n", path); return register_driver(path, &g_pwmops, 0666, upper); } @@ -670,7 +670,7 @@ void pwm_expired(FAR void *handle) { FAR struct pwm_upperhalf_s *upper = (FAR struct pwm_upperhalf_s *)handle; - pwmllvdbg("started: %d waiting: %d\n", upper->started, upper->waiting); + pwmllinfo("started: %d waiting: %d\n", upper->started, upper->waiting); /* Make sure that the PWM is started */ diff --git a/drivers/ramdisk.c b/drivers/ramdisk.c index 09382dadd6..172adde32f 100644 --- a/drivers/ramdisk.c +++ b/drivers/ramdisk.c @@ -158,7 +158,7 @@ static const struct block_operations g_bops = #ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS static void rd_destroy(FAR struct rd_struct_s *dev) { - fvdbg("Destroying RAM disk\n"); + finfo("Destroying RAM disk\n"); /* We we configured to free the RAM disk memory when unlinked? */ @@ -197,7 +197,7 @@ static int rd_open(FAR struct inode *inode) dev->rd_crefs++; DEBUGASSERT(dev->rd_crefs > 0); - fvdbg("rd_crefs: %d\n", dev->rd_crefs); + finfo("rd_crefs: %d\n", dev->rd_crefs); return OK; } #endif @@ -221,7 +221,7 @@ static int rd_close(FAR struct inode *inode) DEBUGASSERT(dev->rd_crefs > 0); dev->rd_crefs--; - fvdbg("rd_crefs: %d\n", dev->rd_crefs); + finfo("rd_crefs: %d\n", dev->rd_crefs); #ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS /* Was that the last open reference to the RAM disk? */ @@ -258,13 +258,13 @@ static ssize_t rd_read(FAR struct inode *inode, unsigned char *buffer, DEBUGASSERT(inode && inode->i_private); dev = (FAR struct rd_struct_s *)inode->i_private; - fvdbg("sector: %d nsectors: %d sectorsize: %d\n", + finfo("sector: %d nsectors: %d sectorsize: %d\n", start_sector, dev->rd_sectsize, nsectors); if (start_sector < dev->rd_nsectors && start_sector + nsectors <= dev->rd_nsectors) { - fvdbg("Transfer %d bytes from %p\n", + finfo("Transfer %d bytes from %p\n", nsectors * dev->rd_sectsize, &dev->rd_buffer[start_sector * dev->rd_sectsize]); @@ -293,7 +293,7 @@ static ssize_t rd_write(FAR struct inode *inode, const unsigned char *buffer, DEBUGASSERT(inode && inode->i_private); dev = (struct rd_struct_s *)inode->i_private; - fvdbg("sector: %d nsectors: %d sectorsize: %d\n", + finfo("sector: %d nsectors: %d sectorsize: %d\n", start_sector, dev->rd_sectsize, nsectors); if (!RDFLAG_IS_WRENABLED(dev->rd_flags)) @@ -303,7 +303,7 @@ static ssize_t rd_write(FAR struct inode *inode, const unsigned char *buffer, else if (start_sector < dev->rd_nsectors && start_sector + nsectors <= dev->rd_nsectors) { - fvdbg("Transfer %d bytes from %p\n", + finfo("Transfer %d bytes from %p\n", nsectors * dev->rd_sectsize, &dev->rd_buffer[start_sector * dev->rd_sectsize]); @@ -328,7 +328,7 @@ static int rd_geometry(FAR struct inode *inode, struct geometry *geometry) { struct rd_struct_s *dev; - fvdbg("Entry\n"); + finfo("Entry\n"); DEBUGASSERT(inode); if (geometry) @@ -344,9 +344,9 @@ static int rd_geometry(FAR struct inode *inode, struct geometry *geometry) geometry->geo_nsectors = dev->rd_nsectors; geometry->geo_sectorsize = dev->rd_sectsize; - fvdbg("available: true mediachanged: false writeenabled: %s\n", + finfo("available: true mediachanged: false writeenabled: %s\n", geometry->geo_writeenabled ? "true" : "false"); - fvdbg("nsectors: %d sectorsize: %d\n", + finfo("nsectors: %d sectorsize: %d\n", geometry->geo_nsectors, geometry->geo_sectorsize); return OK; @@ -368,7 +368,7 @@ static int rd_ioctl(FAR struct inode *inode, int cmd, unsigned long arg) FAR struct rd_struct_s *dev; FAR void **ppv = (void**)((uintptr_t)arg); - fvdbg("Entry\n"); + finfo("Entry\n"); /* Only one ioctl command is supported */ @@ -378,7 +378,7 @@ static int rd_ioctl(FAR struct inode *inode, int cmd, unsigned long arg) dev = (FAR struct rd_struct_s *)inode->i_private; *ppv = (FAR void *)dev->rd_buffer; - fvdbg("ppv: %p\n", *ppv); + finfo("ppv: %p\n", *ppv); return OK; } @@ -452,7 +452,7 @@ int romdisk_register(int minor, FAR const uint8_t *buffer, uint32_t nsectors, char devname[16]; int ret = -ENOMEM; - fvdbg("buffer: %p nsectors: %d sectsize: %d\n", buffer, nsectors, sectsize); + finfo("buffer: %p nsectors: %d sectsize: %d\n", buffer, nsectors, sectsize); /* Sanity check */ diff --git a/drivers/rwbuffer.c b/drivers/rwbuffer.c index 764a6ebbc1..3eb4b8338b 100644 --- a/drivers/rwbuffer.c +++ b/drivers/rwbuffer.c @@ -161,11 +161,11 @@ static void rwb_wrflush(struct rwbuffer_s *rwb) { int ret; - fvdbg("Timeout!\n"); + finfo("Timeout!\n"); if (rwb->wrnblocks > 0) { - fvdbg("Flushing: blockstart=0x%08lx nblocks=%d from buffer=%p\n", + finfo("Flushing: blockstart=0x%08lx nblocks=%d from buffer=%p\n", (long)rwb->wrblockstart, rwb->wrnblocks, rwb->wrbuffer); /* Flush cache. On success, the flush method will return the number @@ -252,7 +252,7 @@ static ssize_t rwb_writebuffer(FAR struct rwbuffer_s *rwb, if (((startblock != rwb->wrexpectedblock) && (rwb->wrnblocks)) || ((rwb->wrnblocks + nblocks) > rwb->wrmaxblocks)) { - fvdbg("writebuffer miss, expected: %08x, given: %08x\n", + finfo("writebuffer miss, expected: %08x, given: %08x\n", rwb->wrexpectedblock, startblock); /* Flush the write buffer */ @@ -271,13 +271,13 @@ static ssize_t rwb_writebuffer(FAR struct rwbuffer_s *rwb, if (rwb->wrnblocks == 0) { - fvdbg("Fresh cache starting at block: 0x%08x\n", startblock); + finfo("Fresh cache starting at block: 0x%08x\n", startblock); rwb->wrblockstart = startblock; } /* Add data to cache */ - fvdbg("writebuffer: copying %d bytes from %p to %p\n", + finfo("writebuffer: copying %d bytes from %p to %p\n", nblocks * rwb->blocksize, wrbuffer, &rwb->wrbuffer[rwb->wrnblocks * rwb->blocksize]); memcpy(&rwb->wrbuffer[rwb->wrnblocks * rwb->blocksize], @@ -413,7 +413,7 @@ int rwb_invalidate_writebuffer(FAR struct rwbuffer_s *rwb, off_t wrbend; off_t invend; - fvdbg("startblock=%d blockcount=%p\n", startblock, blockcount); + finfo("startblock=%d blockcount=%p\n", startblock, blockcount); rwb_semtake(&rwb->wrsem); @@ -549,7 +549,7 @@ int rwb_invalidate_readahead(FAR struct rwbuffer_s *rwb, off_t rhbend; off_t invend; - fvdbg("startblock=%d blockcount=%p\n", startblock, blockcount); + finfo("startblock=%d blockcount=%p\n", startblock, blockcount); rwb_semtake(&rwb->rhsem); @@ -651,7 +651,7 @@ int rwb_initialize(FAR struct rwbuffer_s *rwb) #ifdef CONFIG_DRVR_WRITEBUFFER if (rwb->wrmaxblocks > 0) { - fvdbg("Initialize the write buffer\n"); + finfo("Initialize the write buffer\n"); /* Initialize the write buffer access semaphore */ @@ -675,14 +675,14 @@ int rwb_initialize(FAR struct rwbuffer_s *rwb) } } - fvdbg("Write buffer size: %d bytes\n", allocsize); + finfo("Write buffer size: %d bytes\n", allocsize); } #endif /* CONFIG_DRVR_WRITEBUFFER */ #ifdef CONFIG_DRVR_READAHEAD if (rwb->rhmaxblocks > 0) { - fvdbg("Initialize the read-ahead buffer\n"); + finfo("Initialize the read-ahead buffer\n"); /* Initialize the read-ahead buffer access semaphore */ @@ -706,7 +706,7 @@ int rwb_initialize(FAR struct rwbuffer_s *rwb) } } - fvdbg("Read-ahead buffer size: %d bytes\n", allocsize); + finfo("Read-ahead buffer size: %d bytes\n", allocsize); } #endif /* CONFIG_DRVR_READAHEAD */ @@ -753,7 +753,7 @@ ssize_t rwb_read(FAR struct rwbuffer_s *rwb, off_t startblock, size_t remaining; int ret = OK; - fvdbg("startblock=%ld nblocks=%ld rdbuffer=%p\n", + finfo("startblock=%ld nblocks=%ld rdbuffer=%p\n", (long)startblock, (long)nblocks, rdbuffer); #ifdef CONFIG_DRVR_WRITEBUFFER @@ -880,7 +880,7 @@ ssize_t rwb_write(FAR struct rwbuffer_s *rwb, off_t startblock, #ifdef CONFIG_DRVR_WRITEBUFFER if (rwb->wrmaxblocks > 0) { - fvdbg("startblock=%d wrbuffer=%p\n", startblock, wrbuffer); + finfo("startblock=%d wrbuffer=%p\n", startblock, wrbuffer); /* Use the block cache unless the buffer size is bigger than block cache */ diff --git a/drivers/sensors/adxl345_base.c b/drivers/sensors/adxl345_base.c index 4cf667807d..a1cdeeecdb 100644 --- a/drivers/sensors/adxl345_base.c +++ b/drivers/sensors/adxl345_base.c @@ -125,7 +125,7 @@ static ssize_t adxl345_read(FAR struct file *filep, FAR char *buffer, size_t len struct adxl345_sample_s sample; int ret; - snvdbg("len=%d\n", len); + sninfo("len=%d\n", len); DEBUGASSERT(filep); inode = filep->f_inode; @@ -196,7 +196,7 @@ int adxl345_register(ADXL345_HANDLE handle, int minor) char devname[DEV_NAMELEN]; int ret; - snvdbg("handle=%p minor=%d\n", handle, minor); + sninfo("handle=%p minor=%d\n", handle, minor); DEBUGASSERT(priv); /* Get exclusive access to the device structure */ @@ -329,7 +329,7 @@ static int adxl345_checkid(FAR struct adxl345_dev_s *priv) /* Read device ID */ devid = adxl345_getreg8(priv, ADXL345_DEVID); - snvdbg("devid: %04x\n", devid); + sninfo("devid: %04x\n", devid); if (devid != (uint16_t) DEVID) { diff --git a/drivers/sensors/bmp180.c b/drivers/sensors/bmp180.c index 2124066fe9..113ad049cc 100644 --- a/drivers/sensors/bmp180.c +++ b/drivers/sensors/bmp180.c @@ -314,7 +314,7 @@ static int bmp180_checkid(FAR struct bmp180_dev_s *priv) /* Read device ID */ devid = bmp180_getreg8(priv, BMP180_DEVID); - snvdbg("devid: 0x%02x\n", devid); + sninfo("devid: 0x%02x\n", devid); if (devid != (uint16_t) DEVID) { @@ -421,8 +421,8 @@ static void bmp180_read_press_temp(FAR struct bmp180_dev_s *priv) priv->bmp180_upress |= bmp180_getreg8(priv, BMP180_ADC_OUT_XLSB); priv->bmp180_upress = priv->bmp180_upress >> (8 - (oss >> 6)); - snvdbg("Uncompensated temperature = %d\n", priv->bmp180_utemp); - snvdbg("Uncompensated pressure = %d\n", priv->bmp180_upress); + sninfo("Uncompensated temperature = %d\n", priv->bmp180_utemp); + sninfo("Uncompensated pressure = %d\n", priv->bmp180_upress); } /**************************************************************************** @@ -470,7 +470,7 @@ static int bmp180_getpressure(FAR struct bmp180_dev_s *priv) x2 = (priv->bmp180_cal_mc << 11) / (x1 + priv->bmp180_cal_md); b5 = x1 + x2; temp = (b5 + 8) >> 4; - snvdbg("Compensated temperature = %d\n", temp); + sninfo("Compensated temperature = %d\n", temp); /* Calculate true pressure */ @@ -500,7 +500,7 @@ static int bmp180_getpressure(FAR struct bmp180_dev_s *priv) press = press + ((x1 + x2 + 3791) >> 4); - snvdbg("Compressed pressure = %d\n", press); + sninfo("Compressed pressure = %d\n", press); return press; } @@ -633,7 +633,7 @@ int bmp180_register(FAR const char *devpath, FAR struct i2c_master_s *i2c) kmm_free(priv); } - snvdbg("BMP180 driver loaded successfully!\n"); + sninfo("BMP180 driver loaded successfully!\n"); return ret; } diff --git a/drivers/sensors/lsm9ds1.c b/drivers/sensors/lsm9ds1.c index 10f902aeaa..e6ea884414 100644 --- a/drivers/sensors/lsm9ds1.c +++ b/drivers/sensors/lsm9ds1.c @@ -673,7 +673,7 @@ static int lsm9ds1_readreg8(FAR struct lsm9ds1_dev_s *priv, uint8_t regaddr, return ret; } - snvdbg("addr: %02x value: %02x\n", regaddr, *regval); + sninfo("addr: %02x value: %02x\n", regaddr, *regval); return OK; } @@ -716,7 +716,7 @@ static int lsm9ds1_writereg8(FAR struct lsm9ds1_dev_s *priv, uint8_t regaddr, return ret; } - snvdbg("addr: %02x value: %02x\n", regaddr, regval); + sninfo("addr: %02x value: %02x\n", regaddr, regval); return OK; } diff --git a/drivers/sensors/qencoder.c b/drivers/sensors/qencoder.c index 34cb029d4c..69053bd357 100644 --- a/drivers/sensors/qencoder.c +++ b/drivers/sensors/qencoder.c @@ -128,7 +128,7 @@ static int qe_open(FAR struct file *filep) uint8_t tmp; int ret; - snvdbg("crefs: %d\n", upper->crefs); + sninfo("crefs: %d\n", upper->crefs); /* Get exclusive access to the device structures */ @@ -162,7 +162,7 @@ static int qe_open(FAR struct file *filep) /* Yes.. perform one time hardware initialization. */ DEBUGASSERT(lower->ops->setup != NULL); - snvdbg("calling setup\n"); + sninfo("calling setup\n"); ret = lower->ops->setup(lower); if (ret < 0) @@ -197,7 +197,7 @@ static int qe_close(FAR struct file *filep) FAR struct qe_upperhalf_s *upper = inode->i_private; int ret; - snvdbg("crefs: %d\n", upper->crefs); + sninfo("crefs: %d\n", upper->crefs); /* Get exclusive access to the device structures */ @@ -227,7 +227,7 @@ static int qe_close(FAR struct file *filep) /* Disable the PWM device */ DEBUGASSERT(lower->ops->shutdown != NULL); - snvdbg("calling shutdown: %d\n"); + sninfo("calling shutdown: %d\n"); lower->ops->shutdown(lower); } @@ -284,7 +284,7 @@ static int qe_ioctl(FAR struct file *filep, int cmd, unsigned long arg) FAR struct qe_lowerhalf_s *lower = upper->lower; int ret; - snvdbg("cmd: %d arg: %ld\n", cmd, arg); + sninfo("cmd: %d arg: %ld\n", cmd, arg); DEBUGASSERT(upper && lower); /* Get exclusive access to the device structures */ @@ -326,7 +326,7 @@ static int qe_ioctl(FAR struct file *filep, int cmd, unsigned long arg) default: { - snvdbg("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg); + sninfo("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg); DEBUGASSERT(lower->ops->ioctl != NULL); ret = lower->ops->ioctl(lower, cmd, arg); } @@ -382,7 +382,7 @@ int qe_register(FAR const char *devpath, FAR struct qe_lowerhalf_s *lower) /* Register the PWM device */ - snvdbg("Registering %s\n", devpath); + sninfo("Registering %s\n", devpath); return register_driver(devpath, &g_qeops, 0666, upper); } diff --git a/drivers/sensors/zerocross.c b/drivers/sensors/zerocross.c index 980ffdd86c..8ac7665275 100644 --- a/drivers/sensors/zerocross.c +++ b/drivers/sensors/zerocross.c @@ -244,7 +244,7 @@ static int zc_open(FAR struct file *filep) ret = sem_wait(&priv->exclsem); if (ret < 0) { - snvdbg("ERROR: sem_wait failed: %d\n", ret); + sninfo("ERROR: sem_wait failed: %d\n", ret); return ret; } @@ -253,7 +253,7 @@ static int zc_open(FAR struct file *filep) opriv = (FAR struct zc_open_s *)kmm_zalloc(sizeof(struct zc_open_s)); if (!opriv) { - snvdbg("ERROR: Failled to allocate open structure\n"); + sninfo("ERROR: Failled to allocate open structure\n"); ret = -ENOMEM; goto errout_with_sem; } @@ -325,7 +325,7 @@ static int zc_close(FAR struct file *filep) ret = sem_wait(&priv->exclsem); if (ret < 0) { - snvdbg("ERROR: sem_wait failed: %d\n", ret); + sninfo("ERROR: sem_wait failed: %d\n", ret); return ret; } @@ -338,7 +338,7 @@ static int zc_close(FAR struct file *filep) DEBUGASSERT(curr); if (!curr) { - snvdbg("ERROR: Failed to find open entry\n"); + sninfo("ERROR: Failed to find open entry\n"); ret = -ENOENT; goto errout_with_exclsem; } @@ -414,7 +414,7 @@ static int zc_ioctl(FAR struct file *filep, int cmd, unsigned long arg) FAR struct zc_lowerhalf_s *lower; int ret; - snvdbg("cmd: %d arg: %ld\n", cmd, arg); + sninfo("cmd: %d arg: %ld\n", cmd, arg); DEBUGASSERT(filep && filep->f_priv && filep->f_inode); opriv = filep->f_priv; inode = filep->f_inode; @@ -467,7 +467,7 @@ static int zc_ioctl(FAR struct file *filep, int cmd, unsigned long arg) default: { - snvdbg("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg); + sninfo("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg); ret = -ENOTTY; } break; @@ -516,7 +516,7 @@ int zc_register(FAR const char *devname, FAR struct zc_lowerhalf_s *lower) if (!priv) { - snvdbg("ERROR: Failed to allocate device structure\n"); + sninfo("ERROR: Failed to allocate device structure\n"); return -ENOMEM; } @@ -535,7 +535,7 @@ int zc_register(FAR const char *devname, FAR struct zc_lowerhalf_s *lower) ret = register_driver(devname, &g_zcops, 0666, priv); if (ret < 0) { - snvdbg("ERROR: register_driver failed: %d\n", ret); + sninfo("ERROR: register_driver failed: %d\n", ret); sem_destroy(&priv->exclsem); kmm_free(priv); } diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c index 2de293d0b0..fe56f46d44 100644 --- a/drivers/serial/serial.c +++ b/drivers/serial/serial.c @@ -178,7 +178,7 @@ static void uart_pollnotify(FAR uart_dev_t *dev, pollevent_t eventset) #endif if (fds->revents != 0) { - fvdbg("Report events: %02x\n", fds->revents); + finfo("Report events: %02x\n", fds->revents); sem_post(fds->sem); } } diff --git a/drivers/serial/uart_16550.c b/drivers/serial/uart_16550.c index c7de1031a3..af730d6d27 100644 --- a/drivers/serial/uart_16550.c +++ b/drivers/serial/uart_16550.c @@ -829,7 +829,7 @@ static int u16550_interrupt(int irq, void *context) /* Read the modem status register (MSR) to clear */ status = u16550_serialin(priv, UART_MSR_OFFSET); - vdbg("MSR: %02x\n", status); + info("MSR: %02x\n", status); break; } @@ -840,7 +840,7 @@ static int u16550_interrupt(int irq, void *context) /* Read the line status register (LSR) to clear */ status = u16550_serialin(priv, UART_LSR_OFFSET); - vdbg("LSR: %02x\n", status); + info("LSR: %02x\n", status); break; } diff --git a/drivers/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c index 4f8bf7c083..78f1e1c88f 100644 --- a/drivers/spi/spi_bitbang.c +++ b/drivers/spi/spi_bitbang.c @@ -91,13 +91,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /**************************************************************************** @@ -193,7 +193,7 @@ static int spi_lock(FAR struct spi_dev_s *dev, bool lock) { FAR struct spi_bitbang_s *priv = (FAR struct spi_bitbang_s *)dev; - spivdbg("lock=%d\n", lock); + spiinfo("lock=%d\n", lock); if (lock) { /* Take the semaphore (perhaps waiting) */ @@ -236,7 +236,7 @@ static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, { FAR struct spi_bitbang_s *priv = (FAR struct spi_bitbang_s *)dev; - spivdbg("devid=%d selected=%d\n", devid, selected); + spiinfo("devid=%d selected=%d\n", devid, selected); DEBUGASSERT(priv && priv->low->select); priv->low->select(priv, devid, selected); } @@ -263,7 +263,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency) DEBUGASSERT(priv && priv->low->setfrequency); actual = priv->low->setfrequency(priv, frequency); - spivdbg("frequency=%d holdtime=%d actual=%d\n", + spiinfo("frequency=%d holdtime=%d actual=%d\n", frequency, priv->holdtime, actual); return actual; } @@ -289,7 +289,7 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) DEBUGASSERT(priv && priv->low->setmode); priv->low->setmode(priv, mode); - spivdbg("mode=%d exchange=%p\n", mode, priv->exchange); + spiinfo("mode=%d exchange=%p\n", mode, priv->exchange); } /**************************************************************************** @@ -312,11 +312,11 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) #ifdef CONFIG_SPI_BITBANG_VARWIDTH FAR struct spi_bitbang_s *priv = (FAR struct spi_bitbang_s *)dev; - spivdbg("nbits=%d\n", nbits); + spiinfo("nbits=%d\n", nbits); DEBUGASSERT(priv && nbits > 0 && nbits <= 16); priv->nbits = nbits; #else - spivdbg("nbits=%d\n", nbits); + spiinfo("nbits=%d\n", nbits); DEBUGASSERT(nbits == 8); #endif } @@ -376,7 +376,7 @@ static void spi_exchange(FAR struct spi_dev_s *dev, uint16_t dataout; uint16_t datain; - spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); + spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); DEBUGASSERT(priv && priv->low && priv->low->exchange); /* If there is no data source, send 0xff */ diff --git a/drivers/timers/ds3231.c b/drivers/timers/ds3231.c index 7efaaecb03..cc45f4b29e 100644 --- a/drivers/timers/ds3231.c +++ b/drivers/timers/ds3231.c @@ -85,14 +85,14 @@ #ifdef CONFIG_DEBUG_RTC # define rtcdbg dbg -# define rtcvdbg vdbg +# define rtcinfo info # define rtclldbg lldbg -# define rtcllvdbg llvdbg +# define rtcllinfo llinfo #else # define rtcdbg(x...) -# define rtcvdbg(x...) +# define rtcinfo(x...) # define rtclldbg(x...) -# define rtcllvdbg(x...) +# define rtcllinfo(x...) #endif /************************************************************************************ diff --git a/drivers/timers/pcf85263.c b/drivers/timers/pcf85263.c index 0128e354f2..b513c9f8ac 100644 --- a/drivers/timers/pcf85263.c +++ b/drivers/timers/pcf85263.c @@ -85,14 +85,14 @@ #ifdef CONFIG_DEBUG_RTC # define rtcdbg dbg -# define rtcvdbg vdbg +# define rtcinfo info # define rtclldbg lldbg -# define rtcllvdbg llvdbg +# define rtcllinfo llinfo #else # define rtcdbg(x...) -# define rtcvdbg(x...) +# define rtcinfo(x...) # define rtclldbg(x...) -# define rtcllvdbg(x...) +# define rtcllinfo(x...) #endif /************************************************************************************ diff --git a/drivers/timers/timer.c b/drivers/timers/timer.c index afdd39a39e..2a976cc22c 100644 --- a/drivers/timers/timer.c +++ b/drivers/timers/timer.c @@ -65,14 +65,14 @@ #ifdef CONFIG_DEBUG_TIMER # define tmrdbg dbg -# define tmrvdbg vdbg +# define tmrinfo info # define tmrlldbg lldbg -# define tmrllvdbg llvdbg +# define tmrllinfo llinfo #else # define tmrdbg(x...) -# define tmrvdbg(x...) +# define tmrinfo(x...) # define tmrlldbg(x...) -# define tmrllvdbg(x...) +# define tmrllinfo(x...) #endif /**************************************************************************** @@ -143,7 +143,7 @@ static int timer_open(FAR struct file *filep) uint8_t tmp; int ret; - tmrvdbg("crefs: %d\n", upper->crefs); + tmrinfo("crefs: %d\n", upper->crefs); /* Increment the count of references to the device. If this the first * time that the driver has been opened for this device, then initialize @@ -181,7 +181,7 @@ static int timer_close(FAR struct file *filep) FAR struct inode *inode = filep->f_inode; FAR struct timer_upperhalf_s *upper = inode->i_private; - tmrvdbg("crefs: %d\n", upper->crefs); + tmrinfo("crefs: %d\n", upper->crefs); /* Decrement the references to the driver. If the reference count will * decrement to 0, then uninitialize the driver. @@ -240,7 +240,7 @@ static int timer_ioctl(FAR struct file *filep, int cmd, unsigned long arg) FAR struct timer_lowerhalf_s *lower = upper->lower; int ret; - tmrvdbg("cmd: %d arg: %ld\n", cmd, arg); + tmrinfo("cmd: %d arg: %ld\n", cmd, arg); DEBUGASSERT(upper && lower); /* Handle built-in ioctl commands */ @@ -384,7 +384,7 @@ static int timer_ioctl(FAR struct file *filep, int cmd, unsigned long arg) default: { - tmrvdbg("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg); + tmrinfo("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg); /* An ioctl commands that are not recognized by the "upper-half" * driver are forwarded to the lower half driver through this @@ -443,7 +443,7 @@ FAR void *timer_register(FAR const char *path, int ret; DEBUGASSERT(path && lower); - tmrvdbg("Entry: path=%s\n", path); + tmrinfo("Entry: path=%s\n", path); /* Allocate the upper-half data structure */ @@ -517,7 +517,7 @@ void timer_unregister(FAR void *handle) lower = upper->lower; DEBUGASSERT(upper && lower); - tmrvdbg("Unregistering: %s\n", upper->path); + tmrinfo("Unregistering: %s\n", upper->path); /* Disable the timer */ diff --git a/drivers/timers/watchdog.c b/drivers/timers/watchdog.c index e6bef99ac1..b538d1c55b 100644 --- a/drivers/timers/watchdog.c +++ b/drivers/timers/watchdog.c @@ -64,14 +64,14 @@ #ifdef CONFIG_DEBUG_WATCHDOG # define wddbg dbg -# define wdvdbg vdbg +# define wdinfo info # define wdlldbg lldbg -# define wdllvdbg llvdbg +# define wdllinfo llinfo #else # define wddbg(x...) -# define wdvdbg(x...) +# define wdinfo(x...) # define wdlldbg(x...) -# define wdllvdbg(x...) +# define wdllinfo(x...) #endif /**************************************************************************** @@ -140,7 +140,7 @@ static int wdog_open(FAR struct file *filep) uint8_t tmp; int ret; - wdvdbg("crefs: %d\n", upper->crefs); + wdinfo("crefs: %d\n", upper->crefs); /* Get exclusive access to the device structures */ @@ -191,7 +191,7 @@ static int wdog_close(FAR struct file *filep) FAR struct watchdog_upperhalf_s *upper = inode->i_private; int ret; - wdvdbg("crefs: %d\n", upper->crefs); + wdinfo("crefs: %d\n", upper->crefs); /* Get exclusive access to the device structures */ @@ -262,7 +262,7 @@ static int wdog_ioctl(FAR struct file *filep, int cmd, unsigned long arg) FAR struct watchdog_lowerhalf_s *lower = upper->lower; int ret; - wdvdbg("cmd: %d arg: %ld\n", cmd, arg); + wdinfo("cmd: %d arg: %ld\n", cmd, arg); DEBUGASSERT(upper && lower); /* Get exclusive access to the device structures */ @@ -418,7 +418,7 @@ static int wdog_ioctl(FAR struct file *filep, int cmd, unsigned long arg) default: { - wdvdbg("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg); + wdinfo("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg); /* An ioctl commands that are not recognized by the "upper-half" * driver are forwarded to the lower half driver through this @@ -478,7 +478,7 @@ FAR void *watchdog_register(FAR const char *path, int ret; DEBUGASSERT(path && lower); - wdvdbg("Entry: path=%s\n", path); + wdinfo("Entry: path=%s\n", path); /* Allocate the upper-half data structure */ @@ -554,7 +554,7 @@ void watchdog_unregister(FAR void *handle) lower = upper->lower; DEBUGASSERT(upper && lower); - wdvdbg("Unregistering: %s\n", upper->path); + wdinfo("Unregistering: %s\n", upper->path); /* Disable the watchdog timer */ diff --git a/drivers/usbdev/cdcacm.c b/drivers/usbdev/cdcacm.c index 6767fd8e52..ab48720c21 100644 --- a/drivers/usbdev/cdcacm.c +++ b/drivers/usbdev/cdcacm.c @@ -358,7 +358,7 @@ static int cdcacm_sndpacket(FAR struct cdcacm_dev_s *priv) * to be sent). */ - uvdbg("head=%d tail=%d nwrq=%d empty=%d\n", + uinfo("head=%d tail=%d nwrq=%d empty=%d\n", priv->serdev.xmit.head, priv->serdev.xmit.tail, priv->nwrq, sq_empty(&priv->reqlist)); @@ -427,7 +427,7 @@ static inline int cdcacm_recvpacket(FAR struct cdcacm_dev_s *priv, uint16_t nexthead; uint16_t nbytes = 0; - uvdbg("head=%d tail=%d nrdq=%d reqlen=%d\n", + uinfo("head=%d tail=%d nrdq=%d reqlen=%d\n", priv->serdev.recv.head, priv->serdev.recv.tail, priv->nrdq, reqlen); /* Get the next head index. During the time that RX interrupts are disabled, the @@ -1276,7 +1276,7 @@ static int cdcacm_setup(FAR struct usbdevclass_driver_s *driver, index = GETUINT16(ctrl->index); len = GETUINT16(ctrl->len); - uvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n", + uinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n", ctrl->type, ctrl->req, value, index, len); if ((ctrl->type & USB_REQ_TYPE_MASK) == USB_REQ_TYPE_STANDARD) @@ -2208,7 +2208,7 @@ static void cdcuart_txint(FAR struct uart_dev_s *dev, bool enable) * send the next packet now. */ - uvdbg("enable=%d head=%d tail=%d\n", + uinfo("enable=%d head=%d tail=%d\n", enable, priv->serdev.xmit.head, priv->serdev.xmit.tail); if (enable && priv->serdev.xmit.head != priv->serdev.xmit.tail) diff --git a/drivers/usbdev/composite.c b/drivers/usbdev/composite.c index b0f0c95c9c..7a4f3fdc24 100644 --- a/drivers/usbdev/composite.c +++ b/drivers/usbdev/composite.c @@ -431,7 +431,7 @@ static int composite_setup(FAR struct usbdevclass_driver_s *driver, index = GETUINT16(ctrl->index); len = GETUINT16(ctrl->len); - uvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n", + uinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n", ctrl->type, ctrl->req, value, index, len); UNUSED(index); diff --git a/drivers/usbdev/pl2303.c b/drivers/usbdev/pl2303.c index 92285c01d1..0a07ebaa66 100644 --- a/drivers/usbdev/pl2303.c +++ b/drivers/usbdev/pl2303.c @@ -617,7 +617,7 @@ static int usbclass_sndpacket(FAR struct pl2303_dev_s *priv) * to be sent). */ - uvdbg("head=%d tail=%d nwrq=%d empty=%d\n", + uinfo("head=%d tail=%d nwrq=%d empty=%d\n", priv->serdev.xmit.head, priv->serdev.xmit.tail, priv->nwrq, sq_empty(&priv->reqlist)); @@ -1644,7 +1644,7 @@ static int usbclass_setup(FAR struct usbdevclass_driver_s *driver, index = GETUINT16(ctrl->index); len = GETUINT16(ctrl->len); - uvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n", + uinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n", ctrl->type, ctrl->req, value, index, len); switch (ctrl->type & USB_REQ_TYPE_MASK) @@ -2227,7 +2227,7 @@ static void usbser_txint(FAR struct uart_dev_s *dev, bool enable) * send the next packet now. */ - uvdbg("enable=%d head=%d tail=%d\n", + uinfo("enable=%d head=%d tail=%d\n", enable, priv->serdev.xmit.head, priv->serdev.xmit.tail); if (enable && priv->serdev.xmit.head != priv->serdev.xmit.tail) diff --git a/drivers/usbdev/usbmsc.c b/drivers/usbdev/usbmsc.c index 9e646c9509..34873c1a81 100644 --- a/drivers/usbdev/usbmsc.c +++ b/drivers/usbdev/usbmsc.c @@ -549,7 +549,7 @@ static int usbmsc_setup(FAR struct usbdevclass_driver_s *driver, index = GETUINT16(ctrl->index); len = GETUINT16(ctrl->len); - uvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n", + uinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n", ctrl->type, ctrl->req, value, index, len); if ((ctrl->type & USB_REQ_TYPE_MASK) == USB_REQ_TYPE_STANDARD) @@ -1652,7 +1652,7 @@ int usbmsc_exportluns(FAR void *handle) g_usbmsc_handoff = priv; - uvdbg("Starting SCSI worker thread\n"); + uinfo("Starting SCSI worker thread\n"); priv->thpid = kernel_thread("scsid", CONFIG_USBMSC_SCSI_PRIO, CONFIG_USBMSC_SCSI_STACKSIZE, usbmsc_scsi_main, NULL); @@ -1664,7 +1664,7 @@ int usbmsc_exportluns(FAR void *handle) /* Wait for the worker thread to run and initialize */ - uvdbg("Waiting for the SCSI worker thread\n"); + uinfo("Waiting for the SCSI worker thread\n"); usbmsc_sync_wait(priv); DEBUGASSERT(g_usbmsc_handoff == NULL); @@ -1681,7 +1681,7 @@ int usbmsc_exportluns(FAR void *handle) /* Signal to start the thread */ - uvdbg("Signalling for the SCSI worker thread\n"); + uinfo("Signalling for the SCSI worker thread\n"); flags = enter_critical_section(); priv->theventset |= USBMSC_EVENT_READY; usbmsc_scsi_signal(priv); diff --git a/drivers/usbdev/usbmsc_scsi.c b/drivers/usbdev/usbmsc_scsi.c index 72bc3a8f97..66f2b586b9 100644 --- a/drivers/usbdev/usbmsc_scsi.c +++ b/drivers/usbdev/usbmsc_scsi.c @@ -2622,7 +2622,7 @@ int usbmsc_scsi_main(int argc, char *argv[]) uint16_t eventset; int ret; - uvdbg("Started\n"); + uinfo("Started\n"); /* Get the SCSI state data handed off from the initialization logic */ @@ -2636,7 +2636,7 @@ int usbmsc_scsi_main(int argc, char *argv[]) * wait here until we are told to begin. Start in the NOTINITIALIZED state */ - uvdbg("Waiting to be signalled\n"); + uinfo("Waiting to be signalled\n"); usbmsc_scsi_lock(priv); priv->thstate = USBMSC_STATE_STARTED; while ((priv->theventset & USBMSC_EVENT_READY) != 0 && @@ -2645,7 +2645,7 @@ int usbmsc_scsi_main(int argc, char *argv[]) usbmsc_scsi_wait(priv); } - uvdbg("Running\n"); + uinfo("Running\n"); /* Transition to the INITIALIZED/IDLE state */ diff --git a/drivers/usbhost/usbhost_cdcacm.c b/drivers/usbhost/usbhost_cdcacm.c index 2799356b69..6b7ef9d020 100644 --- a/drivers/usbhost/usbhost_cdcacm.c +++ b/drivers/usbhost/usbhost_cdcacm.c @@ -512,7 +512,7 @@ static FAR struct usbhost_cdcacm_s *usbhost_allocclass(void) } leave_critical_section(flags); - uvdbg("Allocated: %p\n", entry); + uinfo("Allocated: %p\n", entry); return (FAR struct usbhost_cdcacm_s *)entry; } #else @@ -526,7 +526,7 @@ static FAR struct usbhost_cdcacm_s *usbhost_allocclass(void) DEBUGASSERT(!up_interrupt_context()); priv = (FAR struct usbhost_cdcacm_s *)kmm_malloc(sizeof(struct usbhost_cdcacm_s)); - uvdbg("Allocated: %p\n", priv); + uinfo("Allocated: %p\n", priv); return priv; } #endif @@ -552,7 +552,7 @@ static void usbhost_freeclass(FAR struct usbhost_cdcacm_s *usbclass) irqstate_t flags; DEBUGASSERT(entry != NULL); - uvdbg("Freeing: %p\n", entry); + uinfo("Freeing: %p\n", entry); /* Just put the pre-allocated class structure back on the freelist */ @@ -570,7 +570,7 @@ static void usbhost_freeclass(FAR struct usbhost_cdcacm_s *usbclass) * from an interrupt handler. */ - uvdbg("Freeing: %p\n", usbclass); + uinfo("Freeing: %p\n", usbclass); sched_kfree(usbclass); } #endif @@ -743,7 +743,7 @@ static void usbhost_notification_work(FAR void *arg) index = usbhost_getle16(inmsg->index); len = usbhost_getle16(inmsg->len); - uvdbg("type: %02x notification: %02x value: %04x index: %04x len: %04x\n", + uinfo("type: %02x notification: %02x value: %04x index: %04x len: %04x\n", inmsg->type, inmsg->notification, value, index, len); /* We care only about the SerialState notification */ @@ -764,7 +764,7 @@ static void usbhost_notification_work(FAR void *arg) priv->dcd = ((state & CDC_UART_RXCARRIER) != 0); priv->dsr = ((state & CDC_UART_TXCARRIER) != 0); - uvdbg("ACM_SERIAL_STATE: DCD=%d DSR=%d\n", + uinfo("ACM_SERIAL_STATE: DCD=%d DSR=%d\n", priv->dcd, priv->dsr); } } @@ -1224,7 +1224,7 @@ static void usbhost_destroy(FAR void *arg) DEBUGASSERT(priv != NULL && priv->usbclass.hport != NULL); hport = priv->usbclass.hport; - uvdbg("crefs: %d\n", priv->crefs); + uinfo("crefs: %d\n", priv->crefs); /* Unregister the serial lower half driver */ @@ -1365,7 +1365,7 @@ static int usbhost_cfgdesc(FAR struct usbhost_cdcacm_s *priv, { FAR struct usb_ifdesc_s *ifdesc = (FAR struct usb_ifdesc_s *)configdesc; - uvdbg("Interface descriptor: class: %d subclass: %d proto: %d\n", + uinfo("Interface descriptor: class: %d subclass: %d proto: %d\n", ifdesc->classid, ifdesc->subclass, ifdesc->protocol); DEBUGASSERT(remaining >= USB_SIZEOF_IFDESC); @@ -1411,7 +1411,7 @@ static int usbhost_cfgdesc(FAR struct usbhost_cdcacm_s *priv, { FAR struct usb_epdesc_s *epdesc = (FAR struct usb_epdesc_s *)configdesc; - uvdbg("Endpoint descriptor: currif: %02x attr: %02x\n", + uinfo("Endpoint descriptor: currif: %02x attr: %02x\n", currif, epdesc->attr); DEBUGASSERT(remaining >= USB_SIZEOF_EPDESC); @@ -1448,7 +1448,7 @@ static int usbhost_cfgdesc(FAR struct usbhost_cdcacm_s *priv, boutdesc.interval = epdesc->interval; boutdesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize); - uvdbg("Bulk OUT EP addr:%d mxpacketsize:%d\n", + uinfo("Bulk OUT EP addr:%d mxpacketsize:%d\n", boutdesc.addr, boutdesc.mxpacketsize); } else @@ -1476,7 +1476,7 @@ static int usbhost_cfgdesc(FAR struct usbhost_cdcacm_s *priv, bindesc.xfrtype = USB_EP_ATTR_XFER_BULK; bindesc.interval = epdesc->interval; bindesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize); - uvdbg("Bulk IN EP addr:%d mxpacketsize:%d\n", + uinfo("Bulk IN EP addr:%d mxpacketsize:%d\n", bindesc.addr, bindesc.mxpacketsize); } } @@ -1520,7 +1520,7 @@ static int usbhost_cfgdesc(FAR struct usbhost_cdcacm_s *priv, iindesc.interval = epdesc->interval; iindesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize); - uvdbg("Interrupt IN EP addr:%d mxpacketsize:%d\n", + uinfo("Interrupt IN EP addr:%d mxpacketsize:%d\n", boutdesc.addr, boutdesc.mxpacketsize); #else found |= USBHOST_CTRLIF_FOUND; @@ -1597,7 +1597,7 @@ static int usbhost_cfgdesc(FAR struct usbhost_cdcacm_s *priv, } #endif - uvdbg("Endpoints allocated\n"); + uinfo("Endpoints allocated\n"); return OK; } @@ -2029,7 +2029,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass, * driver */ usbhost_mkdevname(priv, devname); - uvdbg("Register device: %s\n", devname); + uinfo("Register device: %s\n", devname); ret = uart_register(devname, &priv->uartdev); if (ret < 0) @@ -2045,7 +2045,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass, { /* Begin monitoring of port status change events */ - uvdbg("Start notification monitoring\n"); + uinfo("Start notification monitoring\n"); ret = DRVR_ASYNCH(hport->drvr, priv->intin, (FAR uint8_t *)priv->notification, MAX_NOTIFICATION, usbhost_notification_callback, @@ -2156,7 +2156,7 @@ static int usbhost_disconnected(struct usbhost_class_s *usbclass) * serial driver. */ - uvdbg("crefs: %d\n", priv->crefs); + uinfo("crefs: %d\n", priv->crefs); if (priv->crefs == 1) { /* Destroy the class instance. If we are executing from an interrupt @@ -2168,7 +2168,7 @@ static int usbhost_disconnected(struct usbhost_class_s *usbclass) { /* Destroy the instance on the worker thread. */ - uvdbg("Queuing destruction: worker %p->%p\n", + uinfo("Queuing destruction: worker %p->%p\n", priv->ntwork.worker, usbhost_destroy); DEBUGASSERT(work_available(&priv->ntwork)); @@ -2204,7 +2204,7 @@ static int usbhost_setup(FAR struct uart_dev_s *uartdev) irqstate_t flags; int ret; - uvdbg("Entry\n"); + uinfo("Entry\n"); DEBUGASSERT(uartdev && uartdev->priv); priv = (FAR struct usbhost_cdcacm_s *)uartdev->priv; @@ -2255,7 +2255,7 @@ static void usbhost_shutdown(FAR struct uart_dev_s *uartdev) FAR struct usbhost_cdcacm_s *priv; irqstate_t flags; - uvdbg("Entry\n"); + uinfo("Entry\n"); DEBUGASSERT(uartdev && uartdev->priv); priv = (FAR struct usbhost_cdcacm_s *)uartdev->priv; @@ -2343,7 +2343,7 @@ static int usbhost_ioctl(FAR struct file *filep, int cmd, unsigned long arg) struct usbhost_cdcacm_s *priv; int ret; - uvdbg("Entry\n"); + uinfo("Entry\n"); DEBUGASSERT(filep && filep->f_inode); inode = filep->f_inode; diff --git a/drivers/usbhost/usbhost_enumerate.c b/drivers/usbhost/usbhost_enumerate.c index 647d0ab7a9..0bb30d961b 100644 --- a/drivers/usbhost/usbhost_enumerate.c +++ b/drivers/usbhost/usbhost_enumerate.c @@ -143,7 +143,7 @@ static inline int usbhost_devdesc(FAR const struct usb_devdesc_s *devdesc, id->vid = usbhost_getle16(devdesc->vendor); id->pid = usbhost_getle16(devdesc->product); - uvdbg("class:%d subclass:%04x protocol:%04x vid:%d pid:%d\n", + uinfo("class:%d subclass:%04x protocol:%04x vid:%d pid:%d\n", id->base, id->subclass, id->proto, id->vid, id->pid); return OK; } @@ -169,7 +169,7 @@ static inline int usbhost_configdesc(const uint8_t *configdesc, int cfglen, /* Verify that we were passed a configuration descriptor */ cfgdesc = (struct usb_cfgdesc_s *)configdesc; - uvdbg("cfg len:%d total len:%d\n", cfgdesc->len, cfglen); + uinfo("cfg len:%d total len:%d\n", cfgdesc->len, cfglen); if (cfgdesc->type != USB_DESC_TYPE_CONFIG) { @@ -200,7 +200,7 @@ static inline int usbhost_configdesc(const uint8_t *configdesc, int cfglen, id->base = ifdesc->classid; id->subclass = ifdesc->subclass; id->proto = ifdesc->protocol; - uvdbg("class:%d subclass:%d protocol:%d\n", + uinfo("class:%d subclass:%d protocol:%d\n", id->base, id->subclass, id->proto); return OK; } @@ -235,7 +235,7 @@ static inline int usbhost_classbind(FAR struct usbhost_hubport_s *hport, /* Is there is a class implementation registered to support this device. */ reg = usbhost_findclass(id); - uvdbg("usbhost_findclass: %p\n", reg); + uinfo("usbhost_findclass: %p\n", reg); if (reg != NULL) { /* Yes.. there is a class for this device. Get an instance of @@ -244,7 +244,7 @@ static inline int usbhost_classbind(FAR struct usbhost_hubport_s *hport, ret = -ENOMEM; devclass = CLASS_CREATE(reg, hport, id); - uvdbg("CLASS_CREATE: %p\n", devclass); + uinfo("CLASS_CREATE: %p\n", devclass); if (devclass != NULL) { /* Then bind the newly instantiated class instance */ @@ -266,7 +266,7 @@ static inline int usbhost_classbind(FAR struct usbhost_hubport_s *hport, } } - uvdbg("Returning: %d\n", ret); + uinfo("Returning: %d\n", ret); return ret; } @@ -389,7 +389,7 @@ int usbhost_enumerate(FAR struct usbhost_hubport_s *hport, /* Extract the correct max packetsize from the device descriptor */ maxpacketsize = ((struct usb_devdesc_s *)buffer)->mxpacketsize; - uvdbg("maxpacksetsize: %d\n", maxpacketsize); + uinfo("maxpacksetsize: %d\n", maxpacketsize); /* And reconfigure EP0 with the correct maximum packet size */ @@ -481,7 +481,7 @@ int usbhost_enumerate(FAR struct usbhost_hubport_s *hport, /* Extract the full size of the configuration data */ cfglen = (unsigned int)usbhost_getle16(((struct usb_cfgdesc_s *)buffer)->totallen); - uvdbg("sizeof config data: %d\n", cfglen); + uinfo("sizeof config data: %d\n", cfglen); /* Get all of the configuration descriptor data, index == 0 (Should not be * hard-coded!) diff --git a/drivers/usbhost/usbhost_findclass.c b/drivers/usbhost/usbhost_findclass.c index b544b60f48..7ae1cad4dc 100644 --- a/drivers/usbhost/usbhost_findclass.c +++ b/drivers/usbhost/usbhost_findclass.c @@ -72,7 +72,7 @@ static bool usbhost_idmatch(const struct usbhost_id_s *classid, const struct usbhost_id_s *devid) { - uvdbg("Compare to class:%d subclass:%d protocol:%d vid:%04x pid:%04x\n", + uinfo("Compare to class:%d subclass:%d protocol:%d vid:%04x pid:%04x\n", classid->base, classid->subclass, classid->proto, classid->vid, classid->pid); @@ -142,7 +142,7 @@ const struct usbhost_registry_s *usbhost_findclass(const struct usbhost_id_s *id int ndx; DEBUGASSERT(id); - uvdbg("Looking for class:%d subclass:%d protocol:%d vid:%04x pid:%04x\n", + uinfo("Looking for class:%d subclass:%d protocol:%d vid:%04x pid:%04x\n", id->base, id->subclass, id->proto, id->vid, id->pid); /* g_classregistry is a singly-linked list of class ID information added by @@ -161,7 +161,7 @@ const struct usbhost_registry_s *usbhost_findclass(const struct usbhost_id_s *id * protocol, then try each. */ - uvdbg("Checking class:%p nids:%d\n", usbclass, usbclass->nids); + uinfo("Checking class:%p nids:%d\n", usbclass, usbclass->nids); for (ndx = 0; ndx < usbclass->nids; ndx++) { /* Did we find a matching ID? */ diff --git a/drivers/usbhost/usbhost_hidkbd.c b/drivers/usbhost/usbhost_hidkbd.c index e11d02709b..5df339962d 100644 --- a/drivers/usbhost/usbhost_hidkbd.c +++ b/drivers/usbhost/usbhost_hidkbd.c @@ -180,10 +180,10 @@ # define idbg udbg # undef illdbg # define illdbg ulldbg -# undef ivdbg -# define ivdbg uvdbg -# undef illvdbg -# define illvdbg ullvdbg +# undef iinfo +# define iinfo uinfo +# undef illinfo +# define illinfo ullinfo #endif /**************************************************************************** @@ -631,7 +631,7 @@ static void usbhost_pollnotify(FAR struct usbhost_state_s *priv) fds->revents |= (fds->events & POLLIN); if (fds->revents != 0) { - uvdbg("Report events: %02x\n", fds->revents); + uinfo("Report events: %02x\n", fds->revents); sem_post(fds->sem); } } @@ -664,7 +664,7 @@ static inline FAR struct usbhost_state_s *usbhost_allocclass(void) DEBUGASSERT(!up_interrupt_context()); priv = (FAR struct usbhost_state_s *)kmm_malloc(sizeof(struct usbhost_state_s)); - uvdbg("Allocated: %p\n", priv); + uinfo("Allocated: %p\n", priv); return priv; } @@ -688,7 +688,7 @@ static inline void usbhost_freeclass(FAR struct usbhost_state_s *usbclass) /* Free the class instance. */ - uvdbg("Freeing: %p\n", usbclass); + uinfo("Freeing: %p\n", usbclass); sched_kfree(usbclass); } @@ -764,11 +764,11 @@ static void usbhost_destroy(FAR void *arg) DEBUGASSERT(priv != NULL && priv->usbclass.hport != NULL); hport = priv->usbclass.hport; - uvdbg("crefs: %d\n", priv->crefs); + uinfo("crefs: %d\n", priv->crefs); /* Unregister the driver */ - uvdbg("Unregister driver\n"); + uinfo("Unregister driver\n"); usbhost_mkdevname(priv, devname); (void)unregister_driver(devname); @@ -965,7 +965,7 @@ static inline void usbhost_encodescancode(FAR struct usbhost_state_s *priv, /* Yes the value is within range */ encoded = encoding[scancode - FIRST_ENCODING]; - ivdbg(" scancode: %02x modifier: %02x encoded: %d\n", + iinfo(" scancode: %02x modifier: %02x encoded: %d\n", scancode, modifier, encoded); if (encoded) @@ -1019,7 +1019,7 @@ static int usbhost_kbdpoll(int argc, char *argv[]) bool newstate; int ret; - uvdbg("Started\n"); + uinfo("Started\n"); /* Synchronize with the start-up logic. Get the private instance, re-start * the start-up logic, and wait a bit to make sure that all of the class @@ -1041,7 +1041,7 @@ static int usbhost_kbdpoll(int argc, char *argv[]) /* Loop here until the device is disconnected */ - uvdbg("Entering poll loop\n"); + uinfo("Entering poll loop\n"); while (!priv->disconnected) { @@ -1143,7 +1143,7 @@ static int usbhost_kbdpoll(int argc, char *argv[]) */ keycode = usbhost_mapscancode(rpt->key[i], rpt->modifier); - ivdbg("Key %d: %02x keycode:%c modifier: %02x\n", + iinfo("Key %d: %02x keycode:%c modifier: %02x\n", i, rpt->key[i], keycode ? keycode : ' ', rpt->modifier); /* Zero at this point means that the key does not map to a @@ -1390,7 +1390,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, { FAR struct usb_ifdesc_s *ifdesc = (FAR struct usb_ifdesc_s *)configdesc; - uvdbg("Interface descriptor\n"); + uinfo("Interface descriptor\n"); DEBUGASSERT(remaining >= USB_SIZEOF_IFDESC); /* Did we already find what we needed from a preceding interface? */ @@ -1418,7 +1418,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, /* HID descriptor */ case USBHID_DESCTYPE_HID: - uvdbg("HID descriptor\n"); + uinfo("HID descriptor\n"); break; /* Endpoint descriptor. We expect one or two interrupt endpoints, @@ -1429,7 +1429,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, { FAR struct usb_epdesc_s *epdesc = (FAR struct usb_epdesc_s *)configdesc; - uvdbg("Endpoint descriptor\n"); + uinfo("Endpoint descriptor\n"); DEBUGASSERT(remaining >= USB_SIZEOF_EPDESC); /* Check for an interrupt endpoint. */ @@ -1463,7 +1463,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, epoutdesc.xfrtype = USB_EP_ATTR_XFER_INT; epoutdesc.interval = epdesc->interval; epoutdesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize); - uvdbg("Interrupt OUT EP addr:%d mxpacketsize:%d\n", + uinfo("Interrupt OUT EP addr:%d mxpacketsize:%d\n", epoutdesc.addr, epoutdesc.mxpacketsize); } else @@ -1491,7 +1491,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, epindesc.xfrtype = USB_EP_ATTR_XFER_INT; epindesc.interval = epdesc->interval; epindesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize); - uvdbg("Interrupt IN EP addr:%d mxpacketsize:%d\n", + uinfo("Interrupt IN EP addr:%d mxpacketsize:%d\n", epindesc.addr, epindesc.mxpacketsize); } } @@ -1501,7 +1501,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, /* Other descriptors are just ignored for now */ default: - uvdbg("Other descriptor: %d\n", desc->type); + uinfo("Other descriptor: %d\n", desc->type); break; } @@ -1543,7 +1543,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, /* Then the optional interrupt OUT endpoint */ - ullvdbg("Found EPOOUT:%s\n", + ullinfo("Found EPOOUT:%s\n", (found & USBHOST_EPOUTFOUND) != 0 ? "YES" : "NO"); if ((found & USBHOST_EPOUTFOUND) != 0) @@ -1557,7 +1557,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, } } - ullvdbg("Endpoints allocated\n"); + ullinfo("Endpoints allocated\n"); return OK; } @@ -1608,7 +1608,7 @@ static inline int usbhost_devinit(FAR struct usbhost_state_s *priv) * memory resources, primarily for the dedicated stack (CONFIG_HIDKBD_STACKSIZE). */ - uvdbg("Start poll task\n"); + uinfo("Start poll task\n"); /* The inputs to a task started by kernel_thread() are very awkard for this * purpose. They are really designed for command line tasks (argc/argv). So @@ -1641,7 +1641,7 @@ static inline int usbhost_devinit(FAR struct usbhost_state_s *priv) /* Register the driver */ - uvdbg("Register driver\n"); + uinfo("Register driver\n"); usbhost_mkdevname(priv, devname); ret = register_driver(devname, &g_hidkbd_fops, 0666, priv); @@ -1991,7 +1991,7 @@ static int usbhost_disconnected(struct usbhost_class_s *usbclass) */ priv->disconnected = true; - ullvdbg("Disconnected\n"); + ullinfo("Disconnected\n"); /* Is there a thread waiting for keyboard data that will never come? */ @@ -2054,7 +2054,7 @@ static int usbhost_open(FAR struct file *filep) irqstate_t flags; int ret; - uvdbg("Entry\n"); + uinfo("Entry\n"); DEBUGASSERT(filep && filep->f_inode); inode = filep->f_inode; priv = inode->i_private; @@ -2107,7 +2107,7 @@ static int usbhost_close(FAR struct file *filep) FAR struct usbhost_state_s *priv; irqstate_t flags; - uvdbg("Entry\n"); + uinfo("Entry\n"); DEBUGASSERT(filep && filep->f_inode); inode = filep->f_inode; priv = inode->i_private; @@ -2201,7 +2201,7 @@ static ssize_t usbhost_read(FAR struct file *filep, FAR char *buffer, size_t len unsigned int tail; int ret; - uvdbg("Entry\n"); + uinfo("Entry\n"); DEBUGASSERT(filep && filep->f_inode && buffer); inode = filep->f_inode; priv = inode->i_private; @@ -2242,7 +2242,7 @@ static ssize_t usbhost_read(FAR struct file *filep, FAR char *buffer, size_t len /* Wait for data to be available */ - uvdbg("Waiting...\n"); + uinfo("Waiting...\n"); priv->waiting = true; usbhost_givesem(&priv->exclsem); @@ -2321,7 +2321,7 @@ static int usbhost_poll(FAR struct file *filep, FAR struct pollfd *fds, int ret = OK; int i; - uvdbg("Entry\n"); + uinfo("Entry\n"); DEBUGASSERT(filep && filep->f_inode && fds); inode = filep->f_inode; priv = inode->i_private; diff --git a/drivers/usbhost/usbhost_hidmouse.c b/drivers/usbhost/usbhost_hidmouse.c index e7d86e6317..b655ee689b 100644 --- a/drivers/usbhost/usbhost_hidmouse.c +++ b/drivers/usbhost/usbhost_hidmouse.c @@ -201,10 +201,10 @@ # define idbg udbg # undef illdbg # define illdbg ulldbg -# undef ivdbg -# define ivdbg uvdbg -# undef illvdbg -# define illvdbg ullvdbg +# undef iinfo +# define iinfo uinfo +# undef illinfo +# define illinfo ullinfo #endif /**************************************************************************** @@ -491,7 +491,7 @@ static void usbhost_pollnotify(FAR struct usbhost_state_s *priv) fds->revents |= (fds->events & POLLIN); if (fds->revents != 0) { - uvdbg("Report events: %02x\n", fds->revents); + uinfo("Report events: %02x\n", fds->revents); sem_post(fds->sem); } } @@ -524,7 +524,7 @@ static inline FAR struct usbhost_state_s *usbhost_allocclass(void) DEBUGASSERT(!up_interrupt_context()); priv = (FAR struct usbhost_state_s *)kmm_malloc(sizeof(struct usbhost_state_s)); - uvdbg("Allocated: %p\n", priv); + uinfo("Allocated: %p\n", priv); return priv; } @@ -548,7 +548,7 @@ static inline void usbhost_freeclass(FAR struct usbhost_state_s *usbclass) /* Free the class instance. */ - uvdbg("Freeing: %p\n", usbclass); + uinfo("Freeing: %p\n", usbclass); sched_kfree(usbclass); } @@ -623,13 +623,13 @@ static void usbhost_destroy(FAR void *arg) char devname[DEV_NAMELEN]; DEBUGASSERT(priv != NULL && priv->usbclass.hport != NULL); - uvdbg("crefs: %d\n", priv->crefs); + uinfo("crefs: %d\n", priv->crefs); hport = priv->usbclass.hport; /* Unregister the driver */ - uvdbg("Unregister driver\n"); + uinfo("Unregister driver\n"); usbhost_mkdevname(priv, devname); (void)unregister_driver(devname); @@ -709,7 +709,7 @@ static void usbhost_notify(FAR struct usbhost_state_s *priv) if (fds) { fds->revents |= POLLIN; - ivdbg("Report events: %02x\n", fds->revents); + iinfo("Report events: %02x\n", fds->revents); sem_post(fds->sem); } } @@ -1056,7 +1056,7 @@ static int usbhost_mouse_poll(int argc, char *argv[]) ssize_t nbytes; int ret = OK; - uvdbg("Started\n"); + uinfo("Started\n"); /* Synchronize with the start-up logic. Get the private instance, re-start * the start-up logic, and wait a bit to make sure that all of the class @@ -1078,7 +1078,7 @@ static int usbhost_mouse_poll(int argc, char *argv[]) /* Loop here until the device is disconnected */ - uvdbg("Entering poll loop\n"); + uinfo("Entering poll loop\n"); while (!priv->disconnected) { @@ -1378,7 +1378,7 @@ static int usbhost_waitsample(FAR struct usbhost_state_s *priv, { /* Wait for a change in the HIDMOUSE state */ - ivdbg("Waiting..\n"); + iinfo("Waiting..\n"); priv->nwaiters++; ret = sem_wait(&priv->waitsem); priv->nwaiters--; @@ -1404,7 +1404,7 @@ static int usbhost_waitsample(FAR struct usbhost_state_s *priv, } } - ivdbg("Sampled\n"); + iinfo("Sampled\n"); /* Re-acquire the semaphore that manages mutually exclusive access to * the device structure. We may have to wait here. But we have our sample. @@ -1509,7 +1509,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, case USB_DESC_TYPE_INTERFACE: { - uvdbg("Interface descriptor\n"); + uinfo("Interface descriptor\n"); DEBUGASSERT(remaining >= USB_SIZEOF_IFDESC); /* Did we already find what we needed from a preceding interface? */ @@ -1534,7 +1534,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, /* HID descriptor */ case USBHID_DESCTYPE_HID: - uvdbg("HID descriptor\n"); + uinfo("HID descriptor\n"); break; /* Endpoint descriptor. We expect one or two interrupt endpoints, @@ -1545,7 +1545,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, { FAR struct usb_epdesc_s *epdesc = (FAR struct usb_epdesc_s *)configdesc; - uvdbg("Endpoint descriptor\n"); + uinfo("Endpoint descriptor\n"); DEBUGASSERT(remaining >= USB_SIZEOF_EPDESC); /* Check for an interrupt endpoint. */ @@ -1580,7 +1580,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, epindesc.interval = epdesc->interval; epindesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize); - uvdbg("Interrupt IN EP addr:%d mxpacketsize:%d\n", + uinfo("Interrupt IN EP addr:%d mxpacketsize:%d\n", epindesc.addr, epindesc.mxpacketsize); } } @@ -1590,7 +1590,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, /* Other descriptors are just ignored for now */ default: - uvdbg("Other descriptor: %d\n", desc->type); + uinfo("Other descriptor: %d\n", desc->type); break; } @@ -1628,7 +1628,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, return ret; } - ullvdbg("Endpoint allocated\n"); + ullinfo("Endpoint allocated\n"); return OK; } @@ -1679,7 +1679,7 @@ static inline int usbhost_devinit(FAR struct usbhost_state_s *priv) * memory resources, primarily for the dedicated stack (CONFIG_HIDMOUSE_STACKSIZE). */ - uvdbg("Start poll task\n"); + uinfo("Start poll task\n"); /* The inputs to a task started by kernel_thread() are very awkward for this * purpose. They are really designed for command line tasks (argc/argv). So @@ -1712,7 +1712,7 @@ static inline int usbhost_devinit(FAR struct usbhost_state_s *priv) /* Register the driver */ - uvdbg("Register driver\n"); + uinfo("Register driver\n"); usbhost_mkdevname(priv, devname); ret = register_driver(devname, &g_hidmouse_fops, 0666, priv); @@ -2062,7 +2062,7 @@ static int usbhost_disconnected(struct usbhost_class_s *usbclass) */ priv->disconnected = true; - ullvdbg("Disconnected\n"); + ullinfo("Disconnected\n"); /* Are there a thread(s) waiting for mouse data that will never come? */ @@ -2124,7 +2124,7 @@ static int usbhost_open(FAR struct file *filep) irqstate_t flags; int ret; - uvdbg("Entry\n"); + uinfo("Entry\n"); DEBUGASSERT(filep && filep->f_inode); inode = filep->f_inode; priv = inode->i_private; @@ -2199,7 +2199,7 @@ static int usbhost_close(FAR struct file *filep) FAR struct usbhost_state_s *priv; irqstate_t flags; - uvdbg("Entry\n"); + uinfo("Entry\n"); DEBUGASSERT(filep && filep->f_inode); inode = filep->f_inode; priv = inode->i_private; @@ -2295,7 +2295,7 @@ static ssize_t usbhost_read(FAR struct file *filep, FAR char *buffer, size_t len struct mouse_sample_s sample; int ret; - uvdbg("Entry\n"); + uinfo("Entry\n"); DEBUGASSERT(filep && filep->f_inode && buffer); inode = filep->f_inode; priv = inode->i_private; @@ -2392,10 +2392,10 @@ static ssize_t usbhost_read(FAR struct file *filep, FAR char *buffer, size_t len report->point[0].flags = TOUCH_MOVE | TOUCH_ID_VALID | TOUCH_POS_VALID; } - ivdbg(" id: %d\n", report->point[0].id); - ivdbg(" flags: %02x\n", report->point[0].flags); - ivdbg(" x: %d\n", report->point[0].x); - ivdbg(" y: %d\n", report->point[0].y); + iinfo(" id: %d\n", report->point[0].id); + iinfo(" flags: %02x\n", report->point[0].flags); + iinfo(" x: %d\n", report->point[0].x); + iinfo(" y: %d\n", report->point[0].y); ret = SIZEOF_TOUCH_SAMPLE_S(1); #else @@ -2414,7 +2414,7 @@ static ssize_t usbhost_read(FAR struct file *filep, FAR char *buffer, size_t len errout: usbhost_givesem(&priv->exclsem); - ivdbg("Returning: %d\n", ret); + iinfo("Returning: %d\n", ret); return (ssize_t)ret; } @@ -2451,7 +2451,7 @@ static int usbhost_poll(FAR struct file *filep, FAR struct pollfd *fds, int ret = OK; int i; - uvdbg("Entry\n"); + uinfo("Entry\n"); DEBUGASSERT(filep && filep->f_inode && fds); inode = filep->f_inode; priv = inode->i_private; diff --git a/drivers/usbhost/usbhost_hub.c b/drivers/usbhost/usbhost_hub.c index 7576eb565f..bc6ce5dac0 100644 --- a/drivers/usbhost/usbhost_hub.c +++ b/drivers/usbhost/usbhost_hub.c @@ -228,7 +228,7 @@ static struct usbhost_registry_s g_hub = static void usbhost_hport_deactivate(FAR struct usbhost_hubport_s *hport) { - uvdbg("Deactivating: %s port %d\n", + uinfo("Deactivating: %s port %d\n", ROOTHUB(hport) ? "Root" : "Hub", hport->port); /* Don't free the control pipe of root hub ports! */ @@ -274,7 +274,7 @@ static int usbhost_hport_activate(FAR struct usbhost_hubport_s *hport) struct usbhost_epdesc_s epdesc; int ret; - uvdbg("Activating port %d\n", hport->port); + uinfo("Activating port %d\n", hport->port); epdesc.hport = hport; epdesc.addr = 0; @@ -384,7 +384,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_class_s *hubclass, FAR struct usb_ifdesc_s *ifdesc = (FAR struct usb_ifdesc_s *)configdesc; - uvdbg("Interface descriptor\n"); + uinfo("Interface descriptor\n"); DEBUGASSERT(remaining >= USB_SIZEOF_IFDESC); /* Save the interface number and mark ONLY the interface found */ @@ -401,7 +401,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_class_s *hubclass, FAR struct usb_epdesc_s *epdesc = (FAR struct usb_epdesc_s *)configdesc; - uvdbg("Endpoint descriptor\n"); + uinfo("Endpoint descriptor\n"); DEBUGASSERT(remaining >= USB_SIZEOF_EPDESC); /* Check for an interrupt endpoint. */ @@ -415,7 +415,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_class_s *hubclass, { /* It is an OUT interrupt endpoint. Ignore */ - uvdbg("Interrupt OUT EP addr:%d mxpacketsize:%d\n", + uinfo("Interrupt OUT EP addr:%d mxpacketsize:%d\n", (epdesc->addr & USB_EP_ADDR_NUMBER_MASK), usbhost_getle16(epdesc->mxpacketsize)); } @@ -431,7 +431,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_class_s *hubclass, intindesc.interval = epdesc->interval; intindesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize); - uvdbg("Interrupt IN EP: addr=%d interval=%d mxpacketsize=%d\n", + uinfo("Interrupt IN EP: addr=%d interval=%d mxpacketsize=%d\n", intindesc.addr, intindesc.interval, intindesc.mxpacketsize); } } @@ -479,7 +479,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_class_s *hubclass, return ret; } - ullvdbg("Endpoint allocated\n"); + ullinfo("Endpoint allocated\n"); return OK; } @@ -513,7 +513,7 @@ static inline int usbhost_hubdesc(FAR struct usbhost_class_s *hubclass) uint16_t hubchar; int ret; - uvdbg("Read hub descriptor\n"); + uinfo("Read hub descriptor\n"); DEBUGASSERT(hubclass != NULL); priv = &((FAR struct usbhost_hubclass_s *)hubclass)->hubpriv; @@ -550,20 +550,20 @@ static inline int usbhost_hubdesc(FAR struct usbhost_class_s *hubclass) priv->pwrondelay = (2 * hubdesc.pwrondelay); priv->ctrlcurrent = hubdesc.ctrlcurrent; - uvdbg("Hub Descriptor:\n"); - uvdbg(" bDescLength: %d\n", hubdesc.len); - uvdbg(" bDescriptorType: 0x%02x\n", hubdesc.type); - uvdbg(" bNbrPorts: %d\n", hubdesc.nports); - uvdbg(" wHubCharacteristics: 0x%04x\n", usbhost_getle16(hubdesc.characteristics)); - uvdbg(" lpsm: %d\n", priv->lpsm); - uvdbg(" compounddev: %s\n", priv->compounddev ? "TRUE" : "FALSE"); - uvdbg(" ocmode: %d\n", priv->ocmode); - uvdbg(" indicator: %s\n", priv->indicator ? "TRUE" : "FALSE"); - uvdbg(" bPwrOn2PwrGood: %d\n", hubdesc.pwrondelay); - uvdbg(" pwrondelay: %d\n", priv->pwrondelay); - uvdbg(" bHubContrCurrent: %d\n", hubdesc.ctrlcurrent); - uvdbg(" DeviceRemovable: %d\n", hubdesc.devattached); - uvdbg(" PortPwrCtrlMask: %d\n", hubdesc.pwrctrlmask); + uinfo("Hub Descriptor:\n"); + uinfo(" bDescLength: %d\n", hubdesc.len); + uinfo(" bDescriptorType: 0x%02x\n", hubdesc.type); + uinfo(" bNbrPorts: %d\n", hubdesc.nports); + uinfo(" wHubCharacteristics: 0x%04x\n", usbhost_getle16(hubdesc.characteristics)); + uinfo(" lpsm: %d\n", priv->lpsm); + uinfo(" compounddev: %s\n", priv->compounddev ? "TRUE" : "FALSE"); + uinfo(" ocmode: %d\n", priv->ocmode); + uinfo(" indicator: %s\n", priv->indicator ? "TRUE" : "FALSE"); + uinfo(" bPwrOn2PwrGood: %d\n", hubdesc.pwrondelay); + uinfo(" pwrondelay: %d\n", priv->pwrondelay); + uinfo(" bHubContrCurrent: %d\n", hubdesc.ctrlcurrent); + uinfo(" DeviceRemovable: %d\n", hubdesc.devattached); + uinfo(" PortPwrCtrlMask: %d\n", hubdesc.pwrctrlmask); return OK; } @@ -694,7 +694,7 @@ static void usbhost_hub_event(FAR void *arg) if (priv->disconnected) { - uvdbg("Disconnected\n"); + uinfo("Disconnected\n"); return; } @@ -707,7 +707,7 @@ static void usbhost_hub_event(FAR void *arg) hport = hubclass->hport; statuschange = priv->buffer[0]; - uvdbg("StatusChange: %02x\n", statuschange); + uinfo("StatusChange: %02x\n", statuschange); /* Check for status change on any port */ @@ -720,7 +720,7 @@ static void usbhost_hub_event(FAR void *arg) continue; } - uvdbg("Port %d status change\n", port); + uinfo("Port %d status change\n", port); /* Port status changed, check what happened */ @@ -783,7 +783,7 @@ static void usbhost_hub_event(FAR void *arg) uint16_t debouncestable = 0; uint16_t connection = 0xffff; - uvdbg("Port %d status %04x change %04x\n", port, status, change); + uinfo("Port %d status %04x change %04x\n", port, status, change); /* Debounce */ @@ -812,7 +812,7 @@ static void usbhost_hub_event(FAR void *arg) debouncestable += 25; if (debouncestable >= 100) { - uvdbg("Port %d debouncestable=%d\n", port, debouncestable); + uinfo("Port %d debouncestable=%d\n", port, debouncestable); break; } } @@ -847,7 +847,7 @@ static void usbhost_hub_event(FAR void *arg) { /* Device connected to a port on the hub */ - uvdbg("Connection on port %d\n", port); + uinfo("Connection on port %d\n", port); ctrlreq->type = USBHUB_REQ_TYPE_PORT; ctrlreq->req = USBHUB_REQ_SETFEATURE; @@ -881,7 +881,7 @@ static void usbhost_hub_event(FAR void *arg) status = usbhost_getle16(portstatus.status); change = usbhost_getle16(portstatus.change); - uvdbg("port %d status %04x change %04x after reset\n", + uinfo("port %d status %04x change %04x after reset\n", port, status, change); if ((status & USBHUB_PORT_STAT_RESET) == 0 && @@ -943,7 +943,7 @@ static void usbhost_hub_event(FAR void *arg) * resources. */ - uvdbg("Disconnection on port %d\n", port); + uinfo("Disconnection on port %d\n", port); /* Free any devices classes connect on this hub port */ @@ -1027,13 +1027,13 @@ static void usbhost_disconnect_event(FAR void *arg) irqstate_t flags; int port; - uvdbg("Disconnecting\n"); + uinfo("Disconnecting\n"); DEBUGASSERT(hubclass != NULL && hubclass->hport != NULL); priv = &((FAR struct usbhost_hubclass_s *)hubclass)->hubpriv; hport = hubclass->hport; - uvdbg("Destroying hub on port %d\n", hport->port); + uinfo("Destroying hub on port %d\n", hport->port); /* Set an indication to any users of the device that the device is no * longer available. @@ -1453,7 +1453,7 @@ static int usbhost_disconnected(struct usbhost_class_s *hubclass) irqstate_t flags; int ret; - uvdbg("Disconnected\n"); + uinfo("Disconnected\n"); /* Execute the disconnect action from the worker thread. */ diff --git a/drivers/usbhost/usbhost_registerclass.c b/drivers/usbhost/usbhost_registerclass.c index aaf61d0428..a795b88d02 100644 --- a/drivers/usbhost/usbhost_registerclass.c +++ b/drivers/usbhost/usbhost_registerclass.c @@ -96,7 +96,7 @@ int usbhost_registerclass(struct usbhost_registry_s *usbclass) { irqstate_t flags; - uvdbg("Registering class:%p nids:%d\n", usbclass, usbclass->nids); + uinfo("Registering class:%p nids:%d\n", usbclass, usbclass->nids); /* g_classregistry is a singly-linkedlist of class ID information added by * calls to usbhost_registerclass(). Since this list is accessed from USB diff --git a/drivers/usbhost/usbhost_skeleton.c b/drivers/usbhost/usbhost_skeleton.c index 9a7ed87de3..a4250031aa 100644 --- a/drivers/usbhost/usbhost_skeleton.c +++ b/drivers/usbhost/usbhost_skeleton.c @@ -251,7 +251,7 @@ static inline FAR struct usbhost_state_s *usbhost_allocclass(void) DEBUGASSERT(!up_interrupt_context()); priv = (FAR struct usbhost_state_s *)kmm_malloc(sizeof(struct usbhost_state_s)); - uvdbg("Allocated: %p\n", priv); + uinfo("Allocated: %p\n", priv); return priv; } @@ -277,7 +277,7 @@ static inline void usbhost_freeclass(FAR struct usbhost_state_s *usbclass) * executing from an interrupt handler. */ - uvdbg("Freeing: %p\n", usbclass); + uinfo("Freeing: %p\n", usbclass); kmm_free(usbclass); } @@ -357,7 +357,7 @@ static void usbhost_destroy(FAR void *arg) DEBUGASSERT(hport->drvr); drvr = hport->drvr; - uvdbg("crefs: %d\n", priv->crefs); + uinfo("crefs: %d\n", priv->crefs); /* Unregister the driver */ @@ -465,7 +465,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, { FAR struct usb_ifdesc_s *ifdesc = (FAR struct usb_ifdesc_s *)configdesc; - uvdbg("Interface descriptor\n"); + uinfo("Interface descriptor\n"); DEBUGASSERT(remaining >= USB_SIZEOF_IFDESC); /* Save the interface number and mark ONLY the interface found */ @@ -483,7 +483,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, { FAR struct usb_epdesc_s *epdesc = (FAR struct usb_epdesc_s *)configdesc; - uvdbg("Endpoint descriptor\n"); + uinfo("Endpoint descriptor\n"); DEBUGASSERT(remaining >= USB_SIZEOF_EPDESC); /* Check for a bulk endpoint. */ @@ -516,7 +516,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, boutdesc.xfrtype = USB_EP_ATTR_XFER_BULK; boutdesc.interval = epdesc->interval; boutdesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize); - uvdbg("Bulk OUT EP addr:%d mxpacketsize:%d\n", + uinfo("Bulk OUT EP addr:%d mxpacketsize:%d\n", boutdesc.addr, boutdesc.mxpacketsize); } else @@ -544,7 +544,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, bindesc.xfrtype = USB_EP_ATTR_XFER_BULK; bindesc.interval = epdesc->interval; bindesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize); - uvdbg("Bulk IN EP addr:%d mxpacketsize:%d\n", + uinfo("Bulk IN EP addr:%d mxpacketsize:%d\n", bindesc.addr, bindesc.mxpacketsize); } } @@ -600,7 +600,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, return ret; } - ullvdbg("Endpoints allocated\n"); + ullinfo("Endpoints allocated\n"); return OK; } @@ -644,7 +644,7 @@ static inline int usbhost_devinit(FAR struct usbhost_state_s *priv) { char devname[DEV_NAMELEN]; - uvdbg("Register block driver\n"); + uinfo("Register block driver\n"); usbhost_mkdevname(priv, devname); // ret = register_blockdriver(devname, &g_bops, 0, priv); } @@ -677,7 +677,7 @@ static inline int usbhost_devinit(FAR struct usbhost_state_s *priv) { /* Ready for normal operation as a block device driver */ - uvdbg("Successfully initialized\n"); + uinfo("Successfully initialized\n"); priv->crefs--; usbhost_givesem(&priv->exclsem); } @@ -1013,7 +1013,7 @@ static int usbhost_disconnected(struct usbhost_class_s *usbclass) * block driver. */ - ullvdbg("crefs: %d\n", priv->crefs); + ullinfo("crefs: %d\n", priv->crefs); if (priv->crefs == 1) { /* Destroy the class instance. If we are executing from an interrupt @@ -1025,7 +1025,7 @@ static int usbhost_disconnected(struct usbhost_class_s *usbclass) { /* Destroy the instance on the worker thread. */ - uvdbg("Queuing destruction: worker %p->%p\n", priv->work.worker, usbhost_destroy); + uinfo("Queuing destruction: worker %p->%p\n", priv->work.worker, usbhost_destroy); DEBUGASSERT(priv->work.worker == NULL); (void)work_queue(HPWORK, &priv->work, usbhost_destroy, priv, 0); } diff --git a/drivers/usbhost/usbhost_storage.c b/drivers/usbhost/usbhost_storage.c index a4d5da6002..e3f6a8769a 100644 --- a/drivers/usbhost/usbhost_storage.c +++ b/drivers/usbhost/usbhost_storage.c @@ -377,7 +377,7 @@ static inline FAR struct usbhost_state_s *usbhost_allocclass(void) } leave_critical_section(flags); - ullvdbg("Allocated: %p\n", entry); + ullinfo("Allocated: %p\n", entry); return (FAR struct usbhost_state_s *)entry; } #else @@ -391,7 +391,7 @@ static inline FAR struct usbhost_state_s *usbhost_allocclass(void) DEBUGASSERT(!up_interrupt_context()); priv = (FAR struct usbhost_state_s *)kmm_malloc(sizeof(struct usbhost_state_s)); - uvdbg("Allocated: %p\n", priv); + uinfo("Allocated: %p\n", priv); return priv; } #endif @@ -417,7 +417,7 @@ static inline void usbhost_freeclass(FAR struct usbhost_state_s *usbclass) irqstate_t flags; DEBUGASSERT(entry != NULL); - ullvdbg("Freeing: %p\n", entry); + ullinfo("Freeing: %p\n", entry); /* Just put the pre-allocated class structure back on the freelist */ @@ -435,7 +435,7 @@ static inline void usbhost_freeclass(FAR struct usbhost_state_s *usbclass) * from an interrupt handler. */ - uvdbg("Freeing: %p\n", usbclass); + uinfo("Freeing: %p\n", usbclass); sched_kfree(usbclass); } #endif @@ -506,18 +506,18 @@ static void usbhost_dumpcbw(FAR struct usbmsc_cbw_s *cbw) { int i; - uvdbg("CBW:\n"); - uvdbg(" signature: %08x\n", usbhost_getle32(cbw->signature)); - uvdbg(" tag: %08x\n", usbhost_getle32(cbw->tag)); - uvdbg(" datlen: %08x\n", usbhost_getle32(cbw->datlen)); - uvdbg(" flags: %02x\n", cbw->flags); - uvdbg(" lun: %02x\n", cbw->lun); - uvdbg(" cdblen: %02x\n", cbw->cdblen); + uinfo("CBW:\n"); + uinfo(" signature: %08x\n", usbhost_getle32(cbw->signature)); + uinfo(" tag: %08x\n", usbhost_getle32(cbw->tag)); + uinfo(" datlen: %08x\n", usbhost_getle32(cbw->datlen)); + uinfo(" flags: %02x\n", cbw->flags); + uinfo(" lun: %02x\n", cbw->lun); + uinfo(" cdblen: %02x\n", cbw->cdblen); - uvdbg("CDB:\n"); + uinfo("CDB:\n"); for (i = 0; i < cbw->cdblen; i += 8) { - uvdbg(" %02x %02x %02x %02x %02x %02x %02x %02x\n", + uinfo(" %02x %02x %02x %02x %02x %02x %02x %02x\n", cbw->cdb[i], cbw->cdb[i+1], cbw->cdb[i+2], cbw->cdb[i+3], cbw->cdb[i+4], cbw->cdb[i+5], cbw->cdb[i+6], cbw->cdb[i+7]); } @@ -525,11 +525,11 @@ static void usbhost_dumpcbw(FAR struct usbmsc_cbw_s *cbw) static void usbhost_dumpcsw(FAR struct usbmsc_csw_s *csw) { - uvdbg("CSW:\n"); - uvdbg(" signature: %08x\n", usbhost_getle32(csw->signature)); - uvdbg(" tag: %08x\n", usbhost_getle32(csw->tag)); - uvdbg(" residue: %08x\n", usbhost_getle32(csw->residue)); - uvdbg(" status: %02x\n", csw->status); + uinfo("CSW:\n"); + uinfo(" signature: %08x\n", usbhost_getle32(csw->signature)); + uinfo(" tag: %08x\n", usbhost_getle32(csw->tag)); + uinfo(" residue: %08x\n", usbhost_getle32(csw->residue)); + uinfo(" status: %02x\n", csw->status); } #endif @@ -685,7 +685,7 @@ static inline int usbhost_maxlunreq(FAR struct usbhost_state_s *priv) * allocated memory. */ - uvdbg("Request maximum logical unit number\n"); + uinfo("Request maximum logical unit number\n"); memset(req, 0, sizeof(struct usb_ctrlreq_s)); req->type = USB_DIR_IN | USB_REQ_TYPE_CLASS | USB_REQ_RECIPIENT_INTERFACE; @@ -920,7 +920,7 @@ static void usbhost_destroy(FAR void *arg) DEBUGASSERT(priv != NULL && priv->usbclass.hport != NULL); hport = priv->usbclass.hport; - uvdbg("crefs: %d\n", priv->crefs); + uinfo("crefs: %d\n", priv->crefs); /* Unregister the block driver */ @@ -1046,7 +1046,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, { FAR struct usb_ifdesc_s *ifdesc = (FAR struct usb_ifdesc_s *)configdesc; - uvdbg("Interface descriptor\n"); + uinfo("Interface descriptor\n"); DEBUGASSERT(remaining >= USB_SIZEOF_IFDESC); /* Save the interface number and mark ONLY the interface found */ @@ -1064,7 +1064,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, { FAR struct usb_epdesc_s *epdesc = (FAR struct usb_epdesc_s *)configdesc; - uvdbg("Endpoint descriptor\n"); + uinfo("Endpoint descriptor\n"); DEBUGASSERT(remaining >= USB_SIZEOF_EPDESC); /* Check for a bulk endpoint. We only support the bulk-only @@ -1100,7 +1100,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, boutdesc.interval = epdesc->interval; boutdesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize); - uvdbg("Bulk OUT EP addr:%d mxpacketsize:%d\n", + uinfo("Bulk OUT EP addr:%d mxpacketsize:%d\n", boutdesc.addr, boutdesc.mxpacketsize); } else @@ -1127,7 +1127,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, bindesc.xfrtype = USB_EP_ATTR_XFER_BULK; bindesc.interval = epdesc->interval; bindesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize); - uvdbg("Bulk IN EP addr:%d mxpacketsize:%d\n", + uinfo("Bulk IN EP addr:%d mxpacketsize:%d\n", bindesc.addr, bindesc.mxpacketsize); } } @@ -1185,7 +1185,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, return ret; } - ullvdbg("Endpoints allocated\n"); + ullinfo("Endpoints allocated\n"); return OK; } @@ -1234,12 +1234,12 @@ static inline int usbhost_initvolume(FAR struct usbhost_state_s *priv) /* Request the maximum logical unit number */ - uvdbg("Get max LUN\n"); + uinfo("Get max LUN\n"); ret = usbhost_maxlunreq(priv); for (retries = 0; retries < USBHOST_MAX_RETRIES /* && ret >= 0 */; retries++) { - uvdbg("Test unit ready, retries=%d\n", retries); + uinfo("Test unit ready, retries=%d\n", retries); /* Wait just a bit */ @@ -1268,7 +1268,7 @@ static inline int usbhost_initvolume(FAR struct usbhost_state_s *priv) * The returned status is ignored here. */ - uvdbg("Request sense\n"); + uinfo("Request sense\n"); ret = usbhost_requestsense(priv); } @@ -1298,7 +1298,7 @@ static inline int usbhost_initvolume(FAR struct usbhost_state_s *priv) { /* Get the capacity of the volume */ - uvdbg("Read capacity\n"); + uinfo("Read capacity\n"); ret = usbhost_readcapacity(priv); if (ret >= 0) { @@ -1319,7 +1319,7 @@ static inline int usbhost_initvolume(FAR struct usbhost_state_s *priv) { /* Inquiry */ - uvdbg("Inquiry\n"); + uinfo("Inquiry\n"); ret = usbhost_inquiry(priv); if (ret >= 0) { @@ -1340,7 +1340,7 @@ static inline int usbhost_initvolume(FAR struct usbhost_state_s *priv) { char devname[DEV_NAMELEN]; - uvdbg("Register block driver\n"); + uinfo("Register block driver\n"); usbhost_mkdevname(priv, devname); ret = register_blockdriver(devname, &g_bops, 0, priv); } @@ -1830,7 +1830,7 @@ static int usbhost_disconnected(struct usbhost_class_s *usbclass) * block driver. */ - ullvdbg("crefs: %d\n", priv->crefs); + ullinfo("crefs: %d\n", priv->crefs); if (priv->crefs == 1) { /* Destroy the class instance. If we are executing from an interrupt @@ -1842,7 +1842,7 @@ static int usbhost_disconnected(struct usbhost_class_s *usbclass) { /* Destroy the instance on the worker thread. */ - uvdbg("Queuing destruction: worker %p->%p\n", priv->work.worker, usbhost_destroy); + uinfo("Queuing destruction: worker %p->%p\n", priv->work.worker, usbhost_destroy); DEBUGASSERT(priv->work.worker == NULL); (void)work_queue(HPWORK, &priv->work, usbhost_destroy, priv, 0); } @@ -1874,7 +1874,7 @@ static int usbhost_open(FAR struct inode *inode) irqstate_t flags; int ret; - uvdbg("Entry\n"); + uinfo("Entry\n"); DEBUGASSERT(inode && inode->i_private); priv = (FAR struct usbhost_state_s *)inode->i_private; @@ -1923,7 +1923,7 @@ static int usbhost_close(FAR struct inode *inode) FAR struct usbhost_state_s *priv; irqstate_t flags; - uvdbg("Entry\n"); + uinfo("Entry\n"); DEBUGASSERT(inode && inode->i_private); priv = (FAR struct usbhost_state_s *)inode->i_private; @@ -1986,7 +1986,7 @@ static ssize_t usbhost_read(FAR struct inode *inode, unsigned char *buffer, DEBUGASSERT(priv->usbclass.hport); hport = priv->usbclass.hport; - uvdbg("startsector: %d nsectors: %d sectorsize: %d\n", + uinfo("startsector: %d nsectors: %d sectorsize: %d\n", startsector, nsectors, priv->blocksize); /* Check if the mass storage device is still connected */ @@ -2086,7 +2086,7 @@ static ssize_t usbhost_write(FAR struct inode *inode, const unsigned char *buffe FAR struct usbhost_hubport_s *hport; ssize_t nbytes; - uvdbg("sector: %d nsectors: %d sectorsize: %d\n"); + uinfo("sector: %d nsectors: %d sectorsize: %d\n"); DEBUGASSERT(inode && inode->i_private); priv = (FAR struct usbhost_state_s *)inode->i_private; @@ -2179,7 +2179,7 @@ static int usbhost_geometry(FAR struct inode *inode, struct geometry *geometry) FAR struct usbhost_state_s *priv; int ret = -EINVAL; - uvdbg("Entry\n"); + uinfo("Entry\n"); DEBUGASSERT(inode && inode->i_private); /* Check if the mass storage device is still connected */ @@ -2211,7 +2211,7 @@ static int usbhost_geometry(FAR struct inode *inode, struct geometry *geometry) geometry->geo_sectorsize = priv->blocksize; usbhost_givesem(&priv->exclsem); - uvdbg("nsectors: %ld sectorsize: %d\n", + uinfo("nsectors: %ld sectorsize: %d\n", (long)geometry->geo_nsectors, geometry->geo_sectorsize); ret = OK; @@ -2232,7 +2232,7 @@ static int usbhost_ioctl(FAR struct inode *inode, int cmd, unsigned long arg) FAR struct usbhost_state_s *priv; int ret; - uvdbg("Entry\n"); + uinfo("Entry\n"); DEBUGASSERT(inode && inode->i_private); priv = (FAR struct usbhost_state_s *)inode->i_private; diff --git a/drivers/video/ov2640.c b/drivers/video/ov2640.c index ebf37f002c..112d3201e3 100644 --- a/drivers/video/ov2640.c +++ b/drivers/video/ov2640.c @@ -864,7 +864,7 @@ static int ovr2640_chipid(FAR struct i2c_master_s *i2c) return -ENOSYS; } - gvdbg("PID=%02x$02x MID=%02x%02x\n", pidh, pidl, midh, midl); + ginfo("PID=%02x$02x MID=%02x%02x\n", pidh, pidl, midh, midl); return OK; } diff --git a/drivers/wireless/cc3000/cc3000.c b/drivers/wireless/cc3000/cc3000.c index bc0e2a615c..b14b8a94a6 100644 --- a/drivers/wireless/cc3000/cc3000.c +++ b/drivers/wireless/cc3000/cc3000.c @@ -422,7 +422,7 @@ static void cc3000_pollnotify(FAR struct cc3000_dev_s *priv, uint32_t type) if (fds) { fds->revents |= type; - nllvdbg("Report events: %02x\n", fds->revents); + nllinfo("Report events: %02x\n", fds->revents); sem_post(fds->sem); } } @@ -623,7 +623,7 @@ static void * cc3000_worker(FAR void *arg) if ((cc3000_wait_irq(priv) != -EINTR) && (priv->workertid != -1)) { PROBE(0, 0); - nllvdbg("State%d\n", priv->state); + nllinfo("State%d\n", priv->state); switch (priv->state) { case eSPI_STATE_POWERUP: @@ -710,9 +710,9 @@ static void * cc3000_worker(FAR void *arg) cc3000_devgive(priv); - nllvdbg("Wait On Completion\n"); + nllinfo("Wait On Completion\n"); sem_wait(priv->wrkwaitsem); - nllvdbg("Completed S:%d irq :%d\n", + nllinfo("Completed S:%d irq :%d\n", priv->state, priv->config->irq_read(priv->config)); sem_getvalue(&priv->irqsem, &count); @@ -732,7 +732,7 @@ static void * cc3000_worker(FAR void *arg) break; default: - nllvdbg("default: State%d\n", priv->state); + nllinfo("default: State%d\n", priv->state); break; } } @@ -802,7 +802,7 @@ static int cc3000_open(FAR struct file *filep) CHECK_GUARD(priv); - nllvdbg("crefs: %d\n", priv->crefs); + nllinfo("crefs: %d\n", priv->crefs); /* Get exclusive access to the driver data structure */ @@ -982,7 +982,7 @@ static int cc3000_close(FAR struct file *filep) CHECK_GUARD(priv); - nllvdbg("crefs: %d\n", priv->crefs); + nllinfo("crefs: %d\n", priv->crefs); /* Get exclusive access to the driver data structure */ @@ -1052,7 +1052,7 @@ static ssize_t cc3000_read(FAR struct file *filep, FAR char *buffer, size_t len) int ret; ssize_t nread; - nllvdbg("buffer:%p len:%d\n", buffer, len); + nllinfo("buffer:%p len:%d\n", buffer, len); DEBUGASSERT(filep); inode = filep->f_inode; @@ -1091,7 +1091,7 @@ static ssize_t cc3000_read(FAR struct file *filep, FAR char *buffer, size_t len) * option, then just return an error. */ - nllvdbg("CC3000 data is not available\n"); + nllinfo("CC3000 data is not available\n"); if (filep->f_oflags & O_NONBLOCK) { nread = -EAGAIN; @@ -1112,7 +1112,7 @@ static ssize_t cc3000_read(FAR struct file *filep, FAR char *buffer, size_t len) * but will be re-enabled while we are waiting. */ - nllvdbg("Waiting..\n"); + nllinfo("Waiting..\n"); ret = sem_wait(&priv->waitsem); priv->nwaiters--; sched_unlock(); @@ -1166,7 +1166,7 @@ errout_with_sem: cc3000_devgive(priv); errout_without_sem: - nllvdbg("Returning: %d\n", nread); + nllinfo("Returning: %d\n", nread); #ifndef CONFIG_DISABLE_POLL if (nread > 0) { @@ -1198,7 +1198,7 @@ static ssize_t cc3000_write(FAR struct file *filep, FAR const char *usrbuffer, s size_t tx_len = (len & 1) ? len : len +1; - nllvdbg("buffer:%p len:%d tx_len:%d\n", buffer, len, tx_len); + nllinfo("buffer:%p len:%d tx_len:%d\n", buffer, len, tx_len); DEBUGASSERT(filep); inode = filep->f_inode; @@ -1263,18 +1263,18 @@ static ssize_t cc3000_write(FAR struct file *filep, FAR const char *usrbuffer, s } else { - nllvdbg("Assert CS\n"); + nllinfo("Assert CS\n"); priv->state = eSPI_STATE_WRITE_WAIT_IRQ; cc3000_lock_and_select(priv->spi); /* Assert CS */ - nllvdbg("Wait on IRQ Active\n"); + nllinfo("Wait on IRQ Active\n"); ret = cc3000_wait_ready(priv); - nllvdbg("IRQ Signaled\n"); + nllinfo("IRQ Signaled\n"); if (ret < 0) { /* This should only happen if the wait was canceled by an signal */ cc3000_deselect_and_unlock(priv->spi); - nllvdbg("sem_wait: %d\n", errno); + nllinfo("sem_wait: %d\n", errno); DEBUGASSERT(errno == EINTR); nwritten = ret; goto errout_without_sem; @@ -1284,13 +1284,13 @@ static ssize_t cc3000_write(FAR struct file *filep, FAR const char *usrbuffer, s } priv->state = eSPI_STATE_WRITE_DONE; - nllvdbg("Deassert CS S:eSPI_STATE_WRITE_DONE\n"); + nllinfo("Deassert CS S:eSPI_STATE_WRITE_DONE\n"); cc3000_deselect_and_unlock(priv->spi); nwritten = tx_len; cc3000_devgive(priv); errout_without_sem: - nllvdbg("Returning: %d\n", ret); + nllinfo("Returning: %d\n", ret); return nwritten; } @@ -1304,7 +1304,7 @@ static int cc3000_ioctl(FAR struct file *filep, int cmd, unsigned long arg) FAR struct cc3000_dev_s *priv; int ret; - nllvdbg("cmd: %d arg: %ld\n", cmd, arg); + nllinfo("cmd: %d arg: %ld\n", cmd, arg); DEBUGASSERT(filep); inode = filep->f_inode; @@ -1409,7 +1409,7 @@ static int cc3000_poll(FAR struct file *filep, FAR struct pollfd *fds, int ret = OK; int i; - nllvdbg("setup: %d\n", (int)setup); + nllinfo("setup: %d\n", (int)setup); DEBUGASSERT(filep && fds); inode = filep->f_inode; @@ -1517,7 +1517,7 @@ int cc3000_register(FAR struct spi_dev_s *spi, #endif int ret; - nllvdbg("spi: %p minor: %d\n", spi, minor); + nllinfo("spi: %p minor: %d\n", spi, minor); /* Debug-only sanity checks */ @@ -1572,7 +1572,7 @@ int cc3000_register(FAR struct spi_dev_s *spi, /* Register the device as an input device */ (void)snprintf(drvname, DEV_NAMELEN, DEV_FORMAT, minor); - nllvdbg("Registering %s\n", drvname); + nllinfo("Registering %s\n", drvname); ret = register_driver(drvname, &cc3000_fops, 0666, priv); if (ret < 0) diff --git a/drivers/wireless/cc3000/cc3000drv.c b/drivers/wireless/cc3000/cc3000drv.c index e192dbf175..d56e66af8a 100644 --- a/drivers/wireless/cc3000/cc3000drv.c +++ b/drivers/wireless/cc3000/cc3000drv.c @@ -67,14 +67,14 @@ #ifdef SPI_DEBUG # define spidbg lldbg # ifdef SPI_VERBOSE -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # undef SPI_VERBOSE # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /**************************************************************************** @@ -118,7 +118,7 @@ void cc3000_resume(void) { DEBUGASSERT(spiconf.cc3000fd >= 0 && spiconf.done); sem_post(spiconf.done); - nllvdbg("Done\n"); + nllinfo("Done\n"); } /**************************************************************************** diff --git a/drivers/wireless/cc3000/evnt_handler.c b/drivers/wireless/cc3000/evnt_handler.c index b890a9a9b7..82d4943906 100644 --- a/drivers/wireless/cc3000/evnt_handler.c +++ b/drivers/wireless/cc3000/evnt_handler.c @@ -924,12 +924,12 @@ void SimpleLinkWaitEvent(uint16_t opcode, void *pRetParams) */ tSLInformation.usRxEventOpcode = opcode; - nllvdbg("Looking for opcode 0x%x\n", opcode); + nllinfo("Looking for opcode 0x%x\n", opcode); uint16_t event_type; do { - nllvdbg("cc3000_wait\n"); + nllinfo("cc3000_wait\n"); tSLInformation.pucReceivedData = cc3000_wait(); tSLInformation.usEventOrDataReceived = 1; STREAM_TO_UINT16((FAR char *)tSLInformation.pucReceivedData, @@ -937,25 +937,25 @@ void SimpleLinkWaitEvent(uint16_t opcode, void *pRetParams) if (*tSLInformation.pucReceivedData == HCI_TYPE_EVNT) { - nllvdbg("Evtn:0x%x\n", event_type); + nllinfo("Evtn:0x%x\n", event_type); } if (event_type != opcode) { if (hci_unsolicited_event_handler() == 1) { - nllvdbg("Processed Event 0x%x want 0x%x\n", event_type, opcode); + nllinfo("Processed Event 0x%x want 0x%x\n", event_type, opcode); } } else { - nllvdbg("Processing opcode 0x%x\n", opcode); + nllinfo("Processing opcode 0x%x\n", opcode); hci_event_handler(pRetParams, 0, 0); } } while (tSLInformation.usRxEventOpcode != 0); - nllvdbg("Done for opcode 0x%x\n", opcode); + nllinfo("Done for opcode 0x%x\n", opcode); } /**************************************************************************** @@ -981,7 +981,7 @@ void SimpleLinkWaitData(uint8_t *pBuf, uint8_t *from, uint8_t *fromlen) * after the end of current transaction, i.e. only after data will be received */ - nllvdbg("Looking for Data\n"); + nllinfo("Looking for Data\n"); uint16_t event_type; uint16_t opcode = tSLInformation.usRxEventOpcode; @@ -999,15 +999,15 @@ void SimpleLinkWaitData(uint8_t *pBuf, uint8_t *from, uint8_t *fromlen) else { STREAM_TO_UINT16((char *)tSLInformation.pucReceivedData, HCI_EVENT_OPCODE_OFFSET, event_type); - nllvdbg("Evtn:0x%x\n", event_type); + nllinfo("Evtn:0x%x\n", event_type); if (hci_unsolicited_event_handler() == 1) { - nllvdbg("Processed Event 0x%x want Data! Opcode 0x%x\n", event_type, opcode); + nllinfo("Processed Event 0x%x want Data! Opcode 0x%x\n", event_type, opcode); } else { - nllvdbg("!!!!!opcode 0x%x\n", opcode); + nllinfo("!!!!!opcode 0x%x\n", opcode); } UNUSED(event_type); @@ -1015,6 +1015,6 @@ void SimpleLinkWaitData(uint8_t *pBuf, uint8_t *from, uint8_t *fromlen) } while (*tSLInformation.pucReceivedData == HCI_TYPE_EVNT); - nllvdbg("Done for Data 0x%x\n", opcode); + nllinfo("Done for Data 0x%x\n", opcode); UNUSED(opcode); } diff --git a/drivers/wireless/cc3000/hci.c b/drivers/wireless/cc3000/hci.c index 6caf64c60d..742f09bae7 100644 --- a/drivers/wireless/cc3000/hci.c +++ b/drivers/wireless/cc3000/hci.c @@ -79,7 +79,7 @@ uint16_t hci_command_send(uint16_t usOpcode, uint8_t *pucBuff, stream = (pucBuff + SPI_HEADER_SIZE); - nllvdbg("Send 0x%x\n", usOpcode); + nllinfo("Send 0x%x\n", usOpcode); UINT8_TO_STREAM(stream, HCI_TYPE_CMND); stream = UINT16_TO_STREAM(stream, usOpcode); UINT8_TO_STREAM(stream, ucArgsLength); @@ -87,7 +87,7 @@ uint16_t hci_command_send(uint16_t usOpcode, uint8_t *pucBuff, /* Update the opcode of the event we will be waiting for */ cc3000_write(pucBuff, ucArgsLength + SIMPLE_LINK_HCI_CMND_HEADER_SIZE); - nllvdbg("Send of 0x%x Completed\n", usOpcode); + nllinfo("Send of 0x%x Completed\n", usOpcode); return 0; } diff --git a/drivers/wireless/cc3000/wlan.c b/drivers/wireless/cc3000/wlan.c index 175d6334b4..3a5bd0f31d 100644 --- a/drivers/wireless/cc3000/wlan.c +++ b/drivers/wireless/cc3000/wlan.c @@ -261,7 +261,7 @@ void SpiReceiveHandler(void *pvBuffer) STREAM_TO_UINT16((char *)tSLInformation.pucReceivedData, HCI_EVENT_OPCODE_OFFSET, event_type); - nllvdbg("Evnt:0x%x\n", event_type); + nllinfo("Evnt:0x%x\n", event_type); UNUSED(event_type); hci_unsolicited_event_handler(); diff --git a/drivers/wireless/nrf24l01.c b/drivers/wireless/nrf24l01.c index eb6c3f68c8..90f9cd3bae 100644 --- a/drivers/wireless/nrf24l01.c +++ b/drivers/wireless/nrf24l01.c @@ -495,7 +495,7 @@ static int nrf24l01_irqhandler(int irq, FAR void *context) { FAR struct nrf24l01_dev_s *dev = g_nrf24l01dev; - wllvdbg("*IRQ*"); + wllinfo("*IRQ*"); #ifdef CONFIG_WL_NRF24L01_RXSUPPORT @@ -604,7 +604,7 @@ static void nrf24l01_worker(FAR void *arg) { dev->pfd->revents |= POLLIN; /* Data available for input */ - wvdbg("Wake up polled fd"); + winfo("Wake up polled fd"); sem_post(dev->pfd->sem); } #endif @@ -720,11 +720,11 @@ static int dosend(FAR struct nrf24l01_dev_s *dev, FAR const uint8_t *data, size_ dev->lastxmitcount = (obsvalue & NRF24L01_ARC_CNT_MASK) >> NRF24L01_ARC_CNT_SHIFT; - wvdbg("Transmission OK (lastxmitcount=%d)\n", dev->lastxmitcount); + winfo("Transmission OK (lastxmitcount=%d)\n", dev->lastxmitcount); } else if (status & NRF24L01_MAX_RT) { - wvdbg("MAX_RT!\n", dev->lastxmitcount); + winfo("MAX_RT!\n", dev->lastxmitcount); result = -ECOMM; dev->lastxmitcount = NRF24L01_XMIT_MAXRT; @@ -758,7 +758,7 @@ static int nrf24l01_open(FAR struct file *filep) FAR struct nrf24l01_dev_s *dev; int result; - wvdbg("Opening nRF24L01 dev\n"); + winfo("Opening nRF24L01 dev\n"); DEBUGASSERT(filep); inode = filep->f_inode; @@ -800,7 +800,7 @@ static int nrf24l01_close(FAR struct file *filep) FAR struct inode *inode; FAR struct nrf24l01_dev_s *dev; - wvdbg("Closing nRF24L01 dev\n"); + winfo("Closing nRF24L01 dev\n"); DEBUGASSERT(filep); inode = filep->f_inode; @@ -885,7 +885,7 @@ static int nrf24l01_ioctl(FAR struct file *filep, int cmd, unsigned long arg) FAR struct nrf24l01_dev_s *dev; int result = OK; - wvdbg("cmd: %d arg: %ld\n", cmd, arg); + winfo("cmd: %d arg: %ld\n", cmd, arg); DEBUGASSERT(filep); inode = filep->f_inode; @@ -1117,7 +1117,7 @@ static int nrf24l01_poll(FAR struct file *filep, FAR struct pollfd *fds, FAR struct nrf24l01_dev_s *dev; int result = OK; - wvdbg("setup: %d\n", (int)setup); + winfo("setup: %d\n", (int)setup); DEBUGASSERT(filep && fds); inode = filep->f_inode; @@ -1252,7 +1252,7 @@ int nrf24l01_register(FAR struct spi_dev_s *spi, FAR struct nrf24l01_config_s *c /* Register the device as an input device */ - ivdbg("Registering " DEV_NAME "\n"); + iinfo("Registering " DEV_NAME "\n"); result = register_driver(DEV_NAME, &nrf24l01_fops, 0666, dev); if (result < 0) diff --git a/fs/binfs/fs_binfs.c b/fs/binfs/fs_binfs.c index 959b3336dd..1fed2e6c2a 100644 --- a/fs/binfs/fs_binfs.c +++ b/fs/binfs/fs_binfs.c @@ -138,7 +138,7 @@ static int binfs_open(FAR struct file *filep, FAR const char *relpath, { int index; - fvdbg("Open '%s'\n", relpath); + finfo("Open '%s'\n", relpath); /* BINFS is read-only. Any attempt to open with any kind of write * access is not permitted. @@ -173,7 +173,7 @@ static int binfs_open(FAR struct file *filep, FAR const char *relpath, static int binfs_close(FAR struct file *filep) { - fvdbg("Closing\n"); + finfo("Closing\n"); return OK; } @@ -185,7 +185,7 @@ static ssize_t binfs_read(FAR struct file *filep, char *buffer, size_t buflen) { /* Reading is not supported. Just return end-of-file */ - fvdbg("Read %d bytes from offset %d\n", buflen, filep->f_pos); + finfo("Read %d bytes from offset %d\n", buflen, filep->f_pos); return 0; } @@ -197,7 +197,7 @@ static int binfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg) { int ret; - fvdbg("cmd: %d arg: %08lx\n", cmd, arg); + finfo("cmd: %d arg: %08lx\n", cmd, arg); /* Only one IOCTL command is supported */ @@ -237,7 +237,7 @@ static int binfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg) static int binfs_dup(FAR const struct file *oldp, FAR struct file *newp) { - fvdbg("Dup %p->%p\n", oldp, newp); + finfo("Dup %p->%p\n", oldp, newp); /* Copy the index from the old to the new file structure */ @@ -256,7 +256,7 @@ static int binfs_dup(FAR const struct file *oldp, FAR struct file *newp) static int binfs_opendir(struct inode *mountpt, const char *relpath, struct fs_dirent_s *dir) { - fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL"); + finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL"); /* The requested directory must be the volume-relative "root" directory */ @@ -294,14 +294,14 @@ static int binfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir) * special error -ENOENT */ - fvdbg("Entry %d: End of directory\n", index); + finfo("Entry %d: End of directory\n", index); ret = -ENOENT; } else { /* Save the filename and file type */ - fvdbg("Entry %d: \"%s\"\n", index, name); + finfo("Entry %d: \"%s\"\n", index, name); dir->fd_dir.d_type = DTYPE_FILE; strncpy(dir->fd_dir.d_name, name, NAME_MAX+1); @@ -331,7 +331,7 @@ static int binfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir) static int binfs_rewinddir(struct inode *mountpt, struct fs_dirent_s *dir) { - fvdbg("Entry\n"); + finfo("Entry\n"); dir->u.binfs.fb_index = 0; return OK; @@ -351,7 +351,7 @@ static int binfs_rewinddir(struct inode *mountpt, struct fs_dirent_s *dir) static int binfs_bind(FAR struct inode *blkdriver, const void *data, void **handle) { - fvdbg("Entry\n"); + finfo("Entry\n"); return OK; } @@ -366,7 +366,7 @@ static int binfs_bind(FAR struct inode *blkdriver, const void *data, static int binfs_unbind(FAR void *handle, FAR struct inode **blkdriver, unsigned int flags) { - fvdbg("Entry\n"); + finfo("Entry\n"); return OK; } @@ -379,7 +379,7 @@ static int binfs_unbind(FAR void *handle, FAR struct inode **blkdriver, static int binfs_statfs(struct inode *mountpt, struct statfs *buf) { - fvdbg("Entry\n"); + finfo("Entry\n"); /* Fill in the statfs info */ @@ -402,7 +402,7 @@ static int binfs_statfs(struct inode *mountpt, struct statfs *buf) static int binfs_stat(struct inode *mountpt, const char *relpath, struct stat *buf) { - fvdbg("Entry\n"); + finfo("Entry\n"); /* The requested directory must be the volume-relative "root" directory */ diff --git a/fs/fat/fs_configfat.c b/fs/fat/fs_configfat.c index 8fe7c576f2..5898887ca1 100644 --- a/fs/fat/fs_configfat.c +++ b/fs/fat/fs_configfat.c @@ -464,7 +464,7 @@ mkfatfs_tryfat12(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var, maxnclusters = FAT_MAXCLUST12; } - fvdbg("nfatsects=%u nclusters=%u (max=%u)\n", + finfo("nfatsects=%u nclusters=%u (max=%u)\n", config->fc_nfatsects, config->fc_nclusters, maxnclusters); /* Check if this number of clusters would overflow the maximum for @@ -535,7 +535,7 @@ mkfatfs_tryfat16(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var, maxnclusters = FAT_MAXCLUST16; } - fvdbg("nfatsects=%u nclusters=%u (min=%u max=%u)\n", + finfo("nfatsects=%u nclusters=%u (min=%u max=%u)\n", config->fc_nfatsects, config->fc_nclusters, FAT_MINCLUST16, maxnclusters); @@ -612,7 +612,7 @@ mkfatfs_tryfat32(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var, maxnclusters = FAT_MAXCLUST32; } - fvdbg("nfatsects=%u nclusters=%u (max=%u)\n", + finfo("nfatsects=%u nclusters=%u (max=%u)\n", config->fc_nfatsects, config->fc_nclusters, maxnclusters); /* Check if this number of clusters would overflow the maximum for @@ -654,7 +654,7 @@ mkfatfs_selectfat(int fattype, FAR struct fat_format_s *fmt, { /* Return the appropriate information about the selected file system. */ - fvdbg("Selected FAT%d\n", fattype); + finfo("Selected FAT%d\n", fattype); var->fv_fattype = fattype; var->fv_nclusters = config->fc_nclusters; @@ -745,7 +745,7 @@ mkfatfs_clustersearch(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var) do { - fvdbg("Configuring with %d sectors/cluster...\n", + finfo("Configuring with %d sectors/cluster...\n", 1 << fmt->ff_clustshift); /* Check if FAT12 has not been excluded */ diff --git a/fs/fat/fs_fat32.c b/fs/fat/fs_fat32.c index c9cf80be6e..b35a600eec 100644 --- a/fs/fat/fs_fat32.c +++ b/fs/fat/fs_fat32.c @@ -1397,7 +1397,7 @@ static int fat_dup(FAR const struct file *oldp, FAR struct file *newp) FAR struct fat_file_s *newff; int ret; - fvdbg("Dup %p->%p\n", oldp, newp); + finfo("Dup %p->%p\n", oldp, newp); /* Sanity checks */ diff --git a/fs/fat/fs_fat32util.c b/fs/fat/fs_fat32util.c index 84f3b8eae7..8e2bcac59e 100644 --- a/fs/fat/fs_fat32util.c +++ b/fs/fat/fs_fat32util.c @@ -573,11 +573,11 @@ int fat_mount(struct fat_mountpt_s *fs, bool writeable) */ uint8_t part = PART_GETTYPE(i, fs->fs_buffer); - fvdbg("Partition %d, offset %d, type %d\n", i, PART_ENTRY(i), part); + finfo("Partition %d, offset %d, type %d\n", i, PART_ENTRY(i), part); if (part == 0) { - fvdbg("No partition %d\n", i); + finfo("No partition %d\n", i); continue; } @@ -606,13 +606,13 @@ int fat_mount(struct fat_mountpt_s *fs, bool writeable) { /* Break out of the loop if a valid boot record is found */ - fvdbg("MBR found in partition %d\n", i); + finfo("MBR found in partition %d\n", i); break; } /* Re-read sector 0 so that we can check the next partition */ - fvdbg("Partition %d is not an MBR\n", i); + finfo("Partition %d is not an MBR\n", i); ret = fat_hwread(fs, fs->fs_buffer, 0, 1); if (ret < 0) { @@ -1875,7 +1875,7 @@ int fat_currentsector(struct fat_mountpt_s *fs, struct fat_file_s *ff, ff->ff_sectorsincluster = fs->fs_fatsecperclus - sectoroffset; - fvdbg("position=%d currentsector=%d sectorsincluster=%d\n", + finfo("position=%d currentsector=%d sectorsincluster=%d\n", position, ff->ff_currentsector, ff->ff_sectorsincluster); return OK; diff --git a/fs/mount/fs_automount.c b/fs/mount/fs_automount.c index e0fea07881..8f2c337c3d 100644 --- a/fs/mount/fs_automount.c +++ b/fs/mount/fs_automount.c @@ -191,7 +191,7 @@ static void automount_mount(FAR struct automounter_state_s *priv) FAR const struct automount_lower_s *lower = priv->lower; int ret; - fvdbg("Mounting %s\n", lower->mountpoint); + finfo("Mounting %s\n", lower->mountpoint); /* Check if the something is already mounted at the mountpoint. */ @@ -268,7 +268,7 @@ static int automount_unmount(FAR struct automounter_state_s *priv) FAR const struct automount_lower_s *lower = priv->lower; int ret; - fvdbg("Unmounting %s\n", lower->mountpoint); + finfo("Unmounting %s\n", lower->mountpoint); /* Check if the something is already mounted at the mountpoint. */ @@ -295,7 +295,7 @@ static int automount_unmount(FAR struct automounter_state_s *priv) if (errcode == EBUSY) { - fvdbg("WARNING: Volume is busy, try again later\n"); + finfo("WARNING: Volume is busy, try again later\n"); /* Start a timer to retry the umount2 after a delay */ @@ -315,7 +315,7 @@ static int automount_unmount(FAR struct automounter_state_s *priv) else { - fvdbg("ERROR: umount2 failed: %d\n", errcode); + finfo("ERROR: umount2 failed: %d\n", errcode); return -errcode; } } @@ -363,7 +363,7 @@ static void automount_timeout(int argc, uint32_t arg1, ...) (FAR struct automounter_state_s *)((uintptr_t)arg1); int ret; - fllvdbg("Timeout!\n"); + fllinfo("Timeout!\n"); DEBUGASSERT(argc == 1 && priv); /* Check the state of things. This timeout at the interrupt level and @@ -372,7 +372,7 @@ static void automount_timeout(int argc, uint32_t arg1, ...) * there should be no pending work. */ - fllvdbg("inserted=%d\n", priv->inserted); + fllinfo("inserted=%d\n", priv->inserted); DEBUGASSERT(!priv->inserted && work_available(&priv->work)); /* Queue work to occur immediately. */ @@ -463,7 +463,7 @@ static int automount_interrupt(FAR const struct automount_lower_s *lower, DEBUGASSERT(lower && priv && priv->lower == lower); - fllvdbg("inserted=%d\n", inserted); + fllinfo("inserted=%d\n", inserted); /* Cancel any pending work. We could get called multiple times if, for * example there is bounce in the detection mechanism. Work is performed @@ -532,7 +532,7 @@ FAR void *automount_initialize(FAR const struct automount_lower_s *lower) FAR struct automounter_state_s *priv; int ret; - fvdbg("lower=%p\n", lower); + finfo("lower=%p\n", lower); DEBUGASSERT(lower); /* Allocate an auto-mounter state structure */ diff --git a/fs/nfs/nfs_util.c b/fs/nfs/nfs_util.c index 6e5d8e4526..f811e01480 100644 --- a/fs/nfs/nfs_util.c +++ b/fs/nfs/nfs_util.c @@ -241,7 +241,7 @@ tryagain: return error; } - fvdbg("NFS_SUCCESS\n"); + finfo("NFS_SUCCESS\n"); return OK; } diff --git a/fs/nfs/nfs_vfsops.c b/fs/nfs/nfs_vfsops.c index 6d71a04457..fb23c5a2fa 100644 --- a/fs/nfs/nfs_vfsops.c +++ b/fs/nfs/nfs_vfsops.c @@ -390,7 +390,7 @@ static int nfs_filetruncate(FAR struct nfsmount *nmp, struct nfsnode *np) int reqlen; int error; - fvdbg("Truncating file\n"); + finfo("Truncating file\n"); /* Create the SETATTR RPC call arguments */ @@ -771,7 +771,7 @@ static ssize_t nfs_read(FAR struct file *filep, char *buffer, size_t buflen) FAR uint32_t *ptr; int error = 0; - fvdbg("Read %d bytes from offset %d\n", buflen, filep->f_pos); + finfo("Read %d bytes from offset %d\n", buflen, filep->f_pos); /* Sanity checks */ @@ -802,7 +802,7 @@ static ssize_t nfs_read(FAR struct file *filep, char *buffer, size_t buflen) if (buflen > tmp) { buflen = tmp; - fvdbg("Read size truncated to %d\n", buflen); + finfo("Read size truncated to %d\n", buflen); } /* Now loop until we fill the user buffer (or hit the end of the file) */ @@ -852,7 +852,7 @@ static ssize_t nfs_read(FAR struct file *filep, char *buffer, size_t buflen) /* Perform the read */ - fvdbg("Reading %d bytes\n", readsize); + finfo("Reading %d bytes\n", readsize); nfs_statistics(NFSPROC_READ); error = nfs_request(nmp, NFSPROC_READ, (FAR void *)&nmp->nm_msgbuffer.read, reqlen, @@ -914,7 +914,7 @@ static ssize_t nfs_read(FAR struct file *filep, char *buffer, size_t buflen) } } - fvdbg("Read %d bytes\n", bytesread); + finfo("Read %d bytes\n", bytesread); nfs_semgive(nmp); return bytesread; @@ -947,7 +947,7 @@ static ssize_t nfs_write(FAR struct file *filep, const char *buffer, int committed = NFSV3WRITE_FILESYNC; int error; - fvdbg("Write %d bytes to offset %d\n", buflen, filep->f_pos); + finfo("Write %d bytes to offset %d\n", buflen, filep->f_pos); /* Sanity checks */ @@ -1127,7 +1127,7 @@ static int nfs_dup(FAR const struct file *oldp, FAR struct file *newp) FAR struct nfsnode *np; int error; - fvdbg("Dup %p->%p\n", oldp, newp); + finfo("Dup %p->%p\n", oldp, newp); /* Sanity checks */ @@ -1193,7 +1193,7 @@ static int nfs_opendir(struct inode *mountpt, const char *relpath, uint32_t objtype; int error; - fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL"); + finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL"); /* Sanity checks */ @@ -1273,7 +1273,7 @@ static int nfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir) int reqlen; int error = 0; - fvdbg("Entry\n"); + finfo("Entry\n"); /* Sanity checks */ @@ -1378,7 +1378,7 @@ static int nfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir) tmp = *ptr++; if (tmp != 0) { - fvdbg("End of directory\n"); + finfo("End of directory\n"); error = ENOENT; } @@ -1388,7 +1388,7 @@ static int nfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir) else { - fvdbg("No data but not end of directory???\n"); + finfo("No data but not end of directory???\n"); error = EAGAIN; } @@ -1437,7 +1437,7 @@ static int nfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir) memcpy(dir->fd_dir.d_name, name, length); dir->fd_dir.d_name[length] = '\0'; - fvdbg("name: \"%s\"\n", dir->fd_dir.d_name); + finfo("name: \"%s\"\n", dir->fd_dir.d_name); /* Get the file attributes associated with this name and return * the file type. @@ -1481,7 +1481,7 @@ static int nfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir) dir->fd_dir.d_type = DTYPE_CHR; break; } - fvdbg("type: %d->%d\n", (int)tmp, dir->fd_dir.d_type); + finfo("type: %d->%d\n", (int)tmp, dir->fd_dir.d_type); errout_with_semaphore: nfs_semgive(nmp); @@ -1502,7 +1502,7 @@ errout_with_semaphore: static int nfs_rewinddir(FAR struct inode *mountpt, FAR struct fs_dirent_s *dir) { - fvdbg("Entry\n"); + finfo("Entry\n"); /* Sanity checks */ @@ -1780,7 +1780,7 @@ static int nfs_bind(FAR struct inode *blkdriver, FAR const void *data, return ENOMEM; } - fvdbg("Connecting\n"); + finfo("Connecting\n"); /* Translate nfsmnt flags -> rpcclnt flags */ @@ -1826,7 +1826,7 @@ static int nfs_bind(FAR struct inode *blkdriver, FAR const void *data, *handle = (FAR void *)nmp; nfs_semgive(nmp); - fvdbg("Successfully mounted\n"); + finfo("Successfully mounted\n"); return OK; bad: @@ -1872,7 +1872,7 @@ static int nfs_unbind(FAR void *handle, FAR struct inode **blkdriver, FAR struct nfsmount *nmp = (FAR struct nfsmount *)handle; int error; - fvdbg("Entry\n"); + finfo("Entry\n"); DEBUGASSERT(nmp); /* Get exclusive access to the mount structure */ diff --git a/fs/nfs/rpc_clnt.c b/fs/nfs/rpc_clnt.c index 0af2b470c7..302f468fbc 100644 --- a/fs/nfs/rpc_clnt.c +++ b/fs/nfs/rpc_clnt.c @@ -349,7 +349,7 @@ void rpcclnt_init(void) rpc_auth_unix = txdr_unsigned(RPCAUTH_UNIX); rpc_auth_null = txdr_unsigned(RPCAUTH_NULL); - fvdbg("RPC initialized\n"); + finfo("RPC initialized\n"); } /**************************************************************************** @@ -385,7 +385,7 @@ int rpcclnt_connect(struct rpcclnt *rpc) uint16_t tport; int errval; - fvdbg("Connecting\n"); + finfo("Connecting\n"); /* Create the socket */ @@ -731,7 +731,7 @@ int rpcclnt_request(FAR struct rpcclnt *rpc, int procnum, int prog, error = rpcclnt_send(rpc, procnum, prog, request, reqlen); if (error != OK) { - fvdbg("ERROR rpcclnt_send failed: %d\n", error); + finfo("ERROR rpcclnt_send failed: %d\n", error); } /* Wait for the reply from our send */ @@ -741,7 +741,7 @@ int rpcclnt_request(FAR struct rpcclnt *rpc, int procnum, int prog, error = rpcclnt_reply(rpc, procnum, prog, response, resplen); if (error != OK) { - fvdbg("ERROR rpcclnt_reply failed: %d\n", error); + finfo("ERROR rpcclnt_reply failed: %d\n", error); } } @@ -785,7 +785,7 @@ int rpcclnt_request(FAR struct rpcclnt *rpc, int procnum, int prog, tmp = fxdr_unsigned(uint32_t, replymsg->status); if (tmp == RPC_SUCCESS) { - fvdbg("RPC_SUCCESS\n"); + finfo("RPC_SUCCESS\n"); } else if (tmp == RPC_PROGMISMATCH) { diff --git a/fs/nxffs/nxffs_cache.c b/fs/nxffs/nxffs_cache.c index 2a04d6b0a9..32c9756a05 100644 --- a/fs/nxffs/nxffs_cache.c +++ b/fs/nxffs/nxffs_cache.c @@ -225,7 +225,7 @@ int nxffs_getc(FAR struct nxffs_volume_s *volume, uint16_t reserve) off_t nextblock = volume->ioblock + 1; if (nextblock >= volume->nblocks) { - fvdbg("End of FLASH encountered\n"); + finfo("End of FLASH encountered\n"); return -ENOSPC; } diff --git a/fs/nxffs/nxffs_dirent.c b/fs/nxffs/nxffs_dirent.c index 39150b9369..d51e2cabb6 100644 --- a/fs/nxffs/nxffs_dirent.c +++ b/fs/nxffs/nxffs_dirent.c @@ -71,7 +71,7 @@ int nxffs_opendir(FAR struct inode *mountpt, FAR const char *relpath, struct nxffs_volume_s *volume; int ret; - fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL"); + finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL"); /* Sanity checks */ @@ -146,7 +146,7 @@ int nxffs_readdir(FAR struct inode *mountpt, FAR struct fs_dirent_s *dir) { /* Return the filename and file type */ - fvdbg("Offset %d: \"%s\"\n", entry.hoffset, entry.name); + finfo("Offset %d: \"%s\"\n", entry.hoffset, entry.name); dir->fd_dir.d_type = DTYPE_FILE; strncpy(dir->fd_dir.d_name, entry.name, NAME_MAX+1); @@ -175,7 +175,7 @@ int nxffs_rewinddir(FAR struct inode *mountpt, FAR struct fs_dirent_s *dir) FAR struct nxffs_volume_s *volume; int ret; - fvdbg("Entry\n"); + finfo("Entry\n"); /* Sanity checks */ diff --git a/fs/nxffs/nxffs_initialize.c b/fs/nxffs/nxffs_initialize.c index 5701d31637..19e419a5de 100644 --- a/fs/nxffs/nxffs_initialize.c +++ b/fs/nxffs/nxffs_initialize.c @@ -383,7 +383,7 @@ int nxffs_limits(FAR struct nxffs_volume_s *volume) * the location of the free FLASH region. */ - fvdbg("No inodes found\n"); + finfo("No inodes found\n"); noinodes = true; } else @@ -391,7 +391,7 @@ int nxffs_limits(FAR struct nxffs_volume_s *volume) /* Save the offset to the first inode */ volume->inoffset = entry.hoffset; - fvdbg("First inode at offset %d\n", volume->inoffset); + finfo("First inode at offset %d\n", volume->inoffset); /* Discard this entry and set the next offset. */ @@ -411,7 +411,7 @@ int nxffs_limits(FAR struct nxffs_volume_s *volume) nxffs_freeentry(&entry); } - fvdbg("Last inode before offset %d\n", offset); + finfo("Last inode before offset %d\n", offset); } /* No inodes were found after this offset. Now search for a block of @@ -435,11 +435,11 @@ int nxffs_limits(FAR struct nxffs_volume_s *volume) /* Yes.. the FLASH is full. Force the offsets to the end of FLASH */ volume->froffset = volume->nblocks * volume->geo.blocksize; - fvdbg("Assume no free FLASH, froffset: %d\n", volume->froffset); + finfo("Assume no free FLASH, froffset: %d\n", volume->froffset); if (noinodes) { volume->inoffset = volume->froffset; - fvdbg("No inodes, inoffset: %d\n", volume->inoffset); + finfo("No inodes, inoffset: %d\n", volume->inoffset); } return OK; @@ -468,11 +468,11 @@ int nxffs_limits(FAR struct nxffs_volume_s *volume) */ volume->froffset = offset; - fvdbg("Free FLASH region begins at offset: %d\n", volume->froffset); + finfo("Free FLASH region begins at offset: %d\n", volume->froffset); if (noinodes) { volume->inoffset = offset; - fvdbg("First inode at offset %d\n", volume->inoffset); + finfo("First inode at offset %d\n", volume->inoffset); } return OK; diff --git a/fs/nxffs/nxffs_inode.c b/fs/nxffs/nxffs_inode.c index bf4c7f5957..02d609832d 100644 --- a/fs/nxffs/nxffs_inode.c +++ b/fs/nxffs/nxffs_inode.c @@ -286,7 +286,7 @@ int nxffs_nextentry(FAR struct nxffs_volume_s *volume, off_t offset, if (++nerased >= NXFFS_NERASED) { - fvdbg("No entry found\n"); + finfo("No entry found\n"); return -ENOENT; } } @@ -337,7 +337,7 @@ int nxffs_nextentry(FAR struct nxffs_volume_s *volume, off_t offset, ret = nxffs_rdentry(volume, offset, entry); if (ret == OK) { - fvdbg("Found a valid fileheader, offset: %d\n", offset); + finfo("Found a valid fileheader, offset: %d\n", offset); return OK; } @@ -396,7 +396,7 @@ int nxffs_findinode(FAR struct nxffs_volume_s *volume, FAR const char *name, ret = nxffs_nextentry(volume, offset, entry); if (ret < 0) { - fvdbg("No inode found: %d\n", -ret); + finfo("No inode found: %d\n", -ret); return ret; } diff --git a/fs/nxffs/nxffs_ioctl.c b/fs/nxffs/nxffs_ioctl.c index da0752320a..7d6219eaab 100644 --- a/fs/nxffs/nxffs_ioctl.c +++ b/fs/nxffs/nxffs_ioctl.c @@ -69,7 +69,7 @@ int nxffs_ioctl(FAR struct file *filep, int cmd, unsigned long arg) FAR struct nxffs_volume_s *volume; int ret; - fvdbg("cmd: %d arg: %08lx\n", cmd, arg); + finfo("cmd: %d arg: %08lx\n", cmd, arg); /* Sanity checks */ @@ -96,7 +96,7 @@ int nxffs_ioctl(FAR struct file *filep, int cmd, unsigned long arg) if (cmd == FIOC_REFORMAT) { - fvdbg("Reformat command\n"); + finfo("Reformat command\n"); /* We cannot reformat the volume if there are any open inodes */ @@ -114,7 +114,7 @@ int nxffs_ioctl(FAR struct file *filep, int cmd, unsigned long arg) else if (cmd == FIOC_OPTIMIZE) { - fvdbg("Optimize command\n"); + finfo("Optimize command\n"); /* Pack the volume */ diff --git a/fs/nxffs/nxffs_open.c b/fs/nxffs/nxffs_open.c index 2ac1249e06..a461d2c080 100644 --- a/fs/nxffs/nxffs_open.c +++ b/fs/nxffs/nxffs_open.c @@ -726,7 +726,7 @@ static inline int nxffs_rdopen(FAR struct nxffs_volume_s *volume, /* Just increment the reference count on the ofile */ ofile->crefs++; - fvdbg("crefs: %d\n", ofile->crefs); + finfo("crefs: %d\n", ofile->crefs); } /* The file has not yet been opened. @@ -756,7 +756,7 @@ static inline int nxffs_rdopen(FAR struct nxffs_volume_s *volume, ret = nxffs_findinode(volume, name, &ofile->entry); if (ret != OK) { - fvdbg("Inode '%s' not found: %d\n", name, -ret); + finfo("Inode '%s' not found: %d\n", name, -ret); goto errout_with_ofile; } @@ -892,7 +892,7 @@ static inline int nxffs_wrclose(FAR struct nxffs_volume_s *volume, if (wrfile->truncate && wrfile->ofile.entry.name) { - fvdbg("Removing old file: %s\n", wrfile->ofile.entry.name); + finfo("Removing old file: %s\n", wrfile->ofile.entry.name); ret = nxffs_rminode(volume, wrfile->ofile.entry.name); if (ret < 0) @@ -1000,7 +1000,7 @@ int nxffs_open(FAR struct file *filep, FAR const char *relpath, FAR struct nxffs_ofile_s *ofile = NULL; int ret; - fvdbg("Open '%s'\n", relpath); + finfo("Open '%s'\n", relpath); /* Sanity checks */ @@ -1069,7 +1069,7 @@ int nxffs_dup(FAR const struct file *oldp, FAR struct file *newp) #endif FAR struct nxffs_ofile_s *ofile; - fvdbg("Dup %p->%p\n", oldp, newp); + finfo("Dup %p->%p\n", oldp, newp); /* Sanity checks */ @@ -1126,7 +1126,7 @@ int nxffs_close(FAR struct file *filep) FAR struct nxffs_ofile_s *ofile; int ret; - fvdbg("Closing\n"); + finfo("Closing\n"); /* Sanity checks */ diff --git a/fs/nxffs/nxffs_read.c b/fs/nxffs/nxffs_read.c index c327013d82..36ba8bd055 100644 --- a/fs/nxffs/nxffs_read.c +++ b/fs/nxffs/nxffs_read.c @@ -150,7 +150,7 @@ ssize_t nxffs_read(FAR struct file *filep, FAR char *buffer, size_t buflen) size_t readsize; int ret; - fvdbg("Read %d bytes from offset %d\n", buflen, filep->f_pos); + finfo("Read %d bytes from offset %d\n", buflen, filep->f_pos); /* Sanity checks */ @@ -304,7 +304,7 @@ int nxffs_nextblock(FAR struct nxffs_volume_s *volume, off_t offset, if (++nerased >= NXFFS_NERASED) { - fvdbg("No entry found\n"); + finfo("No entry found\n"); return -ENOENT; } } @@ -358,7 +358,7 @@ int nxffs_nextblock(FAR struct nxffs_volume_s *volume, off_t offset, ret = nxffs_rdblkhdr(volume, blkentry->hoffset, &blkentry->datlen); if (ret == OK) { - fvdbg("Found a valid data block, offset: %d datlen: %d\n", + finfo("Found a valid data block, offset: %d datlen: %d\n", blkentry->hoffset, blkentry->datlen); return OK; } diff --git a/fs/nxffs/nxffs_stat.c b/fs/nxffs/nxffs_stat.c index b1dbdcbaf9..f47c55dbb8 100644 --- a/fs/nxffs/nxffs_stat.c +++ b/fs/nxffs/nxffs_stat.c @@ -70,7 +70,7 @@ int nxffs_statfs(FAR struct inode *mountpt, FAR struct statfs *buf) FAR struct nxffs_volume_s *volume; int ret; - fvdbg("Entry\n"); + finfo("Entry\n"); /* Sanity checks */ @@ -116,7 +116,7 @@ int nxffs_stat(FAR struct inode *mountpt, FAR const char *relpath, struct nxffs_entry_s entry; int ret; - fvdbg("Entry\n"); + finfo("Entry\n"); /* Sanity checks */ diff --git a/fs/nxffs/nxffs_unlink.c b/fs/nxffs/nxffs_unlink.c index bc42b5a317..9c9dbd4bdc 100644 --- a/fs/nxffs/nxffs_unlink.c +++ b/fs/nxffs/nxffs_unlink.c @@ -148,7 +148,7 @@ int nxffs_unlink(FAR struct inode *mountpt, FAR const char *relpath) FAR struct nxffs_volume_s *volume; int ret; - fvdbg("Entry\n"); + finfo("Entry\n"); /* Sanity checks */ diff --git a/fs/nxffs/nxffs_write.c b/fs/nxffs/nxffs_write.c index 423c61c9f6..f07f43da14 100644 --- a/fs/nxffs/nxffs_write.c +++ b/fs/nxffs/nxffs_write.c @@ -436,7 +436,7 @@ ssize_t nxffs_write(FAR struct file *filep, FAR const char *buffer, size_t bufle ssize_t total; int ret; - fvdbg("Write %d bytes to offset %d\n", buflen, filep->f_pos); + finfo("Write %d bytes to offset %d\n", buflen, filep->f_pos); /* Sanity checks */ diff --git a/fs/procfs/fs_procfs.c b/fs/procfs/fs_procfs.c index 506ab9fcb5..6b0ee4e3c0 100644 --- a/fs/procfs/fs_procfs.c +++ b/fs/procfs/fs_procfs.c @@ -322,7 +322,7 @@ static int procfs_open(FAR struct file *filep, FAR const char *relpath, { int x, ret = -ENOENT; - fvdbg("Open '%s'\n", relpath); + finfo("Open '%s'\n", relpath); /* Perform the stat based on the procfs_entry operations */ @@ -382,7 +382,7 @@ static ssize_t procfs_read(FAR struct file *filep, FAR char *buffer, FAR struct procfs_file_s *handler; ssize_t ret = 0; - fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen); + finfo("buffer=%p buflen=%d\n", buffer, (int)buflen); /* Recover our private data from the struct file instance */ @@ -406,7 +406,7 @@ static ssize_t procfs_write(FAR struct file *filep, FAR const char *buffer, FAR struct procfs_file_s *handler; ssize_t ret = 0; - fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen); + finfo("buffer=%p buflen=%d\n", buffer, (int)buflen); /* Recover our private data from the struct file instance */ @@ -429,7 +429,7 @@ static ssize_t procfs_write(FAR struct file *filep, FAR const char *buffer, static int procfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg) { - fvdbg("cmd: %d arg: %08lx\n", cmd, arg); + finfo("cmd: %d arg: %08lx\n", cmd, arg); /* No IOCTL commands supported */ @@ -448,7 +448,7 @@ static int procfs_dup(FAR const struct file *oldp, FAR struct file *newp) { FAR struct procfs_file_s *oldattr; - fvdbg("Dup %p->%p\n", oldp, newp); + finfo("Dup %p->%p\n", oldp, newp); /* Recover our private data from the old struct file instance */ @@ -476,7 +476,7 @@ static int procfs_opendir(FAR struct inode *mountpt, FAR const char *relpath, FAR void *priv = NULL; irqstate_t flags; - fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL"); + finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL"); DEBUGASSERT(mountpt && relpath && dir && !dir->u.procfs); /* The relative must be either: @@ -717,7 +717,7 @@ static int procfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir) * error -ENOENT */ - fvdbg("Entry %d: End of directory\n", index); + finfo("Entry %d: End of directory\n", index); ret = -ENOENT; } else diff --git a/fs/procfs/fs_procfscpuload.c b/fs/procfs/fs_procfscpuload.c index 2f54ab841f..02d216e409 100644 --- a/fs/procfs/fs_procfscpuload.c +++ b/fs/procfs/fs_procfscpuload.c @@ -138,7 +138,7 @@ static int cpuload_open(FAR struct file *filep, FAR const char *relpath, { FAR struct cpuload_file_s *attr; - fvdbg("Open '%s'\n", relpath); + finfo("Open '%s'\n", relpath); /* PROCFS is read-only. Any attempt to open with any kind of write * access is not permitted. @@ -207,7 +207,7 @@ static ssize_t cpuload_read(FAR struct file *filep, FAR char *buffer, off_t offset; ssize_t ret; - fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen); + finfo("buffer=%p buflen=%d\n", buffer, (int)buflen); /* Recover our private data from the struct file instance */ @@ -288,7 +288,7 @@ static int cpuload_dup(FAR const struct file *oldp, FAR struct file *newp) FAR struct cpuload_file_s *oldattr; FAR struct cpuload_file_s *newattr; - fvdbg("Dup %p->%p\n", oldp, newp); + finfo("Dup %p->%p\n", oldp, newp); /* Recover our private data from the old struct file instance */ diff --git a/fs/procfs/fs_procfskmm.c b/fs/procfs/fs_procfskmm.c index 3424338dc0..4589de4a88 100644 --- a/fs/procfs/fs_procfskmm.c +++ b/fs/procfs/fs_procfskmm.c @@ -137,7 +137,7 @@ static int kmm_open(FAR struct file *filep, FAR const char *relpath, { FAR struct kmm_file_s *procfile; - fvdbg("Open '%s'\n", relpath); + finfo("Open '%s'\n", relpath); /* PROCFS is read-only. Any attempt to open with any kind of write * access is not permitted. @@ -208,7 +208,7 @@ static ssize_t kmm_read(FAR struct file *filep, FAR char *buffer, size_t totalsize; off_t offset; - fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen); + finfo("buffer=%p buflen=%d\n", buffer, (int)buflen); DEBUGASSERT(filep != NULL && buffer != NULL && buflen > 0); offset = filep->f_pos; @@ -267,7 +267,7 @@ static int kmm_dup(FAR const struct file *oldp, FAR struct file *newp) FAR struct kmm_file_s *oldattr; FAR struct kmm_file_s *newattr; - fvdbg("Dup %p->%p\n", oldp, newp); + finfo("Dup %p->%p\n", oldp, newp); /* Recover our private data from the old struct file instance */ diff --git a/fs/procfs/fs_procfsproc.c b/fs/procfs/fs_procfsproc.c index f5f6c0397f..d7cb3f8813 100644 --- a/fs/procfs/fs_procfsproc.c +++ b/fs/procfs/fs_procfsproc.c @@ -1013,7 +1013,7 @@ static int proc_open(FAR struct file *filep, FAR const char *relpath, unsigned long tmp; pid_t pid; - fvdbg("Open '%s'\n", relpath); + finfo("Open '%s'\n", relpath); /* PROCFS is read-only. Any attempt to open with any kind of write * access is not permitted. @@ -1137,7 +1137,7 @@ static ssize_t proc_read(FAR struct file *filep, FAR char *buffer, irqstate_t flags; ssize_t ret; - fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen); + finfo("buffer=%p buflen=%d\n", buffer, (int)buflen); /* Recover our private data from the struct file instance */ @@ -1215,7 +1215,7 @@ static int proc_dup(FAR const struct file *oldp, FAR struct file *newp) FAR struct proc_file_s *oldfile; FAR struct proc_file_s *newfile; - fvdbg("Dup %p->%p\n", oldp, newp); + finfo("Dup %p->%p\n", oldp, newp); /* Recover our private data from the old struct file instance */ @@ -1259,7 +1259,7 @@ static int proc_opendir(FAR const char *relpath, FAR struct fs_dirent_s *dir) FAR char *ptr; pid_t pid; - fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL"); + finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL"); DEBUGASSERT(relpath && dir && !dir->u.procfs); /* The relative must be either: @@ -1415,7 +1415,7 @@ static int proc_readdir(struct fs_dirent_s *dir) * error -ENOENT */ - fvdbg("Entry %d: End of directory\n", index); + finfo("Entry %d: End of directory\n", index); ret = -ENOENT; } diff --git a/fs/procfs/fs_procfsuptime.c b/fs/procfs/fs_procfsuptime.c index a1b9b070da..75d7510ed1 100644 --- a/fs/procfs/fs_procfsuptime.c +++ b/fs/procfs/fs_procfsuptime.c @@ -140,7 +140,7 @@ static int uptime_open(FAR struct file *filep, FAR const char *relpath, { FAR struct uptime_file_s *attr; - fvdbg("Open '%s'\n", relpath); + finfo("Open '%s'\n", relpath); /* PROCFS is read-only. Any attempt to open with any kind of write * access is not permitted. @@ -222,7 +222,7 @@ static ssize_t uptime_read(FAR struct file *filep, FAR char *buffer, unsigned int csec; #endif - fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen); + finfo("buffer=%p buflen=%d\n", buffer, (int)buflen); /* Recover our private data from the struct file instance */ @@ -301,7 +301,7 @@ static int uptime_dup(FAR const struct file *oldp, FAR struct file *newp) FAR struct uptime_file_s *oldattr; FAR struct uptime_file_s *newattr; - fvdbg("Dup %p->%p\n", oldp, newp); + finfo("Dup %p->%p\n", oldp, newp); /* Recover our private data from the old struct file instance */ diff --git a/fs/procfs/fs_skeleton.c b/fs/procfs/fs_skeleton.c index 052eb1f0f7..55216e8cef 100644 --- a/fs/procfs/fs_skeleton.c +++ b/fs/procfs/fs_skeleton.c @@ -163,7 +163,7 @@ static int skel_open(FAR struct file *filep, FAR const char *relpath, { FAR struct skel_file_s *priv; - fvdbg("Open '%s'\n", relpath); + finfo("Open '%s'\n", relpath); /* PROCFS is read-only. Any attempt to open with any kind of write * access is not permitted. @@ -228,7 +228,7 @@ static ssize_t skel_read(FAR struct file *filep, FAR char *buffer, FAR struct skel_file_s *priv; ssize_t ret; - fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen); + finfo("buffer=%p buflen=%d\n", buffer, (int)buflen); /* Recover our private data from the struct file instance */ @@ -262,7 +262,7 @@ static int skel_dup(FAR const struct file *oldp, FAR struct file *newp) FAR struct skel_file_s *oldpriv; FAR struct skel_file_s *newpriv; - fvdbg("Dup %p->%p\n", oldp, newp); + finfo("Dup %p->%p\n", oldp, newp); /* Recover our private data from the old struct file instance */ @@ -300,7 +300,7 @@ static int skel_opendir(FAR const char *relpath, FAR struct fs_dirent_s *dir) { FAR struct skel_level1_s *level1; - fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL"); + finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL"); DEBUGASSERT(relpath && dir && !dir->u.procfs); /* The path refers to the 1st level sbdirectory. Allocate the level1 @@ -383,7 +383,7 @@ static int skel_readdir(FAR struct fs_dirent_s *dir) * error -ENOENT */ - fvdbg("Entry %d: End of directory\n", index); + finfo("Entry %d: End of directory\n", index); ret = -ENOENT; } diff --git a/fs/romfs/fs_romfs.c b/fs/romfs/fs_romfs.c index 804fbb7ed4..91686d32d6 100644 --- a/fs/romfs/fs_romfs.c +++ b/fs/romfs/fs_romfs.c @@ -149,7 +149,7 @@ static int romfs_open(FAR struct file *filep, FAR const char *relpath, FAR struct romfs_file_s *rf; int ret; - fvdbg("Open '%s'\n", relpath); + finfo("Open '%s'\n", relpath); /* Sanity checks */ @@ -285,7 +285,7 @@ static int romfs_close(FAR struct file *filep) FAR struct romfs_file_s *rf; int ret = OK; - fvdbg("Closing\n"); + finfo("Closing\n"); /* Sanity checks */ @@ -340,7 +340,7 @@ static ssize_t romfs_read(FAR struct file *filep, FAR char *buffer, int sectorndx; int ret; - fvdbg("Read %d bytes from offset %d\n", buflen, filep->f_pos); + finfo("Read %d bytes from offset %d\n", buflen, filep->f_pos); /* Sanity checks */ @@ -404,7 +404,7 @@ static ssize_t romfs_read(FAR struct file *filep, FAR char *buffer, /* Read all of the sectors directly into user memory */ - fvdbg("Read %d sectors starting with %d\n", nsectors, sector); + finfo("Read %d sectors starting with %d\n", nsectors, sector); ret = romfs_hwread(rm, userbuffer, sector, nsectors); if (ret < 0) { @@ -422,7 +422,7 @@ static ssize_t romfs_read(FAR struct file *filep, FAR char *buffer, * it is already there then all is well. */ - fvdbg("Read sector %d\n", sector); + finfo("Read sector %d\n", sector); ret = romfs_filecacheread(rm, rf, sector); if (ret < 0) { @@ -446,7 +446,7 @@ static ssize_t romfs_read(FAR struct file *filep, FAR char *buffer, sector++; } - fvdbg("Return %d bytes from sector offset %d\n", bytesread, sectorndx); + finfo("Return %d bytes from sector offset %d\n", bytesread, sectorndx); memcpy(userbuffer, &rf->rf_buffer[sectorndx], bytesread); } @@ -477,7 +477,7 @@ static off_t romfs_seek(FAR struct file *filep, off_t offset, int whence) off_t position; int ret; - fvdbg("Seek to offset: %d whence: %d\n", offset, whence); + finfo("Seek to offset: %d whence: %d\n", offset, whence); /* Sanity checks */ @@ -537,7 +537,7 @@ static off_t romfs_seek(FAR struct file *filep, off_t offset, int whence) /* Set file position and return success */ filep->f_pos = position; - fvdbg("New file position: %d\n", filep->f_pos); + finfo("New file position: %d\n", filep->f_pos); romfs_semgive(rm); return OK; @@ -557,7 +557,7 @@ static int romfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg) FAR struct romfs_file_s *rf; FAR void **ppv = (FAR void**)arg; - fvdbg("cmd: %d arg: %08lx\n", cmd, arg); + finfo("cmd: %d arg: %08lx\n", cmd, arg); /* Sanity checks */ @@ -597,7 +597,7 @@ static int romfs_dup(FAR const struct file *oldp, FAR struct file *newp) FAR struct romfs_file_s *newrf; int ret; - fvdbg("Dup %p->%p\n", oldp, newp); + finfo("Dup %p->%p\n", oldp, newp); /* Sanity checks */ @@ -691,7 +691,7 @@ static int romfs_opendir(FAR struct inode *mountpt, FAR const char *relpath, FAR struct romfs_dirinfo_s dirinfo; int ret; - fvdbg("relpath: '%s'\n", relpath); + finfo("relpath: '%s'\n", relpath); /* Sanity checks */ @@ -759,7 +759,7 @@ static int romfs_readdir(FAR struct inode *mountpt, uint32_t size; int ret; - fvdbg("Entry\n"); + finfo("Entry\n"); /* Sanity checks */ @@ -851,7 +851,7 @@ static int romfs_rewinddir(FAR struct inode *mountpt, FAR struct romfs_mountpt_s *rm; int ret; - fvdbg("Entry\n"); + finfo("Entry\n"); /* Sanity checks */ @@ -891,7 +891,7 @@ static int romfs_bind(FAR struct inode *blkdriver, FAR const void *data, struct romfs_mountpt_s *rm; int ret; - fvdbg("Entry\n"); + finfo("Entry\n"); /* Open the block driver */ @@ -977,7 +977,7 @@ static int romfs_unbind(FAR void *handle, FAR struct inode **blkdriver, FAR struct romfs_mountpt_s *rm = (FAR struct romfs_mountpt_s *)handle; int ret; - fvdbg("Entry\n"); + finfo("Entry\n"); #ifdef CONFIG_DEBUG if (!rm) @@ -1056,7 +1056,7 @@ static int romfs_statfs(FAR struct inode *mountpt, FAR struct statfs *buf) FAR struct romfs_mountpt_s *rm; int ret; - fvdbg("Entry\n"); + finfo("Entry\n"); /* Sanity checks */ @@ -1114,7 +1114,7 @@ static int romfs_stat(FAR struct inode *mountpt, FAR const char *relpath, FAR struct romfs_dirinfo_s dirinfo; int ret; - fvdbg("Entry\n"); + finfo("Entry\n"); /* Sanity checks */ @@ -1142,7 +1142,7 @@ static int romfs_stat(FAR struct inode *mountpt, FAR const char *relpath, if (ret < 0) { - fvdbg("Failed to find directory: %d\n", ret); + finfo("Failed to find directory: %d\n", ret); goto errout_with_semaphore; } @@ -1171,7 +1171,7 @@ static int romfs_stat(FAR struct inode *mountpt, FAR const char *relpath, { /* Otherwise, pretend like the unsupported node does not exist */ - fvdbg("Unsupported inode: %d\n", dirinfo.rd_next); + finfo("Unsupported inode: %d\n", dirinfo.rd_next); ret = -ENOENT; goto errout_with_semaphore; } diff --git a/fs/romfs/fs_romfsutil.c b/fs/romfs/fs_romfsutil.c index ade749ffcb..da4b7685cd 100644 --- a/fs/romfs/fs_romfsutil.c +++ b/fs/romfs/fs_romfsutil.c @@ -437,7 +437,7 @@ int romfs_filecacheread(struct romfs_mountpt_s *rm, struct romfs_file_s *rf, { int ret; - fvdbg("sector: %d cached: %d sectorsize: %d XIP base: %p buffer: %p\n", + finfo("sector: %d cached: %d sectorsize: %d XIP base: %p buffer: %p\n", sector, rf->rf_cachesector, rm->rm_hwsectorsize, rm->rm_xipbase, rf->rf_buffer); @@ -457,13 +457,13 @@ int romfs_filecacheread(struct romfs_mountpt_s *rm, struct romfs_file_s *rf, */ rf->rf_buffer = rm->rm_xipbase + sector * rm->rm_hwsectorsize; - fvdbg("XIP buffer: %p\n", rf->rf_buffer); + finfo("XIP buffer: %p\n", rf->rf_buffer); } else { /* In non-XIP mode, we will have to read the new sector. */ - fvdbg("Calling romfs_hwread\n"); + finfo("Calling romfs_hwread\n"); ret = romfs_hwread(rm, rf->rf_buffer, sector, 1); if (ret < 0) { diff --git a/fs/smartfs/smartfs_procfs.c b/fs/smartfs/smartfs_procfs.c index 474d85009f..d8fe9995c3 100644 --- a/fs/smartfs/smartfs_procfs.c +++ b/fs/smartfs/smartfs_procfs.c @@ -348,7 +348,7 @@ static int smartfs_open(FAR struct file *filep, FAR const char *relpath, FAR struct smartfs_file_s *priv; int ret; - fvdbg("Open '%s'\n", relpath); + finfo("Open '%s'\n", relpath); /* PROCFS is read-only. Any attempt to open with any kind of write * access is not permitted. @@ -421,7 +421,7 @@ static ssize_t smartfs_read(FAR struct file *filep, FAR char *buffer, FAR struct smartfs_file_s *priv; ssize_t ret; - fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen); + finfo("buffer=%p buflen=%d\n", buffer, (int)buflen); /* Recover our private data from the struct file instance */ @@ -506,7 +506,7 @@ static int smartfs_dup(FAR const struct file *oldp, FAR struct file *newp) FAR struct smartfs_file_s *oldpriv; FAR struct smartfs_file_s *newpriv; - fvdbg("Dup %p->%p\n", oldp, newp); + finfo("Dup %p->%p\n", oldp, newp); /* Recover our private data from the old struct file instance */ @@ -545,7 +545,7 @@ static int smartfs_opendir(FAR const char *relpath, FAR struct fs_dirent_s *dir) FAR struct smartfs_level1_s *level1; int ret; - fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL"); + finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL"); DEBUGASSERT(relpath && dir && !dir->u.procfs); /* The path refers to the 1st level subdirectory. Allocate the level1 @@ -624,7 +624,7 @@ static int smartfs_readdir(struct fs_dirent_s *dir) * error -ENOENT */ - fvdbg("Entry %d: End of directory\n", index); + finfo("Entry %d: End of directory\n", index); ret = -ENOENT; } diff --git a/fs/smartfs/smartfs_smart.c b/fs/smartfs/smartfs_smart.c index df65d2bdd0..d7c7694be5 100644 --- a/fs/smartfs/smartfs_smart.c +++ b/fs/smartfs/smartfs_smart.c @@ -628,7 +628,7 @@ static int smartfs_sync_internal(struct smartfs_mountpt_s *fs, if (sf->byteswritten > 0) { - fvdbg("Syncing sector %d\n", sf->currsector); + finfo("Syncing sector %d\n", sf->currsector); /* Read the existing sector used bytes value */ @@ -1218,7 +1218,7 @@ static int smartfs_dup(FAR const struct file *oldp, FAR struct file *newp) { struct smartfs_ofile_s *sf; - fvdbg("Dup %p->%p\n", oldp, newp); + finfo("Dup %p->%p\n", oldp, newp); /* Sanity checks */ diff --git a/fs/tmpfs/fs_tmpfs.c b/fs/tmpfs/fs_tmpfs.c index 09aa6bec70..8bcaffec64 100644 --- a/fs/tmpfs/fs_tmpfs.c +++ b/fs/tmpfs/fs_tmpfs.c @@ -1345,7 +1345,7 @@ static int tmpfs_open(FAR struct file *filep, FAR const char *relpath, off_t offset; int ret; - fvdbg("filep: %p\n", filep); + finfo("filep: %p\n", filep); DEBUGASSERT(filep->f_priv == NULL && filep->f_inode != NULL); /* Get the mountpoint inode reference from the file structure and the @@ -1489,7 +1489,7 @@ static int tmpfs_close(FAR struct file *filep) { FAR struct tmpfs_file_s *tfo; - fvdbg("filep: %p\n", filep); + finfo("filep: %p\n", filep); DEBUGASSERT(filep->f_priv != NULL && filep->f_inode != NULL); /* Recover our private data from the struct file instance */ @@ -1543,7 +1543,7 @@ static ssize_t tmpfs_read(FAR struct file *filep, FAR char *buffer, off_t startpos; off_t endpos; - fvdbg("filep: %p buffer: %p buflen: %lu\n", + finfo("filep: %p buffer: %p buflen: %lu\n", filep, buffer, (unsigned long)buflen); DEBUGASSERT(filep->f_priv != NULL && filep->f_inode != NULL); @@ -1591,7 +1591,7 @@ static ssize_t tmpfs_write(FAR struct file *filep, FAR const char *buffer, off_t endpos; int ret; - fvdbg("filep: %p buffer: %p buflen: %lu\n", + finfo("filep: %p buffer: %p buflen: %lu\n", filep, buffer, (unsigned long)buflen); DEBUGASSERT(filep->f_priv != NULL && filep->f_inode != NULL); @@ -1646,7 +1646,7 @@ static off_t tmpfs_seek(FAR struct file *filep, off_t offset, int whence) FAR struct tmpfs_file_s *tfo; off_t position; - fvdbg("filep: %p\n", filep); + finfo("filep: %p\n", filep); DEBUGASSERT(filep->f_priv != NULL && filep->f_inode != NULL); /* Recover our private data from the struct file instance */ @@ -1706,7 +1706,7 @@ static int tmpfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg) FAR struct tmpfs_file_s *tfo; FAR void **ppv = (FAR void**)arg; - fvdbg("filep: %p cmd: %d arg: %08lx\n", filep, cmd, arg); + finfo("filep: %p cmd: %d arg: %08lx\n", filep, cmd, arg); DEBUGASSERT(filep->f_priv != NULL && filep->f_inode != NULL); /* Recover our private data from the struct file instance */ @@ -1739,7 +1739,7 @@ static int tmpfs_dup(FAR const struct file *oldp, FAR struct file *newp) { FAR struct tmpfs_file_s *tfo; - fvdbg("Dup %p->%p\n", oldp, newp); + finfo("Dup %p->%p\n", oldp, newp); DEBUGASSERT(oldp->f_priv != NULL && oldp->f_inode != NULL && newp->f_priv == NULL && newp->f_inode != NULL); @@ -1774,7 +1774,7 @@ static int tmpfs_opendir(FAR struct inode *mountpt, FAR const char *relpath, FAR struct tmpfs_directory_s *tdo; int ret; - fvdbg("mountpt: %p relpath: %s dir: %p\n", + finfo("mountpt: %p relpath: %s dir: %p\n", mountpt, relpath, dir); DEBUGASSERT(mountpt != NULL && relpath != NULL && dir != NULL); @@ -1820,7 +1820,7 @@ static int tmpfs_closedir(FAR struct inode *mountpt, { FAR struct tmpfs_directory_s *tdo; - fvdbg("mountpt: %p dir: %p\n", mountpt, dir); + finfo("mountpt: %p dir: %p\n", mountpt, dir); DEBUGASSERT(mountpt != NULL && dir != NULL); /* Get the directory structure from the dir argument */ @@ -1847,7 +1847,7 @@ static int tmpfs_readdir(FAR struct inode *mountpt, unsigned int index; int ret; - fvdbg("mountpt: %p dir: %p\n", mountpt, dir); + finfo("mountpt: %p dir: %p\n", mountpt, dir); DEBUGASSERT(mountpt != NULL && dir != NULL); /* Get the directory structure from the dir argument and lock it */ @@ -1866,7 +1866,7 @@ static int tmpfs_readdir(FAR struct inode *mountpt, * -ENOENT */ - fvdbg("End of directory\n"); + finfo("End of directory\n"); ret = -ENOENT; } else @@ -1914,7 +1914,7 @@ static int tmpfs_readdir(FAR struct inode *mountpt, static int tmpfs_rewinddir(FAR struct inode *mountpt, FAR struct fs_dirent_s *dir) { - fvdbg("mountpt: %p dir: %p\n", mountpt, dir); + finfo("mountpt: %p dir: %p\n", mountpt, dir); DEBUGASSERT(mountpt != NULL && dir != NULL); /* Set the readdir index to zero */ @@ -1933,7 +1933,7 @@ static int tmpfs_bind(FAR struct inode *blkdriver, FAR const void *data, FAR struct tmpfs_directory_s *tdo; FAR struct tmpfs_s *fs; - fvdbg("blkdriver: %p data: %p handle: %p\n", blkdriver, data, handle); + finfo("blkdriver: %p data: %p handle: %p\n", blkdriver, data, handle); DEBUGASSERT(blkdriver == NULL && handle != NULL); /* Create an instance of the tmpfs file system */ @@ -1985,7 +1985,7 @@ static int tmpfs_unbind(FAR void *handle, FAR struct inode **blkdriver, FAR struct tmpfs_directory_s *tdo; int ret; - fvdbg("handle: %p blkdriver: %p flags: %02x\n", + finfo("handle: %p blkdriver: %p flags: %02x\n", handle, blkdriver, flags); DEBUGASSERT(fs != NULL && fs->tfs_root.tde_object != NULL); @@ -2023,7 +2023,7 @@ static int tmpfs_statfs(FAR struct inode *mountpt, FAR struct statfs *buf) off_t blkused; int ret; - fvdbg("mountpt: %p buf: %p\n", mountpt, buf); + finfo("mountpt: %p buf: %p\n", mountpt, buf); DEBUGASSERT(mountpt != NULL && buf != NULL); /* Get the file system structure from the inode reference. */ @@ -2090,7 +2090,7 @@ static int tmpfs_unlink(FAR struct inode *mountpt, FAR const char *relpath) FAR const char *name; int ret; - fvdbg("mountpt: %p relpath: %s\n", mountpt, relpath); + finfo("mountpt: %p relpath: %s\n", mountpt, relpath); DEBUGASSERT(mountpt != NULL && relpath != NULL); /* Get the file system structure from the inode reference. */ @@ -2190,7 +2190,7 @@ static int tmpfs_mkdir(FAR struct inode *mountpt, FAR const char *relpath, FAR struct tmpfs_s *fs; int ret; - fvdbg("mountpt: %p relpath: %s mode: %04x\n", mountpt, relpath, mode); + finfo("mountpt: %p relpath: %s mode: %04x\n", mountpt, relpath, mode); DEBUGASSERT(mountpt != NULL && relpath != NULL); /* Get the file system structure from the inode reference. */ @@ -2221,7 +2221,7 @@ static int tmpfs_rmdir(FAR struct inode *mountpt, FAR const char *relpath) FAR const char *name; int ret; - fvdbg("mountpt: %p relpath: %s\n", mountpt, relpath); + finfo("mountpt: %p relpath: %s\n", mountpt, relpath); DEBUGASSERT(mountpt != NULL && relpath != NULL); /* Get the file system structure from the inode reference. */ @@ -2322,7 +2322,7 @@ static int tmpfs_rename(FAR struct inode *mountpt, FAR const char *oldrelpath, FAR char *copy; int ret; - fvdbg("mountpt: %p oldrelpath: %s newrelpath: %s\n", + finfo("mountpt: %p oldrelpath: %s newrelpath: %s\n", mountpt, oldrelpath, newrelpath); DEBUGASSERT(mountpt != NULL && oldrelpath != NULL && newrelpath != NULL); @@ -2462,7 +2462,7 @@ static int tmpfs_stat(FAR struct inode *mountpt, FAR const char *relpath, size_t objsize; int ret; - fvdbg("mountpt=%p relpath=%s buf=%p\n", mountpt, relpath, buf); + finfo("mountpt=%p relpath=%s buf=%p\n", mountpt, relpath, buf); DEBUGASSERT(mountpt != NULL && relpath != NULL && buf != NULL); /* Get the file system structure from the inode reference. */ diff --git a/fs/unionfs/fs_unionfs.c b/fs/unionfs/fs_unionfs.c index b0a0920e83..a61e94acb0 100644 --- a/fs/unionfs/fs_unionfs.c +++ b/fs/unionfs/fs_unionfs.c @@ -843,7 +843,7 @@ static int unionfs_open(FAR struct file *filep, FAR const char *relpath, DEBUGASSERT(filep != NULL && filep->f_inode != NULL); ui = (FAR struct unionfs_inode_s *)filep->f_inode->i_private; - fvdbg("Opening: ui_nopen=%d\n", ui->ui_nopen); + finfo("Opening: ui_nopen=%d\n", ui->ui_nopen); /* Get exclusive access to the file system data structures */ @@ -946,7 +946,7 @@ static int unionfs_close(FAR struct file *filep) DEBUGASSERT(um != NULL && um->um_node != NULL && um->um_node->u.i_mops != NULL); ops = um->um_node->u.i_mops; - fvdbg("Closing: ui_nopen=%d\n", ui->ui_nopen); + finfo("Closing: ui_nopen=%d\n", ui->ui_nopen); /* Perform the lower level close operation */ @@ -986,7 +986,7 @@ static ssize_t unionfs_read(FAR struct file *filep, FAR char *buffer, FAR const struct mountpt_operations *ops; int ret = -EPERM; - fvdbg("buflen: %lu\n", (unsigned long)buflen); + finfo("buflen: %lu\n", (unsigned long)buflen); /* Recover the open file data from the struct file instance */ @@ -1034,7 +1034,7 @@ static ssize_t unionfs_write(FAR struct file *filep, FAR const char *buffer, FAR const struct mountpt_operations *ops; int ret = -EPERM; - fvdbg("buflen: %lu\n", (unsigned long)buflen); + finfo("buflen: %lu\n", (unsigned long)buflen); /* Recover the open file data from the struct file instance */ @@ -1081,7 +1081,7 @@ static off_t unionfs_seek(FAR struct file *filep, off_t offset, int whence) FAR const struct mountpt_operations *ops; int ret; - fvdbg("offset: %lu whence: %d\n", (unsigned long)offset, whence); + finfo("offset: %lu whence: %d\n", (unsigned long)offset, whence); /* Recover the open file data from the struct file instance */ @@ -1157,7 +1157,7 @@ static int unionfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg) FAR const struct mountpt_operations *ops; int ret = -ENOTTY; - fvdbg("cmd: %d arg: %lu\n", cmd, arg); + finfo("cmd: %d arg: %lu\n", cmd, arg); /* Recover the open file data from the struct file instance */ @@ -1204,7 +1204,7 @@ static int unionfs_sync(FAR struct file *filep) FAR const struct mountpt_operations *ops; int ret = -EINVAL; - fvdbg("Entry\n"); + finfo("Entry\n"); /* Recover the open file data from the struct file instance */ @@ -1252,7 +1252,7 @@ static int unionfs_dup(FAR const struct file *oldp, FAR struct file *newp) FAR const struct mountpt_operations *ops; int ret = -ENOMEM; - fvdbg("Entry\n"); + finfo("Entry\n"); /* Recover the open file data from the struct file instance */ @@ -1323,7 +1323,7 @@ static int unionfs_opendir(FAR struct inode *mountpt, FAR const char *relpath, FAR struct fs_dirent_s *lowerdir; int ret; - fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL"); + finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL"); /* Recover the filesystem data from the struct inode instance */ @@ -1486,7 +1486,7 @@ static int unionfs_closedir(FAR struct inode *mountpt, int ret = OK; int i; - fvdbg("Entry\n"); + finfo("Entry\n"); /* Recover the union file system data from the struct inode instance */ @@ -1638,7 +1638,7 @@ static int unionfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir) DEBUGASSERT(um->um_node != NULL && um->um_node->u.i_mops != NULL); ops = um->um_node->u.i_mops; - fvdbg("fu_ndx: %d\n", fu->fu_ndx); + finfo("fu_ndx: %d\n", fu->fu_ndx); /* Perform the lower level readdir operation */ @@ -1819,7 +1819,7 @@ static int unionfs_rewinddir(struct inode *mountpt, struct fs_dirent_s *dir) FAR struct fs_unionfsdir_s *fu; int ret; - fvdbg("Entry\n"); + finfo("Entry\n"); /* Recover the union file system data from the struct inode instance */ @@ -1883,7 +1883,7 @@ static int unionfs_unbind(FAR void *handle, FAR struct inode **blkdriver, { FAR struct unionfs_inode_s *ui; - fvdbg("Entry\n"); + finfo("Entry\n"); /* Recover the union file system data from the struct inode instance */ @@ -1929,7 +1929,7 @@ static int unionfs_statfs(FAR struct inode *mountpt, FAR struct statfs *buf) uint32_t ratiob16; int ret; - fvdbg("Entry\n"); + finfo("Entry\n"); /* Recover the union file system data from the struct inode instance */ @@ -2065,7 +2065,7 @@ static int unionfs_unlink(FAR struct inode *mountpt, struct stat buf; int ret; - fvdbg("relpath: %s\n", relpath); + finfo("relpath: %s\n", relpath); /* Recover the union file system data from the struct inode instance */ @@ -2137,7 +2137,7 @@ static int unionfs_mkdir(FAR struct inode *mountpt, FAR const char *relpath, int ret2; int ret; - fvdbg("relpath: %s\n", relpath); + finfo("relpath: %s\n", relpath); /* Recover the union file system data from the struct inode instance */ @@ -2210,7 +2210,7 @@ static int unionfs_rmdir(FAR struct inode *mountpt, FAR const char *relpath) int tmp; int ret; - fvdbg("relpath: %s\n", relpath); + finfo("relpath: %s\n", relpath); /* Recover the union file system data from the struct inode instance */ @@ -2285,7 +2285,7 @@ static int unionfs_rename(FAR struct inode *mountpt, int tmp; int ret = -ENOENT; - fvdbg("oldrelpath: %s newrelpath\n", oldrelpath, newrelpath); + finfo("oldrelpath: %s newrelpath\n", oldrelpath, newrelpath); /* Recover the union file system data from the struct inode instance */ @@ -2359,7 +2359,7 @@ static int unionfs_stat(FAR struct inode *mountpt, FAR const char *relpath, FAR struct unionfs_mountpt_s *um; int ret; - fvdbg("relpath: %s\n", relpath); + finfo("relpath: %s\n", relpath); /* Recover the union file system data from the struct inode instance */ diff --git a/fs/vfs/fs_epoll.c b/fs/vfs/fs_epoll.c index 8cd6e227ac..590959b2b7 100644 --- a/fs/vfs/fs_epoll.c +++ b/fs/vfs/fs_epoll.c @@ -114,7 +114,7 @@ int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev) switch (op) { case EPOLL_CTL_ADD: - fvdbg("%08x CTL ADD(%d): fd=%d ev=%08x\n", + finfo("%08x CTL ADD(%d): fd=%d ev=%08x\n", epfd, eph->occupied, fd, ev->events); eph->evs[eph->occupied].events = ev->events | POLLERR | POLLHUP; @@ -147,7 +147,7 @@ int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev) { int i; - fvdbg("%08x CTL MOD(%d): fd=%d ev=%08x\n", + finfo("%08x CTL MOD(%d): fd=%d ev=%08x\n", epfd, eph->occupied, fd, ev->events); for (i = 0; i < eph->occupied; i++) diff --git a/graphics/nxbe/nxbe_getrectangle.c b/graphics/nxbe/nxbe_getrectangle.c index b4d871bc80..e7ec53d2b0 100644 --- a/graphics/nxbe/nxbe_getrectangle.c +++ b/graphics/nxbe/nxbe_getrectangle.c @@ -90,7 +90,7 @@ void nxbe_getrectangle(FAR struct nxbe_window_s *wnd, #ifdef CONFIG_DEBUG if (!wnd || !rect || !dest || plane >= wnd->be->vinfo.nplanes) { - gvdbg("Invalid parameters\n"); + ginfo("Invalid parameters\n"); return; } #endif diff --git a/graphics/nxmu/nx_start.c b/graphics/nxmu/nx_start.c index 814dc5a70c..18e1aeae3f 100644 --- a/graphics/nxmu/nx_start.c +++ b/graphics/nxmu/nx_start.c @@ -135,7 +135,7 @@ int nx_server(int argc, char *argv[]) /* Then start the server (nx_run does not normally return) */ ret = nx_run(dev); - gvdbg("nx_run returned: %d\n", ret); + ginfo("nx_run returned: %d\n", ret); return EXIT_FAILURE; } @@ -174,7 +174,7 @@ int nx_start(void) /* Start the server kernel thread */ - gvdbg("Starting server task\n"); + ginfo("Starting server task\n"); server = kernel_thread("NX Server", CONFIG_NXSTART_SERVERPRIO, CONFIG_NXSTART_SERVERSTACK, nx_server, NULL); if (server < 0) diff --git a/graphics/nxmu/nxmu_server.c b/graphics/nxmu/nxmu_server.c index a5dad6ec40..3d5822b5bb 100644 --- a/graphics/nxmu/nxmu_server.c +++ b/graphics/nxmu/nxmu_server.c @@ -345,7 +345,7 @@ int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev) DEBUGASSERT(nbytes >= sizeof(struct nxsvrmsg_s)); msg = (FAR struct nxsvrmsg_s *)buffer; - gvdbg("Received opcode=%d nbytes=%d\n", msg->msgid, nbytes); + ginfo("Received opcode=%d nbytes=%d\n", msg->msgid, nbytes); switch (msg->msgid) { /* Messages sent from clients to the NX server *********************/ @@ -531,7 +531,7 @@ int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev) { FAR struct nxclimsg_redraw_s *redraw = (FAR struct nxclimsg_redraw_s *)buffer; DEBUGASSERT(redraw->wnd == &fe.be.bkgd); - gvdbg("Re-draw background rect={(%d,%d),(%d,%d)}\n", + ginfo("Re-draw background rect={(%d,%d),(%d,%d)}\n", redraw->rect.pt1.x, redraw->rect.pt1.y, redraw->rect.pt2.x, redraw->rect.pt2.y); nxbe_fill(&fe.be.bkgd, &redraw->rect, fe.be.bgcolor); diff --git a/graphics/nxsu/nx_open.c b/graphics/nxsu/nx_open.c index 2c646c8b3e..ae0007c247 100644 --- a/graphics/nxsu/nx_open.c +++ b/graphics/nxsu/nx_open.c @@ -101,7 +101,7 @@ static void nxsu_bkgdredraw(NXWINDOW hwnd, FAR struct nxbe_window_s *wnd = (FAR struct nxbe_window_s *)hwnd; FAR struct nxbe_state_s *be = wnd->be; - gvdbg("BG redraw rect={(%d,%d),(%d,%d)}\n", + ginfo("BG redraw rect={(%d,%d),(%d,%d)}\n", rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y); nxbe_fill(wnd, &wnd->bounds, be->bgcolor); } diff --git a/graphics/nxterm/nxterm_kbdin.c b/graphics/nxterm/nxterm_kbdin.c index 395f6f759f..3ffb75b01d 100644 --- a/graphics/nxterm/nxterm_kbdin.c +++ b/graphics/nxterm/nxterm_kbdin.c @@ -393,7 +393,7 @@ void nxterm_kbdin(NXTERM handle, FAR const uint8_t *buffer, uint8_t buflen) char ch; int ret; - gvdbg("buflen=%d\n"); + ginfo("buflen=%d\n"); DEBUGASSERT(handle); /* Get the reference to the driver structure from the handle */ diff --git a/graphics/nxterm/nxterm_redraw.c b/graphics/nxterm/nxterm_redraw.c index e2cbc053c9..b1af8b95cb 100644 --- a/graphics/nxterm/nxterm_redraw.c +++ b/graphics/nxterm/nxterm_redraw.c @@ -105,7 +105,7 @@ void nxterm_redraw(NXTERM handle, FAR const struct nxgl_rect_s *rect, bool more) int i; DEBUGASSERT(handle && rect); - gvdbg("rect={(%d,%d),(%d,%d)} more=%s\n", + ginfo("rect={(%d,%d),(%d,%d)} more=%s\n", rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y, more ? "true" : "false"); diff --git a/graphics/vnc/server/vnc_fbdev.c b/graphics/vnc/server/vnc_fbdev.c index 7fc1b46f52..aa71ebd5ff 100644 --- a/graphics/vnc/server/vnc_fbdev.c +++ b/graphics/vnc/server/vnc_fbdev.c @@ -162,7 +162,7 @@ static int up_getvideoinfo(FAR struct fb_vtable_s *vtable, FAR struct vnc_fbinfo_s *fbinfo = (FAR struct vnc_fbinfo_s *)vtable; FAR struct vnc_session_s *session; - gvdbg("vtable=%p vinfo=%p\n", vtable, vinfo); + ginfo("vtable=%p vinfo=%p\n", vtable, vinfo); DEBUGASSERT(fbinfo != NULL && vinfo != NULL); if (fbinfo != NULL && vinfo != NULL) @@ -203,7 +203,7 @@ static int up_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno, FAR struct vnc_fbinfo_s *fbinfo = (FAR struct vnc_fbinfo_s *)vtable; FAR struct vnc_session_s *session; - gvdbg("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo); + ginfo("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo); DEBUGASSERT(fbinfo != NULL && pinfo != NULL && planeno == 0); if (fbinfo != NULL && pinfo != NULL && planeno == 0) @@ -249,7 +249,7 @@ static int up_getcmap(FAR struct fb_vtable_s *vtable, FAR struct vnc_session_s *session; int i; - gvdbg("vtable=%p cmap=%p\n", vtable, cmap); + ginfo("vtable=%p cmap=%p\n", vtable, cmap); DEBUGASSERT(fbinfo != NULL && cmap != NULL); @@ -264,7 +264,7 @@ static int up_getcmap(FAR struct fb_vtable_s *vtable, return -ENOTCONN; } - gvdbg("first=%d len=%d\n", vcmap->first, cmap->len); + ginfo("first=%d len=%d\n", vcmap->first, cmap->len); #warning Missing logic return OK; @@ -286,7 +286,7 @@ static int up_putcmap(FAR struct fb_vtable_s *vtable, FAR const struct fb_cmap_s FAR struct vnc_session_s *session; int i; - gvdbg("vtable=%p cmap=%p\n", vtable, cmap); + ginfo("vtable=%p cmap=%p\n", vtable, cmap); DEBUGASSERT(fbinfo != NULL && cmap != NULL); @@ -301,7 +301,7 @@ static int up_putcmap(FAR struct fb_vtable_s *vtable, FAR const struct fb_cmap_s return -ENOTCONN; } - gvdbg("first=%d len=%d\n", vcmap->first, cmap->len); + ginfo("first=%d len=%d\n", vcmap->first, cmap->len); #warning Missing logic return OK; @@ -324,7 +324,7 @@ static int up_getcursor(FAR struct fb_vtable_s *vtable, FAR struct vnc_session_s *session; int i; - gvdbg("vtable=%p attrib=%p\n", vtable, attrib); + ginfo("vtable=%p attrib=%p\n", vtable, attrib); DEBUGASSERT(fbinfo != NULL && attrib != NULL); @@ -360,7 +360,7 @@ static int up_setcursor(FAR struct fb_vtable_s *vtable, FAR struct vnc_session_s *session; int i; - gvdbg("vtable=%p settings=%p\n", vtable, settings); + ginfo("vtable=%p settings=%p\n", vtable, settings); DEBUGASSERT(fbinfo != NULL && settings != NULL); @@ -375,7 +375,7 @@ static int up_setcursor(FAR struct fb_vtable_s *vtable, return -ENOTCONN; } - gvdbg("flags: %02x\n", settings->flags); + ginfo("flags: %02x\n", settings->flags); if ((settings->flags & FB_CUR_SETPOSITION) != 0) { #warning Missing logic @@ -435,7 +435,7 @@ static int vnc_start_server(int display) /* Start the VNC server kernel thread. */ - gvdbg("Starting the VNC server for display %d\n", display); + ginfo("Starting the VNC server for display %d\n", display); g_fbstartup[display].result = -EBUSY; sem_reset(&g_fbstartup[display].fbinit, 0); @@ -630,7 +630,7 @@ int up_fbinitialize(int display) ret = vnc_start_server(display); if (ret < 0) { - gvdbg("ERROR: vnc_start_server() failed: %d\n", ret); + ginfo("ERROR: vnc_start_server() failed: %d\n", ret); return ret; } @@ -639,7 +639,7 @@ int up_fbinitialize(int display) ret = vnc_wait_connect(display); if (ret < 0) { - gvdbg("ERROR: vnc_wait_connect() failed: %d\n", ret); + ginfo("ERROR: vnc_wait_connect() failed: %d\n", ret); } return ret; @@ -711,7 +711,7 @@ int vnc_fbinitialize(int display, vnc_kbdout_t kbdout, ret = vnc_start_server(display); if (ret < 0) { - gvdbg("ERROR: vnc_start_server() failed: %d\n", ret); + ginfo("ERROR: vnc_start_server() failed: %d\n", ret); return ret; } @@ -720,7 +720,7 @@ int vnc_fbinitialize(int display, vnc_kbdout_t kbdout, ret = vnc_wait_start(display); if (ret < 0) { - gvdbg("ERROR: vnc_wait_start() failed: %d\n", ret); + ginfo("ERROR: vnc_wait_start() failed: %d\n", ret); return ret; } diff --git a/graphics/vnc/server/vnc_negotiate.c b/graphics/vnc/server/vnc_negotiate.c index d70f7c02e0..1541cf2749 100644 --- a/graphics/vnc/server/vnc_negotiate.c +++ b/graphics/vnc/server/vnc_negotiate.c @@ -136,7 +136,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session) /* Inform the client of the VNC protocol version */ - gvdbg("Send protocol version: %s\n", g_vncproto); + ginfo("Send protocol version: %s\n", g_vncproto); len = strlen(g_vncproto); nsent = psock_send(&session->connect, g_vncproto, len, 0); @@ -152,7 +152,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session) /* Receive the echo of the protocol string */ - gvdbg("Receive echo from VNC client\n"); + ginfo("Receive echo from VNC client\n"); nrecvd = psock_recv(&session->connect, session->inbuf, len, 0); if (nrecvd < 0) @@ -176,7 +176,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session) * any stinkin' security. */ - gvdbg("Send SecurityType\n"); + ginfo("Send SecurityType\n"); sectype = (FAR struct rfb_sectype_s *)session->outbuf; rfb_putbe32(sectype->type, RFB_SECTYPE_NONE); @@ -198,7 +198,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session) * only option offered. */ - gvdbg("Send SupportedSecurityTypes\n"); + ginfo("Send SupportedSecurityTypes\n"); sectypes = (FAR struct rfb_supported_sectypes_s *)session->outbuf; sectypes->ntypes = 1; @@ -221,7 +221,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session) * type is to be used on the connection. */ - gvdbg("Receive SecurityType\n"); + ginfo("Receive SecurityType\n"); sectype = (FAR struct rfb_selected_sectype_s *)session->inbuf; @@ -242,7 +242,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session) DEBUGASSERT(nrecvd == sizeof(struct rfb_selected_sectype_s)); - gvdbg("Send SecurityResult\n"); + ginfo("Send SecurityResult\n"); secresult = (FAR struct rfb_sectype_result_s *)session->outbuf; @@ -266,7 +266,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session) DEBUGASSERT(nsent == sizeof(struct rfb_sectype_result_s)); - gvdbg("Send failure reason\n"); + ginfo("Send failure reason\n"); secfail = (FAR struct rfb_sectype_fail_s *)session->outbuf; len = strlen(g_nosecurity); @@ -312,7 +312,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session) * In this implementation, the sharing flag is ignored. */ - gvdbg("Receive ClientInit\n"); + ginfo("Receive ClientInit\n"); nrecvd = psock_recv(&session->connect, session->inbuf, sizeof(struct rfb_clientinit_s), 0); @@ -344,7 +344,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session) * Very Low (8 colors) - RGB3 1:1:1 (TrueColor) */ - gvdbg("Send ServerInit\n"); + ginfo("Send ServerInit\n"); serverinit = (FAR struct rfb_serverinit_s *)session->outbuf; @@ -385,7 +385,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session) * This may override some of our framebuffer settings. */ - gvdbg("Receive SetPixelFormat\n"); + ginfo("Receive SetPixelFormat\n"); setformat = (FAR struct rfb_setpixelformat_s *)session->inbuf; @@ -432,7 +432,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session) /* Receive supported encoding types from client. */ - gvdbg("Receive encoding types\n"); + ginfo("Receive encoding types\n"); encodings = (FAR struct rfb_setencodings_s *)session->inbuf; @@ -498,35 +498,35 @@ int vnc_client_pixelformat(FAR struct vnc_session_s *session, if (pixelfmt->bpp == 8 && pixelfmt->depth == 6) { - gvdbg("Client pixel format: RGB8 2:2:2\n"); + ginfo("Client pixel format: RGB8 2:2:2\n"); session->colorfmt = FB_FMT_RGB8_222; session->bpp = 8; session->bigendian = false; } else if (pixelfmt->bpp == 8 && pixelfmt->depth == 8) { - gvdbg("Client pixel format: RGB8 3:3:2\n"); + ginfo("Client pixel format: RGB8 3:3:2\n"); session->colorfmt = FB_FMT_RGB8_332; session->bpp = 8; session->bigendian = false; } else if (pixelfmt->bpp == 16 && pixelfmt->depth == 15) { - gvdbg("Client pixel format: RGB16 5:5:5\n"); + ginfo("Client pixel format: RGB16 5:5:5\n"); session->colorfmt = FB_FMT_RGB16_555; session->bpp = 16; session->bigendian = (pixelfmt->bigendian != 0) ? true : false; } else if (pixelfmt->bpp == 16 && pixelfmt->depth == 16) { - gvdbg("Client pixel format: RGB16 5:6:5\n"); + ginfo("Client pixel format: RGB16 5:6:5\n"); session->colorfmt = FB_FMT_RGB16_565; session->bpp = 16; session->bigendian = (pixelfmt->bigendian != 0) ? true : false; } else if (pixelfmt->bpp == 32 && pixelfmt->depth == 24) { - gvdbg("Client pixel format: RGB32 8:8:8\n"); + ginfo("Client pixel format: RGB32 8:8:8\n"); session->colorfmt = FB_FMT_RGB32; session->bpp = 32; session->bigendian = (pixelfmt->bigendian != 0) ? true : false; diff --git a/graphics/vnc/server/vnc_raw.c b/graphics/vnc/server/vnc_raw.c index 1f6149b398..4b4ac83209 100644 --- a/graphics/vnc/server/vnc_raw.c +++ b/graphics/vnc/server/vnc_raw.c @@ -491,7 +491,7 @@ int vnc_raw(FAR struct vnc_session_s *session, FAR struct nxgl_rect_s *rect) } while (size > 0); - updvdbg("Sent {(%d, %d),(%d, %d)}\n", + updinfo("Sent {(%d, %d),(%d, %d)}\n", x, y, x + updwidth -1, y + updheight - 1); } } diff --git a/graphics/vnc/server/vnc_receiver.c b/graphics/vnc/server/vnc_receiver.c index 6356d6df35..2344ede712 100644 --- a/graphics/vnc/server/vnc_receiver.c +++ b/graphics/vnc/server/vnc_receiver.c @@ -138,7 +138,7 @@ int vnc_receiver(FAR struct vnc_session_s *session) int ret; DEBUGASSERT(session); - gvdbg("Receiver running for Display %d\n", session->display); + ginfo("Receiver running for Display %d\n", session->display); #ifdef CONFIG_NET_SOCKOPTS /* Disable the receive timeout so that we will wait indefinitely for the @@ -196,7 +196,7 @@ int vnc_receiver(FAR struct vnc_session_s *session) { case RFB_SETPIXELFMT_MSG: /* SetPixelFormat */ { - gvdbg("Received SetPixelFormat\n"); + ginfo("Received SetPixelFormat\n"); /* Read the rest of the SetPixelFormat message */ @@ -230,7 +230,7 @@ int vnc_receiver(FAR struct vnc_session_s *session) FAR struct rfb_setencodings_s *encodings; unsigned int nencodings; - gvdbg("Received SetEncodings\n"); + ginfo("Received SetEncodings\n"); /* Read the SetEncodings message without the following * encodings. @@ -278,7 +278,7 @@ int vnc_receiver(FAR struct vnc_session_s *session) FAR struct rfb_fbupdatereq_s *update; struct nxgl_rect_s rect; - gvdbg("Received FramebufferUpdateRequest\n"); + ginfo("Received FramebufferUpdateRequest\n"); /* Read the rest of the SetPixelFormat message */ @@ -314,7 +314,7 @@ int vnc_receiver(FAR struct vnc_session_s *session) { FAR struct rfb_keyevent_s *keyevent; - gvdbg("Received KeyEvent\n"); + ginfo("Received KeyEvent\n"); /* Read the rest of the KeyEvent message */ @@ -343,7 +343,7 @@ int vnc_receiver(FAR struct vnc_session_s *session) FAR struct rfb_pointerevent_s *event; uint8_t buttons; #endif - gvdbg("Received PointerEvent\n"); + ginfo("Received PointerEvent\n"); /* Read the rest of the PointerEvent message */ @@ -397,7 +397,7 @@ int vnc_receiver(FAR struct vnc_session_s *session) FAR struct rfb_clientcuttext_s *cuttext; uint32_t length; - gvdbg("Received ClientCutText\n"); + ginfo("Received ClientCutText\n"); /* Read the ClientCutText message without the following * text. diff --git a/graphics/vnc/server/vnc_rre.c b/graphics/vnc/server/vnc_rre.c index 6c0c880a04..fa4935f7d4 100644 --- a/graphics/vnc/server/vnc_rre.c +++ b/graphics/vnc/server/vnc_rre.c @@ -299,7 +299,7 @@ int vnc_rre(FAR struct vnc_session_s *session, FAR struct nxgl_rect_s *rect) } DEBUGASSERT(nsent == nbytes); - updvdbg("Sent {(%d, %d),(%d, %d)}\n", + updinfo("Sent {(%d, %d),(%d, %d)}\n", rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y); return nbytes; } diff --git a/graphics/vnc/server/vnc_server.c b/graphics/vnc/server/vnc_server.c index bbbfe3251c..94b993ccd7 100644 --- a/graphics/vnc/server/vnc_server.c +++ b/graphics/vnc/server/vnc_server.c @@ -161,7 +161,7 @@ static int vnc_connect(FAR struct vnc_session_s *session, int port) struct sockaddr_in addr; int ret; - gvdbg("Connecting display %d\n", session->display); + ginfo("Connecting display %d\n", session->display); /* Create a listening socket */ @@ -197,7 +197,7 @@ static int vnc_connect(FAR struct vnc_session_s *session, int port) /* Connect to the client */ - gvdbg("Accepting connection for Display %d\n", session->display); + ginfo("Accepting connection for Display %d\n", session->display); ret = psock_accept(&session->listen, NULL, NULL, &session->connect); if (ret < 0) @@ -206,7 +206,7 @@ static int vnc_connect(FAR struct vnc_session_s *session, int port) goto errout_with_listener; } - gvdbg("Display %d connected\n", session->display); + ginfo("Display %d connected\n", session->display); session->state = VNCSERVER_CONNECTED; return OK; @@ -257,7 +257,7 @@ int vnc_server(int argc, FAR char *argv[]) goto errout_with_post; } - gvdbg("Server started for Display %d\n", display); + ginfo("Server started for Display %d\n", display); /* Allocate the framebuffer memory. We rely on the fact that * the KMM allocator will align memory to 32-bits or better. @@ -310,7 +310,7 @@ int vnc_server(int argc, FAR char *argv[]) ret = vnc_connect(session, RFB_DISPLAY_PORT(display)); if (ret >= 0) { - gvdbg("New VNC connection\n"); + ginfo("New VNC connection\n"); /* Perform the VNC initialization sequence after the client has * sucessfully connected to the server. Negotiate security, @@ -350,7 +350,7 @@ int vnc_server(int argc, FAR char *argv[]) */ ret = vnc_receiver(session); - gvdbg("Session terminated with %d\n", ret); + ginfo("Session terminated with %d\n", ret); UNUSED(ret); /* Stop the VNC updater thread. */ diff --git a/graphics/vnc/server/vnc_server.h b/graphics/vnc/server/vnc_server.h index 45d34b5260..07863fbf5b 100644 --- a/graphics/vnc/server/vnc_server.h +++ b/graphics/vnc/server/vnc_server.h @@ -188,25 +188,25 @@ # ifdef CONFIG_CPP_HAVE_VARARGS # define upddbg(format, ...) dbg(format, ##__VA_ARGS__) # define updlldbg(format, ...) lldbg(format, ##__VA_ARGS__) -# define updvdbg(format, ...) vdbg(format, ##__VA_ARGS__) -# define updllvdbg(format, ...) llvdbg(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 updvdbg vdbg -# define updllvdbg llvdbg +# define updinfo info +# define updllinfo llinfo # endif #else # ifdef CONFIG_CPP_HAVE_VARARGS # define upddbg(x...) # define updlldbg(x...) -# define updvdbg(x...) -# define updllvdbg(x...) +# define updinfo(x...) +# define updllinfo(x...) # else # define upddbg (void) # define updlldbg (void) -# define updvdbg (void) -# define updllvdbg (void) +# define updinfo (void) +# define updllinfo (void) # endif #endif diff --git a/graphics/vnc/server/vnc_updater.c b/graphics/vnc/server/vnc_updater.c index 0d03aa275c..a466740b23 100644 --- a/graphics/vnc/server/vnc_updater.c +++ b/graphics/vnc/server/vnc_updater.c @@ -299,7 +299,7 @@ vnc_remove_queue(FAR struct vnc_session_s *session) if (session->nwhupd > 0 && rect->whupd) { session->nwhupd--; - updvdbg("Whole screen update: nwhupd=%d\n", session->nwhupd); + updinfo("Whole screen update: nwhupd=%d\n", session->nwhupd); } sched_unlock(); @@ -369,7 +369,7 @@ static FAR void *vnc_updater(FAR void *arg) int ret; DEBUGASSERT(session != NULL); - gvdbg("Updater running for Display %d\n", session->display); + ginfo("Updater running for Display %d\n", session->display); /* Loop, processing updates until we are asked to stop. * REVISIT: Probably need some kind of signal mechanism to wake up @@ -386,7 +386,7 @@ static FAR void *vnc_updater(FAR void *arg) srcrect = vnc_remove_queue(session); DEBUGASSERT(srcrect != NULL); - updvdbg("Dequeued {(%d, %d),(%d, %d)}\n", + updinfo("Dequeued {(%d, %d),(%d, %d)}\n", srcrect->rect.pt1.x, srcrect->rect.pt1.y, srcrect->rect.pt2.x, srcrect->rect.pt2.y); @@ -442,7 +442,7 @@ int vnc_start_updater(FAR struct vnc_session_s *session) struct sched_param param; int status; - gvdbg("Starting updater for Display %d\n", session->display); + ginfo("Starting updater for Display %d\n", session->display); /* Create thread that is gonna send rectangles to the client */ @@ -577,7 +577,7 @@ int vnc_update_rectangle(FAR struct vnc_session_s *session, FAR struct vnc_fbupdate_s *curr; FAR struct vnc_fbupdate_s *next; - updvdbg("New whole screen update...\n"); + updinfo("New whole screen update...\n"); curr = (FAR struct vnc_fbupdate_s *)session->updqueue.head; sq_init(&session->updqueue); @@ -619,7 +619,7 @@ int vnc_update_rectangle(FAR struct vnc_session_s *session, vnc_add_queue(session, update); - updvdbg("Queued {(%d, %d),(%d, %d)}\n", + updinfo("Queued {(%d, %d),(%d, %d)}\n", intersection.pt1.x, intersection.pt1.y, intersection.pt2.x, intersection.pt2.y); } diff --git a/include/debug.h b/include/debug.h index de212f968d..2f09d73c57 100644 --- a/include/debug.h +++ b/include/debug.h @@ -70,7 +70,7 @@ * directed stdout). Therefore [a-z]dbg() should not be used in interrupt * handlers. * - * [a-z]vdbg() -- Identical to [a-z]dbg() except that it also requires that + * [a-z]info() -- Identical to [a-z]dbg() except that it also requires that * CONFIG_DEBUG_INFO be defined. This is intended for general debug * output that you would normally want to suppress. * @@ -85,7 +85,7 @@ * in low-level code where it is inappropriate to use file descriptors. For * example, only [a-z]lldbg() should be used in interrupt handlers. * - * [a-z]llvdbg() -- Identical to [a-z]lldbg() except that it also requires that + * [a-z]llinfo() -- Identical to [a-z]lldbg() except that it also requires that * CONFIG_DEBUG_INFO be defined. This is intended for general debug * output that you would normally want to suppress. */ @@ -127,27 +127,27 @@ # endif # ifdef CONFIG_DEBUG_INFO -# define vdbg(format, ...) \ +# define info(format, ...) \ __arch_syslog(LOG_DEBUG, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__) # ifdef CONFIG_ARCH_LOWPUTC -# define llvdbg(format, ...) \ +# define llinfo(format, ...) \ __arch_lowsyslog(LOG_DEBUG, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__) # else -# define llvdbg(x...) +# define llinfo(x...) # endif # else /* CONFIG_DEBUG_INFO */ -# define vdbg(x...) -# define llvdbg(x...) +# define info(x...) +# define llinfo(x...) # endif /* CONFIG_DEBUG_INFO */ #else /* CONFIG_DEBUG */ # define dbg(x...) # define lldbg(x...) -# define vdbg(x...) -# define llvdbg(x...) +# define info(x...) +# define llinfo(x...) #endif /* CONFIG_DEBUG */ @@ -156,181 +156,181 @@ #ifdef CONFIG_DEBUG_MM # define mdbg(format, ...) dbg(format, ##__VA_ARGS__) # define mlldbg(format, ...) lldbg(format, ##__VA_ARGS__) -# define mvdbg(format, ...) vdbg(format, ##__VA_ARGS__) -# define mllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__) +# define minfo(format, ...) info(format, ##__VA_ARGS__) +# define mllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define mdbg(x...) # define mlldbg(x...) -# define mvdbg(x...) -# define mllvdbg(x...) +# define minfo(x...) +# define mllinfo(x...) #endif #ifdef CONFIG_DEBUG_SCHED # define sdbg(format, ...) dbg(format, ##__VA_ARGS__) # define slldbg(format, ...) lldbg(format, ##__VA_ARGS__) -# define svdbg(format, ...) vdbg(format, ##__VA_ARGS__) -# define sllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__) +# define sinfo(format, ...) info(format, ##__VA_ARGS__) +# define sllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define sdbg(x...) # define slldbg(x...) -# define svdbg(x...) -# define sllvdbg(x...) +# define sinfo(x...) +# define sllinfo(x...) #endif #ifdef CONFIG_DEBUG_PAGING # define pgdbg(format, ...) dbg(format, ##__VA_ARGS__) # define pglldbg(format, ...) lldbg(format, ##__VA_ARGS__) -# define pgvdbg(format, ...) vdbg(format, ##__VA_ARGS__) -# define pgllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__) +# define pginfo(format, ...) info(format, ##__VA_ARGS__) +# define pgllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define pgdbg(x...) # define pglldbg(x...) -# define pgvdbg(x...) -# define pgllvdbg(x...) +# define pginfo(x...) +# define pgllinfo(x...) #endif #ifdef CONFIG_DEBUG_DMA # define dmadbg(format, ...) dbg(format, ##__VA_ARGS__) # define dmalldbg(format, ...) lldbg(format, ##__VA_ARGS__) -# define dmavdbg(format, ...) vdbg(format, ##__VA_ARGS__) -# define dmallvdbg(format, ...) llvdbg(format, ##__VA_ARGS__) +# define dmainfo(format, ...) info(format, ##__VA_ARGS__) +# define dmallinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define dmadbg(x...) # define dmalldbg(x...) -# define dmavdbg(x...) -# define dmallvdbg(x...) +# define dmainfo(x...) +# define dmallinfo(x...) #endif #ifdef CONFIG_DEBUG_NET # define ndbg(format, ...) dbg(format, ##__VA_ARGS__) # define nlldbg(format, ...) lldbg(format, ##__VA_ARGS__) -# define nvdbg(format, ...) vdbg(format, ##__VA_ARGS__) -# define nllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__) +# define ninfo(format, ...) info(format, ##__VA_ARGS__) +# define nllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define ndbg(x...) # define nlldbg(x...) -# define nvdbg(x...) -# define nllvdbg(x...) +# define ninfo(x...) +# define nllinfo(x...) #endif #ifdef CONFIG_DEBUG_USB # define udbg(format, ...) dbg(format, ##__VA_ARGS__) # define ulldbg(format, ...) lldbg(format, ##__VA_ARGS__) -# define uvdbg(format, ...) vdbg(format, ##__VA_ARGS__) -# define ullvdbg(format, ...) llvdbg(format, ##__VA_ARGS__) +# define uinfo(format, ...) info(format, ##__VA_ARGS__) +# define ullinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define udbg(x...) # define ulldbg(x...) -# define uvdbg(x...) -# define ullvdbg(x...) +# define uinfo(x...) +# define ullinfo(x...) #endif #ifdef CONFIG_DEBUG_FS # define fdbg(format, ...) dbg(format, ##__VA_ARGS__) # define flldbg(format, ...) lldbg(format, ##__VA_ARGS__) -# define fvdbg(format, ...) vdbg(format, ##__VA_ARGS__) -# define fllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__) +# define finfo(format, ...) info(format, ##__VA_ARGS__) +# define fllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define fdbg(x...) # define flldbg(x...) -# define fvdbg(x...) -# define fllvdbg(x...) +# define finfo(x...) +# define fllinfo(x...) #endif #ifdef CONFIG_DEBUG_CRYPTO # define cryptdbg(format, ...) dbg(format, ##__VA_ARGS__) # define cryptlldbg(format, ...) lldbg(format, ##__VA_ARGS__) -# define cryptvdbg(format, ...) vdbg(format, ##__VA_ARGS__) -# define cryptllvdbg(format, ...) llvdbg(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 cryptvdbg(x...) -# define cryptllvdbg(x...) +# define cryptinfo(x...) +# define cryptllinfo(x...) #endif #ifdef CONFIG_DEBUG_INPUT # define idbg(format, ...) dbg(format, ##__VA_ARGS__) # define illdbg(format, ...) lldbg(format, ##__VA_ARGS__) -# define ivdbg(format, ...) vdbg(format, ##__VA_ARGS__) -# define illvdbg(format, ...) llvdbg(format, ##__VA_ARGS__) +# define iinfo(format, ...) info(format, ##__VA_ARGS__) +# define illinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define idbg(x...) # define illdbg(x...) -# define ivdbg(x...) -# define illvdbg(x...) +# define iinfo(x...) +# define illinfo(x...) #endif #ifdef CONFIG_DEBUG_SENSORS # define sndbg(format, ...) dbg(format, ##__VA_ARGS__) # define snlldbg(format, ...) lldbg(format, ##__VA_ARGS__) -# define snvdbg(format, ...) vdbg(format, ##__VA_ARGS__) -# define snllvdbg(format, ...) llvdbg(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 snvdbg(x...) -# define snllvdbg(x...) +# define sninfo(x...) +# define snllinfo(x...) #endif #ifdef CONFIG_DEBUG_ANALOG # define adbg(format, ...) dbg(format, ##__VA_ARGS__) # define alldbg(format, ...) lldbg(format, ##__VA_ARGS__) -# define avdbg(format, ...) vdbg(format, ##__VA_ARGS__) -# define allvdbg(format, ...) llvdbg(format, ##__VA_ARGS__) +# define ainfo(format, ...) info(format, ##__VA_ARGS__) +# define allinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define adbg(x...) # define alldbg(x...) -# define avdbg(x...) -# define allvdbg(x...) +# define ainfo(x...) +# define allinfo(x...) #endif #ifdef CONFIG_DEBUG_GRAPHICS # define gdbg(format, ...) dbg(format, ##__VA_ARGS__) # define glldbg(format, ...) lldbg(format, ##__VA_ARGS__) -# define gvdbg(format, ...) vdbg(format, ##__VA_ARGS__) -# define gllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__) +# define ginfo(format, ...) info(format, ##__VA_ARGS__) +# define gllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define gdbg(x...) # define glldbg(x...) -# define gvdbg(x...) -# define gllvdbg(x...) +# define ginfo(x...) +# define gllinfo(x...) #endif #ifdef CONFIG_DEBUG_BINFMT # define bdbg(format, ...) dbg(format, ##__VA_ARGS__) # define blldbg(format, ...) lldbg(format, ##__VA_ARGS__) -# define bvdbg(format, ...) vdbg(format, ##__VA_ARGS__) -# define bllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__) +# define binfo(format, ...) info(format, ##__VA_ARGS__) +# define bllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define bdbg(x...) # define blldbg(x...) -# define bvdbg(x...) -# define bllvdbg(x...) +# define binfo(x...) +# define bllinfo(x...) #endif #ifdef CONFIG_DEBUG_LIB # define ldbg(format, ...) dbg(format, ##__VA_ARGS__) # define llldbg(format, ...) lldbg(format, ##__VA_ARGS__) -# define lvdbg(format, ...) vdbg(format, ##__VA_ARGS__) -# define lllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__) +# define linfo(format, ...) info(format, ##__VA_ARGS__) +# define lllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define ldbg(x...) # define llldbg(x...) -# define lvdbg(x...) -# define lllvdbg(x...) +# define linfo(x...) +# define lllinfo(x...) #endif #ifdef CONFIG_DEBUG_AUDIO # define auddbg(format, ...) dbg(format, ##__VA_ARGS__) # define audlldbg(format, ...) lldbg(format, ##__VA_ARGS__) -# define audvdbg(format, ...) vdbg(format, ##__VA_ARGS__) -# define audllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__) +# define audinfo(format, ...) info(format, ##__VA_ARGS__) +# define audllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define auddbg(x...) # define audlldbg(x...) -# define audvdbg(x...) -# define audllvdbg(x...) +# define audinfo(x...) +# define audllinfo(x...) #endif #else /* CONFIG_CPP_HAVE_VARARGS */ @@ -342,18 +342,18 @@ # define lldbg (void) # endif # ifndef CONFIG_DEBUG_INFO -# define vdbg (void) -# define llvdbg (void) +# define info (void) +# define llinfo (void) # else # ifndef CONFIG_ARCH_LOWPUTC -# define llvdbg (void) +# define llinfo (void) # endif # endif #else # define dbg (void) # define lldbg (void) -# define vdbg (void) -# define llvdbg (void) +# define info (void) +# define llinfo (void) #endif /* Subsystem specific debug */ @@ -361,181 +361,181 @@ #ifdef CONFIG_DEBUG_MM # define mdbg dbg # define mlldbg lldbg -# define mvdbg vdbg -# define mllvdbg llvdbg +# define minfo info +# define mllinfo llinfo #else # define mdbg (void) # define mlldbg (void) -# define mvdbg (void) -# define mllvdbg (void) +# define minfo (void) +# define mllinfo (void) #endif #ifdef CONFIG_DEBUG_SCHED # define sdbg dbg # define slldbg lldbg -# define svdbg vdbg -# define sllvdbg llvdbg +# define sinfo info +# define sllinfo llinfo #else # define sdbg (void) # define slldbg (void) -# define svdbg (void) -# define sllvdbg (void) +# define sinfo (void) +# define sllinfo (void) #endif #ifdef CONFIG_DEBUG_PAGING # define pgdbg dbg # define pglldbg lldbg -# define pgvdbg vdbg -# define pgllvdbg llvdbg +# define pginfo info +# define pgllinfo llinfo #else # define pgdbg (void) # define pglldbg (void) -# define pgvdbg (void) -# define pgllvdbg (void) +# define pginfo (void) +# define pgllinfo (void) #endif #ifdef CONFIG_DEBUG_DMA # define dmadbg dbg # define dmalldbg lldbg -# define dmavdbg vdbg -# define dmallvdbg llvdbg +# define dmainfo info +# define dmallinfo llinfo #else # define dmadbg (void) # define dmalldbg (void) -# define dmavdbg (void) -# define dmallvdbg (void) +# define dmainfo (void) +# define dmallinfo (void) #endif #ifdef CONFIG_DEBUG_NET # define ndbg dbg # define nlldbg lldbg -# define nvdbg vdbg -# define nllvdbg llvdbg +# define ninfo info +# define nllinfo llinfo #else # define ndbg (void) # define nlldbg (void) -# define nvdbg (void) -# define nllvdbg (void) +# define ninfo (void) +# define nllinfo (void) #endif #ifdef CONFIG_DEBUG_USB # define udbg dbg # define ulldbg lldbg -# define uvdbg vdbg -# define ullvdbg llvdbg +# define uinfo info +# define ullinfo llinfo #else # define udbg (void) # define ulldbg (void) -# define uvdbg (void) -# define ullvdbg (void) +# define uinfo (void) +# define ullinfo (void) #endif #ifdef CONFIG_DEBUG_FS # define fdbg dbg # define flldbg lldbg -# define fvdbg vdbg -# define fllvdbg llvdbg +# define finfo info +# define fllinfo llinfo #else # define fdbg (void) # define flldbg (void) -# define fvdbg (void) -# define fllvdbg (void) +# define finfo (void) +# define fllinfo (void) #endif #ifdef CONFIG_DEBUG_CRYPTO # define cryptdbg dbg # define cryptlldbg lldbg -# define cryptvdbg vdbg -# define cryptllvdbg llvdbg +# define cryptinfo info +# define cryptllinfo llinfo #else # define cryptdbg (void) # define cryptlldbg (void) -# define cryptvdbg (void) -# define cryptllvdbg (void) +# define cryptinfo (void) +# define cryptllinfo (void) #endif #ifdef CONFIG_DEBUG_INPUT # define idbg dbg # define illdbg lldbg -# define ivdbg vdbg -# define illvdbg llvdbg +# define iinfo info +# define illinfo llinfo #else # define idbg (void) # define illdbg (void) -# define ivdbg (void) -# define illvdbg (void) +# define iinfo (void) +# define illinfo (void) #endif #ifdef CONFIG_DEBUG_SENSORS # define sndbg dbg # define snlldbg lldbg -# define snvdbg vdbg -# define snllvdbg llvdbg +# define sninfo info +# define snllinfo llinfo #else # define sndbg (void) # define snlldbg (void) -# define snvdbg (void) -# define snllvdbg (void) +# define sninfo (void) +# define snllinfo (void) #endif #ifdef CONFIG_DEBUG_ANALOG # define adbg dbg # define alldbg lldbg -# define avdbg vdbg -# define allvdbg llvdbg +# define ainfo info +# define allinfo llinfo #else # define adbg (void) # define alldbg (void) -# define avdbg (void) -# define allvdbg (void) +# define ainfo (void) +# define allinfo (void) #endif #ifdef CONFIG_DEBUG_GRAPHICS # define gdbg dbg # define glldbg lldbg -# define gvdbg vdbg -# define gllvdbg llvdbg +# define ginfo info +# define gllinfo llinfo #else # define gdbg (void) # define glldbg (void) -# define gvdbg (void) -# define gllvdbg (void) +# define ginfo (void) +# define gllinfo (void) #endif #ifdef CONFIG_DEBUG_BINFMT # define bdbg dbg # define blldbg lldbg -# define bvdbg vdbg -# define bllvdbg llvdbg +# define binfo info +# define bllinfo llinfo #else # define bdbg (void) # define blldbg (void) -# define bvdbg (void) -# define bllvdbg (void) +# define binfo (void) +# define bllinfo (void) #endif #ifdef CONFIG_DEBUG_LIB # define ldbg dbg # define llldbg lldbg -# define lvdbg vdbg -# define lllvdbg llvdbg +# define linfo info +# define lllinfo llinfo #else # define ldbg (void) # define llldbg (void) -# define lvdbg (void) -# define lllvdbg (void) +# define linfo (void) +# define lllinfo (void) #endif #ifdef CONFIG_DEBUG_AUDIO # define auddbg dbg # define audlldbg lldbg -# define audvdbg vdbg -# define audllvdbg llvdbg +# define audinfo info +# define audllinfo llinfo #else # define auddbg (void) # define audlldbg (void) -# define audvdbg (void) -# define audllvdbg (void) +# define audinfo (void) +# define audllinfo (void) #endif #endif /* CONFIG_CPP_HAVE_VARARGS */ @@ -545,111 +545,111 @@ #ifdef CONFIG_DEBUG # define dbgdumpbuffer(m,b,n) lib_dumpbuffer(m,b,n) # ifdef CONFIG_DEBUG_INFO -# define vdbgdumpbuffer(m,b,n) lib_dumpbuffer(m,b,n) +# define infodumpbuffer(m,b,n) lib_dumpbuffer(m,b,n) # else -# define vdbgdumpbuffer(m,b,n) +# define infodumpbuffer(m,b,n) # endif #else # define dbgdumpbuffer(m,b,n) -# define vdbgdumpbuffer(m,b,n) +# define infodumpbuffer(m,b,n) # endif /* Subsystem specific debug */ #ifdef CONFIG_DEBUG_MM # define mdbgdumpbuffer(m,b,n) dbgdumpbuffer(m,b,n) -# define mvdbgdumpbuffer(m,b,n) vdbgdumpbuffer(m,b,n) +# define minfodumpbuffer(m,b,n) infodumpbuffer(m,b,n) #else # define mdbgdumpbuffer(m,b,n) -# define mvdbgdumpbuffer(m,b,n) +# define minfodumpbuffer(m,b,n) #endif #ifdef CONFIG_DEBUG_SCHED # define sdbgdumpbuffer(m,b,n) dbgdumpbuffer(m,b,n) -# define svdbgdumpbuffer(m,b,n) vdbgdumpbuffer(m,b,n) +# define sinfodumpbuffer(m,b,n) infodumpbuffer(m,b,n) #else # define sdbgdumpbuffer(m,b,n) -# define svdbgdumpbuffer(m,b,n) +# define sinfodumpbuffer(m,b,n) #endif #ifdef CONFIG_DEBUG_PAGING # define pgdbgdumpbuffer(m,b,n) dbgdumpbuffer(m,b,n) -# define pgvdbgdumpbuffer(m,b,n) vdbgdumpbuffer(m,b,n) +# define pginfodumpbuffer(m,b,n) infodumpbuffer(m,b,n) #else # define pgdbgdumpbuffer(m,b,n) -# define pgvdbgdumpbuffer(m,b,n) +# define pginfodumpbuffer(m,b,n) #endif #ifdef CONFIG_DEBUG_DMA # define dmadbgdumpbuffer(m,b,n) dbgdumpbuffer(m,b,n) -# define dmavdbgdumpbuffer(m,b,n) vdbgdumpbuffer(m,b,n) +# define dmainfodumpbuffer(m,b,n) infodumpbuffer(m,b,n) #else # define dmadbgdumpbuffer(m,b,n) -# define dmavdbgdumpbuffer(m,b,n) +# define dmainfodumpbuffer(m,b,n) #endif #ifdef CONFIG_DEBUG_NET # define ndbgdumpbuffer(m,b,n) dbgdumpbuffer(m,b,n) -# define nvdbgdumpbuffer(m,b,n) vdbgdumpbuffer(m,b,n) +# define ninfodumpbuffer(m,b,n) infodumpbuffer(m,b,n) #else # define ndbgdumpbuffer(m,b,n) -# define nvdbgdumpbuffer(m,b,n) +# define ninfodumpbuffer(m,b,n) #endif #ifdef CONFIG_DEBUG_USB # define udbgdumpbuffer(m,b,n) dbgdumpbuffer(m,b,n) -# define uvdbgdumpbuffer(m,b,n) vdbgdumpbuffer(m,b,n) +# define uinfodumpbuffer(m,b,n) infodumpbuffer(m,b,n) #else # define udbgdumpbuffer(m,b,n) -# define uvdbgdumpbuffer(m,b,n) +# define uinfodumpbuffer(m,b,n) #endif #ifdef CONFIG_DEBUG_FS # define fdbgdumpbuffer(m,b,n) dbgdumpbuffer(m,b,n) -# define fvdbgdumpbuffer(m,b,n) vdbgdumpbuffer(m,b,n) +# define finfodumpbuffer(m,b,n) infodumpbuffer(m,b,n) #else # define fdbgdumpbuffer(m,b,n) -# define fvdbgdumpbuffer(m,b,n) +# define finfodumpbuffer(m,b,n) #endif #ifdef CONFIG_DEBUG_INPUT # define idbgdumpbuffer(m,b,n) dbgdumpbuffer(m,b,n) -# define ivdbgdumpbuffer(m,b,n) vdbgdumpbuffer(m,b,n) +# define iinfodumpbuffer(m,b,n) infodumpbuffer(m,b,n) #else # define idbgdumpbuffer(m,b,n) -# define ivdbgdumpbuffer(m,b,n) +# define iinfodumpbuffer(m,b,n) #endif #ifdef CONFIG_DEBUG_GRAPHICS # define gdbgdumpbuffer(m,b,n) dbgdumpbuffer(m,b,n) -# define gvdbgdumpbuffer(m,b,n) vdbgdumpbuffer(m,b,n) +# define ginfodumpbuffer(m,b,n) infodumpbuffer(m,b,n) #else # define gdbgdumpbuffer(m,b,n) -# define gvdbgdumpbuffer(m,b,n) +# define ginfodumpbuffer(m,b,n) #endif #ifdef CONFIG_DEBUG_BINFMT # define bdbgdumpbuffer(m,b,n) dbgdumpbuffer(m,b,n) -# define bvdbgdumpbuffer(m,b,n) vdbgdumpbuffer(m,b,n) +# define binfodumpbuffer(m,b,n) infodumpbuffer(m,b,n) #else # define bdbgdumpbuffer(m,b,n) -# define bvdbgdumpbuffer(m,b,n) +# define binfodumpbuffer(m,b,n) #endif #ifdef CONFIG_DEBUG_LIB # define ldbgdumpbuffer(m,b,n) dbgdumpbuffer(m,b,n) -# define lvdbgdumpbuffer(m,b,n) vdbgdumpbuffer(m,b,n) +# define linfodumpbuffer(m,b,n) infodumpbuffer(m,b,n) #else # define ldbgdumpbuffer(m,b,n) -# define lvdbgdumpbuffer(m,b,n) +# define linfodumpbuffer(m,b,n) #endif #ifdef CONFIG_DEBUG_AUDIO # define auddbgdumpbuffer(m,b,n) dbgdumpbuffer(m,b,n) -# define audvdbgdumpbuffer(m,b,n) vdbgdumpbuffer(m,b,n) +# define audinfodumpbuffer(m,b,n) infodumpbuffer(m,b,n) #else # define auddbgdumpbuffer(m,b,n) -# define audvdbgdumpbuffer(m,b,n) +# define audinfodumpbuffer(m,b,n) #endif /**************************************************************************** @@ -692,10 +692,10 @@ int lldbg(const char *format, ...); # endif # ifdef CONFIG_DEBUG_INFO -int vdbg(const char *format, ...); +int info(const char *format, ...); # ifdef CONFIG_ARCH_LOWPUTC -int llvdbg(const char *format, ...); +int llinfo(const char *format, ...); # endif #endif #endif /* CONFIG_DEBUG */ diff --git a/include/nuttx/mm/shm.h b/include/nuttx/mm/shm.h index 1a568e81c4..8c6f90cfaa 100644 --- a/include/nuttx/mm/shm.h +++ b/include/nuttx/mm/shm.h @@ -78,18 +78,18 @@ #ifdef CONFIG_CPP_HAVE_VARARGS # ifdef CONFIG_DEBUG_SHM # define shmdbg(format, ...) dbg(format, ##__VA_ARGS__) -# define shmvdbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define shminfo(format, ...) info(format, ##__VA_ARGS__) # else # define shmdbg(format, ...) mdbg(format, ##__VA_ARGS__) -# define shmvdbg(format, ...) mvdbg(format, ##__VA_ARGS__) +# define shminfo(format, ...) minfo(format, ##__VA_ARGS__) # endif #else # ifdef CONFIG_DEBUG_SHM # define shmdbg dbg -# define shmvdbg vdbg +# define shminfo info # else # define shmdbg (void) -# define shmvdbg (void) +# define shminfo (void) # endif #endif diff --git a/include/nuttx/spi/spi_bitbang.c b/include/nuttx/spi/spi_bitbang.c index e39fa68639..9e424b5aa2 100644 --- a/include/nuttx/spi/spi_bitbang.c +++ b/include/nuttx/spi/spi_bitbang.c @@ -77,13 +77,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /**************************************************************************** @@ -273,7 +273,7 @@ static uint32_t spi_setfrequency(FAR struct spi_bitbang_s *priv, uint32_t freque static void spi_setmode(FAR struct spi_bitbang_s *priv, enum spi_mode_e mode) { - spivdbg("mode=%d\n", mode); + spiinfo("mode=%d\n", mode); switch (mode) { diff --git a/include/nuttx/spi/spi_bitbang.h b/include/nuttx/spi/spi_bitbang.h index 8e91b5345f..95b1a85538 100644 --- a/include/nuttx/spi/spi_bitbang.h +++ b/include/nuttx/spi/spi_bitbang.h @@ -64,13 +64,13 @@ #ifdef CONFIG_DEBUG_SPI # define spidbg lldbg # ifdef CONFIG_DEBUG_INFO -# define spivdbg lldbg +# define spiinfo lldbg # else -# define spivdbg(x...) +# define spiinfo(x...) # endif #else # define spidbg(x...) -# define spivdbg(x...) +# define spiinfo(x...) #endif /**************************************************************************** diff --git a/include/nuttx/wireless/nrf24l01.h b/include/nuttx/wireless/nrf24l01.h index 6d2128606b..32dc20db02 100644 --- a/include/nuttx/wireless/nrf24l01.h +++ b/include/nuttx/wireless/nrf24l01.h @@ -93,13 +93,13 @@ #ifdef NRF24L01_DEBUG # define wdbg(format, ...) dbg(format, ##__VA_ARGS__) # define wlldbg(format, ...) lldbg(format, ##__VA_ARGS__) -# define wvdbg(format, ...) vdbg(format, ##__VA_ARGS__) -# define wllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__) +# define winfo(format, ...) info(format, ##__VA_ARGS__) +# define wllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define wdbg(x...) # define wlldbg(x...) -# define wvdbg(x...) -# define wllvdbg(x...) +# define winfo(x...) +# define wllinfo(x...) #endif /**************************************************************************** diff --git a/libc/audio/lib_buffer.c b/libc/audio/lib_buffer.c index af4e719879..6ad506aa6e 100644 --- a/libc/audio/lib_buffer.c +++ b/libc/audio/lib_buffer.c @@ -174,7 +174,7 @@ void apb_free(FAR struct ap_buffer_s *apb) if (refcount <= 1) { - audvdbg("Freeing %p\n", apb); + audinfo("Freeing %p\n", apb); lib_ufree(apb); } } diff --git a/libc/libc.csv b/libc/libc.csv index cd74cc09a7..cf68eaf776 100644 --- a/libc/libc.csv +++ b/libc/libc.csv @@ -65,7 +65,7 @@ "lio_listio","aio.h","defined(CONFIG_FS_AIO)","int","int","FAR struct aiocb *const []|FAR struct aiocb *const *","int","FAR struct sigevent *" "llabs","stdlib.h","defined(CONFIG_HAVE_LONG_LONG)","long long int","long long int" "lldbg","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..." -"llvdbg","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..." +"llinfo","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..." "lowsyslog","syslog.h","","int","int","FAR const char *","..." "lowvsyslog","syslog.h","","int","int","FAR const char *","va_list" "match","nuttx/regex.h","","int","const char *","const char *" @@ -168,7 +168,7 @@ "ub16sqr","fixedmath.h","!defined(CONFIG_HAVE_LONG_LONG)","ub16_t","ub16_t" "ungetc","stdio.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","int","FAR FILE *" "usleep","unistd.h","!defined(CONFIG_DISABLE_SIGNALS)","int","int","FAR FILE *" -"vdbg","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO)","int","const char *","..." +"info","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO)","int","const char *","..." "vfprintf","stdio.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","FAR FILE *","const char *","va_list" "vprintf","stdio.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","FAR const char *","va_list" "vsnprintf","stdio.h","","int","FAR char *","size_t","const char *","va_list" diff --git a/libc/misc/lib_dbg.c b/libc/misc/lib_dbg.c index 821353944f..3e398d90b9 100644 --- a/libc/misc/lib_dbg.c +++ b/libc/misc/lib_dbg.c @@ -55,7 +55,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: dbg, lldbg, vdbg + * Name: dbg, lldbg, info * * Description: * If the cross-compiler's pre-processor does not support variable @@ -91,7 +91,7 @@ int lldbg(const char *format, ...) #endif #ifdef CONFIG_DEBUG_INFO -int vdbg(const char *format, ...) +int info(const char *format, ...) { va_list ap; int ret; @@ -104,7 +104,7 @@ int vdbg(const char *format, ...) } #ifdef CONFIG_ARCH_LOWPUTC -int llvdbg(const char *format, ...) +int llinfo(const char *format, ...) { va_list ap; int ret; diff --git a/libc/misc/lib_slcddecode.c b/libc/misc/lib_slcddecode.c index bba8c7a8dc..92e11a297c 100644 --- a/libc/misc/lib_slcddecode.c +++ b/libc/misc/lib_slcddecode.c @@ -93,10 +93,10 @@ #ifdef CONFIG_DEBUG_LCD # define lcddbg dbg -# define lcdvdbg vdbg +# define lcdinfo info #else # define lcddbg(x...) -# define lcdvdbg(x...) +# define lcdinfo(x...) #endif /**************************************************************************** diff --git a/libc/netdb/lib_dnsaddserver.c b/libc/netdb/lib_dnsaddserver.c index ff2436985a..cc689b34c3 100644 --- a/libc/netdb/lib_dnsaddserver.c +++ b/libc/netdb/lib_dnsaddserver.c @@ -161,7 +161,7 @@ int dns_add_nameserver(FAR const struct sockaddr *addr, socklen_t addrlen) else #endif { - nvdbg("ERROR: Unsupported family: %d\n", + ninfo("ERROR: Unsupported family: %d\n", g_dns_server.addr.sa_family); ret = -ENOSYS; goto errout; @@ -242,7 +242,7 @@ int dns_add_nameserver(FAR const struct sockaddr *addr, socklen_t addrlen) else #endif { - nvdbg("ERROR: Unsupported family: %d\n", addr->sa_family); + ninfo("ERROR: Unsupported family: %d\n", addr->sa_family); return -ENOSYS; } @@ -250,7 +250,7 @@ int dns_add_nameserver(FAR const struct sockaddr *addr, socklen_t addrlen) if (addrlen < copylen) { - nvdbg("ERROR: Invalid addrlen %ld for family %d\n", + ninfo("ERROR: Invalid addrlen %ld for family %d\n", (long)addrlen, addr->sa_family); return -EINVAL; } diff --git a/libc/netdb/lib_dnsforeach.c b/libc/netdb/lib_dnsforeach.c index 761cc441f3..3d13dc5a63 100644 --- a/libc/netdb/lib_dnsforeach.c +++ b/libc/netdb/lib_dnsforeach.c @@ -276,7 +276,7 @@ int dns_foreach_nameserver(dns_callback_t callback, FAR void *arg) else #endif { - nvdbg("ERROR: Unsupported family: %d\n", + ninfo("ERROR: Unsupported family: %d\n", g_dns_server.addr.sa_family); ret = -ENOSYS; } diff --git a/libc/netdb/lib_dnsquery.c b/libc/netdb/lib_dnsquery.c index c29437c7b2..1510691438 100644 --- a/libc/netdb/lib_dnsquery.c +++ b/libc/netdb/lib_dnsquery.c @@ -254,10 +254,10 @@ static int dns_recv_response(int sd, FAR struct sockaddr *addr, hdr = (FAR struct dns_header_s *)buffer; - nvdbg("ID %d\n", htons(hdr->id)); - nvdbg("Query %d\n", hdr->flags1 & DNS_FLAG1_RESPONSE); - nvdbg("Error %d\n", hdr->flags2 & DNS_FLAG2_ERR_MASK); - nvdbg("Num questions %d, answers %d, authrr %d, extrarr %d\n", + ninfo("ID %d\n", htons(hdr->id)); + ninfo("Query %d\n", hdr->flags1 & DNS_FLAG1_RESPONSE); + ninfo("Error %d\n", hdr->flags2 & DNS_FLAG2_ERR_MASK); + ninfo("Num questions %d, answers %d, authrr %d, extrarr %d\n", htons(hdr->numquestions), htons(hdr->numanswers), htons(hdr->numauthrr), htons(hdr->numextrarr)); @@ -317,7 +317,7 @@ static int dns_recv_response(int sd, FAR struct sockaddr *addr, /* Compressed name. */ nameptr += 2; - nvdbg("Compressed answer\n"); + ninfo("Compressed answer\n"); } else { @@ -328,7 +328,7 @@ static int dns_recv_response(int sd, FAR struct sockaddr *addr, ans = (FAR struct dns_answer_s *)nameptr; - nvdbg("Answer: type=%04x, class=%04x, ttl=%06x, length=%04x \n", + ninfo("Answer: type=%04x, class=%04x, ttl=%06x, length=%04x \n", htons(ans->type), htons(ans->class), (htons(ans->ttl[0]) << 16) | htons(ans->ttl[1]), htons(ans->len)); @@ -342,7 +342,7 @@ static int dns_recv_response(int sd, FAR struct sockaddr *addr, { ans->u.ipv4.s_addr = *(FAR uint32_t *)(nameptr + 10); - nvdbg("IPv4 address: %d.%d.%d.%d\n", + ninfo("IPv4 address: %d.%d.%d.%d\n", (ans->u.ipv4.s_addr ) & 0xff, (ans->u.ipv4.s_addr >> 8 ) & 0xff, (ans->u.ipv4.s_addr >> 16) & 0xff, @@ -374,7 +374,7 @@ static int dns_recv_response(int sd, FAR struct sockaddr *addr, { memcpy(&ans->u.ipv6.s6_addr, nameptr + 10, 16); - nvdbg("IPv6 address: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", + ninfo("IPv6 address: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", htons(ans->u.ipv6.s6_addr[7]), htons(ans->u.ipv6.s6_addr[6]), htons(ans->u.ipv6.s6_addr[5]), htons(ans->u.ipv6.s6_addr[4]), htons(ans->u.ipv6.s6_addr[3]), htons(ans->u.ipv6.s6_addr[2]), diff --git a/libc/netdb/lib_gethostbyaddrr.c b/libc/netdb/lib_gethostbyaddrr.c index 6dcb8e8ab1..78439b1911 100644 --- a/libc/netdb/lib_gethostbyaddrr.c +++ b/libc/netdb/lib_gethostbyaddrr.c @@ -309,7 +309,7 @@ int lib_hostfile_lookup(FAR const void *addr, socklen_t len, int type, FAR char *hostaddr = host->h_addr; if (hostaddr != NULL) { - nvdbg("Comparing addresses...\n"); + ninfo("Comparing addresses...\n"); if (memcmp(addr, hostaddr, len) == 0) { /* We have a match */ diff --git a/libc/netdb/lib_gethostbynamer.c b/libc/netdb/lib_gethostbynamer.c index 86d46d2054..f6cf659596 100644 --- a/libc/netdb/lib_gethostbynamer.c +++ b/libc/netdb/lib_gethostbynamer.c @@ -622,7 +622,7 @@ static int lib_hostfile_lookup(FAR const char *name, FAR struct hostent *host, { /* We successfully read the entry */ - nvdbg("Comparing %s to %s\n", name, host->h_name); + ninfo("Comparing %s to %s\n", name, host->h_name); /* Check for a host name match */ diff --git a/libc/stdio/lib_sscanf.c b/libc/stdio/lib_sscanf.c index c54fb3f145..cc67145306 100644 --- a/libc/stdio/lib_sscanf.c +++ b/libc/stdio/lib_sscanf.c @@ -193,7 +193,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap) int base = 10; char tmp[MAXLN]; - lvdbg("vsscanf: buf=\"%s\" fmt=\"%s\"\n", buf, fmt); + linfo("vsscanf: buf=\"%s\" fmt=\"%s\"\n", buf, fmt); /* Remember the start of the input buffer. We will need this for %n * calculations. @@ -226,14 +226,14 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap) if (*fmt == '%') { - lvdbg("vsscanf: Specifier found\n"); + linfo("vsscanf: Specifier found\n"); /* Check for qualifiers on the conversion specifier */ fmt++; for (; *fmt; fmt++) { - lvdbg("vsscanf: Processing %c\n", *fmt); + linfo("vsscanf: Processing %c\n", *fmt); if (strchr("dibouxcsefgn%", *fmt)) { @@ -264,7 +264,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap) if (*fmt == 's') { - lvdbg("vsscanf: Performing string conversion\n"); + linfo("vsscanf: Performing string conversion\n"); /* Get a pointer to the char * value. We need to do this even * if we have reached the end of the input data in order to @@ -320,7 +320,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap) else if (*fmt == 'c') { - lvdbg("vsscanf: Performing character conversion\n"); + linfo("vsscanf: Performing character conversion\n"); /* Get a pointer to the char * value. We need to do this even * if we have reached the end of the input data in order to @@ -374,7 +374,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap) FAR int *pint = NULL; bool sign; - lvdbg("vsscanf: Performing integer conversion\n"); + linfo("vsscanf: Performing integer conversion\n"); /* Get a pointer to the integer value. We need to do this even * if we have reached the end of the input data in order to @@ -461,7 +461,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap) strncpy(tmp, buf, width); tmp[width] = '\0'; - lvdbg("vsscanf: tmp[]=\"%s\"\n", tmp); + linfo("vsscanf: tmp[]=\"%s\"\n", tmp); /* Perform the integer conversion */ /* Preserve the errno value */ @@ -497,13 +497,13 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap) if (lflag) { - lvdbg("vsscanf: Return %ld to 0x%p\n", + linfo("vsscanf: Return %ld to 0x%p\n", tmplong, plong); *plong = tmplong; } else { - lvdbg("vsscanf: Return %ld to 0x%p\n", + linfo("vsscanf: Return %ld to 0x%p\n", tmplong, pint); *pint = (int)tmplong; } @@ -524,7 +524,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap) #endif FAR float *pf = NULL; - lvdbg("vsscanf: Performing floating point conversion\n"); + linfo("vsscanf: Performing floating point conversion\n"); /* Get a pointer to the double value. We need to do this even * if we have reached the end of the input data in order to @@ -580,7 +580,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap) tmp[width] = '\0'; buf += width; - lvdbg("vsscanf: tmp[]=\"%s\"\n", tmp); + linfo("vsscanf: tmp[]=\"%s\"\n", tmp); /* Perform the floating point conversion */ @@ -614,13 +614,13 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap) #ifdef CONFIG_HAVE_DOUBLE if (lflag) { - lvdbg("vsscanf: Return %f to %p\n", dvalue, pd); + linfo("vsscanf: Return %f to %p\n", dvalue, pd); *pd = dvalue; } else #endif { - lvdbg("vsscanf: Return %f to %p\n", dvalue, pf); + linfo("vsscanf: Return %f to %p\n", dvalue, pf); *pf = (float)dvalue; } @@ -634,7 +634,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap) else if (*fmt == 'n') { - lvdbg("vsscanf: Performing character count\n"); + linfo("vsscanf: Performing character count\n"); if (!noassign) { diff --git a/libnx/nxglib/nxglib_splitline.c b/libnx/nxglib/nxglib_splitline.c index fa2ccc1a0d..c63539b8c1 100644 --- a/libnx/nxglib/nxglib_splitline.c +++ b/libnx/nxglib/nxglib_splitline.c @@ -139,7 +139,7 @@ int nxgl_splitline(FAR struct nxgl_vector_s *vector, b16_t b16x; b16_t b16y; - gvdbg("vector: (%d,%d)->(%d,%d) linewidth: %d\n", + ginfo("vector: (%d,%d)->(%d,%d) linewidth: %d\n", vector->pt1.x, vector->pt1.y, vector->pt2.x, vector->pt2.y, linewidth); /* First, check the linewidth */ @@ -190,7 +190,7 @@ int nxgl_splitline(FAR struct nxgl_vector_s *vector, rect->pt1.y = vector->pt1.y - (linewidth >> 1); rect->pt2.y = rect->pt1.y + linewidth - 1; - gvdbg("Horizontal rect: (%d,%d),(%d,%d)\n", + ginfo("Horizontal rect: (%d,%d),(%d,%d)\n", rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y); return 2; @@ -208,7 +208,7 @@ int nxgl_splitline(FAR struct nxgl_vector_s *vector, rect->pt1.x = line.pt1.x - (linewidth >> 1); rect->pt2.x = rect->pt1.x + linewidth - 1; - gvdbg("Vertical rect: (%d,%d),(%d,%d)\n", + ginfo("Vertical rect: (%d,%d),(%d,%d)\n", rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y); return 2; @@ -231,7 +231,7 @@ int nxgl_splitline(FAR struct nxgl_vector_s *vector, traps[1].bot.x2 = traps[1].bot.x1; traps[1].bot.y = line.pt2.y; - gvdbg("Vertical traps[1]: (%08x,%08x,%d),(%08x,%08x, %d)\n", + ginfo("Vertical traps[1]: (%08x,%08x,%d),(%08x,%08x, %d)\n", traps[1].top.x1, traps[1].top.x2, traps[1].top.y, traps[1].bot.x1, traps[1].bot.x2, traps[1].bot.y); @@ -277,7 +277,7 @@ int nxgl_splitline(FAR struct nxgl_vector_s *vector, sinangle = b16sin(angle); b16xoffset = (linewidth * sinangle + 1) >> 1; - gvdbg("height: %d width: %d angle: %08x b16yoffset: %08x b16xoffset: %08x\n", + ginfo("height: %d width: %d angle: %08x b16yoffset: %08x b16xoffset: %08x\n", iheight, iwidth, angle, b16yoffset, b16xoffset); /* Now we know all four points of the rotated rectangle */ @@ -307,7 +307,7 @@ int nxgl_splitline(FAR struct nxgl_vector_s *vector, quad[2].x = b16x + b16xoffset; quad[3].x = b16x - b16xoffset; - gvdbg("Southeast: quad (%08x,%08x),(%08x,%08x),(%08x,%08x),(%08x,%08x)\n", + ginfo("Southeast: quad (%08x,%08x),(%08x,%08x),(%08x,%08x),(%08x,%08x)\n", quad[0].x, quad[0].y, quad[1].x, quad[1].y, quad[2].x, quad[2].y, quad[3].x, quad[3].y); @@ -408,7 +408,7 @@ int nxgl_splitline(FAR struct nxgl_vector_s *vector, quad[2].x = b16x - b16xoffset; quad[3].x = b16x + b16xoffset; - gvdbg("Southwest: quad (%08x,%08x),(%08x,%08x),(%08x,%08x),(%08x,%08x)\n", + ginfo("Southwest: quad (%08x,%08x),(%08x,%08x),(%08x,%08x),(%08x,%08x)\n", quad[0].x, quad[0].y, quad[1].x, quad[1].y, quad[2].x, quad[2].y, quad[3].x, quad[3].y); @@ -498,13 +498,13 @@ int nxgl_splitline(FAR struct nxgl_vector_s *vector, traps[2].bot.y = b16toi(quad[3].y + b16HALF); } - gvdbg("traps[0]: (%08x,%08x,%d),(%08x,%08x,%d)\n", + ginfo("traps[0]: (%08x,%08x,%d),(%08x,%08x,%d)\n", traps[0].top.x1, traps[0].top.x2, traps[0].top.y, traps[0].bot.x1, traps[0].bot.x2, traps[0].bot.y); - gvdbg("traps[1]: (%08x,%08x,%d),(%08x,%08x,%d)\n", + ginfo("traps[1]: (%08x,%08x,%d),(%08x,%08x,%d)\n", traps[1].top.x1, traps[1].top.x2, traps[1].top.y, traps[1].bot.x1, traps[1].bot.x2, traps[1].bot.y); - gvdbg("traps[2]: (%08x,%08x,%d),(%08x,%08x,%d)\n", + ginfo("traps[2]: (%08x,%08x,%d),(%08x,%08x,%d)\n", traps[2].top.x1, traps[2].top.x2, traps[2].top.y, traps[2].bot.x1, traps[2].bot.x2, traps[2].bot.y); @@ -523,7 +523,7 @@ int nxgl_splitline(FAR struct nxgl_vector_s *vector, traps[1].bot.x2 = traps[1].bot.x1 + itob16(linewidth - 1); traps[1].bot.y = line.pt2.y; - gvdbg("Horizontal traps[1]: (%08x,%08x,%d),(%08x,%08x, %d)\n", + ginfo("Horizontal traps[1]: (%08x,%08x,%d),(%08x,%08x, %d)\n", traps[1].top.x1, traps[1].top.x2, traps[1].top.y, traps[1].bot.x1, traps[1].bot.x2, traps[1].bot.y); diff --git a/libnx/nxmu/nx_eventhandler.c b/libnx/nxmu/nx_eventhandler.c index 71172fe6f9..d67860b2fa 100644 --- a/libnx/nxmu/nx_eventhandler.c +++ b/libnx/nxmu/nx_eventhandler.c @@ -177,7 +177,7 @@ int nx_eventhandler(NXHANDLE handle) /* Dispatch the message appropriately */ msg = (struct nxsvrmsg_s *)buffer; - gvdbg("Received msgid=%d\n", msg->msgid); + ginfo("Received msgid=%d\n", msg->msgid); switch (msg->msgid) { case NX_CLIMSG_CONNECTED: diff --git a/libnx/nxmu/nx_getrectangle.c b/libnx/nxmu/nx_getrectangle.c index a3b9a3a241..4c6f2d22e2 100644 --- a/libnx/nxmu/nx_getrectangle.c +++ b/libnx/nxmu/nx_getrectangle.c @@ -104,7 +104,7 @@ int nx_getrectangle(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, #ifdef CONFIG_DEBUG if (!hwnd || !rect || !dest) { - gvdbg("Invalid parameters\n"); + ginfo("Invalid parameters\n"); set_errno(EINVAL); return ERROR; } diff --git a/libnx/nxtk/nxtk_events.c b/libnx/nxtk/nxtk_events.c index d7f33e6ebe..6644366e25 100644 --- a/libnx/nxtk/nxtk_events.c +++ b/libnx/nxtk/nxtk_events.c @@ -119,7 +119,7 @@ static void nxtk_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, DEBUGASSERT(hwnd && rect && fwnd->fwcb); - gvdbg("hwnd=%p rect={(%d,%d),(%d,%d)} more=%d\n", + ginfo("hwnd=%p rect={(%d,%d),(%d,%d)} more=%d\n", hwnd, rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y, more); /* The incoming rectangle (rect) is relative to the containing window @@ -137,7 +137,7 @@ static void nxtk_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, nxtk_containerclip(fwnd, &intersection, rect, &fwnd->fwrect); - gvdbg("fwrect intersection={(%d,%d),(%d,%d)}\n", + ginfo("fwrect intersection={(%d,%d),(%d,%d)}\n", intersection.pt1.x, intersection.pt1.y, intersection.pt2.x, intersection.pt2.y); @@ -160,7 +160,7 @@ static void nxtk_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, nxtk_containerclip(fwnd, &intersection, rect, &fwnd->tbrect); - gvdbg("tbrect intersection={(%d,%d),(%d,%d)}\n", + ginfo("tbrect intersection={(%d,%d),(%d,%d)}\n", intersection.pt1.x, intersection.pt1.y, intersection.pt2.x, intersection.pt2.y); @@ -187,7 +187,7 @@ static void nxtk_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hwnd; struct nxgl_size_s subwindowsize; - gvdbg("hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n", + ginfo("hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n", hwnd, size->w, size->h, pos->x, pos->y, bounds->pt1.x, bounds->pt1.y, bounds->pt2.x, bounds->pt2.y); diff --git a/libnx/nxtk/nxtk_gettoolbar.c b/libnx/nxtk/nxtk_gettoolbar.c index 593fcb09a6..3626462dad 100644 --- a/libnx/nxtk/nxtk_gettoolbar.c +++ b/libnx/nxtk/nxtk_gettoolbar.c @@ -103,7 +103,7 @@ int nxtk_gettoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect, #ifdef CONFIG_DEBUG if (!hfwnd || !rect || !dest) { - gvdbg("Invalid parameters\n"); + ginfo("Invalid parameters\n"); set_errno(EINVAL); return ERROR; } diff --git a/libnx/nxtk/nxtk_getwindow.c b/libnx/nxtk/nxtk_getwindow.c index b229459973..ffb06bf95d 100644 --- a/libnx/nxtk/nxtk_getwindow.c +++ b/libnx/nxtk/nxtk_getwindow.c @@ -103,7 +103,7 @@ int nxtk_getwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect, #ifdef CONFIG_DEBUG if (!hfwnd || !rect || !dest) { - gvdbg("Invalid parameters\n"); + ginfo("Invalid parameters\n"); set_errno(EINVAL); return ERROR; } diff --git a/mm/mm_gran/mm_gran.h b/mm/mm_gran/mm_gran.h index 20229216b7..2d1e8a4159 100644 --- a/mm/mm_gran/mm_gran.h +++ b/mm/mm_gran/mm_gran.h @@ -64,18 +64,18 @@ #ifdef CONFIG_CPP_HAVE_VARARGS # ifdef CONFIG_DEBUG_GRAM # define grandbg(format, ...) dbg(format, ##__VA_ARGS__) -# define granvdbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define graninfo(format, ...) info(format, ##__VA_ARGS__) # else # define grandbg(format, ...) mdbg(format, ##__VA_ARGS__) -# define granvdbg(format, ...) mvdbg(format, ##__VA_ARGS__) +# define graninfo(format, ...) minfo(format, ##__VA_ARGS__) # endif #else # ifdef CONFIG_DEBUG_GRAM # define grandbg dbg -# define granvdbg vdbg +# define graninfo info # else # define grandbg (void) -# define granvdbg (void) +# define graninfo (void) # endif #endif diff --git a/mm/mm_gran/mm_pgalloc.c b/mm/mm_gran/mm_pgalloc.c index 474d9e0f4e..72d0531199 100644 --- a/mm/mm_gran/mm_pgalloc.c +++ b/mm/mm_gran/mm_pgalloc.c @@ -67,18 +67,18 @@ #ifdef CONFIG_CPP_HAVE_VARARGS # ifdef CONFIG_DEBUG_PGALLOC # define pgadbg(format, ...) dbg(format, ##__VA_ARGS__) -# define pgavdbg(format, ...) vdbg(format, ##__VA_ARGS__) +# define pgainfo(format, ...) info(format, ##__VA_ARGS__) # else # define pgadbg(format, ...) mdbg(format, ##__VA_ARGS__) -# define pgavdbg(format, ...) mvdbg(format, ##__VA_ARGS__) +# define pgainfo(format, ...) minfo(format, ##__VA_ARGS__) # endif #else # ifdef CONFIG_DEBUG_PGALLOC # define pgadbg dbg -# define pgavdbg vdbg +# define pgainfo info # else # define pgadbg (void) -# define pgavdbg (void) +# define pgainfo (void) # endif #endif diff --git a/mm/mm_heap/mm_free.c b/mm/mm_heap/mm_free.c index 57cb867f8d..4dad12e366 100644 --- a/mm/mm_heap/mm_free.c +++ b/mm/mm_heap/mm_free.c @@ -63,7 +63,7 @@ void mm_free(FAR struct mm_heap_s *heap, FAR void *mem) FAR struct mm_freenode_s *prev; FAR struct mm_freenode_s *next; - mvdbg("Freeing %p\n", mem); + minfo("Freeing %p\n", mem); /* Protect against attempts to free a NULL reference */ diff --git a/mm/mm_heap/mm_mallinfo.c b/mm/mm_heap/mm_mallinfo.c index f3c8775ba6..3ee276c917 100644 --- a/mm/mm_heap/mm_mallinfo.c +++ b/mm/mm_heap/mm_mallinfo.c @@ -88,7 +88,7 @@ int mm_mallinfo(FAR struct mm_heap_s *heap, FAR struct mallinfo *info) node < heap->mm_heapend[region]; node = (FAR struct mm_allocnode_s *)((FAR char *)node + node->size)) { - mvdbg("region=%d node=%p size=%p preceding=%p (%c)\n", + minfo("region=%d node=%p size=%p preceding=%p (%c)\n", region, node, node->size, (node->preceding & ~MM_ALLOC_BIT), (node->preceding & MM_ALLOC_BIT) ? 'A' : 'F'); @@ -111,7 +111,7 @@ int mm_mallinfo(FAR struct mm_heap_s *heap, FAR struct mallinfo *info) mm_givesemaphore(heap); - mvdbg("region=%d node=%p heapend=%p\n", region, node, heap->mm_heapend[region]); + minfo("region=%d node=%p heapend=%p\n", region, node, heap->mm_heapend[region]); DEBUGASSERT(node == heap->mm_heapend[region]); uordblks += SIZEOF_MM_ALLOCNODE; /* account for the tail node */ } diff --git a/mm/mm_heap/mm_malloc.c b/mm/mm_heap/mm_malloc.c index 3f9db86a33..2594ebcda2 100644 --- a/mm/mm_heap/mm_malloc.c +++ b/mm/mm_heap/mm_malloc.c @@ -190,7 +190,7 @@ FAR void *mm_malloc(FAR struct mm_heap_s *heap, size_t size) } else { - mvdbg("Allocated %p, size %d\n", ret, size); + minfo("Allocated %p, size %d\n", ret, size); } #endif diff --git a/net/arp/arp_arpin.c b/net/arp/arp_arpin.c index 6945ff666a..c84f4bfa81 100644 --- a/net/arp/arp_arpin.c +++ b/net/arp/arp_arpin.c @@ -107,7 +107,7 @@ void arp_arpin(FAR struct net_driver_s *dev) switch (arp->ah_opcode) { case HTONS(ARP_REQUEST): - nllvdbg("ARP request for IP %04lx\n", (long)ipaddr); + nllinfo("ARP request for IP %04lx\n", (long)ipaddr); /* ARP request. If it asked for our address, we send out a reply. */ @@ -139,7 +139,7 @@ void arp_arpin(FAR struct net_driver_s *dev) break; case HTONS(ARP_REPLY): - nllvdbg("ARP reply for IP %04lx\n", (long)ipaddr); + nllinfo("ARP reply for IP %04lx\n", (long)ipaddr); /* ARP reply. We insert or update the ARP table if it was meant * for us. diff --git a/net/arp/arp_out.c b/net/arp/arp_out.c index 563d601337..8eaaf555a6 100644 --- a/net/arp/arp_out.c +++ b/net/arp/arp_out.c @@ -231,7 +231,7 @@ void arp_out(FAR struct net_driver_s *dev) tabptr = arp_find(ipaddr); if (!tabptr) { - nllvdbg("ARP request for IP %08lx\n", (unsigned long)ipaddr); + nllinfo("ARP request for IP %08lx\n", (unsigned long)ipaddr); /* The destination address was not in our ARP table, so we * overwrite the IP packet with an ARP request. diff --git a/net/arp/arp_send.c b/net/arp/arp_send.c index 0fff9041c3..f9ec518d41 100644 --- a/net/arp/arp_send.c +++ b/net/arp/arp_send.c @@ -102,7 +102,7 @@ static uint16_t arp_send_interrupt(FAR struct net_driver_s *dev, { FAR struct arp_send_s *state = (FAR struct arp_send_s *)priv; - nllvdbg("flags: %04x sent: %d\n", flags, state->snd_sent); + nllinfo("flags: %04x sent: %d\n", flags, state->snd_sent); if (state) { diff --git a/net/devif/devif_callback.c b/net/devif/devif_callback.c index fc89eaf7d5..4db178e425 100644 --- a/net/devif/devif_callback.c +++ b/net/devif/devif_callback.c @@ -410,7 +410,7 @@ uint16_t devif_conn_event(FAR struct net_driver_s *dev, void *pvconn, * beginning of the list (which will be ignored on this pass) */ - nllvdbg("Call event=%p with flags=%04x\n", list->event, flags); + nllinfo("Call event=%p with flags=%04x\n", list->event, flags); flags = list->event(dev, pvconn, list->priv, flags); } @@ -475,7 +475,7 @@ uint16_t devif_dev_event(FAR struct net_driver_s *dev, void *pvconn, * beginning of the list (which will be ignored on this pass) */ - nllvdbg("Call event=%p with flags=%04x\n", cb->event, flags); + nllinfo("Call event=%p with flags=%04x\n", cb->event, flags); flags = cb->event(dev, pvconn, cb->priv, flags); } diff --git a/net/icmp/icmp_input.c b/net/icmp/icmp_input.c index 2d919b8f76..36b0e02e55 100644 --- a/net/icmp/icmp_input.c +++ b/net/icmp/icmp_input.c @@ -140,7 +140,7 @@ void icmp_input(FAR struct net_driver_s *dev) } #endif - nllvdbg("Outgoing ICMP packet length: %d (%d)\n", + nllinfo("Outgoing ICMP packet length: %d (%d)\n", dev->d_len, (picmp->len[0] << 8) | picmp->len[1]); #ifdef CONFIG_NET_STATISTICS diff --git a/net/icmp/icmp_ping.c b/net/icmp/icmp_ping.c index 337968bf84..a155d8d2f6 100644 --- a/net/icmp/icmp_ping.c +++ b/net/icmp/icmp_ping.c @@ -154,7 +154,7 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn, FAR uint8_t *ptr; int i; - nllvdbg("flags: %04x\n", flags); + nllinfo("flags: %04x\n", flags); if (pstate) { @@ -177,7 +177,7 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn, { FAR struct icmp_iphdr_s *icmp = (FAR struct icmp_iphdr_s *)conn; - nllvdbg("ECHO reply: id=%d seqno=%d\n", + nllinfo("ECHO reply: id=%d seqno=%d\n", ntohs(icmp->id), ntohs(icmp->seqno)); if (ntohs(icmp->id) == pstate->png_id) @@ -236,7 +236,7 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn, * of the ICMP header. */ - nllvdbg("Send ECHO request: seqno=%d\n", pstate->png_seqno); + nllinfo("Send ECHO request: seqno=%d\n", pstate->png_seqno); dev->d_sndlen = pstate->png_datlen + 4; icmp_send(dev, &pstate->png_addr); @@ -283,7 +283,7 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn, return flags; end_wait: - nllvdbg("Resuming\n"); + nllinfo("Resuming\n"); /* Do not allow any further callbacks */ @@ -397,7 +397,7 @@ int icmp_ping(in_addr_t addr, uint16_t id, uint16_t seqno, uint16_t datalen, * re-enabled when the task restarts. */ - nllvdbg("Start time: 0x%08x seqno: %d\n", state.png_time, seqno); + nllinfo("Start time: 0x%08x seqno: %d\n", state.png_time, seqno); net_lockedwait(&state.png_sem); icmp_callback_free(dev, state.png_cb); @@ -411,7 +411,7 @@ int icmp_ping(in_addr_t addr, uint16_t id, uint16_t seqno, uint16_t datalen, if (!state.png_result) { - nllvdbg("Return seqno=%d\n", state.png_seqno); + nllinfo("Return seqno=%d\n", state.png_seqno); return (int)state.png_seqno; } else diff --git a/net/icmp/icmp_send.c b/net/icmp/icmp_send.c index b92e992704..b45d12acc3 100644 --- a/net/icmp/icmp_send.c +++ b/net/icmp/icmp_send.c @@ -131,7 +131,7 @@ void icmp_send(FAR struct net_driver_s *dev, FAR in_addr_t *destaddr) picmp->icmpchksum = 0xffff; } - nllvdbg("Outgoing ICMP packet length: %d (%d)\n", + nllinfo("Outgoing ICMP packet length: %d (%d)\n", dev->d_len, (picmp->len[0] << 8) | picmp->len[1]); #ifdef CONFIG_NET_STATISTICS diff --git a/net/icmpv6/icmpv6_advertise.c b/net/icmpv6/icmpv6_advertise.c index c30456d855..5ac4932c4d 100644 --- a/net/icmpv6/icmpv6_advertise.c +++ b/net/icmpv6/icmpv6_advertise.c @@ -180,7 +180,7 @@ void icmpv6_advertise(FAR struct net_driver_s *dev, IFF_SET_NOARP(dev->d_flags); - nllvdbg("Outgoing ICMPv6 Neighbor Advertise length: %d (%d)\n", + nllinfo("Outgoing ICMPv6 Neighbor Advertise length: %d (%d)\n", dev->d_len, (icmp->len[0] << 8) | icmp->len[1]); #ifdef CONFIG_NET_STATISTICS diff --git a/net/icmpv6/icmpv6_autoconfig.c b/net/icmpv6/icmpv6_autoconfig.c index 7899f07451..d7f7b2fbb7 100644 --- a/net/icmpv6/icmpv6_autoconfig.c +++ b/net/icmpv6/icmpv6_autoconfig.c @@ -119,7 +119,7 @@ static uint16_t icmpv6_router_interrupt(FAR struct net_driver_s *dev, { FAR struct icmpv6_router_s *state = (FAR struct icmpv6_router_s *)priv; - nllvdbg("flags: %04x sent: %d\n", flags, state->snd_sent); + nllinfo("flags: %04x sent: %d\n", flags, state->snd_sent); if (state) { @@ -354,7 +354,7 @@ int icmpv6_autoconfig(FAR struct net_driver_s *dev) /* Sanity checks */ DEBUGASSERT(dev); - nvdbg("Auto-configuring %s\n", dev->d_ifname); + ninfo("Auto-configuring %s\n", dev->d_ifname); #ifdef CONFIG_NET_MULTILINK /* Only Ethernet devices are supported for now */ @@ -402,7 +402,7 @@ int icmpv6_autoconfig(FAR struct net_driver_s *dev) memcpy(&lladdr[5], dev->d_mac.ether_addr_octet, sizeof(struct ether_addr)); /* 48-bit Ethernet address */ - nvdbg("lladdr=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", + ninfo("lladdr=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", lladdr[0], lladdr[1], lladdr[2], lladdr[3], lladdr[4], lladdr[6], lladdr[6], lladdr[7]); @@ -493,7 +493,7 @@ int icmpv6_autoconfig(FAR struct net_driver_s *dev) break; } - nvdbg("Timed out... retrying %d\n", retries + 1); + ninfo("Timed out... retrying %d\n", retries + 1); } /* Check for failures. Note: On successful return, the network will be diff --git a/net/icmpv6/icmpv6_input.c b/net/icmpv6/icmpv6_input.c index 3ffc30662e..95fdece263 100644 --- a/net/icmpv6/icmpv6_input.c +++ b/net/icmpv6/icmpv6_input.c @@ -312,7 +312,7 @@ void icmpv6_input(FAR struct net_driver_s *dev) } } - nllvdbg("Outgoing ICMPv6 packet length: %d (%d)\n", + nllinfo("Outgoing ICMPv6 packet length: %d (%d)\n", dev->d_len, (icmp->len[0] << 8) | icmp->len[1]); #ifdef CONFIG_NET_STATISTICS diff --git a/net/icmpv6/icmpv6_neighbor.c b/net/icmpv6/icmpv6_neighbor.c index d2de416504..95723eb858 100644 --- a/net/icmpv6/icmpv6_neighbor.c +++ b/net/icmpv6/icmpv6_neighbor.c @@ -103,7 +103,7 @@ static uint16_t icmpv6_neighbor_interrupt(FAR struct net_driver_s *dev, { FAR struct icmpv6_neighbor_s *state = (FAR struct icmpv6_neighbor_s *)priv; - nllvdbg("flags: %04x sent: %d\n", flags, state->snd_sent); + nllinfo("flags: %04x sent: %d\n", flags, state->snd_sent); if (state) { diff --git a/net/icmpv6/icmpv6_ping.c b/net/icmpv6/icmpv6_ping.c index 0e9ac3b691..0ed83ec956 100644 --- a/net/icmpv6/icmpv6_ping.c +++ b/net/icmpv6/icmpv6_ping.c @@ -164,7 +164,7 @@ static void icmpv6_echo_request(FAR struct net_driver_s *dev, uint16_t reqlen; int i; - nllvdbg("Send ECHO request: seqno=%d\n", pstate->png_seqno); + nllinfo("Send ECHO request: seqno=%d\n", pstate->png_seqno); /* Set up the IPv6 header (most is probably already in place) */ @@ -217,7 +217,7 @@ static void icmpv6_echo_request(FAR struct net_driver_s *dev, dev->d_sndlen = reqlen; dev->d_len = reqlen + IPv6_HDRLEN; - nllvdbg("Outgoing ICMPv6 Echo Request length: %d (%d)\n", + nllinfo("Outgoing ICMPv6 Echo Request length: %d (%d)\n", dev->d_len, (icmp->len[0] << 8) | icmp->len[1]); #ifdef CONFIG_NET_STATISTICS @@ -253,7 +253,7 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn, { FAR struct icmpv6_ping_s *pstate = (struct icmpv6_ping_s *)pvpriv; - nllvdbg("flags: %04x\n", flags); + nllinfo("flags: %04x\n", flags); if (pstate) { @@ -276,7 +276,7 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn, { FAR struct icmpv6_echo_reply_s *reply = ICMPv6ECHOREPLY; - nllvdbg("ECHO reply: id=%d seqno=%d\n", + nllinfo("ECHO reply: id=%d seqno=%d\n", ntohs(reply->id), ntohs(reply->seqno)); if (ntohs(reply->id) == pstate->png_id) @@ -357,7 +357,7 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn, return flags; end_wait: - nllvdbg("Resuming\n"); + nllinfo("Resuming\n"); /* Do not allow any further callbacks */ @@ -471,7 +471,7 @@ int icmpv6_ping(net_ipv6addr_t addr, uint16_t id, uint16_t seqno, * re-enabled when the task restarts. */ - nllvdbg("Start time: 0x%08x seqno: %d\n", state.png_time, seqno); + nllinfo("Start time: 0x%08x seqno: %d\n", state.png_time, seqno); net_lockedwait(&state.png_sem); icmpv6_callback_free(dev, state.png_cb); @@ -485,7 +485,7 @@ int icmpv6_ping(net_ipv6addr_t addr, uint16_t id, uint16_t seqno, if (!state.png_result) { - nllvdbg("Return seqno=%d\n", state.png_seqno); + nllinfo("Return seqno=%d\n", state.png_seqno); return (int)state.png_seqno; } else diff --git a/net/icmpv6/icmpv6_radvertise.c b/net/icmpv6/icmpv6_radvertise.c index 09bd4c4857..0b1ed2fea5 100644 --- a/net/icmpv6/icmpv6_radvertise.c +++ b/net/icmpv6/icmpv6_radvertise.c @@ -242,7 +242,7 @@ void icmpv6_radvertise(FAR struct net_driver_s *dev) IFF_SET_NOARP(dev->d_flags); - nllvdbg("Outgoing ICMPv6 Router Advertise length: %d (%d)\n", + nllinfo("Outgoing ICMPv6 Router Advertise length: %d (%d)\n", dev->d_len, (icmp->len[0] << 8) | icmp->len[1]); #ifdef CONFIG_NET_STATISTICS diff --git a/net/icmpv6/icmpv6_rnotify.c b/net/icmpv6/icmpv6_rnotify.c index c8e38e3d63..bf1f1beffd 100644 --- a/net/icmpv6/icmpv6_rnotify.c +++ b/net/icmpv6/icmpv6_rnotify.c @@ -106,7 +106,7 @@ static void icmpv6_setaddresses(FAR struct net_driver_s *dev, net_ipv6_pref2mask(preflen, dev->d_ipv6netmask); - nvdbg("preflen=%d netmask=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", + ninfo("preflen=%d netmask=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", preflen, dev->d_ipv6netmask[0], dev->d_ipv6netmask[1], dev->d_ipv6netmask[2], dev->d_ipv6netmask[3], dev->d_ipv6netmask[4], dev->d_ipv6netmask[5], dev->d_ipv6netmask[6], dev->d_ipv6netmask[7]); @@ -119,10 +119,10 @@ static void icmpv6_setaddresses(FAR struct net_driver_s *dev, (prefix[i] & dev->d_ipv6netmask[i]); } - nvdbg("prefix=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", + ninfo("prefix=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", prefix[0], prefix[1], prefix[2], prefix[3], prefix[4], prefix[6], prefix[6], prefix[7]); - nvdbg("IP address=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", + ninfo("IP address=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2], dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[6], dev->d_ipv6addr[6], dev->d_ipv6addr[7]); @@ -131,7 +131,7 @@ static void icmpv6_setaddresses(FAR struct net_driver_s *dev, net_ipv6addr_copy(dev->d_ipv6draddr, draddr); - nvdbg("DR address=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", + ninfo("DR address=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", dev->d_ipv6draddr[0], dev->d_ipv6draddr[1], dev->d_ipv6draddr[2], dev->d_ipv6draddr[3], dev->d_ipv6draddr[4], dev->d_ipv6draddr[6], dev->d_ipv6draddr[6], dev->d_ipv6draddr[7]); @@ -212,7 +212,7 @@ int icmpv6_rwait_cancel(FAR struct icmpv6_rnotify_s *notify) irqstate_t flags; int ret = -ENOENT; - nvdbg("Cancelling...\n"); + ninfo("Cancelling...\n"); /* Remove our wait structure from the list (we may no longer be at the * head of the list). @@ -243,7 +243,7 @@ int icmpv6_rwait_cancel(FAR struct icmpv6_rnotify_s *notify) return ret; #else - nvdbg("Cancelling...\n"); + ninfo("Cancelling...\n"); /* If there is only one network device, then there can be only one entry * in the list of waiters. @@ -276,7 +276,7 @@ int icmpv6_rwait(FAR struct icmpv6_rnotify_s *notify, irqstate_t flags; int ret; - nvdbg("Waiting...\n"); + ninfo("Waiting...\n"); /* And wait for the Neighbor Advertisement (or a timeout). Interrupts will * be re-enabled while we wait. @@ -335,7 +335,7 @@ void icmpv6_rnotify(FAR struct net_driver_s *dev, const net_ipv6addr_t draddr, #ifdef CONFIG_NETDEV_MULTINIC FAR struct icmpv6_rnotify_s *curr; - nvdbg("Notified\n"); + ninfo("Notified\n"); /* Find an entry with the matching device name in the list of waiters */ @@ -364,7 +364,7 @@ void icmpv6_rnotify(FAR struct net_driver_s *dev, const net_ipv6addr_t draddr, #else FAR struct icmpv6_rnotify_s *waiter = g_icmpv6_rwaiters; - nvdbg("Notified\n"); + ninfo("Notified\n"); if (waiter) { diff --git a/net/icmpv6/icmpv6_rsolicit.c b/net/icmpv6/icmpv6_rsolicit.c index 58e60fdd3d..81c87ac911 100644 --- a/net/icmpv6/icmpv6_rsolicit.c +++ b/net/icmpv6/icmpv6_rsolicit.c @@ -183,7 +183,7 @@ void icmpv6_rsolicit(FAR struct net_driver_s *dev) * outgoing packet. */ dev->d_len += netdev_ipv6_hdrlen(dev); - nllvdbg("Outgoing ICMPv6 Router Solicitation length: %d (%d)\n", + nllinfo("Outgoing ICMPv6 Router Solicitation length: %d (%d)\n", dev->d_len, (icmp->len[0] << 8) | icmp->len[1]); #ifdef CONFIG_NET_STATISTICS diff --git a/net/icmpv6/icmpv6_solicit.c b/net/icmpv6/icmpv6_solicit.c index 7e84ccf7d5..08d99190ee 100644 --- a/net/icmpv6/icmpv6_solicit.c +++ b/net/icmpv6/icmpv6_solicit.c @@ -211,7 +211,7 @@ void icmpv6_solicit(FAR struct net_driver_s *dev, * outgoing packet. */ dev->d_len += netdev_ipv6_hdrlen(dev); - nllvdbg("Outgoing ICMPv6 Neighbor Solicitation length: %d (%d)\n", + nllinfo("Outgoing ICMPv6 Neighbor Solicitation length: %d (%d)\n", dev->d_len, (icmp->len[0] << 8) | icmp->len[1]); #ifdef CONFIG_NET_STATISTICS diff --git a/net/igmp/igmp_group.c b/net/igmp/igmp_group.c index 92b34427b4..b95fe66f7f 100644 --- a/net/igmp/igmp_group.c +++ b/net/igmp/igmp_group.c @@ -90,25 +90,25 @@ # ifdef IGMP_GRPDEBUG # define grpdbg(format, ...) ndbg(format, ##__VA_ARGS__) # define grplldbg(format, ...) nlldbg(format, ##__VA_ARGS__) -# define grpvdbg(format, ...) nvdbg(format, ##__VA_ARGS__) -# define grpllvdbg(format, ...) nllvdbg(format, ##__VA_ARGS__) +# define grpinfo(format, ...) ninfo(format, ##__VA_ARGS__) +# define grpllinfo(format, ...) nllinfo(format, ##__VA_ARGS__) # else # define grpdbg(x...) # define grplldbg(x...) -# define grpvdbg(x...) -# define grpllvdbg(x...) +# define grpinfo(x...) +# define grpllinfo(x...) # endif #else # ifdef IGMP_GRPDEBUG # define grpdbg ndbg # define grplldbg nlldbg -# define grpvdbg nvdbg -# define grpllvdbg nllvdbg +# define grpinfo ninfo +# define grpllinfo nllinfo # else # define grpdbg (void) # define grplldbg (void) -# define grpvdbg (void) -# define grpllvdbg (void) +# define grpinfo (void) +# define grpllinfo (void) # endif #endif @@ -222,7 +222,7 @@ FAR struct igmp_group_s *igmp_grpalloc(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group; net_lock_t flags; - nllvdbg("addr: %08x dev: %p\n", *addr, dev); + nllinfo("addr: %08x dev: %p\n", *addr, dev); if (up_interrupt_context()) { #if CONFIG_PREALLOC_IGMPGROUPS > 0 diff --git a/net/igmp/igmp_initialize.c b/net/igmp/igmp_initialize.c index 1a92cb3ecf..84dd6f34c1 100644 --- a/net/igmp/igmp_initialize.c +++ b/net/igmp/igmp_initialize.c @@ -84,7 +84,7 @@ in_addr_t g_ipv4_allrouters; void igmp_initialize(void) { - nvdbg("IGMP initializing\n"); + ninfo("IGMP initializing\n"); net_ipaddr(g_ipv4_allrouters, 224, 0, 0, 2); net_ipaddr(g_ipv4_allsystems, 224, 0, 0, 1); @@ -105,7 +105,7 @@ void igmp_initialize(void) void igmp_devinit(struct net_driver_s *dev) { - nvdbg("IGMP initializing dev %p\n", dev); + ninfo("IGMP initializing dev %p\n", dev); DEBUGASSERT(dev->grplist.head == NULL); /* Add the all systems address to the group */ diff --git a/net/igmp/igmp_input.c b/net/igmp/igmp_input.c index c2b3c870a3..66b1601bbe 100644 --- a/net/igmp/igmp_input.c +++ b/net/igmp/igmp_input.c @@ -117,7 +117,7 @@ void igmp_input(struct net_driver_s *dev) in_addr_t grpaddr; unsigned int ticks; - nllvdbg("IGMP message: %04x%04x\n", IGMPBUF->destipaddr[1], IGMPBUF->destipaddr[0]); + nllinfo("IGMP message: %04x%04x\n", IGMPBUF->destipaddr[1], IGMPBUF->destipaddr[0]); /* Verify the message length */ @@ -186,7 +186,7 @@ void igmp_input(struct net_driver_s *dev) /* This is the general query */ - nllvdbg("General multicast query\n"); + nllinfo("General multicast query\n"); if (IGMPBUF->maxresp == 0) { IGMP_STATINCR(g_netstats.igmp.v1_received); @@ -216,7 +216,7 @@ void igmp_input(struct net_driver_s *dev) } else /* if (IGMPBUF->grpaddr != 0) */ { - nllvdbg("Group-specific multicast queury\n"); + nllinfo("Group-specific multicast queury\n"); /* We first need to re-lookup the group since we used dest last time. * Use the incoming IPaddress! @@ -238,7 +238,7 @@ void igmp_input(struct net_driver_s *dev) else if (group->grpaddr != 0) { - nllvdbg("Unicast query\n"); + nllinfo("Unicast query\n"); IGMP_STATINCR(g_netstats.igmp.ucast_query); nlldbg("Query to a specific group with the group address as destination\n"); @@ -254,7 +254,7 @@ void igmp_input(struct net_driver_s *dev) case IGMPv2_MEMBERSHIP_REPORT: { - nllvdbg("Membership report\n"); + nllinfo("Membership report\n"); IGMP_STATINCR(g_netstats.igmp.report_received); if (!IS_IDLEMEMBER(group->flags)) diff --git a/net/igmp/igmp_join.c b/net/igmp/igmp_join.c index 83ef65a0f8..c72ebe3f0a 100644 --- a/net/igmp/igmp_join.c +++ b/net/igmp/igmp_join.c @@ -129,7 +129,7 @@ int igmp_joingroup(struct net_driver_s *dev, FAR const struct in_addr *grpaddr) { /* No... allocate a new entry */ - nvdbg("Join to new group: %08x\n", grpaddr->s_addr); + ninfo("Join to new group: %08x\n", grpaddr->s_addr); group = igmp_grpalloc(dev, &grpaddr->s_addr); IGMP_STATINCR(g_netstats.igmp.joins); diff --git a/net/igmp/igmp_leave.c b/net/igmp/igmp_leave.c index 4035358e8f..5e0019b3a2 100644 --- a/net/igmp/igmp_leave.c +++ b/net/igmp/igmp_leave.c @@ -172,7 +172,7 @@ int igmp_leavegroup(struct net_driver_s *dev, FAR const struct in_addr *grpaddr) /* Return ENOENT if the address is not a member of the group */ - nvdbg("Return -ENOENT\n"); + ninfo("Return -ENOENT\n"); return -ENOENT; } diff --git a/net/igmp/igmp_mcastmac.c b/net/igmp/igmp_mcastmac.c index 2172a281ec..88c12a8cb7 100644 --- a/net/igmp/igmp_mcastmac.c +++ b/net/igmp/igmp_mcastmac.c @@ -79,7 +79,7 @@ static void igmp_mcastmac(in_addr_t *ip, FAR uint8_t *mac) mac[4] = ip4_addr3(*ip); mac[5] = ip4_addr4(*ip); - nvdbg("IP: %08x -> MAC: %02x%02x%02x%02x%02x%02x\n", + ninfo("IP: %08x -> MAC: %02x%02x%02x%02x%02x%02x\n", *ip, mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); } @@ -99,7 +99,7 @@ void igmp_addmcastmac(FAR struct net_driver_s *dev, FAR in_addr_t *ip) { uint8_t mcastmac[6]; - nvdbg("Adding: IP %08x\n", *ip); + ninfo("Adding: IP %08x\n", *ip); if (dev->d_addmac) { igmp_mcastmac(ip, mcastmac); @@ -119,7 +119,7 @@ void igmp_removemcastmac(FAR struct net_driver_s *dev, FAR in_addr_t *ip) { uint8_t mcastmac[6]; - nvdbg("Removing: IP %08x\n", *ip); + ninfo("Removing: IP %08x\n", *ip); if (dev->d_rmmac) { igmp_mcastmac(ip, mcastmac); diff --git a/net/igmp/igmp_poll.c b/net/igmp/igmp_poll.c index e7dfd10683..a789ba8331 100644 --- a/net/igmp/igmp_poll.c +++ b/net/igmp/igmp_poll.c @@ -87,7 +87,7 @@ static inline void igmp_sched_send(FAR struct net_driver_s *dev, if (group->msgid == IGMPv2_MEMBERSHIP_REPORT) { dest = &group->grpaddr; - nllvdbg("Send IGMPv2_MEMBERSHIP_REPORT, dest=%08x flags=%02x\n", + nllinfo("Send IGMPv2_MEMBERSHIP_REPORT, dest=%08x flags=%02x\n", *dest, group->flags); IGMP_STATINCR(g_netstats.igmp.report_sched); SET_LASTREPORT(group->flags); /* Remember we were the last to report */ @@ -96,7 +96,7 @@ static inline void igmp_sched_send(FAR struct net_driver_s *dev, { DEBUGASSERT(group->msgid == IGMP_LEAVE_GROUP); dest = &g_ipv4_allrouters; - nllvdbg("Send IGMP_LEAVE_GROUP, dest=%08x flags=%02x\n", + nllinfo("Send IGMP_LEAVE_GROUP, dest=%08x flags=%02x\n", *dest, group->flags); IGMP_STATINCR(g_netstats.igmp.leave_sched); } @@ -114,7 +114,7 @@ static inline void igmp_sched_send(FAR struct net_driver_s *dev, if (IS_WAITMSG(group->flags)) { - nllvdbg("Awakening waiter\n"); + nllinfo("Awakening waiter\n"); sem_post(&group->sem); } } @@ -143,7 +143,7 @@ void igmp_poll(FAR struct net_driver_s *dev) { FAR struct igmp_group_s *group; - nllvdbg("Entry\n"); + nllinfo("Entry\n"); /* Setup the poll operation */ diff --git a/net/igmp/igmp_send.c b/net/igmp/igmp_send.c index d40301495a..b05b2ca40a 100644 --- a/net/igmp/igmp_send.c +++ b/net/igmp/igmp_send.c @@ -116,7 +116,7 @@ static uint16_t igmp_chksum(FAR uint8_t *buffer, int buflen) void igmp_send(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group, FAR in_addr_t *destipaddr) { - nllvdbg("msgid: %02x destipaddr: %08x\n", group->msgid, (int)*destipaddr); + nllinfo("msgid: %02x destipaddr: %08x\n", group->msgid, (int)*destipaddr); /* The total length to send is the size of the IP and IGMP headers and 4 * bytes for the ROUTER ALERT (and, eventually, the Ethernet header) @@ -169,7 +169,7 @@ void igmp_send(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group, IGMP_STATINCR(g_netstats.igmp.poll_send); IGMP_STATINCR(g_netstats.ipv4.sent); - nllvdbg("Outgoing IGMP packet length: %d (%d)\n", + nllinfo("Outgoing IGMP packet length: %d (%d)\n", dev->d_len, (IGMPBUF->len[0] << 8) | IGMPBUF->len[1]); igmp_dumppkt(RA, IPIGMP_HDRLEN + RASIZE); } diff --git a/net/igmp/igmp_timer.c b/net/igmp/igmp_timer.c index 5465a68f72..ef6d75cef0 100644 --- a/net/igmp/igmp_timer.c +++ b/net/igmp/igmp_timer.c @@ -75,25 +75,25 @@ # ifdef IGMP_GTMRDEBUG # define gtmrdbg(format, ...) ndbg(format, ##__VA_ARGS__) # define gtmrlldbg(format, ...) nlldbg(format, ##__VA_ARGS__) -# define gtmrvdbg(format, ...) nvdbg(format, ##__VA_ARGS__) -# define gtmrllvdbg(format, ...) nllvdbg(format, ##__VA_ARGS__) +# define gtmrinfo(format, ...) ninfo(format, ##__VA_ARGS__) +# define gtmrllinfo(format, ...) nllinfo(format, ##__VA_ARGS__) # else # define gtmrdbg(x...) # define gtmrlldbg(x...) -# define gtmrvdbg(x...) -# define gtmrllvdbg(x...) +# define gtmrinfo(x...) +# define gtmrllinfo(x...) # endif #else # ifdef IGMP_GTMRDEBUG # define gtmrdbg ndbg # define gtmrlldbg nlldbg -# define gtmrvdbg nvdbg -# define gtmrllvdbg nllvdbg +# define gtmrinfo ninfo +# define gtmrllinfo nllinfo # else # define gtmrdbg (void) # define gtmrlldbg (void) -# define gtmrvdbg (void) -# define gtmrllvdbg (void) +# define gtmrinfo (void) +# define gtmrllinfo (void) # endif #endif @@ -119,7 +119,7 @@ static void igmp_timeout(int argc, uint32_t arg, ...) /* If the state is DELAYING_MEMBER then we send a report for this group */ - nllvdbg("Timeout!\n"); + nllinfo("Timeout!\n"); group = (FAR struct igmp_group_s *)arg; DEBUGASSERT(argc == 1 && group); diff --git a/net/iob/iob_copyin.c b/net/iob/iob_copyin.c index c5030c91c5..e671dc2b5e 100644 --- a/net/iob/iob_copyin.c +++ b/net/iob/iob_copyin.c @@ -97,7 +97,7 @@ static int iob_copyin_internal(FAR struct iob_s *iob, FAR const uint8_t *src, unsigned int avail; unsigned int total = len; - nllvdbg("iob=%p len=%u offset=%u\n", iob, len, offset); + nllinfo("iob=%p len=%u offset=%u\n", iob, len, offset); DEBUGASSERT(iob && src); /* The offset must applied to data that is already in the I/O buffer chain */ @@ -130,7 +130,7 @@ static int iob_copyin_internal(FAR struct iob_s *iob, FAR const uint8_t *src, dest = &iob->io_data[iob->io_offset + offset]; avail = iob->io_len - offset; - nllvdbg("iob=%p avail=%u len=%u next=%p\n", iob, avail, len, next); + nllinfo("iob=%p avail=%u len=%u next=%p\n", iob, avail, len, next); /* Will the rest of the copy fit into this buffer, overwriting * existing data. @@ -187,7 +187,7 @@ static int iob_copyin_internal(FAR struct iob_s *iob, FAR const uint8_t *src, /* Copy from the user buffer to the I/O buffer. */ memcpy(dest, src, ncopy); - nllvdbg("iob=%p Copy %u bytes new len=%u\n", + nllinfo("iob=%p Copy %u bytes new len=%u\n", iob, ncopy, iob->io_len); /* Adjust the total length of the copy and the destination address in @@ -227,7 +227,7 @@ static int iob_copyin_internal(FAR struct iob_s *iob, FAR const uint8_t *src, /* Add the new, empty I/O buffer to the end of the buffer chain. */ iob->io_flink = next; - nllvdbg("iob=%p added to the chain\n", iob); + nllinfo("iob=%p added to the chain\n", iob); } iob = next; diff --git a/net/iob/iob_free.c b/net/iob/iob_free.c index 53d8f6fb1d..7762201b3c 100644 --- a/net/iob/iob_free.c +++ b/net/iob/iob_free.c @@ -74,7 +74,7 @@ FAR struct iob_s *iob_free(FAR struct iob_s *iob) FAR struct iob_s *next = iob->io_flink; irqstate_t flags; - nllvdbg("iob=%p io_pktlen=%u io_len=%u next=%p\n", + nllinfo("iob=%p io_pktlen=%u io_len=%u next=%p\n", iob, iob->io_pktlen, iob->io_len, next); /* Copy the data that only exists in the head of a I/O buffer chain into @@ -104,7 +104,7 @@ FAR struct iob_s *iob_free(FAR struct iob_s *iob) DEBUGASSERT(next->io_len == 0 && next->io_flink == NULL); } - nllvdbg("next=%p io_pktlen=%u io_len=%u\n", + nllinfo("next=%p io_pktlen=%u io_len=%u\n", next, next->io_pktlen, next->io_len); } diff --git a/net/iob/iob_trimhead.c b/net/iob/iob_trimhead.c index 70a5359603..1262eecf09 100644 --- a/net/iob/iob_trimhead.c +++ b/net/iob/iob_trimhead.c @@ -78,7 +78,7 @@ FAR struct iob_s *iob_trimhead(FAR struct iob_s *iob, unsigned int trimlen) { uint16_t pktlen; - nllvdbg("iob=%p trimlen=%d\n", iob, trimlen); + nllinfo("iob=%p trimlen=%d\n", iob, trimlen); if (iob && trimlen > 0) { @@ -89,7 +89,7 @@ FAR struct iob_s *iob_trimhead(FAR struct iob_s *iob, unsigned int trimlen) { /* Do we trim this entire I/O buffer away? */ - nllvdbg("iob=%p io_len=%d pktlen=%d trimlen=%d\n", + nllinfo("iob=%p io_len=%d pktlen=%d trimlen=%d\n", iob, iob->io_len, pktlen, trimlen); if (iob->io_len <= trimlen) @@ -120,7 +120,7 @@ FAR struct iob_s *iob_trimhead(FAR struct iob_s *iob, unsigned int trimlen) /* Free this entry and set the next I/O buffer as the head */ - nllvdbg("iob=%p: Freeing\n", iob); + nllinfo("iob=%p: Freeing\n", iob); (void)iob_free(iob); iob = next; } diff --git a/net/iob/iob_trimtail.c b/net/iob/iob_trimtail.c index 6965fe3da5..4ca9407957 100644 --- a/net/iob/iob_trimtail.c +++ b/net/iob/iob_trimtail.c @@ -101,7 +101,7 @@ FAR struct iob_s *iob_trimtail(FAR struct iob_s *iob, unsigned int trimlen) * I/O buffer away? */ - nllvdbg("iob=%p len=%d vs %d\n", last, last->io_len, len); + nllinfo("iob=%p len=%d vs %d\n", last, last->io_len, len); if (last->io_len <= len) { /* Yes.. Consume the entire buffer */ diff --git a/net/local/local_recvutils.c b/net/local/local_recvutils.c index 27272a59db..95845fe0b7 100644 --- a/net/local/local_recvutils.c +++ b/net/local/local_recvutils.c @@ -98,7 +98,7 @@ int local_fifo_read(int fd, FAR uint8_t *buf, size_t *len) goto errout; } - nvdbg("Ignoring signal\n"); + ninfo("Ignoring signal\n"); } else if (nread == 0) { diff --git a/net/local/local_sendpacket.c b/net/local/local_sendpacket.c index c55aa7efbf..0f6942802b 100644 --- a/net/local/local_sendpacket.c +++ b/net/local/local_sendpacket.c @@ -104,7 +104,7 @@ static int local_fifo_write(int fd, FAR const uint8_t *buf, size_t len) return -errcode; } - nvdbg("Ignoring signal\n"); + ninfo("Ignoring signal\n"); } else { diff --git a/net/neighbor/neighbor_add.c b/net/neighbor/neighbor_add.c index 4205f60db2..dd09f93596 100644 --- a/net/neighbor/neighbor_add.c +++ b/net/neighbor/neighbor_add.c @@ -76,11 +76,11 @@ void neighbor_add(FAR net_ipv6addr_t ipaddr, FAR struct neighbor_addr_s *addr) int oldest_ndx; int i; - nllvdbg("Add neighbor: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", + nllinfo("Add neighbor: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", ntohs(ipaddr[0]), ntohs(ipaddr[1]), ntohs(ipaddr[2]), ntohs(ipaddr[3]), ntohs(ipaddr[4]), ntohs(ipaddr[5]), ntohs(ipaddr[6]), ntohs(ipaddr[7])); - nllvdbg(" at: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo(" at: %02x:%02x:%02x:%02x:%02x:%02x\n", addr->na_addr.ether_addr_octet[0], addr->na_addr.ether_addr_octet[1], addr->na_addr.ether_addr_octet[2], diff --git a/net/neighbor/neighbor_findentry.c b/net/neighbor/neighbor_findentry.c index 88b7abf94e..8d9949dff7 100644 --- a/net/neighbor/neighbor_findentry.c +++ b/net/neighbor/neighbor_findentry.c @@ -72,7 +72,7 @@ FAR struct neighbor_entry *neighbor_findentry(const net_ipv6addr_t ipaddr) { int i; - nllvdbg("Find neighbor: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", + nllinfo("Find neighbor: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", ntohs(ipaddr[0]), ntohs(ipaddr[1]), ntohs(ipaddr[2]), ntohs(ipaddr[3]), ntohs(ipaddr[4]), ntohs(ipaddr[5]), ntohs(ipaddr[6]), ntohs(ipaddr[7])); @@ -83,7 +83,7 @@ FAR struct neighbor_entry *neighbor_findentry(const net_ipv6addr_t ipaddr) if (net_ipv6addr_cmp(neighbor->ne_ipaddr, ipaddr)) { - nllvdbg(" at: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo(" at: %02x:%02x:%02x:%02x:%02x:%02x\n", neighbor->ne_addr.na_addr.ether_addr_octet[0], neighbor->ne_addr.na_addr.ether_addr_octet[1], neighbor->ne_addr.na_addr.ether_addr_octet[2], @@ -95,6 +95,6 @@ FAR struct neighbor_entry *neighbor_findentry(const net_ipv6addr_t ipaddr) } } - nllvdbg(" Not found\n"); + nllinfo(" Not found\n"); return NULL; } diff --git a/net/neighbor/neighbor_lookup.c b/net/neighbor/neighbor_lookup.c index 39b9f941bb..a0a3e856d7 100644 --- a/net/neighbor/neighbor_lookup.c +++ b/net/neighbor/neighbor_lookup.c @@ -76,7 +76,7 @@ FAR const struct neighbor_addr_s *neighbor_lookup(const net_ipv6addr_t ipaddr) neighbor = neighbor_findentry(ipaddr); if (neighbor != NULL) { - nllvdbg("Lookup neighbor: %02x:%02x:%02x:%02x:%02x:%02x\n", + nllinfo("Lookup neighbor: %02x:%02x:%02x:%02x:%02x:%02x\n", neighbor->ne_addr.na_addr.ether_addr_octet[0], neighbor->ne_addr.na_addr.ether_addr_octet[1], neighbor->ne_addr.na_addr.ether_addr_octet[2], diff --git a/net/neighbor/neighbor_out.c b/net/neighbor/neighbor_out.c index 061a45518d..8e40982b9c 100644 --- a/net/neighbor/neighbor_out.c +++ b/net/neighbor/neighbor_out.c @@ -227,7 +227,7 @@ void neighbor_out(FAR struct net_driver_s *dev) naddr = neighbor_lookup(ipaddr); if (!naddr) { - nllvdbg("IPv6 Neighbor solicitation for IPv6\n"); + nllinfo("IPv6 Neighbor solicitation for IPv6\n"); /* The destination address was not in our Neighbor Table, so we * overwrite the IPv6 packet with an ICMDv6 Neighbor Solicitation @@ -253,6 +253,6 @@ void neighbor_out(FAR struct net_driver_s *dev) */ dev->d_len += netdev_ipv6_hdrlen(dev); - nllvdbg("Outgoing IPv6 Packet length: %d (%d)\n", + nllinfo("Outgoing IPv6 Packet length: %d (%d)\n", dev->d_len, (ip->len[0] << 8) | ip->len[1]); } diff --git a/net/netdev/netdev_ioctl.c b/net/netdev/netdev_ioctl.c index c4a1a650d0..d12d3bdbbd 100644 --- a/net/netdev/netdev_ioctl.c +++ b/net/netdev/netdev_ioctl.c @@ -363,7 +363,7 @@ static int netdev_ifrioctl(FAR struct socket *psock, int cmd, FAR struct net_driver_s *dev; int ret = -EINVAL; - nvdbg("cmd: %d\n", cmd); + ninfo("cmd: %d\n", cmd); /* Execute the command */ @@ -769,7 +769,7 @@ static int netdev_imsfioctl(FAR struct socket *psock, int cmd, FAR struct net_driver_s *dev; int ret = -EINVAL; - nvdbg("cmd: %d\n", cmd); + ninfo("cmd: %d\n", cmd); /* Execute the command */ diff --git a/net/pkt/pkt_callback.c b/net/pkt/pkt_callback.c index 5376b4ce22..e4c4783457 100644 --- a/net/pkt/pkt_callback.c +++ b/net/pkt/pkt_callback.c @@ -70,7 +70,7 @@ uint16_t pkt_callback(FAR struct net_driver_s *dev, FAR struct pkt_conn_s *conn, uint16_t flags) { - nllvdbg("flags: %04x\n", flags); + nllinfo("flags: %04x\n", flags); /* Some sanity checking */ diff --git a/net/pkt/pkt_send.c b/net/pkt/pkt_send.c index 1310cb9208..70c2a5e2f6 100644 --- a/net/pkt/pkt_send.c +++ b/net/pkt/pkt_send.c @@ -93,7 +93,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, { FAR struct send_s *pstate = (FAR struct send_s *)pvpriv; - nllvdbg("flags: %04x sent: %d\n", flags, pstate->snd_sent); + nllinfo("flags: %04x sent: %d\n", flags, pstate->snd_sent); if (pstate) { diff --git a/net/procfs/net_procfs.c b/net/procfs/net_procfs.c index f65cf040df..3beb1a72ee 100644 --- a/net/procfs/net_procfs.c +++ b/net/procfs/net_procfs.c @@ -126,7 +126,7 @@ static int netprocfs_open(FAR struct file *filep, FAR const char *relpath, FAR struct netprocfs_file_s *priv; FAR struct net_driver_s *dev; - fvdbg("Open '%s'\n", relpath); + finfo("Open '%s'\n", relpath); /* PROCFS is read-only. Any attempt to open with any kind of write * access is not permitted. @@ -233,7 +233,7 @@ static ssize_t netprocfs_read(FAR struct file *filep, FAR char *buffer, FAR struct netprocfs_file_s *priv; ssize_t nreturned; - fvdbg("buffer=%p buflen=%lu\n", buffer, (unsigned long)buflen); + finfo("buffer=%p buflen=%lu\n", buffer, (unsigned long)buflen); /* Recover our private data from the struct file instance */ @@ -282,7 +282,7 @@ static int netprocfs_dup(FAR const struct file *oldp, FAR struct file *newp) FAR struct netprocfs_file_s *oldpriv; FAR struct netprocfs_file_s *newpriv; - fvdbg("Dup %p->%p\n", oldp, newp); + finfo("Dup %p->%p\n", oldp, newp); /* Recover our private data from the old struct file instance */ @@ -322,7 +322,7 @@ static int netprocfs_opendir(FAR const char *relpath, FAR struct netprocfs_level1_s *level1; int ndevs; - fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL"); + finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL"); DEBUGASSERT(relpath && dir && !dir->u.procfs); /* "net" is the only value of relpath that is a directory */ @@ -420,7 +420,7 @@ static int netprocfs_readdir(FAR struct fs_dirent_s *dir) * error -ENOENT. */ - fvdbg("Entry %d: End of directory\n", index); + finfo("Entry %d: End of directory\n", index); return -ENOENT; } @@ -575,7 +575,7 @@ ssize_t netprocfs_read_linegen(FAR struct netprocfs_file_s *priv, size_t xfrsize; ssize_t nreturned; - fvdbg("buffer=%p buflen=%lu\n", buffer, (unsigned long)buflen); + finfo("buffer=%p buflen=%lu\n", buffer, (unsigned long)buflen); /* Is there line data already buffered? */ diff --git a/net/socket/connect.c b/net/socket/connect.c index cbd19e1774..8365a5b3d5 100644 --- a/net/socket/connect.c +++ b/net/socket/connect.c @@ -185,7 +185,7 @@ static uint16_t psock_connect_interrupt(FAR struct net_driver_s *dev, { struct tcp_connect_s *pstate = (struct tcp_connect_s *)pvpriv; - nllvdbg("flags: %04x\n", flags); + nllinfo("flags: %04x\n", flags); /* 'priv' might be null in some race conditions (?) */ @@ -261,7 +261,7 @@ static uint16_t psock_connect_interrupt(FAR struct net_driver_s *dev, return flags & ~TCP_NEWDATA; } - nllvdbg("Resuming: %d\n", pstate->tc_result); + nllinfo("Resuming: %d\n", pstate->tc_result); /* Stop further callbacks */ diff --git a/net/socket/net_checksd.c b/net/socket/net_checksd.c index 3269b531a9..64a2f4df8e 100644 --- a/net/socket/net_checksd.c +++ b/net/socket/net_checksd.c @@ -72,7 +72,7 @@ int net_checksd(int sd, int oflags) if (!psock || psock->s_crefs <= 0) { - nvdbg("No valid socket for sd: %d\n", sd); + ninfo("No valid socket for sd: %d\n", sd); return -EBADF; } diff --git a/net/socket/net_close.c b/net/socket/net_close.c index f03a9caeea..75ddb23b53 100644 --- a/net/socket/net_close.c +++ b/net/socket/net_close.c @@ -161,7 +161,7 @@ static uint16_t netclose_interrupt(FAR struct net_driver_s *dev, DEBUGASSERT(conn != NULL); - nllvdbg("conn: %p flags: %04x\n", conn, flags); + nllinfo("conn: %p flags: %04x\n", conn, flags); /* TCP_DISCONN_EVENTS: * TCP_CLOSE: The remote host has closed the connection @@ -250,7 +250,7 @@ end_wait: pstate->cl_cb->event = NULL; sem_post(&pstate->cl_sem); - nllvdbg("Resuming\n"); + nllinfo("Resuming\n"); return 0; #endif } diff --git a/net/socket/net_monitor.c b/net/socket/net_monitor.c index 3e6cf0c2ae..2c61a6a673 100644 --- a/net/socket/net_monitor.c +++ b/net/socket/net_monitor.c @@ -145,7 +145,7 @@ static uint16_t connection_event(FAR struct net_driver_s *dev, if (psock) { - nllvdbg("flags: %04x s_flags: %02x\n", flags, psock->s_flags); + nllinfo("flags: %04x s_flags: %02x\n", flags, psock->s_flags); /* TCP_DISCONN_EVENTS: TCP_CLOSE, TCP_ABORT, TCP_TIMEDOUT, or * NETDEV_DOWN. All loss-of-connection events. diff --git a/net/socket/net_sendfile.c b/net/socket/net_sendfile.c index d5fde26023..0ab962d762 100644 --- a/net/socket/net_sendfile.c +++ b/net/socket/net_sendfile.c @@ -156,7 +156,7 @@ static uint16_t ack_interrupt(FAR struct net_driver_s *dev, FAR void *pvconn, { FAR struct sendfile_s *pstate = (FAR struct sendfile_s *)pvpriv; - nllvdbg("flags: %04x\n", flags); + nllinfo("flags: %04x\n", flags); if ((flags & TCP_ACKDATA) != 0) { @@ -197,7 +197,7 @@ static uint16_t ack_interrupt(FAR struct net_driver_s *dev, FAR void *pvconn, */ pstate->snd_acked = tcp_getsequence(tcp->ackno) - pstate->snd_isn; - nllvdbg("ACK: acked=%d sent=%d flen=%d\n", + nllinfo("ACK: acked=%d sent=%d flen=%d\n", pstate->snd_acked, pstate->snd_sent, pstate->snd_flen); dev->d_sndlen = 0; @@ -336,7 +336,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon } #endif - nllvdbg("flags: %04x acked: %d sent: %d\n", + nllinfo("flags: %04x acked: %d sent: %d\n", flags, pstate->snd_acked, pstate->snd_sent); /* Check for a loss of connection */ @@ -410,7 +410,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon */ seqno = pstate->snd_sent + pstate->snd_isn; - nllvdbg("SEND: sndseq %08x->%08x len: %d\n", conn->sndseq, seqno, ret); + nllinfo("SEND: sndseq %08x->%08x len: %d\n", conn->sndseq, seqno, ret); tcp_setsequence(conn->sndseq, seqno); @@ -424,7 +424,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon /* Update the amount of data sent (but not necessarily ACKed) */ pstate->snd_sent += sndlen; - nllvdbg("pid: %d SEND: acked=%d sent=%d flen=%d\n", getpid(), + nllinfo("pid: %d SEND: acked=%d sent=%d flen=%d\n", getpid(), pstate->snd_acked, pstate->snd_sent, pstate->snd_flen); } } diff --git a/net/socket/net_vfcntl.c b/net/socket/net_vfcntl.c index d6fd76f20b..a58756cb8e 100644 --- a/net/socket/net_vfcntl.c +++ b/net/socket/net_vfcntl.c @@ -80,7 +80,7 @@ int net_vfcntl(int sockfd, int cmd, va_list ap) int err = 0; int ret = 0; - nvdbg("sockfd=%d cmd=%d\n", sockfd, cmd); + ninfo("sockfd=%d cmd=%d\n", sockfd, cmd); /* Verify that the sockfd corresponds to valid, allocated socket */ diff --git a/net/socket/recvfrom.c b/net/socket/recvfrom.c index 9bc234f541..fc9d8c794d 100644 --- a/net/socket/recvfrom.c +++ b/net/socket/recvfrom.c @@ -181,7 +181,7 @@ static size_t recvfrom_newdata(FAR struct net_driver_s *dev, /* Copy the new appdata into the user buffer */ memcpy(pstate->rf_buffer, dev->d_appdata, recvlen); - nllvdbg("Received %d bytes (of %d)\n", (int)recvlen, (int)dev->d_len); + nllinfo("Received %d bytes (of %d)\n", (int)recvlen, (int)dev->d_len); /* Update the accumulated size of the data read */ @@ -227,7 +227,7 @@ static void recvfrom_newpktdata(FAR struct net_driver_s *dev, /* Copy the new packet data into the user buffer */ memcpy(pstate->rf_buffer, dev->d_buf, recvlen); - nllvdbg("Received %d bytes (of %d)\n", (int)recvlen, (int)dev->d_len); + nllinfo("Received %d bytes (of %d)\n", (int)recvlen, (int)dev->d_len); /* Update the accumulated size of the data read */ @@ -378,7 +378,7 @@ static inline void recvfrom_tcpreadahead(struct recvfrom_s *pstate) */ recvlen = iob_copyout(pstate->rf_buffer, iob, pstate->rf_buflen, 0); - nllvdbg("Received %d bytes (of %d)\n", recvlen, iob->io_pktlen); + nllinfo("Received %d bytes (of %d)\n", recvlen, iob->io_pktlen); /* Update the accumulated size of the data read */ @@ -478,7 +478,7 @@ static inline void recvfrom_udpreadahead(struct recvfrom_s *pstate) recvlen = iob_copyout(pstate->rf_buffer, iob, pstate->rf_buflen, src_addr_size + sizeof(uint8_t)); - nllvdbg("Received %d bytes (of %d)\n", recvlen, iob->io_pktlen); + nllinfo("Received %d bytes (of %d)\n", recvlen, iob->io_pktlen); /* Update the accumulated size of the data read */ @@ -621,7 +621,7 @@ static uint16_t recvfrom_pktinterrupt(FAR struct net_driver_s *dev, { struct recvfrom_s *pstate = (struct recvfrom_s *)pvpriv; - nllvdbg("flags: %04x\n", flags); + nllinfo("flags: %04x\n", flags); /* 'priv' might be null in some race conditions (?) */ @@ -636,7 +636,7 @@ static uint16_t recvfrom_pktinterrupt(FAR struct net_driver_s *dev, /* We are finished. */ - nllvdbg("PKT done\n"); + nllinfo("PKT done\n"); /* Don't allow any further call backs. */ @@ -778,7 +778,7 @@ static uint16_t recvfrom_tcpinterrupt(FAR struct net_driver_s *dev, #endif #endif - nllvdbg("flags: %04x\n", flags); + nllinfo("flags: %04x\n", flags); /* 'priv' might be null in some race conditions (?) */ @@ -827,7 +827,7 @@ static uint16_t recvfrom_tcpinterrupt(FAR struct net_driver_s *dev, if (pstate->rf_recvlen > 0) #endif { - nllvdbg("TCP resume\n"); + nllinfo("TCP resume\n"); /* The TCP receive buffer is full. Return now and don't allow * any further TCP call backs. @@ -864,7 +864,7 @@ static uint16_t recvfrom_tcpinterrupt(FAR struct net_driver_s *dev, else if ((flags & TCP_DISCONN_EVENTS) != 0) { - nllvdbg("Lost connection\n"); + nllinfo("Lost connection\n"); /* Stop further callbacks */ @@ -924,7 +924,7 @@ static uint16_t recvfrom_tcpinterrupt(FAR struct net_driver_s *dev, * callbacks */ - nllvdbg("TCP timeout\n"); + nllinfo("TCP timeout\n"); pstate->rf_cb->flags = 0; pstate->rf_cb->priv = NULL; @@ -1122,7 +1122,7 @@ static uint16_t recvfrom_udp_interrupt(FAR struct net_driver_s *dev, { FAR struct recvfrom_s *pstate = (FAR struct recvfrom_s *)pvpriv; - nllvdbg("flags: %04x\n", flags); + nllinfo("flags: %04x\n", flags); /* 'priv' might be null in some race conditions (?) */ @@ -1150,7 +1150,7 @@ static uint16_t recvfrom_udp_interrupt(FAR struct net_driver_s *dev, /* We are finished. */ - nllvdbg("UDP done\n"); + nllinfo("UDP done\n"); /* Save the sender's address in the caller's 'from' location */ @@ -1176,7 +1176,7 @@ static uint16_t recvfrom_udp_interrupt(FAR struct net_driver_s *dev, * callbacks */ - nllvdbg("ERROR: UDP timeout\n"); + nllinfo("ERROR: UDP timeout\n"); /* Terminate the transfer with an -EAGAIN error */ diff --git a/net/tcp/tcp_accept.c b/net/tcp/tcp_accept.c index ced4f0d659..d2b7d426ed 100644 --- a/net/tcp/tcp_accept.c +++ b/net/tcp/tcp_accept.c @@ -246,7 +246,7 @@ int psock_tcp_accept(FAR struct socket *psock, FAR struct sockaddr *addr, { /* Yes... get the address of the connected client */ - nvdbg("Pending conn=%p\n", state.acpt_newconn); + ninfo("Pending conn=%p\n", state.acpt_newconn); accept_tcpsender(psock, state.acpt_newconn, addr, addrlen); } diff --git a/net/tcp/tcp_appsend.c b/net/tcp/tcp_appsend.c index a56da75714..924415378e 100644 --- a/net/tcp/tcp_appsend.c +++ b/net/tcp/tcp_appsend.c @@ -87,7 +87,7 @@ void tcp_appsend(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn, /* Handle the result based on the application response */ - nllvdbg("result: %04x d_sndlen: %d conn->unacked: %d\n", + nllinfo("result: %04x d_sndlen: %d conn->unacked: %d\n", result, dev->d_sndlen, conn->unacked); /* Get the IP header length associated with the IP domain configured for @@ -124,7 +124,7 @@ void tcp_appsend(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn, dev->d_sndlen = 0; conn->tcpstateflags = TCP_CLOSED; - nllvdbg("TCP state: NETDEV_DOWN\n"); + nllinfo("TCP state: NETDEV_DOWN\n"); } /* Check for connection aborted */ @@ -133,7 +133,7 @@ void tcp_appsend(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn, { dev->d_sndlen = 0; conn->tcpstateflags = TCP_CLOSED; - nllvdbg("TCP state: TCP_CLOSED\n"); + nllinfo("TCP state: TCP_CLOSED\n"); tcp_send(dev, conn, TCP_RST | TCP_ACK, hdrlen); } @@ -145,7 +145,7 @@ void tcp_appsend(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn, conn->tcpstateflags = TCP_FIN_WAIT_1; conn->unacked = 1; conn->nrtx = 0; - nllvdbg("TCP state: TCP_FIN_WAIT_1\n"); + nllinfo("TCP state: TCP_FIN_WAIT_1\n"); dev->d_sndlen = 0; tcp_send(dev, conn, TCP_FIN | TCP_ACK, hdrlen); @@ -210,7 +210,7 @@ void tcp_rexmit(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn, { uint8_t hdrlen; - nllvdbg("result: %04x d_sndlen: %d conn->unacked: %d\n", + nllinfo("result: %04x d_sndlen: %d conn->unacked: %d\n", result, dev->d_sndlen, conn->unacked); /* Get the IP header length associated with the IP domain configured for diff --git a/net/tcp/tcp_backlog.c b/net/tcp/tcp_backlog.c index f4bba6cbeb..9a1e6e3bf5 100644 --- a/net/tcp/tcp_backlog.c +++ b/net/tcp/tcp_backlog.c @@ -77,7 +77,7 @@ int tcp_backlogcreate(FAR struct tcp_conn_s *conn, int nblg) int offset; int i; - nllvdbg("conn=%p nblg=%d\n", conn, nblg); + nllinfo("conn=%p nblg=%d\n", conn, nblg); #ifdef CONFIG_DEBUG if (!conn) @@ -161,7 +161,7 @@ int tcp_backlogdestroy(FAR struct tcp_conn_s *conn) FAR struct tcp_blcontainer_s *blc; FAR struct tcp_conn_s *blconn; - nllvdbg("conn=%p\n", conn); + nllinfo("conn=%p\n", conn); #ifdef CONFIG_DEBUG if (!conn) @@ -222,7 +222,7 @@ int tcp_backlogadd(FAR struct tcp_conn_s *conn, FAR struct tcp_conn_s *blconn) FAR struct tcp_blcontainer_s *blc; int ret = -EINVAL; - nllvdbg("conn=%p blconn=%p\n", conn, blconn); + nllinfo("conn=%p blconn=%p\n", conn, blconn); #ifdef CONFIG_DEBUG if (!conn) @@ -321,7 +321,7 @@ FAR struct tcp_conn_s *tcp_backlogremove(FAR struct tcp_conn_s *conn) } } - nllvdbg("conn=%p, returning %p\n", conn, blconn); + nllinfo("conn=%p, returning %p\n", conn, blconn); return blconn; } @@ -345,7 +345,7 @@ int tcp_backlogdelete(FAR struct tcp_conn_s *conn, FAR struct tcp_blcontainer_s *blc; FAR struct tcp_blcontainer_s *prev; - nllvdbg("conn=%p blconn=%p\n", conn, blconn); + nllinfo("conn=%p blconn=%p\n", conn, blconn); #ifdef CONFIG_DEBUG if (!conn) diff --git a/net/tcp/tcp_callback.c b/net/tcp/tcp_callback.c index ac43091923..7571821842 100644 --- a/net/tcp/tcp_callback.c +++ b/net/tcp/tcp_callback.c @@ -95,7 +95,7 @@ tcp_data_event(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn, uint16_t recvlen; #endif - nllvdbg("No listener on connection\n"); + nllinfo("No listener on connection\n"); #ifdef CONFIG_NET_TCP_READAHEAD /* Save as the packet data as in the read-ahead buffer. NOTE that @@ -110,7 +110,7 @@ tcp_data_event(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn, * read-ahead buffers to retain the data -- drop the packet. */ - nllvdbg("Dropped %d bytes\n", dev->d_len); + nllinfo("Dropped %d bytes\n", dev->d_len); #ifdef CONFIG_NET_STATISTICS g_netstats.tcp.syndrop++; @@ -152,7 +152,7 @@ uint16_t tcp_callback(FAR struct net_driver_s *dev, * explicitly set in the callback. */ - nllvdbg("flags: %04x\n", flags); + nllinfo("flags: %04x\n", flags); /* Perform the data callback. When a data callback is executed from 'list', * the input flags are normally returned, however, the implementation @@ -275,7 +275,7 @@ uint16_t tcp_datahandler(FAR struct tcp_conn_s *conn, FAR uint8_t *buffer, return 0; } - nllvdbg("Buffered %d bytes\n", buflen); + nllinfo("Buffered %d bytes\n", buflen); return buflen; } #endif /* CONFIG_NET_TCP_READAHEAD */ diff --git a/net/tcp/tcp_conn.c b/net/tcp/tcp_conn.c index efc6527cc5..d4ff81e8ff 100644 --- a/net/tcp/tcp_conn.c +++ b/net/tcp/tcp_conn.c @@ -727,7 +727,7 @@ FAR struct tcp_conn_s *tcp_alloc(uint8_t domain) while (tmp) { - nllvdbg("conn: %p state: %02x\n", tmp, tmp->tcpstateflags); + nllinfo("conn: %p state: %02x\n", tmp, tmp->tcpstateflags); /* Is this connection in a state we can sacrifice. */ diff --git a/net/tcp/tcp_input.c b/net/tcp/tcp_input.c index 27ab34e1b3..88286266b2 100644 --- a/net/tcp/tcp_input.c +++ b/net/tcp/tcp_input.c @@ -409,7 +409,7 @@ found: * be beyond ackseq. */ - nllvdbg("sndseq: %08x->%08x unackseq: %08x new unacked: %d\n", + nllinfo("sndseq: %08x->%08x unackseq: %08x new unacked: %d\n", conn->sndseq, ackseq, unackseq, conn->unacked); tcp_setsequence(conn->sndseq, ackseq); @@ -471,7 +471,7 @@ found: #endif conn->unacked = 0; flags = TCP_CONNECTED; - nllvdbg("TCP state: TCP_ESTABLISHED\n"); + nllinfo("TCP state: TCP_ESTABLISHED\n"); if (dev->d_len > 0) { @@ -571,7 +571,7 @@ found: dev->d_len = 0; dev->d_sndlen = 0; - nllvdbg("TCP state: TCP_ESTABLISHED\n"); + nllinfo("TCP state: TCP_ESTABLISHED\n"); result = tcp_callback(dev, conn, TCP_CONNECTED | TCP_NEWDATA); tcp_appsend(dev, conn, result); return; @@ -584,7 +584,7 @@ found: /* The connection is closed after we send the RST */ conn->tcpstateflags = TCP_CLOSED; - nllvdbg("Connection failed - TCP state: TCP_CLOSED\n"); + nllinfo("Connection failed - TCP state: TCP_CLOSED\n"); /* We do not send resets in response to resets. */ @@ -640,7 +640,7 @@ found: conn->tcpstateflags = TCP_LAST_ACK; conn->unacked = 1; conn->nrtx = 0; - nllvdbg("TCP state: TCP_LAST_ACK\n"); + nllinfo("TCP state: TCP_LAST_ACK\n"); tcp_send(dev, conn, TCP_FIN | TCP_ACK, tcpiplen); return; @@ -748,7 +748,7 @@ found: if ((flags & TCP_ACKDATA) != 0) { conn->tcpstateflags = TCP_CLOSED; - nllvdbg("TCP_LAST_ACK TCP state: TCP_CLOSED\n"); + nllinfo("TCP_LAST_ACK TCP state: TCP_CLOSED\n"); (void)tcp_callback(dev, conn, TCP_CLOSE); } @@ -772,12 +772,12 @@ found: conn->tcpstateflags = TCP_TIME_WAIT; conn->timer = 0; conn->unacked = 0; - nllvdbg("TCP state: TCP_TIME_WAIT\n"); + nllinfo("TCP state: TCP_TIME_WAIT\n"); } else { conn->tcpstateflags = TCP_CLOSING; - nllvdbg("TCP state: TCP_CLOSING\n"); + nllinfo("TCP state: TCP_CLOSING\n"); } net_incr32(conn->rcvseq, 1); @@ -789,7 +789,7 @@ found: { conn->tcpstateflags = TCP_FIN_WAIT_2; conn->unacked = 0; - nllvdbg("TCP state: TCP_FIN_WAIT_2\n"); + nllinfo("TCP state: TCP_FIN_WAIT_2\n"); goto drop; } @@ -811,7 +811,7 @@ found: { conn->tcpstateflags = TCP_TIME_WAIT; conn->timer = 0; - nllvdbg("TCP state: TCP_TIME_WAIT\n"); + nllinfo("TCP state: TCP_TIME_WAIT\n"); net_incr32(conn->rcvseq, 1); (void)tcp_callback(dev, conn, TCP_CLOSE); @@ -836,7 +836,7 @@ found: { conn->tcpstateflags = TCP_TIME_WAIT; conn->timer = 0; - nllvdbg("TCP state: TCP_TIME_WAIT\n"); + nllinfo("TCP state: TCP_TIME_WAIT\n"); } default: diff --git a/net/tcp/tcp_netpoll.c b/net/tcp/tcp_netpoll.c index 522c00986b..40a5a34c78 100644 --- a/net/tcp/tcp_netpoll.c +++ b/net/tcp/tcp_netpoll.c @@ -93,7 +93,7 @@ static uint16_t tcp_poll_interrupt(FAR struct net_driver_s *dev, FAR void *conn, { FAR struct tcp_poll_s *info = (FAR struct tcp_poll_s *)pvpriv; - nllvdbg("flags: %04x\n", flags); + nllinfo("flags: %04x\n", flags); DEBUGASSERT(!info || (info->psock && info->fds)); diff --git a/net/tcp/tcp_send.c b/net/tcp/tcp_send.c index 14affd53de..12881bcd3a 100644 --- a/net/tcp/tcp_send.c +++ b/net/tcp/tcp_send.c @@ -167,7 +167,7 @@ static inline void tcp_ipv4_sendcomplete(FAR struct net_driver_s *dev, ipv4->ipchksum = 0; ipv4->ipchksum = ~ipv4_chksum(dev); - nllvdbg("IPv4 length: %d\n", ((int)ipv4->len[0] << 8) + ipv4->len[1]); + nllinfo("IPv4 length: %d\n", ((int)ipv4->len[0] << 8) + ipv4->len[1]); #ifdef CONFIG_NET_STATISTICS g_netstats.ipv4.sent++; @@ -230,7 +230,7 @@ static inline void tcp_ipv6_sendcomplete(FAR struct net_driver_s *dev, ipv6->tcf = 0x00; ipv6->flow = 0x00; - nllvdbg("IPv6 length: %d\n", ((int)ipv6->len[0] << 8) + ipv6->len[1]); + nllinfo("IPv6 length: %d\n", ((int)ipv6->len[0] << 8) + ipv6->len[1]); #ifdef CONFIG_NET_STATISTICS g_netstats.ipv6.sent++; @@ -277,7 +277,7 @@ static void tcp_sendcomplete(FAR struct net_driver_s *dev, } #endif /* CONFIG_NET_IPv4 */ - nllvdbg("Outgoing TCP packet length: %d bytes\n", dev->d_len); + nllinfo("Outgoing TCP packet length: %d bytes\n", dev->d_len); #ifdef CONFIG_NET_STATISTICS g_netstats.tcp.sent++; diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c index af4766c309..538cb29980 100644 --- a/net/tcp/tcp_send_buffered.c +++ b/net/tcp/tcp_send_buffered.c @@ -349,7 +349,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, } #endif - nllvdbg("flags: %04x\n", flags); + nllinfo("flags: %04x\n", flags); /* If this packet contains an acknowledgement, then update the count of * acknowledged bytes. @@ -388,7 +388,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, /* Get the ACK number from the TCP header */ ackno = tcp_getsequence(tcp->ackno); - nllvdbg("ACK: ackno=%u flags=%04x\n", ackno, flags); + nllinfo("ACK: ackno=%u flags=%04x\n", ackno, flags); /* Look at every write buffer in the unacked_q. The unacked_q * holds write buffers that have been entirely sent, but which @@ -414,14 +414,14 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, /* Get the sequence number at the end of the data */ lastseq = WRB_SEQNO(wrb) + WRB_PKTLEN(wrb); - nllvdbg("ACK: wrb=%p seqno=%u lastseq=%u pktlen=%u ackno=%u\n", + nllinfo("ACK: wrb=%p seqno=%u lastseq=%u pktlen=%u ackno=%u\n", wrb, WRB_SEQNO(wrb), lastseq, WRB_PKTLEN(wrb), ackno); /* Has the entire buffer been ACKed? */ if (ackno >= lastseq) { - nllvdbg("ACK: wrb=%p Freeing write buffer\n", wrb); + nllinfo("ACK: wrb=%p Freeing write buffer\n", wrb); /* Yes... Remove the write buffer from ACK waiting queue */ @@ -449,7 +449,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, trimlen = WRB_SENT(wrb); } - nllvdbg("ACK: wrb=%p trim %u bytes\n", wrb, trimlen); + nllinfo("ACK: wrb=%p trim %u bytes\n", wrb, trimlen); WRB_TRIM(wrb, trimlen); WRB_SEQNO(wrb) = ackno; @@ -457,7 +457,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, /* Set the new sequence number for what remains */ - nllvdbg("ACK: wrb=%p seqno=%u pktlen=%u\n", + nllinfo("ACK: wrb=%p seqno=%u pktlen=%u\n", wrb, WRB_SEQNO(wrb), WRB_PKTLEN(wrb)); } } @@ -483,7 +483,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, nacked = WRB_SENT(wrb); } - nllvdbg("ACK: wrb=%p seqno=%u nacked=%u sent=%u ackno=%u\n", + nllinfo("ACK: wrb=%p seqno=%u nacked=%u sent=%u ackno=%u\n", wrb, WRB_SEQNO(wrb), nacked, WRB_SENT(wrb), ackno); /* Trim the ACKed bytes from the beginning of the write buffer. */ @@ -492,7 +492,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, WRB_SEQNO(wrb) = ackno; WRB_SENT(wrb) -= nacked; - nllvdbg("ACK: wrb=%p seqno=%u pktlen=%u sent=%u\n", + nllinfo("ACK: wrb=%p seqno=%u pktlen=%u sent=%u\n", wrb, WRB_SEQNO(wrb), WRB_PKTLEN(wrb), WRB_SENT(wrb)); } } @@ -501,7 +501,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, else if ((flags & TCP_DISCONN_EVENTS) != 0) { - nllvdbg("Lost connection: %04x\n", flags); + nllinfo("Lost connection: %04x\n", flags); if (psock->s_conn != NULL) { @@ -523,14 +523,14 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, FAR struct tcp_wrbuffer_s *wrb; FAR sq_entry_t *entry; - nllvdbg("REXMIT: %04x\n", flags); + nllinfo("REXMIT: %04x\n", flags); /* If there is a partially sent write buffer at the head of the * write_q? Has anything been sent from that write buffer? */ wrb = (FAR struct tcp_wrbuffer_s *)sq_peek(&conn->write_q); - nllvdbg("REXMIT: wrb=%p sent=%u\n", wrb, wrb ? WRB_SENT(wrb) : 0); + nllinfo("REXMIT: wrb=%p sent=%u\n", wrb, wrb ? WRB_SENT(wrb) : 0); if (wrb != NULL && WRB_SENT(wrb) > 0) { @@ -559,7 +559,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, } WRB_SENT(wrb) = 0; - nllvdbg("REXMIT: wrb=%p sent=%u, conn unacked=%d sent=%d\n", + nllinfo("REXMIT: wrb=%p sent=%u, conn unacked=%d sent=%d\n", wrb, WRB_SENT(wrb), conn->unacked, conn->sent); /* Increment the retransmit count on this write buffer. */ @@ -624,7 +624,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, } WRB_SENT(wrb) = 0; - nllvdbg("REXMIT: wrb=%p sent=%u, conn unacked=%d sent=%d\n", + nllinfo("REXMIT: wrb=%p sent=%u, conn unacked=%d sent=%d\n", wrb, WRB_SENT(wrb), conn->unacked, conn->sent); /* Free any write buffers that have exceed the retry count */ @@ -656,7 +656,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, * is pulled from the write_q again. */ - nllvdbg("REXMIT: Moving wrb=%p nrtx=%u\n", wrb, WRB_NRTX(wrb)); + nllinfo("REXMIT: Moving wrb=%p nrtx=%u\n", wrb, WRB_NRTX(wrb)); psock_insert_segment(wrb, &conn->write_q); } @@ -721,7 +721,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, sndlen = conn->winsize; } - nllvdbg("SEND: wrb=%p pktlen=%u sent=%u sndlen=%u\n", + nllinfo("SEND: wrb=%p pktlen=%u sent=%u sndlen=%u\n", wrb, WRB_PKTLEN(wrb), WRB_SENT(wrb), sndlen); /* Set the sequence number for this segment. If we are @@ -768,14 +768,14 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, conn->unacked += sndlen; conn->sent += sndlen; - nllvdbg("SEND: wrb=%p nrtx=%u unacked=%u sent=%u\n", + nllinfo("SEND: wrb=%p nrtx=%u unacked=%u sent=%u\n", wrb, WRB_NRTX(wrb), conn->unacked, conn->sent); /* Increment the count of bytes sent from this write buffer */ WRB_SENT(wrb) += sndlen; - nllvdbg("SEND: wrb=%p sent=%u pktlen=%u\n", + nllinfo("SEND: wrb=%p sent=%u pktlen=%u\n", wrb, WRB_SENT(wrb), WRB_PKTLEN(wrb)); /* Remove the write buffer from the write queue if the @@ -787,7 +787,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev, { FAR struct tcp_wrbuffer_s *tmp; - nllvdbg("SEND: wrb=%p Move to unacked_q\n", wrb); + nllinfo("SEND: wrb=%p Move to unacked_q\n", wrb); tmp = (FAR struct tcp_wrbuffer_s *)sq_remfirst(&conn->write_q); DEBUGASSERT(tmp == wrb); @@ -1056,7 +1056,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock, FAR const void *buf, */ sq_addlast(&wrb->wb_node, &conn->write_q); - nllvdbg("Queued WRB=%p pktlen=%u write_q(%p,%p)\n", + nllinfo("Queued WRB=%p pktlen=%u write_q(%p,%p)\n", wrb, WRB_PKTLEN(wrb), conn->write_q.head, conn->write_q.tail); diff --git a/net/tcp/tcp_send_unbuffered.c b/net/tcp/tcp_send_unbuffered.c index 53365e3f68..d043a46250 100644 --- a/net/tcp/tcp_send_unbuffered.c +++ b/net/tcp/tcp_send_unbuffered.c @@ -302,7 +302,7 @@ static uint16_t tcpsend_interrupt(FAR struct net_driver_s *dev, } #endif - nllvdbg("flags: %04x acked: %d sent: %d\n", + nllinfo("flags: %04x acked: %d sent: %d\n", flags, pstate->snd_acked, pstate->snd_sent); /* If this packet contains an acknowledgement, then update the count of @@ -348,7 +348,7 @@ static uint16_t tcpsend_interrupt(FAR struct net_driver_s *dev, */ pstate->snd_acked = tcp_getsequence(tcp->ackno) - pstate->snd_isn; - nllvdbg("ACK: acked=%d sent=%d buflen=%d\n", + nllinfo("ACK: acked=%d sent=%d buflen=%d\n", pstate->snd_acked, pstate->snd_sent, pstate->snd_buflen); /* Have all of the bytes in the buffer been sent and acknowledged? */ @@ -392,7 +392,7 @@ static uint16_t tcpsend_interrupt(FAR struct net_driver_s *dev, { /* Report not connected */ - nllvdbg("Lost connection\n"); + nllinfo("Lost connection\n"); net_lostconnection(pstate->snd_sock, flags); pstate->snd_sent = -ENOTCONN; @@ -526,7 +526,7 @@ static uint16_t tcpsend_interrupt(FAR struct net_driver_s *dev, */ seqno = pstate->snd_sent + pstate->snd_isn; - nllvdbg("SEND: sndseq %08x->%08x\n", conn->sndseq, seqno); + nllinfo("SEND: sndseq %08x->%08x\n", conn->sndseq, seqno); tcp_setsequence(conn->sndseq, seqno); #ifdef NEED_IPDOMAIN_SUPPORT @@ -554,7 +554,7 @@ static uint16_t tcpsend_interrupt(FAR struct net_driver_s *dev, /* Update the amount of data sent (but not necessarily ACKed) */ pstate->snd_sent += sndlen; - nllvdbg("SEND: acked=%d sent=%d buflen=%d\n", + nllinfo("SEND: acked=%d sent=%d buflen=%d\n", pstate->snd_acked, pstate->snd_sent, pstate->snd_buflen); } diff --git a/net/tcp/tcp_timer.c b/net/tcp/tcp_timer.c index 0ba497bb2a..4d8871e1af 100644 --- a/net/tcp/tcp_timer.c +++ b/net/tcp/tcp_timer.c @@ -157,7 +157,7 @@ void tcp_timer(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn, DEBUGASSERT(conn->dev != NULL); if (dev != conn->dev) { - nllvdbg("TCP: TCP_CLOSED pending\n"); + nllinfo("TCP: TCP_CLOSED pending\n"); } else #endif @@ -168,7 +168,7 @@ void tcp_timer(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn, result = tcp_callback(dev, conn, TCP_TIMEDOUT); - nllvdbg("TCP state: TCP_CLOSED\n"); + nllinfo("TCP state: TCP_CLOSED\n"); } } else @@ -213,7 +213,7 @@ void tcp_timer(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn, DEBUGASSERT(conn->dev != NULL); if (dev != conn->dev) { - nllvdbg("TCP: TCP_CLOSED pending\n"); + nllinfo("TCP: TCP_CLOSED pending\n"); goto done; } #endif @@ -231,7 +231,7 @@ void tcp_timer(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn, ) { conn->tcpstateflags = TCP_CLOSED; - nllvdbg("TCP state: TCP_CLOSED\n"); + nllinfo("TCP state: TCP_CLOSED\n"); /* We call tcp_callback() with TCP_TIMEDOUT to * inform the application that the connection has diff --git a/net/udp/udp_callback.c b/net/udp/udp_callback.c index 86b733f81a..e53e806c51 100644 --- a/net/udp/udp_callback.c +++ b/net/udp/udp_callback.c @@ -225,7 +225,7 @@ static uint16_t udp_datahandler(FAR struct net_driver_s *dev, FAR struct udp_con return 0; } - nllvdbg("Buffered %d bytes\n", buflen); + nllinfo("Buffered %d bytes\n", buflen); return buflen; } #endif /* CONFIG_NET_UDP_READAHEAD */ @@ -255,7 +255,7 @@ net_dataevent(FAR struct net_driver_s *dev, FAR struct udp_conn_s *conn, * can have zero-length with UDP_NEWDATA set just to cause an ACK). */ - nllvdbg("No receive on connection\n"); + nllinfo("No receive on connection\n"); #ifdef CONFIG_NET_UDP_READAHEAD /* Save as the packet data as in the read-ahead buffer. NOTE that @@ -270,7 +270,7 @@ net_dataevent(FAR struct net_driver_s *dev, FAR struct udp_conn_s *conn, * read-ahead buffers to retain the data -- drop the packet. */ - nllvdbg("Dropped %d bytes\n", dev->d_len); + nllinfo("Dropped %d bytes\n", dev->d_len); #ifdef CONFIG_NET_STATISTICS g_netstats.udp.drop++; @@ -304,7 +304,7 @@ net_dataevent(FAR struct net_driver_s *dev, FAR struct udp_conn_s *conn, uint16_t udp_callback(FAR struct net_driver_s *dev, FAR struct udp_conn_s *conn, uint16_t flags) { - nllvdbg("flags: %04x\n", flags); + nllinfo("flags: %04x\n", flags); /* Some sanity checking */ diff --git a/net/udp/udp_netpoll.c b/net/udp/udp_netpoll.c index 07772b6604..349560b1cc 100644 --- a/net/udp/udp_netpoll.c +++ b/net/udp/udp_netpoll.c @@ -93,7 +93,7 @@ static uint16_t udp_poll_interrupt(FAR struct net_driver_s *dev, FAR void *conn, { FAR struct udp_poll_s *info = (FAR struct udp_poll_s *)pvpriv; - nllvdbg("flags: %04x\n", flags); + nllinfo("flags: %04x\n", flags); DEBUGASSERT(!info || (info->psock && info->fds)); diff --git a/net/udp/udp_psock_sendto.c b/net/udp/udp_psock_sendto.c index 71fbe55af1..0b001e153b 100644 --- a/net/udp/udp_psock_sendto.c +++ b/net/udp/udp_psock_sendto.c @@ -224,7 +224,7 @@ static uint16_t sendto_interrupt(FAR struct net_driver_s *dev, FAR void *conn, { FAR struct sendto_s *pstate = (FAR struct sendto_s *)pvpriv; - nllvdbg("flags: %04x\n", flags); + nllinfo("flags: %04x\n", flags); if (pstate) { /* If the network device has gone down, then we will have terminate diff --git a/net/udp/udp_send.c b/net/udp/udp_send.c index b764fade42..4395da2f8d 100644 --- a/net/udp/udp_send.c +++ b/net/udp/udp_send.c @@ -100,7 +100,7 @@ void udp_send(FAR struct net_driver_s *dev, FAR struct udp_conn_s *conn) { FAR struct udp_hdr_s *udp; - nllvdbg("UDP payload: %d (%d) bytes\n", dev->d_sndlen, dev->d_len); + nllinfo("UDP payload: %d (%d) bytes\n", dev->d_sndlen, dev->d_len); if (dev->d_sndlen > 0) { @@ -252,7 +252,7 @@ void udp_send(FAR struct net_driver_s *dev, FAR struct udp_conn_s *conn) } #endif /* CONFIG_NET_UDP_CHECKSUMS */ - nllvdbg("Outgoing UDP packet length: %d\n", dev->d_len); + nllinfo("Outgoing UDP packet length: %d\n", dev->d_len); #ifdef CONFIG_NET_STATISTICS g_netstats.udp.sent++; diff --git a/sched/init/os_bringup.c b/sched/init/os_bringup.c index 1652a36b7f..7887ab8770 100644 --- a/sched/init/os_bringup.c +++ b/sched/init/os_bringup.c @@ -152,7 +152,7 @@ static inline void os_pgworker(void) * resolve page faults in other threads */ - svdbg("Starting paging thread\n"); + sinfo("Starting paging thread\n"); g_pgworker = kernel_thread("pgfill", CONFIG_PAGING_DEFPRIO, CONFIG_PAGING_STACKSIZE, @@ -253,7 +253,7 @@ static inline void os_do_appstart(void) * entrypoint from the header at the beginning of the user-space blob. */ - svdbg("Starting init thread\n"); + sinfo("Starting init thread\n"); #ifdef CONFIG_BUILD_PROTECTED DEBUGASSERT(USERSPACE->us_entrypoint != NULL); @@ -287,7 +287,7 @@ static inline void os_do_appstart(void) * of the board_initialize() operation. */ - svdbg("Starting init task: %s\n", CONFIG_USER_INITPATH); + sinfo("Starting init task: %s\n", CONFIG_USER_INITPATH); ret = exec(CONFIG_USER_INITPATH, NULL, CONFIG_INIT_SYMTAB, CONFIG_INIT_NEXPORTS); diff --git a/sched/module/mod_init.c b/sched/module/mod_init.c index 6bcf0e152a..d9c55f1599 100644 --- a/sched/module/mod_init.c +++ b/sched/module/mod_init.c @@ -65,7 +65,7 @@ #endif #ifdef CONFIG_MODULE_DUMPBUFFER -# define mod_dumpbuffer(m,b,n) svdbgdumpbuffer(m,b,n) +# define mod_dumpbuffer(m,b,n) sinfodumpbuffer(m,b,n) #else # define mod_dumpbuffer(m,b,n) #endif @@ -146,7 +146,7 @@ int mod_initialize(FAR const char *filename, { int ret; - svdbg("filename: %s loadinfo: %p\n", filename, loadinfo); + sinfo("filename: %s loadinfo: %p\n", filename, loadinfo); /* Clear the load info structure */ diff --git a/sched/module/mod_insmod.c b/sched/module/mod_insmod.c index 7ab65e734d..f7bf1b9a84 100644 --- a/sched/module/mod_insmod.c +++ b/sched/module/mod_insmod.c @@ -67,7 +67,7 @@ #endif #ifdef CONFIG_MODULE_DUMPBUFFER -# define mod_dumpbuffer(m,b,n) svdbgdumpbuffer(m,b,n) +# define mod_dumpbuffer(m,b,n) sinfodumpbuffer(m,b,n) #else # define mod_dumpbuffer(m,b,n) #endif @@ -191,7 +191,7 @@ int insmod(FAR const char *filename, FAR const char *modulename) int ret; DEBUGASSERT(filename != NULL && modulename != NULL); - svdbg("Loading file: %s\n", filename); + sinfo("Loading file: %s\n", filename); /* Get exclusive access to the module registry */ diff --git a/sched/module/mod_load.c b/sched/module/mod_load.c index cce6ac0cb2..de693e575e 100644 --- a/sched/module/mod_load.c +++ b/sched/module/mod_load.c @@ -152,7 +152,7 @@ static inline int mod_loadfile(FAR struct mod_loadinfo_s *loadinfo) /* Read each section into memory that is marked SHF_ALLOC + SHT_NOBITS */ - svdbg("Loaded sections:\n"); + sinfo("Loaded sections:\n"); text = (FAR uint8_t *)loadinfo->textalloc; data = (FAR uint8_t *)loadinfo->datastart; @@ -208,7 +208,7 @@ static inline int mod_loadfile(FAR struct mod_loadinfo_s *loadinfo) /* Update sh_addr to point to copy in memory */ - svdbg("%d. %08lx->%08lx\n", i, + sinfo("%d. %08lx->%08lx\n", i, (unsigned long)shdr->sh_addr, (unsigned long)*pptr); shdr->sh_addr = (uintptr_t)*pptr; @@ -242,7 +242,7 @@ int mod_load(FAR struct mod_loadinfo_s *loadinfo) { int ret; - svdbg("loadinfo: %p\n", loadinfo); + sinfo("loadinfo: %p\n", loadinfo); DEBUGASSERT(loadinfo && loadinfo->filfd >= 0); /* Load section headers into memory */ diff --git a/sched/module/mod_procfs.c b/sched/module/mod_procfs.c index 411cb1eccd..cb0ec00613 100644 --- a/sched/module/mod_procfs.c +++ b/sched/module/mod_procfs.c @@ -171,7 +171,7 @@ static int modprocfs_open(FAR struct file *filep, FAR const char *relpath, { FAR struct modprocfs_file_s *priv; - fvdbg("Open '%s'\n", relpath); + finfo("Open '%s'\n", relpath); /* PROCFS is read-only. Any attempt to open with any kind of write * access is not permitted. @@ -232,7 +232,7 @@ static ssize_t modprocfs_read(FAR struct file *filep, FAR char *buffer, FAR struct modprocfs_file_s *priv; int ret; - fvdbg("buffer=%p buflen=%lu\n", buffer, (unsigned long)buflen); + finfo("buffer=%p buflen=%lu\n", buffer, (unsigned long)buflen); /* Recover our private data from the struct file instance */ @@ -270,7 +270,7 @@ static int modprocfs_dup(FAR const struct file *oldp, FAR struct file *newp) FAR struct modprocfs_file_s *oldpriv; FAR struct modprocfs_file_s *newpriv; - fvdbg("Dup %p->%p\n", oldp, newp); + finfo("Dup %p->%p\n", oldp, newp); /* Recover our private data from the old struct file instance */ diff --git a/sched/module/mod_read.c b/sched/module/mod_read.c index 8cad4adb89..1440f5f5ea 100644 --- a/sched/module/mod_read.c +++ b/sched/module/mod_read.c @@ -114,7 +114,7 @@ int mod_read(FAR struct mod_loadinfo_s *loadinfo, FAR uint8_t *buffer, ssize_t nbytes; /* Number of bytes read */ off_t rpos; /* Position returned by lseek */ - svdbg("Read %ld bytes from offset %ld\n", (long)readsize, (long)offset); + sinfo("Read %ld bytes from offset %ld\n", (long)readsize, (long)offset); /* Loop until all of the requested data has been read. */ diff --git a/sched/module/mod_sections.c b/sched/module/mod_sections.c index dcdb4de991..dcfaaf9ae6 100644 --- a/sched/module/mod_sections.c +++ b/sched/module/mod_sections.c @@ -262,7 +262,7 @@ int mod_findsection(FAR struct mod_loadinfo_s *loadinfo, /* Check if the name of this section is 'sectname' */ - svdbg("%d. Comparing \"%s\" and .\"%s\"\n", + sinfo("%d. Comparing \"%s\" and .\"%s\"\n", i, loadinfo->iobuffer, sectname); if (strcmp((FAR const char *)loadinfo->iobuffer, sectname) == 0) diff --git a/sched/module/mod_symbols.c b/sched/module/mod_symbols.c index bc91a426e3..632b978866 100644 --- a/sched/module/mod_symbols.c +++ b/sched/module/mod_symbols.c @@ -281,7 +281,7 @@ int mod_symvalue(FAR struct mod_loadinfo_s *loadinfo, FAR Elf32_Sym *sym) { /* st_value already holds the correct value */ - svdbg("SHN_ABS: st_value=%08lx\n", (long)sym->st_value); + sinfo("SHN_ABS: st_value=%08lx\n", (long)sym->st_value); return OK; } @@ -321,7 +321,7 @@ int mod_symvalue(FAR struct mod_loadinfo_s *loadinfo, FAR Elf32_Sym *sym) /* Yes... add the exported symbol value to the ELF symbol table entry */ - svdbg("SHN_ABS: name=%s %08x+%08x=%08x\n", + sinfo("SHN_ABS: name=%s %08x+%08x=%08x\n", loadinfo->iobuffer, sym->st_value, symbol->sym_value, sym->st_value + symbol->sym_value); @@ -333,7 +333,7 @@ int mod_symvalue(FAR struct mod_loadinfo_s *loadinfo, FAR Elf32_Sym *sym) { secbase = loadinfo->shdr[sym->st_shndx].sh_addr; - svdbg("Other: %08x+%08x=%08x\n", + sinfo("Other: %08x+%08x=%08x\n", sym->st_value, secbase, sym->st_value + secbase); sym->st_value += secbase; diff --git a/sched/module/mod_verify.c b/sched/module/mod_verify.c index a46d96f73d..5469edaed0 100644 --- a/sched/module/mod_verify.c +++ b/sched/module/mod_verify.c @@ -87,7 +87,7 @@ int mod_verifyheader(FAR const Elf32_Ehdr *ehdr) if (memcmp(ehdr->e_ident, g_modmagic, EI_MAGIC_SIZE) != 0) { - svdbg("Not ELF magic {%02x, %02x, %02x, %02x}\n", + sinfo("Not ELF magic {%02x, %02x, %02x, %02x}\n", ehdr->e_ident[0], ehdr->e_ident[1], ehdr->e_ident[2], ehdr->e_ident[3]); return -ENOEXEC; } diff --git a/sched/paging/pg_miss.c b/sched/paging/pg_miss.c index 945678f99a..ebc10c2953 100644 --- a/sched/paging/pg_miss.c +++ b/sched/paging/pg_miss.c @@ -159,7 +159,7 @@ void pg_miss(void) { /* Reprioritize the page fill worker thread */ - pgllvdbg("New worker priority. %d->%d\n", + pgllinfo("New worker priority. %d->%d\n", wtcb->sched_priority, ftcb->sched_priority); sched_setpriority(wtcb, ftcb->sched_priority); } diff --git a/sched/paging/pg_worker.c b/sched/paging/pg_worker.c index 08c94fd17c..914ab604ed 100644 --- a/sched/paging/pg_worker.c +++ b/sched/paging/pg_worker.c @@ -155,7 +155,7 @@ static void pg_callback(FAR struct tcb_s *tcb, int result) { /* Verify that g_pftcb is non-NULL */ - pgllvdbg("g_pftcb: %p\n", g_pftcb); + pgllinfo("g_pftcb: %p\n", g_pftcb); if (g_pftcb) { FAR struct tcb_s *htcb = (FAR struct tcb_s *)g_waitingforfill.head; @@ -181,7 +181,7 @@ static void pg_callback(FAR struct tcb_s *tcb, int result) if (priority > wtcb->sched_priority) { - pgllvdbg("New worker priority. %d->%d\n", + pgllinfo("New worker priority. %d->%d\n", wtcb->sched_priority, priority); sched_setpriority(wtcb, priority); } @@ -246,7 +246,7 @@ static inline bool pg_dequeue(void) /* Remove the TCB from the head of the list (if any) */ g_pftcb = (FAR struct tcb_s *)dq_remfirst((dq_queue_t *)&g_waitingforfill); - pgllvdbg("g_pftcb: %p\n", g_pftcb); + pgllinfo("g_pftcb: %p\n", g_pftcb); if (g_pftcb != NULL) { /* Call the architecture-specific function up_checkmapping() to see if @@ -292,7 +292,7 @@ static inline bool pg_dequeue(void) /* Reduce the priority of the page fill worker thread */ - pgllvdbg("New worker priority. %d->%d\n", + pgllinfo("New worker priority. %d->%d\n", wtcb->sched_priority, priority); sched_setpriority(wtcb, priority); } @@ -365,7 +365,7 @@ static inline bool pg_startfill(void) * a page in-use, un-map it, and make it available. */ - pgllvdbg("Call up_allocpage(%p)\n", g_pftcb); + pgllinfo("Call up_allocpage(%p)\n", g_pftcb); result = up_allocpage(g_pftcb, &vpage); DEBUGASSERT(result == OK); @@ -382,7 +382,7 @@ static inline bool pg_startfill(void) * status of the fill will be provided by return value from up_fillpage(). */ - pgllvdbg("Call up_fillpage(%p)\n", g_pftcb); + pgllinfo("Call up_fillpage(%p)\n", g_pftcb); result = up_fillpage(g_pftcb, vpage); DEBUGASSERT(result == OK); #else @@ -395,7 +395,7 @@ static inline bool pg_startfill(void) * This callback will probably from interrupt level. */ - pgllvdbg("Call up_fillpage(%p)\n", g_pftcb); + pgllinfo("Call up_fillpage(%p)\n", g_pftcb); result = up_fillpage(g_pftcb, vpage, pg_callback); DEBUGASSERT(result == OK); @@ -454,7 +454,7 @@ static inline void pg_alldone(void) { FAR struct tcb_s *wtcb = this_task(); g_pftcb = NULL; - pgllvdbg("New worker priority. %d->%d\n", + pgllinfo("New worker priority. %d->%d\n", wtcb->sched_priority, CONFIG_PAGING_DEFPRIO); sched_setpriority(wtcb, CONFIG_PAGING_DEFPRIO); } @@ -588,7 +588,7 @@ int pg_worker(int argc, char *argv[]) * no fill was started). */ - pgllvdbg("Calling pg_startfill\n"); + pgllinfo("Calling pg_startfill\n"); if (!pg_startfill()) { /* No fill was started. This can mean only that all queued @@ -596,7 +596,7 @@ int pg_worker(int argc, char *argv[]) * nothing more to do. */ - pgllvdbg("Call pg_alldone()\n"); + pgllinfo("Call pg_alldone()\n"); pg_alldone(); } } @@ -626,7 +626,7 @@ int pg_worker(int argc, char *argv[]) * g_pftcb). */ - pgllvdbg("Calling pg_startfill\n"); + pgllinfo("Calling pg_startfill\n"); (void)pg_startfill(); } #else @@ -641,7 +641,7 @@ int pg_worker(int argc, char *argv[]) * (false means that no fill was perforemd). */ - pgllvdbg("Calling pg_startfill\n"); + pgllinfo("Calling pg_startfill\n"); if (!pg_startfill()) { /* Break out of the loop -- there is nothing more to do */ @@ -656,13 +656,13 @@ int pg_worker(int argc, char *argv[]) * returns true. */ - pgllvdbg("Restarting TCB: %p\n", g_pftcb); + pgllinfo("Restarting TCB: %p\n", g_pftcb); up_unblock_task(g_pftcb); } /* All queued fills have been processed */ - pgllvdbg("Call pg_alldone()\n"); + pgllinfo("Call pg_alldone()\n"); pg_alldone(); #endif } diff --git a/sched/pthread/pthread_completejoin.c b/sched/pthread/pthread_completejoin.c index 2d9f3530e5..24343cdb3b 100644 --- a/sched/pthread/pthread_completejoin.c +++ b/sched/pthread/pthread_completejoin.c @@ -68,7 +68,7 @@ static bool pthread_notifywaiters(FAR struct join_s *pjoin) int ntasks_waiting; int status; - svdbg("pjoin=0x%p\n", pjoin); + sinfo("pjoin=0x%p\n", pjoin); /* Are any tasks waiting for our exit value? */ @@ -205,7 +205,7 @@ int pthread_completejoin(pid_t pid, FAR void *exit_value) FAR struct task_group_s *group = task_getgroup(pid); FAR struct join_s *pjoin; - svdbg("pid=%d exit_value=%p group=%p\n", pid, exit_value, group); + sinfo("pid=%d exit_value=%p group=%p\n", pid, exit_value, group); DEBUGASSERT(group); /* First, find thread's structure in the private data set. */ diff --git a/sched/task/task_posixspawn.c b/sched/task/task_posixspawn.c index 17172086fc..fe13c80ac3 100644 --- a/sched/task/task_posixspawn.c +++ b/sched/task/task_posixspawn.c @@ -359,7 +359,7 @@ int posix_spawn(FAR pid_t *pid, FAR const char *path, DEBUGASSERT(path); - svdbg("pid=%p path=%s file_actions=%p attr=%p argv=%p\n", + sinfo("pid=%p path=%s file_actions=%p attr=%p argv=%p\n", pid, path, file_actions, attr, argv); /* If there are no file actions to be performed and there is no change to diff --git a/sched/task/task_spawn.c b/sched/task/task_spawn.c index ef686e03ad..9d4019bf26 100644 --- a/sched/task/task_spawn.c +++ b/sched/task/task_spawn.c @@ -350,7 +350,7 @@ int task_spawn(FAR pid_t *pid, FAR const char *name, main_t entry, #endif int ret; - svdbg("pid=%p name=%s entry=%p file_actions=%p attr=%p argv=%p\n", + sinfo("pid=%p name=%s entry=%p file_actions=%p attr=%p argv=%p\n", pid, name, entry, file_actions, attr, argv); /* If there are no file actions to be performed and there is no change to diff --git a/sched/task/task_spawnparms.c b/sched/task/task_spawnparms.c index df0946c2fb..e6d377c473 100644 --- a/sched/task/task_spawnparms.c +++ b/sched/task/task_spawnparms.c @@ -83,7 +83,7 @@ static inline int spawn_close(FAR struct spawn_close_file_action_s *action) { /* The return value from close() is ignored */ - svdbg("Closing fd=%d\n", action->fd); + sinfo("Closing fd=%d\n", action->fd); (void)close(action->fd); return OK; @@ -95,7 +95,7 @@ static inline int spawn_dup2(FAR struct spawn_dup2_file_action_s *action) /* Perform the dup */ - svdbg("Dup'ing %d->%d\n", action->fd1, action->fd2); + sinfo("Dup'ing %d->%d\n", action->fd1, action->fd2); ret = dup2(action->fd1, action->fd2); if (ret < 0) @@ -116,7 +116,7 @@ static inline int spawn_open(FAR struct spawn_open_file_action_s *action) /* Open the file */ - svdbg("Open'ing path=%s oflags=%04x mode=%04x\n", + sinfo("Open'ing path=%s oflags=%04x mode=%04x\n", action->path, action->oflags, action->mode); fd = open(action->path, action->oflags, action->mode); @@ -134,7 +134,7 @@ static inline int spawn_open(FAR struct spawn_open_file_action_s *action) { /* No.. dup2 to get the correct file number */ - svdbg("Dup'ing %d->%d\n", fd, action->fd); + sinfo("Dup'ing %d->%d\n", fd, action->fd); ret = dup2(fd, action->fd); if (ret < 0) @@ -143,7 +143,7 @@ static inline int spawn_open(FAR struct spawn_open_file_action_s *action) sdbg("ERROR: dup2 failed: %d\n", ret); } - svdbg("Closing fd=%d\n", fd); + sinfo("Closing fd=%d\n", fd); close(fd); } @@ -246,7 +246,7 @@ int spawn_execattrs(pid_t pid, FAR const posix_spawnattr_t *attr) if ((attr->flags & POSIX_SPAWN_SETSCHEDULER) == 0) { - svdbg("Setting priority=%d for pid=%d\n", + sinfo("Setting priority=%d for pid=%d\n", param.sched_priority, pid); (void)sched_setparam(pid, ¶m); @@ -269,7 +269,7 @@ int spawn_execattrs(pid_t pid, FAR const posix_spawnattr_t *attr) if ((attr->flags & POSIX_SPAWN_SETSCHEDULER) != 0) { - svdbg("Setting policy=%d priority=%d for pid=%d\n", + sinfo("Setting policy=%d priority=%d for pid=%d\n", attr->policy, param.sched_priority, pid); #ifdef CONFIG_SCHED_SPORADIC diff --git a/sched/task/task_vfork.c b/sched/task/task_vfork.c index b2fef61d36..d1978135c5 100644 --- a/sched/task/task_vfork.c +++ b/sched/task/task_vfork.c @@ -303,14 +303,14 @@ FAR struct task_tcb_s *task_vforksetup(start_t retaddr) /* Initialize the task control block. This calls up_initial_state() */ - svdbg("Child priority=%d start=%p\n", priority, retaddr); + sinfo("Child priority=%d start=%p\n", priority, retaddr); ret = task_schedsetup(child, priority, retaddr, parent->entry.main, ttype); if (ret < OK) { goto errout_with_tcb; } - svdbg("parent=%p, returning child=%p\n", parent, child); + sinfo("parent=%p, returning child=%p\n", parent, child); return child; errout_with_tcb: @@ -369,7 +369,7 @@ pid_t task_vforkstart(FAR struct task_tcb_s *child) int rc; int ret; - svdbg("Starting Child TCB=%p, parent=%p\n", child, this_task()); + sinfo("Starting Child TCB=%p, parent=%p\n", child, this_task()); DEBUGASSERT(child); /* Duplicate the original argument list in the forked child TCB */ diff --git a/sched/wqueue/kwork_hpthread.c b/sched/wqueue/kwork_hpthread.c index ae3f518be5..e09e825cee 100644 --- a/sched/wqueue/kwork_hpthread.c +++ b/sched/wqueue/kwork_hpthread.c @@ -152,7 +152,7 @@ int work_hpstart(void) /* Start the high-priority, kernel mode worker thread */ - svdbg("Starting high-priority kernel worker thread\n"); + sinfo("Starting high-priority kernel worker thread\n"); pid = kernel_thread(HPWORKNAME, CONFIG_SCHED_HPWORKPRIORITY, CONFIG_SCHED_HPWORKSTACKSIZE, diff --git a/sched/wqueue/kwork_lpthread.c b/sched/wqueue/kwork_lpthread.c index 2a47fbca48..1e5ffb47e9 100644 --- a/sched/wqueue/kwork_lpthread.c +++ b/sched/wqueue/kwork_lpthread.c @@ -197,7 +197,7 @@ int work_lpstart(void) /* Start the low-priority, kernel mode worker thread(s) */ - svdbg("Starting low-priority kernel worker thread(s)\n"); + sinfo("Starting low-priority kernel worker thread(s)\n"); for (wndx = 0; wndx < CONFIG_SCHED_LPNTHREADS; wndx++) {