diff options
author | Bernd Moessner <berndmoessner80@gmail.com> | 2024-01-05 20:48:58 +0100 |
---|---|---|
committer | Joel Sherrill <joel@rtems.org> | 2024-01-05 20:12:02 -0600 |
commit | 976c27fd6bba352ad0a339b9c5d11b731a74f4b8 (patch) | |
tree | dedab53c529caf5b5ce9aab7cfdd035c2be5614d | |
parent | xadapter: fix compiler warnings (diff) | |
download | rtems-lwip-976c27fd6bba352ad0a339b9c5d11b731a74f4b8.tar.bz2 |
xemacpsif: fix compiler warnings
The compiler issues a couple of warnings as the Xilinx code omits to cast pointers ip_addr_t to the required ip4_addr_t or ip6_addr_t type.
Note, ip_addr_t can hold ip4_addr_t and ip6_addr_t. Therefore, the complaints by GCC are correct, but do not indicate a major bug.
-rw-r--r-- | embeddedsw/ThirdParty/sw_services/lwip211/src/contrib/ports/xilinx/netif/xemacpsif.c | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/embeddedsw/ThirdParty/sw_services/lwip211/src/contrib/ports/xilinx/netif/xemacpsif.c b/embeddedsw/ThirdParty/sw_services/lwip211/src/contrib/ports/xilinx/netif/xemacpsif.c index 1bf3abb..5328e86 100644 --- a/embeddedsw/ThirdParty/sw_services/lwip211/src/contrib/ports/xilinx/netif/xemacpsif.c +++ b/embeddedsw/ThirdParty/sw_services/lwip211/src/contrib/ports/xilinx/netif/xemacpsif.c @@ -61,14 +61,24 @@ #if LWIP_IGMP static err_t xemacpsif_mac_filter_update (struct netif *netif, +#ifndef __rtems__ ip_addr_t *group, u8_t action); +#else /* __rtems__ */ + const ip4_addr_t *group, + enum netif_mac_filter_action action); +#endif static u8_t xemacps_mcast_entry_mask = 0; #endif #if LWIP_IPV6 && LWIP_IPV6_MLD static err_t xemacpsif_mld6_mac_filter_update (struct netif *netif, +#ifndef __rtems__ ip_addr_t *group, u8_t action); +#else /* __rtems__ */ + const ip6_addr_t *group, + enum netif_mac_filter_action action); +#endif static u8_t xemacps_mld6_mcast_entry_mask; #endif @@ -236,7 +246,11 @@ static struct pbuf * low_level_input(struct netif *netif) */ static err_t xemacpsif_output(struct netif *netif, struct pbuf *p, +#ifndef __rtems__ const ip_addr_t *ipaddr) +#else /* __rtems__ */ + const ip4_addr_t *ipaddr) +#endif { /* resolve hardware address, then send (or queue) packet */ return etharp_output(netif, p, ipaddr); @@ -498,7 +512,11 @@ void HandleTxErrors(struct xemac_s *xemac) } #if LWIP_IPV6 && LWIP_IPV6_MLD +#ifndef __rtems__ static u8_t xemacpsif_ip6_addr_ismulticast(ip6_addr_t* ip_addr) +#else /* __rtems__ */ +static u8_t xemacpsif_ip6_addr_ismulticast(const ip6_addr_t* ip_addr) +#endif { if(ip6_addr_ismulticast_linklocal(ip_addr)|| ip6_addr_ismulticast_iflocal(ip_addr) || @@ -514,7 +532,11 @@ static u8_t xemacpsif_ip6_addr_ismulticast(ip6_addr_t* ip_addr) } static void xemacpsif_mld6_mac_hash_update (struct netif *netif, u8_t *ip_addr, +#ifndef __rtems__ u8_t action) +#else /* __rtems__ */ + enum netif_mac_filter_action action) +#endif { u8_t multicast_mac_addr[6]; struct xemac_s *xemac = (struct xemac_s *) (netif->state); @@ -557,14 +579,24 @@ static void xemacpsif_mld6_mac_hash_update (struct netif *netif, u8_t *ip_addr, SYS_ARCH_UNPROTECT(lev); } +#ifndef __rtems__ static err_t xemacpsif_mld6_mac_filter_update (struct netif *netif, ip_addr_t *group, u8_t action) +#else /* __rtems__ */ +static err_t xemacpsif_mld6_mac_filter_update (struct netif *netif, + const ip6_addr_t *group, + enum netif_mac_filter_action action) +#endif { u8_t temp_mask; unsigned int i; u8_t * ip_addr = (u8_t *) group; +#ifndef __rtems__ if(!(xemacpsif_ip6_addr_ismulticast((ip6_addr_t*) ip_addr))) { +#else /* __rtems__ */ + if(!(xemacpsif_ip6_addr_ismulticast( group ))) { +#endif LWIP_DEBUGF(NETIF_DEBUG, ("%s: The requested MAC address is not a multicast address.\r\n", __func__)); LWIP_DEBUGF(NETIF_DEBUG, ("Multicast address add operation failure !!\r\n")); @@ -620,8 +652,13 @@ static err_t xemacpsif_mld6_mac_filter_update (struct netif *netif, ip_addr_t *g #endif #if LWIP_IGMP +#ifndef __rtems__ static void xemacpsif_mac_hash_update (struct netif *netif, u8_t *ip_addr, u8_t action) +#else /* __rtems__ */ +static void xemacpsif_mac_hash_update (struct netif *netif, u8_t *ip4_addr_t, + enum netif_mac_filter_action action) +#endif { u8_t multicast_mac_addr[6]; struct xemac_s *xemac = (struct xemac_s *) (netif->state); |