sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NET: More renaming

Browse Source
This commit is contained in:
Gregory Nutt 2014-07-04 15:40:49 -06:00
parent 77439f3c75
commit 11e3a21411
13 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/src/c5471/c5471_ethernet.c
View File

@ -1233,9 +1233,9 @@ static void c5471_receive(struct c5471_driver_s *c5471)
/* We only accept IP packets of the configured type and ARP packets */ /* We only accept IP packets of the configured type and ARP packets */
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
if (BUF->type == HTONS(UIP_ETHTYPE_IP6)) if (BUF->type == HTONS(ETHTYPE_IP6))
#else #else
if (BUF->type == HTONS(UIP_ETHTYPE_IP)) if (BUF->type == HTONS(ETHTYPE_IP))
#endif #endif
{ {
arp_ipin(dev); arp_ipin(dev);
@ -1254,7 +1254,7 @@ static void c5471_receive(struct c5471_driver_s *c5471)
c5471_transmit(c5471); c5471_transmit(c5471);
} }
} }
else if (BUF->type == HTONS(UIP_ETHTYPE_ARP)) else if (BUF->type == HTONS(ETHTYPE_ARP))
{ {
arp_arpin(dev); arp_arpin(dev);

6
arch/arm/src/kinetis/kinetis_enet.c
View File

@ -517,9 +517,9 @@ static void kinetis_receive(FAR struct kinetis_driver_s *priv)
/* We only accept IP packets of the configured type and ARP packets */ /* We only accept IP packets of the configured type and ARP packets */
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
if (BUF->type == HTONS(UIP_ETHTYPE_IP6)) if (BUF->type == HTONS(ETHTYPE_IP6))
#else #else
if (BUF->type == HTONS(UIP_ETHTYPE_IP)) if (BUF->type == HTONS(ETHTYPE_IP))
#endif #endif
{ {
arp_ipin(&priv->dev); arp_ipin(&priv->dev);
@ -535,7 +535,7 @@ static void kinetis_receive(FAR struct kinetis_driver_s *priv)
kinetis_transmit(priv); kinetis_transmit(priv);
} }
} }
else if (BUF->type == htons(UIP_ETHTYPE_ARP)) else if (BUF->type == htons(ETHTYPE_ARP))
{ {
arp_arpin(&priv->dev); arp_arpin(&priv->dev);

6
arch/arm/src/lpc17xx/lpc17_ethernet.c
View File

@ -859,9 +859,9 @@ static void lpc17_rxdone(struct lpc17_driver_s *priv)
/* We only accept IP packets of the configured type and ARP packets */ /* We only accept IP packets of the configured type and ARP packets */
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
if (BUF->type == HTONS(UIP_ETHTYPE_IP6)) if (BUF->type == HTONS(ETHTYPE_IP6))
#else #else
if (BUF->type == HTONS(UIP_ETHTYPE_IP)) if (BUF->type == HTONS(ETHTYPE_IP))
#endif #endif
{ {
/* Handle the incoming Rx packet */ /* Handle the incoming Rx packet */
@ -881,7 +881,7 @@ static void lpc17_rxdone(struct lpc17_driver_s *priv)
lpc17_response(priv); lpc17_response(priv);
} }
} }
else if (BUF->type == htons(UIP_ETHTYPE_ARP)) else if (BUF->type == htons(ETHTYPE_ARP))
{ {
EMAC_STAT(priv, rx_arp); EMAC_STAT(priv, rx_arp);
arp_arpin(&priv->lp_dev); arp_arpin(&priv->lp_dev);

6
arch/arm/src/sam34/sam_emac.c
View File

@ -1133,9 +1133,9 @@ static void sam_receive(struct sam_emac_s *priv)
/* We only accept IP packets of the configured type and ARP packets */ /* We only accept IP packets of the configured type and ARP packets */
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
else if (BUF->type == HTONS(UIP_ETHTYPE_IP6)) else if (BUF->type == HTONS(ETHTYPE_IP6))
#else #else
else if (BUF->type == HTONS(UIP_ETHTYPE_IP)) else if (BUF->type == HTONS(ETHTYPE_IP))
#endif #endif
{ {
nllvdbg("IP frame\n"); nllvdbg("IP frame\n");
@ -1155,7 +1155,7 @@ static void sam_receive(struct sam_emac_s *priv)
sam_transmit(priv); sam_transmit(priv);
} }
} }
else if (BUF->type == htons(UIP_ETHTYPE_ARP)) else if (BUF->type == htons(ETHTYPE_ARP))
{ {
nllvdbg("ARP frame\n"); nllvdbg("ARP frame\n");

6
arch/arm/src/sama5/sam_emaca.c
View File

@ -1173,9 +1173,9 @@ static void sam_receive(struct sam_emac_s *priv)
/* We only accept IP packets of the configured type and ARP packets */ /* We only accept IP packets of the configured type and ARP packets */
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
else if (BUF->type == HTONS(UIP_ETHTYPE_IP6)) else if (BUF->type == HTONS(ETHTYPE_IP6))
#else #else
else if (BUF->type == HTONS(UIP_ETHTYPE_IP)) else if (BUF->type == HTONS(ETHTYPE_IP))
#endif #endif
{ {
nllvdbg("IP frame\n"); nllvdbg("IP frame\n");
@ -1195,7 +1195,7 @@ static void sam_receive(struct sam_emac_s *priv)
sam_transmit(priv); sam_transmit(priv);
} }
} }
else if (BUF->type == htons(UIP_ETHTYPE_ARP)) else if (BUF->type == htons(ETHTYPE_ARP))
{ {
nllvdbg("ARP frame\n"); nllvdbg("ARP frame\n");

6
arch/arm/src/sama5/sam_emacb.c
View File

@ -1494,9 +1494,9 @@ static void sam_receive(struct sam_emac_s *priv)
/* We only accept IP packets of the configured type and ARP packets */ /* We only accept IP packets of the configured type and ARP packets */
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
else if (BUF->type == HTONS(UIP_ETHTYPE_IP6)) else if (BUF->type == HTONS(ETHTYPE_IP6))
#else #else
else if (BUF->type == HTONS(UIP_ETHTYPE_IP)) else if (BUF->type == HTONS(ETHTYPE_IP))
#endif #endif
{ {
nllvdbg("IP frame\n"); nllvdbg("IP frame\n");
@ -1516,7 +1516,7 @@ static void sam_receive(struct sam_emac_s *priv)
sam_transmit(priv); sam_transmit(priv);
} }
} }
else if (BUF->type == htons(UIP_ETHTYPE_ARP)) else if (BUF->type == htons(ETHTYPE_ARP))
{ {
nllvdbg("ARP frame\n"); nllvdbg("ARP frame\n");

6
arch/arm/src/sama5/sam_gmac.c
View File

@ -1103,9 +1103,9 @@ static void sam_receive(struct sam_gmac_s *priv)
/* We only accept IP packets of the configured type and ARP packets */ /* We only accept IP packets of the configured type and ARP packets */
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
else if (BUF->type == HTONS(UIP_ETHTYPE_IP6)) else if (BUF->type == HTONS(ETHTYPE_IP6))
#else #else
else if (BUF->type == HTONS(UIP_ETHTYPE_IP)) else if (BUF->type == HTONS(ETHTYPE_IP))
#endif #endif
{ {
nllvdbg("IP frame\n"); nllvdbg("IP frame\n");
@ -1125,7 +1125,7 @@ static void sam_receive(struct sam_gmac_s *priv)
sam_transmit(priv); sam_transmit(priv);
} }
} }
else if (BUF->type == htons(UIP_ETHTYPE_ARP)) else if (BUF->type == htons(ETHTYPE_ARP))
{ {
nllvdbg("ARP frame\n"); nllvdbg("ARP frame\n");

6
arch/arm/src/stm32/stm32_eth.c
View File

@ -1613,9 +1613,9 @@ static void stm32_receive(FAR struct stm32_ethmac_s *priv)
/* We only accept IP packets of the configured type and ARP packets */ /* We only accept IP packets of the configured type and ARP packets */
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
else if (BUF->type == HTONS(UIP_ETHTYPE_IP6)) else if (BUF->type == HTONS(ETHTYPE_IP6))
#else #else
else if (BUF->type == HTONS(UIP_ETHTYPE_IP)) else if (BUF->type == HTONS(ETHTYPE_IP))
#endif #endif
{ {
nllvdbg("IP frame\n"); nllvdbg("IP frame\n");
@ -1635,7 +1635,7 @@ static void stm32_receive(FAR struct stm32_ethmac_s *priv)
stm32_transmit(priv); stm32_transmit(priv);
} }
} }
else if (BUF->type == htons(UIP_ETHTYPE_ARP)) else if (BUF->type == htons(ETHTYPE_ARP))
{ {
nllvdbg("ARP frame\n"); nllvdbg("ARP frame\n");

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

@ -514,7 +514,7 @@ static int tiva_transmit(struct tiva_driver_s *priv)
pktlen = priv->ld_dev.d_len; pktlen = priv->ld_dev.d_len;
nllvdbg("Sending packet, pktlen: %d\n", pktlen); nllvdbg("Sending packet, pktlen: %d\n", pktlen);
DEBUGASSERT(pktlen > UIP_LLH_LEN); DEBUGASSERT(pktlen > NET_LLH_LEN);
dbuf = priv->ld_dev.d_buf; dbuf = priv->ld_dev.d_buf;
regval = (uint32_t)(pktlen - 14); regval = (uint32_t)(pktlen - 14);
@ -676,7 +676,7 @@ static void tiva_receive(struct tiva_driver_s *priv)
* and 4 byte FCS that are not copied into the uIP packet. * and 4 byte FCS that are not copied into the uIP packet.
*/ */
if (pktlen > (CONFIG_NET_BUFSIZE + 6) || pktlen <= (UIP_LLH_LEN + 6)) if (pktlen > (CONFIG_NET_BUFSIZE + 6) || pktlen <= (NET_LLH_LEN + 6))
{ {
int wordlen; int wordlen;
@ -758,9 +758,9 @@ static void tiva_receive(struct tiva_driver_s *priv)
/* We only accept IP packets of the configured type and ARP packets */ /* We only accept IP packets of the configured type and ARP packets */
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
if (ETHBUF->type == HTONS(UIP_ETHTYPE_IP6)) if (ETHBUF->type == HTONS(ETHTYPE_IP6))
#else #else
if (ETHBUF->type == HTONS(UIP_ETHTYPE_IP)) if (ETHBUF->type == HTONS(ETHTYPE_IP))
#endif #endif
{ {
nllvdbg("IP packet received (%02x)\n", ETHBUF->type); nllvdbg("IP packet received (%02x)\n", ETHBUF->type);
@ -779,7 +779,7 @@ static void tiva_receive(struct tiva_driver_s *priv)
tiva_transmit(priv); tiva_transmit(priv);
} }
} }
else if (ETHBUF->type == htons(UIP_ETHTYPE_ARP)) else if (ETHBUF->type == htons(ETHTYPE_ARP))
{ {
nllvdbg("ARP packet received (%02x)\n", ETHBUF->type); nllvdbg("ARP packet received (%02x)\n", ETHBUF->type);
EMAC_STAT(priv, rx_arp); EMAC_STAT(priv, rx_arp);

6
arch/hc/src/m9s12/m9s12_ethernet.c
View File

@ -259,9 +259,9 @@ static void emac_receive(FAR struct emac_driver_s *priv)
/* We only accept IP packets of the configured type and ARP packets */ /* We only accept IP packets of the configured type and ARP packets */
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
if (BUF->type == HTONS(UIP_ETHTYPE_IP6)) if (BUF->type == HTONS(ETHTYPE_IP6))
#else #else
if (BUF->type == HTONS(UIP_ETHTYPE_IP)) if (BUF->type == HTONS(ETHTYPE_IP))
#endif #endif
{ {
arp_ipin(&priv->d_dev); arp_ipin(&priv->d_dev);
@ -277,7 +277,7 @@ static void emac_receive(FAR struct emac_driver_s *priv)
emac_transmit(priv); emac_transmit(priv);
} }
} }
else if (BUF->type == htons(UIP_ETHTYPE_ARP)) else if (BUF->type == htons(ETHTYPE_ARP))
{ {
arp_arpin(&priv->d_dev); arp_arpin(&priv->d_dev);

6
arch/mips/src/pic32mx/pic32mx-ethernet.c
View File

@ -1427,9 +1427,9 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv)
/* We only accept IP packets of the configured type and ARP packets */ /* We only accept IP packets of the configured type and ARP packets */
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
if (BUF->type == HTONS(UIP_ETHTYPE_IP6)) if (BUF->type == HTONS(ETHTYPE_IP6))
#else #else
if (BUF->type == HTONS(UIP_ETHTYPE_IP)) if (BUF->type == HTONS(ETHTYPE_IP))
#endif #endif
{ {
/* Handle the incoming IP packet */ /* Handle the incoming IP packet */
@ -1449,7 +1449,7 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv)
pic32mx_response(priv); pic32mx_response(priv);
} }
} }
else if (BUF->type == htons(UIP_ETHTYPE_ARP)) else if (BUF->type == htons(ETHTYPE_ARP))
{ {
/* Handle the incoming ARP packet */ /* Handle the incoming ARP packet */

8
arch/sim/src/up_netdriver.c
View File

@ -156,14 +156,14 @@ void netdriver_loop(void)
* MAC address * MAC address
*/ */
if (g_sim_dev.d_len > UIP_LLH_LEN && up_comparemac(BUF->ether_dhost, &g_sim_dev.d_mac) == 0) if (g_sim_dev.d_len > NET_LLH_LEN && up_comparemac(BUF->ether_dhost, &g_sim_dev.d_mac) == 0)
{ {
/* We only accept IP packets of the configured type and ARP packets */ /* We only accept IP packets of the configured type and ARP packets */
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
if (BUF->ether_type == htons(UIP_ETHTYPE_IP6)) if (BUF->ether_type == htons(ETHTYPE_IP6))
#else #else
if (BUF->ether_type == htons(UIP_ETHTYPE_IP)) if (BUF->ether_type == htons(ETHTYPE_IP))
#endif #endif
{ {
arp_ipin(&g_sim_dev); arp_ipin(&g_sim_dev);
@ -180,7 +180,7 @@ void netdriver_loop(void)
netdev_send(g_sim_dev.d_buf, g_sim_dev.d_len); netdev_send(g_sim_dev.d_buf, g_sim_dev.d_len);
} }
} }
else if (BUF->ether_type == htons(UIP_ETHTYPE_ARP)) else if (BUF->ether_type == htons(ETHTYPE_ARP))
{ {
arp_arpin(&g_sim_dev); arp_arpin(&g_sim_dev);

6
arch/z80/src/ez80/ez80_emac.c
View File

@ -1266,9 +1266,9 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv)
/* We only accept IP packets of the configured type and ARP packets */ /* We only accept IP packets of the configured type and ARP packets */
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
if (ETHBUF->type == HTONS(UIP_ETHTYPE_IP6)) if (ETHBUF->type == HTONS(ETHTYPE_IP6))
#else #else
if (ETHBUF->type == HTONS(UIP_ETHTYPE_IP)) if (ETHBUF->type == HTONS(ETHTYPE_IP))
#endif #endif
{ {
nvdbg("IP packet received (%02x)\n", ETHBUF->type); nvdbg("IP packet received (%02x)\n", ETHBUF->type);
@ -1287,7 +1287,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv)
ez80emac_transmit(priv); ez80emac_transmit(priv);
} }
} }
else if (ETHBUF->type == htons(UIP_ETHTYPE_ARP)) else if (ETHBUF->type == htons(ETHTYPE_ARP))
{ {
nvdbg("ARP packet received (%02x)\n", ETHBUF->type); nvdbg("ARP packet received (%02x)\n", ETHBUF->type);
EMAC_STAT(priv, rx_arp); EMAC_STAT(priv, rx_arp);