arch/c5471/include and arch/dm320/include are not identical. This is in preparation to replace arch/c5471 and arch/dm320 with arch/arm

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@186 42af7a65-404d-4744-a932-0658087f49c3

4 files changed, 16 insertions, 66 deletions

diff --git a/nuttx/arch/dm320/include/arch.h b/nuttx/arch/dm320/include/arch.h
index 6b58d0e36..a64ecb5e9 100644
--- a/nuttx/arch/dm320/include/arch.h
+++ b/nuttx/arch/dm320/include/arch.h
@@ -1,5 +1,5 @@
 /************************************************************
- * arch.h
+ * arch/arch.h
  *
  *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -37,8 +37,8 @@
  * only indirectly through nuttx/arch.h
  */
 
-#ifndef __ARCH_DM320_ARCH_H
-#define __ARCH_DM320_ARCH_H
+#ifndef __ARCH_ARCH_H
+#define __ARCH_ARCH_H
 
 /************************************************************
  * Included Files
@@ -76,5 +76,5 @@ extern "C" {
 }
 #endif
 
-#endif /* __ARCH_DM320_ARCH_H */
+#endif /* __ARCH_ARCH_H */
 
diff --git a/nuttx/arch/dm320/include/irq.h b/nuttx/arch/dm320/include/irq.h
index 9e5daafb3..c838ad402 100644
--- a/nuttx/arch/dm320/include/irq.h
+++ b/nuttx/arch/dm320/include/irq.h
@@ -1,5 +1,5 @@
 /************************************************************
- * irq.h
+ * arch/irq.h
  *
  *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -37,13 +37,15 @@
  * only indirectly through nuttx/irq.h
  */
 
-#ifndef __ARCH_DM320_IRQ_H
-#define __ARCH_DM320_IRQ_H
+#ifndef __ARCH_IRQ_H
+#define __ARCH_IRQ_H
 
 /************************************************************
  * Included Files
  ************************************************************/
 
+#include <arch/chip/irq.h>
+
 /************************************************************
  * Definitions
  ************************************************************/
@@ -100,58 +102,6 @@
 #define REG_LR              REG_R14
 #define REG_PC              REG_R15
 
