From 11e3a2141105d7848dd81b15bcceeafbee36f03d Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 4 Jul 2014 15:40:49 -0600 Subject: [PATCH] NET: More renaming --- arch/arm/src/c5471/c5471_ethernet.c | 6 +++--- arch/arm/src/kinetis/kinetis_enet.c | 6 +++--- arch/arm/src/lpc17xx/lpc17_ethernet.c | 6 +++--- arch/arm/src/sam34/sam_emac.c | 6 +++--- arch/arm/src/sama5/sam_emaca.c | 6 +++--- arch/arm/src/sama5/sam_emacb.c | 6 +++--- arch/arm/src/sama5/sam_gmac.c | 6 +++--- arch/arm/src/stm32/stm32_eth.c | 6 +++--- arch/arm/src/tiva/tiva_ethernet.c | 10 +++++----- arch/hc/src/m9s12/m9s12_ethernet.c | 6 +++--- arch/mips/src/pic32mx/pic32mx-ethernet.c | 6 +++--- arch/sim/src/up_netdriver.c | 8 ++++---- arch/z80/src/ez80/ez80_emac.c | 6 +++--- 13 files changed, 42 insertions(+), 42 deletions(-) diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c index dcef92518c..798b9dcdee 100644 --- a/arch/arm/src/c5471/c5471_ethernet.c +++ b/arch/arm/src/c5471/c5471_ethernet.c @@ -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 */ #ifdef CONFIG_NET_IPv6 - if (BUF->type == HTONS(UIP_ETHTYPE_IP6)) + if (BUF->type == HTONS(ETHTYPE_IP6)) #else - if (BUF->type == HTONS(UIP_ETHTYPE_IP)) + if (BUF->type == HTONS(ETHTYPE_IP)) #endif { arp_ipin(dev); @@ -1254,7 +1254,7 @@ static void c5471_receive(struct c5471_driver_s *c5471) c5471_transmit(c5471); } } - else if (BUF->type == HTONS(UIP_ETHTYPE_ARP)) + else if (BUF->type == HTONS(ETHTYPE_ARP)) { arp_arpin(dev); diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c index 1cc7eac581..fcd90d9888 100644 --- a/arch/arm/src/kinetis/kinetis_enet.c +++ b/arch/arm/src/kinetis/kinetis_enet.c @@ -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 */ #ifdef CONFIG_NET_IPv6 - if (BUF->type == HTONS(UIP_ETHTYPE_IP6)) + if (BUF->type == HTONS(ETHTYPE_IP6)) #else - if (BUF->type == HTONS(UIP_ETHTYPE_IP)) + if (BUF->type == HTONS(ETHTYPE_IP)) #endif { arp_ipin(&priv->dev); @@ -535,7 +535,7 @@ static void kinetis_receive(FAR struct kinetis_driver_s *priv) kinetis_transmit(priv); } } - else if (BUF->type == htons(UIP_ETHTYPE_ARP)) + else if (BUF->type == htons(ETHTYPE_ARP)) { arp_arpin(&priv->dev); diff --git a/arch/arm/src/lpc17xx/lpc17_ethernet.c b/arch/arm/src/lpc17xx/lpc17_ethernet.c index e1522507c0..11a7967398 100644 --- a/arch/arm/src/lpc17xx/lpc17_ethernet.c +++ b/arch/arm/src/lpc17xx/lpc17_ethernet.c @@ -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 */ #ifdef CONFIG_NET_IPv6 - if (BUF->type == HTONS(UIP_ETHTYPE_IP6)) + if (BUF->type == HTONS(ETHTYPE_IP6)) #else - if (BUF->type == HTONS(UIP_ETHTYPE_IP)) + if (BUF->type == HTONS(ETHTYPE_IP)) #endif { /* Handle the incoming Rx packet */ @@ -881,7 +881,7 @@ static void lpc17_rxdone(struct lpc17_driver_s *priv) lpc17_response(priv); } } - else if (BUF->type == htons(UIP_ETHTYPE_ARP)) + else if (BUF->type == htons(ETHTYPE_ARP)) { EMAC_STAT(priv, rx_arp); arp_arpin(&priv->lp_dev); diff --git a/arch/arm/src/sam34/sam_emac.c b/arch/arm/src/sam34/sam_emac.c index 0fe3361954..cd85d77104 100644 --- a/arch/arm/src/sam34/sam_emac.c +++ b/arch/arm/src/sam34/sam_emac.c @@ -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 */ #ifdef CONFIG_NET_IPv6 - else if (BUF->type == HTONS(UIP_ETHTYPE_IP6)) + else if (BUF->type == HTONS(ETHTYPE_IP6)) #else - else if (BUF->type == HTONS(UIP_ETHTYPE_IP)) + else if (BUF->type == HTONS(ETHTYPE_IP)) #endif { nllvdbg("IP frame\n"); @@ -1155,7 +1155,7 @@ static void sam_receive(struct sam_emac_s *priv) sam_transmit(priv); } } - else if (BUF->type == htons(UIP_ETHTYPE_ARP)) + else if (BUF->type == htons(ETHTYPE_ARP)) { nllvdbg("ARP frame\n"); diff --git a/arch/arm/src/sama5/sam_emaca.c b/arch/arm/src/sama5/sam_emaca.c index 66f9244781..acaac9b8cf 100644 --- a/arch/arm/src/sama5/sam_emaca.c +++ b/arch/arm/src/sama5/sam_emaca.c @@ -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 */ #ifdef CONFIG_NET_IPv6 - else if (BUF->type == HTONS(UIP_ETHTYPE_IP6)) + else if (BUF->type == HTONS(ETHTYPE_IP6)) #else - else if (BUF->type == HTONS(UIP_ETHTYPE_IP)) + else if (BUF->type == HTONS(ETHTYPE_IP)) #endif { nllvdbg("IP frame\n"); @@ -1195,7 +1195,7 @@ static void sam_receive(struct sam_emac_s *priv) sam_transmit(priv); } } - else if (BUF->type == htons(UIP_ETHTYPE_ARP)) + else if (BUF->type == htons(ETHTYPE_ARP)) { nllvdbg("ARP frame\n"); diff --git a/arch/arm/src/sama5/sam_emacb.c b/arch/arm/src/sama5/sam_emacb.c index 9a0a70d67e..c459b526e8 100644 --- a/arch/arm/src/sama5/sam_emacb.c +++ b/arch/arm/src/sama5/sam_emacb.c @@ -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 */ #ifdef CONFIG_NET_IPv6 - else if (BUF->type == HTONS(UIP_ETHTYPE_IP6)) + else if (BUF->type == HTONS(ETHTYPE_IP6)) #else - else if (BUF->type == HTONS(UIP_ETHTYPE_IP)) + else if (BUF->type == HTONS(ETHTYPE_IP)) #endif { nllvdbg("IP frame\n"); @@ -1516,7 +1516,7 @@ static void sam_receive(struct sam_emac_s *priv) sam_transmit(priv); } } - else if (BUF->type == htons(UIP_ETHTYPE_ARP)) + else if (BUF->type == htons(ETHTYPE_ARP)) { nllvdbg("ARP frame\n"); diff --git a/arch/arm/src/sama5/sam_gmac.c b/arch/arm/src/sama5/sam_gmac.c index 01ad32c58a..992e3d72d9 100644 --- a/arch/arm/src/sama5/sam_gmac.c +++ b/arch/arm/src/sama5/sam_gmac.c @@ -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 */ #ifdef CONFIG_NET_IPv6 - else if (BUF->type == HTONS(UIP_ETHTYPE_IP6)) + else if (BUF->type == HTONS(ETHTYPE_IP6)) #else - else if (BUF->type == HTONS(UIP_ETHTYPE_IP)) + else if (BUF->type == HTONS(ETHTYPE_IP)) #endif { nllvdbg("IP frame\n"); @@ -1125,7 +1125,7 @@ static void sam_receive(struct sam_gmac_s *priv) sam_transmit(priv); } } - else if (BUF->type == htons(UIP_ETHTYPE_ARP)) + else if (BUF->type == htons(ETHTYPE_ARP)) { nllvdbg("ARP frame\n"); diff --git a/arch/arm/src/stm32/stm32_eth.c b/arch/arm/src/stm32/stm32_eth.c index 0b3b3c2ab4..29f589e15f 100644 --- a/arch/arm/src/stm32/stm32_eth.c +++ b/arch/arm/src/stm32/stm32_eth.c @@ -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 */ #ifdef CONFIG_NET_IPv6 - else if (BUF->type == HTONS(UIP_ETHTYPE_IP6)) + else if (BUF->type == HTONS(ETHTYPE_IP6)) #else - else if (BUF->type == HTONS(UIP_ETHTYPE_IP)) + else if (BUF->type == HTONS(ETHTYPE_IP)) #endif { nllvdbg("IP frame\n"); @@ -1635,7 +1635,7 @@ static void stm32_receive(FAR struct stm32_ethmac_s *priv) stm32_transmit(priv); } } - else if (BUF->type == htons(UIP_ETHTYPE_ARP)) + else if (BUF->type == htons(ETHTYPE_ARP)) { nllvdbg("ARP frame\n"); diff --git a/arch/arm/src/tiva/tiva_ethernet.c b/arch/arm/src/tiva/tiva_ethernet.c index 4a988f1c21..6e97070bfc 100644 --- a/arch/arm/src/tiva/tiva_ethernet.c +++ b/arch/arm/src/tiva/tiva_ethernet.c @@ -514,7 +514,7 @@ static int tiva_transmit(struct tiva_driver_s *priv) pktlen = priv->ld_dev.d_len; nllvdbg("Sending packet, pktlen: %d\n", pktlen); - DEBUGASSERT(pktlen > UIP_LLH_LEN); + DEBUGASSERT(pktlen > NET_LLH_LEN); dbuf = priv->ld_dev.d_buf; 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. */ - if (pktlen > (CONFIG_NET_BUFSIZE + 6) || pktlen <= (UIP_LLH_LEN + 6)) + if (pktlen > (CONFIG_NET_BUFSIZE + 6) || pktlen <= (NET_LLH_LEN + 6)) { 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 */ #ifdef CONFIG_NET_IPv6 - if (ETHBUF->type == HTONS(UIP_ETHTYPE_IP6)) + if (ETHBUF->type == HTONS(ETHTYPE_IP6)) #else - if (ETHBUF->type == HTONS(UIP_ETHTYPE_IP)) + if (ETHBUF->type == HTONS(ETHTYPE_IP)) #endif { nllvdbg("IP packet received (%02x)\n", ETHBUF->type); @@ -779,7 +779,7 @@ static void tiva_receive(struct tiva_driver_s *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); EMAC_STAT(priv, rx_arp); diff --git a/arch/hc/src/m9s12/m9s12_ethernet.c b/arch/hc/src/m9s12/m9s12_ethernet.c index d9461ed3a8..ebf4cc28f8 100644 --- a/arch/hc/src/m9s12/m9s12_ethernet.c +++ b/arch/hc/src/m9s12/m9s12_ethernet.c @@ -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 */ #ifdef CONFIG_NET_IPv6 - if (BUF->type == HTONS(UIP_ETHTYPE_IP6)) + if (BUF->type == HTONS(ETHTYPE_IP6)) #else - if (BUF->type == HTONS(UIP_ETHTYPE_IP)) + if (BUF->type == HTONS(ETHTYPE_IP)) #endif { arp_ipin(&priv->d_dev); @@ -277,7 +277,7 @@ static void emac_receive(FAR struct emac_driver_s *priv) emac_transmit(priv); } } - else if (BUF->type == htons(UIP_ETHTYPE_ARP)) + else if (BUF->type == htons(ETHTYPE_ARP)) { arp_arpin(&priv->d_dev); diff --git a/arch/mips/src/pic32mx/pic32mx-ethernet.c b/arch/mips/src/pic32mx/pic32mx-ethernet.c index fb3d7b269c..b76d0d2e91 100644 --- a/arch/mips/src/pic32mx/pic32mx-ethernet.c +++ b/arch/mips/src/pic32mx/pic32mx-ethernet.c @@ -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 */ #ifdef CONFIG_NET_IPv6 - if (BUF->type == HTONS(UIP_ETHTYPE_IP6)) + if (BUF->type == HTONS(ETHTYPE_IP6)) #else - if (BUF->type == HTONS(UIP_ETHTYPE_IP)) + if (BUF->type == HTONS(ETHTYPE_IP)) #endif { /* Handle the incoming IP packet */ @@ -1449,7 +1449,7 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv) pic32mx_response(priv); } } - else if (BUF->type == htons(UIP_ETHTYPE_ARP)) + else if (BUF->type == htons(ETHTYPE_ARP)) { /* Handle the incoming ARP packet */ diff --git a/arch/sim/src/up_netdriver.c b/arch/sim/src/up_netdriver.c index 649b9afaf6..8b22c00f93 100644 --- a/arch/sim/src/up_netdriver.c +++ b/arch/sim/src/up_netdriver.c @@ -156,14 +156,14 @@ void netdriver_loop(void) * 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 */ #ifdef CONFIG_NET_IPv6 - if (BUF->ether_type == htons(UIP_ETHTYPE_IP6)) + if (BUF->ether_type == htons(ETHTYPE_IP6)) #else - if (BUF->ether_type == htons(UIP_ETHTYPE_IP)) + if (BUF->ether_type == htons(ETHTYPE_IP)) #endif { 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); } } - else if (BUF->ether_type == htons(UIP_ETHTYPE_ARP)) + else if (BUF->ether_type == htons(ETHTYPE_ARP)) { arp_arpin(&g_sim_dev); diff --git a/arch/z80/src/ez80/ez80_emac.c b/arch/z80/src/ez80/ez80_emac.c index ab9e08a1aa..1926786bf1 100644 --- a/arch/z80/src/ez80/ez80_emac.c +++ b/arch/z80/src/ez80/ez80_emac.c @@ -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 */ #ifdef CONFIG_NET_IPv6 - if (ETHBUF->type == HTONS(UIP_ETHTYPE_IP6)) + if (ETHBUF->type == HTONS(ETHTYPE_IP6)) #else - if (ETHBUF->type == HTONS(UIP_ETHTYPE_IP)) + if (ETHBUF->type == HTONS(ETHTYPE_IP)) #endif { nvdbg("IP packet received (%02x)\n", ETHBUF->type); @@ -1287,7 +1287,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *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); EMAC_STAT(priv, rx_arp);