diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-12-28 00:49:32 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-12-28 00:49:32 +0000 |
commit | 1c1974d75c76a6dc650c6a68266bc8906193d9c9 (patch) | |
tree | 003c423b3699c22654c831df5f17450abb42ea50 /nuttx/arch/arm | |
parent | d068dc36f0be095cb9a82cf64804aba6ba2bf555 (diff) | |
download | px4-nuttx-1c1974d75c76a6dc650c6a68266bc8906193d9c9.tar.gz px4-nuttx-1c1974d75c76a6dc650c6a68266bc8906193d9c9.tar.bz2 px4-nuttx-1c1974d75c76a6dc650c6a68266bc8906193d9c9.zip |
Fix circular header file dependency
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2443 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm')
-rw-r--r-- | nuttx/arch/arm/src/arm/up_assert.c | 1 | ||||
-rw-r--r-- | nuttx/arch/arm/src/arm/up_sigdeliver.c | 1 | ||||
-rw-r--r-- | nuttx/arch/arm/src/common/up_allocateheap.c | 1 | ||||
-rw-r--r-- | nuttx/arch/arm/src/common/up_arch.h | 3 | ||||
-rw-r--r-- | nuttx/arch/arm/src/common/up_createstack.c | 1 | ||||
-rw-r--r-- | nuttx/arch/arm/src/common/up_initialize.c | 1 | ||||
-rw-r--r-- | nuttx/arch/arm/src/cortexm3/up_assert.c | 1 | ||||
-rw-r--r-- | nuttx/arch/arm/src/cortexm3/up_sigdeliver.c | 1 | ||||
-rw-r--r-- | nuttx/arch/arm/src/dm320/dm320_allocateheap.c | 3 | ||||
-rw-r--r-- | nuttx/arch/arm/src/imx/imx_allocateheap.c | 2 | ||||
-rwxr-xr-x | nuttx/arch/arm/src/lpc313x/lpc313x_allocateheap.c | 1 | ||||
-rwxr-xr-x | nuttx/arch/arm/src/lpc313x/lpc313x_cgudrvr.h | 112 |
12 files changed, 69 insertions, 59 deletions
diff --git a/nuttx/arch/arm/src/arm/up_assert.c b/nuttx/arch/arm/src/arm/up_assert.c index 657152b98..2a4dc0a31 100644 --- a/nuttx/arch/arm/src/arm/up_assert.c +++ b/nuttx/arch/arm/src/arm/up_assert.c @@ -46,6 +46,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> +#include <arch/board/board.h> #include "up_arch.h" #include "os_internal.h" diff --git a/nuttx/arch/arm/src/arm/up_sigdeliver.c b/nuttx/arch/arm/src/arm/up_sigdeliver.c index 60cc0caf8..a2358a044 100644 --- a/nuttx/arch/arm/src/arm/up_sigdeliver.c +++ b/nuttx/arch/arm/src/arm/up_sigdeliver.c @@ -45,6 +45,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> +#include <arch/board/board.h> #include "os_internal.h" #include "up_internal.h" diff --git a/nuttx/arch/arm/src/common/up_allocateheap.c b/nuttx/arch/arm/src/common/up_allocateheap.c index 1aeb511f8..fbd1421a7 100644 --- a/nuttx/arch/arm/src/common/up_allocateheap.c +++ b/nuttx/arch/arm/src/common/up_allocateheap.c @@ -43,6 +43,7 @@ #include <debug.h> #include <nuttx/arch.h> +#include <arch/board/board.h> #include "up_arch.h" #include "up_internal.h" diff --git a/nuttx/arch/arm/src/common/up_arch.h b/nuttx/arch/arm/src/common/up_arch.h index 3b001542b..b612f6af2 100644 --- a/nuttx/arch/arm/src/common/up_arch.h +++ b/nuttx/arch/arm/src/common/up_arch.h @@ -45,9 +45,6 @@ # include <stdint.h> #endif -#include <arch/board/board.h> -#include "chip.h" - /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ diff --git a/nuttx/arch/arm/src/common/up_createstack.c b/nuttx/arch/arm/src/common/up_createstack.c index 9f4989da3..32d76d47d 100644 --- a/nuttx/arch/arm/src/common/up_createstack.c +++ b/nuttx/arch/arm/src/common/up_createstack.c @@ -46,6 +46,7 @@ #include <nuttx/kmalloc.h> #include <nuttx/arch.h> +#include <arch/board/board.h> #include "up_arch.h" #include "up_internal.h" diff --git a/nuttx/arch/arm/src/common/up_initialize.c b/nuttx/arch/arm/src/common/up_initialize.c index 446009040..1e8fca47c 100644 --- a/nuttx/arch/arm/src/common/up_initialize.c +++ b/nuttx/arch/arm/src/common/up_initialize.c @@ -43,6 +43,7 @@ #include <nuttx/arch.h> #include <nuttx/fs.h> +#include <arch/board/board.h> #include "up_arch.h" #include "up_internal.h" diff --git a/nuttx/arch/arm/src/cortexm3/up_assert.c b/nuttx/arch/arm/src/cortexm3/up_assert.c index 9a27ac13d..b10bc0d8d 100644 --- a/nuttx/arch/arm/src/cortexm3/up_assert.c +++ b/nuttx/arch/arm/src/cortexm3/up_assert.c @@ -46,6 +46,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> +#include <arch/board/board.h> #include "up_arch.h" #include "os_internal.h" diff --git a/nuttx/arch/arm/src/cortexm3/up_sigdeliver.c b/nuttx/arch/arm/src/cortexm3/up_sigdeliver.c index 79b3f876f..e350f126a 100644 --- a/nuttx/arch/arm/src/cortexm3/up_sigdeliver.c +++ b/nuttx/arch/arm/src/cortexm3/up_sigdeliver.c @@ -45,6 +45,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> +#include <arch/board/board.h> #include "os_internal.h" #include "up_internal.h" diff --git a/nuttx/arch/arm/src/dm320/dm320_allocateheap.c b/nuttx/arch/arm/src/dm320/dm320_allocateheap.c index f97a55c7d..865164b52 100644 --- a/nuttx/arch/arm/src/dm320/dm320_allocateheap.c +++ b/nuttx/arch/arm/src/dm320/dm320_allocateheap.c @@ -40,7 +40,10 @@ #include <nuttx/config.h> #include <sys/types.h> #include <debug.h> + #include <nuttx/arch.h> +#include <arch/board/board.h> + #include "up_arch.h" #include "up_internal.h" diff --git a/nuttx/arch/arm/src/imx/imx_allocateheap.c b/nuttx/arch/arm/src/imx/imx_allocateheap.c index fcf0117ff..a9ba6800f 100644 --- a/nuttx/arch/arm/src/imx/imx_allocateheap.c +++ b/nuttx/arch/arm/src/imx/imx_allocateheap.c @@ -43,8 +43,10 @@ #include <sys/types.h> #include <stdint.h> #include <debug.h> + #include <nuttx/mm.h> #include <nuttx/arch.h> +#include <arch/board/board.h> #include "up_arch.h" #include "up_internal.h" diff --git a/nuttx/arch/arm/src/lpc313x/lpc313x_allocateheap.c b/nuttx/arch/arm/src/lpc313x/lpc313x_allocateheap.c index 471df465f..cd3ccdc0d 100755 --- a/nuttx/arch/arm/src/lpc313x/lpc313x_allocateheap.c +++ b/nuttx/arch/arm/src/lpc313x/lpc313x_allocateheap.c @@ -43,6 +43,7 @@ #include <debug.h> #include <nuttx/arch.h> +#include <arch/board/board.h> #include "up_arch.h" #include "up_internal.h" diff --git a/nuttx/arch/arm/src/lpc313x/lpc313x_cgudrvr.h b/nuttx/arch/arm/src/lpc313x/lpc313x_cgudrvr.h index 558a00433..2a9655b2c 100755 --- a/nuttx/arch/arm/src/lpc313x/lpc313x_cgudrvr.h +++ b/nuttx/arch/arm/src/lpc313x/lpc313x_cgudrvr.h @@ -338,62 +338,62 @@ enum lpc313x_clockid_e enum lpc313x_resetid_e { - RESETID_APB0RST, /* 4 AHB part of AHB_TO_APB0 bridge (Reserved) */ - RESETID_AHB2APB0RST, /* 5 APB part of AHB_TO_APB0 bridge (Reserved) */ - RESETID_APB1RST, /* 6 AHB part of AHB_TO_APB1 bridge */ - RESETID_AHB2PB1RST, /* 7 APB part of AHB_TO_APB1 bridge */ - RESETID_APB2RST, /* 8 AHB part of AHB_TO_APB2 bridge */ - RESETID_AHB2APB2RST, /* 9 APB part of AHB_TO_APB2 bridge */ - RESETID_APB3RST, /* 10 AHB part of AHB_TO_APB3 bridge */ - RESETID_AHB2APB3RST, /* 11 APB part of AHB_TO_APB3 bridge */ - RESETID_APB4RST, /* 12 AHB_TO_APB4 bridge */ - RESETID_AHB2INTCRST, /* 13 AHB_TO_INTC */ - RESETID_AHB0RST, /* 14 AHB0 */ - RESETID_EBIRST, /* 15 EBI */ - RESETID_PCMAPBRST, /* 16 APB domain of PCM */ - RESETID_PCMCLKIPRST, /* 17 synchronous clk_ip domain of PCM */ - RESETID_PCMRSTASYNC, /* 18 asynchronous clk_ip domain of PCM */ - RESETID_TIMER0RST, /* 19 Timer0 */ - RESETID_TIMER1RST, /* 20 Timer1 */ - RESETID_TIMER2RST, /* 21 Timer2 */ - RESETID_TIMER3RST, /* 22 Timer3 */ - RESETID_ADCPRST, /* 23 controller of 10 bit ADC Interface */ - RESETID_ADCRST, /* 24 A/D converter of ADC Interface */ - RESETID_PWMRST, /* 25 PWM */ - RESETID_UARTRST, /* 26 UART/IrDA */ - RESETID_I2C0RST, /* 27 I2C0 */ - RESETID_I2C1RST, /* 28 I2C1 */ - RESETID_I2SCFGRST, /* 29 I2S_Config */ - RESETID_I2SNSOFRST, /* 30 NSOF counter of I2S_CONFIG */ - RESETID_EDGEDETRST, /* 31 Edge_det */ - RESETID_I2STXFF0RST, /* 32 I2STX_FIFO_0 */ - RESETID_I2STXIF0RST, /* 33 I2STX_IF_0 */ - RESETID_I2STXFF1RST, /* 34 I2STX_FIFO_1 */ - RESETID_I2STXIF1RST, /* 35 I2STX_IF_1 */ - RESETID_I2SRXFF0RST, /* 36 I2SRX_FIFO_0 */ - RESETID_I2SRXIF0RST, /* 37 I2SRX_IF_0 */ - RESETID_I2SRXFF1RST, /* 38 I2SRX_FIFO_1 */ - RESETID_I2SRXIF1RST, /* 39 I2SRX_IF_1 */ - RESETID_RESERVED40, /* 40 Reserved */ - RESETID_RESERVED41, /* 41 Reserved */ - RESETID_RESERVED42, /* 42 Reserved */ - RESETID_RESERVED43, /* 43 Reserved */ - RESETID_RESERVED44, /* 44 Reserved */ - RESETID_LCDRST, /* 45 LCD Interface */ - RESETID_SPIRSTAPB, /* 46 apb_clk domain of SPI */ - RESETID_SPIRSTIP, /* 47 ip_clk domain of SPI */ - RESETID_DMARST, /* 48 DMA */ - RESETID_NANDECCRST, /* 49 Nandflash Controller ECC clock */ - RESETID_NANDAESRST, /* 50 Nandflash Controller AES clock (reserved for lpc313x) */ - RESETID_NANDCTRLRST, /* 51 Nandflash Controller */ - RESETID_RNG, /* 52 RNG */ - RESETID_SDMMCRST, /* 53 MCI (on AHB clock) */ - RESETID_SDMMCRSTCKIN, /* 54 CI synchronous (on IP clock) */ - RESETID_USBOTGAHBRST, /* 55 USB_OTG */ - RESETID_REDCTLRST, /* 56 Redundancy Controller */ - RESETID_AHBMPMCHRST, /* 57 MPMC */ - RESETID_AHBMPMCRFRST, /* 58 refresh generator used for MPMC */ - RESETID_INTCRST, /* 59 Interrupt Controller */ + RESETID_APB0RST, /* 0 AHB part of AHB_TO_APB0 bridge (Reserved) */ + RESETID_AHB2APB0RST, /* 1 APB part of AHB_TO_APB0 bridge (Reserved) */ + RESETID_APB1RST, /* 2 AHB part of AHB_TO_APB1 bridge */ + RESETID_AHB2PB1RST, /* 3 APB part of AHB_TO_APB1 bridge */ + RESETID_APB2RST, /* 4 AHB part of AHB_TO_APB2 bridge */ + RESETID_AHB2APB2RST, /* 5 APB part of AHB_TO_APB2 bridge */ + RESETID_APB3RST, /* 6 AHB part of AHB_TO_APB3 bridge */ + RESETID_AHB2APB3RST, /* 7 APB part of AHB_TO_APB3 bridge */ + RESETID_APB4RST, /* 8 AHB_TO_APB4 bridge */ + RESETID_AHB2INTCRST, /* 9 AHB_TO_INTC */ + RESETID_AHB0RST, /* 10 AHB0 */ + RESETID_EBIRST, /* 11 EBI */ + RESETID_PCMAPBRST, /* 12 APB domain of PCM */ + RESETID_PCMCLKIPRST, /* 13 synchronous clk_ip domain of PCM */ + RESETID_PCMRSTASYNC, /* 14 asynchronous clk_ip domain of PCM */ + RESETID_TIMER0RST, /* 15 Timer0 */ + RESETID_TIMER1RST, /* 16 Timer1 */ + RESETID_TIMER2RST, /* 17 Timer2 */ + RESETID_TIMER3RST, /* 18 Timer3 */ + RESETID_ADCPRST, /* 19 controller of 10 bit ADC Interface */ + RESETID_ADCRST, /* 20 A/D converter of ADC Interface */ + RESETID_PWMRST, /* 21 PWM */ + RESETID_UARTRST, /* 22 UART/IrDA */ + RESETID_I2C0RST, /* 23 I2C0 */ + RESETID_I2C1RST, /* 24 I2C1 */ + RESETID_I2SCFGRST, /* 25 I2S_Config */ + RESETID_I2SNSOFRST, /* 26 NSOF counter of I2S_CONFIG */ + RESETID_EDGEDETRST, /* 27 Edge_det */ + RESETID_I2STXFF0RST, /* 28 I2STX_FIFO_0 */ + RESETID_I2STXIF0RST, /* 29 I2STX_IF_0 */ + RESETID_I2STXFF1RST, /* 30 I2STX_FIFO_1 */ + RESETID_I2STXIF1RST, /* 31 I2STX_IF_1 */ + RESETID_I2SRXFF0RST, /* 32 I2SRX_FIFO_0 */ + RESETID_I2SRXIF0RST, /* 33 I2SRX_IF_0 */ + RESETID_I2SRXFF1RST, /* 34 I2SRX_FIFO_1 */ + RESETID_I2SRXIF1RST, /* 35 I2SRX_IF_1 */ + RESETID_RESERVED40, /* 36 Reserved */ + RESETID_RESERVED41, /* 37 Reserved */ + RESETID_RESERVED42, /* 38 Reserved */ + RESETID_RESERVED43, /* 39 Reserved */ + RESETID_RESERVED44, /* 40 Reserved */ + RESETID_LCDRST, /* 41 LCD Interface */ + RESETID_SPIRSTAPB, /* 42 apb_clk domain of SPI */ + RESETID_SPIRSTIP, /* 43 ip_clk domain of SPI */ + RESETID_DMARST, /* 44 DMA */ + RESETID_NANDECCRST, /* 45 Nandflash Controller ECC clock */ + RESETID_NANDAESRST, /* 46 Nandflash Controller AES clock (reserved for lpc313x) */ + RESETID_NANDCTRLRST, /* 47 Nandflash Controller */ + RESETID_RNG, /* 48 RNG */ + RESETID_SDMMCRST, /* 49 MCI (on AHB clock) */ + RESETID_SDMMCRSTCKIN, /* 50 CI synchronous (on IP clock) */ + RESETID_USBOTGAHBRST, /* 51 USB_OTG */ + RESETID_REDCTLRST, /* 52 Redundancy Controller */ + RESETID_AHBMPMCHRST, /* 53 MPMC */ + RESETID_AHBMPMCRFRST, /* 54 refresh generator used for MPMC */ + RESETID_INTCRST, /* 55 Interrupt Controller */ }; /************************************************************************ |