Move all non-standard, NuttX header files into include/nuttx/net

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4450 42af7a65-404d-4744-a932-0658087f49c3
2026-05-22 13:52:22 +08:00 · 2012-03-03 23:18:34 +00:00
parent f811b4e17f
commit 7f005e2d3c
110 changed files with 901 additions and 899 deletions
@@ -2526,4 +2526,6 @@
 	  low level, thread-independent socket interfaces for use within the OS.
 	  Some of these are currently used by the FTP controlling terminal.  More will
 	  be used to support the NFS file system currenly underwork.
-
+	* include/nuttx/net/:  Major re-organization of networking headerf files.
+	  Moved all non-standard, NuttX-specific header files from include/net and
+	  include/nuttx into include/nuttx/net.
@@ -12,7 +12,7 @@
      <h1><big><font color="#3c34ec">
        <i>NuttX RTOS Porting Guide</i>
      </font></big></h1>
-      <p>Last Updated: February 28, 2011</p>
+      <p>Last Updated: March 3, 2011</p>
    </td>
  </tr>
 </table>
@@ -1113,12 +1113,12 @@ include/
 |   `-- <i>(Standard header files)</i>
 |-- cxx/
 |   `-- <i>(C++ standard header files)</i>
-|-- net/
-|   `-- uip/
-|       `-- <i>(uIP specific header files)</i>
 |-- netinet/
 |   `-- <i>(Standard header files)</i>
 |-- nuttx/
+|   |-net/
+|   | `-- uip/
+|   |     `-- <i>(uIP specific header files)</i>
 |   `-- <i>(NuttX specific header files)</i>
 `- sys/
    `-- <i>(More standard header files)</i>
@@ -1185,7 +1185,7 @@ lib/

 <h2>2.12 <a name="DirStructNet">nuttx/net</a></h2>
 <p>
-  This directory contains the implementation of the socket APIs.
+  This directory contains the implementation of the NuttX internal socket APIs.
  The subdirectory, <code>uip</code> contains the uIP port.
 </P>

@@ -2424,7 +2424,7 @@ extern void up_ledoff(int led);
 <ul>
  <li>
    <p>
-    <b><code>include/net/uip/uip-arch.h</code></b>.
+    <b><code>include/nuttx/net/uip/uip-arch.h</code></b>.
    All structures and APIs needed to work with Ethernet drivers are provided in this header file.
    The structure <code>struct uip_driver_s</code> defines the interface and is passed to uIP via
    <code>netdev_register()</code>.
@@ -58,9 +58,9 @@
 #include <nuttx/arch.h>

 #include <net/ethernet.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>

 #include "chip.h"
 #include "up_arch.h"
@@ -1,8 +1,8 @@
 /****************************************************************************
 * drivers/net/kinetis_enet.c
 *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2011-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
@@ -51,11 +51,11 @@

 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/mii.h>
+#include <nuttx/net/mii.h>

-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>

 #include "up_arch.h"
 #include "chip.h"
@@ -51,9 +51,9 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>

 #include "chip.h"
 #include "up_arch.h"
@@ -1,8 +1,8 @@
 /************************************************************************************
 * arch/arm/src/lm3s/lm3s_ethernet.h
 *
- *   Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2009-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
@@ -41,7 +41,7 @@
 ************************************************************************************/

 #include <nuttx/config.h>
-#include <nuttx/mii.h>
+#include <nuttx/net/mii.h>

 #include "chip.h"

@@ -72,7 +72,7 @@
 #  define LM3S_MAC_TS_OFFSET  0x03c /* Ethernet MAC Time Stamp Configuration */
 #endif

-/* MII Management Register Offsets (see include/nuttx/mii.h) */
+/* MII Management Register Offsets (see include/nuttx/net/mii.h) */

 /* Ethernet Controller Register Addresses *******************************************/

