diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-03-03 23:18:34 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-03-03 23:18:34 +0000 |
commit | 8e1975393114d786b3699f926a416c3945ec3dfd (patch) | |
tree | 836687c8a01c9ab067c477767811699a0584323f /nuttx/arch | |
parent | f885003829cabac6e8a2db65b318f897f25ff933 (diff) | |
download | px4-nuttx-8e1975393114d786b3699f926a416c3945ec3dfd.tar.gz px4-nuttx-8e1975393114d786b3699f926a416c3945ec3dfd.tar.bz2 px4-nuttx-8e1975393114d786b3699f926a416c3945ec3dfd.zip |
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
Diffstat (limited to 'nuttx/arch')
-rw-r--r-- | nuttx/arch/arm/src/c5471/c5471_ethernet.c | 6 | ||||
-rw-r--r-- | nuttx/arch/arm/src/kinetis/kinetis_enet.c | 12 | ||||
-rw-r--r-- | nuttx/arch/arm/src/lm3s/lm3s_ethernet.c | 6 | ||||
-rw-r--r-- | nuttx/arch/arm/src/lm3s/lm3s_ethernet.h | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c | 14 | ||||
-rwxr-xr-x | nuttx/arch/arm/src/stm32/stm32_eth.c | 8 | ||||
-rw-r--r-- | nuttx/arch/hc/src/m9s12/m9s12_ethernet.c | 6 | ||||
-rw-r--r-- | nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c | 10 | ||||
-rw-r--r-- | nuttx/arch/sim/src/up_uipdriver.c | 12 | ||||
-rw-r--r-- | nuttx/arch/z80/src/ez80/ez80_emac.c | 12 |
10 files changed, 47 insertions, 47 deletions
diff --git a/nuttx/arch/arm/src/c5471/c5471_ethernet.c b/nuttx/arch/arm/src/c5471/c5471_ethernet.c index bcf7b89b5..507f63cf9 100644 --- a/nuttx/arch/arm/src/c5471/c5471_ethernet.c +++ b/nuttx/arch/arm/src/c5471/c5471_ethernet.c @@ -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" diff --git a/nuttx/arch/arm/src/kinetis/kinetis_enet.c b/nuttx/arch/arm/src/kinetis/kinetis_enet.c index 06ecff06c..3e0a36779 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_enet.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_enet.c @@ -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" diff --git a/nuttx/arch/arm/src/lm3s/lm3s_ethernet.c b/nuttx/arch/arm/src/lm3s/lm3s_ethernet.c index 4f78c9e85..be38a7b26 100644 --- a/nuttx/arch/arm/src/lm3s/lm3s_ethernet.c +++ b/nuttx/arch/arm/src/lm3s/lm3s_ethernet.c @@ -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" diff --git a/nuttx/arch/arm/src/lm3s/lm3s_ethernet.h b/nuttx/arch/arm/src/lm3s/lm3s_ethernet.h index ea98c8b07..71833b271 100644 --- a/nuttx/arch/arm/src/lm3s/lm3s_ethernet.h +++ b/nuttx/arch/arm/src/lm3s/lm3s_ethernet.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 *******************************************/ diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c index 5a2971130..a3bc9d951 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c @@ -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" diff --git a/nuttx/arch/arm/src/stm32/stm32_eth.c b/nuttx/arch/arm/src/stm32/stm32_eth.c index 055893f88..68ee78fd5 100755 --- a/nuttx/arch/arm/src/stm32/stm32_eth.c +++ b/nuttx/arch/arm/src/stm32/stm32_eth.c @@ -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" diff --git a/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c b/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c index ca9840360..a2b890d22 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c +++ b/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c @@ -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 diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c b/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c index d7a9612ee..d4dee038c 100644 --- a/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c +++ b/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c @@ -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> diff --git a/nuttx/arch/sim/src/up_uipdriver.c b/nuttx/arch/sim/src/up_uipdriver.c index e6dec219d..99f37b22f 100644 --- a/nuttx/arch/sim/src/up_uipdriver.c +++ b/nuttx/arch/sim/src/up_uipdriver.c @@ -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" diff --git a/nuttx/arch/z80/src/ez80/ez80_emac.c b/nuttx/arch/z80/src/ez80/ez80_emac.c index c758cfb1b..23542e279 100644 --- a/nuttx/arch/z80/src/ez80/ez80_emac.c +++ b/nuttx/arch/z80/src/ez80/ez80_emac.c @@ -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" |