diff options
Diffstat (limited to 'nuttx/include')
-rw-r--r-- | nuttx/include/nuttx/net/arp.h | 2 | ||||
-rw-r--r-- | nuttx/include/nuttx/net/icmp.h (renamed from nuttx/include/nuttx/net/uip/uip-icmp.h) | 10 | ||||
-rw-r--r-- | nuttx/include/nuttx/net/igmp.h (renamed from nuttx/include/nuttx/net/uip/uip-igmp.h) | 12 | ||||
-rw-r--r-- | nuttx/include/nuttx/net/ip.h (renamed from nuttx/include/nuttx/net/uip/uip-ipopt.h) | 10 | ||||
-rw-r--r-- | nuttx/include/nuttx/net/net.h | 2 | ||||
-rw-r--r-- | nuttx/include/nuttx/net/netdev.h | 4 | ||||
-rw-r--r-- | nuttx/include/nuttx/net/pkt.h (renamed from nuttx/include/nuttx/net/uip/uip-pkt.h) | 8 | ||||
-rw-r--r-- | nuttx/include/nuttx/net/tcp.h (renamed from nuttx/include/nuttx/net/uip/uip-tcp.h) | 10 | ||||
-rw-r--r-- | nuttx/include/nuttx/net/udp.h (renamed from nuttx/include/nuttx/net/uip/uip-udp.h) | 10 | ||||
-rw-r--r-- | nuttx/include/nuttx/net/uip.h (renamed from nuttx/include/nuttx/net/uip/uip.h) | 18 |
10 files changed, 43 insertions, 43 deletions
diff --git a/nuttx/include/nuttx/net/arp.h b/nuttx/include/nuttx/net/arp.h index c64471ce5..524490bb4 100644 --- a/nuttx/include/nuttx/net/arp.h +++ b/nuttx/include/nuttx/net/arp.h @@ -52,7 +52,7 @@ #include <net/ethernet.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/include/nuttx/net/uip/uip-icmp.h b/nuttx/include/nuttx/net/icmp.h index 849d62af0..87464c73f 100644 --- a/nuttx/include/nuttx/net/uip/uip-icmp.h +++ b/nuttx/include/nuttx/net/icmp.h @@ -1,8 +1,8 @@ /**************************************************************************** - * include/nuttx/net/uip/uip-icmp.h + * include/nuttx/net/icmp.h * Header file for the uIP ICMP stack. * - * Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * This logic was leveraged from uIP which also has a BSD-style license: @@ -38,8 +38,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_ICMP_H -#define __INCLUDE_NUTTX_NET_UIP_UIP_ICMP_H +#ifndef __INCLUDE_NUTTX_NET_ICMP_H +#define __INCLUDE_NUTTX_NET_ICMP_H /**************************************************************************** * Included Files @@ -208,4 +208,4 @@ EXTERN int uip_ping(uip_ipaddr_t addr, uint16_t id, uint16_t seqno, uint16_t dat #ifdef __cplusplus } #endif -#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_ICMP_H */ +#endif /* __INCLUDE_NUTTX_NET_ICMP_H */ diff --git a/nuttx/include/nuttx/net/uip/uip-igmp.h b/nuttx/include/nuttx/net/igmp.h index d3c021b66..8f6c4daf8 100644 --- a/nuttx/include/nuttx/net/uip/uip-igmp.h +++ b/nuttx/include/nuttx/net/igmp.h @@ -1,9 +1,9 @@ /**************************************************************************** - * include/nuttx/net/uip/uip-igmp.h + * include/nuttx/net/igmp.h * The definitions in this header file are intended only for internal use * by the NuttX port of the uIP stack. * - * Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2010, 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * The NuttX implementation of IGMP was inspired by the IGMP add-on for the @@ -39,8 +39,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_IGMP_H -#define __INCLUDE_NUTTX_NET_UIP_UIP_IGMP_H +#ifndef __INCLUDE_NUTTX_NET_IGMP_H +#define __INCLUDE_NUTTX_NET_IGMP_H /**************************************************************************** * Included Files @@ -54,7 +54,7 @@ #include <netinet/in.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #include <nuttx/net/netdev.h> #ifdef CONFIG_NET_IGMP @@ -255,4 +255,4 @@ EXTERN int igmp_leavegroup(struct uip_driver_s *dev, FAR const struct in_addr * #endif #endif /* CONFIG_NET_IGMP */ -#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_IGMP_H */ +#endif /* __INCLUDE_NUTTX_NET_IGMP_H */ diff --git a/nuttx/include/nuttx/net/uip/uip-ipopt.h b/nuttx/include/nuttx/net/ip.h index 7aa4114db..4cbfd824a 100644 --- a/nuttx/include/nuttx/net/uip/uip-ipopt.h +++ b/nuttx/include/nuttx/net/ip.h @@ -1,9 +1,9 @@ /************************************************************************************************************ - * include/nuttx/net/uip/uip-ipopt.h + * include/nuttx/net/ip.h * * Defines values for the IP header options * - * Copyright (C) 2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2010, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -35,8 +35,8 @@ * ************************************************************************************************************/ -#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_IPOPT_H -#define __INCLUDE_NUTTX_NET_UIP_UIP_IPOPT_H +#ifndef __INCLUDE_NUTTX_NET_IP_H +#define __INCLUDE_NUTTX_NET_IP_H /************************************************************************************************************ * Included Files @@ -248,4 +248,4 @@ * Public Function Prototypes ************************************************************************************************************/ -#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_IPOPT_H */ +#endif /* __INCLUDE_NUTTX_NET_IP_H */ diff --git a/nuttx/include/nuttx/net/net.h b/nuttx/include/nuttx/net/net.h index c433d25b9..d8b6b1f39 100644 --- a/nuttx/include/nuttx/net/net.h +++ b/nuttx/include/nuttx/net/net.h @@ -48,7 +48,7 @@ #include <stdarg.h> #include <semaphore.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/include/nuttx/net/netdev.h b/nuttx/include/nuttx/net/netdev.h index 7f7733d2a..9c6cbd441 100644 --- a/nuttx/include/nuttx/net/netdev.h +++ b/nuttx/include/nuttx/net/netdev.h @@ -52,9 +52,9 @@ #include <stdint.h> #include <net/if.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> #ifdef CONFIG_NET_IGMP -# include <nuttx/net/uip/uip-igmp.h> +# include <nuttx/net/igmp.h> #endif #include <nuttx/net/netconfig.h> diff --git a/nuttx/include/nuttx/net/uip/uip-pkt.h b/nuttx/include/nuttx/net/pkt.h index 1a5f2db4a..8db02e923 100644 --- a/nuttx/include/nuttx/net/uip/uip-pkt.h +++ b/nuttx/include/nuttx/net/pkt.h @@ -1,5 +1,5 @@ /**************************************************************************** - * include/netpacket/netpacket.h + * include/nuttx/net/pkt.h * Definitions for use with AF_PACKET sockets * * Copyright (C) 2014 Gregory Nutt. All rights reserved. @@ -37,8 +37,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_PKT_H -#define __INCLUDE_NUTTX_NET_UIP_UIP_PKT_H +#ifndef __INCLUDE_NUTTX_NET_PKT_H +#define __INCLUDE_NUTTX_NET_PKT_H /**************************************************************************** * Included Files @@ -103,4 +103,4 @@ void uip_pktpoll(struct uip_driver_s *dev, struct uip_pkt_conn *conn); int uip_pktinput(struct uip_driver_s *dev); -#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_PKT_H */ +#endif /* __INCLUDE_NUTTX_NET_PKT_H */ diff --git a/nuttx/include/nuttx/net/uip/uip-tcp.h b/nuttx/include/nuttx/net/tcp.h index a019f70b0..05ccf4c4a 100644 --- a/nuttx/include/nuttx/net/uip/uip-tcp.h +++ b/nuttx/include/nuttx/net/tcp.h @@ -1,5 +1,5 @@ /**************************************************************************** - * include/nuttx/net/uip/uip-tcp.h + * include/nuttx/net/tcp.h * Header file for the uIP TCP/IP stack. * * The uIP TCP/IP stack header file contains definitions for a number @@ -43,8 +43,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_TCP_H -#define __INCLUDE_NUTTX_NET_UIP_UIP_TCP_H +#ifndef __INCLUDE_NUTTX_NET_TCP_H +#define __INCLUDE_NUTTX_NET_TCP_H /**************************************************************************** * Included Files @@ -56,7 +56,7 @@ #include <stdint.h> #include <stdbool.h> #include <nuttx/net/netconfig.h> -#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip.h> /**************************************************************************** * Pre-processor Definitions @@ -526,4 +526,4 @@ int uip_backlogdelete(FAR struct uip_conn *conn, FAR struct uip_conn *blconn); #define uip_mss(conn) ((conn)->mss) #endif /* CONFIG_NET_TCP */ -#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_TCP_H */ +#endif /* __INCLUDE_NUTTX_NET_TCP_H */ diff --git a/nuttx/include/nuttx/net/uip/uip-udp.h b/nuttx/include/nuttx/net/udp.h index 9cdfb3fe7..2b90dce79 100644 --- a/nuttx/include/nuttx/net/uip/uip-udp.h +++ b/nuttx/include/nuttx/net/udp.h @@ -1,12 +1,12 @@ /**************************************************************************** - * include/nuttx/net/uip/uip-udp.h + * include/nuttx/net/udp.h * Header file for the uIP UDP stack. * * The uIP UDP stack header file contains definitions for a number * of C macros that are used by uIP programs as well as internal uIP * structures, UDP header structures and function declarations. * - * Copyright (C) 2007, 2009, 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2009, 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * This logic was leveraged from uIP which also has a BSD-style license: @@ -42,8 +42,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_UDP_H -#define __INCLUDE_NUTTX_NET_UIP_UIP_UDP_H +#ifndef __INCLUDE_NUTTX_NET_UDP_H +#define __INCLUDE_NUTTX_NET_UDP_H /**************************************************************************** * Included Files @@ -203,4 +203,4 @@ extern int uip_udpconnect(struct uip_udp_conn *conn, const struct sockaddr_in *a extern void uip_udpenable(struct uip_udp_conn *conn); extern void uip_udpdisable(struct uip_udp_conn *conn); -#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_UDP_H */ +#endif /* __INCLUDE_NUTTX_NET_UDP_H */ diff --git a/nuttx/include/nuttx/net/uip/uip.h b/nuttx/include/nuttx/net/uip.h index 260082795..3725f423f 100644 --- a/nuttx/include/nuttx/net/uip/uip.h +++ b/nuttx/include/nuttx/net/uip.h @@ -1,5 +1,5 @@ /**************************************************************************** - * include/nuttx/net/uip/uip.h + * include/nuttx/net/uip.h * * The uIP header file contains definitions for a number of C macros that * are used by uIP programs as well as internal uIP structures and function @@ -41,8 +41,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_H -#define __INCLUDE_NUTTX_NET_UIP_UIP_H +#ifndef __INCLUDE_NUTTX_NET_UIP_H +#define __INCLUDE_NUTTX_NET_UIP_H /**************************************************************************** * Included Files @@ -228,19 +228,19 @@ struct uip_callback_s /* Protocol-specific support */ #ifdef CONFIG_NET_PKT -# include <nuttx/net/uip/uip-pkt.h> +# include <nuttx/net/pkt.h> #endif #ifdef CONFIG_NET_TCP -# include <nuttx/net/uip/uip-tcp.h> +# include <nuttx/net/tcp.h> #endif #ifdef CONFIG_NET_UDP -# include <nuttx/net/uip/uip-udp.h> +# include <nuttx/net/udp.h> #endif #ifdef CONFIG_NET_ICMP -# include <nuttx/net/uip/uip-icmp.h> +# include <nuttx/net/icmp.h> #endif #ifdef CONFIG_NET_IGMP -# include <nuttx/net/uip/uip-igmp.h> +# include <nuttx/net/igmp.h> #endif /* The structure holding the uIP statistics that are gathered if @@ -581,4 +581,4 @@ bool uip_ipaddr_maskcmp(uip_ipaddr_t addr1, uip_ipaddr_t addr2, (in_addr_t)(dest) = (in_addr_t)(src) & (in_addr_t)(mask); \ } while (0) -#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_H */ +#endif /* __INCLUDE_NUTTX_NET_UIP_H */ |