@@ -1,8 +1,8 @@
 /****************************************************************************
 * arch/arm/src/lpc17xx/lpc17_ethernet.c
 *
- *   Copyright (C) 2010-2011 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
@@ -50,12 +50,12 @@

 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/mii.h>
+#include <nuttx/net/mii.h>

-#include <net/uip/uip.h>
-#include <net/uip/uipopt.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>

 #include "chip.h"
 #include "up_arch.h"
@@ -51,11 +51,11 @@

 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/mii.h>
+#include <nuttx/net/mii.h>

-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>

 #include "up_internal.h"

@@ -51,9 +51,9 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>

-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>

 /****************************************************************************
 * Definitions
@@ -52,12 +52,12 @@

 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/mii.h>
+#include <nuttx/net/mii.h>

-#include <net/uip/uip.h>
-#include <net/uip/uipopt.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>

 #include <arch/irq.h>
 #include <arch/board/board.h>
@@ -1,8 +1,8 @@
 /****************************************************************************
 * up_uipdriver.c
 *
- *   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>
 *
 * Based on code from uIP which also has a BSD-like license:
 *
@@ -50,12 +50,12 @@
 #include <stdbool.h>
 #include <string.h>
 #include <sched.h>
-#include <nuttx/net.h>
+#include <nuttx/net/net.h>

 #include <net/ethernet.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
-#include <net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip-arp.h>

 #include "up_internal.h"

@@ -1,8 +1,8 @@
 /****************************************************************************
 * drivers/net/ez80_emac.c
 *
- *   Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2009-2010, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
 *
 * References:
 *   eZ80F91 MCU Product Specification, PS019214-0808, Zilig, Inc., 2008.
@@ -54,13 +54,13 @@

 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/mii.h>
+#include <nuttx/net/mii.h>

 #include <arch/io.h>

-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>

 #include "chip.h"
 #include "up_internal.h"
@@ -1,8 +1,8 @@
 /****************************************************************************
 * configs/olimex-strp711/src/up_enc28j60.c
 *
- *   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
@@ -86,7 +86,7 @@
 #include <debug.h>

 #include <nuttx/spi.h>
-#include <nuttx/enc28j60.h>
+#include <nuttx/net/enc28j60.h>

 #include <arch/board/board.h>

@@ -88,7 +88,7 @@ mtd/
 	aware of any other common way to refer to this class of devices).

 net/
-	Network interface drivers.  See also include/nuttx/net.h
+	Network interface drivers.  See also include/nuttx/net/net.h

 pipes/
 	FIFO and named pipe drivers.  Standard interfaces are declared
@@ -51,9 +51,9 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>

-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>

 /****************************************************************************
 * Definitions
@@ -64,9 +64,9 @@
 #include <nuttx/arch.h>

 #include <net/ethernet.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>

 /****************************************************************************
 * Definitions
@@ -53,9 +53,9 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>

-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>

 #include <rgmp/pmap.h>
 #include <rgmp/string.h>
@@ -1,8 +1,8 @@
 /****************************************************************************
 * drivers/net/enc28j60.c
 *
- *   Copyright (C) 2010-2011 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>
 *
 * References:
 * - ENC28J60 Data Sheet, Stand-Alone Ethernet Controller with SPI Interface,
@@ -58,11 +58,11 @@
 #include <nuttx/spi.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/clock.h>
-#include <nuttx/enc28j60.h>
+#include <nuttx/net/enc28j60.h>

-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>

 #include "enc28j60.h"

@@ -51,9 +51,9 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>

-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>

 /****************************************************************************
 * Definitions
@@ -1,8 +1,8 @@
 /****************************************************************************
 * drivers/net/slip.c
 *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
 *
 * Reference: RFC 1055
 *
@@ -55,10 +55,10 @@
 #include <debug.h>

 #include <nuttx/irq.h>
-#include <nuttx/net.h>
+#include <nuttx/net/net.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>

 #if defined(CONFIG_NET) && defined(CONFIG_NET_SLIP)

@@ -55,9 +55,9 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>

-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>

 #include <rgmp/vnet.h>
 #include <rgmp/stdio.h>
@@ -1,8 +1,8 @@
 /****************************************************************************
 * fs/fs_close.c
 *
- *   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>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
@@ -45,7 +45,7 @@
 #include <nuttx/fs.h>

 #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0
-# include <nuttx/net.h>
+# include <nuttx/net/net.h>
 #endif

 #include "fs_internal.h"
@@ -1,8 +1,8 @@
 /****************************************************************************
 * fs/fs_fcntl.c
 *
- *   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
@@ -44,7 +44,7 @@
 #include <errno.h>

 #include <nuttx/fs.h>
-#include <nuttx/net.h>
+#include <nuttx/net/net.h>
 #include <nuttx/sched.h>

 #include "fs_internal.h"
@@ -1,8 +1,8 @@
 /****************************************************************************
 * fs/fs_fdopen.c
 *
- *   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
@@ -47,7 +47,7 @@

 #include <nuttx/kmalloc.h>
 #include <nuttx/fs.h>
-#include <nuttx/net.h>
+#include <nuttx/net/net.h>

 /****************************************************************************
 * Private Functions
@@ -1,8 +1,8 @@
 /****************************************************************************
 * fs/fs_ioctl.c
 *
- *   Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007-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
@@ -46,7 +46,7 @@
 #include <net/if.h>

 #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0
-# include <nuttx/net.h>
+# include <nuttx/net/net.h>
 #endif

 #include "fs_internal.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 */
@@ -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 */
@@ -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 */
@@ -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 */
@@ -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 */
@@ -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 */
@@ -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 */

@@ -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
@@ -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 */
@@ -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 */
@@ -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 */
@@ -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 */
@@ -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 */
@@ -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 */
@@ -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 */
@@ -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 */
@@ -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 */
@@ -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 */
@@ -48,7 +48,7 @@
 #include <debug.h>

 #include <arch/irq.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip-arch.h>

 #include "net_internal.h"
 #include "uip/uip_internal.h"
@@ -1,8 +1,8 @@
 /****************************************************************************
 * net/getsockname.c
 *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2011-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
@@ -44,8 +44,8 @@

 #include <errno.h>

-#include <nuttx/net.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/net.h>
+#include <nuttx/net/uip/uip-arch.h>

 #include "net_internal.h"

@@ -45,8 +45,8 @@
 #include <wdog.h>
 #include <debug.h>

-#include <net/uip/uipopt.h>
-#include <net/uip/uip-arp.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip-arp.h>

 #include "net_internal.h"

@@ -47,7 +47,7 @@
 #include <debug.h>

 #include <arch/irq.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip-arch.h>

 #include "net_internal.h"
 #include "uip/uip_internal.h"
@@ -47,8 +47,8 @@
 #include <stdint.h>
 #include <time.h>

-#include <nuttx/net.h>
-#include <net/uip/uip.h>
+#include <nuttx/net/net.h>
+#include <nuttx/net/uip/uip.h>

 /****************************************************************************
 * Definitions
@@ -48,8 +48,8 @@
 #include <errno.h>
 #include <debug.h>

-#include <net/uip/uip.h>
-#include <nuttx/net.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/net.h>
 #include <nuttx/arch.h>

 #include <uip/uip_internal.h>
@@ -47,8 +47,8 @@
 #include <errno.h>
 #include <debug.h>

-#include <net/uip/uip.h>
-#include <nuttx/net.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/net.h>
 #include <nuttx/kmalloc.h>

 #include "net_internal.h"
--- a/Show More
+++ b/Show More