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

arch/z80/: 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 18:55:24 -06:00
parent 191d875b05
commit 3c2050040c
23 changed files with 127 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/z80/src/common/up_assert.c
+6 -6
View File
@@ -161,17 +161,17 @@ void up_assert(void)
#ifdef CONFIG_HAVE_FILENAME #ifdef CONFIG_HAVE_FILENAME
#if CONFIG_TASK_NAME_SIZE > 0 #if CONFIG_TASK_NAME_SIZE > 0
llerr("Assertion failed at file:%s line: %d task: %s\n", llinfo("Assertion failed at file:%s line: %d task: %s\n",
filename, lineno, rtcb->name); filename, lineno, rtcb->name);
#else #else
llerr("Assertion failed at file:%s line: %d\n", llinfo("Assertion failed at file:%s line: %d\n",
filename, lineno); filename, lineno);
#endif #endif
#else #else
#if CONFIG_TASK_NAME_SIZE > 0 #if CONFIG_TASK_NAME_SIZE > 0
llerr("Assertion failed: task: %s\n", rtcb->name); llinfo("Assertion failed: task: %s\n", rtcb->name);
#else #else
llerr("Assertion failed\n"); llinfo("Assertion failed\n");
#endif #endif
#endif #endif
arch/z80/src/common/up_blocktask.c
+1 -1
View File
@@ -85,7 +85,7 @@ void up_block_task(FAR struct tcb_s *tcb, tstate_t task_state)
ASSERT((tcb->task_state >= FIRST_READY_TO_RUN_STATE) && ASSERT((tcb->task_state >= FIRST_READY_TO_RUN_STATE) &&
(tcb->task_state <= LAST_READY_TO_RUN_STATE)); (tcb->task_state <= LAST_READY_TO_RUN_STATE));
/* err("Blocking TCB=%p\n", tcb); */ /* info("Blocking TCB=%p\n", tcb); */
/* Remove the tcb task from the ready-to-run list. If we /* Remove the tcb task from the ready-to-run list. If we
* are blocking the task at the head of the task list (the * are blocking the task at the head of the task list (the
arch/z80/src/common/up_exit.c
+11 -11
View File
@@ -88,8 +88,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
int i; int i;
#endif #endif
llerr(" TCB=%p name=%s\n", tcb, tcb->argv[0]); llinfo(" TCB=%p name=%s\n", tcb, tcb->argv[0]);
llerr(" priority=%d state=%d\n", tcb->sched_priority, tcb->task_state); llinfo(" priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
#if CONFIG_NFILE_DESCRIPTORS > 0 #if CONFIG_NFILE_DESCRIPTORS > 0
filelist = tcb->group->tg_filelist; filelist = tcb->group->tg_filelist;
@@ -98,8 +98,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
struct inode *inode = filelist->fl_files[i].f_inode; struct inode *inode = filelist->fl_files[i].f_inode;
if (inode) if (inode)
{ {
llerr(" fd=%d refcount=%d\n", llinfo(" fd=%d refcount=%d\n",
i, inode->i_crefs); i, inode->i_crefs);
} }
} }
#endif #endif
@@ -112,11 +112,11 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
if (filep->fs_fd >= 0) if (filep->fs_fd >= 0)
{ {
#if CONFIG_STDIO_BUFFER_SIZE > 0 #if CONFIG_STDIO_BUFFER_SIZE > 0
llerr(" fd=%d nbytes=%d\n", llinfo(" fd=%d nbytes=%d\n",
filep->fs_fd, filep->fs_fd,
filep->fs_bufpos - filep->fs_bufstart); filep->fs_bufpos - filep->fs_bufstart);
#else #else
llerr(" fd=%d\n", filep->fs_fd); llinfo(" fd=%d\n", filep->fs_fd);
#endif #endif
} }
} }
@@ -149,10 +149,10 @@ void _exit(int status)
(void)up_irq_save(); (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) #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
llerr("Other tasks:\n"); llinfo("Other tasks:\n");
sched_foreach(_up_dumponexit, NULL); sched_foreach(_up_dumponexit, NULL);
#endif #endif
@@ -165,7 +165,7 @@ void _exit(int status)
*/ */
tcb = this_task(); tcb = this_task();
sllerr("New Active Task TCB=%p\n", tcb); sllinfo("New Active Task TCB=%p\n", tcb);
#ifdef CONFIG_ARCH_ADDRENV #ifdef CONFIG_ARCH_ADDRENV
/* Make sure that the address environment for the previously running /* Make sure that the address environment for the previously running
arch/z80/src/common/up_initialize.c
+2 -2
View File
@@ -75,13 +75,13 @@ static void up_calibratedelay(void)
{ {
int i; int i;
llerr("Beginning 100s delay\n"); llwarn("Beginning 100s delay\n");
for (i = 0; i < 100; i++) for (i = 0; i < 100; i++)
{ {
up_mdelay(1000); up_mdelay(1000);
} }
llerr("End 100s delay\n"); llwarn("End 100s delay\n");
} }
#else #else
# define up_calibratedelay() # define up_calibratedelay()
arch/z80/src/common/up_releasepending.c
+1 -1
View File
@@ -70,7 +70,7 @@ void up_release_pending(void)
{ {
FAR struct tcb_s *rtcb = this_task(); 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 */ /* Merge the g_pendingtasks list into the ready-to-run task list */
arch/z80/src/common/up_reprioritizertr.c
+1 -1
View File
@@ -98,7 +98,7 @@ void up_reprioritize_rtr(FAR struct tcb_s *tcb, uint8_t priority)
FAR struct tcb_s *rtcb = this_task(); FAR struct tcb_s *rtcb = this_task();
bool switch_needed; 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. /* Remove the tcb task from the ready-to-run list.
* sched_removereadytorun will return true if we just * sched_removereadytorun will return true if we just
arch/z80/src/common/up_stackdump.c
+5 -5
View File
@@ -87,13 +87,13 @@ static void up_stackdump(void)
uint16_t stack_base = (uint16_t)rtcb->adj_stack_ptr; uint16_t stack_base = (uint16_t)rtcb->adj_stack_ptr;
uint16_t stack_size = (uint16_t)rtcb->adj_stack_size; uint16_t stack_size = (uint16_t)rtcb->adj_stack_size;
llerr("stack_base: %04x\n", stack_base); llinfo("stack_base: %04x\n", stack_base);
llerr("stack_size: %04x\n", stack_size); llinfo("stack_size: %04x\n", stack_size);
llerr("sp: %04x\n", sp); llinfo("sp: %04x\n", sp);
if (sp >= stack_base || sp < stack_base - stack_size) if (sp >= stack_base || sp < stack_base - stack_size)
{ {
llerr("ERROR: Stack pointer is not within allocated stack\n"); llinfo("ERROR: Stack pointer is not within allocated stack\n");
return; return;
} }
else else
@@ -103,7 +103,7 @@ static void up_stackdump(void)
for (stack = sp & ~0x0f; stack < stack_base; stack += 8*sizeof(uint16_t)) for (stack = sp & ~0x0f; stack < stack_base; stack += 8*sizeof(uint16_t))
{ {
uint16_t *ptr = (uint16_t*)stack; uint16_t *ptr = (uint16_t*)stack;
llerr("%04x: %04x %04x %04x %04x %04x %04x %04x %04x\n", llinfo("%04x: %04x %04x %04x %04x %04x %04x %04x %04x\n",
stack, ptr[0], ptr[1], ptr[2], ptr[3], stack, ptr[0], ptr[1], ptr[2], ptr[3],
ptr[4], ptr[5], ptr[6], ptr[7]); ptr[4], ptr[5], ptr[6], ptr[7]);
} }
arch/z80/src/common/up_unblocktask.c
+1 -1
View File
@@ -81,7 +81,7 @@ void up_unblock_task(FAR struct tcb_s *tcb)
ASSERT((tcb->task_state >= FIRST_BLOCKED_STATE) && ASSERT((tcb->task_state >= FIRST_BLOCKED_STATE) &&
(tcb->task_state <= LAST_BLOCKED_STATE)); (tcb->task_state <= LAST_BLOCKED_STATE));
/* err("Unblocking TCB=%p\n", tcb); */ /* info("Unblocking TCB=%p\n", tcb); */
/* Remove the task from the blocked task list */ /* Remove the task from the blocked task list */
arch/z80/src/ez80/ez80_emac.c
+35 -35
View File
@@ -578,7 +578,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
phyval = ez80emac_miiread(priv, MII_PHYID1); phyval = ez80emac_miiread(priv, MII_PHYID1);
if (phyval != MII_PHYID1_AM79C874) if (phyval != MII_PHYID1_AM79C874)
{ {
nerr("Not an Am79c874 PHY: PHY1=%04x vs %04x\n", phyval, MII_PHYID1_AM79C874); nerr("ERROR: Not an Am79c874 PHY: PHY1=%04x vs %04x\n", phyval, MII_PHYID1_AM79C874);
ret = -ENODEV; ret = -ENODEV;
goto dumpregs; goto dumpregs;
} }
@@ -586,7 +586,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
phyval = ez80emac_miiread(priv, MII_PHYID2); phyval = ez80emac_miiread(priv, MII_PHYID2);
if (phyval != MII_PHYID2_AM79C874) if (phyval != MII_PHYID2_AM79C874)
{ {
nerr("Not an Am79c874 PHY: PHY2=%04x vs %04x\n", phyval, MII_PHYID2_AM79C874); nerr("ERROR: Not an Am79c874 PHY: PHY2=%04x vs %04x\n", phyval, MII_PHYID2_AM79C874);
ret = -ENODEV; ret = -ENODEV;
goto dumpregs; goto dumpregs;
} }
@@ -618,7 +618,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
#if CONFIG_EZ80_PHYCONFIG == EZ80_EMAC_AUTONEG #if CONFIG_EZ80_PHYCONFIG == EZ80_EMAC_AUTONEG
nerr("Configure autonegotiation\n"); ninfo("Configure autonegotiation\n");
if (bauto) if (bauto)
{ {
ez80emac_miiwrite(priv, MII_ADVERTISE, ez80emac_miiwrite(priv, MII_ADVERTISE,
@@ -628,12 +628,12 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
} }
else else
{ {
nerr("Am79c784 is not capable of autonegotiation\n"); nerr("ERROR: Am79c784 is not capable of autonegotiation\n");
} }
#elif CONFIG_EZ80_PHYCONFIG == EZ80_EMAC_100BFD #elif CONFIG_EZ80_PHYCONFIG == EZ80_EMAC_100BFD
nerr("100BASETX full duplex\n"); ninfo("100BASETX full duplex\n");
phyval |= MII_MCR_SPEED100 | MII_MCR_FULLDPLX; phyval |= MII_MCR_SPEED100 | MII_MCR_FULLDPLX;
ez80emac_miiwrite(priv, MII_ADVERTISE, ez80emac_miiwrite(priv, MII_ADVERTISE,
MII_ADVERTISE_100BASETXFULL|MII_ADVERTISE_100BASETXHALF| MII_ADVERTISE_100BASETXFULL|MII_ADVERTISE_100BASETXHALF|
@@ -642,7 +642,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
#elif CONFIG_EZ80_PHYCONFIG == EZ80_EMAC_100BHD #elif CONFIG_EZ80_PHYCONFIG == EZ80_EMAC_100BHD
nerr("100BASETX half duplex\n"); ninfo("100BASETX half duplex\n");
phyval |= MII_MCR_SPEED100; phyval |= MII_MCR_SPEED100;
ez80emac_miiwrite(priv, MII_ADVERTISE, ez80emac_miiwrite(priv, MII_ADVERTISE,
MII_ADVERTISE_100BASETXHALF|MII_ADVERTISE_10BASETXFULL| MII_ADVERTISE_100BASETXHALF|MII_ADVERTISE_10BASETXFULL|
@@ -650,14 +650,14 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
#elif CONFIG_EZ80_PHYCONFIG == EZ80_EMAC_10BFD #elif CONFIG_EZ80_PHYCONFIG == EZ80_EMAC_10BFD
nerr("10BASETX full duplex\n"); ninfo("10BASETX full duplex\n");
phyval |= MII_MCR_FULLDPLX; phyval |= MII_MCR_FULLDPLX;
ez80emac_miiwrite(priv, MII_ADVERTISE, ez80emac_miiwrite(priv, MII_ADVERTISE,
MII_ADVERTISE_10BASETXFULL|MII_ADVERTISE_10BASETXHALF|MII_ADVERTISE_CSMA); MII_ADVERTISE_10BASETXFULL|MII_ADVERTISE_10BASETXHALF|MII_ADVERTISE_CSMA);
#elif CONFIG_EZ80_PHYCONFIG == EZ80_EMAC_10BHD #elif CONFIG_EZ80_PHYCONFIG == EZ80_EMAC_10BHD
nerr("10BASETX half duplex\n"); ninfo("10BASETX half duplex\n");
ez80emac_miiwrite(priv, MII_ADVERTISE, ez80emac_miiwrite(priv, MII_ADVERTISE,
MII_ADVERTISE_10BASETXHALF|MII_ADVERTISE_CSMA); MII_ADVERTISE_10BASETXHALF|MII_ADVERTISE_CSMA);
@@ -681,7 +681,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
if ((phyval & MII_MSR_LINKSTATUS) == 0) if ((phyval & MII_MSR_LINKSTATUS) == 0)
{ {
nerr("Failed to establish link\n"); nerr("ERROR: Failed to establish link\n");
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
} }
else else
@@ -731,21 +731,21 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
if (!ez80emac_miipoll(priv, MII_MCR, MII_MCR_ANRESTART, false)) if (!ez80emac_miipoll(priv, MII_MCR, MII_MCR_ANRESTART, false))
{ {
nerr("Autonegotiation didn't start.\n"); nerr("ERROR: Autonegotiation didn't start.\n");
} }
/* Wait for auto-negotiation to complete */ /* Wait for auto-negotiation to complete */
if (!ez80emac_miipoll(priv, MII_MSR, MII_MSR_ANEGCOMPLETE, true)) if (!ez80emac_miipoll(priv, MII_MSR, MII_MSR_ANEGCOMPLETE, true))
{ {
nerr("Autonegotiation didn't complete.\n"); nerr("ERROR: Autonegotiation didn't complete.\n");
} }
/* Wait link */ /* Wait link */
if (!ez80emac_miipoll(priv, MII_MSR, MII_MSR_LINKSTATUS, true)) if (!ez80emac_miipoll(priv, MII_MSR, MII_MSR_LINKSTATUS, true))
{ {
nerr("Link is down!\n"); nwarn("WARNING: Link is down!\n");
priv->blinkok = false; priv->blinkok = false;
} }
else else
@@ -763,7 +763,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
if ((advertise & MII_ADVERTISE_100BASETXFULL) && (lpa & MII_LPA_100BASETXFULL)) if ((advertise & MII_ADVERTISE_100BASETXFULL) && (lpa & MII_LPA_100BASETXFULL))
{ {
nerr("100BASETX full duplex\n"); ninfo("100BASETX full duplex\n");
regval = inp(EZ80_EMAC_CFG1); regval = inp(EZ80_EMAC_CFG1);
regval |= EMAC_CFG1_FULLHD; /* Enable full duplex mode */ regval |= EMAC_CFG1_FULLHD; /* Enable full duplex mode */
outp(EZ80_EMAC_CFG1, regval); outp(EZ80_EMAC_CFG1, regval);
@@ -775,7 +775,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
else if ((advertise & MII_ADVERTISE_100BASETXHALF) && (lpa & MII_LPA_100BASETXHALF)) else if ((advertise & MII_ADVERTISE_100BASETXHALF) && (lpa & MII_LPA_100BASETXHALF))
{ {
nerr("100BASETX half duplex\n"); ninfo("100BASETX half duplex\n");
regval = inp(EZ80_EMAC_CFG1); regval = inp(EZ80_EMAC_CFG1);
regval &= ~EMAC_CFG1_FULLHD; /* Disable full duplex mode */ regval &= ~EMAC_CFG1_FULLHD; /* Disable full duplex mode */
outp(EZ80_EMAC_CFG1, regval); outp(EZ80_EMAC_CFG1, regval);
@@ -787,7 +787,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
else if ((advertise & MII_ADVERTISE_10BASETXFULL) && (lpa & MII_LPA_10BASETXFULL)) else if ((advertise & MII_ADVERTISE_10BASETXFULL) && (lpa & MII_LPA_10BASETXFULL))
{ {
nerr("10BASETX full duplex\n"); ninfo("10BASETX full duplex\n");
regval = inp(EZ80_EMAC_CFG1); regval = inp(EZ80_EMAC_CFG1);
regval |= EMAC_CFG1_FULLHD; /* Enable full duplex mode */ regval |= EMAC_CFG1_FULLHD; /* Enable full duplex mode */
outp(EZ80_EMAC_CFG1, regval); outp(EZ80_EMAC_CFG1, regval);
@@ -799,7 +799,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
else if ((advertise & MII_ADVERTISE_10BASETXHALF) && (lpa & MII_LPA_10BASETXHALF)) else if ((advertise & MII_ADVERTISE_10BASETXHALF) && (lpa & MII_LPA_10BASETXHALF))
{ {
nerr("10BASETX half duplex\n"); ninfo("10BASETX half duplex\n");
regval = inp(EZ80_EMAC_CFG1); regval = inp(EZ80_EMAC_CFG1);
regval &= ~EMAC_CFG1_FULLHD; /* Disable full duplex mode */ regval &= ~EMAC_CFG1_FULLHD; /* Disable full duplex mode */
outp(EZ80_EMAC_CFG1, regval); outp(EZ80_EMAC_CFG1, regval);
@@ -808,7 +808,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
} }
else else
{ {
nerr("No valid connection; force 10Mbps half-duplex.\n"); nwarn("WARNING: No valid connection; force 10Mbps half-duplex.\n");
regval = inp(EZ80_EMAC_CFG1); regval = inp(EZ80_EMAC_CFG1);
regval &= ~EMAC_CFG1_FULLHD; /* Disable full duplex mode */ regval &= ~EMAC_CFG1_FULLHD; /* Disable full duplex mode */
outp(EZ80_EMAC_CFG1, regval); outp(EZ80_EMAC_CFG1, regval);
@@ -1400,7 +1400,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv)
else else
#endif #endif
{ {
nerr("Unsupported packet type dropped (%02x)\n", ETHBUF->type); ninfo("Unsupported packet type dropped (%02x)\n", ETHBUF->type);
EMAC_STAT(priv, rx_dropped); EMAC_STAT(priv, rx_dropped);
} }
@@ -1458,9 +1458,9 @@ static int ez80emac_txinterrupt(int irq, FAR void *context)
{ {
if ((txhead->stat & EMAC_TXDESC_ABORT) != 0) if ((txhead->stat & EMAC_TXDESC_ABORT) != 0)
{ {
nerr("Descriptor %p aborted {%06x, %u, %04x} trp=%02x%02x\n", nwarn("WARNING: Descriptor %p aborted {%06x, %u, %04x} trp=%02x%02x\n",
txhead, txhead->np, txhead->pktsize, txhead->stat, txhead, txhead->np, txhead->pktsize, txhead->stat,
inp(EZ80_EMAC_TRP_H), inp(EZ80_EMAC_TRP_L)); inp(EZ80_EMAC_TRP_H), inp(EZ80_EMAC_TRP_L));
EMAC_STAT(priv, tx_errors); EMAC_STAT(priv, tx_errors);
EMAC_STAT(priv, tx_abterrors); EMAC_STAT(priv, tx_abterrors);
@@ -1604,7 +1604,7 @@ static int ez80emac_sysinterrupt(int irq, FAR void *context)
if ((istat & EMAC_ISTAT_TXFSMERR) != 0) if ((istat & EMAC_ISTAT_TXFSMERR) != 0)
{ {
nerr("Tx FSMERR txhead=%p {%06x, %u, %04x} trp=%02x%02x istat=%02x\n", nwarn("WARNING: Tx FSMERR txhead=%p {%06x, %u, %04x} trp=%02x%02x istat=%02x\n",
priv->txhead, priv->txhead->np, priv->txhead->pktsize, priv->txhead->stat, priv->txhead, priv->txhead->np, priv->txhead->pktsize, priv->txhead->stat,
inp(EZ80_EMAC_TRP_H), inp(EZ80_EMAC_TRP_L), istat); inp(EZ80_EMAC_TRP_H), inp(EZ80_EMAC_TRP_L), istat);
@@ -1620,7 +1620,7 @@ static int ez80emac_sysinterrupt(int irq, FAR void *context)
if ((istat & EMAC_ISTAT_RXOVR) != 0) if ((istat & EMAC_ISTAT_RXOVR) != 0)
{ {
nerr("Rx OVR rxnext=%p {%06x, %u, %04x} rrp=%02x%02x rwp=%02x%02x blkslft=%02x istat=%02x\n", nwarn("WARNING: Rx OVR rxnext=%p {%06x, %u, %04x} rrp=%02x%02x rwp=%02x%02x blkslft=%02x istat=%02x\n",
priv->rxnext, priv->rxnext->np, priv->rxnext->pktsize, priv->rxnext->stat, priv->rxnext, priv->rxnext->np, priv->rxnext->pktsize, priv->rxnext->stat,
inp(EZ80_EMAC_RRP_H), inp(EZ80_EMAC_RRP_L), inp(EZ80_EMAC_RRP_H), inp(EZ80_EMAC_RRP_L),
inp(EZ80_EMAC_RWP_H), inp(EZ80_EMAC_RWP_L), inp(EZ80_EMAC_RWP_H), inp(EZ80_EMAC_RWP_L),
@@ -1728,13 +1728,13 @@ static int ez80emac_ifup(FAR struct net_driver_s *dev)
uint8_t regval; uint8_t regval;
int ret; int ret;
nerr("Bringing up: MAC %02x:%02x:%02x:%02x:%02x:%02x\n", ninfo("Bringing up: MAC %02x:%02x:%02x:%02x:%02x:%02x\n",
dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1], dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1],
dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3], dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3],
dev->d_mac.ether_addr_octet[4], dev->d_mac.ether_addr_octet[5]); dev->d_mac.ether_addr_octet[4], dev->d_mac.ether_addr_octet[5]);
nerr(" IP %d.%d.%d.%d\n", ninfo(" IP %d.%d.%d.%d\n",
dev->d_ipaddr >> 24, (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24, (dev->d_ipaddr >> 16) & 0xff,
(dev->d_ipaddr >> 8) & 0xff, dev->d_ipaddr & 0xff); (dev->d_ipaddr >> 8) & 0xff, dev->d_ipaddr & 0xff);
/* Bring up the interface -- Must be down right now */ /* Bring up the interface -- Must be down right now */
@@ -2094,7 +2094,7 @@ static int ez80_emacinitialize(void)
ez80emac_miiwrite(priv, MII_MCR, MII_MCR_RESET); ez80emac_miiwrite(priv, MII_MCR, MII_MCR_RESET);
if (!ez80emac_miipoll(priv, MII_MCR, MII_MCR_RESET, false)) if (!ez80emac_miipoll(priv, MII_MCR, MII_MCR_RESET, false))
{ {
nerr("PHY reset error.\n"); nerr("ERROR: PHY reset error.\n");
} }
/* Initialize MAC */ /* Initialize MAC */
@@ -2149,7 +2149,7 @@ static int ez80_emacinitialize(void)
ez80emac_miiwrite(priv, MII_MCR, MII_MCR_RESET); ez80emac_miiwrite(priv, MII_MCR, MII_MCR_RESET);
if (!ez80emac_miipoll(priv, MII_MCR, MII_MCR_RESET, false)) if (!ez80emac_miipoll(priv, MII_MCR, MII_MCR_RESET, false))
{ {
nerr("PHY reset error.\n"); nerr("ERROR: PHY reset error.\n");
ret = -EIO; ret = -EIO;
goto errout; goto errout;
} }
@@ -2200,7 +2200,7 @@ int up_netinitialize(void)
ret = irq_attach(EZ80_EMACSYS_IRQ, ez80emac_sysinterrupt); ret = irq_attach(EZ80_EMACSYS_IRQ, ez80emac_sysinterrupt);
if (ret < 0) if (ret < 0)
{ {
nllerr("Unable to attach IRQ %d\n", EZ80_EMACSYS_IRQ); nllerr("ERROR: Unable to attach IRQ %d\n", EZ80_EMACSYS_IRQ);
ret = -EAGAIN; ret = -EAGAIN;
goto errout; goto errout;
} }
@@ -2208,7 +2208,7 @@ int up_netinitialize(void)
ret = irq_attach(EZ80_EMACRX_IRQ, ez80emac_rxinterrupt); ret = irq_attach(EZ80_EMACRX_IRQ, ez80emac_rxinterrupt);
if (ret < 0) if (ret < 0)
{ {
nllerr("Unable to attach IRQ %d\n", EZ80_EMACRX_IRQ); nllerr("ERROR: Unable to attach IRQ %d\n", EZ80_EMACRX_IRQ);
ret = -EAGAIN; ret = -EAGAIN;
goto errout; goto errout;
} }
@@ -2216,7 +2216,7 @@ int up_netinitialize(void)
ret = irq_attach(EZ80_EMACTX_IRQ, ez80emac_txinterrupt); ret = irq_attach(EZ80_EMACTX_IRQ, ez80emac_txinterrupt);
if (ret < 0) if (ret < 0)
{ {
nllerr("Unable to attach IRQ %d\n", EZ80_EMACTX_IRQ); nllerr("ERROR: Unable to attach IRQ %d\n", EZ80_EMACTX_IRQ);
ret = -EAGAIN; ret = -EAGAIN;
goto errout; goto errout;
} }
arch/z80/src/ez80/ez80_i2c.c
+9 -9
View File
@@ -404,7 +404,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit)
{ {
/* This error should never occur */ /* This error should never occur */
err("Bad START status: %02x\n", sr); err("ERROR: Bad START status: %02x\n", sr);
ez80_i2c_clriflg(); ez80_i2c_clriflg();
return -EIO; return -EIO;
} }
@@ -426,7 +426,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit)
sr = ez80_i2c_waitiflg(); sr = ez80_i2c_waitiflg();
if (sr != I2C_SR_MADDRWRACK && sr != I2C_SR_MADDRWR) if (sr != I2C_SR_MADDRWRACK && sr != I2C_SR_MADDRWR)
{ {
err("Bad ADDR8 status: %02x\n", sr); err("ERROR: Bad ADDR8 status: %02x\n", sr);
goto failure; goto failure;
} }
} }
@@ -445,7 +445,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit)
sr = ez80_i2c_waitiflg(); sr = ez80_i2c_waitiflg();
if (sr != I2C_SR_MADDRWRACK && sr != I2C_SR_MADDRWR) if (sr != I2C_SR_MADDRWRACK && sr != I2C_SR_MADDRWR)
{ {
err("Bad ADDR10H status: %02x\n", sr); err("ERROR: Bad ADDR10H status: %02x\n", sr);
goto failure; goto failure;
} }
@@ -459,7 +459,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit)
sr = ez80_i2c_waitiflg(); sr = ez80_i2c_waitiflg();
if (sr != I2C_SR_MADDR2WRACK && sr != I2C_SR_MADDR2WR) if (sr != I2C_SR_MADDR2WRACK && sr != I2C_SR_MADDR2WR)
{ {
err("Bad ADDR10L status: %02x\n", sr); err("ERROR: Bad ADDR10L status: %02x\n", sr);
goto failure; goto failure;
} }
} }
@@ -479,12 +479,12 @@ failure:
* Call address received, ACK transmitted */ * Call address received, ACK transmitted */
case I2C_SR_ARBLOST4: /* Arbitration lost in address as master, slave case I2C_SR_ARBLOST4: /* Arbitration lost in address as master, slave
* address and Read bit received, ACK transmitted */ * address and Read bit received, ACK transmitted */
err("Arbitration lost: %02x\n", sr); err("ERROR: Arbitration lost: %02x\n", sr);
ez80_i2c_clriflg(); ez80_i2c_clriflg();
return -EAGAIN; return -EAGAIN;
default: default:
err("Unexpected status: %02x\n", sr); err("ERROR: Unexpected status: %02x\n", sr);
ez80_i2c_clriflg(); ez80_i2c_clriflg();
return -EIO; return -EIO;
} }
@@ -634,7 +634,7 @@ static int ez80_i2c_read_transfer(FAR struct ez80_i2cdev_s *priv,
* this will cause the whole transfer to start over * this will cause the whole transfer to start over
*/ */
err("Arbitration lost: %02x\n", regval); err("ERROR: Arbitration lost: %02x\n", regval);
ez80_i2c_clriflg(); ez80_i2c_clriflg();
break; break;
} }
@@ -643,7 +643,7 @@ static int ez80_i2c_read_transfer(FAR struct ez80_i2cdev_s *priv,
else else
{ {
err("Unexpected status: %02x\n", regval); err("ERROR: Unexpected status: %02x\n", regval);
ez80_i2c_clriflg(); ez80_i2c_clriflg();
return-EIO; return-EIO;
} }
@@ -731,7 +731,7 @@ static int ez80_i2c_write_transfer(FAR struct ez80_i2cdev_s *priv,
sr = ez80_i2c_waitiflg(); sr = ez80_i2c_waitiflg();
if (sr != I2C_SR_MDATAWRACK && sr != I2C_SR_MDATAWR) if (sr != I2C_SR_MDATAWRACK && sr != I2C_SR_MDATAWR)
{ {
err("Bad DATA status: %02x\n", sr); err("ERROR: Bad DATA status: %02x\n", sr);
ez80_i2c_clriflg(); ez80_i2c_clriflg();
if (sr == I2C_SR_ARBLOST1) if (sr == I2C_SR_ARBLOST1)
{ {
arch/z80/src/ez80/ez80_registerdump.c
+16 -16
View File
@@ -81,23 +81,23 @@ static void ez80_registerdump(void)
if (g_current_regs) if (g_current_regs)
{ {
#ifdef CONFIG_EZ80_Z80MODE #ifdef CONFIG_EZ80_Z80MODE
llerr("AF: %04x I: %04x\n", llinfo("AF: %04x I: %04x\n",
g_current_regs[XCPT_AF], g_current_regs[XCPT_I]); g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
llerr("BC: %04x DE: %04x HL: %04x\n", llinfo("BC: %04x DE: %04x HL: %04x\n",
g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]); g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
llerr("IX: %04x IY: %04x\n", llinfo("IX: %04x IY: %04x\n",
g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]); g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
llerr("SP: %04x PC: %04x\n" llinfo("SP: %04x PC: %04x\n"
g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]); g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
#else #else
llerr("AF: %06x I: %06x\n", llinfo("AF: %06x I: %06x\n",
g_current_regs[XCPT_AF], g_current_regs[XCPT_I]); g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
llerr("BC: %06x DE: %06x HL: %06x\n", llinfo("BC: %06x DE: %06x HL: %06x\n",
g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]); g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
llerr("IX: %06x IY: %06x\n", llinfo("IX: %06x IY: %06x\n",
g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]); g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
llerr("SP: %06x PC: %06x\n" llinfo("SP: %06x PC: %06x\n"
g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]); g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
#endif #endif
} }
} }
arch/z80/src/ez80/ez80_schedulesigaction.c
+1 -1
View File
@@ -125,7 +125,7 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver)
{ {
irqstate_t flags; irqstate_t flags;
serr("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver); sinfo("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
/* Make sure that interrupts are disabled */ /* Make sure that interrupts are disabled */
arch/z80/src/ez80/ez80_sigdeliver.c
+3 -3
View File
@@ -95,8 +95,8 @@ void up_sigdeliver(void)
board_autoled_on(LED_SIGNAL); 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); rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
ASSERT(rtcb->xcp.sigdeliver != NULL); ASSERT(rtcb->xcp.sigdeliver != NULL);
/* Save the real return state on the stack. */ /* Save the real return state on the stack. */
@@ -127,7 +127,7 @@ void up_sigdeliver(void)
* errno that is needed by the user logic (it is probably EINTR). * errno that is needed by the user logic (it is probably EINTR).
*/ */
serr("Resuming\n"); sinfo("Resuming\n");
(void)up_irq_save(); (void)up_irq_save();
rtcb->pterrno = saved_errno; rtcb->pterrno = saved_errno;
arch/z80/src/z180/z180_registerdump.c
+10 -18
View File
@@ -60,14 +60,6 @@
#ifdef CONFIG_ARCH_STACKDUMP #ifdef CONFIG_ARCH_STACKDUMP
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/
@@ -80,16 +72,16 @@ static void z180_registerdump(void)
{ {
if (g_current_regs) if (g_current_regs)
{ {
llerr("AF: %04x I: %04x\n", llinfo("AF: %04x I: %04x\n",
g_current_regs[XCPT_AF], g_current_regs[XCPT_I]); g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
llerr("BC: %04x DE: %04x HL: %04x\n", llinfo("BC: %04x DE: %04x HL: %04x\n",
g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]); g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
llerr("IX: %04x IY: %04x\n", llinfo("IX: %04x IY: %04x\n",
g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]); g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
llerr("SP: %04x PC: %04x\n" llinfo("SP: %04x PC: %04x\n"
g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]); g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
llerr("CBAR: %02x BBR: %02x CBR: %02x\n" llinfo("CBAR: %02x BBR: %02x CBR: %02x\n"
inp(Z180_MMU_CBAR), inp(Z180_MMU_BBR), inp(Z180_MMU_CBR)); inp(Z180_MMU_CBAR), inp(Z180_MMU_BBR), inp(Z180_MMU_CBR));
} }
} }
arch/z80/src/z180/z180_schedulesigaction.c
+1 -1
View File
@@ -125,7 +125,7 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver)
{ {
irqstate_t flags; irqstate_t flags;
err("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver); info("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
/* Make sure that interrupts are disabled */ /* Make sure that interrupts are disabled */
arch/z80/src/z180/z180_sigdeliver.c
+3 -3
View File
@@ -94,8 +94,8 @@ void up_sigdeliver(void)
board_autoled_on(LED_SIGNAL); 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); rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
ASSERT(rtcb->xcp.sigdeliver != NULL); ASSERT(rtcb->xcp.sigdeliver != NULL);
/* Save the real return state on the stack. */ /* Save the real return state on the stack. */
@@ -126,7 +126,7 @@ void up_sigdeliver(void)
* errno that is needed by the user logic (it is probably EINTR). * errno that is needed by the user logic (it is probably EINTR).
*/ */
serr("Resuming\n"); sinfo("Resuming\n");
(void)up_irq_save(); (void)up_irq_save();
rtcb->pterrno = saved_errno; rtcb->pterrno = saved_errno;
arch/z80/src/z8/z8_i2c.c
+1 -1
View File
@@ -236,7 +236,7 @@ static uint16_t z8_i2c_getbrg(uint32_t frequency)
if (frequency > 400*1000) if (frequency > 400*1000)
{ {
err("Invalid inputs\n"); err("ERROR: Invalid inputs\n");
frequency = 400*1000; frequency = 400*1000;
} }
arch/z80/src/z8/z8_registerdump.c
+4 -12
View File
@@ -63,30 +63,22 @@
#ifdef CONFIG_ARCH_STACKDUMP #ifdef CONFIG_ARCH_STACKDUMP
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/
static inline void z8_dumpregs(FAR chipret_t *regs) static inline void z8_dumpregs(FAR chipret_t *regs)
{ {
llerr("REGS: %04x %04x %04x %04x %04x %04x %04x %04x\n", llinfo("REGS: %04x %04x %04x %04x %04x %04x %04x %04x\n",
regs[XCPT_RR0], regs[XCPT_RR2], regs[XCPT_RR4], regs[XCPT_RR6], regs[XCPT_RR0], regs[XCPT_RR2], regs[XCPT_RR4], regs[XCPT_RR6],
regs[XCPT_RR8], regs[XCPT_RR10], regs[XCPT_RR12], regs[XCPT_RR14]); regs[XCPT_RR8], regs[XCPT_RR10], regs[XCPT_RR12], regs[XCPT_RR14]);
} }
static inline void z8_dumpstate(chipreg_t sp, chipreg_t pc, uint8_t irqctl, static inline void z8_dumpstate(chipreg_t sp, chipreg_t pc, uint8_t irqctl,
chipreg_t rpflags) chipreg_t rpflags)
{ {
llerr("SP: %04x PC: %04x IRQCTL: %02x RP: %02x FLAGS: %02x\n", llinfo("SP: %04x PC: %04x IRQCTL: %02x RP: %02x FLAGS: %02x\n",
sp, pc, irqctl & 0xff, rpflags >> 8, rpflags & 0xff); sp, pc, irqctl & 0xff, rpflags >> 8, rpflags & 0xff);
} }
/**************************************************************************** /****************************************************************************
arch/z80/src/z8/z8_schedulesigaction.c
+1 -1
View File
@@ -125,7 +125,7 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver)
{ {
irqstate_t flags; irqstate_t flags;
err("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver); info("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
/* Make sure that interrupts are disabled */ /* Make sure that interrupts are disabled */
arch/z80/src/z8/z8_sigdeliver.c
+3 -3
View File
@@ -109,8 +109,8 @@ void up_sigdeliver(void)
board_autoled_on(LED_SIGNAL); 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); rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
ASSERT(rtcb->xcp.sigdeliver != NULL); ASSERT(rtcb->xcp.sigdeliver != NULL);
/* Save the real return state on the stack. */ /* Save the real return state on the stack. */
@@ -141,7 +141,7 @@ void up_sigdeliver(void)
* errno that is needed by the user logic (it is probably EINTR). * errno that is needed by the user logic (it is probably EINTR).
*/ */
serr("Resuming\n"); sinfo("Resuming\n");
(void)up_irq_save(); (void)up_irq_save();
rtcb->pterrno = saved_errno; rtcb->pterrno = saved_errno;
arch/z80/src/z80/z80_registerdump.c
+8 -8
View File
@@ -80,14 +80,14 @@ static void z80_registerdump(void)
{ {
if (g_current_regs) if (g_current_regs)
{ {
llerr("AF: %04x I: %04x\n", llinfo("AF: %04x I: %04x\n",
g_current_regs[XCPT_AF], g_current_regs[XCPT_I]); g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
llerr("BC: %04x DE: %04x HL: %04x\n", llinfo("BC: %04x DE: %04x HL: %04x\n",
g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]); g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
llerr("IX: %04x IY: %04x\n", llinfo("IX: %04x IY: %04x\n",
g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]); g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
llerr("SP: %04x PC: %04x\n" llinfo("SP: %04x PC: %04x\n"
g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]); g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
} }
} }
arch/z80/src/z80/z80_schedulesigaction.c
+1 -1
View File
@@ -125,7 +125,7 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver)
{ {
irqstate_t flags; irqstate_t flags;
err("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver); info("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
/* Make sure that interrupts are disabled */ /* Make sure that interrupts are disabled */
arch/z80/src/z80/z80_sigdeliver.c
+3 -3
View File
@@ -94,8 +94,8 @@ void up_sigdeliver(void)
board_autoled_on(LED_SIGNAL); 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); rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
ASSERT(rtcb->xcp.sigdeliver != NULL); ASSERT(rtcb->xcp.sigdeliver != NULL);
/* Save the real return state on the stack. */ /* Save the real return state on the stack. */
@@ -126,7 +126,7 @@ void up_sigdeliver(void)
* errno that is needed by the user logic (it is probably EINTR). * errno that is needed by the user logic (it is probably EINTR).
*/ */
serr("Resuming\n"); sinfo("Resuming\n");
(void)up_irq_save(); (void)up_irq_save();
rtcb->pterrno = saved_errno; rtcb->pterrno = saved_errno;