From 08043fb5bcff227a56cf0adb457b946eb120b19d Mon Sep 17 00:00:00 2001 From: Petro Karashchenko Date: Tue, 18 Jan 2022 00:09:14 +0200 Subject: [PATCH] net: unify FAR keyword usage for all net buffer memory mapped buffers Signed-off-by: Petro Karashchenko --- arch/arm/src/c5471/c5471_ethernet.c | 2 +- arch/arm/src/imx6/imx_enet.c | 2 +- arch/arm/src/imxrt/imxrt_enet.c | 2 +- arch/arm/src/kinetis/kinetis_enet.c | 2 +- arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c | 2 +- arch/arm/src/lpc43xx/lpc43_ethernet.c | 2 +- arch/arm/src/lpc54xx/lpc54_ethernet.c | 4 ++-- arch/arm/src/rtl8720c/amebaz_netdev.c | 2 +- arch/arm/src/s32k1xx/s32k1xx_enet.c | 2 +- arch/arm/src/sam34/sam_emac.c | 2 +- arch/arm/src/sama5/sam_emaca.c | 2 +- arch/arm/src/sama5/sam_emacb.c | 2 +- arch/arm/src/sama5/sam_gmac.c | 2 +- arch/arm/src/samd5e5/sam_gmac.c | 2 +- arch/arm/src/samv7/sam_emac.c | 2 +- arch/arm/src/stm32/stm32_eth.c | 2 +- arch/arm/src/stm32f7/stm32_ethernet.c | 2 +- arch/arm/src/stm32h7/stm32_ethernet.c | 2 +- arch/arm/src/tiva/lm/lm3s_ethernet.c | 2 +- arch/arm/src/tiva/tm4c/tm4c_ethernet.c | 2 +- arch/hc/src/m9s12/m9s12_ethernet.c | 2 +- arch/mips/src/pic32mx/pic32mx_ethernet.c | 2 +- arch/mips/src/pic32mz/pic32mz_ethernet.c | 2 +- arch/misoc/src/common/misoc_net.c | 2 +- arch/renesas/src/rx65n/rx65n_eth.c | 2 +- arch/xtensa/src/esp32/esp32_wlan.c | 2 +- arch/z80/src/ez80/ez80_emac.c | 2 +- drivers/net/dm90x0.c | 2 +- drivers/net/enc28j60.c | 2 +- drivers/net/encx24j600.c | 2 +- drivers/net/ftmac100.c | 2 +- drivers/net/rpmsgdrv.c | 10 +++++----- drivers/net/skeleton.c | 2 +- drivers/usbdev/cdcecm.c | 2 +- drivers/usbhost/usbhost_cdcmbim.c | 2 +- drivers/wireless/ieee80211/bcm43xxx/bcmf_netdev.c | 2 +- include/nuttx/net/netdev.h | 2 +- net/arp/arp_arpin.c | 4 ++-- net/arp/arp_format.c | 4 ++-- net/arp/arp_ipin.c | 4 ++-- net/arp/arp_out.c | 6 +++--- net/devif/ipv4_input.c | 2 +- net/icmp/icmp_recvmsg.c | 4 ++-- net/icmp/icmp_reply.c | 4 ++-- net/icmp/icmp_sendmsg.c | 4 ++-- net/icmpv6/icmpv6_advertise.c | 4 ++-- net/icmpv6/icmpv6_input.c | 6 +++--- net/icmpv6/icmpv6_radvertise.c | 4 ++-- net/icmpv6/icmpv6_recvmsg.c | 4 ++-- net/icmpv6/icmpv6_reply.c | 4 ++-- net/icmpv6/icmpv6_rsolicit.c | 4 ++-- net/icmpv6/icmpv6_sendmsg.c | 4 ++-- net/icmpv6/icmpv6_solicit.c | 4 ++-- net/sixlowpan/sixlowpan_tcpsend.c | 2 +- net/tcp/tcp_conn.c | 4 ++-- net/tcp/tcp_recvfrom.c | 8 ++++---- net/tcp/tcp_send.c | 10 +++++----- net/tcp/tcp_send_buffered.c | 4 ++-- net/tcp/tcp_send_unbuffered.c | 4 ++-- net/tcp/tcp_sendfile.c | 4 ++-- net/udp/udp_conn.c | 4 ++-- net/udp/udp_recvfrom.c | 8 ++++---- net/udp/udp_send.c | 8 ++++---- net/udp/udp_sendto_buffered.c | 4 ++-- net/utils/net_ipchksum.c | 4 ++-- sched/init/nx_start.c | 2 +- 66 files changed, 108 insertions(+), 108 deletions(-) diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c index 5a8d9881a11..31df990bd34 100644 --- a/arch/arm/src/c5471/c5471_ethernet.c +++ b/arch/arm/src/c5471/c5471_ethernet.c @@ -281,7 +281,7 @@ /* This is a helper pointer for accessing the contents of Ethernet header */ -#define BUF ((struct eth_hdr_s *)priv->c_dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->c_dev.d_buf) /**************************************************************************** * Private Types diff --git a/arch/arm/src/imx6/imx_enet.c b/arch/arm/src/imx6/imx_enet.c index c3e7ae63518..c75941f90d4 100644 --- a/arch/arm/src/imx6/imx_enet.c +++ b/arch/arm/src/imx6/imx_enet.c @@ -260,7 +260,7 @@ * the contents of the Ethernet header */ -#define BUF ((struct eth_hdr_s *)priv->dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->dev.d_buf) #define IMX_BUF_SIZE ENET_ALIGN_UP(CONFIG_NET_ETH_PKTSIZE) diff --git a/arch/arm/src/imxrt/imxrt_enet.c b/arch/arm/src/imxrt/imxrt_enet.c index c276d0e31c6..decdf1006fc 100644 --- a/arch/arm/src/imxrt/imxrt_enet.c +++ b/arch/arm/src/imxrt/imxrt_enet.c @@ -244,7 +244,7 @@ * the contents of the Ethernet header */ -#define BUF ((struct eth_hdr_s *)priv->dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->dev.d_buf) #define IMXRT_BUF_SIZE ENET_ALIGN_UP(CONFIG_NET_ETH_PKTSIZE + \ CONFIG_NET_GUARDSIZE) diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c index 45b2f07e146..6cb4361a51c 100644 --- a/arch/arm/src/kinetis/kinetis_enet.c +++ b/arch/arm/src/kinetis/kinetis_enet.c @@ -194,7 +194,7 @@ * header */ -#define BUF ((struct eth_hdr_s *)priv->dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->dev.d_buf) #define KINETIS_BUF_SIZE ((CONFIG_NET_ETH_PKTSIZE & 0xfffffff0) + 0x10) diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c index 244e4e56a62..d87ed770430 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c @@ -165,7 +165,7 @@ /* This is a helper pointer for accessing the contents of Ethernet header */ -#define BUF ((struct eth_hdr_s *)priv->lp_dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->lp_dev.d_buf) /* This is the number of ethernet GPIO pins that must be configured */ diff --git a/arch/arm/src/lpc43xx/lpc43_ethernet.c b/arch/arm/src/lpc43xx/lpc43_ethernet.c index 45486972759..a3079ba5176 100644 --- a/arch/arm/src/lpc43xx/lpc43_ethernet.c +++ b/arch/arm/src/lpc43xx/lpc43_ethernet.c @@ -498,7 +498,7 @@ * header */ -#define BUF ((struct eth_hdr_s *)priv->dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->dev.d_buf) /**************************************************************************** * Private Types diff --git a/arch/arm/src/lpc54xx/lpc54_ethernet.c b/arch/arm/src/lpc54xx/lpc54_ethernet.c index e3162444e4a..4eb4ed0e1e1 100644 --- a/arch/arm/src/lpc54xx/lpc54_ethernet.c +++ b/arch/arm/src/lpc54xx/lpc54_ethernet.c @@ -257,8 +257,8 @@ * header. */ -#define ETHBUF ((struct eth_hdr_s *)priv->eth_dev.d_buf) -#define ETH8021QWBUF ((struct eth_8021qhdr_s *)priv->eth_dev.d_buf) +#define ETHBUF ((FAR struct eth_hdr_s *)priv->eth_dev.d_buf) +#define ETH8021QWBUF ((FAR struct eth_8021qhdr_s *)priv->eth_dev.d_buf) /**************************************************************************** * Private Types diff --git a/arch/arm/src/rtl8720c/amebaz_netdev.c b/arch/arm/src/rtl8720c/amebaz_netdev.c index c0a5232c9d4..914dda68197 100644 --- a/arch/arm/src/rtl8720c/amebaz_netdev.c +++ b/arch/arm/src/rtl8720c/amebaz_netdev.c @@ -156,7 +156,7 @@ void amebaz_netdev_notify_receive(FAR struct amebaz_dev_s *priv, NETDEV_RXPACKETS(&priv->dev); net_lock(); oldbuf = priv->dev.d_buf; - hdr = (struct eth_hdr_s *)skb->data; + hdr = (FAR struct eth_hdr_s *)skb->data; priv->dev.d_buf = (void *)skb->data; priv->dev.d_len = len; #ifdef CONFIG_NET_PKT diff --git a/arch/arm/src/s32k1xx/s32k1xx_enet.c b/arch/arm/src/s32k1xx/s32k1xx_enet.c index 53092569731..3075d25264c 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_enet.c +++ b/arch/arm/src/s32k1xx/s32k1xx_enet.c @@ -239,7 +239,7 @@ /* This is a helper pointer for accessing the contents of Ethernet header */ -#define BUF ((struct eth_hdr_s *)priv->dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->dev.d_buf) #define S32K1XX_BUF_SIZE ENET_ALIGN_UP(CONFIG_NET_ETH_PKTSIZE) diff --git a/arch/arm/src/sam34/sam_emac.c b/arch/arm/src/sam34/sam_emac.c index e4ac27c3eed..a702cf445e6 100644 --- a/arch/arm/src/sam34/sam_emac.c +++ b/arch/arm/src/sam34/sam_emac.c @@ -236,7 +236,7 @@ * header */ -#define BUF ((struct eth_hdr_s *)priv->dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->dev.d_buf) /**************************************************************************** * Private Types diff --git a/arch/arm/src/sama5/sam_emaca.c b/arch/arm/src/sama5/sam_emaca.c index 4f85ed8242c..af4ee23600c 100644 --- a/arch/arm/src/sama5/sam_emaca.c +++ b/arch/arm/src/sama5/sam_emaca.c @@ -267,7 +267,7 @@ * header */ -#define BUF ((struct eth_hdr_s *)priv->dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->dev.d_buf) /**************************************************************************** * Private Types diff --git a/arch/arm/src/sama5/sam_emacb.c b/arch/arm/src/sama5/sam_emacb.c index e6b6ffd1b8d..a0236379430 100644 --- a/arch/arm/src/sama5/sam_emacb.c +++ b/arch/arm/src/sama5/sam_emacb.c @@ -314,7 +314,7 @@ * header */ -#define BUF ((struct eth_hdr_s *)priv->dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->dev.d_buf) /**************************************************************************** * Private Types diff --git a/arch/arm/src/sama5/sam_gmac.c b/arch/arm/src/sama5/sam_gmac.c index 67b7e09b7dc..931d78073aa 100644 --- a/arch/arm/src/sama5/sam_gmac.c +++ b/arch/arm/src/sama5/sam_gmac.c @@ -193,7 +193,7 @@ * header */ -#define BUF ((struct eth_hdr_s *)priv->dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->dev.d_buf) /**************************************************************************** * Private Types diff --git a/arch/arm/src/samd5e5/sam_gmac.c b/arch/arm/src/samd5e5/sam_gmac.c index e79e27123d3..65c32e39d73 100644 --- a/arch/arm/src/samd5e5/sam_gmac.c +++ b/arch/arm/src/samd5e5/sam_gmac.c @@ -190,7 +190,7 @@ * header */ -#define BUF ((struct eth_hdr_s *)priv->dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->dev.d_buf) /**************************************************************************** * Private Types diff --git a/arch/arm/src/samv7/sam_emac.c b/arch/arm/src/samv7/sam_emac.c index a8bcc4815d8..6ee60a1d4b0 100644 --- a/arch/arm/src/samv7/sam_emac.c +++ b/arch/arm/src/samv7/sam_emac.c @@ -410,7 +410,7 @@ * header */ -#define BUF ((struct eth_hdr_s *)priv->dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->dev.d_buf) /**************************************************************************** * Private Types diff --git a/arch/arm/src/stm32/stm32_eth.c b/arch/arm/src/stm32/stm32_eth.c index 57f006c48c3..27aabbb32cd 100644 --- a/arch/arm/src/stm32/stm32_eth.c +++ b/arch/arm/src/stm32/stm32_eth.c @@ -607,7 +607,7 @@ * header */ -#define BUF ((struct eth_hdr_s *)priv->dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->dev.d_buf) /**************************************************************************** * Private Types diff --git a/arch/arm/src/stm32f7/stm32_ethernet.c b/arch/arm/src/stm32f7/stm32_ethernet.c index 18815048645..a82b58e7153 100644 --- a/arch/arm/src/stm32f7/stm32_ethernet.c +++ b/arch/arm/src/stm32f7/stm32_ethernet.c @@ -594,7 +594,7 @@ * header */ -#define BUF ((struct eth_hdr_s *)priv->dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->dev.d_buf) /**************************************************************************** * Private Types diff --git a/arch/arm/src/stm32h7/stm32_ethernet.c b/arch/arm/src/stm32h7/stm32_ethernet.c index 4f172b5ce0a..209db66e5c1 100644 --- a/arch/arm/src/stm32h7/stm32_ethernet.c +++ b/arch/arm/src/stm32h7/stm32_ethernet.c @@ -599,7 +599,7 @@ * header */ -#define BUF ((struct eth_hdr_s *)priv->dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->dev.d_buf) /**************************************************************************** * Private Types diff --git a/arch/arm/src/tiva/lm/lm3s_ethernet.c b/arch/arm/src/tiva/lm/lm3s_ethernet.c index cade0e27961..51121f8363a 100644 --- a/arch/arm/src/tiva/lm/lm3s_ethernet.c +++ b/arch/arm/src/tiva/lm/lm3s_ethernet.c @@ -167,7 +167,7 @@ /* This is a helper pointer for accessing the contents of Ethernet header */ -#define ETHBUF ((struct eth_hdr_s *)priv->ld_dev.d_buf) +#define ETHBUF ((FAR struct eth_hdr_s *)priv->ld_dev.d_buf) #define TIVA_MAX_MDCCLK 2500000 diff --git a/arch/arm/src/tiva/tm4c/tm4c_ethernet.c b/arch/arm/src/tiva/tm4c/tm4c_ethernet.c index e122c5492c4..a48815e6fd8 100644 --- a/arch/arm/src/tiva/tm4c/tm4c_ethernet.c +++ b/arch/arm/src/tiva/tm4c/tm4c_ethernet.c @@ -615,7 +615,7 @@ * header */ -#define BUF ((struct eth_hdr_s *)priv->dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->dev.d_buf) /**************************************************************************** * Private Types diff --git a/arch/hc/src/m9s12/m9s12_ethernet.c b/arch/hc/src/m9s12/m9s12_ethernet.c index f1a8749dde9..a9d17e6b21e 100644 --- a/arch/hc/src/m9s12/m9s12_ethernet.c +++ b/arch/hc/src/m9s12/m9s12_ethernet.c @@ -69,7 +69,7 @@ /* This is a helper pointer for accessing the contents of Ethernet header */ -#define BUF ((struct eth_hdr_s *)priv->d_dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->d_dev.d_buf) /**************************************************************************** * Private Types diff --git a/arch/mips/src/pic32mx/pic32mx_ethernet.c b/arch/mips/src/pic32mx/pic32mx_ethernet.c index 32a36026bc0..697bef66f7c 100644 --- a/arch/mips/src/pic32mx/pic32mx_ethernet.c +++ b/arch/mips/src/pic32mx/pic32mx_ethernet.c @@ -215,7 +215,7 @@ * header */ -#define BUF ((struct eth_hdr_s *)priv->pd_dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->pd_dev.d_buf) /* PHYs *********************************************************************/ diff --git a/arch/mips/src/pic32mz/pic32mz_ethernet.c b/arch/mips/src/pic32mz/pic32mz_ethernet.c index 7f2e70b0f4c..62bdcc44ba0 100644 --- a/arch/mips/src/pic32mz/pic32mz_ethernet.c +++ b/arch/mips/src/pic32mz/pic32mz_ethernet.c @@ -254,7 +254,7 @@ * header */ -#define BUF ((struct eth_hdr_s *)priv->pd_dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->pd_dev.d_buf) /* PHYs *********************************************************************/ diff --git a/arch/misoc/src/common/misoc_net.c b/arch/misoc/src/common/misoc_net.c index 4bf8731df5b..d715e2c728a 100644 --- a/arch/misoc/src/common/misoc_net.c +++ b/arch/misoc/src/common/misoc_net.c @@ -88,7 +88,7 @@ /* This is a helper pointer for accessing the contents of Ethernet header */ -#define BUF ((struct eth_hdr_s *)priv->misoc_net_dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->misoc_net_dev.d_buf) /**************************************************************************** * Private Types diff --git a/arch/renesas/src/rx65n/rx65n_eth.c b/arch/renesas/src/rx65n/rx65n_eth.c index 87259747012..f0d0b671182 100644 --- a/arch/renesas/src/rx65n/rx65n_eth.c +++ b/arch/renesas/src/rx65n/rx65n_eth.c @@ -198,7 +198,7 @@ * header */ -#define BUF ((struct eth_hdr_s *)priv->dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->dev.d_buf) /* PHY return definitions */ diff --git a/arch/xtensa/src/esp32/esp32_wlan.c b/arch/xtensa/src/esp32/esp32_wlan.c index 9183aa1516c..6bf510b2aec 100644 --- a/arch/xtensa/src/esp32/esp32_wlan.c +++ b/arch/xtensa/src/esp32/esp32_wlan.c @@ -1077,7 +1077,7 @@ static void wlan_txtimeout_expiry(wdparm_t arg) static void wlan_poll_work(void *arg) { int32_t delay_tick = WLAN_WDDELAY; - FAR struct wlan_priv_s *priv = (FAR struct wlan_priv_s *)arg; + struct wlan_priv_s *priv = (struct wlan_priv_s *)arg; struct net_driver_s *dev = &priv->dev; struct wlan_pktbuf *pktbuf; diff --git a/arch/z80/src/ez80/ez80_emac.c b/arch/z80/src/ez80/ez80_emac.c index 20333ab29cc..74c381dffa8 100644 --- a/arch/z80/src/ez80/ez80_emac.c +++ b/arch/z80/src/ez80/ez80_emac.c @@ -255,7 +255,7 @@ extern uintptr_t _RAM_ADDR_U_INIT_PARAM; /* This is a helper pointer for accessing the contents of Ethernet header */ -#define ETHBUF ((struct eth_hdr_s *)priv->dev.d_buf) +#define ETHBUF ((FAR struct eth_hdr_s *)priv->dev.d_buf) /**************************************************************************** * Private Types diff --git a/drivers/net/dm90x0.c b/drivers/net/dm90x0.c index 1167daf7b6a..f567d0662df 100644 --- a/drivers/net/dm90x0.c +++ b/drivers/net/dm90x0.c @@ -281,7 +281,7 @@ /* This is a helper pointer for accessing the contents of Ethernet header */ -#define BUF ((struct eth_hdr_s *)priv->dm_dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->dm_dev.d_buf) /**************************************************************************** * Private Types diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c index 14bf84ea31b..8824c0e1e4e 100644 --- a/drivers/net/enc28j60.c +++ b/drivers/net/enc28j60.c @@ -181,7 +181,7 @@ /* This is a helper pointer for accessing the contents of Ethernet header */ -#define BUF ((struct eth_hdr_s *)priv->dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->dev.d_buf) /* Debug ********************************************************************/ diff --git a/drivers/net/encx24j600.c b/drivers/net/encx24j600.c index 6dc79cf1e5d..ff500b19ecd 100644 --- a/drivers/net/encx24j600.c +++ b/drivers/net/encx24j600.c @@ -164,7 +164,7 @@ /* This is a helper pointer for accessing the contents of Ethernet header */ -#define BUF ((struct eth_hdr_s *)priv->dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->dev.d_buf) /* Debug ********************************************************************/ diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index 09b370c8a4f..b972d2fd99e 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -95,7 +95,7 @@ * header. */ -#define BUF ((struct eth_hdr_s *)priv->ft_dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->ft_dev.d_buf) /* RX/TX buffer alignment */ diff --git a/drivers/net/rpmsgdrv.c b/drivers/net/rpmsgdrv.c index 1aacba6f6e3..6c102fb37f2 100644 --- a/drivers/net/rpmsgdrv.c +++ b/drivers/net/rpmsgdrv.c @@ -457,8 +457,8 @@ static int net_rpmsg_drv_sockioctl_handler(FAR struct rpmsg_endpoint *ept, static bool net_rpmsg_drv_is_ipv4(FAR struct net_driver_s *dev) { FAR struct ipv4_hdr_s *ip = - (struct ipv4_hdr_s *)(dev->d_buf + dev->d_llhdrlen); - FAR struct eth_hdr_s *eth = (struct eth_hdr_s *)dev->d_buf; + (FAR struct ipv4_hdr_s *)(dev->d_buf + dev->d_llhdrlen); + FAR struct eth_hdr_s *eth = (FAR struct eth_hdr_s *)dev->d_buf; if (dev->d_lltype == NET_LL_ETHERNET || dev->d_lltype == NET_LL_IEEE80211) { @@ -475,8 +475,8 @@ static bool net_rpmsg_drv_is_ipv4(FAR struct net_driver_s *dev) static bool net_rpmsg_drv_is_ipv6(FAR struct net_driver_s *dev) { FAR struct ipv6_hdr_s *ip = - (struct ipv6_hdr_s *)(dev->d_buf + dev->d_llhdrlen); - FAR struct eth_hdr_s *eth = (struct eth_hdr_s *)dev->d_buf; + (FAR struct ipv6_hdr_s *)(dev->d_buf + dev->d_llhdrlen); + FAR struct eth_hdr_s *eth = (FAR struct eth_hdr_s *)dev->d_buf; if (dev->d_lltype == NET_LL_ETHERNET || dev->d_lltype == NET_LL_IEEE80211) { @@ -492,7 +492,7 @@ static bool net_rpmsg_drv_is_ipv6(FAR struct net_driver_s *dev) #ifdef CONFIG_NET_ARP static bool net_rpmsg_drv_is_arp(FAR struct net_driver_s *dev) { - FAR struct eth_hdr_s *eth = (struct eth_hdr_s *)dev->d_buf; + FAR struct eth_hdr_s *eth = (FAR struct eth_hdr_s *)dev->d_buf; if (dev->d_lltype == NET_LL_ETHERNET || dev->d_lltype == NET_LL_IEEE80211) { diff --git a/drivers/net/skeleton.c b/drivers/net/skeleton.c index 22e26d459b8..792ae6ca52b 100644 --- a/drivers/net/skeleton.c +++ b/drivers/net/skeleton.c @@ -88,7 +88,7 @@ /* This is a helper pointer for accessing the contents of Ethernet header */ -#define BUF ((struct eth_hdr_s *)priv->sk_dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->sk_dev.d_buf) /**************************************************************************** * Private Types diff --git a/drivers/usbdev/cdcecm.c b/drivers/usbdev/cdcecm.c index a2a33f1bd40..15b6107d382 100644 --- a/drivers/usbdev/cdcecm.c +++ b/drivers/usbdev/cdcecm.c @@ -102,7 +102,7 @@ /* This is a helper pointer for accessing the contents of Ethernet header */ -#define BUF ((struct eth_hdr_s *)self->dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)self->dev.d_buf) /**************************************************************************** * Private Types diff --git a/drivers/usbhost/usbhost_cdcmbim.c b/drivers/usbhost/usbhost_cdcmbim.c index 664a8661a14..52b857c8546 100644 --- a/drivers/usbhost/usbhost_cdcmbim.c +++ b/drivers/usbhost/usbhost_cdcmbim.c @@ -2271,7 +2271,7 @@ static void cdcmbim_receive(struct usbhost_cdcmbim_s *priv, priv->netdev.d_buf = buf; priv->netdev.d_len = len; - switch (((struct ipv4_hdr_s *)buf)->vhl & IP_VERSION_MASK) + switch (((FAR struct ipv4_hdr_s *)buf)->vhl & IP_VERSION_MASK) { #ifdef CONFIG_NET_IPv4 case IPv4_VERSION: diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_netdev.c b/drivers/wireless/ieee80211/bcm43xxx/bcmf_netdev.c index b077d7f6e82..f793f1ec06c 100644 --- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_netdev.c +++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_netdev.c @@ -95,7 +95,7 @@ /* This is a helper pointer for accessing the contents of Ethernet header */ -#define BUF ((struct eth_hdr_s *)priv->bc_dev.d_buf) +#define BUF ((FAR struct eth_hdr_s *)priv->bc_dev.d_buf) /**************************************************************************** * Private Function Prototypes diff --git a/include/nuttx/net/netdev.h b/include/nuttx/net/netdev.h index bcc14ede5d4..6db2237352d 100644 --- a/include/nuttx/net/netdev.h +++ b/include/nuttx/net/netdev.h @@ -451,7 +451,7 @@ typedef CODE int (*devif_poll_callback_t)(FAR struct net_driver_s *dev); * Ethernet, you will need to call the network ARP code before calling * this function: * - * #define BUF ((struct eth_hdr_s *)&dev->d_buf[0]) + * #define BUF ((FAR struct eth_hdr_s *)&dev->d_buf[0]) * dev->d_len = ethernet_devicedrver_poll(); * if (dev->d_len > 0) * { diff --git a/net/arp/arp_arpin.c b/net/arp/arp_arpin.c index 12f87602da8..2f1a582d9c6 100644 --- a/net/arp/arp_arpin.c +++ b/net/arp/arp_arpin.c @@ -59,8 +59,8 @@ * Pre-processor Definitions ****************************************************************************/ -#define ETHBUF ((struct eth_hdr_s *)&dev->d_buf[0]) -#define ARPBUF ((struct arp_hdr_s *)&dev->d_buf[ETH_HDRLEN]) +#define ETHBUF ((FAR struct eth_hdr_s *)&dev->d_buf[0]) +#define ARPBUF ((FAR struct arp_hdr_s *)&dev->d_buf[ETH_HDRLEN]) /**************************************************************************** * Public Functions diff --git a/net/arp/arp_format.c b/net/arp/arp_format.c index c17b4fbdf1a..a424ec41e0c 100644 --- a/net/arp/arp_format.c +++ b/net/arp/arp_format.c @@ -59,8 +59,8 @@ * Pre-processor Definitions ****************************************************************************/ -#define ETHBUF ((struct eth_hdr_s *)&dev->d_buf[0]) -#define ARPBUF ((struct arp_hdr_s *)&dev->d_buf[ETH_HDRLEN]) +#define ETHBUF ((FAR struct eth_hdr_s *)&dev->d_buf[0]) +#define ARPBUF ((FAR struct arp_hdr_s *)&dev->d_buf[ETH_HDRLEN]) /**************************************************************************** * Public Functions diff --git a/net/arp/arp_ipin.c b/net/arp/arp_ipin.c index f3be0224428..a375d84c691 100644 --- a/net/arp/arp_ipin.c +++ b/net/arp/arp_ipin.c @@ -56,8 +56,8 @@ * Pre-processor Definitions ****************************************************************************/ -#define ETHBUF ((struct eth_hdr_s *)&dev->d_buf[0]) -#define IPBUF ((struct arp_iphdr_s *)&dev->d_buf[ETH_HDRLEN]) +#define ETHBUF ((FAR struct eth_hdr_s *)&dev->d_buf[0]) +#define IPBUF ((FAR struct arp_iphdr_s *)&dev->d_buf[ETH_HDRLEN]) /**************************************************************************** * Public Functions diff --git a/net/arp/arp_out.c b/net/arp/arp_out.c index 7356006e339..37ef851a0de 100644 --- a/net/arp/arp_out.c +++ b/net/arp/arp_out.c @@ -59,9 +59,9 @@ * Pre-processor Definitions ****************************************************************************/ -#define ETHBUF ((struct eth_hdr_s *)&dev->d_buf[0]) -#define ARPBUF ((struct arp_hdr_s *)&dev->d_buf[ETH_HDRLEN]) -#define IPBUF ((struct arp_iphdr_s *)&dev->d_buf[ETH_HDRLEN]) +#define ETHBUF ((FAR struct eth_hdr_s *)&dev->d_buf[0]) +#define ARPBUF ((FAR struct arp_hdr_s *)&dev->d_buf[ETH_HDRLEN]) +#define IPBUF ((FAR struct arp_iphdr_s *)&dev->d_buf[ETH_HDRLEN]) /**************************************************************************** * Private Data diff --git a/net/devif/ipv4_input.c b/net/devif/ipv4_input.c index fa45b930e90..bb16940cbf6 100644 --- a/net/devif/ipv4_input.c +++ b/net/devif/ipv4_input.c @@ -110,7 +110,7 @@ /* Macros */ -#define BUF ((FAR struct ipv4_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) +#define BUF ((FAR struct ipv4_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) /**************************************************************************** * Private Data diff --git a/net/icmp/icmp_recvmsg.c b/net/icmp/icmp_recvmsg.c index 013d7fe5e36..4ceb06886b2 100644 --- a/net/icmp/icmp_recvmsg.c +++ b/net/icmp/icmp_recvmsg.c @@ -43,8 +43,8 @@ * Pre-processor Definitions ****************************************************************************/ -#define IPv4BUF ((struct ipv4_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) -#define ICMPBUF ((struct icmp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv4_HDRLEN]) +#define IPv4BUF ((FAR struct ipv4_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) +#define ICMPBUF ((FAR struct icmp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv4_HDRLEN]) #define ICMPSIZE ((dev)->d_len - IPv4_HDRLEN) /**************************************************************************** diff --git a/net/icmp/icmp_reply.c b/net/icmp/icmp_reply.c index 77d05c2415b..c5faa681573 100644 --- a/net/icmp/icmp_reply.c +++ b/net/icmp/icmp_reply.c @@ -51,7 +51,7 @@ * Pre-processor Definitions ****************************************************************************/ -#define IPv4BUF ((struct ipv4_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) +#define IPv4BUF ((FAR struct ipv4_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) /* RFC 1812: * 4.3.2.3, Original Message Header @@ -93,7 +93,7 @@ void icmp_reply(FAR struct net_driver_s *dev, int type, int code) { int ipicmplen = IPv4_HDRLEN + sizeof(struct icmp_hdr_s); FAR struct ipv4_hdr_s *ipv4 = IPv4BUF; - FAR struct icmp_hdr_s *icmp = (FAR void *)(ipv4 + 1); + FAR struct icmp_hdr_s *icmp = (FAR struct icmp_hdr_s *)(ipv4 + 1); uint16_t datalen; #ifdef CONFIG_NET_BROADCAST const in_addr_t bcast = INADDR_BROADCAST; diff --git a/net/icmp/icmp_sendmsg.c b/net/icmp/icmp_sendmsg.c index a4a8f834867..4fad4c95e72 100644 --- a/net/icmp/icmp_sendmsg.c +++ b/net/icmp/icmp_sendmsg.c @@ -60,9 +60,9 @@ ****************************************************************************/ #define IPv4BUF \ - ((struct ipv4_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) + ((FAR struct ipv4_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) #define ICMPBUF \ - ((struct icmp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv4_HDRLEN]) + ((FAR struct icmp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv4_HDRLEN]) /**************************************************************************** * Private Types diff --git a/net/icmpv6/icmpv6_advertise.c b/net/icmpv6/icmpv6_advertise.c index c133980181d..124779ea58f 100644 --- a/net/icmpv6/icmpv6_advertise.c +++ b/net/icmpv6/icmpv6_advertise.c @@ -45,10 +45,10 @@ * Pre-processor Definitions ****************************************************************************/ -#define IPv6BUF ((struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) +#define IPv6BUF ((FAR struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) #define ICMPv6ADVERTISE \ - ((struct icmpv6_neighbor_advertise_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) + ((FAR struct icmpv6_neighbor_advertise_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) /**************************************************************************** * Public Functions diff --git a/net/icmpv6/icmpv6_input.c b/net/icmpv6/icmpv6_input.c index c2dd5de0de2..12f73ae14f3 100644 --- a/net/icmpv6/icmpv6_input.c +++ b/net/icmpv6/icmpv6_input.c @@ -52,9 +52,9 @@ #define ICMPv6REPLY ((FAR struct icmpv6_echo_reply_s *)icmpv6) #define ICMPv6SIZE ((dev)->d_len - iplen) -#define ICMPv6SOLICIT ((struct icmpv6_neighbor_solicit_s *)icmpv6) -#define ICMPv6ADVERTISE ((struct icmpv6_neighbor_advertise_s *)icmpv6) -#define ICMPv6RADVERTISE ((struct icmpv6_router_advertise_s *)icmpv6) +#define ICMPv6SOLICIT ((FAR struct icmpv6_neighbor_solicit_s *)icmpv6) +#define ICMPv6ADVERTISE ((FAR struct icmpv6_neighbor_advertise_s *)icmpv6) +#define ICMPv6RADVERTISE ((FAR struct icmpv6_router_advertise_s *)icmpv6) #define MLDQUERY ((FAR struct mld_mcast_listen_query_s *)icmpv6) #define MLDREPORT_V1 ((FAR struct mld_mcast_listen_report_v1_s *)icmpv6) diff --git a/net/icmpv6/icmpv6_radvertise.c b/net/icmpv6/icmpv6_radvertise.c index 7a4975f7460..b63b37ae3ac 100644 --- a/net/icmpv6/icmpv6_radvertise.c +++ b/net/icmpv6/icmpv6_radvertise.c @@ -45,10 +45,10 @@ * Pre-processor Definitions ****************************************************************************/ -#define IPv6BUF ((struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) +#define IPv6BUF ((FAR struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) #define ICMPv6ADVERTISE \ - ((struct icmpv6_router_advertise_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) + ((FAR struct icmpv6_router_advertise_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) /**************************************************************************** * Private Data diff --git a/net/icmpv6/icmpv6_recvmsg.c b/net/icmpv6/icmpv6_recvmsg.c index 0c764a771eb..5507eea806c 100644 --- a/net/icmpv6/icmpv6_recvmsg.c +++ b/net/icmpv6/icmpv6_recvmsg.c @@ -44,9 +44,9 @@ ****************************************************************************/ #define IPv6_BUF \ - ((struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) + ((FAR struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) #define ICMPv6_BUF \ - ((struct icmpv6_echo_reply_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) + ((FAR struct icmpv6_echo_reply_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) #define ICMPv6_SIZE \ ((dev)->d_len - IPv6_HDRLEN) diff --git a/net/icmpv6/icmpv6_reply.c b/net/icmpv6/icmpv6_reply.c index 72258294cb6..1bc730d6938 100644 --- a/net/icmpv6/icmpv6_reply.c +++ b/net/icmpv6/icmpv6_reply.c @@ -51,7 +51,7 @@ * Pre-processor Definitions ****************************************************************************/ -#define IPv6BUF ((struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) +#define IPv6BUF ((FAR struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) /* The latest drafts declared increase in minimal mtu up to 1280. */ @@ -88,7 +88,7 @@ void icmpv6_reply(FAR struct net_driver_s *dev, int type, int code, int data) { int ipicmplen = IPv6_HDRLEN + sizeof(struct icmpv6_hdr_s); FAR struct ipv6_hdr_s *ipv6 = IPv6BUF; - FAR struct icmpv6_hdr_s *icmpv6 = (FAR void *)(ipv6 + 1); + FAR struct icmpv6_hdr_s *icmpv6 = (FAR struct icmpv6_hdr_s *)(ipv6 + 1); uint16_t datalen; if (net_ipv6addr_cmp(ipv6->destipaddr, g_ipv6_unspecaddr) diff --git a/net/icmpv6/icmpv6_rsolicit.c b/net/icmpv6/icmpv6_rsolicit.c index 87c3771fda9..958f8bbb4d6 100644 --- a/net/icmpv6/icmpv6_rsolicit.c +++ b/net/icmpv6/icmpv6_rsolicit.c @@ -43,9 +43,9 @@ * Pre-processor Definitions ****************************************************************************/ -#define IPv6BUF ((struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) +#define IPv6BUF ((FAR struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) #define ICMPv6RSOLICIT \ - ((struct icmpv6_router_solicit_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) + ((FAR struct icmpv6_router_solicit_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) /**************************************************************************** * Public Functions diff --git a/net/icmpv6/icmpv6_sendmsg.c b/net/icmpv6/icmpv6_sendmsg.c index f8c4fb13766..57b2efd59f0 100644 --- a/net/icmpv6/icmpv6_sendmsg.c +++ b/net/icmpv6/icmpv6_sendmsg.c @@ -59,9 +59,9 @@ ****************************************************************************/ #define IPv6BUF \ - ((struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) + ((FAR struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) #define ICMPv6BUF \ - ((struct icmpv6_echo_request_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) + ((FAR struct icmpv6_echo_request_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) /**************************************************************************** * Private Types diff --git a/net/icmpv6/icmpv6_solicit.c b/net/icmpv6/icmpv6_solicit.c index 4a92a1f02c6..ae7bbe66e36 100644 --- a/net/icmpv6/icmpv6_solicit.c +++ b/net/icmpv6/icmpv6_solicit.c @@ -43,9 +43,9 @@ * Pre-processor Definitions ****************************************************************************/ -#define IPv6BUF ((struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) +#define IPv6BUF ((FAR struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) #define ICMPv6SOLICIT \ - ((struct icmpv6_neighbor_solicit_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) + ((FAR struct icmpv6_neighbor_solicit_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) /**************************************************************************** * Private Data diff --git a/net/sixlowpan/sixlowpan_tcpsend.c b/net/sixlowpan/sixlowpan_tcpsend.c index bd18f3645ab..202d2f194e5 100644 --- a/net/sixlowpan/sixlowpan_tcpsend.c +++ b/net/sixlowpan/sixlowpan_tcpsend.c @@ -52,7 +52,7 @@ /* Buffer access helpers */ -#define TCPBUF(dev) ((FAR struct tcp_hdr_s *)(&(dev)->d_buf[IPv6_HDRLEN])) +#define TCPBUF(dev) ((FAR struct tcp_hdr_s *)(&(dev)->d_buf[IPv6_HDRLEN])) /**************************************************************************** * Pre-processor Definitions diff --git a/net/tcp/tcp_conn.c b/net/tcp/tcp_conn.c index a02110d07df..a8161d349c7 100644 --- a/net/tcp/tcp_conn.c +++ b/net/tcp/tcp_conn.c @@ -72,8 +72,8 @@ * Pre-processor Definitions ****************************************************************************/ -#define IPv4BUF ((struct ipv4_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) -#define IPv6BUF ((struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) +#define IPv4BUF ((FAR struct ipv4_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) +#define IPv6BUF ((FAR struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) /**************************************************************************** * Private Data diff --git a/net/tcp/tcp_recvfrom.c b/net/tcp/tcp_recvfrom.c index 52997a2996e..ab8bb077ad8 100644 --- a/net/tcp/tcp_recvfrom.c +++ b/net/tcp/tcp_recvfrom.c @@ -46,11 +46,11 @@ * Pre-processor Definitions ****************************************************************************/ -#define IPv4BUF ((struct ipv4_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) -#define IPv6BUF ((struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) +#define IPv4BUF ((FAR struct ipv4_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) +#define IPv6BUF ((FAR struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) -#define TCPIPv4BUF ((struct tcp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv4_HDRLEN]) -#define TCPIPv6BUF ((struct tcp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) +#define TCPIPv4BUF ((FAR struct tcp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv4_HDRLEN]) +#define TCPIPv6BUF ((FAR struct tcp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) /**************************************************************************** * Private Types diff --git a/net/tcp/tcp_send.c b/net/tcp/tcp_send.c index 13b89b7a812..7fa69f963f4 100644 --- a/net/tcp/tcp_send.c +++ b/net/tcp/tcp_send.c @@ -66,11 +66,11 @@ * Pre-processor Definitions ****************************************************************************/ -#define IPv4BUF ((struct ipv4_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) -#define IPv6BUF ((struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) +#define IPv4BUF ((FAR struct ipv4_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) +#define IPv6BUF ((FAR struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) -#define TCPIPv4BUF ((struct tcp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv4_HDRLEN]) -#define TCPIPv6BUF ((struct tcp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) +#define TCPIPv4BUF ((FAR struct tcp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv4_HDRLEN]) +#define TCPIPv6BUF ((FAR struct tcp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) /**************************************************************************** * Private Functions @@ -649,7 +649,7 @@ uint16_t tcp_rx_mss(FAR struct net_driver_s *dev) void tcp_synack(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn, uint8_t ack) { - struct tcp_hdr_s *tcp; + FAR struct tcp_hdr_s *tcp; uint16_t tcp_mss; int16_t optlen = 0; diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c index 6637e46ac04..f79baa102d2 100644 --- a/net/tcp/tcp_send_buffered.c +++ b/net/tcp/tcp_send_buffered.c @@ -77,8 +77,8 @@ # define NEED_IPDOMAIN_SUPPORT 1 #endif -#define TCPIPv4BUF ((struct tcp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv4_HDRLEN]) -#define TCPIPv6BUF ((struct tcp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) +#define TCPIPv4BUF ((FAR struct tcp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv4_HDRLEN]) +#define TCPIPv6BUF ((FAR struct tcp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) /* Debug */ diff --git a/net/tcp/tcp_send_unbuffered.c b/net/tcp/tcp_send_unbuffered.c index 03ce11ea940..26a11ed2d7a 100644 --- a/net/tcp/tcp_send_unbuffered.c +++ b/net/tcp/tcp_send_unbuffered.c @@ -67,8 +67,8 @@ # define NEED_IPDOMAIN_SUPPORT 1 #endif -#define TCPIPv4BUF ((struct tcp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv4_HDRLEN]) -#define TCPIPv6BUF ((struct tcp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) +#define TCPIPv4BUF ((FAR struct tcp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv4_HDRLEN]) +#define TCPIPv6BUF ((FAR struct tcp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) /**************************************************************************** * Private Types diff --git a/net/tcp/tcp_sendfile.c b/net/tcp/tcp_sendfile.c index da355298483..5f4a30275fb 100644 --- a/net/tcp/tcp_sendfile.c +++ b/net/tcp/tcp_sendfile.c @@ -62,8 +62,8 @@ * Pre-processor Definitions ****************************************************************************/ -#define TCPIPv4BUF ((struct tcp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv4_HDRLEN]) -#define TCPIPv6BUF ((struct tcp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) +#define TCPIPv4BUF ((FAR struct tcp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv4_HDRLEN]) +#define TCPIPv6BUF ((FAR struct tcp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) /**************************************************************************** * Private Types diff --git a/net/udp/udp_conn.c b/net/udp/udp_conn.c index 9f02dcbb686..621caac2531 100644 --- a/net/udp/udp_conn.c +++ b/net/udp/udp_conn.c @@ -72,8 +72,8 @@ * Pre-processor Definitions ****************************************************************************/ -#define IPv4BUF ((struct ipv4_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) -#define IPv6BUF ((struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) +#define IPv4BUF ((FAR struct ipv4_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) +#define IPv6BUF ((FAR struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) /**************************************************************************** * Private Data diff --git a/net/udp/udp_recvfrom.c b/net/udp/udp_recvfrom.c index 99167cbcda0..7abc2a7e7fc 100644 --- a/net/udp/udp_recvfrom.c +++ b/net/udp/udp_recvfrom.c @@ -46,11 +46,11 @@ * Pre-processor Definitions ****************************************************************************/ -#define IPv4BUF ((struct ipv4_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) -#define IPv6BUF ((struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) +#define IPv4BUF ((FAR struct ipv4_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) +#define IPv6BUF ((FAR struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) -#define UDPIPv4BUF ((struct udp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv4_HDRLEN]) -#define UDPIPv6BUF ((struct udp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) +#define UDPIPv4BUF ((FAR struct udp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv4_HDRLEN]) +#define UDPIPv6BUF ((FAR struct udp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) /**************************************************************************** * Private Types diff --git a/net/udp/udp_send.c b/net/udp/udp_send.c index 1284a85eca9..ce6ac3edeea 100644 --- a/net/udp/udp_send.c +++ b/net/udp/udp_send.c @@ -66,14 +66,14 @@ ****************************************************************************/ #define IPv4BUF \ - ((struct ipv4_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) + ((FAR struct ipv4_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) #define IPv6BUF \ - ((struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) + ((FAR struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) #define UDPIPv4BUF \ - ((struct udp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv4_HDRLEN]) + ((FAR struct udp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv4_HDRLEN]) #define UDPIPv6BUF \ - ((struct udp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) + ((FAR struct udp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) /**************************************************************************** * Public Functions diff --git a/net/udp/udp_sendto_buffered.c b/net/udp/udp_sendto_buffered.c index 65608411457..abd43ce7b52 100644 --- a/net/udp/udp_sendto_buffered.c +++ b/net/udp/udp_sendto_buffered.c @@ -74,8 +74,8 @@ # define NEED_IPDOMAIN_SUPPORT 1 #endif -#define UDPIPv4BUF ((struct udp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv4_HDRLEN]) -#define UDPIPv6BUF ((struct udp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) +#define UDPIPv4BUF ((FAR struct udp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv4_HDRLEN]) +#define UDPIPv6BUF ((FAR struct udp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN]) /* Debug */ diff --git a/net/utils/net_ipchksum.c b/net/utils/net_ipchksum.c index bad3e7f8822..c9242cc88ea 100644 --- a/net/utils/net_ipchksum.c +++ b/net/utils/net_ipchksum.c @@ -37,8 +37,8 @@ * Pre-processor Definitions ****************************************************************************/ -#define IPv4BUF ((struct ipv4_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) -#define IPv6BUF ((struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) +#define IPv4BUF ((FAR struct ipv4_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) +#define IPv6BUF ((FAR struct ipv6_hdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)]) /**************************************************************************** * Public Functions diff --git a/sched/init/nx_start.c b/sched/init/nx_start.c index a50bd3deec0..9ea049e8c01 100644 --- a/sched/init/nx_start.c +++ b/sched/init/nx_start.c @@ -808,7 +808,7 @@ void nx_start(void) { #if CONFIG_TASK_NAME_SIZE > 0 _alert("Stack check failed, pid %d, name %s\n", - tcb->pid, tcb->name); + tcb->pid, tcb->name); #else _alert("Stack check failed, pid %d\n", tcb->pid); #endif