luchianmihai/walnux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move include/nuttx/net/uip/uip-arch.h to include/nuttx/net/arp.h; rename all uip_arp_ functions to arp_

Browse source
This commit is contained in:
Gregory Nutt 2014-05-30 12:13:06 -06:00
parent b3abd30a76
commit 407e72b300
12 changed files with 60 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/arm/src/c5471/c5471_ethernet.c
View file

@ -59,7 +59,7 @@
#include <net/ethernet.h>
#include <nuttx/net/uip/uip.h>
#include <nuttx/net/uip/uip-arp.h>
#include <nuttx/net/arp.h>
#include <nuttx/net/uip/uip-arch.h>
#include "chip.h"
@ -984,7 +984,7 @@ static int c5471_uiptxpoll(struct uip_driver_s *dev)
if (c5471->c_dev.d_len > 0)
{
uip_arp_out(&c5471->c_dev);
arp_out(&c5471->c_dev);
c5471_transmit(c5471);
/* Check if the ESM has let go of the RX descriptor giving us access
@ -1238,7 +1238,7 @@ static void c5471_receive(struct c5471_driver_s *c5471)
if (BUF->type == HTONS(UIP_ETHTYPE_IP))
#endif
{
uip_arp_ipin(dev);
arp_ipin(dev);
uip_input(dev);
/* If the above function invocation resulted in data that should be
@ -1250,13 +1250,13 @@ static void c5471_receive(struct c5471_driver_s *c5471)
if (dev->d_len > 0 &&
(EIM_TXDESC_OWN_HOST & getreg32(c5471->c_rxcpudesc)) == 0)
{
uip_arp_out(dev);
arp_out(dev);
c5471_transmit(c5471);
}
}
else if (BUF->type == HTONS(UIP_ETHTYPE_ARP))
{
uip_arp_arpin(dev);
arp_arpin(dev);
/* If the above function invocation resulted in data that should be
* sent out on the network, the field d_len will set to a value > 0.

10
arch/arm/src/kinetis/kinetis_enet.c
View file

@ -54,7 +54,7 @@
#include <nuttx/net/mii.h>
#include <nuttx/net/uip/uip.h>
#include <nuttx/net/uip/uip-arp.h>
#include <nuttx/net/arp.h>
#include <nuttx/net/uip/uip-arch.h>
#include "up_arch.h"
@ -444,7 +444,7 @@ static int kinetis_uiptxpoll(struct uip_driver_s *dev)
if (priv->dev.d_len > 0)
{
uip_arp_out(&priv->dev);
arp_out(&priv->dev);
kinetis_transmit(priv);
/* Check if there is room in the device to hold another packet. If not,
@ -522,7 +522,7 @@ static void kinetis_receive(FAR struct kinetis_driver_s *priv)
if (BUF->type == HTONS(UIP_ETHTYPE_IP))
#endif
{
uip_arp_ipin(&priv->dev);
arp_ipin(&priv->dev);
uip_input(&priv->dev);
/* If the above function invocation resulted in data that should be
@ -531,13 +531,13 @@ static void kinetis_receive(FAR struct kinetis_driver_s *priv)
if (priv->dev.d_len > 0)
{
uip_arp_out(&priv->dev);
arp_out(&priv->dev);
kinetis_transmit(priv);
}
}
else if (BUF->type == htons(UIP_ETHTYPE_ARP))
{
uip_arp_arpin(&priv->dev);
arp_arpin(&priv->dev);
/* If the above function invocation resulted in data that should
* be sent out on the network, the field d_len will set to a

10
arch/arm/src/lpc17xx/lpc17_ethernet.c
View file

@ -54,7 +54,7 @@
#include <nuttx/net/uip/uip.h>
#include <nuttx/net/uip/uipopt.h>
#include <nuttx/net/uip/uip-arp.h>
#include <nuttx/net/arp.h>
#include <nuttx/net/uip/uip-arch.h>
#include "up_arch.h"
@ -681,7 +681,7 @@ static int lpc17_uiptxpoll(struct uip_driver_s *dev)
* at least one more packet in the descriptor list.
*/
uip_arp_out(&priv->lp_dev);
arp_out(&priv->lp_dev);
lpc17_transmit(priv);
/* Check if there is room in the device to hold another packet. If not,
@ -867,7 +867,7 @@ static void lpc17_rxdone(struct lpc17_driver_s *priv)
/* Handle the incoming Rx packet */
EMAC_STAT(priv, rx_ip);
uip_arp_ipin(&priv->lp_dev);
arp_ipin(&priv->lp_dev);
uip_input(&priv->lp_dev);
/* If the above function invocation resulted in data that
@ -877,14 +877,14 @@ static void lpc17_rxdone(struct lpc17_driver_s *priv)
if (priv->lp_dev.d_len > 0)
{
uip_arp_out(&priv->lp_dev);
arp_out(&priv->lp_dev);
lpc17_response(priv);
}
}
else if (BUF->type == htons(UIP_ETHTYPE_ARP))
{
EMAC_STAT(priv, rx_arp);
uip_arp_arpin(&priv->lp_dev);
arp_arpin(&priv->lp_dev);
/* If the above function invocation resulted in data that
* should be sent out on the network, the field d_len will

10
arch/arm/src/sam34/sam_emac.c
View file

@ -64,7 +64,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/net/mii.h>
#include <nuttx/net/uip/uip.h>
#include <nuttx/net/uip/uip-arp.h>
#include <nuttx/net/arp.h>
#include <nuttx/net/uip/uip-arch.h>
#include "up_arch.h"
@ -820,7 +820,7 @@ static int sam_uiptxpoll(struct uip_driver_s *dev)
{
/* Send the packet */
uip_arp_out(&priv->dev);
arp_out(&priv->dev);
sam_transmit(priv);
/* Check if the there are any free TX descriptors. We cannot perform
@ -1139,7 +1139,7 @@ static void sam_receive(struct sam_emac_s *priv)
/* Handle ARP on input then give the IP packet to uIP */
uip_arp_ipin(&priv->dev);
arp_ipin(&priv->dev);
uip_input(&priv->dev);
/* If the above function invocation resulted in data that should be
@ -1148,7 +1148,7 @@ static void sam_receive(struct sam_emac_s *priv)
if (priv->dev.d_len > 0)
{
uip_arp_out(&priv->dev);
arp_out(&priv->dev);
sam_transmit(priv);
}
}
@ -1158,7 +1158,7 @@ static void sam_receive(struct sam_emac_s *priv)
/* Handle ARP packet */
uip_arp_arpin(&priv->dev);
arp_arpin(&priv->dev);
/* If the above function invocation resulted in data that should be
* sent out on the network, the field d_len will set to a value > 0.

10
arch/arm/src/sama5/sam_emac.c
View file

@ -62,7 +62,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/net/mii.h>
#include <nuttx/net/uip/uip.h>
#include <nuttx/net/uip/uip-arp.h>
#include <nuttx/net/arp.h>
#include <nuttx/net/uip/uip-arch.h>
#include "up_arch.h"
@ -824,7 +824,7 @@ static int sam_uiptxpoll(struct uip_driver_s *dev)
{
/* Send the packet */
uip_arp_out(&priv->dev);
arp_out(&priv->dev);
sam_transmit(priv);
/* Check if the there are any free TX descriptors. We cannot perform
@ -1171,7 +1171,7 @@ static void sam_receive(struct sam_emac_s *priv)
/* Handle ARP on input then give the IP packet to uIP */
uip_arp_ipin(&priv->dev);
arp_ipin(&priv->dev);
uip_input(&priv->dev);
/* If the above function invocation resulted in data that should be
@ -1180,7 +1180,7 @@ static void sam_receive(struct sam_emac_s *priv)
if (priv->dev.d_len > 0)
{
uip_arp_out(&priv->dev);
arp_out(&priv->dev);
sam_transmit(priv);
}
}
@ -1190,7 +1190,7 @@ static void sam_receive(struct sam_emac_s *priv)
/* Handle ARP packet */
uip_arp_arpin(&priv->dev);
arp_arpin(&priv->dev);
/* If the above function invocation resulted in data that should be
* sent out on the network, the field d_len will set to a value > 0.

10
arch/arm/src/sama5/sam_gmac.c
View file

@ -62,7 +62,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/net/gmii.h>
#include <nuttx/net/uip/uip.h>
#include <nuttx/net/uip/uip-arp.h>
#include <nuttx/net/arp.h>
#include <nuttx/net/uip/uip-arch.h>
#include "up_arch.h"
@ -762,7 +762,7 @@ static int sam_uiptxpoll(struct uip_driver_s *dev)
{
/* Send the packet */
uip_arp_out(&priv->dev);
arp_out(&priv->dev);
sam_transmit(priv);
/* Check if the there are any free TX descriptors. We cannot perform
@ -1109,7 +1109,7 @@ static void sam_receive(struct sam_gmac_s *priv)
/* Handle ARP on input then give the IP packet to uIP */
uip_arp_ipin(&priv->dev);
arp_ipin(&priv->dev);
uip_input(&priv->dev);
/* If the above function invocation resulted in data that should be
@ -1118,7 +1118,7 @@ static void sam_receive(struct sam_gmac_s *priv)
if (priv->dev.d_len > 0)
{
uip_arp_out(&priv->dev);
arp_out(&priv->dev);
sam_transmit(priv);
}
}
@ -1128,7 +1128,7 @@ static void sam_receive(struct sam_gmac_s *priv)
/* Handle ARP packet */
uip_arp_arpin(&priv->dev);
arp_arpin(&priv->dev);
/* If the above function invocation resulted in data that should be
* sent out on the network, the field d_len will set to a value > 0.

10
arch/arm/src/stm32/stm32_eth.c
View file

@ -54,7 +54,7 @@
#include <nuttx/net/mii.h>
#include <nuttx/net/uip/uip.h>
#include <nuttx/net/uip/uip-arp.h>
#include <nuttx/net/arp.h>
#include <nuttx/net/uip/uip-arch.h>
#include "up_internal.h"
@ -1167,7 +1167,7 @@ static int stm32_uiptxpoll(struct uip_driver_s *dev)
{
/* Send the packet */
uip_arp_out(&priv->dev);
arp_out(&priv->dev);
stm32_transmit(priv);
DEBUGASSERT(dev->d_len == 0 && dev->d_buf == NULL);
@ -1610,7 +1610,7 @@ static void stm32_receive(FAR struct stm32_ethmac_s *priv)
/* Handle ARP on input then give the IP packet to uIP */
uip_arp_ipin(&priv->dev);
arp_ipin(&priv->dev);
uip_input(&priv->dev);
/* If the above function invocation resulted in data that should be
@ -1619,7 +1619,7 @@ static void stm32_receive(FAR struct stm32_ethmac_s *priv)
if (priv->dev.d_len > 0)
{
uip_arp_out(&priv->dev);
arp_out(&priv->dev);
stm32_transmit(priv);
}
}
@ -1629,7 +1629,7 @@ static void stm32_receive(FAR struct stm32_ethmac_s *priv)
/* Handle ARP packet */
uip_arp_arpin(&priv->dev);
arp_arpin(&priv->dev);
/* If the above function invocation resulted in data that should be
* sent out on the network, the field d_len will set to a value > 0.

10
arch/arm/src/tiva/tiva_ethernet.c
View file

@ -52,7 +52,7 @@
#include <nuttx/arch.h>
#include <arch/board/board.h>
#include <nuttx/net/uip/uip.h>
#include <nuttx/net/uip/uip-arp.h>
#include <nuttx/net/arp.h>
#include <nuttx/net/uip/uip-arch.h>
#include "chip.h"
@ -610,7 +610,7 @@ static int tiva_uiptxpoll(struct uip_driver_s *dev)
*/
DEBUGASSERT((tiva_ethin(priv, TIVA_MAC_TR_OFFSET) & MAC_TR_NEWTX) == 0)
uip_arp_out(&priv->ld_dev);
arp_out(&priv->ld_dev);
ret = tiva_transmit(priv);
}
@ -766,7 +766,7 @@ static void tiva_receive(struct tiva_driver_s *priv)
nllvdbg("IP packet received (%02x)\n", ETHBUF->type);
EMAC_STAT(priv, rx_ip);
uip_arp_ipin(&priv->ld_dev);
arp_ipin(&priv->ld_dev);
uip_input(&priv->ld_dev);
/* If the above function invocation resulted in data that should be
@ -775,7 +775,7 @@ static void tiva_receive(struct tiva_driver_s *priv)
if (priv->ld_dev.d_len > 0)
{
uip_arp_out(&priv->ld_dev);
arp_out(&priv->ld_dev);
tiva_transmit(priv);
}
}
@ -784,7 +784,7 @@ static void tiva_receive(struct tiva_driver_s *priv)
nllvdbg("ARP packet received (%02x)\n", ETHBUF->type);
EMAC_STAT(priv, rx_arp);
uip_arp_arpin(&priv->ld_dev);
arp_arpin(&priv->ld_dev);
/* If the above function invocation resulted in data that should be
* sent out on the network, the field d_len will set to a value > 0.

10
arch/hc/src/m9s12/m9s12_ethernet.c
View file

@ -52,7 +52,7 @@
#include <nuttx/arch.h>
#include <nuttx/net/uip/uip.h>
#include <nuttx/net/uip/uip-arp.h>
#include <nuttx/net/arp.h>
#include <nuttx/net/uip/uip-arch.h>
/****************************************************************************
@ -212,7 +212,7 @@ static int emac_uiptxpoll(struct uip_driver_s *dev)
if (priv->d_dev.d_len > 0)
{
uip_arp_out(&priv->d_dev);
arp_out(&priv->d_dev);
emac_transmit(priv);
/* Check if there is room in the device to hold another packet. If not,
@ -264,7 +264,7 @@ static void emac_receive(FAR struct emac_driver_s *priv)
if (BUF->type == HTONS(UIP_ETHTYPE_IP))
#endif
{
uip_arp_ipin(&priv->d_dev);
arp_ipin(&priv->d_dev);
uip_input(&priv->d_dev);
/* If the above function invocation resulted in data that should be
@ -273,13 +273,13 @@ static void emac_receive(FAR struct emac_driver_s *priv)
if (priv->d_dev.d_len > 0)
{
uip_arp_out(&priv->d_dev);
arp_out(&priv->d_dev);
emac_transmit(priv);
}
}
else if (BUF->type == htons(UIP_ETHTYPE_ARP))
{
uip_arp_arpin(&priv->d_dev);
arp_arpin(&priv->d_dev);
/* If the above function invocation resulted in data that should be
* sent out on the network, the field d_len will set to a value > 0.

10
arch/mips/src/pic32mx/pic32mx-ethernet.c
View file

@ -57,7 +57,7 @@
#include <nuttx/net/uip/uip.h>
#include <nuttx/net/uip/uipopt.h>
#include <nuttx/net/uip/uip-arp.h>
#include <nuttx/net/arp.h>
#include <nuttx/net/uip/uip-arch.h>
#include <arch/irq.h>
@ -1147,7 +1147,7 @@ static int pic32mx_uiptxpoll(struct uip_driver_s *dev)
* at least one more packet in the descriptor list.
*/
uip_arp_out(&priv->pd_dev);
arp_out(&priv->pd_dev);
pic32mx_transmit(priv);
/* Check if the next TX descriptor is available. If not, return a
@ -1435,7 +1435,7 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv)
/* Handle the incoming IP packet */
EMAC_STAT(priv, rx_ip);
uip_arp_ipin(&priv->pd_dev);
arp_ipin(&priv->pd_dev);
uip_input(&priv->pd_dev);
/* If the above function invocation resulted in data that
@ -1445,7 +1445,7 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv)
if (priv->pd_dev.d_len > 0)
{
uip_arp_out(&priv->pd_dev);
arp_out(&priv->pd_dev);
pic32mx_response(priv);
}
}
@ -1454,7 +1454,7 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv)
/* Handle the incoming ARP packet */
EMAC_STAT(priv, rx_arp);
uip_arp_arpin(&priv->pd_dev);
arp_arpin(&priv->pd_dev);
/* If the above function invocation resulted in data that
* should be sent out on the network, the field d_len will

10
arch/sim/src/up_uipdriver.c
View file

@ -55,7 +55,7 @@
#include <net/ethernet.h>
#include <nuttx/net/uip/uip.h>
#include <nuttx/net/uip/uip-arch.h>
#include <nuttx/net/uip/uip-arp.h>
#include <nuttx/net/arp.h>
#include "up_internal.h"
@ -123,7 +123,7 @@ static int sim_uiptxpoll(struct uip_driver_s *dev)
if (g_sim_dev.d_len > 0)
{
uip_arp_out(&g_sim_dev);
arp_out(&g_sim_dev);
netdev_send(g_sim_dev.d_buf, g_sim_dev.d_len);
}
@ -166,7 +166,7 @@ void uipdriver_loop(void)
if (BUF->ether_type == htons(UIP_ETHTYPE_IP))
#endif
{
uip_arp_ipin(&g_sim_dev);
arp_ipin(&g_sim_dev);
uip_input(&g_sim_dev);
/* If the above function invocation resulted in data that
@ -176,13 +176,13 @@ void uipdriver_loop(void)
if (g_sim_dev.d_len > 0)
{
uip_arp_out(&g_sim_dev);
arp_out(&g_sim_dev);
netdev_send(g_sim_dev.d_buf, g_sim_dev.d_len);
}
}
else if (BUF->ether_type == htons(UIP_ETHTYPE_ARP))
{
uip_arp_arpin(&g_sim_dev);
arp_arpin(&g_sim_dev);
/* If the above function invocation resulted in data that
* should be sent out on the network, the global variable

10
arch/z80/src/ez80/ez80_emac.c
View file

@ -59,7 +59,7 @@
#include <arch/io.h>
#include <nuttx/net/uip/uip.h>
#include <nuttx/net/uip/uip-arp.h>
#include <nuttx/net/arp.h>
#include <nuttx/net/uip/uip-arch.h>
#include "chip.h"
@ -1080,7 +1080,7 @@ static int ez80emac_uiptxpoll(struct uip_driver_s *dev)
* packet was successfully handled.
*/
uip_arp_out(&priv->dev);
arp_out(&priv->dev);
ret = ez80emac_transmit(priv);
}
@ -1274,7 +1274,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv)
nvdbg("IP packet received (%02x)\n", ETHBUF->type);
EMAC_STAT(priv, rx_ip);
uip_arp_ipin(&priv->dev);
arp_ipin(&priv->dev);
uip_input(&priv->dev);
/* If the above function invocation resulted in data that should be
@ -1283,7 +1283,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv)
if (priv->dev.d_len > 0)
{
uip_arp_out(&priv->dev);
arp_out(&priv->dev);
ez80emac_transmit(priv);
}
}
@ -1292,7 +1292,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv)
nvdbg("ARP packet received (%02x)\n", ETHBUF->type);
EMAC_STAT(priv, rx_arp);
uip_arp_arpin(&priv->dev);
arp_arpin(&priv->dev);
/* If the above function invocation resulted in data that should be
* sent out on the network, the field d_len will set to a value > 0.