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

Add _ to the beginning of all debug macros to avoid name collisions

Browse Source
This commit is contained in:
Gregory Nutt
2016-06-16 12:33:32 -06:00
parent fdaf3d7268
commit 0c8c7fecf0
252 changed files with 1348 additions and 1374 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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) &&
(tcb->task_state <= LAST_READY_TO_RUN_STATE));
/* info("Blocking TCB=%p\n", tcb); */
/* _info("Blocking TCB=%p\n", tcb); */
/* Remove the tcb task from the ready-to-run list. If we
* are blocking the task at the head of the task list (the
arch/z80/src/common/up_exit.c
+6 -6
View File
@@ -88,8 +88,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
int i;
#endif
llinfo(" TCB=%p name=%s\n", tcb, tcb->argv[0]);
llinfo(" priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
_llinfo(" TCB=%p name=%s\n", tcb, tcb->argv[0]);
_llinfo(" priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
#if CONFIG_NFILE_DESCRIPTORS > 0
filelist = tcb->group->tg_filelist;
@@ -98,7 +98,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
struct inode *inode = filelist->fl_files[i].f_inode;
if (inode)
{
llinfo(" fd=%d refcount=%d\n",
_llinfo(" fd=%d refcount=%d\n",
i, inode->i_crefs);
}
}
@@ -112,11 +112,11 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
if (filep->fs_fd >= 0)
{
#if CONFIG_STDIO_BUFFER_SIZE > 0
llinfo(" fd=%d nbytes=%d\n",
_llinfo(" fd=%d nbytes=%d\n",
filep->fs_fd,
filep->fs_bufpos - filep->fs_bufstart);
#else
llinfo(" fd=%d\n", filep->fs_fd);
_llinfo(" fd=%d\n", filep->fs_fd);
#endif
}
}
@@ -152,7 +152,7 @@ void _exit(int status)
sllinfo("TCB=%p exiting\n", tcb);
#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
llinfo("Other tasks:\n");
_llinfo("Other tasks:\n");
sched_foreach(_up_dumponexit, NULL);
#endif
arch/z80/src/common/up_initialize.c
+2 -2
View File
@@ -75,13 +75,13 @@ static void up_calibratedelay(void)
{
int i;
llwarn("Beginning 100s delay\n");
_llwarn("Beginning 100s delay\n");
for (i = 0; i < 100; i++)
{
up_mdelay(1000);
}
llwarn("End 100s delay\n");
_llwarn("End 100s delay\n");
}
#else
# define up_calibratedelay()
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) &&
(tcb->task_state <= LAST_BLOCKED_STATE));
/* info("Unblocking TCB=%p\n", tcb); */
/* _info("Unblocking TCB=%p\n", tcb); */
/* Remove the task from the blocked task list */
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 */
err("ERROR: Bad START status: %02x\n", sr);
_err("ERROR: Bad START status: %02x\n", sr);
ez80_i2c_clriflg();
return -EIO;
}
@@ -426,7 +426,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit)
sr = ez80_i2c_waitiflg();
if (sr != I2C_SR_MADDRWRACK && sr != I2C_SR_MADDRWR)
{
err("ERROR: Bad ADDR8 status: %02x\n", sr);
_err("ERROR: Bad ADDR8 status: %02x\n", sr);
goto failure;
}
}
@@ -445,7 +445,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit)
sr = ez80_i2c_waitiflg();
if (sr != I2C_SR_MADDRWRACK && sr != I2C_SR_MADDRWR)
{
err("ERROR: Bad ADDR10H status: %02x\n", sr);
_err("ERROR: Bad ADDR10H status: %02x\n", sr);
goto failure;
}
@@ -459,7 +459,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit)
sr = ez80_i2c_waitiflg();
if (sr != I2C_SR_MADDR2WRACK && sr != I2C_SR_MADDR2WR)
{
err("ERROR: Bad ADDR10L status: %02x\n", sr);
_err("ERROR: Bad ADDR10L status: %02x\n", sr);
goto failure;
}
}
@@ -479,12 +479,12 @@ failure:
* Call address received, ACK transmitted */
case I2C_SR_ARBLOST4: /* Arbitration lost in address as master, slave
* address and Read bit received, ACK transmitted */
err("ERROR: Arbitration lost: %02x\n", sr);
_err("ERROR: Arbitration lost: %02x\n", sr);
ez80_i2c_clriflg();
return -EAGAIN;
default:
err("ERROR: Unexpected status: %02x\n", sr);
_err("ERROR: Unexpected status: %02x\n", sr);
ez80_i2c_clriflg();
return -EIO;
}
@@ -634,7 +634,7 @@ static int ez80_i2c_read_transfer(FAR struct ez80_i2cdev_s *priv,
* this will cause the whole transfer to start over
*/
err("ERROR: Arbitration lost: %02x\n", regval);
_err("ERROR: Arbitration lost: %02x\n", regval);
ez80_i2c_clriflg();
break;
}
@@ -643,7 +643,7 @@ static int ez80_i2c_read_transfer(FAR struct ez80_i2cdev_s *priv,
else
{
err("ERROR: Unexpected status: %02x\n", regval);
_err("ERROR: Unexpected status: %02x\n", regval);
ez80_i2c_clriflg();
return-EIO;
}
@@ -731,7 +731,7 @@ static int ez80_i2c_write_transfer(FAR struct ez80_i2cdev_s *priv,
sr = ez80_i2c_waitiflg();
if (sr != I2C_SR_MDATAWRACK && sr != I2C_SR_MDATAWR)
{
err("ERROR: Bad DATA status: %02x\n", sr);
_err("ERROR: Bad DATA status: %02x\n", sr);
ez80_i2c_clriflg();
if (sr == I2C_SR_ARBLOST1)
{
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;
info("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
_info("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
/* Make sure that interrupts are disabled */
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)
{
err("ERROR: Invalid inputs\n");
_err("ERROR: Invalid inputs\n");
frequency = 400*1000;
}
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;
info("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
_info("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
/* Make sure that interrupts are disabled */
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;
info("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
_info("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
/* Make sure that interrupts are disabled */