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

Rename many functions in net/devif from uip_* to devif_*

Browse Source
This commit is contained in:
Gregory Nutt
2014-06-28 18:36:09 -06:00
parent 5790c94ba3
commit 8e706eb4ff
29 changed files with 94 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/icmp/icmp_input.c
+2 -2
View File
@@ -185,7 +185,7 @@ void icmp_input(FAR struct net_driver_s *dev)
#ifdef CONFIG_NET_ICMP_PING
else if (picmp->type == ICMP_ECHO_REPLY && g_echocallback)
{
(void)uip_callbackexecute(dev, picmp, UIP_ECHOREPLY, g_echocallback);
(void)devif_callback_execute(dev, picmp, UIP_ECHOREPLY, g_echocallback);
}
#endif
@@ -273,7 +273,7 @@ typeerr:
{
/* Dispatch the ECHO reply to the waiting thread */
flags = uip_callbackexecute(dev, picmp, flags, g_echocallback);
flags = devif_callback_execute(dev, picmp, flags, g_echocallback);
}
/* If the ECHO reply was not handled, then drop the packet */
net/icmp/icmp_ping.c
+4 -4
View File
@@ -67,8 +67,8 @@
/* Allocate a new ICMP data callback */
#define icmp_callbackalloc() uip_callbackalloc(&g_echocallback)
#define icmp_callbackfree(cb) uip_callbackfree(cb, &g_echocallback)
#define icmp_callback_alloc() devif_callback_alloc(&g_echocallback)
#define icmp_callback_free(cb) devif_callback_free(cb, &g_echocallback)
/****************************************************************************
* Private Types
@@ -345,7 +345,7 @@ int uip_ping(uip_ipaddr_t addr, uint16_t id, uint16_t seqno,
/* Set up the callback */
state.png_cb = icmp_callbackalloc();
state.png_cb = icmp_callback_alloc();
if (state.png_cb)
{
state.png_cb->flags = UIP_POLL|UIP_ECHOREPLY;
@@ -367,7 +367,7 @@ int uip_ping(uip_ipaddr_t addr, uint16_t id, uint16_t seqno,
nlldbg("Start time: 0x%08x seqno: %d\n", state.png_time, seqno);
net_lockedwait(&state.png_sem);
icmp_callbackfree(state.png_cb);
icmp_callback_free(state.png_cb);
}
net_unlock(save);
net/icmp/icmp_poll.c
+1 -1
View File
@@ -98,7 +98,7 @@ void icmp_poll(FAR struct net_driver_s *dev)
/* Perform the application callback */
(void)uip_callbackexecute(dev, NULL, UIP_POLL, g_echocallback);
(void)devif_callback_execute(dev, NULL, UIP_POLL, g_echocallback);
}
#endif /* CONFIG_NET && CONFIG_NET_ICMP && CONFIG_NET_ICMP_PING */