Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 14:53:47 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

arch/z16/: Change some *err() message to *info() messages if what was a *dbg() message does not indicate and error condition.

Browse Source
This commit is contained in:
Gregory Nutt
2016-06-13 19:08:23 -06:00
parent 3c2050040c
commit 3659bf58c0
11 changed files with 42 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/z16/src/common/up_blocktask.c
+1 -1
View File
@@ -83,7 +83,7 @@ void up_block_task(FAR struct tcb_s *tcb, tstate_t task_state)
ASSERT((tcb->task_state >= FIRST_READY_TO_RUN_STATE) &&
(tcb->task_state <= LAST_READY_TO_RUN_STATE));
/* err("Blocking TCB=%p\n", tcb); */
/* sinfo("Blocking TCB=%p\n", tcb); */
/* Remove the tcb task from the ready-to-run list. If we
* are blocking the task at the head of the task list (the
arch/z16/src/common/up_exit.c
+8 -8
View File
@@ -78,8 +78,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
int i;
#endif
llerr(" TCB=%p name=%s\n", tcb, tcb->argv[0]);
llerr(" priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
sllinfo(" TCB=%p name=%s\n", tcb, tcb->argv[0]);
sllinfo(" priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
#if CONFIG_NFILE_DESCRIPTORS > 0
filelist = tcb->group->tg_filelist;
@@ -88,7 +88,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
struct inode *inode = filelist->fl_files[i].f_inode;
if (inode)
{
llerr(" fd=%d refcount=%d\n",
sllinfo(" fd=%d refcount=%d\n",
i, inode->i_crefs);
}
}
@@ -102,11 +102,11 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
if (filep->fs_fd >= 0)
{
#if CONFIG_STDIO_BUFFER_SIZE > 0
llerr(" fd=%d nbytes=%d\n",
sllinfo(" fd=%d nbytes=%d\n",
filep->fs_fd,
filep->fs_bufpos - filep->fs_bufstart);
#else
llerr(" fd=%d\n", filep->fs_fd);
sllinfo(" fd=%d\n", filep->fs_fd);
#endif
}
}
@@ -139,10 +139,10 @@ void _exit(int status)
(void)up_irq_save();
sllerr("TCB=%p exiting\n", tcb);
sllinfo("TCB=%p exiting\n", tcb);
#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
llerr("Other tasks:\n");
sllinfo("Other tasks:\n");
sched_foreach(_up_dumponexit, NULL);
#endif
@@ -155,7 +155,7 @@ void _exit(int status)
*/
tcb = this_task();
sllerr("New Active Task TCB=%p\n", tcb);
sllinfo("New Active Task TCB=%p\n", tcb);
/* Then switch contexts */
arch/z16/src/common/up_initialize.c
+2 -2
View File
@@ -87,13 +87,13 @@ static void up_calibratedelay(void)
{
int i;
llerr("Beginning 100s delay\n");
llwarn("Beginning 100s delay\n");
for (i = 0; i < 100; i++)
{
up_mdelay(1000);
}
llerr("End 100s delay\n");
llwarn("End 100s delay\n");
}
#else
# define up_calibratedelay()
arch/z16/src/common/up_registerdump.c
+6 -11
View File
@@ -64,14 +64,6 @@
#ifdef CONFIG_ARCH_STACKDUMP
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
@@ -82,16 +74,19 @@
static void up_registerdump(void)
{
#ifdef CONFIG_DEBUG_INFO
FAR uint32_t *regs32 = (FAR uint32_t*)g_current_regs;
llerr("R0 :%08x R1 :%08x R2 :%08x R3 :%08x "
llinfo("R0 :%08x R1 :%08x R2 :%08x R3 :%08x "
"R4 :%08x R5 :%08x R6 :%08x R7 :%08x\n"
regs32[REG_R0/2], regs32[REG_R1/2], regs32[REG_R2/2], regs32[REG_R3/2],
regs32[REG_R4/2], regs32[REG_R5/2], regs32[REG_R6/2], regs32[REG_R7/2]);
llerr("R8 :%08x R9 :%08x R10:%08x R11:%08x R12:%08x R13:%08x\n"
llinfo("R8 :%08x R9 :%08x R10:%08x R11:%08x R12:%08x R13:%08x\n"
regs32[REG_R8/2], regs32[REG_R9/2], regs32[REG_R10/2], regs3[REG_R11/2],
regs32[REG_R12/2], regs32[REG_R13/2]);
llerr("FP :%08x SP :%08x FLG:%04x\n"
llinfo("FP :%08x SP :%08x FLG:%04x\n"
regs32[REG_R14/2], regs32[REG_R15/2], g_current_regs[REG_FLAGS]);
#endif
}
#endif /* CONFIG_ARCH_STACKDUMP */
arch/z16/src/common/up_releasepending.c
+1 -1
View File
@@ -68,7 +68,7 @@ void up_release_pending(void)
{
FAR struct tcb_s *rtcb = this_task();
sllerr("From TCB=%p\n", rtcb);
sllinfo("From TCB=%p\n", rtcb);
/* Merge the g_pendingtasks list into the ready-to-run task list */
arch/z16/src/common/up_reprioritizertr.c
+1 -1
View File
@@ -96,7 +96,7 @@ void up_reprioritize_rtr(FAR struct tcb_s *tcb, uint8_t priority)
FAR struct tcb_s *rtcb = this_task();
bool switch_needed;
sllerr("TCB=%p PRI=%d\n", tcb, priority);
sllinfo("TCB=%p PRI=%d\n", tcb, priority);
/* Remove the tcb task from the ready-to-run list.
* sched_removereadytorun will return true if we just
arch/z16/src/common/up_schedulesigaction.c
+2 -2
View File
@@ -92,7 +92,7 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver)
{
irqstate_t flags;
err("tcb=0x%p sigdeliver=0x%06x\n", tcb, (uint32_t)sigdeliver);
sinfo("tcb=0x%p sigdeliver=0x%06x\n", tcb, (uint32_t)sigdeliver);
/* Make sure that interrupts are disabled */
@@ -106,7 +106,7 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver)
* being delivered to the currently executing task.
*/
err("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
sinfo("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
if (tcb == this_task())
{
arch/z16/src/common/up_sigdeliver.c
+2 -2
View File
@@ -84,7 +84,7 @@ void up_sigdeliver(void)
board_autoled_on(LED_SIGNAL);
serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
sinfo("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
ASSERT(rtcb->xcp.sigdeliver != NULL);
@@ -119,7 +119,7 @@ void up_sigdeliver(void)
* errno that is needed by the user logic (it is probably EINTR).
*/
serr("Resuming\n");
sinfo("Resuming\n");
(void)up_irq_save();
rtcb->pterrno = saved_errno;
arch/z16/src/common/up_stackdump.c
+4 -4
View File
@@ -78,9 +78,9 @@ static void up_stackdump(void)
chipreg_t stack_base = (chipreg_t)rtcb->adj_stack_ptr;
chipreg_t stack_size = (chipreg_t)rtcb->adj_stack_size;
llerr("stack_base: %08x\n", stack_base);
llerr("stack_size: %08x\n", stack_size);
llerr("sp: %08x\n", sp);
llinfo("stack_base: %08x\n", stack_base);
llinfo("stack_size: %08x\n", stack_size);
llinfo("sp: %08x\n", sp);
if (sp >= stack_base || sp < stack_base - stack_size)
{
@@ -94,7 +94,7 @@ static void up_stackdump(void)
for (stack = sp & ~0x0f; stack < stack_base; stack += 8*sizeof(chipreg_t))
{
chipreg_t *ptr = (chipreg_t*)stack;
llerr("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
llinfo("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
stack, ptr[0], ptr[1], ptr[2], ptr[3],
ptr[4], ptr[5], ptr[6], ptr[7]);
}
arch/z16/src/common/up_unblocktask.c
+1 -1
View File
@@ -79,7 +79,7 @@ void up_unblock_task(FAR struct tcb_s *tcb)
ASSERT((tcb->task_state >= FIRST_BLOCKED_STATE) &&
(tcb->task_state <= LAST_BLOCKED_STATE));
/* err("Unblocking TCB=%p\n", tcb); */
/* sinfo("Unblocking TCB=%p\n", tcb); */
/* Remove the task from the blocked task list */
arch/z16/src/z16f/z16f_espi.c
+5 -5
View File
@@ -221,7 +221,7 @@ static bool spi_checkreg(FAR struct z16f_spi_s *priv, bool wr, uint16_t regval,
{
/* Yes... show how many times we did it */
llerr("...[Repeats %d times]...\n", priv->ntimes);
syslog(LOG_INFO, "...[Repeats %d times]...\n", priv->ntimes);
}
/* Save information about the new access */
@@ -253,7 +253,7 @@ static uint8_t spi_getreg8(FAR struct z16f_spi_s *priv, uintptr_t regaddr)
if (spi_checkreg(priv, false, (uint16_t)regval, regaddr))
{
llerr("%06x->%02x\n", regaddr, regval);
syslog(LOG_INFO, "%06x->%02x\n", regaddr, regval);
}
return regval;
@@ -274,7 +274,7 @@ static void spi_putreg8(FAR struct z16f_spi_s *priv, uint8_t regval,
{
if (spi_checkreg(priv, true, (uint16_t)regval, regaddr))
{
llerr("%06x<-%02x\n", regaddr, regval);
syslog(LOG_INFO, "%06x<-%02x\n", regaddr, regval);
}
putreg8(regval, regaddr);
@@ -295,7 +295,7 @@ static void spi_putreg16(FAR struct z16f_spi_s *priv, uint16_t regval,
{
if (spi_checkreg(priv, true, regval, regaddr))
{
llerr("%06x<-%04x\n", regaddr, regval);
syslog(LOG_INFO, "%06x<-%04x\n", regaddr, regval);
}
putreg8(regval, regaddr);
@@ -466,7 +466,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
priv->frequency = frequency;
priv->actual = actual;
spierr("Frequency %d->%d\n", frequency, actual);
spiinfo("Frequency %d->%d\n", frequency, actual);
return actual;
}