This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit a0b847bf1b1176c3040ea11679a964d67f4a3c6b Author: zhanghongyu <[email protected]> AuthorDate: Wed Nov 12 11:34:06 2025 +0800 net/devif_callback: change flags type from uint16_t to uint32_t increase the size of the flag to prepare for precise xxx_POLL. Signed-off-by: zhanghongyu <[email protected]> --- net/arp/arp_send.c | 6 +++--- net/bluetooth/bluetooth.h | 6 +++--- net/bluetooth/bluetooth_callback.c | 8 ++++---- net/bluetooth/bluetooth_recvmsg.c | 8 ++++---- net/bluetooth/bluetooth_sendmsg.c | 8 ++++---- net/can/can.h | 4 ++-- net/can/can_callback.c | 10 +++++----- net/can/can_input.c | 2 +- net/can/can_recvmsg.c | 4 ++-- net/can/can_sendmsg.c | 4 ++-- net/can/can_sendmsg_buffered.c | 4 ++-- net/can/can_sockif.c | 4 ++-- net/devif/devif.h | 10 +++++----- net/devif/devif_callback.c | 6 +++--- net/icmp/icmp_netpoll.c | 6 +++--- net/icmp/icmp_recvmsg.c | 6 +++--- net/icmp/icmp_sendmsg.c | 6 +++--- net/icmpv6/icmpv6_autoconfig.c | 6 +++--- net/icmpv6/icmpv6_neighbor.c | 6 +++--- net/icmpv6/icmpv6_netpoll.c | 6 +++--- net/icmpv6/icmpv6_recvmsg.c | 6 +++--- net/icmpv6/icmpv6_sendmsg.c | 6 +++--- net/ieee802154/ieee802154.h | 4 ++-- net/ieee802154/ieee802154_callback.c | 6 +++--- net/ieee802154/ieee802154_recvmsg.c | 8 ++++---- net/ieee802154/ieee802154_sendmsg.c | 6 +++--- net/ipforward/ipfwd_forward.c | 6 +++--- net/ipforward/ipfwd_poll.c | 2 +- net/pkt/pkt.h | 4 ++-- net/pkt/pkt_callback.c | 6 +++--- net/pkt/pkt_input.c | 2 +- net/pkt/pkt_netpoll.c | 6 +++--- net/pkt/pkt_recvmsg.c | 6 +++--- net/pkt/pkt_sendmsg_buffered.c | 4 ++-- net/pkt/pkt_sendmsg_unbuffered.c | 6 +++--- net/sixlowpan/sixlowpan_send.c | 6 +++--- net/sixlowpan/sixlowpan_tcpsend.c | 6 +++--- net/tcp/tcp.h | 12 ++++++------ net/tcp/tcp_callback.c | 16 ++++++++-------- net/tcp/tcp_close.c | 6 +++--- net/tcp/tcp_connect.c | 10 +++++----- net/tcp/tcp_dump.c | 6 +++--- net/tcp/tcp_input.c | 2 +- net/tcp/tcp_monitor.c | 21 +++++++++++---------- net/tcp/tcp_netpoll.c | 6 +++--- net/tcp/tcp_recvfrom.c | 10 +++++----- net/tcp/tcp_send_buffered.c | 12 ++++++------ net/tcp/tcp_send_unbuffered.c | 6 +++--- net/tcp/tcp_sendfile.c | 6 +++--- net/tcp/tcp_shutdown.c | 6 +++--- net/tcp/tcp_timer.c | 2 +- net/udp/udp.h | 4 ++-- net/udp/udp_callback.c | 12 ++++++------ net/udp/udp_input.c | 2 +- net/udp/udp_netpoll.c | 6 +++--- net/udp/udp_recvfrom.c | 6 +++--- net/udp/udp_sendto_buffered.c | 12 ++++++------ net/udp/udp_sendto_unbuffered.c | 6 +++--- net/usrsock/usrsock.h | 4 ++-- net/usrsock/usrsock_accept.c | 4 ++-- net/usrsock/usrsock_bind.c | 4 ++-- net/usrsock/usrsock_close.c | 4 ++-- net/usrsock/usrsock_conn.c | 4 ++-- net/usrsock/usrsock_connect.c | 4 ++-- net/usrsock/usrsock_getpeername.c | 4 ++-- net/usrsock/usrsock_getsockname.c | 4 ++-- net/usrsock/usrsock_getsockopt.c | 4 ++-- net/usrsock/usrsock_ioctl.c | 4 ++-- net/usrsock/usrsock_listen.c | 4 ++-- net/usrsock/usrsock_poll.c | 4 ++-- net/usrsock/usrsock_recvmsg.c | 4 ++-- net/usrsock/usrsock_sendmsg.c | 4 ++-- net/usrsock/usrsock_setsockopt.c | 4 ++-- net/usrsock/usrsock_shutdown.c | 4 ++-- net/usrsock/usrsock_socket.c | 4 ++-- 75 files changed, 224 insertions(+), 223 deletions(-) diff --git a/net/arp/arp_send.c b/net/arp/arp_send.c index b56300578be..ecc255ff2da 100644 --- a/net/arp/arp_send.c +++ b/net/arp/arp_send.c @@ -81,12 +81,12 @@ static void arp_send_terminate(FAR struct net_driver_s *dev, * Name: arp_send_eventhandler ****************************************************************************/ -static uint16_t arp_send_eventhandler(FAR struct net_driver_s *dev, - FAR void *priv, uint16_t flags) +static uint32_t arp_send_eventhandler(FAR struct net_driver_s *dev, + FAR void *priv, uint32_t flags) { FAR struct arp_send_s *state = (FAR struct arp_send_s *)priv; - ninfo("flags: %04x sent: %d\n", flags, state->snd_sent); + ninfo("flags: %" PRIx32 " sent: %d\n", flags, state->snd_sent); if (state) { diff --git a/net/bluetooth/bluetooth.h b/net/bluetooth/bluetooth.h index aeac3269a31..11c0606e3fa 100644 --- a/net/bluetooth/bluetooth.h +++ b/net/bluetooth/bluetooth.h @@ -254,9 +254,9 @@ FAR struct bluetooth_conn_s * * ****************************************************************************/ -uint16_t bluetooth_callback(FAR struct radio_driver_s *radio, - FAR struct bluetooth_conn_s *conn, - uint16_t flags); +uint32_t bluetooth_callback(FAR struct radio_driver_s *radio, + FAR struct bluetooth_conn_s *conn, + uint32_t flags); /**************************************************************************** * Name: bluetooth_recvmsg diff --git a/net/bluetooth/bluetooth_callback.c b/net/bluetooth/bluetooth_callback.c index 808ed9ee708..50487c769cb 100644 --- a/net/bluetooth/bluetooth_callback.c +++ b/net/bluetooth/bluetooth_callback.c @@ -59,11 +59,11 @@ * ****************************************************************************/ -uint16_t bluetooth_callback(FAR struct radio_driver_s *radio, - FAR struct bluetooth_conn_s *conn, - uint16_t flags) +uint32_t bluetooth_callback(FAR struct radio_driver_s *radio, + FAR struct bluetooth_conn_s *conn, + uint32_t flags) { - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); /* Some sanity checking */ diff --git a/net/bluetooth/bluetooth_recvmsg.c b/net/bluetooth/bluetooth_recvmsg.c index 9400e22cbe6..da42b2a28a6 100644 --- a/net/bluetooth/bluetooth_recvmsg.c +++ b/net/bluetooth/bluetooth_recvmsg.c @@ -206,15 +206,15 @@ static ssize_t * ****************************************************************************/ -static uint16_t bluetooth_recvfrom_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, - uint16_t flags) +static uint32_t bluetooth_recvfrom_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, + uint32_t flags) { FAR struct bluetooth_recvfrom_s *pstate; FAR struct radio_driver_s *radio; ssize_t ret; - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); DEBUGASSERT(pvpriv != NULL && dev != NULL); diff --git a/net/bluetooth/bluetooth_sendmsg.c b/net/bluetooth/bluetooth_sendmsg.c index b9c54ef8725..94f4dd924bd 100644 --- a/net/bluetooth/bluetooth_sendmsg.c +++ b/net/bluetooth/bluetooth_sendmsg.c @@ -83,9 +83,9 @@ struct bluetooth_sendto_s * Name: bluetooth_sendto_eventhandler ****************************************************************************/ -static uint16_t bluetooth_sendto_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, - uint16_t flags) +static uint32_t bluetooth_sendto_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, + uint32_t flags) { FAR struct radio_driver_s *radio; FAR struct bluetooth_sendto_s *pstate; @@ -110,7 +110,7 @@ static uint16_t bluetooth_sendto_eventhandler(FAR struct net_driver_s *dev, pstate = pvpriv; radio = (FAR struct radio_driver_s *)dev; - ninfo("flags: %04x sent: %zd\n", flags, pstate->is_sent); + ninfo("flags: %" PRIx32 " sent: %zd\n", flags, pstate->is_sent); if (pstate != NULL && (flags & BLUETOOTH_POLL) != 0) { diff --git a/net/can/can.h b/net/can/can.h index 56f29506477..26ce489d4f1 100644 --- a/net/can/can.h +++ b/net/can/can.h @@ -237,8 +237,8 @@ FAR struct can_conn_s *can_active(FAR struct net_driver_s *dev, * ****************************************************************************/ -uint16_t can_callback(FAR struct net_driver_s *dev, - FAR struct can_conn_s *conn, uint16_t flags); +uint32_t can_callback(FAR struct net_driver_s *dev, + FAR struct can_conn_s *conn, uint32_t flags); /**************************************************************************** * Name: can_datahandler diff --git a/net/can/can_callback.c b/net/can/can_callback.c index e022f8ebd27..6d31fda2152 100644 --- a/net/can/can_callback.c +++ b/net/can/can_callback.c @@ -62,13 +62,13 @@ * ****************************************************************************/ -static inline uint16_t +static inline uint32_t can_data_event(FAR struct net_driver_s *dev, FAR struct can_conn_s *conn, - uint16_t flags) + uint32_t flags) { int buflen = dev->d_len; uint16_t recvlen; - uint16_t ret; + uint32_t ret; #ifdef CONFIG_NET_TIMESTAMP buflen -= sizeof(struct timeval); @@ -118,8 +118,8 @@ can_data_event(FAR struct net_driver_s *dev, FAR struct can_conn_s *conn, * ****************************************************************************/ -uint16_t can_callback(FAR struct net_driver_s *dev, - FAR struct can_conn_s *conn, uint16_t flags) +uint32_t can_callback(FAR struct net_driver_s *dev, + FAR struct can_conn_s *conn, uint32_t flags) { /* Some sanity checking */ diff --git a/net/can/can_input.c b/net/can/can_input.c index 40f8a36cf37..a8d8da8affd 100644 --- a/net/can/can_input.c +++ b/net/can/can_input.c @@ -159,7 +159,7 @@ const uint8_t g_len_to_can_dlc[65] = static int can_input_conn(FAR struct net_driver_s *dev, FAR struct can_conn_s *conn) { - uint16_t flags; + uint32_t flags; uint16_t buflen = dev->d_len; int ret = OK; diff --git a/net/can/can_recvmsg.c b/net/can/can_recvmsg.c index 38440493ef4..3d9f90eaac9 100644 --- a/net/can/can_recvmsg.c +++ b/net/can/can_recvmsg.c @@ -288,8 +288,8 @@ static inline int can_readahead(struct can_recvfrom_s *pstate) return 0; } -static uint16_t can_recvfrom_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t can_recvfrom_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { struct can_recvfrom_s *pstate = pvpriv; diff --git a/net/can/can_sendmsg.c b/net/can/can_sendmsg.c index 373538a5d08..0939d94aaef 100644 --- a/net/can/can_sendmsg.c +++ b/net/can/can_sendmsg.c @@ -79,8 +79,8 @@ struct send_s * Name: psock_send_eventhandler ****************************************************************************/ -static uint16_t psock_send_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t psock_send_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct send_s *pstate = pvpriv; diff --git a/net/can/can_sendmsg_buffered.c b/net/can/can_sendmsg_buffered.c index 09b8ca4d384..2619d8cc609 100644 --- a/net/can/can_sendmsg_buffered.c +++ b/net/can/can_sendmsg_buffered.c @@ -61,8 +61,8 @@ * Name: psock_send_eventhandler ****************************************************************************/ -static uint16_t psock_send_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t psock_send_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct can_conn_s *conn = pvpriv; diff --git a/net/can/can_sockif.c b/net/can/can_sockif.c index e0f2eee2665..ac6e95ff436 100644 --- a/net/can/can_sockif.c +++ b/net/can/can_sockif.c @@ -112,8 +112,8 @@ const struct sock_intf_s g_can_sockif = * ****************************************************************************/ -static uint16_t can_poll_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t can_poll_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct can_poll_s *info = pvpriv; diff --git a/net/devif/devif.h b/net/devif/devif.h index 872cf916cf6..94c3eb6b805 100644 --- a/net/devif/devif.h +++ b/net/devif/devif.h @@ -267,9 +267,9 @@ struct net_driver_s; /* Forward reference */ -typedef CODE uint16_t (*devif_callback_event_t)(FAR struct net_driver_s *dev, +typedef CODE uint32_t (*devif_callback_event_t)(FAR struct net_driver_s *dev, FAR void *pvpriv, - uint16_t flags); + uint32_t flags); struct devif_callback_s { @@ -278,7 +278,7 @@ struct devif_callback_s FAR struct devif_callback_s *nxtdev; FAR devif_callback_event_t event; FAR void *priv; - uint16_t flags; + uint32_t flags; uint8_t free_flags; }; @@ -386,7 +386,7 @@ void devif_dev_callback_free(FAR struct net_driver_s *dev, * ****************************************************************************/ -uint16_t devif_conn_event(FAR struct net_driver_s *dev, uint16_t flags, +uint32_t devif_conn_event(FAR struct net_driver_s *dev, uint32_t flags, FAR struct devif_callback_s *list); /**************************************************************************** @@ -408,7 +408,7 @@ uint16_t devif_conn_event(FAR struct net_driver_s *dev, uint16_t flags, * ****************************************************************************/ -uint16_t devif_dev_event(FAR struct net_driver_s *dev, uint16_t flags); +uint32_t devif_dev_event(FAR struct net_driver_s *dev, uint32_t flags); /**************************************************************************** * Name: devif_send diff --git a/net/devif/devif_callback.c b/net/devif/devif_callback.c index f706ec638a5..271b897ee25 100644 --- a/net/devif/devif_callback.c +++ b/net/devif/devif_callback.c @@ -216,7 +216,7 @@ static void devif_callback_free(FAR struct net_driver_s *dev, * ****************************************************************************/ -static bool devif_event_trigger(uint16_t events, uint16_t triggers) +static bool devif_event_trigger(uint32_t events, uint32_t triggers) { /* The events are divided into a set of individual bits that may be ORed * together PLUS a field that encodes a single poll event. @@ -451,7 +451,7 @@ void devif_dev_callback_free(FAR struct net_driver_s *dev, * ****************************************************************************/ -uint16_t devif_conn_event(FAR struct net_driver_s *dev, uint16_t flags, +uint32_t devif_conn_event(FAR struct net_driver_s *dev, uint32_t flags, FAR struct devif_callback_s *list) { FAR struct devif_callback_s *next; @@ -508,7 +508,7 @@ uint16_t devif_conn_event(FAR struct net_driver_s *dev, uint16_t flags, * ****************************************************************************/ -uint16_t devif_dev_event(FAR struct net_driver_s *dev, uint16_t flags) +uint32_t devif_dev_event(FAR struct net_driver_s *dev, uint32_t flags) { FAR struct devif_callback_s *cb; FAR struct devif_callback_s *next; diff --git a/net/icmp/icmp_netpoll.c b/net/icmp/icmp_netpoll.c index 2966a077563..b326e87d167 100644 --- a/net/icmp/icmp_netpoll.c +++ b/net/icmp/icmp_netpoll.c @@ -63,15 +63,15 @@ * ****************************************************************************/ -static uint16_t icmp_poll_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t icmp_poll_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct icmp_poll_s *info = pvpriv; FAR struct icmp_conn_s *conn; FAR struct socket *psock; pollevent_t eventset; - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); DEBUGASSERT(info == NULL || info->fds != NULL); diff --git a/net/icmp/icmp_recvmsg.c b/net/icmp/icmp_recvmsg.c index f871931dda3..83ca75e5a6e 100644 --- a/net/icmp/icmp_recvmsg.c +++ b/net/icmp/icmp_recvmsg.c @@ -86,14 +86,14 @@ struct icmp_recvfrom_s * ****************************************************************************/ -static uint16_t recvfrom_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t recvfrom_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct icmp_recvfrom_s *pstate = pvpriv; FAR struct socket *psock; FAR struct ipv4_hdr_s *ipv4; - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); if (pstate != NULL) { diff --git a/net/icmp/icmp_sendmsg.c b/net/icmp/icmp_sendmsg.c index dfced7f117e..659af82b1b3 100644 --- a/net/icmp/icmp_sendmsg.c +++ b/net/icmp/icmp_sendmsg.c @@ -173,12 +173,12 @@ static void sendto_request(FAR struct net_driver_s *dev, * ****************************************************************************/ -static uint16_t sendto_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t sendto_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct icmp_sendto_s *pstate = pvpriv; - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); if (pstate != NULL) { diff --git a/net/icmpv6/icmpv6_autoconfig.c b/net/icmpv6/icmpv6_autoconfig.c index 1da602bebf5..bb7f5412a1b 100644 --- a/net/icmpv6/icmpv6_autoconfig.c +++ b/net/icmpv6/icmpv6_autoconfig.c @@ -92,12 +92,12 @@ static void icmpv6_router_terminate(FAR struct icmpv6_router_s *state, * Name: icmpv6_router_eventhandler ****************************************************************************/ -static uint16_t icmpv6_router_eventhandler(FAR struct net_driver_s *dev, - FAR void *priv, uint16_t flags) +static uint32_t icmpv6_router_eventhandler(FAR struct net_driver_s *dev, + FAR void *priv, uint32_t flags) { FAR struct icmpv6_router_s *state = (FAR struct icmpv6_router_s *)priv; - ninfo("flags: %04x sent: %d\n", flags, state->snd_sent); + ninfo("flags: %" PRIx32 " sent: %d\n", flags, state->snd_sent); if (state) { diff --git a/net/icmpv6/icmpv6_neighbor.c b/net/icmpv6/icmpv6_neighbor.c index 246d16e0b46..a689c8fb0fd 100644 --- a/net/icmpv6/icmpv6_neighbor.c +++ b/net/icmpv6/icmpv6_neighbor.c @@ -74,12 +74,12 @@ struct icmpv6_neighbor_s * Name: icmpv6_neighbor_eventhandler ****************************************************************************/ -static uint16_t icmpv6_neighbor_eventhandler(FAR struct net_driver_s *dev, - FAR void *priv, uint16_t flags) +static uint32_t icmpv6_neighbor_eventhandler(FAR struct net_driver_s *dev, + FAR void *priv, uint32_t flags) { FAR struct icmpv6_neighbor_s *state = (FAR struct icmpv6_neighbor_s *)priv; - ninfo("flags: %04x sent: %d\n", flags, state->snd_sent); + ninfo("flags: %" PRIx32 " sent: %d\n", flags, state->snd_sent); if (state) { diff --git a/net/icmpv6/icmpv6_netpoll.c b/net/icmpv6/icmpv6_netpoll.c index a5984c459a9..c4fe1d0c475 100644 --- a/net/icmpv6/icmpv6_netpoll.c +++ b/net/icmpv6/icmpv6_netpoll.c @@ -63,15 +63,15 @@ * ****************************************************************************/ -static uint16_t icmpv6_poll_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t icmpv6_poll_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct icmpv6_poll_s *info = pvpriv; FAR struct icmpv6_conn_s *conn; FAR struct socket *psock; pollevent_t eventset; - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); DEBUGASSERT(info == NULL || info->fds != NULL); diff --git a/net/icmpv6/icmpv6_recvmsg.c b/net/icmpv6/icmpv6_recvmsg.c index d761fd3a49b..ff5a20ad390 100644 --- a/net/icmpv6/icmpv6_recvmsg.c +++ b/net/icmpv6/icmpv6_recvmsg.c @@ -94,13 +94,13 @@ struct icmpv6_recvfrom_s * ****************************************************************************/ -static uint16_t recvfrom_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t recvfrom_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct icmpv6_recvfrom_s *pstate = pvpriv; FAR struct ipv6_hdr_s *ipv6; - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); if (pstate != NULL) { diff --git a/net/icmpv6/icmpv6_sendmsg.c b/net/icmpv6/icmpv6_sendmsg.c index fcab9fb80c5..3e076611311 100644 --- a/net/icmpv6/icmpv6_sendmsg.c +++ b/net/icmpv6/icmpv6_sendmsg.c @@ -170,12 +170,12 @@ static void sendto_request(FAR struct net_driver_s *dev, * ****************************************************************************/ -static uint16_t sendto_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t sendto_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct icmpv6_sendto_s *pstate = pvpriv; - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); if (pstate != NULL) { diff --git a/net/ieee802154/ieee802154.h b/net/ieee802154/ieee802154.h index e4feb519246..a5869dfa326 100644 --- a/net/ieee802154/ieee802154.h +++ b/net/ieee802154/ieee802154.h @@ -268,9 +268,9 @@ FAR struct ieee802154_conn_s * * ****************************************************************************/ -uint16_t ieee802154_callback(FAR struct radio_driver_s *radio, +uint32_t ieee802154_callback(FAR struct radio_driver_s *radio, FAR struct ieee802154_conn_s *conn, - uint16_t flags); + uint32_t flags); /**************************************************************************** * Name: ieee802154_recvmsg diff --git a/net/ieee802154/ieee802154_callback.c b/net/ieee802154/ieee802154_callback.c index 5b0f8336a79..5d79d834130 100644 --- a/net/ieee802154/ieee802154_callback.c +++ b/net/ieee802154/ieee802154_callback.c @@ -55,11 +55,11 @@ * ****************************************************************************/ -uint16_t ieee802154_callback(FAR struct radio_driver_s *radio, +uint32_t ieee802154_callback(FAR struct radio_driver_s *radio, FAR struct ieee802154_conn_s *conn, - uint16_t flags) + uint32_t flags) { - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); /* Some sanity checking */ diff --git a/net/ieee802154/ieee802154_recvmsg.c b/net/ieee802154/ieee802154_recvmsg.c index 957c8660efb..1720390502b 100644 --- a/net/ieee802154/ieee802154_recvmsg.c +++ b/net/ieee802154/ieee802154_recvmsg.c @@ -206,15 +206,15 @@ static ssize_t * ****************************************************************************/ -static uint16_t - ieee802154_recvfrom_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t +ieee802154_recvfrom_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct ieee802154_recvfrom_s *pstate; FAR struct radio_driver_s *radio; ssize_t ret; - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); DEBUGASSERT(pvpriv != NULL && dev != NULL); diff --git a/net/ieee802154/ieee802154_sendmsg.c b/net/ieee802154/ieee802154_sendmsg.c index 90037873f0a..4531d1f30cf 100644 --- a/net/ieee802154/ieee802154_sendmsg.c +++ b/net/ieee802154/ieee802154_sendmsg.c @@ -270,9 +270,9 @@ static void ieee802154_meta_data(FAR struct radio_driver_s *radio, * Name: ieee802154_sendto_eventhandler ****************************************************************************/ -static uint16_t ieee802154_sendto_eventhandler(FAR struct net_driver_s *dev, +static uint32_t ieee802154_sendto_eventhandler(FAR struct net_driver_s *dev, FAR void *pvpriv, - uint16_t flags) + uint32_t flags) { FAR struct radio_driver_s *radio; FAR struct ieee802154_sendto_s *pstate; @@ -297,7 +297,7 @@ static uint16_t ieee802154_sendto_eventhandler(FAR struct net_driver_s *dev, pstate = pvpriv; radio = (FAR struct radio_driver_s *)dev; - ninfo("flags: %04x sent: %zd\n", flags, pstate->is_sent); + ninfo("flags: %" PRIx32 " sent: %zd\n", flags, pstate->is_sent); if (pstate != NULL && (flags & IEEE802154_POLL) != 0) { diff --git a/net/ipforward/ipfwd_forward.c b/net/ipforward/ipfwd_forward.c index 11f748ff2dd..50e7deb1b5d 100644 --- a/net/ipforward/ipfwd_forward.c +++ b/net/ipforward/ipfwd_forward.c @@ -120,12 +120,12 @@ static inline void forward_ipselect(FAR struct forward_s *fwd) * ****************************************************************************/ -static uint16_t ipfwd_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t ipfwd_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct forward_s *fwd = pvpriv; - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); DEBUGASSERT(fwd != NULL && fwd->f_iob != NULL && fwd->f_dev != NULL); /* Make sure that this is from the forwarding device */ diff --git a/net/ipforward/ipfwd_poll.c b/net/ipforward/ipfwd_poll.c index 46733092ed4..2add1f963a5 100644 --- a/net/ipforward/ipfwd_poll.c +++ b/net/ipforward/ipfwd_poll.c @@ -160,7 +160,7 @@ static void ipfwd_packet_conversion(FAR struct net_driver_s *dev, int proto) void ipfwd_poll(FAR struct net_driver_s *dev) { - uint16_t flags; + uint32_t flags; /* Setup for the callback (most of these do not apply) */ diff --git a/net/pkt/pkt.h b/net/pkt/pkt.h index b4c90eefcba..3753d110093 100644 --- a/net/pkt/pkt.h +++ b/net/pkt/pkt.h @@ -245,8 +245,8 @@ void pkt_conn_list_unlock(void); * ****************************************************************************/ -uint16_t pkt_callback(FAR struct net_driver_s *dev, - FAR struct pkt_conn_s *conn, uint16_t flags); +uint32_t pkt_callback(FAR struct net_driver_s *dev, + FAR struct pkt_conn_s *conn, uint32_t flags); /**************************************************************************** * Name: pkt_input diff --git a/net/pkt/pkt_callback.c b/net/pkt/pkt_callback.c index 4b74c1d3b55..c3f6a8b0ae3 100644 --- a/net/pkt/pkt_callback.c +++ b/net/pkt/pkt_callback.c @@ -55,10 +55,10 @@ * ****************************************************************************/ -uint16_t pkt_callback(FAR struct net_driver_s *dev, - FAR struct pkt_conn_s *conn, uint16_t flags) +uint32_t pkt_callback(FAR struct net_driver_s *dev, + FAR struct pkt_conn_s *conn, uint32_t flags) { - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); /* Some sanity checking */ diff --git a/net/pkt/pkt_input.c b/net/pkt/pkt_input.c index 58a06380f35..6edc2827d5e 100644 --- a/net/pkt/pkt_input.c +++ b/net/pkt/pkt_input.c @@ -160,7 +160,7 @@ static int pkt_in(FAR struct net_driver_s *dev) conn = pkt_active(dev); if (conn) { - uint16_t flags; + uint32_t flags; if (conn->pendiob == dev->d_iob) { diff --git a/net/pkt/pkt_netpoll.c b/net/pkt/pkt_netpoll.c index 5c52498efa9..2644f212ab3 100644 --- a/net/pkt/pkt_netpoll.c +++ b/net/pkt/pkt_netpoll.c @@ -98,12 +98,12 @@ static int psock_pkt_cansend(FAR struct pkt_conn_s *conn) * ****************************************************************************/ -static uint16_t pkt_poll_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t pkt_poll_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct pkt_poll_s *info = pvpriv; - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); DEBUGASSERT(!info || (info->conn && info->fds)); diff --git a/net/pkt/pkt_recvmsg.c b/net/pkt/pkt_recvmsg.c index 756b2e0ebb0..cd30728b1ea 100644 --- a/net/pkt/pkt_recvmsg.c +++ b/net/pkt/pkt_recvmsg.c @@ -217,12 +217,12 @@ static inline void pkt_recvfrom_sender(FAR struct net_driver_s *dev, * ****************************************************************************/ -static uint16_t pkt_recvfrom_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t pkt_recvfrom_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { struct pkt_recvfrom_s *pstate = pvpriv; - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); /* 'priv' might be null in some race conditions (?) */ diff --git a/net/pkt/pkt_sendmsg_buffered.c b/net/pkt/pkt_sendmsg_buffered.c index bc6481adaab..9bfc97fb6a2 100644 --- a/net/pkt/pkt_sendmsg_buffered.c +++ b/net/pkt/pkt_sendmsg_buffered.c @@ -82,8 +82,8 @@ static void pkt_sendbuffer_notify(FAR struct pkt_conn_s *conn) * Name: psock_send_eventhandler ****************************************************************************/ -static uint16_t psock_send_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t psock_send_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct pkt_conn_s *conn = pvpriv; diff --git a/net/pkt/pkt_sendmsg_unbuffered.c b/net/pkt/pkt_sendmsg_unbuffered.c index ab38974464b..afcbad3e314 100644 --- a/net/pkt/pkt_sendmsg_unbuffered.c +++ b/net/pkt/pkt_sendmsg_unbuffered.c @@ -78,12 +78,12 @@ struct send_s * Name: psock_send_eventhandler ****************************************************************************/ -static uint16_t psock_send_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t psock_send_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct send_s *pstate = pvpriv; - ninfo("flags: %04x sent: %zd\n", flags, pstate->snd_sent); + ninfo("flags: %" PRIx32 " sent: %zd\n", flags, pstate->snd_sent); if (pstate) { diff --git a/net/sixlowpan/sixlowpan_send.c b/net/sixlowpan/sixlowpan_send.c index 04696844888..d2d4230ddb0 100644 --- a/net/sixlowpan/sixlowpan_send.c +++ b/net/sixlowpan/sixlowpan_send.c @@ -99,12 +99,12 @@ struct sixlowpan_send_s * ****************************************************************************/ -static uint16_t send_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t send_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct sixlowpan_send_s *sinfo = pvpriv; - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); /* Verify that this is a compatible network driver. */ diff --git a/net/sixlowpan/sixlowpan_tcpsend.c b/net/sixlowpan/sixlowpan_tcpsend.c index 693cf7c75d3..26344b2ba91 100644 --- a/net/sixlowpan/sixlowpan_tcpsend.c +++ b/net/sixlowpan/sixlowpan_tcpsend.c @@ -302,8 +302,8 @@ static int sixlowpan_tcp_header(FAR struct tcp_conn_s *conn, * ****************************************************************************/ -static uint16_t tcp_send_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t tcp_send_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct sixlowpan_send_s *sinfo = pvpriv; FAR struct tcp_conn_s *conn = sinfo->s_conn; @@ -339,7 +339,7 @@ static uint16_t tcp_send_eventhandler(FAR struct net_driver_s *dev, return flags; } - ninfo("flags: %04x acked: %" PRIu32 " sent: %zu\n", + ninfo("flags: %" PRIx32 " acked: %" PRIu32 " sent: %zu\n", flags, sinfo->s_acked, sinfo->s_sent); /* If this packet contains an acknowledgement, then update the count of diff --git a/net/tcp/tcp.h b/net/tcp/tcp.h index 937f8afdb5b..35389a58949 100644 --- a/net/tcp/tcp.h +++ b/net/tcp/tcp.h @@ -806,7 +806,7 @@ int tcp_start_monitor(FAR struct socket *psock); * ****************************************************************************/ -void tcp_stop_monitor(FAR struct tcp_conn_s *conn, uint16_t flags); +void tcp_stop_monitor(FAR struct tcp_conn_s *conn, uint32_t flags); /**************************************************************************** * Name: tcp_lost_connection @@ -832,7 +832,7 @@ void tcp_stop_monitor(FAR struct tcp_conn_s *conn, uint16_t flags); ****************************************************************************/ void tcp_lost_connection(FAR struct tcp_conn_s *conn, - FAR struct devif_callback_s *cb, uint16_t flags); + FAR struct devif_callback_s *cb, uint32_t flags); /**************************************************************************** * Name: tcp_close @@ -1399,8 +1399,8 @@ void tcp_ipv6_input(FAR struct net_driver_s *dev, unsigned int iplen); * ****************************************************************************/ -uint16_t tcp_callback(FAR struct net_driver_s *dev, - FAR struct tcp_conn_s *conn, uint16_t flags); +uint32_t tcp_callback(FAR struct net_driver_s *dev, + FAR struct tcp_conn_s *conn, uint32_t flags); /**************************************************************************** * Name: tcp_datahandler @@ -1939,7 +1939,7 @@ int tcp_wrbuffer_test(void); #ifdef CONFIG_DEBUG_FEATURES void tcp_event_handler_dump(FAR struct net_driver_s *dev, FAR void *pvpriv, - uint16_t flags, + uint32_t flags, FAR struct tcp_conn_s *conn); #endif @@ -2381,7 +2381,7 @@ void tcp_cc_recv_ack(FAR struct tcp_conn_s *conn, FAR struct tcp_hdr_s *tcp); * ****************************************************************************/ -void tcp_set_zero_probe(FAR struct tcp_conn_s *conn, uint16_t flags); +void tcp_set_zero_probe(FAR struct tcp_conn_s *conn, uint32_t flags); #endif /* NET_TCP_HAVE_STACK */ #endif /* __NET_TCP_TCP_H */ diff --git a/net/tcp/tcp_callback.c b/net/tcp/tcp_callback.c index 8f9d5631e9c..2e8b561c7e4 100644 --- a/net/tcp/tcp_callback.c +++ b/net/tcp/tcp_callback.c @@ -60,9 +60,9 @@ * ****************************************************************************/ -static inline uint16_t +static inline uint32_t tcp_data_event(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn, - uint16_t flags) + uint32_t flags) { uint16_t recvlen; @@ -109,9 +109,9 @@ tcp_data_event(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn, ****************************************************************************/ #ifdef CONFIG_NET_TCP_OUT_OF_ORDER -static uint16_t tcp_ofoseg_data_event(FAR struct net_driver_s *dev, +static uint32_t tcp_ofoseg_data_event(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn, - uint16_t flags) + uint32_t flags) { FAR struct tcp_ofoseg_s *seg; uint32_t rcvseq; @@ -257,11 +257,11 @@ int tcp_ofoseg_bufsize(FAR struct tcp_conn_s *conn) * ****************************************************************************/ -uint16_t tcp_callback(FAR struct net_driver_s *dev, - FAR struct tcp_conn_s *conn, uint16_t flags) +uint32_t tcp_callback(FAR struct net_driver_s *dev, + FAR struct tcp_conn_s *conn, uint32_t flags) { #if defined(CONFIG_NET_TCP_NOTIFIER) || defined(CONFIG_NET_TCP_OUT_OF_ORDER) - uint16_t orig = flags; + uint32_t orig = flags; #endif /* Prepare device buffer */ @@ -277,7 +277,7 @@ uint16_t tcp_callback(FAR struct net_driver_s *dev, * must be explicitly set in the callback. */ - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); /* Perform the data callback. When a data callback is executed from * 'list', the input flags are normally returned, however, the diff --git a/net/tcp/tcp_close.c b/net/tcp/tcp_close.c index 98568d1f2f8..4aa324819b6 100644 --- a/net/tcp/tcp_close.c +++ b/net/tcp/tcp_close.c @@ -70,12 +70,12 @@ static void tcp_close_work(FAR void *param) * Name: tcp_close_eventhandler ****************************************************************************/ -static uint16_t tcp_close_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t tcp_close_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct tcp_conn_s *conn = pvpriv; - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); /* TCP_DISCONN_EVENTS: * TCP_ABORT: The remote host has aborted the connection diff --git a/net/tcp/tcp_connect.c b/net/tcp/tcp_connect.c index 3bba8132481..eb8ee1691b6 100644 --- a/net/tcp/tcp_connect.c +++ b/net/tcp/tcp_connect.c @@ -72,8 +72,8 @@ static inline int psock_setup_callbacks(FAR struct socket *psock, FAR struct tcp_connect_s *pstate); static void psock_teardown_callbacks(FAR struct tcp_connect_s *pstate, int status); -static uint16_t psock_connect_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags); +static uint32_t psock_connect_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags); /**************************************************************************** * Private Functions @@ -159,13 +159,13 @@ static void psock_teardown_callbacks(FAR struct tcp_connect_s *pstate, * ****************************************************************************/ -static uint16_t psock_connect_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t psock_connect_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { struct tcp_connect_s *pstate = pvpriv; FAR struct tcp_conn_s *conn; - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); /* 'priv' might be null in some race conditions (?) */ diff --git a/net/tcp/tcp_dump.c b/net/tcp/tcp_dump.c index c273b394242..ccec9fc961c 100644 --- a/net/tcp/tcp_dump.c +++ b/net/tcp/tcp_dump.c @@ -50,12 +50,12 @@ void tcp_event_handler_dump(FAR struct net_driver_s *dev, FAR void *pvpriv, - uint16_t flags, + uint32_t flags, FAR struct tcp_conn_s *conn) { #ifdef CONFIG_NET_TCP_WRITE_BUFFERS nerr("ERROR: conn->dev == NULL:" - " dev=%p pvpriv=%p flags=0x%04x" + " dev=%p pvpriv=%p flags=0x%" PRIx32 " conn->dev=%p conn->flags=0x%04x tcpstateflags=0x%02x crefs=%d" " isn=%" PRIu32 " sndseq=%" PRIu32 " tx_unacked=%" PRId32 " sent=%" PRId32 @@ -67,7 +67,7 @@ void tcp_event_handler_dump(FAR struct net_driver_s *dev, conn, conn->sconn.s_flags); #else nerr("ERROR: conn->dev == NULL:" - " dev=%p pvpriv=%p flags=0x%04x" + " dev=%p pvpriv=%p flags=0x%" PRIx32 " conn->dev=%p conn->flags=0x%04x tcpstateflags=0x%02x crefs=%d" " sndseq=%" PRIu32 " tx_unacked=%" PRId32 diff --git a/net/tcp/tcp_input.c b/net/tcp/tcp_input.c index ad8e880ab5e..74c8d53651d 100644 --- a/net/tcp/tcp_input.c +++ b/net/tcp/tcp_input.c @@ -696,8 +696,8 @@ static void tcp_input(FAR struct net_driver_s *dev, uint8_t domain, FAR struct tcp_hdr_s *tcp; union ip_binding_u uaddr; unsigned int tcpiplen; + uint32_t flags; uint16_t tmp16; - uint16_t flags; uint16_t result; int len; diff --git a/net/tcp/tcp_monitor.c b/net/tcp/tcp_monitor.c index 2a559b32448..6c8271d585b 100644 --- a/net/tcp/tcp_monitor.c +++ b/net/tcp/tcp_monitor.c @@ -44,9 +44,9 @@ ****************************************************************************/ static void tcp_close_connection(FAR struct tcp_conn_s *conn, - uint16_t flags); -static uint16_t tcp_monitor_event(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags); + uint32_t flags); +static uint32_t tcp_monitor_event(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags); /**************************************************************************** * Private Functions @@ -70,7 +70,7 @@ static uint16_t tcp_monitor_event(FAR struct net_driver_s *dev, * ****************************************************************************/ -static void tcp_close_connection(FAR struct tcp_conn_s *conn, uint16_t flags) +static void tcp_close_connection(FAR struct tcp_conn_s *conn, uint32_t flags) { /* These loss-of-connection events may be reported: * @@ -130,14 +130,15 @@ static void tcp_close_connection(FAR struct tcp_conn_s *conn, uint16_t flags) * ****************************************************************************/ -static uint16_t tcp_monitor_event(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t tcp_monitor_event(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct tcp_conn_s *conn = pvpriv; if (conn != NULL) { - ninfo("flags: %04x s_flags: %02x\n", flags, conn->sconn.s_flags); + ninfo("flags: %" PRIx32 " s_flags: %02x\n", flags, + conn->sconn.s_flags); /* TCP_DISCONN_EVENTS: TCP_ABORT, TCP_TIMEDOUT, or NETDEV_DOWN. * All loss-of-connection events. @@ -205,7 +206,7 @@ static uint16_t tcp_monitor_event(FAR struct net_driver_s *dev, * ****************************************************************************/ -static void tcp_shutdown_monitor(FAR struct tcp_conn_s *conn, uint16_t flags) +static void tcp_shutdown_monitor(FAR struct tcp_conn_s *conn, uint32_t flags) { /* Perform callbacks to assure that all sockets, including dup'ed copies, * are informed of the loss of connection event. @@ -335,7 +336,7 @@ int tcp_start_monitor(FAR struct socket *psock) * ****************************************************************************/ -void tcp_stop_monitor(FAR struct tcp_conn_s *conn, uint16_t flags) +void tcp_stop_monitor(FAR struct tcp_conn_s *conn, uint32_t flags) { DEBUGASSERT(conn != NULL); @@ -368,7 +369,7 @@ void tcp_stop_monitor(FAR struct tcp_conn_s *conn, uint16_t flags) ****************************************************************************/ void tcp_lost_connection(FAR struct tcp_conn_s *conn, - FAR struct devif_callback_s *cb, uint16_t flags) + FAR struct devif_callback_s *cb, uint32_t flags) { DEBUGASSERT(conn != NULL); diff --git a/net/tcp/tcp_netpoll.c b/net/tcp/tcp_netpoll.c index 093ea200df9..2b1dad2094b 100644 --- a/net/tcp/tcp_netpoll.c +++ b/net/tcp/tcp_netpoll.c @@ -66,12 +66,12 @@ * ****************************************************************************/ -static uint16_t tcp_poll_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t tcp_poll_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct tcp_poll_s *info = pvpriv; - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); DEBUGASSERT(info == NULL || (info->conn != NULL && info->fds != NULL)); diff --git a/net/tcp/tcp_recvfrom.c b/net/tcp/tcp_recvfrom.c index 45ab7c6594c..f7f6e44fac0 100644 --- a/net/tcp/tcp_recvfrom.c +++ b/net/tcp/tcp_recvfrom.c @@ -170,9 +170,9 @@ static size_t tcp_recvfrom_newdata(FAR struct net_driver_s *dev, * ****************************************************************************/ -static inline uint16_t tcp_newdata(FAR struct net_driver_s *dev, +static inline uint32_t tcp_newdata(FAR struct net_driver_s *dev, FAR struct tcp_recvfrom_s *pstate, - uint16_t flags) + uint32_t flags) { FAR struct tcp_conn_s *conn = pstate->ir_conn; @@ -391,13 +391,13 @@ static inline void tcp_sender(FAR struct net_driver_s *dev, * ****************************************************************************/ -static uint16_t tcp_recvhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t tcp_recvhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct tcp_recvfrom_s *pstate = pvpriv; FAR struct iob_s *iob = NULL; - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); /* 'priv' might be null in some race conditions (?) */ diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c index bec10ee2681..68711453a8c 100644 --- a/net/tcp/tcp_send_buffered.c +++ b/net/tcp/tcp_send_buffered.c @@ -431,8 +431,8 @@ static int parse_sack(FAR struct tcp_conn_s *conn, FAR struct tcp_hdr_s *tcp, * ****************************************************************************/ -static uint16_t psock_send_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t psock_send_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct tcp_conn_s *conn = pvpriv; #ifdef CONFIG_NET_TCP_SELECTIVE_ACK @@ -459,7 +459,7 @@ static uint16_t psock_send_eventhandler(FAR struct net_driver_s *dev, return flags; } - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); /* The TCP_ACKDATA, TCP_REXMIT and TCP_DISCONN_EVENTS flags are expected to * appear here strictly one at a time, except for the FIN + ACK case. @@ -505,7 +505,7 @@ static uint16_t psock_send_eventhandler(FAR struct net_driver_s *dev, /* Get the ACK number from the TCP header */ ackno = tcp_getsequence(tcp->ackno); - ninfo("ACK: ackno=%" PRIu32 " flags=%04x\n", ackno, flags); + ninfo("ACK: ackno=%" PRIu32 " flags=%" PRIx32 "\n", ackno, flags); /* Look at every write buffer in the unacked_q. The unacked_q * holds write buffers that have been entirely sent, but which @@ -707,7 +707,7 @@ static uint16_t psock_send_eventhandler(FAR struct net_driver_s *dev, if ((flags & TCP_DISCONN_EVENTS) != 0) { - ninfo("Lost connection: %04x\n", flags); + ninfo("Lost connection: %" PRIx32 "\n", flags); /* We could get here recursively through the callback actions of * tcp_lost_connection(). So don't repeat that action if we have @@ -893,7 +893,7 @@ static uint16_t psock_send_eventhandler(FAR struct net_driver_s *dev, FAR struct tcp_wrbuffer_s *wrb; FAR sq_entry_t *entry; - ninfo("REXMIT: %04x\n", flags); + ninfo("REXMIT: %" PRIx32 "\n", flags); /* If there is a partially sent write buffer at the head of the * write_q? Has anything been sent from that write buffer? diff --git a/net/tcp/tcp_send_unbuffered.c b/net/tcp/tcp_send_unbuffered.c index 04477dc793d..fa5844b9866 100644 --- a/net/tcp/tcp_send_unbuffered.c +++ b/net/tcp/tcp_send_unbuffered.c @@ -125,8 +125,8 @@ struct send_s * ****************************************************************************/ -static uint16_t tcpsend_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t tcpsend_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct send_s *pstate = pvpriv; FAR struct tcp_conn_s *conn; @@ -151,7 +151,7 @@ static uint16_t tcpsend_eventhandler(FAR struct net_driver_s *dev, return flags; } - ninfo("flags: %04x acked: %" PRId32 " sent: %zd\n", + ninfo("flags: %" PRIx32 " acked: %" PRId32 " sent: %zd\n", flags, pstate->snd_acked, pstate->snd_sent); /* The TCP_ACKDATA, TCP_REXMIT and TCP_DISCONN_EVENTS flags are expected to diff --git a/net/tcp/tcp_sendfile.c b/net/tcp/tcp_sendfile.c index 6b1a33776ec..429c6449f3f 100644 --- a/net/tcp/tcp_sendfile.c +++ b/net/tcp/tcp_sendfile.c @@ -117,8 +117,8 @@ struct sendfile_s * ****************************************************************************/ -static uint16_t sendfile_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t sendfile_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct sendfile_s *pstate = pvpriv; FAR struct tcp_conn_s *conn; @@ -143,7 +143,7 @@ static uint16_t sendfile_eventhandler(FAR struct net_driver_s *dev, return flags; } - ninfo("flags: %04x acked: %" PRId32 " sent: %zd\n", + ninfo("flags: %" PRIx32 " acked: %" PRId32 " sent: %zd\n", flags, pstate->snd_acked, pstate->snd_sent); /* The TCP_ACKDATA, TCP_REXMIT and TCP_DISCONN_EVENTS flags are expected to diff --git a/net/tcp/tcp_shutdown.c b/net/tcp/tcp_shutdown.c index f29d57b4ae6..94426e26ab9 100644 --- a/net/tcp/tcp_shutdown.c +++ b/net/tcp/tcp_shutdown.c @@ -49,12 +49,12 @@ * Name: tcp_shutdown_eventhandler ****************************************************************************/ -static uint16_t tcp_shutdown_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t tcp_shutdown_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct tcp_conn_s *conn = pvpriv; - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); #ifdef CONFIG_NET_TCP_WRITE_BUFFERS /* We don't need the send callback anymore. */ diff --git a/net/tcp/tcp_timer.c b/net/tcp/tcp_timer.c index b86a1b38b86..5422616d407 100644 --- a/net/tcp/tcp_timer.c +++ b/net/tcp/tcp_timer.c @@ -364,7 +364,7 @@ void tcp_stop_timer(FAR struct tcp_conn_s *conn) * ****************************************************************************/ -void tcp_set_zero_probe(FAR struct tcp_conn_s *conn, uint16_t flags) +void tcp_set_zero_probe(FAR struct tcp_conn_s *conn, uint32_t flags) { if ((conn->tcpstateflags & TCP_ESTABLISHED) && ((flags & TCP_NEWDATA) == 0) && conn->tx_unacked <= 0 && diff --git a/net/udp/udp.h b/net/udp/udp.h index ebfd5500468..68850022f65 100644 --- a/net/udp/udp.h +++ b/net/udp/udp.h @@ -729,8 +729,8 @@ udp_find_raddr_device(FAR struct udp_conn_s *conn, * ****************************************************************************/ -uint16_t udp_callback(FAR struct net_driver_s *dev, - FAR struct udp_conn_s *conn, uint16_t flags); +uint32_t udp_callback(FAR struct net_driver_s *dev, + FAR struct udp_conn_s *conn, uint32_t flags); /**************************************************************************** * Name: udp_callback_cleanup diff --git a/net/udp/udp_callback.c b/net/udp/udp_callback.c index 710bd95657e..7b363e3acd4 100644 --- a/net/udp/udp_callback.c +++ b/net/udp/udp_callback.c @@ -247,11 +247,11 @@ errout: * ****************************************************************************/ -static inline uint16_t +static inline uint32_t net_dataevent(FAR struct net_driver_s *dev, FAR struct udp_conn_s *conn, - uint16_t flags) + uint32_t flags) { - uint16_t ret; + uint32_t ret; uint8_t *buffer = dev->d_appdata; int buflen = dev->d_len; uint16_t recvlen; @@ -306,10 +306,10 @@ net_dataevent(FAR struct net_driver_s *dev, FAR struct udp_conn_s *conn, * ****************************************************************************/ -uint16_t udp_callback(FAR struct net_driver_s *dev, - FAR struct udp_conn_s *conn, uint16_t flags) +uint32_t udp_callback(FAR struct net_driver_s *dev, + FAR struct udp_conn_s *conn, uint32_t flags) { - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); /* Some sanity checking */ diff --git a/net/udp/udp_input.c b/net/udp/udp_input.c index 22ec8a065e3..15534e37b97 100644 --- a/net/udp/udp_input.c +++ b/net/udp/udp_input.c @@ -138,7 +138,7 @@ static bool udp_is_broadcast(FAR struct net_driver_s *dev) static int udp_input_conn(FAR struct net_driver_s *dev, FAR struct udp_conn_s *conn, unsigned int udpiplen) { - uint16_t flags; + uint32_t flags; /* Set-up for the application callback */ diff --git a/net/udp/udp_netpoll.c b/net/udp/udp_netpoll.c index 213832b80c6..5a7333aaab7 100644 --- a/net/udp/udp_netpoll.c +++ b/net/udp/udp_netpoll.c @@ -64,12 +64,12 @@ * ****************************************************************************/ -static uint16_t udp_poll_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t udp_poll_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct udp_poll_s *info = pvpriv; - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); DEBUGASSERT(!info || (info->conn && info->fds)); diff --git a/net/udp/udp_recvfrom.c b/net/udp/udp_recvfrom.c index a5d18d68e9f..38fbfda7829 100644 --- a/net/udp/udp_recvfrom.c +++ b/net/udp/udp_recvfrom.c @@ -440,12 +440,12 @@ static void udp_terminate(FAR struct udp_recvfrom_s *pstate, int result) * ****************************************************************************/ -static uint16_t udp_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t udp_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct udp_recvfrom_s *pstate = pvpriv; - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); /* 'priv' might be null in some race conditions (?) */ diff --git a/net/udp/udp_sendto_buffered.c b/net/udp/udp_sendto_buffered.c index cfb28c6f0dc..194ce3c5dfd 100644 --- a/net/udp/udp_sendto_buffered.c +++ b/net/udp/udp_sendto_buffered.c @@ -94,8 +94,8 @@ static inline void sendto_ipselect(FAR struct net_driver_s *dev, FAR struct udp_conn_s *conn); #endif static int sendto_next_transfer(FAR struct udp_conn_s *conn); -static uint16_t sendto_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags); +static uint32_t sendto_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags); /**************************************************************************** * Private Functions @@ -386,20 +386,20 @@ out: * ****************************************************************************/ -static uint16_t sendto_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t sendto_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct udp_conn_s *conn = pvpriv; DEBUGASSERT(dev != NULL && conn != NULL); - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); /* Check if the network device has gone down */ if ((flags & NETDEV_DOWN) != 0) { - ninfo("Device down: %04x\n", flags); + ninfo("Device down: %" PRIx32 "\n", flags); /* Free the write buffer at the head of the queue and attempt to setup * the next transfer. diff --git a/net/udp/udp_sendto_unbuffered.c b/net/udp/udp_sendto_unbuffered.c index 6e402a8064d..ffa190f6e2a 100644 --- a/net/udp/udp_sendto_unbuffered.c +++ b/net/udp/udp_sendto_unbuffered.c @@ -144,8 +144,8 @@ static inline void sendto_ipselect(FAR struct net_driver_s *dev, * ****************************************************************************/ -static uint16_t sendto_eventhandler(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t sendto_eventhandler(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct sendto_s *pstate = pvpriv; @@ -163,7 +163,7 @@ static uint16_t sendto_eventhandler(FAR struct net_driver_s *dev, return flags; } - ninfo("flags: %04x\n", flags); + ninfo("flags: %" PRIx32 "\n", flags); /* If the network device has gone down, then we will have terminate * the wait now with an error. diff --git a/net/usrsock/usrsock.h b/net/usrsock/usrsock.h index 200fb745da8..9f9e05f78a8 100644 --- a/net/usrsock/usrsock.h +++ b/net/usrsock/usrsock.h @@ -211,7 +211,7 @@ FAR struct usrsock_conn_s *usrsock_active(int16_t usockid); int usrsock_setup_request_callback(FAR struct usrsock_conn_s *conn, FAR struct usrsock_reqstate_s *pstate, FAR devif_callback_event_t event, - uint16_t flags); + uint32_t flags); /**************************************************************************** * Name: usrsock_setup_data_request_callback() @@ -220,7 +220,7 @@ int usrsock_setup_request_callback(FAR struct usrsock_conn_s *conn, int usrsock_setup_data_request_callback(FAR struct usrsock_conn_s *conn, FAR struct usrsock_data_reqstate_s *pstate, FAR devif_callback_event_t event, - uint16_t flags); + uint32_t flags); /**************************************************************************** * Name: usrsock_teardown_request_callback() diff --git a/net/usrsock/usrsock_accept.c b/net/usrsock/usrsock_accept.c index 07e2f60adf9..880be40edbc 100644 --- a/net/usrsock/usrsock_accept.c +++ b/net/usrsock/usrsock_accept.c @@ -40,8 +40,8 @@ * Private Functions ****************************************************************************/ -static uint16_t accept_event(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t accept_event(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct usrsock_data_reqstate_s *pstate = pvpriv; FAR struct usrsock_conn_s *conn = pstate->reqstate.conn; diff --git a/net/usrsock/usrsock_bind.c b/net/usrsock/usrsock_bind.c index c0a74aafd7d..a0f163ace97 100644 --- a/net/usrsock/usrsock_bind.c +++ b/net/usrsock/usrsock_bind.c @@ -45,8 +45,8 @@ * Private Functions ****************************************************************************/ -static uint16_t bind_event(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t bind_event(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct usrsock_reqstate_s *pstate = pvpriv; FAR struct usrsock_conn_s *conn = pstate->conn; diff --git a/net/usrsock/usrsock_close.c b/net/usrsock/usrsock_close.c index c9a0cb7fe26..2dc38196f0a 100644 --- a/net/usrsock/usrsock_close.c +++ b/net/usrsock/usrsock_close.c @@ -45,8 +45,8 @@ * Private Functions ****************************************************************************/ -static uint16_t close_event(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t close_event(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct usrsock_reqstate_s *pstate = pvpriv; FAR struct usrsock_conn_s *conn = pstate->conn; diff --git a/net/usrsock/usrsock_conn.c b/net/usrsock/usrsock_conn.c index 52f9050d922..fd1e5325f8e 100644 --- a/net/usrsock/usrsock_conn.c +++ b/net/usrsock/usrsock_conn.c @@ -203,7 +203,7 @@ FAR struct usrsock_conn_s *usrsock_active(int16_t usockid) int usrsock_setup_request_callback(FAR struct usrsock_conn_s *conn, FAR struct usrsock_reqstate_s *pstate, FAR devif_callback_event_t event, - uint16_t flags) + uint32_t flags) { int ret = -EBUSY; @@ -248,7 +248,7 @@ int usrsock_setup_data_request_callback( FAR struct usrsock_conn_s *conn, FAR struct usrsock_data_reqstate_s *pstate, FAR devif_callback_event_t event, - uint16_t flags) + uint32_t flags) { pstate->valuelen = 0; pstate->valuelen_nontrunc = 0; diff --git a/net/usrsock/usrsock_connect.c b/net/usrsock/usrsock_connect.c index 951b213e8b6..51237d3e102 100644 --- a/net/usrsock/usrsock_connect.c +++ b/net/usrsock/usrsock_connect.c @@ -45,8 +45,8 @@ * Private Functions ****************************************************************************/ -static uint16_t connect_event(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t connect_event(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct usrsock_reqstate_s *pstate = pvpriv; FAR struct usrsock_conn_s *conn = pstate->conn; diff --git a/net/usrsock/usrsock_getpeername.c b/net/usrsock/usrsock_getpeername.c index 4adb768df6a..94322bc2e4d 100644 --- a/net/usrsock/usrsock_getpeername.c +++ b/net/usrsock/usrsock_getpeername.c @@ -45,8 +45,8 @@ * Private Functions ****************************************************************************/ -static uint16_t getpeername_event(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t getpeername_event(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct usrsock_data_reqstate_s *pstate = pvpriv; FAR struct usrsock_conn_s *conn = pstate->reqstate.conn; diff --git a/net/usrsock/usrsock_getsockname.c b/net/usrsock/usrsock_getsockname.c index 679fa385b90..4947eb2d363 100644 --- a/net/usrsock/usrsock_getsockname.c +++ b/net/usrsock/usrsock_getsockname.c @@ -45,8 +45,8 @@ * Private Functions ****************************************************************************/ -static uint16_t getsockname_event(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t getsockname_event(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct usrsock_data_reqstate_s *pstate = pvpriv; FAR struct usrsock_conn_s *conn = pstate->reqstate.conn; diff --git a/net/usrsock/usrsock_getsockopt.c b/net/usrsock/usrsock_getsockopt.c index e01b2ad200e..2ddcb591fab 100644 --- a/net/usrsock/usrsock_getsockopt.c +++ b/net/usrsock/usrsock_getsockopt.c @@ -46,8 +46,8 @@ * Private Functions ****************************************************************************/ -static uint16_t getsockopt_event(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t getsockopt_event(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct usrsock_data_reqstate_s *pstate = pvpriv; FAR struct usrsock_conn_s *conn = pstate->reqstate.conn; diff --git a/net/usrsock/usrsock_ioctl.c b/net/usrsock/usrsock_ioctl.c index 06cd1aa2283..c80ab11fc91 100644 --- a/net/usrsock/usrsock_ioctl.c +++ b/net/usrsock/usrsock_ioctl.c @@ -47,8 +47,8 @@ * Private Functions ****************************************************************************/ -static uint16_t ioctl_event(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t ioctl_event(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct usrsock_data_reqstate_s *pstate = pvpriv; FAR struct usrsock_conn_s *conn = pstate->reqstate.conn; diff --git a/net/usrsock/usrsock_listen.c b/net/usrsock/usrsock_listen.c index fca51913bd9..2ce60844311 100644 --- a/net/usrsock/usrsock_listen.c +++ b/net/usrsock/usrsock_listen.c @@ -40,8 +40,8 @@ * Private Functions ****************************************************************************/ -static uint16_t listen_event(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t listen_event(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct usrsock_reqstate_s *pstate = pvpriv; FAR struct usrsock_conn_s *conn = pstate->conn; diff --git a/net/usrsock/usrsock_poll.c b/net/usrsock/usrsock_poll.c index 159b8a97a8f..8ee80097340 100644 --- a/net/usrsock/usrsock_poll.c +++ b/net/usrsock/usrsock_poll.c @@ -47,8 +47,8 @@ * Private Functions ****************************************************************************/ -static uint16_t poll_event(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t poll_event(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct usrsock_poll_s *info = pvpriv; FAR struct usrsock_conn_s *conn = info->conn; diff --git a/net/usrsock/usrsock_recvmsg.c b/net/usrsock/usrsock_recvmsg.c index 67d34569170..a726827ed42 100644 --- a/net/usrsock/usrsock_recvmsg.c +++ b/net/usrsock/usrsock_recvmsg.c @@ -45,8 +45,8 @@ * Private Functions ****************************************************************************/ -static uint16_t recvfrom_event(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t recvfrom_event(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct usrsock_data_reqstate_s *pstate = pvpriv; FAR struct usrsock_conn_s *conn = pstate->reqstate.conn; diff --git a/net/usrsock/usrsock_sendmsg.c b/net/usrsock/usrsock_sendmsg.c index 8e86366ef63..084806c9318 100644 --- a/net/usrsock/usrsock_sendmsg.c +++ b/net/usrsock/usrsock_sendmsg.c @@ -45,8 +45,8 @@ * Private Functions ****************************************************************************/ -static uint16_t sendto_event(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t sendto_event(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct usrsock_reqstate_s *pstate = pvpriv; FAR struct usrsock_conn_s *conn = pstate->conn; diff --git a/net/usrsock/usrsock_setsockopt.c b/net/usrsock/usrsock_setsockopt.c index c065625769c..7baa9229676 100644 --- a/net/usrsock/usrsock_setsockopt.c +++ b/net/usrsock/usrsock_setsockopt.c @@ -46,8 +46,8 @@ * Private Functions ****************************************************************************/ -static uint16_t setsockopt_event(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t setsockopt_event(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct usrsock_reqstate_s *pstate = pvpriv; FAR struct usrsock_conn_s *conn = pstate->conn; diff --git a/net/usrsock/usrsock_shutdown.c b/net/usrsock/usrsock_shutdown.c index 7d50948cf90..d49e6c2cd35 100644 --- a/net/usrsock/usrsock_shutdown.c +++ b/net/usrsock/usrsock_shutdown.c @@ -45,8 +45,8 @@ * Private Functions ****************************************************************************/ -static uint16_t shutdown_event(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t shutdown_event(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct usrsock_reqstate_s *pstate = pvpriv; FAR struct usrsock_conn_s *conn = pstate->conn; diff --git a/net/usrsock/usrsock_socket.c b/net/usrsock/usrsock_socket.c index 167b007cfbf..abf9facae6a 100644 --- a/net/usrsock/usrsock_socket.c +++ b/net/usrsock/usrsock_socket.c @@ -46,8 +46,8 @@ * Private Functions ****************************************************************************/ -static uint16_t socket_event(FAR struct net_driver_s *dev, - FAR void *pvpriv, uint16_t flags) +static uint32_t socket_event(FAR struct net_driver_s *dev, + FAR void *pvpriv, uint32_t flags) { FAR struct usrsock_reqstate_s *pstate = pvpriv; FAR struct usrsock_conn_s *conn = pstate->conn;