-/* DM320 Interrupts */
-
-#define DM320_IRQ_TMR0      0 /* IRQ0:  Timer 0 Interrupt */
-#define DM320_IRQ_TMR1      1 /* IRQ1:  Timer 1 Interrupt */
-#define DM320_IRQ_TMR2      2 /* IRQ2:  Timer 2 Interrupt (CCD timer 0) */
-#define DM320_IRQ_TMR3      3 /* IRQ3:  Timer 3 Interrupt (CCD timer 1) */
-#define DM320_IRQ_CCDVD0    4 /* IRQ4:  CCD VD Interrupt #0 */
-#define DM320_IRQ_CCDVD1    5 /* IRQ5:  CCD VD Interrupt #1 */
-#define DM320_IRQ_CCDWEN    6 /* IRQ6:  CCD WEN Interrupt */
-#define DM320_IRQ_VENC      7 /* IRQ7:  Video Encoder Interrupt */
-#define DM320_IRQ_SP0       8 /* IRQ8:  Serial Port 0 Interrupt (with DMA) */
-#define DM320_IRQ_SP1       9 /* IRQ9:  Serial Port 1 Interrupt */
-#define DM320_IRQ_EXTHOST  10 /* IRQ10: External host interrupt */
-#define DM320_IRQ_IMGBUF   11 /* IRQ11: Image Buffer */
-#define DM320_IRQ_UART0    12 /* IRQ12: UART0 Interrupt */
-#define DM320_IRQ_UART1    13 /* IRQ13: UART1 Interrupt */
-#define DM320_IRQ_USB0     14 /* IRQ14: USB 0 Interrupt (DMA) */
-#define DM320_IRQ_USB1     15 /* IRQ15: USB 1 Interrupt (Core) */
-#define DM320_IRQ_VLYNQ    16 /* IRQ16: VLYNQ Interrupt */
-#define DM320_IRQ_MTC0     17 /* IRQ17: Memory Traffic Controller 0 (DMA) */
-#define DM320_IRQ_MTC1     18 /* IRQ18: Memory Traffic Controller 1 (CFC_RDY) */
-#define DM320_IRQ_MMCSD0   19 /* IRQ19: MMC/SD or MS 0 Interrupt */
-#define DM320_IRQ_MMCSD1   20 /* IRQ20: MMC/SD or MS 1 Interrupt */
-#define DM320_IRQ_EXT0     21 /* IRQ21: External Interrupt #0 (GIO0) */
-#define DM320_IRQ_EXT1     22 /* IRQ22: External Interrupt #1 (GIO1) */
-#define DM320_IRQ_EXT2     23 /* IRQ23: External Interrupt #2 (GIO2) */
-#define DM320_IRQ_EXT3     24 /* IRQ24: External Interrupt #3 (GIO3) */
-#define DM320_IRQ_EXT4     25 /* IRQ25: External Interrupt #4 (GIO4) */
-#define DM320_IRQ_EXT5     26 /* IRQ26: External Interrupt #5 (GIO5) */
-#define DM320_IRQ_EXT6     27 /* IRQ27: External Interrupt #6 (GIO6) */
-#define DM320_IRQ_EXT7     28 /* IRQ28: External Interrupt #7 (GIO7) */
-#define DM320_IRQ_EXT8     29 /* IRQ29: External Interrupt #8 (GIO8) */
-#define DM320_IRQ_EXT9     30 /* IRQ30: External Interrupt #9 (GIO9) */
-#define DM320_IRQ_EXT10    31 /* IRQ31: External Interrupt #10 (GIO10) */
-#define DM320_IRQ_EXT11    32 /* IRQ32: External Interrupt #11 (GIO11) */
-#define DM320_IRQ_EXT12    33 /* IRQ33: External Interrupt #12 (GIO12) */
-#define DM320_IRQ_EXT13    34 /* IRQ34: External Interrupt #13 (GIO13) */
-#define DM320_IRQ_EXT14    35 /* IRQ35: External Interrupt #14 (GIO14) */
-#define DM320_IRQ_EXT15    36 /* IRQ36: External Interrupt #15 (GIO15) */
-#define DM320_IRQ_PREV0    37 /* IRQ37: Preview Engine 0 (Preview Over) */
-#define DM320_IRQ_PREV1    38 /* IRQ38: Preview Engine 1 (Preview Historgram Over) */
-#define DM320_IRQ_WDT      39 /* IRQ39: Watchdog Timer Interrupt */
-#define DM320_IRQ_I2C      40 /* IRQ40: I2C Interrupt */
-#define DM320_IRQ_CLKC     41 /* IRQ41: Clock controller Interrupt (wake up) */
-#define DM320_IRQ_E2ICE    42 /* IRQ42: Embedded ICE Interrupt */
-#define DM320_IRQ_ARMCOMRX 43 /* IRQ43: ARMCOMM Receive Interrupt */
-#define DM320_IRQ_ARMCOMTX 44 /* IRQ44: ARMCOMM Transmit Interrupt */
-#define DM320_IRQ_RSV      45 /* IRQ45: Reserved Interrupt */
-
-#define DM320_IRQ_SYSTIMER DM320_IRQ_TMR0
-#define NR_IRQS            (DM320_IRQ_RSV+1)
-
 /************************************************************
  * Public Types
  ************************************************************/
@@ -272,5 +222,5 @@ extern "C" {
 #endif
 #endif
 
-#endif /* __ARCH_DM320_IRQ_H */
+#endif /* __ARCH_IRQ_H */
 
diff --git a/nuttx/arch/dm320/include/serial.h b/nuttx/arch/dm320/include/serial.h
index d9cc1ba89..1439300b0 100644
--- a/nuttx/arch/dm320/include/serial.h
+++ b/nuttx/arch/dm320/include/serial.h
@@ -1,5 +1,5 @@
 /************************************************************
- * serial.h
+ * arch/serial.h
  *
  *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -44,7 +44,7 @@
  * Definitions
  ************************************************************/
 
-/* IOCTL commands supported by the DM320 serial driver */
+/* IOCTL commands supported by the ARM serial driver */
 
 #define TIOCSBRK        0x5401  /* BSD compatibility */
 #define TIOCCBRK        0x5402  /* " " "           " */
diff --git a/nuttx/arch/dm320/include/types.h b/nuttx/arch/dm320/include/types.h
index 740f4590f..760790327 100644
--- a/nuttx/arch/dm320/include/types.h
+++ b/nuttx/arch/dm320/include/types.h
@@ -1,5 +1,5 @@
 /************************************************************
- * types.h
+ * arch/types.h
  *
  *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -37,8 +37,8 @@
  * only indirectly through sys/types.h
  */
 
-#ifndef __ARCH_DM320_TYPES_H
-#define __ARCH_DM320_TYPES_H
+#ifndef __ARCH_TYPES_H
+#define __ARCH_TYPES_H
 
 /************************************************************
  * Included Files
@@ -79,4 +79,4 @@ typedef unsigned int irqstate_t;
  * Global Function Prototypes
  ************************************************************/
 
-#endif /* __ARCH_DM320_TYPES_H */
+#endif /* __ARCH_TYPES_H */