diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-05-19 17:31:58 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-05-19 17:31:58 +0000 |
| commit | b72d8f8ca224f9ac84cbc15cbb09577d1a804902 (patch) | |
| tree | 30d795ece3a2c15a614095b0715d73000f89e647 | |
| parent | f0233026fc2379ba8630a35f3a2525eac1e0bf66 (diff) | |
| download | nuttx-b72d8f8ca224f9ac84cbc15cbb09577d1a804902.tar.gz nuttx-b72d8f8ca224f9ac84cbc15cbb09577d1a804902.tar.bz2 nuttx-b72d8f8ca224f9ac84cbc15cbb09577d1a804902.zip | |
Move ARM and Cortex header files to separate directories
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1796 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | nuttx/arch/arm/include/arm/irq.h (renamed from nuttx/arch/arm/include/irq_arm.h) | 8 | ||||
| -rw-r--r-- | nuttx/arch/arm/include/cortexm3/irq.h (renamed from nuttx/arch/arm/include/irq_cortexm3.h) | 8 | ||||
| -rw-r--r-- | nuttx/arch/arm/include/irq.h | 15 |
3 files changed, 20 insertions, 11 deletions
diff --git a/nuttx/arch/arm/include/irq_arm.h b/nuttx/arch/arm/include/arm/irq.h index efaa5f816..11c2bb046 100644 --- a/nuttx/arch/arm/include/irq_arm.h +++ b/nuttx/arch/arm/include/arm/irq.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/include/irq_arm.h + * arch/arm/include/arm/irq.h * * Copyright (C) 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> @@ -37,8 +37,8 @@ * through nuttx/irq.h */ -#ifndef __ARCH_ARM_INCLUDE_IRQ_ARM_H -#define __ARCH_ARM_INCLUDE_IRQ_ARM_H +#ifndef __ARCH_ARM_INCLUDE_ARM_IRQ_H +#define __ARCH_ARM_INCLUDE_ARM_IRQ_H /**************************************************************************** * Included Files @@ -225,5 +225,5 @@ extern "C" { #endif #endif -#endif /* __ARCH_ARM_INCLUDE_IRQ_ARM_H */ +#endif /* __ARCH_ARM_INCLUDE_ARM_IRQ_H */ diff --git a/nuttx/arch/arm/include/irq_cortexm3.h b/nuttx/arch/arm/include/cortexm3/irq.h index a08b7e2f8..ce126748a 100644 --- a/nuttx/arch/arm/include/irq_cortexm3.h +++ b/nuttx/arch/arm/include/cortexm3/irq.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/include/irq_cortexm3.h + * arch/arm/include/cortexm3/irq.h * * Copyright (C) 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> @@ -37,8 +37,8 @@ * through nuttx/irq.h */ -#ifndef __ARCH_ARM_INCLUDE_IRQ_THUMB2_H -#define __ARCH_ARM_INCLUDE_IRQ_THUMB2_H +#ifndef __ARCH_ARM_INCLUDE_CORTEXM3_IRQ_H +#define __ARCH_ARM_INCLUDE_CORTEXM3_IRQ_H /**************************************************************************** * Included Files @@ -286,5 +286,5 @@ extern "C" { #endif #endif -#endif /* __ARCH_ARM_INCLUDE_IRQ_THUMB2_H */ +#endif /* __ARCH_ARM_INCLUDE_CORTEXM3_IRQ_H */ diff --git a/nuttx/arch/arm/include/irq.h b/nuttx/arch/arm/include/irq.h index dabd35f41..2ee412334 100644 --- a/nuttx/arch/arm/include/irq.h +++ b/nuttx/arch/arm/include/irq.h @@ -44,13 +44,22 @@ * Included Files ****************************************************************************/ +/* Include NuttX-specific IRQ definitions */ + #include <nuttx/irq.h> + +/* Include chip-specific IRQ definitions (including IRQ numbers) */ + #include <arch/chip/irq.h> -#ifdef __thumb2__ -# include <arch/irq_cortexm3.h> +/* Include ARM architectgure-specific IRQ definitions (including register + * save structure and irqsave()/irqrestore() macros + */ + +#ifdef CONFIG_ARCH_CORTEXM3 +# include <arch/cortexm3/irq.h> #else -# include <arch/irq_arm.h> +# include <arch/arm/irq.h> #endif /**************************************************************************** |