mirror of
https://github.com/apache/nuttx.git
synced 2026-09-27 18:58:27 +08:00
Rename *lldbg to *llerr
This commit is contained in:
+17
-17
@@ -89,24 +89,24 @@
|
||||
#ifdef CONFIG_CPP_HAVE_VARARGS
|
||||
# ifdef IGMP_GRPDEBUG
|
||||
# define grpdbg(format, ...) ndbg(format, ##__VA_ARGS__)
|
||||
# define grplldbg(format, ...) nlldbg(format, ##__VA_ARGS__)
|
||||
# define grpllerr(format, ...) nllerr(format, ##__VA_ARGS__)
|
||||
# define grpinfo(format, ...) ninfo(format, ##__VA_ARGS__)
|
||||
# define grpllinfo(format, ...) nllinfo(format, ##__VA_ARGS__)
|
||||
# else
|
||||
# define grpdbg(x...)
|
||||
# define grplldbg(x...)
|
||||
# define grpllerr(x...)
|
||||
# define grpinfo(x...)
|
||||
# define grpllinfo(x...)
|
||||
# endif
|
||||
#else
|
||||
# ifdef IGMP_GRPDEBUG
|
||||
# define grpdbg ndbg
|
||||
# define grplldbg nlldbg
|
||||
# define grpllerr nllerr
|
||||
# define grpinfo ninfo
|
||||
# define grpllinfo nllinfo
|
||||
# else
|
||||
# define grpdbg (void)
|
||||
# define grplldbg (void)
|
||||
# define grpllerr (void)
|
||||
# define grpinfo (void)
|
||||
# define grpllinfo (void)
|
||||
# endif
|
||||
@@ -194,7 +194,7 @@ void igmp_grpinit(void)
|
||||
FAR struct igmp_group_s *group;
|
||||
int i;
|
||||
|
||||
grplldbg("Initializing\n");
|
||||
grpllerr("Initializing\n");
|
||||
|
||||
#if CONFIG_PREALLOC_IGMPGROUPS > 0
|
||||
for (i = 0; i < CONFIG_PREALLOC_IGMPGROUPS; i++)
|
||||
@@ -226,20 +226,20 @@ FAR struct igmp_group_s *igmp_grpalloc(FAR struct net_driver_s *dev,
|
||||
if (up_interrupt_context())
|
||||
{
|
||||
#if CONFIG_PREALLOC_IGMPGROUPS > 0
|
||||
grplldbg("Use a pre-allocated group entry\n");
|
||||
grpllerr("Use a pre-allocated group entry\n");
|
||||
group = igmp_grpprealloc();
|
||||
#else
|
||||
grplldbg("Cannot allocate from interrupt handler\n");
|
||||
grpllerr("Cannot allocate from interrupt handler\n");
|
||||
group = NULL;
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
grplldbg("Allocate from the heap\n");
|
||||
grpllerr("Allocate from the heap\n");
|
||||
group = igmp_grpheapalloc();
|
||||
}
|
||||
|
||||
grplldbg("group: %p\n", group);
|
||||
grpllerr("group: %p\n", group);
|
||||
|
||||
/* Check if we successfully allocated a group structure */
|
||||
|
||||
@@ -285,7 +285,7 @@ FAR struct igmp_group_s *igmp_grpfind(FAR struct net_driver_s *dev,
|
||||
FAR struct igmp_group_s *group;
|
||||
net_lock_t flags;
|
||||
|
||||
grplldbg("Searching for addr %08x\n", (int)*addr);
|
||||
grpllerr("Searching for addr %08x\n", (int)*addr);
|
||||
|
||||
/* We must disable interrupts because we don't which context we were
|
||||
* called from.
|
||||
@@ -296,10 +296,10 @@ FAR struct igmp_group_s *igmp_grpfind(FAR struct net_driver_s *dev,
|
||||
group;
|
||||
group = group->next)
|
||||
{
|
||||
grplldbg("Compare: %08x vs. %08x\n", group->grpaddr, *addr);
|
||||
grpllerr("Compare: %08x vs. %08x\n", group->grpaddr, *addr);
|
||||
if (net_ipv4addr_cmp(group->grpaddr, *addr))
|
||||
{
|
||||
grplldbg("Match!\n");
|
||||
grpllerr("Match!\n");
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -325,13 +325,13 @@ FAR struct igmp_group_s *igmp_grpallocfind(FAR struct net_driver_s *dev,
|
||||
{
|
||||
FAR struct igmp_group_s *group = igmp_grpfind(dev, addr);
|
||||
|
||||
grplldbg("group: %p addr: %08x\n", group, (int)*addr);
|
||||
grpllerr("group: %p addr: %08x\n", group, (int)*addr);
|
||||
if (!group)
|
||||
{
|
||||
group = igmp_grpalloc(dev, addr);
|
||||
}
|
||||
|
||||
grplldbg("group: %p\n", group);
|
||||
grpllerr("group: %p\n", group);
|
||||
return group;
|
||||
}
|
||||
|
||||
@@ -350,7 +350,7 @@ void igmp_grpfree(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group)
|
||||
{
|
||||
net_lock_t flags;
|
||||
|
||||
grplldbg("Free: %p flags: %02x\n", group, group->flags);
|
||||
grpllerr("Free: %p flags: %02x\n", group, group->flags);
|
||||
|
||||
/* Cancel the wdog */
|
||||
|
||||
@@ -376,7 +376,7 @@ void igmp_grpfree(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group)
|
||||
#if CONFIG_PREALLOC_IGMPGROUPS > 0
|
||||
if (IS_PREALLOCATED(group->flags))
|
||||
{
|
||||
grplldbg("Put back on free list\n");
|
||||
grpllerr("Put back on free list\n");
|
||||
sq_addlast((FAR sq_entry_t *)group, &g_freelist);
|
||||
net_unlock(flags);
|
||||
}
|
||||
@@ -388,7 +388,7 @@ void igmp_grpfree(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group)
|
||||
*/
|
||||
|
||||
net_unlock(flags);
|
||||
grplldbg("Call sched_kfree()\n");
|
||||
grpllerr("Call sched_kfree()\n");
|
||||
sched_kfree(group);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -124,7 +124,7 @@ void igmp_input(struct net_driver_s *dev)
|
||||
if (dev->d_len < NET_LL_HDRLEN(dev) + IPIGMP_HDRLEN)
|
||||
{
|
||||
IGMP_STATINCR(g_netstats.igmp.length_errors);
|
||||
nlldbg("Length error\n");
|
||||
nllerr("Length error\n");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -133,7 +133,7 @@ void igmp_input(struct net_driver_s *dev)
|
||||
if (net_chksum((FAR uint16_t *)&IGMPBUF->type, IGMP_HDRLEN) != 0)
|
||||
{
|
||||
IGMP_STATINCR(g_netstats.igmp.chksum_errors);
|
||||
nlldbg("Checksum error\n");
|
||||
nllerr("Checksum error\n");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -143,7 +143,7 @@ void igmp_input(struct net_driver_s *dev)
|
||||
group = igmp_grpallocfind(dev, &destipaddr);
|
||||
if (!group)
|
||||
{
|
||||
nlldbg("Failed to allocate/find group: %08x\n", destipaddr);
|
||||
nllerr("Failed to allocate/find group: %08x\n", destipaddr);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -192,7 +192,7 @@ void igmp_input(struct net_driver_s *dev)
|
||||
IGMP_STATINCR(g_netstats.igmp.v1_received);
|
||||
IGMPBUF->maxresp = 10;
|
||||
|
||||
nlldbg("V1 not implemented\n");
|
||||
nllerr("V1 not implemented\n");
|
||||
}
|
||||
|
||||
IGMP_STATINCR(g_netstats.igmp.query_received);
|
||||
@@ -241,7 +241,7 @@ void igmp_input(struct net_driver_s *dev)
|
||||
nllinfo("Unicast query\n");
|
||||
IGMP_STATINCR(g_netstats.igmp.ucast_query);
|
||||
|
||||
nlldbg("Query to a specific group with the group address as destination\n");
|
||||
nllerr("Query to a specific group with the group address as destination\n");
|
||||
|
||||
ticks = net_dsec2tick((int)IGMPBUF->maxresp);
|
||||
if (IS_IDLEMEMBER(group->flags) || igmp_cmptimer(group, ticks))
|
||||
@@ -270,7 +270,7 @@ void igmp_input(struct net_driver_s *dev)
|
||||
|
||||
default:
|
||||
{
|
||||
nlldbg("Unexpected msg %02x\n", IGMPBUF->type);
|
||||
nllerr("Unexpected msg %02x\n", IGMPBUF->type);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -74,24 +74,24 @@
|
||||
#ifdef CONFIG_CPP_HAVE_VARARGS
|
||||
# ifdef IGMP_GTMRDEBUG
|
||||
# define gtmrdbg(format, ...) ndbg(format, ##__VA_ARGS__)
|
||||
# define gtmrlldbg(format, ...) nlldbg(format, ##__VA_ARGS__)
|
||||
# define gtmrllerr(format, ...) nllerr(format, ##__VA_ARGS__)
|
||||
# define gtmrinfo(format, ...) ninfo(format, ##__VA_ARGS__)
|
||||
# define gtmrllinfo(format, ...) nllinfo(format, ##__VA_ARGS__)
|
||||
# else
|
||||
# define gtmrdbg(x...)
|
||||
# define gtmrlldbg(x...)
|
||||
# define gtmrllerr(x...)
|
||||
# define gtmrinfo(x...)
|
||||
# define gtmrllinfo(x...)
|
||||
# endif
|
||||
#else
|
||||
# ifdef IGMP_GTMRDEBUG
|
||||
# define gtmrdbg ndbg
|
||||
# define gtmrlldbg nlldbg
|
||||
# define gtmrllerr nllerr
|
||||
# define gtmrinfo ninfo
|
||||
# define gtmrllinfo nllinfo
|
||||
# else
|
||||
# define gtmrdbg (void)
|
||||
# define gtmrlldbg (void)
|
||||
# define gtmrllerr (void)
|
||||
# define gtmrinfo (void)
|
||||
# define gtmrllinfo (void)
|
||||
# endif
|
||||
@@ -170,7 +170,7 @@ void igmp_startticks(FAR struct igmp_group_s *group, unsigned int ticks)
|
||||
|
||||
/* Start the timer */
|
||||
|
||||
gtmrlldbg("ticks: %d\n", ticks);
|
||||
gtmrllerr("ticks: %d\n", ticks);
|
||||
|
||||
ret = wd_start(group->wdog, ticks, igmp_timeout, 1, (uint32_t)group);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user