sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move ARM and Cortex header files to separate directories

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1796 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2009-05-19 17:31:58 +00:00
parent da29bce964
commit c8095344f4
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/include/irq_arm.h → arch/arm/include/arm/irq.h
View File

@ -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 */

8
arch/arm/include/irq_cortexm3.h → arch/arm/include/cortexm3/irq.h
View File

@ -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 */

15
arch/arm/include/irq.h
View File

@ -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
/****************************************************************************