diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-06-30 19:03:01 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-06-30 19:03:01 -0600 |
commit | 3e9da6c0f0ca85e1d4db88f3b592da1f75a0cbab (patch) | |
tree | cb41ffa1e68ab0d391094541be41a411c9558ff7 /nuttx/include/nuttx/net | |
parent | 8ae1ef74551af33cf18dd1cc4188c4def4fecf42 (diff) | |
download | nuttx-3e9da6c0f0ca85e1d4db88f3b592da1f75a0cbab.tar.gz nuttx-3e9da6c0f0ca85e1d4db88f3b592da1f75a0cbab.tar.bz2 nuttx-3e9da6c0f0ca85e1d4db88f3b592da1f75a0cbab.zip |
NET: Remove uip_stopped and uip_stop
Diffstat (limited to 'nuttx/include/nuttx/net')
-rw-r--r-- | nuttx/include/nuttx/net/net.h | 4 | ||||
-rw-r--r-- | nuttx/include/nuttx/net/netdev.h | 19 | ||||
-rw-r--r-- | nuttx/include/nuttx/net/tcp.h | 14 | ||||
-rw-r--r-- | nuttx/include/nuttx/net/uip.h | 4 |
4 files changed, 17 insertions, 24 deletions
diff --git a/nuttx/include/nuttx/net/net.h b/nuttx/include/nuttx/net/net.h index a1f97f6b2..0cfbdbe40 100644 --- a/nuttx/include/nuttx/net/net.h +++ b/nuttx/include/nuttx/net/net.h @@ -144,6 +144,10 @@ extern "C" * Public Function Prototypes ****************************************************************************/ +/* This function may be used at boot time to set the initial ip_id.*/ + +void net_setipid(uint16_t id); + /* net_checksd.c *************************************************************/ /* Check if the socket descriptor is valid for the provided TCB and if it * supports the requested access. diff --git a/nuttx/include/nuttx/net/netdev.h b/nuttx/include/nuttx/net/netdev.h index 479ea3dcd..896b00102 100644 --- a/nuttx/include/nuttx/net/netdev.h +++ b/nuttx/include/nuttx/net/netdev.h @@ -206,7 +206,8 @@ typedef int (*devif_poll_callback_t)(struct net_driver_s *dev); * Public Function Prototypes ****************************************************************************/ -/* uIP device driver functions +/**************************************************************************** + * uIP device driver functions * * These functions are used by a network device driver for interacting * with uIP. @@ -263,11 +264,13 @@ typedef int (*devif_poll_callback_t)(struct net_driver_s *dev); * devicedriver_send(); * } * } - */ + * + ****************************************************************************/ int devif_input(struct net_driver_s *dev); -/* Polling of connections +/**************************************************************************** + * Polling of connections * * These functions will traverse each active uIP connection structure and * perform appropriate operations: devif_timer() will perform TCP timer @@ -315,18 +318,22 @@ int devif_input(struct net_driver_s *dev); * } * return 0; * } - */ + * + ****************************************************************************/ int devif_poll(struct net_driver_s *dev, devif_poll_callback_t callback); int devif_timer(struct net_driver_s *dev, devif_poll_callback_t callback, int hsec); -/* Carrier detection +/**************************************************************************** + * Carrier detection + * * Call netdev_carrier_on when the carrier has become available and the device * is ready to receive/transmit packets. * * Call detdev_carrier_off when the carrier disappeared and the device has moved * into non operational state. - */ + * + ****************************************************************************/ int netdev_carrier_on(FAR struct net_driver_s *dev); int netdev_carrier_off(FAR struct net_driver_s *dev); diff --git a/nuttx/include/nuttx/net/tcp.h b/nuttx/include/nuttx/net/tcp.h index 210588fdd..3755ba703 100644 --- a/nuttx/include/nuttx/net/tcp.h +++ b/nuttx/include/nuttx/net/tcp.h @@ -472,20 +472,6 @@ int tcp_backlogdelete(FAR struct tcp_conn_s *conn, # define tcp_backlogremove(conn) (NULL) #endif -/* Tell the sending host to stop sending data. - * - * This function will close our receiver's window so that we stop - * receiving data for the current connection. - */ - -#define uip_stop(conn) ((conn)->tcpstateflags |= UIP_STOPPED) - -/* Find out if the current connection has been previously stopped with - * uip_stop(). - */ - -#define uip_stopped(conn) ((conn)->tcpstateflags & UIP_STOPPED) - /* Restart the current connection, if is has previously been stopped * with uip_stop(). * diff --git a/nuttx/include/nuttx/net/uip.h b/nuttx/include/nuttx/net/uip.h index fd51967a2..5e2c60502 100644 --- a/nuttx/include/nuttx/net/uip.h +++ b/nuttx/include/nuttx/net/uip.h @@ -235,10 +235,6 @@ struct devif_callback_s * Public Function Prototypes ****************************************************************************/ -/* This function may be used at boot time to set the initial ip_id.*/ - -void uip_setipid(uint16_t id); - /* Critical section management. The NuttX configuration setting * CONFIG_NET_NOINT indicates that uIP not called from the interrupt level. * If CONFIG_NET_NOINTS is defined, then these will map to semaphore |