diff options
Diffstat (limited to 'nuttx/arch')
-rw-r--r-- | nuttx/arch/arm/src/c5471/c5471_ethernet.c | 10 | ||||
-rw-r--r-- | nuttx/arch/arm/src/kinetis/kinetis_enet.c | 10 | ||||
-rw-r--r-- | nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c | 10 | ||||
-rw-r--r-- | nuttx/arch/arm/src/sam34/sam_emac.c | 10 | ||||
-rw-r--r-- | nuttx/arch/arm/src/sama5/sam_emac.c | 10 | ||||
-rw-r--r-- | nuttx/arch/arm/src/sama5/sam_gmac.c | 10 | ||||
-rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_eth.c | 10 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/tiva_ethernet.c | 10 | ||||
-rw-r--r-- | nuttx/arch/hc/src/m9s12/m9s12_ethernet.c | 10 | ||||
-rw-r--r-- | nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c | 10 | ||||
-rw-r--r-- | nuttx/arch/sim/src/up_uipdriver.c | 10 | ||||
-rw-r--r-- | nuttx/arch/z80/src/ez80/ez80_emac.c | 10 |
12 files changed, 60 insertions, 60 deletions
diff --git a/nuttx/arch/arm/src/c5471/c5471_ethernet.c b/nuttx/arch/arm/src/c5471/c5471_ethernet.c index 94b392153..4a6ff9bde 100644 --- a/nuttx/arch/arm/src/c5471/c5471_ethernet.c +++ b/nuttx/arch/arm/src/c5471/c5471_ethernet.c @@ -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. diff --git a/nuttx/arch/arm/src/kinetis/kinetis_enet.c b/nuttx/arch/arm/src/kinetis/kinetis_enet.c index 2607b6bdf..096ff54a3 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_enet.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_enet.c @@ -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 diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c index 360b6acc9..60dee4a8e 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c @@ -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 diff --git a/nuttx/arch/arm/src/sam34/sam_emac.c b/nuttx/arch/arm/src/sam34/sam_emac.c index d2c134c90..3bdd288ee 100644 --- a/nuttx/arch/arm/src/sam34/sam_emac.c +++ b/nuttx/arch/arm/src/sam34/sam_emac.c @@ -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. diff --git a/nuttx/arch/arm/src/sama5/sam_emac.c b/nuttx/arch/arm/src/sama5/sam_emac.c index b20446ec7..b62f39b63 100644 --- a/nuttx/arch/arm/src/sama5/sam_emac.c +++ b/nuttx/arch/arm/src/sama5/sam_emac.c @@ -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. diff --git a/nuttx/arch/arm/src/sama5/sam_gmac.c b/nuttx/arch/arm/src/sama5/sam_gmac.c index 453dca9c0..096405573 100644 --- a/nuttx/arch/arm/src/sama5/sam_gmac.c +++ b/nuttx/arch/arm/src/sama5/sam_gmac.c @@ -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. diff --git a/nuttx/arch/arm/src/stm32/stm32_eth.c b/nuttx/arch/arm/src/stm32/stm32_eth.c index 7cd5d6a13..60187bcff 100644 --- a/nuttx/arch/arm/src/stm32/stm32_eth.c +++ b/nuttx/arch/arm/src/stm32/stm32_eth.c @@ -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. diff --git a/nuttx/arch/arm/src/tiva/tiva_ethernet.c b/nuttx/arch/arm/src/tiva/tiva_ethernet.c index 070236827..a3a282111 100644 --- a/nuttx/arch/arm/src/tiva/tiva_ethernet.c +++ b/nuttx/arch/arm/src/tiva/tiva_ethernet.c @@ -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. diff --git a/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c b/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c index b01bc1284..857469b28 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c +++ b/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c @@ -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. diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c b/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c index fedf20b04..5af9e7452 100644 --- a/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c +++ b/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c @@ -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 diff --git a/nuttx/arch/sim/src/up_uipdriver.c b/nuttx/arch/sim/src/up_uipdriver.c index 99f37b22f..3bc0bf9df 100644 --- a/nuttx/arch/sim/src/up_uipdriver.c +++ b/nuttx/arch/sim/src/up_uipdriver.c @@ -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 diff --git a/nuttx/arch/z80/src/ez80/ez80_emac.c b/nuttx/arch/z80/src/ez80/ez80_emac.c index 4957a5bd8..5787303eb 100644 --- a/nuttx/arch/z80/src/ez80/ez80_emac.c +++ b/nuttx/arch/z80/src/ez80/ez80_emac.c @@ -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. |