From de5703237a8973502fdd4c87e993a998be192863 Mon Sep 17 00:00:00 2001 From: patacongo Date: Tue, 15 Dec 2009 15:57:25 +0000 Subject: Changing NuttX fixed size type names to C99 standard names -- things will be broken for awhile git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2346 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/net/connect.c | 13 +++++++------ nuttx/net/getsockopt.c | 2 +- nuttx/net/listen.c | 1 - nuttx/net/net_arptimer.c | 7 ++++--- nuttx/net/net_clone.c | 1 - nuttx/net/net_close.c | 6 +++--- nuttx/net/net_dsec2timeval.c | 8 ++++---- nuttx/net/net_dup.c | 1 - nuttx/net/net_dup2.c | 1 - nuttx/net/net_internal.h | 7 +++++-- nuttx/net/net_poll.c | 12 ++++++------ nuttx/net/net_sockets.c | 4 ++-- nuttx/net/net_timeo.c | 10 +++++----- nuttx/net/net_timeval2dsec.c | 4 ++-- nuttx/net/net_vfcntl.c | 4 ++-- nuttx/net/netdev_count.c | 5 ++--- nuttx/net/netdev_findbyaddr.c | 10 +++++----- nuttx/net/netdev_findbyname.c | 3 +-- nuttx/net/netdev_foreach.c | 5 ++--- nuttx/net/netdev_ioctl.c | 5 ++--- nuttx/net/netdev_register.c | 3 +-- nuttx/net/recvfrom.c | 12 ++++++------ nuttx/net/send.c | 24 ++++++++++++------------ nuttx/net/sendto.c | 6 ++++-- nuttx/net/socket.c | 1 - 25 files changed, 76 insertions(+), 79 deletions(-) (limited to 'nuttx/net') diff --git a/nuttx/net/connect.c b/nuttx/net/connect.c index 16f3e3583..927abfe0e 100644 --- a/nuttx/net/connect.c +++ b/nuttx/net/connect.c @@ -43,6 +43,7 @@ #include #include +#include #include #include @@ -71,12 +72,12 @@ struct tcp_connect_s ****************************************************************************/ #ifdef CONFIG_NET_TCP -static void connection_event(struct uip_conn *conn, uint16 flags); +static void connection_event(struct uip_conn *conn, uint16_t flags); static inline int tcp_setup_callbacks(FAR struct socket *psock, FAR struct tcp_connect_s *pstate); static inline void tcp_teardown_callbacks(struct tcp_connect_s *pstate, int status); -static uint16 tcp_connect_interrupt(struct uip_driver_s *dev, void *pvconn, - void *pvpriv, uint16 flags); +static uint16_t tcp_connect_interrupt(struct uip_driver_s *dev, void *pvconn, + void *pvpriv, uint16_t flags); #ifdef CONFIG_NET_IPv6 static inline int tcp_connect(FAR struct socket *psock, const struct sockaddr_in6 *inaddr); #else @@ -107,7 +108,7 @@ static inline int tcp_connect(FAR struct socket *psock, const struct sockaddr_in ****************************************************************************/ #ifdef CONFIG_NET_TCP -static void connection_event(struct uip_conn *conn, uint16 flags) +static void connection_event(struct uip_conn *conn, uint16_t flags) { FAR struct socket *psock = (FAR struct socket *)conn->connection_private; @@ -222,8 +223,8 @@ static inline void tcp_teardown_callbacks(struct tcp_connect_s *pstate, int stat ****************************************************************************/ #ifdef CONFIG_NET_TCP -static uint16 tcp_connect_interrupt(struct uip_driver_s *dev, void *pvconn, - void *pvpriv, uint16 flags) +static uint16_t tcp_connect_interrupt(struct uip_driver_s *dev, void *pvconn, + void *pvpriv, uint16_t flags) { struct tcp_connect_s *pstate = (struct tcp_connect_s *)pvpriv; diff --git a/nuttx/net/getsockopt.c b/nuttx/net/getsockopt.c index 186de82af..94cfb5ec7 100644 --- a/nuttx/net/getsockopt.c +++ b/nuttx/net/getsockopt.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/getsockopt.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without diff --git a/nuttx/net/listen.c b/nuttx/net/listen.c index c28f9fae0..bddb0ab08 100644 --- a/nuttx/net/listen.c +++ b/nuttx/net/listen.c @@ -40,7 +40,6 @@ #include #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0 -#include #include #include #include diff --git a/nuttx/net/net_arptimer.c b/nuttx/net/net_arptimer.c index e3c281c38..f019fdb75 100644 --- a/nuttx/net/net_arptimer.c +++ b/nuttx/net/net_arptimer.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/net_arptimer.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -40,6 +40,7 @@ #include #ifdef CONFIG_NET +#include #include #include #include @@ -49,7 +50,7 @@ #include "net_internal.h" /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /* ARP timer interval = 10 seconds. CLK_TCK is the number of clock ticks @@ -85,7 +86,7 @@ static WDOG_ID g_arptimer; /* ARP timer */ * ****************************************************************************/ -static void arptimer_poll(int argc, uint32 arg, ...) +static void arptimer_poll(int argc, uint32_t arg, ...) { /* Call the ARP timer function every 10 seconds. */ diff --git a/nuttx/net/net_clone.c b/nuttx/net/net_clone.c index 313daee24..542f59050 100644 --- a/nuttx/net/net_clone.c +++ b/nuttx/net/net_clone.c @@ -40,7 +40,6 @@ #include #ifdef CONFIG_NET -#include #include #include #include diff --git a/nuttx/net/net_close.c b/nuttx/net/net_close.c index 02e648a8a..162006505 100644 --- a/nuttx/net/net_close.c +++ b/nuttx/net/net_close.c @@ -42,7 +42,7 @@ #include #include - +#include #include #include @@ -87,8 +87,8 @@ struct tcp_close_s ****************************************************************************/ #ifdef CONFIG_NET_TCP -static uint16 netclose_interrupt(struct uip_driver_s *dev, void *pvconn, - void *pvpriv, uint16 flags) +static uint16_t netclose_interrupt(struct uip_driver_s *dev, void *pvconn, + void *pvpriv, uint16_t flags) { struct tcp_close_s *pstate = (struct tcp_close_s *)pvpriv; diff --git a/nuttx/net/net_dsec2timeval.c b/nuttx/net/net_dsec2timeval.c index f447b91bf..c9d3aeb66 100644 --- a/nuttx/net/net_dsec2timeval.c +++ b/nuttx/net/net_dsec2timeval.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/net_dsec2timeval.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -40,8 +40,8 @@ #include #if defined(CONFIG_NET) && defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK) -#include #include +#include #include #include @@ -69,9 +69,9 @@ * ****************************************************************************/ -void net_dsec2timeval(uint16 dsec, struct timeval *tv) +void net_dsec2timeval(uint16_t dsec, struct timeval *tv) { - uint16 remainder; + uint16_t remainder; tv->tv_sec = dsec / DSEC_PER_SEC; remainder = dsec - tv->tv_sec * DSEC_PER_SEC; tv->tv_usec = remainder * USEC_PER_DSEC; diff --git a/nuttx/net/net_dup.c b/nuttx/net/net_dup.c index e935e4749..8465b7ce4 100644 --- a/nuttx/net/net_dup.c +++ b/nuttx/net/net_dup.c @@ -39,7 +39,6 @@ #include -#include #include #include #include diff --git a/nuttx/net/net_dup2.c b/nuttx/net/net_dup2.c index 8992ec226..da7ab9d70 100644 --- a/nuttx/net/net_dup2.c +++ b/nuttx/net/net_dup2.c @@ -39,7 +39,6 @@ #include -#include #include #include #include diff --git a/nuttx/net/net_internal.h b/nuttx/net/net_internal.h index c66f808e4..0ddb98b30 100644 --- a/nuttx/net/net_internal.h +++ b/nuttx/net/net_internal.h @@ -43,7 +43,10 @@ #include #ifdef CONFIG_NET +#include +#include #include + #include #include @@ -159,9 +162,9 @@ EXTERN int net_closesocket(FAR struct socket *psock); /* sockopt support ***********************************************************/ #if defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK) -EXTERN int net_timeo(uint32 start_time, socktimeo_t timeo); +EXTERN int net_timeo(uint32_t start_time, socktimeo_t timeo); EXTERN socktimeo_t net_timeval2dsec(struct timeval *tv); -EXTERN void net_dsec2timeval(uint16 dsec, struct timeval *tv); +EXTERN void net_dsec2timeval(uint16_t dsec, struct timeval *tv); #endif /* net_register.c ************************************************************/ diff --git a/nuttx/net/net_poll.c b/nuttx/net/net_poll.c index b982f6ae6..7f24a1b7f 100644 --- a/nuttx/net/net_poll.c +++ b/nuttx/net/net_poll.c @@ -40,9 +40,9 @@ #include #if defined(CONFIG_NET) && !defined(CONFIG_DISABLE_POLL) -#include #include - +#include +#include #include #include #include @@ -101,8 +101,8 @@ ****************************************************************************/ #ifdef HAVE_NETPOLL -static uint16 poll_interrupt(struct uip_driver_s *dev, FAR void *conn, - FAR void *pvpriv, uint16 flags) +static uint16_t poll_interrupt(struct uip_driver_s *dev, FAR void *conn, + FAR void *pvpriv, uint16_t flags) { FAR struct pollfd *fds = (FAR struct pollfd *)pvpriv; @@ -293,7 +293,7 @@ static inline int net_pollteardown(FAR struct socket *psock, struct pollfd *fds) * fd - The socket descriptor of interest * fds - The structure describing the events to be monitored, OR NULL if * this is a request to stop monitoring events. - * setup - TRUE: Setup up the poll; FALSE: Teardown the poll + * setup - true: Setup up the poll; false: Teardown the poll * * Returned Value: * 0: Success; Negated errno on failure @@ -301,7 +301,7 @@ static inline int net_pollteardown(FAR struct socket *psock, struct pollfd *fds) ****************************************************************************/ #ifndef CONFIG_DISABLE_POLL -int net_poll(int sockfd, struct pollfd *fds, boolean setup) +int net_poll(int sockfd, struct pollfd *fds, bool setup) { #ifndef HAVE_NETPOLL return -ENOSYS; diff --git a/nuttx/net/net_sockets.c b/nuttx/net/net_sockets.c index 60141808a..6e54c8719 100644 --- a/nuttx/net/net_sockets.c +++ b/nuttx/net/net_sockets.c @@ -1,7 +1,7 @@ /**************************************************************************** - * net_sockets.c + * net/net_sockets.c * - * Copyright (C) 2007- 2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without diff --git a/nuttx/net/net_timeo.c b/nuttx/net/net_timeo.c index e4b95d4ce..191136fca 100644 --- a/nuttx/net/net_timeo.c +++ b/nuttx/net/net_timeo.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/net_timeo.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -40,7 +40,7 @@ #include #if defined(CONFIG_NET) && defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK) -#include +#include #include #include @@ -69,10 +69,10 @@ * ****************************************************************************/ -int net_timeo(uint32 start_time, socktimeo_t timeo) +int net_timeo(uint32_t start_time, socktimeo_t timeo) { - uint32 timeo_ticks = DSEC2TICK(timeo); - uint32 elapsed = g_system_timer - start_time; + uint32_t timeo_ticks = DSEC2TICK(timeo); + uint32_t elapsed = g_system_timer - start_time; if (elapsed >= timeo_ticks) { diff --git a/nuttx/net/net_timeval2dsec.c b/nuttx/net/net_timeval2dsec.c index 87f6b0966..4ca5ecb5f 100644 --- a/nuttx/net/net_timeval2dsec.c +++ b/nuttx/net/net_timeval2dsec.c @@ -40,8 +40,8 @@ #include #if defined(CONFIG_NET) && defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK) -#include #include +#include #include #include @@ -70,7 +70,7 @@ socktimeo_t net_timeval2dsec(struct timeval *tv) { - return (uint16)(tv->tv_sec* DSEC_PER_SEC + tv->tv_usec / USEC_PER_DSEC); + return (uint16_t)(tv->tv_sec* DSEC_PER_SEC + tv->tv_usec / USEC_PER_DSEC); } #endif /* CONFIG_NET && CONFIG_NET_SOCKOPTS && !CONFIG_DISABLE_CLOCK */ diff --git a/nuttx/net/net_vfcntl.c b/nuttx/net/net_vfcntl.c index 88e46ad22..3ea710425 100644 --- a/nuttx/net/net_vfcntl.c +++ b/nuttx/net/net_vfcntl.c @@ -38,9 +38,9 @@ ****************************************************************************/ #include -#include -#include +#include +#include #include #include #include diff --git a/nuttx/net/netdev_count.c b/nuttx/net/netdev_count.c index 5550b28c4..c738b51b3 100644 --- a/nuttx/net/netdev_count.c +++ b/nuttx/net/netdev_count.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/netdev_count.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -40,7 +40,6 @@ #include #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0 -#include #include #include @@ -49,7 +48,7 @@ #include "net_internal.h" /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/net/netdev_findbyaddr.c b/nuttx/net/netdev_findbyaddr.c index 14bd27709..2565aed5a 100644 --- a/nuttx/net/netdev_findbyaddr.c +++ b/nuttx/net/netdev_findbyaddr.c @@ -40,7 +40,7 @@ #include #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0 -#include +#include #include #include #include @@ -50,7 +50,7 @@ #include "net_internal.h" /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** @@ -73,9 +73,9 @@ * Function: netdev_maskcmp ****************************************************************************/ -static inline boolean netdev_maskcmp(const uip_ipaddr_t *ipaddr, - const uip_ipaddr_t *raddr, - const uip_ipaddr_t *netmask) +static inline bool netdev_maskcmp(const uip_ipaddr_t *ipaddr, + const uip_ipaddr_t *raddr, + const uip_ipaddr_t *netmask) { #ifndef CONFIG_NET_IPv6 return (*ipaddr & *netmask) == (*raddr & *netmask); diff --git a/nuttx/net/netdev_findbyname.c b/nuttx/net/netdev_findbyname.c index 3a9db0c0d..c482f5781 100644 --- a/nuttx/net/netdev_findbyname.c +++ b/nuttx/net/netdev_findbyname.c @@ -40,7 +40,6 @@ #include #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0 -#include #include #include @@ -49,7 +48,7 @@ #include "net_internal.h" /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/net/netdev_foreach.c b/nuttx/net/netdev_foreach.c index 760ed20c8..f7d92ce65 100644 --- a/nuttx/net/netdev_foreach.c +++ b/nuttx/net/netdev_foreach.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/netdev_foreach.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -40,7 +40,6 @@ #include #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0 -#include #include #include #include @@ -48,7 +47,7 @@ #include "net_internal.h" /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** diff --git a/nuttx/net/netdev_ioctl.c b/nuttx/net/netdev_ioctl.c index f690b335e..228ead30c 100644 --- a/nuttx/net/netdev_ioctl.c +++ b/nuttx/net/netdev_ioctl.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/netdev_ioctl.c * - * Copyright (C) 2007, 2008, 2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -40,7 +40,6 @@ #include #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0 -#include #include #include @@ -58,7 +57,7 @@ #include "net_internal.h" /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ #ifdef CONFIG_NET_IPv6 diff --git a/nuttx/net/netdev_register.c b/nuttx/net/netdev_register.c index b173bf231..e5426d4e6 100644 --- a/nuttx/net/netdev_register.c +++ b/nuttx/net/netdev_register.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/netdev_register.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -40,7 +40,6 @@ #include #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0 -#include #include #include #include diff --git a/nuttx/net/recvfrom.c b/nuttx/net/recvfrom.c index 5e6325659..17e5b2775 100644 --- a/nuttx/net/recvfrom.c +++ b/nuttx/net/recvfrom.c @@ -42,7 +42,7 @@ #include #include - +#include #include #include #include @@ -72,7 +72,7 @@ struct recvfrom_s { FAR struct socket *rf_sock; /* The parent socket structure */ #if defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK) - uint32 rf_starttime; /* rcv start time for determining timeout */ + uint32_t rf_starttime; /* rcv start time for determining timeout */ #endif FAR struct uip_callback_s *rf_cb; /* Reference to callback instance */ sem_t rf_sem; /* Semaphore signals recv completion */ @@ -358,8 +358,8 @@ static inline void recvfrom_tcpsender(struct uip_driver_s *dev, struct recvfrom_ ****************************************************************************/ #ifdef CONFIG_NET_TCP -static uint16 recvfrom_tcpinterrupt(struct uip_driver_s *dev, void *conn, - void *pvpriv, uint16 flags) +static uint16_t recvfrom_tcpinterrupt(struct uip_driver_s *dev, void *conn, + void *pvpriv, uint16_t flags) { struct recvfrom_s *pstate = (struct recvfrom_s *)pvpriv; @@ -541,8 +541,8 @@ static inline void recvfrom_udpsender(struct uip_driver_s *dev, struct recvfrom_ ****************************************************************************/ #ifdef CONFIG_NET_UDP -static uint16 recvfrom_udpinterrupt(struct uip_driver_s *dev, void *pvconn, - void *pvpriv, uint16 flags) +static uint16_t recvfrom_udpinterrupt(struct uip_driver_s *dev, void *pvconn, + void *pvpriv, uint16_t flags) { struct recvfrom_s *pstate = (struct recvfrom_s *)pvpriv; diff --git a/nuttx/net/send.c b/nuttx/net/send.c index 0ebc864f8..b31723293 100644 --- a/nuttx/net/send.c +++ b/nuttx/net/send.c @@ -42,7 +42,7 @@ #include #include - +#include #include #include #include @@ -73,13 +73,13 @@ struct send_s FAR struct socket *snd_sock; /* Points to the parent socket structure */ FAR struct uip_callback_s *snd_cb; /* Reference to callback instance */ sem_t snd_sem; /* Used to wake up the waiting thread */ - FAR const uint8 *snd_buffer; /* Points to the buffer of data to send */ + FAR const uint8_t *snd_buffer; /* Points to the buffer of data to send */ size_t snd_buflen; /* Number of bytes in the buffer to send */ ssize_t snd_sent; /* The number of bytes sent */ - uint32 snd_isn; /* Initial sequence number */ - uint32 snd_acked; /* The number of bytes acked */ + uint32_t snd_isn; /* Initial sequence number */ + uint32_t snd_acked; /* The number of bytes acked */ #if defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK) - uint32 snd_time; /* last send time for determining timeout */ + uint32_t snd_time; /* last send time for determining timeout */ #endif }; @@ -104,9 +104,9 @@ struct send_s * ****************************************************************************/ -static uint32 send_getisn(struct uip_conn *conn) +static uint32_t send_getisn(struct uip_conn *conn) { - uint32 tmp; + uint32_t tmp; memcpy(&tmp, conn->snd_nxt, 4); return ntohl(tmp); } @@ -128,9 +128,9 @@ static uint32 send_getisn(struct uip_conn *conn) * ****************************************************************************/ -static uint32 send_getackno(struct uip_driver_s *dev) +static uint32_t send_getackno(struct uip_driver_s *dev) { - uint32 tmp; + uint32_t tmp; memcpy(&tmp, TCPBUF->ackno, 4); return ntohl(tmp); } @@ -195,8 +195,8 @@ static inline int send_timeout(struct send_s *pstate) * ****************************************************************************/ -static uint16 send_interrupt(struct uip_driver_s *dev, void *pvconn, - void *pvpriv, uint16 flags) +static uint16_t send_interrupt(struct uip_driver_s *dev, void *pvconn, + void *pvpriv, uint16_t flags) { struct uip_conn *conn = (struct uip_conn*)pvconn; struct send_s *pstate = (struct send_s *)pvpriv; @@ -283,7 +283,7 @@ static uint16 send_interrupt(struct uip_driver_s *dev, void *pvconn, { /* Get the amount of data that we can send in the next packet */ - uint32 sndlen = pstate->snd_buflen - pstate->snd_sent; + uint32_t sndlen = pstate->snd_buflen - pstate->snd_sent; if (sndlen > uip_mss(conn)) { sndlen = uip_mss(conn); diff --git a/nuttx/net/sendto.c b/nuttx/net/sendto.c index e85ca0156..89f478810 100644 --- a/nuttx/net/sendto.c +++ b/nuttx/net/sendto.c @@ -42,6 +42,7 @@ #include #include +#include #include #include #include @@ -63,7 +64,7 @@ struct sendto_s { FAR struct uip_callback_s *st_cb; /* Reference to callback instance */ sem_t st_sem; /* Semaphore signals sendto completion */ - uint16 st_buflen; /* Length of send buffer (error if <0) */ + uint16_t st_buflen; /* Length of send buffer (error if <0) */ const char *st_buffer; /* Pointer to send buffer */ int st_sndlen; /* Result of the send (length sent or negated errno) */ }; @@ -94,7 +95,8 @@ struct sendto_s ****************************************************************************/ #ifdef CONFIG_NET_UDP -static uint16 sendto_interrupt(struct uip_driver_s *dev, void *conn, void *pvpriv, uint16 flags) +static uint16_t sendto_interrupt(struct uip_driver_s *dev, void *conn, + void *pvpriv, uint16_t flags) { struct sendto_s *pstate = (struct sendto_s *)pvpriv; diff --git a/nuttx/net/socket.c b/nuttx/net/socket.c index 23555c7ea..3bbdd848c 100644 --- a/nuttx/net/socket.c +++ b/nuttx/net/socket.c @@ -40,7 +40,6 @@ #include #ifdef CONFIG_NET -#include #include #include #include -- cgit v1.2.3