diff options
Diffstat (limited to 'nuttx/include')
| -rw-r--r-- | nuttx/include/netinet/arp.h | 14 | ||||
| -rw-r--r-- | nuttx/include/nuttx/net/cs89x0.h (renamed from nuttx/include/nuttx/cs89x0.h) | 12 | ||||
| -rw-r--r-- | nuttx/include/nuttx/net/enc28j60.h (renamed from nuttx/include/nuttx/enc28j60.h) | 8 | ||||
| -rw-r--r-- | nuttx/include/nuttx/net/ioctl.h (renamed from nuttx/include/net/ioctls.h) | 12 | ||||
| -rw-r--r-- | nuttx/include/nuttx/net/mii.h (renamed from nuttx/include/nuttx/mii.h) | 12 | ||||
| -rw-r--r-- | nuttx/include/nuttx/net/net.h (renamed from nuttx/include/nuttx/net.h) | 12 | ||||
| -rw-r--r-- | nuttx/include/nuttx/net/uip/uip-arch.h (renamed from nuttx/include/net/uip/uip-arch.h) | 26 | ||||
| -rw-r--r-- | nuttx/include/nuttx/net/uip/uip-arp.h (renamed from nuttx/include/net/uip/uip-arp.h) | 10 | ||||
| -rw-r--r-- | nuttx/include/nuttx/net/uip/uip-icmp.h (renamed from nuttx/include/net/uip/uip-icmp.h) | 14 | ||||
| -rw-r--r--[-rwxr-xr-x] | nuttx/include/nuttx/net/uip/uip-igmp.h (renamed from nuttx/include/net/uip/uip-igmp.h) | 16 | ||||
| -rw-r--r--[-rwxr-xr-x] | nuttx/include/nuttx/net/uip/uip-ipopt.h (renamed from nuttx/include/net/uip/uip-ipopt.h) | 8 | ||||
| -rw-r--r-- | nuttx/include/nuttx/net/uip/uip-tcp.h (renamed from nuttx/include/net/uip/uip-tcp.h) | 14 | ||||
| -rw-r--r-- | nuttx/include/nuttx/net/uip/uip-udp.h (renamed from nuttx/include/net/uip/uip-udp.h) | 14 | ||||
| -rw-r--r-- | nuttx/include/nuttx/net/uip/uip.h (renamed from nuttx/include/net/uip/uip.h) | 18 | ||||
| -rw-r--r-- | nuttx/include/nuttx/net/uip/uipopt.h (renamed from nuttx/include/net/uip/uipopt.h) | 8 | ||||
| -rw-r--r-- | nuttx/include/nuttx/sched.h | 12 | ||||
| -rw-r--r-- | nuttx/include/sys/ioctl.h | 12 | ||||
| -rw-r--r-- | nuttx/include/sys/sockio.h | 12 |
18 files changed, 117 insertions, 117 deletions
diff --git a/nuttx/include/netinet/arp.h b/nuttx/include/netinet/arp.h index 4c2ad205d..f2a9a0366 100644 --- a/nuttx/include/netinet/arp.h +++ b/nuttx/include/netinet/arp.h @@ -1,8 +1,8 @@ /**************************************************************************** - * netinet/arp.h + * include/netinet/arp.h * - * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __NETINET_ARP_H -#define __NETINET_ARP_H +#ifndef __INCLUDE_NETINET_ARP_H +#define __INCLUDE_NETINET_ARP_H /**************************************************************************** * Included Files @@ -99,7 +99,7 @@ extern "C" { /* If CONFIG_NET_ARPIOCTLS is defined then the semi-standard ioctl commands * described above are supported. If not, you can call the uIP ARP interfaces - * directly in a very non-standard way. See include/net/uip/uip-arp.h for + * directly in a very non-standard way. See include/nuttx/net/uip/uip-arp.h for * prototypes. */ @@ -108,4 +108,4 @@ extern "C" { } #endif -#endif /* __NETINET_ARP_H */ +#endif /* __INCLUDE_NETINET_ARP_H */ diff --git a/nuttx/include/nuttx/cs89x0.h b/nuttx/include/nuttx/net/cs89x0.h index ec79b157d..4b2a52a5c 100644 --- a/nuttx/include/nuttx/cs89x0.h +++ b/nuttx/include/nuttx/net/cs89x0.h @@ -1,8 +1,8 @@ /**************************************************************************** - * include/nuttx/cs89x0.h + * include/nuttx/net/cs89x0.h * - * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_CS89x0_H -#define __INCLUDE_NUTTX_CS89x0_H +#ifndef __INCLUDE_NUTTX_NET_CS89x0_H +#define __INCLUDE_NUTTX_NET_CS89x0_H /**************************************************************************** * Included Files @@ -165,4 +165,4 @@ EXTERN int cs89x0_initialize(FAR const cs89x0_driver_s *cs89x0, int devno); } #endif -#endif /* __INCLUDE_NUTTX_CS89x0_H */ +#endif /* __INCLUDE_NUTTX_NET_CS89x0_H */ diff --git a/nuttx/include/nuttx/enc28j60.h b/nuttx/include/nuttx/net/enc28j60.h index f668b6cc6..6cc911ce5 100644 --- a/nuttx/include/nuttx/enc28j60.h +++ b/nuttx/include/nuttx/net/enc28j60.h @@ -1,5 +1,5 @@ /**************************************************************************** - * include/nuttx/enc28j60.h + * include/nuttx/net/enc28j60.h * * Copyright (C) 2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_ENC28J60_H -#define __INCLUDE_NUTTX_ENC28J60_H +#ifndef __INCLUDE_NUTTX_NET_ENC28J60_H +#define __INCLUDE_NUTTX_NET_ENC28J60_H /**************************************************************************** * Included Files @@ -148,4 +148,4 @@ EXTERN int enc_stats(unsigned int devno, struct enc_stats_s *stats); } #endif -#endif /* __INCLUDE_NUTTX_ENC28J60_H */ +#endif /* __INCLUDE_NUTTX_NET_ENC28J60_H */ diff --git a/nuttx/include/net/ioctls.h b/nuttx/include/nuttx/net/ioctl.h index 8398e51ed..402226519 100644 --- a/nuttx/include/net/ioctls.h +++ b/nuttx/include/nuttx/net/ioctl.h @@ -1,8 +1,8 @@ /**************************************************************************** - * include/net/ioctls.h + * include/nuttx/net/ioctl.h * - * Copyright (C) 2007-2008, 2010-2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2007-2008, 2010-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __NET_IOCTLS_H -#define __NET_IOCTLS_H +#ifndef __INCLUDE_NUTTX_NET_IOCTL_H +#define __INCLUDE_NUTTX_NET_IOCTL_H /**************************************************************************** * Included Files @@ -140,4 +140,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __NET_IOCTLS_H */ +#endif /* __INCLUDE_NUTTX_NET_IOCTL_H */ diff --git a/nuttx/include/nuttx/mii.h b/nuttx/include/nuttx/net/mii.h index 59458ec3f..50c57245a 100644 --- a/nuttx/include/nuttx/mii.h +++ b/nuttx/include/nuttx/net/mii.h @@ -1,8 +1,8 @@ /**************************************************************************** - * include/nuttx/mii.h + * include/nuttx/net/mii.h * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2008-2010, 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_MII_H -#define __INCLUDE_NUTTX_MII_H +#ifndef __INCLUDE_NUTTX_NET_MII_H +#define __INCLUDE_NUTTX_NET_MII_H /**************************************************************************** * Included Files @@ -444,4 +444,4 @@ extern "C" { } #endif -#endif /* __INCLUDE_NUTTX_MII_H */ +#endif /* __INCLUDE_NUTTX_NET_MII_H */ diff --git a/nuttx/include/nuttx/net.h b/nuttx/include/nuttx/net/net.h index bcbcd627b..a78ce1251 100644 --- a/nuttx/include/nuttx/net.h +++ b/nuttx/include/nuttx/net/net.h @@ -1,5 +1,5 @@ /**************************************************************************** - * nuttx/net.h + * nuttx/net/net.h * * Copyright (C) 2007, 2009-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __NUTTX_NET_H -#define __NUTTX_NET_H +#ifndef __INCLUDE_NUTTX_NET_NET_H +#define __INCLUDE_NUTTX_NET_NET_H /**************************************************************************** * Included Files @@ -48,7 +48,7 @@ #include <stdarg.h> #include <semaphore.h> -#include <net/uip/uip.h> +#include <nuttx/net/uip/uip.h> /**************************************************************************** * Definitions @@ -113,7 +113,7 @@ struct socketlist /* Callback from netdev_foreach() */ -struct uip_driver_s; /* Forward reference. See net/uip/uip-arch.h */ +struct uip_driver_s; /* Forward reference. See nuttx/net/uip/uip-arch.h */ typedef int (*netdev_callback_t)(FAR struct uip_driver_s *dev, void *arg); /**************************************************************************** @@ -286,4 +286,4 @@ EXTERN int slip_initialize(int intf, const char *devname); #endif #endif /* CONFIG_NET */ -#endif /* __NUTTX_NET_H */ +#endif /* __INCLUDE_NUTTX_NET_NET_H */ diff --git a/nuttx/include/net/uip/uip-arch.h b/nuttx/include/nuttx/net/uip/uip-arch.h index 3cb2904ea..9546de04e 100644 --- a/nuttx/include/net/uip/uip-arch.h +++ b/nuttx/include/nuttx/net/uip/uip-arch.h @@ -1,9 +1,9 @@ /**************************************************************************** - * uip-arch.h + * include/nuttx/net/uip/uip-arch.h * Defines architecture-specific device driver interfaces to uIP * - * Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2007, 2009, 2011-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Derived largely from portions of uIP with has a similar BSD-styple license: * @@ -39,8 +39,12 @@ * ****************************************************************************/ -#ifndef __UIP_ARCH_H -#define __UIP_ARCH_H +#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_ARCH_H +#define __INCLUDE_NUTTX_NET_UIP_UIP_ARCH_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ #include <nuttx/config.h> @@ -48,16 +52,12 @@ #include <stdint.h> #include <net/if.h> -#include <net/uip/uip.h> +#include <nuttx/net/uip/uip.h> #ifdef CONFIG_NET_IGMP -# include <net/uip/uip-igmp.h> +# include <nuttx/net/uip/uip-igmp.h> #endif -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include <net/uip/uipopt.h> +#include <nuttx/net/uip/uipopt.h> #include <net/ethernet.h> /**************************************************************************** @@ -366,5 +366,5 @@ extern uint16_t uip_tcpchksum(struct uip_driver_s *dev); extern uint16_t uip_udpchksum(struct uip_driver_s *dev); extern uint16_t uip_icmpchksum(struct uip_driver_s *dev, int len); -#endif /* __UIP_ARCH_H */ +#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_ARCH_H */ diff --git a/nuttx/include/net/uip/uip-arp.h b/nuttx/include/nuttx/net/uip/uip-arp.h index 3afe1b252..8484c7d5a 100644 --- a/nuttx/include/net/uip/uip-arp.h +++ b/nuttx/include/nuttx/net/uip/uip-arp.h @@ -1,9 +1,9 @@ /**************************************************************************** - * include/net/uip/uip-arch.h + * include/nuttx/net/uip/uip-arch.h * Macros and definitions for the ARP module. * - * Copyright (C) 2007, 2009-2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2007, 2009-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Derived from uIP with has a similar BSD-styple license: * @@ -51,8 +51,8 @@ #include <stdint.h> #include <net/ethernet.h> -#include <net/uip/uipopt.h> -#include <net/uip/uip.h> +#include <nuttx/net/uip/uipopt.h> +#include <nuttx/net/uip/uip.h> /**************************************************************************** * Pre-Processor Definitions diff --git a/nuttx/include/net/uip/uip-icmp.h b/nuttx/include/nuttx/net/uip/uip-icmp.h index c9d4d90ee..27098d5d3 100644 --- a/nuttx/include/net/uip/uip-icmp.h +++ b/nuttx/include/nuttx/net/uip/uip-icmp.h @@ -1,9 +1,9 @@ /**************************************************************************** - * net/uip/uip-icmp.h + * include/nuttx/net/uip/uip-icmp.h * Header file for the uIP ICMP stack. * - * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2007-2009, 2012 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 __NET_UIP_UIP_ICMP_H -#define __NET_UIP_UIP_ICMP_H +#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_ICMP_H +#define __INCLUDE_NUTTX_NET_UIP_UIP_ICMP_H /**************************************************************************** * Included Files @@ -48,7 +48,7 @@ #include <nuttx/config.h> #include <stdint.h> -#include <net/uip/uipopt.h> +#include <nuttx/net/uip/uipopt.h> /**************************************************************************** * Pre-processor Definitions @@ -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 /* __NET_UIP_UIP_ICMP_H */ +#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_ICMP_H */ diff --git a/nuttx/include/net/uip/uip-igmp.h b/nuttx/include/nuttx/net/uip/uip-igmp.h index 29a3d5334..8b6d79e61 100755..100644 --- a/nuttx/include/net/uip/uip-igmp.h +++ b/nuttx/include/nuttx/net/uip/uip-igmp.h @@ -1,10 +1,10 @@ /**************************************************************************** - * net/uip/uip-igmp.h + * include/nuttx/net/uip/uip-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 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2010, 2012 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 * lwIP TCP/IP stack by Steve Reynolds: @@ -39,8 +39,8 @@ * ****************************************************************************/ -#ifndef __NET_UIP_IGMP_H -#define __NET_UIP_IGMP_H +#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_IGMP_H +#define __INCLUDE_NUTTX_NET_UIP_UIP_IGMP_H /**************************************************************************** * Included Files @@ -54,8 +54,8 @@ #include <netinet/in.h> -#include <net/uip/uip.h> -#include <net/uip/uip-arch.h> +#include <nuttx/net/uip/uip.h> +#include <nuttx/net/uip/uip-arch.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 /* __NET_UIP_IGMP_H */ +#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_IGMP_H */ diff --git a/nuttx/include/net/uip/uip-ipopt.h b/nuttx/include/nuttx/net/uip/uip-ipopt.h index 1625fbab6..5e600d8b1 100755..100644 --- a/nuttx/include/net/uip/uip-ipopt.h +++ b/nuttx/include/nuttx/net/uip/uip-ipopt.h @@ -1,5 +1,5 @@ /************************************************************************************************************ - * net/uip/uip-ipopt.h + * include/nuttx/net/uip/uip-ipopt.h * * Defines values for the IP header options * @@ -35,8 +35,8 @@ * ************************************************************************************************************/ -#ifndef __NET_UIP_UIP_IPOPT_H -#define __NET_UIP_UIP_IPOPT_H +#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_IPOPT_H +#define __INCLUDE_NUTTX_NET_UIP_UIP_IPOPT_H /************************************************************************************************************ * Included Files @@ -248,4 +248,4 @@ * Public Function Prototypes ************************************************************************************************************/ -#endif /* __NET_UIP_UIP_IPOPT_H */ +#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_IPOPT_H */ diff --git a/nuttx/include/net/uip/uip-tcp.h b/nuttx/include/nuttx/net/uip/uip-tcp.h index 2fcf7390c..c3c800d7b 100644 --- a/nuttx/include/net/uip/uip-tcp.h +++ b/nuttx/include/nuttx/net/uip/uip-tcp.h @@ -1,13 +1,13 @@ /**************************************************************************** - * net/uip/uip-tcp.h + * include/nuttx/net/uip/uip-tcp.h * Header file for the uIP TCP/IP stack. * * The uIP TCP/IP stack header file contains definitions for a number * of C macros that are used by uIP programs as well as internal uIP * structures, TCP/IP header structures and function declarations. * - * Copyright (C) 2007, 2009-2010 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2007, 2009-2010, 2012 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 __NET_UIP_UIP_TCP_H -#define __NET_UIP_UIP_TCP_H +#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_TCP_H +#define __INCLUDE_NUTTX_NET_UIP_UIP_TCP_H /**************************************************************************** * Included Files @@ -54,7 +54,7 @@ #include <stdint.h> #include <stdbool.h> -#include <net/uip/uipopt.h> +#include <nuttx/net/uip/uipopt.h> /**************************************************************************** * Pre-processor Definitions @@ -457,4 +457,4 @@ extern int uip_backlogdelete(FAR struct uip_conn *conn, FAR struct uip_conn *blc #define uip_mss(conn) ((conn)->mss) #endif /* CONFIG_NET_TCP */ -#endif /* __NET_UIP_UIP_TCP_H */ +#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_TCP_H */ diff --git a/nuttx/include/net/uip/uip-udp.h b/nuttx/include/nuttx/net/uip/uip-udp.h index a27e1a3b5..5eb7f1711 100644 --- a/nuttx/include/net/uip/uip-udp.h +++ b/nuttx/include/nuttx/net/uip/uip-udp.h @@ -1,13 +1,13 @@ /**************************************************************************** - * net/uip/uip-udp.h + * include/nuttx/net/uip/uip-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 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2007, 2009, 2012 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 __NET_UIP_UIP_UDP_H -#define __NET_UIP_UIP_UDP_H +#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_UDP_H +#define __INCLUDE_NUTTX_NET_UIP_UIP_UDP_H /**************************************************************************** * Included Files @@ -52,7 +52,7 @@ #include <nuttx/config.h> #include <stdint.h> -#include <net/uip/uipopt.h> +#include <nuttx/net/uip/uipopt.h> /**************************************************************************** * Pre-processor Definitions @@ -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 /* __NET_UIP_UIP_UDP_H */ +#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_UDP_H */ diff --git a/nuttx/include/net/uip/uip.h b/nuttx/include/nuttx/net/uip/uip.h index c36efa355..392793e68 100644 --- a/nuttx/include/net/uip/uip.h +++ b/nuttx/include/nuttx/net/uip/uip.h @@ -1,5 +1,5 @@ /**************************************************************************** - * net/uip/uip.h + * include/nuttx/net/uip/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 __NET_UIP_UIP_H -#define __NET_UIP_UIP_H +#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_H +#define __INCLUDE_NUTTX_NET_UIP_UIP_H /**************************************************************************** * Included Files @@ -60,7 +60,7 @@ #include <arpa/inet.h> -#include <net/uip/uipopt.h> +#include <nuttx/net/uip/uipopt.h> /**************************************************************************** * Pre-processor Definitions @@ -228,16 +228,16 @@ struct uip_callback_s /* Protocol-specific support */ #ifdef CONFIG_NET_TCP -# include <net/uip/uip-tcp.h> +# include <nuttx/net/uip/uip-tcp.h> #endif #ifdef CONFIG_NET_UDP -# include <net/uip/uip-udp.h> +# include <nuttx/net/uip/uip-udp.h> #endif #ifdef CONFIG_NET_ICMP -# include <net/uip/uip-icmp.h> +# include <nuttx/net/uip/uip-icmp.h> #endif #ifdef CONFIG_NET_IGMP -# include <net/uip/uip-igmp.h> +# include <nuttx/net/uip/uip-igmp.h> #endif /* The structure holding the uIP statistics that are gathered if @@ -565,4 +565,4 @@ extern 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 /* __NET_UIP_UIP_H */ +#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_H */ diff --git a/nuttx/include/net/uip/uipopt.h b/nuttx/include/nuttx/net/uip/uipopt.h index a0ba62ee1..eee1dac4c 100644 --- a/nuttx/include/net/uip/uipopt.h +++ b/nuttx/include/nuttx/net/uip/uipopt.h @@ -1,5 +1,5 @@ /**************************************************************************** - * uipopt.h + * include/nuttx/net/uip/uipopt.h * Configuration options for uIP. * * This file is used for tweaking various configuration options for @@ -51,8 +51,8 @@ * ****************************************************************************/ -#ifndef __UIPOPT_H__ -#define __UIPOPT_H__ +#ifndef __INCLUDE_NUTTX_NET_UIP_UIPOPT_H +#define __INCLUDE_NUTTX_NET_UIP_UIPOPT_H /**************************************************************************** * Included Files @@ -311,4 +311,4 @@ typedef uint16_t uip_stats_t; -#endif /* __UIPOPT_H__ */ +#endif /* __INCLUDE_NUTTX_NET_UIP_UIPOPT_H */ diff --git a/nuttx/include/nuttx/sched.h b/nuttx/include/nuttx/sched.h index 4cfca9dbc..6459ec02a 100644 --- a/nuttx/include/nuttx/sched.h +++ b/nuttx/include/nuttx/sched.h @@ -1,8 +1,8 @@ /******************************************************************************** * nuttx/sched.h * - * Copyright (C) 2007-2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2007-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ********************************************************************************/ -#ifndef __NUTTX_SCHED_H -#define __NUTTX_SCHED_H +#ifndef __INCLUDE_NUTTX_SCHED_H +#define __INCLUDE_NUTTX_SCHED_H /******************************************************************************** * Included Files @@ -52,7 +52,7 @@ #include <time.h> #include <nuttx/irq.h> -#include <nuttx/net.h> +#include <nuttx/net/net.h> /******************************************************************************** * Pre-processor Definitions @@ -361,4 +361,4 @@ EXTERN void sched_foreach(sched_foreach_t handler, FAR void *arg); #endif #endif /* __ASSEMBLY__ */ -#endif /* __NUTTX_SCHED_H */ +#endif /* __INCLUDE_NUTTX_SCHED_H */ diff --git a/nuttx/include/sys/ioctl.h b/nuttx/include/sys/ioctl.h index 03c79ebef..73564dc5a 100644 --- a/nuttx/include/sys/ioctl.h +++ b/nuttx/include/sys/ioctl.h @@ -1,8 +1,8 @@ /**************************************************************************** * include/sys/ioctl.h * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2007, 2008, 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __SYS_IOCTL_H -#define __SYS_IOCTL_H +#ifndef __INCLUDE_SYS_IOCTL_H +#define __INCLUDE_SYS_IOCTL_H /**************************************************************************** * Included Files @@ -48,7 +48,7 @@ /* Include network ioctls info */ #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0 -# include <net/ioctls.h> +# include <nuttx/net/ioctl.h> #endif /**************************************************************************** @@ -80,4 +80,4 @@ EXTERN int ioctl(int fd, int req, unsigned long arg); } #endif -#endif /* __SYS_IOCTL_H */ +#endif /* __INCLUDE_SYS_IOCTL_H */ diff --git a/nuttx/include/sys/sockio.h b/nuttx/include/sys/sockio.h index a63833756..e69425926 100644 --- a/nuttx/include/sys/sockio.h +++ b/nuttx/include/sys/sockio.h @@ -1,8 +1,8 @@ /**************************************************************************** * include/sys/sockio.h * - * Copyright (C) 2010 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __SYS_SOCKIO_H -#define __SYS_SOCKIO_H +#ifndef __INCLUDE_SYS_SOCKIO_H +#define __INCLUDE_SYS_SOCKIO_H /**************************************************************************** * Included Files @@ -44,7 +44,7 @@ #include <nuttx/config.h> #include <nuttx/ioctl.h> -#include <net/ioctls.h> +#include <nuttx/net/ioctl.h> /**************************************************************************** * Pre-Processor Definitions @@ -117,4 +117,4 @@ extern "C" { } #endif -#endif /* __SYS_SOCKIO_H */ +#endif /* __INCLUDE_SYS_SOCKIO_H */ |