Re-partition Stellaris vector logic

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

1 files changed, 14 insertions, 267 deletions

diff --git a/nuttx/arch/arm/include/lm/irq.h b/nuttx/arch/arm/include/lm/irq.h
index 9a5a3d153..3b984a826 100644
--- a/nuttx/arch/arm/include/lm/irq.h
+++ b/nuttx/arch/arm/include/lm/irq.h
@@ -33,10 +33,6 @@
  *
  ************************************************************************************/
 
-/* This file should never be included directed but, rather,
- * only indirectly through nuttx/irq.h
- */
-
 #ifndef __ARCH_ARM_INCLUDE_LM_IRQ_H
 #define __ARCH_ARM_INCLUDE_LM_IRQ_H
 
@@ -47,263 +43,18 @@
 #include <nuttx/config.h>
 #include <nuttx/irq.h>
 
-/************************************************************************************
- * Definitions
- ************************************************************************************/
-
-/* IRQ numbers.  The IRQ number corresponds vector number and hence map directly to
- * bits in the NVIC.  This does, however, waste several words of memory in the IRQ
- * to handle mapping tables.
- */
-
-/* Processor Exceptions (vectors 0-15) */
-
-#define LM_IRQ_RESERVED     (0) /* Reserved vector (only used with CONFIG_DEBUG) */
-                                /* Vector  0: Reset stack pointer value */
-                                /* Vector  1: Reset (not handler as an IRQ) */
-#define LM_IRQ_NMI          (2) /* Vector  2: Non-Maskable Interrupt (NMI) */
-#define LM_IRQ_HARDFAULT    (3) /* Vector  3: Hard fault */
-#define LM_IRQ_MEMFAULT     (4) /* Vector  4: Memory management (MPU) */
-#define LM_IRQ_BUSFAULT     (5) /* Vector  5: Bus fault */
-#define LM_IRQ_USAGEFAULT   (6) /* Vector  6: Usage fault */
-#define LM_IRQ_SVCALL      (11) /* Vector 11: SVC call */
-#define LM_IRQ_DBGMONITOR  (12) /* Vector 12: Debug Monitor */
-                                /* Vector 13: Reserved */
-#define LM_IRQ_PENDSV      (14) /* Vector 14: Pendable system service request */
-#define LM_IRQ_SYSTICK     (15) /* Vector 15: System tick */
-
-/* External interrupts (vectors >= 16) */
-
-#define LM_IRQ_INTERRUPTS  (16) /* Vector number of the first external interrupt */
-#if defined(CONFIG_ARCH_CHIP_LM3S6918)
-
-#  define LM_IRQ_GPIOA     (16) /* Vector 16: GPIO Port A */
-#  define LM_IRQ_GPIOB     (17) /* Vector 17: GPIO Port B */
-#  define LM_IRQ_GPIOC     (18) /* Vector 18: GPIO Port C */
-#  define LM_IRQ_GPIOD     (19) /* Vector 19: GPIO Port D */
-#  define LM_IRQ_GPIOE     (20) /* Vector 20: GPIO Port E */
-#  define LM_IRQ_UART0     (21) /* Vector 21: UART 0 */
-#  define LM_IRQ_UART1     (22) /* Vector 22: UART 1 */
-#  define LM_IRQ_SSI0      (23) /* Vector 23: SSI 0 */
-#  define LM_IRQ_I2C0      (24) /* Vector 24: I2C 0 */
-                                /* Vector 25-29: Reserved */
-#  define LM_IRQ_ADC0      (30) /* Vector 30: ADC Sequence 0 */
-#  define LM_IRQ_ADC1      (31) /* Vector 31: ADC Sequence 1 */
-#  define LM_IRQ_ADC2      (32) /* Vector 32: ADC Sequence 2 */
-#  define LM_IRQ_ADC3      (33) /* Vector 33: ADC Sequence 3 */
-#  define LM_IRQ_WDOG      (34) /* Vector 34: Watchdog Timer */
-#  define LM_IRQ_TIMER0A   (35) /* Vector 35: Timer 0 A */
-#  define LM_IRQ_TIMER0B   (36) /* Vector 36: Timer 0 B */
-#  define LM_IRQ_TIMER1A   (37) /* Vector 37: Timer 1 A */
-#  define LM_IRQ_TIMER1B   (38) /* Vector 38: Timer 1 B */
-#  define LM_IRQ_TIMER2A   (39) /* Vector 39: Timer 2 A */
-#  define LM_IRQ_TIMER2B   (40) /* Vector 40: Timer 3 B */
-#  define LM_IRQ_COMPARE0  (41) /* Vector 41: Analog Comparator 0 */
-#  define LM_IRQ_COMPARE1  (42) /* Vector 42: Analog Comparator 1 */
-                                /* Vector 43: Reserved */
-#  define LM_IRQ_SYSCON    (44) /* Vector 44: System Control */
-#  define LM_IRQ_FLASHCON  (45) /* Vector 45: FLASH Control */
-#  define LM_IRQ_GPIOF     (46) /* Vector 46: GPIO Port F */
-#  define LM_IRQ_GPIOG     (47) /* Vector 47: GPIO Port G */
-#  define LM_IRQ_GPIOH     (48) /* Vector 48: GPIO Port H */
-                                /* Vector 49: Reserved */
-#  define LM_IRQ_SSI1      (50) /* Vector 50: SSI 1 */
-#  define LM_IRQ_TIMER3A   (51) /* Vector 51: Timer 3 A */
-#  define LM_IRQ_TIMER3B   (52) /* Vector 52: Timer 3 B */
-#  define LM_IRQ_I2C1      (53) /* Vector 53: I2C 1 */
-                                /* Vectors 54-57: Reserved */
-#  define LM_IRQ_ETHCON    (58) /* Vector 58: Ethernet Controller */
-#  define LM_IRQ_HIBERNATE (59) /* Vector 59: Hibernation Module */
-                                /* Vectors 60-70: Reserved */
-#  define NR_IRQS          (60) /* (Really less because of reserved vectors) */
-#elif defined(CONFIG_ARCH_CHIP_LM3S6432)
-#  define LM_IRQ_GPIOA     (16) /* Vector 16: GPIO Port A */
-#  define LM_IRQ_GPIOB     (17) /* Vector 17: GPIO Port B */
-#  define LM_IRQ_GPIOC     (18) /* Vector 18: GPIO Port C */
-#  define LM_IRQ_GPIOD     (19) /* Vector 19: GPIO Port D */
-#  define LM_IRQ_GPIOE     (20) /* Vector 20: GPIO Port E */
-#  define LM_IRQ_UART0     (21) /* Vector 21: UART 0 */
-#  define LM_IRQ_UART1     (22) /* Vector 22: UART 1 */
-#  define LM_IRQ_SSI0      (23) /* Vector 23: SSI 0 */
-#  define LM_IRQ_I2C0      (24) /* Vector 24: I2C 0 */
-                                /* Vector 25: Reserved */
-#  define LM_IRQ_PWM0      (26) /* Vector 26: PWM Generator 0 */
-                                /* Vectors 27-29: Reserved */
-#  define LM_IRQ_ADC0      (30) /* Vector 30: ADC Sequence 0 */
-#  define LM_IRQ_ADC1      (31) /* Vector 31: ADC Sequence 1 */
-#  define LM_IRQ_ADC2      (32) /* Vector 32: ADC Sequence 2 */
-#  define LM_IRQ_ADC3      (33) /* Vector 33: ADC Sequence 3 */
-#  define LM_IRQ_WDOG      (34) /* Vector 34: Watchdog Timer */
-#  define LM_IRQ_TIMER0A   (35) /* Vector 35: Timer 0 A */
-#  define LM_IRQ_TIMER0B   (36) /* Vector 36: Timer 0 B */
-#  define LM_IRQ_TIMER1A   (37) /* Vector 37: Timer 1 A */
-#  define LM_IRQ_TIMER1B   (38) /* Vector 38: Timer 1 B */
-#  define LM_IRQ_TIMER2A   (39) /* Vector 39: Timer 2 A */
-#  define LM_IRQ_TIMER2B   (40) /* Vector 40: Timer 3 B */
-#  define LM_IRQ_COMPARE0  (41) /* Vector 41: Analog Comparator 0 */
-#  define LM_IRQ_COMPARE1  (42) /* Vector 42: Analog Comparator 1 */
-                                /* Vector 43: Reserved */
-#  define LM_IRQ_SYSCON    (44) /* Vector 44: System Control */
-#  define LM_IRQ_FLASHCON  (45) /* Vector 45: FLASH Control */
-#  define LM_IRQ_GPIOF     (46) /* Vector 46: GPIO Port F */
-#  define LM_IRQ_GPIOG     (47) /* Vector 47: GPIO Port G */
-                                /* Vectors 48-57: Reserved */
-#  define LM_IRQ_ETHCON    (58) /* Vector 58: Ethernet Controller */
-                                /* Vectors 59-70: Reserved */
-#  define NR_IRQS          (60) /* (Really less because of reserved vectors) */
-#elif defined(CONFIG_ARCH_CHIP_LM3S6965)
-#  define LM_IRQ_GPIOA     (16) /* Vector 16: GPIO Port A */
-#  define LM_IRQ_GPIOB     (17) /* Vector 17: GPIO Port B */
-#  define LM_IRQ_GPIOC     (18) /* Vector 18: GPIO Port C */
-#  define LM_IRQ_GPIOD     (19) /* Vector 19: GPIO Port D */
-#  define LM_IRQ_GPIOE     (20) /* Vector 20: GPIO Port E */
-#  define LM_IRQ_UART0     (21) /* Vector 21: UART 0 */
-#  define LM_IRQ_UART1     (22) /* Vector 22: UART 1 */
-#  define LM_IRQ_SSI0      (23) /* Vector 23: SSI 0 */
-#  define LM_IRQ_I2C0      (24) /* Vector 24: I2C 0 */
-#  define LM_IRQ_PWMFAULT  (25) /* Vector 25: PWM Fault */
-#  define LM_IRQ_PWM0      (26) /* Vector 26: PWM Generator 0 */
-#  define LM_IRQ_PWM1      (27) /* Vector 27: PWM Generator 1 */
-#  define LM_IRQ_PWM2      (28) /* Vector 28: PWM Generator 2 */
-#  define LM_IRQ_QEI0      (29) /* Vector 29: QEI0 */
-#  define LM_IRQ_ADC0      (30) /* Vector 30: ADC Sequence 0 */
-#  define LM_IRQ_ADC1      (31) /* Vector 31: ADC Sequence 1 */
-#  define LM_IRQ_ADC2      (32) /* Vector 32: ADC Sequence 2 */
-#  define LM_IRQ_ADC3      (33) /* Vector 33: ADC Sequence 3 */
-#  define LM_IRQ_WDOG      (34) /* Vector 34: Watchdog Timer */
-#  define LM_IRQ_TIMER0A   (35) /* Vector 35: Timer 0 A */
-#  define LM_IRQ_TIMER0B   (36) /* Vector 36: Timer 0 B */
-#  define LM_IRQ_TIMER1A   (37) /* Vector 37: Timer 1 A */
-#  define LM_IRQ_TIMER1B   (38) /* Vector 38: Timer 1 B */
-#  define LM_IRQ_TIMER2A   (39) /* Vector 39: Timer 2 A */
-#  define LM_IRQ_TIMER2B   (40) /* Vector 40: Timer 3 B */
-#  define LM_IRQ_COMPARE0  (41) /* Vector 41: Analog Comparator 0 */
-#  define LM_IRQ_COMPARE1  (42) /* Vector 42: Analog Comparator 1 */
-                                /* Vector 43: Reserved */
-#  define LM_IRQ_SYSCON    (44) /* Vector 44: System Control */
-#  define LM_IRQ_FLASHCON  (45) /* Vector 45: FLASH Control */
-#  define LM_IRQ_GPIOF     (46) /* Vector 46: GPIO Port F */
-#  define LM_IRQ_GPIOG     (47) /* Vector 47: GPIO Port G */
-                                /* Vector 48: Reserved */
-#  define LM_IRQ_UART2     (49) /* Vector 49: UART 2 */
-                                /* Vector 50: Reserved */
-#  define LM_IRQ_TIMER3A   (51) /* Vector 51: Timer 3 A */
-#  define LM_IRQ_TIMER3B   (52) /* Vector 52: Timer 3 B */
-#  define LM_IRQ_I2C1      (53) /* Vector 53: I2C 1 */
-#  define LM_IRQ_QEI1      (54) /* Vector 54: QEI1 */
-                                /* Vectors 55-57: Reserved */
-#  define LM_IRQ_ETHCON    (58) /* Vector 58: Ethernet Controller */
-#  define LM_IRQ_HIBERNATE (59) /* Vector 59: Hibernation Module */
-                                /* Vectors 60-70: Reserved */
-#  define NR_IRQS          (60) /* (Really less because of reserved vectors) */
-#elif defined(CONFIG_ARCH_CHIP_LM3S9B96)
-#  define LM_IRQ_GPIOA     (16) /* Vector 16: GPIO Port A */
-#  define LM_IRQ_GPIOB     (17) /* Vector 17: GPIO Port B */
-#  define LM_IRQ_GPIOC     (18) /* Vector 18: GPIO Port C */
-#  define LM_IRQ_GPIOD     (19) /* Vector 19: GPIO Port D */
-#  define LM_IRQ_GPIOE     (20) /* Vector 20: GPIO Port E */
-#  define LM_IRQ_UART0     (21) /* Vector 21: UART 0 */
-#  define LM_IRQ_UART1     (22) /* Vector 22: UART 1 */
-#  define LM_IRQ_SSI0      (23) /* Vector 23: SSI 0 */
-#  define LM_IRQ_I2C0      (24) /* Vector 24: I2C 0 */
-#  define LM_IRQ_PWMFAULT  (25) /* Vector 25: PWM Fault */
-#  define LM_IRQ_PWM0      (26) /* Vector 26: PWM Generator 0 */
-#  define LM_IRQ_PWM1      (27) /* Vector 27: PWM Generator 1 */
-#  define LM_IRQ_PWM2      (28) /* Vector 28: PWM Generator 2 */
-#  define LM_IRQ_QEI0      (29) /* Vector 29: QEI0 */
-#  define LM_IRQ_ADC0      (30) /* Vector 30: ADC0 Sequence 0 */
-#  define LM_IRQ_ADC1      (31) /* Vector 31: ADC0 Sequence 1 */
-#  define LM_IRQ_ADC2      (32) /* Vector 32: ADC0 Sequence 2 */
-#  define LM_IRQ_ADC3      (33) /* Vector 33: ADC0 Sequence 3 */
-#  define LM_IRQ_WDOG      (34) /* Vector 34: Watchdog Timer */
-#  define LM_IRQ_TIMER0A   (35) /* Vector 35: Timer 0 A */
-#  define LM_IRQ_TIMER0B   (36) /* Vector 36: Timer 0 B */
-#  define LM_IRQ_TIMER1A   (37) /* Vector 37: Timer 1 A */
-#  define LM_IRQ_TIMER1B   (38) /* Vector 38: Timer 1 B */
-#  define LM_IRQ_TIMER2A   (39) /* Vector 39: Timer 2 A */
-#  define LM_IRQ_TIMER2B   (40) /* Vector 40: Timer 3 B */
-#  define LM_IRQ_COMPARE0  (41) /* Vector 41: Analog Comparator 0 */
-#  define LM_IRQ_COMPARE1  (42) /* Vector 42: Analog Comparator 1 */
-#  define LM_IRQ_COMPARE2  (43) /* Vector 43: Analog Comparator 3 */
-#  define LM_IRQ_SYSCON    (44) /* Vector 44: System Control */
-#  define LM_IRQ_FLASHCON  (45) /* Vector 45: FLASH Control */
-#  define LM_IRQ_GPIOF     (46) /* Vector 46: GPIO Port F */
-#  define LM_IRQ_GPIOG     (47) /* Vector 47: GPIO Port G */
-#  define LM_IRQ_GPIOH     (48) /* Vector 48: GPIO Port H */
-#  define LM_IRQ_UART2     (49) /* Vector 49: UART 2 */
-#  define LM_IRQ_SSI1      (50) /* Vector 50: SSI 1  */
-#  define LM_IRQ_TIMER3A   (51) /* Vector 51: Timer 3 A */
-#  define LM_IRQ_TIMER3B   (52) /* Vector 52: Timer 3 B */
-#  define LM_IRQ_I2C1      (53) /* Vector 53: I2C 1 */
-#  define LM_IRQ_QEI1      (54) /* Vector 54: QEI1 */
-#  define LM_IRQ_CAN0      (55) /* Vector 55: CAN 1 */
-#  define LM_IRQ_CAN1      (56) /* Vector 56: CAN 2 */
-                                /* Vector 57: Reserved */
-#  define LM_IRQ_ETHCON    (58) /* Vector 58: Ethernet Controller */
-                                /* Vector 59: Reserved */
-#  define LM_IRQ_USB       (60) /* Vector 60: USB */
-#  define LM_IRQ_PWM3      (61) /* Vector 61: PWM Generator 3 */
-#  define LM_IRQ_UDMASOFT  (62) /* Vector 62: uDMA Software */
-#  define LM_IRQ_UDMAERROR (63) /* Vector 63: uDMA Error */
-#  define LM_IRQ_ADC1_0    (64) /* Vector 64: ADC1 Sequence 0 */
-#  define LM_IRQ_ADC1_1    (65) /* Vector 65: ADC1 Sequence 1 */
-#  define LM_IRQ_ADC1_2    (66) /* Vector 66: ADC1 Sequence 2 */
-#  define LM_IRQ_ADC1_3    (67) /* Vector 67: ADC1 Sequence 3 */
-#  define LM_IRQ_I2S0      (68) /* Vector 68: I2S0 */
-#  define LM_IRQ_EPI       (69) /* Vector 69: EPI */
-#  define LM_IRQ_GPIOJ     (70) /* Vector 70: GPIO Port J */
-                                /* Vector 71: Reserved */
-#  define NR_IRQS          (71) /* (Really less because of reserved vectors) */
-#elif defined(CONFIG_ARCH_CHIP_LM3S8962)
-#  define LM_IRQ_GPIOA     (16) /* Vector 16: GPIO Port A */
-#  define LM_IRQ_GPIOB     (17) /* Vector 17: GPIO Port B */
-#  define LM_IRQ_GPIOC     (18) /* Vector 18: GPIO Port C */
-#  define LM_IRQ_GPIOD     (19) /* Vector 19: GPIO Port D */
-#  define LM_IRQ_GPIOE     (20) /* Vector 20: GPIO Port E */
-#  define LM_IRQ_UART0     (21) /* Vector 21: UART 0 */
-#  define LM_IRQ_UART1     (22) /* Vector 22: UART 1 */
-#  define LM_IRQ_SSI0      (23) /* Vector 23: SSI 0 */
-#  define LM_IRQ_I2C0      (24) /* Vector 24: I2C 0 */
-#  define LM_IRQ_PWMFAULT  (25) /* Vector 25: PWM Fault */
-#  define LM_IRQ_PWM0      (26) /* Vector 26: PWM Generator 0 */
-#  define LM_IRQ_PWM1      (27) /* Vector 27: PWM Generator 1 */
-#  define LM_IRQ_PWM2      (28) /* Vector 28: PWM Generator 2 */
-#  define LM_IRQ_QEI0      (29) /* Vector 29: QEI0 */
-#  define LM_IRQ_ADC0      (30) /* Vector 30: ADC Sequence 0 */
-#  define LM_IRQ_ADC1      (31) /* Vector 31: ADC Sequence 1 */
-#  define LM_IRQ_ADC2      (32) /* Vector 32: ADC Sequence 2 */
-#  define LM_IRQ_ADC3      (33) /* Vector 33: ADC Sequence 3 */
-#  define LM_IRQ_WDOG      (34) /* Vector 34: Watchdog Timer */
-#  define LM_IRQ_TIMER0A   (35) /* Vector 35: Timer 0 A */
-#  define LM_IRQ_TIMER0B   (36) /* Vector 36: Timer 0 B */
-#  define LM_IRQ_TIMER1A   (37) /* Vector 37: Timer 1 A */
-#  define LM_IRQ_TIMER1B   (38) /* Vector 38: Timer 1 B */
-#  define LM_IRQ_TIMER2A   (39) /* Vector 39: Timer 2 A */
-#  define LM_IRQ_TIMER2B   (40) /* Vector 40: Timer 3 B */
-#  define LM_IRQ_COMPARE0  (41) /* Vector 41: Analog Comparator 0 */
-                                /* Vector 42: Reserved */
-                                /* Vector 43: Reserved */
-#  define LM_IRQ_SYSCON    (44) /* Vector 44: System Control */
-#  define LM_IRQ_FLASHCON  (45) /* Vector 45: FLASH Control */
-#  define LM_IRQ_GPIOF     (46) /* Vector 46: GPIO Port F */
-#  define LM_IRQ_GPIOG     (47) /* Vector 47: GPIO Port G */
-                                /* Vector 48: Reserved */
-                                /* Vector 49: Reserved */
-                                /* Vector 50: Reserved */
-#  define LM_IRQ_TIMER3A   (51) /* Vector 51: Timer 3 A */
-#  define LM_IRQ_TIMER3B   (52) /* Vector 52: Timer 3 B */
-#  define LM_IRQ_I2C1      (53) /* Vector 53: I2C 1 */
-#  define LM_IRQ_QEI1      (54) /* Vector 54: QEI1 */
-#  define LM_IRQ_CAN0      (54) /* Vector 55: CAN0 */
-                                /* Vectors 56-57: Reserved */
-#  define LM_IRQ_ETHCON    (58) /* Vector 58: Ethernet Controller */
-#  define LM_IRQ_HIBERNATE (59) /* Vector 59: Hibernation Module */
-                                /* Vectors 60-70: Reserved */
-#  define NR_IRQS          (60) /* (Really less because of reserved vectors) */
+#if defined(CONFIG_ARCH_CHIP_LM3S)
+#  include <arch/lm/lm3s_irq.h>
+#elif defined(CONFIG_ARCH_CHIP_LM4F)
+#  include <arch/lm/lm4f_irq.h>
 #else
-#  error "IRQ Numbers not specified for this Stellaris chip"
+#  error "Unsupported Stellaris IRQ file"
 #endif
 
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
 /* GPIO IRQs -- Note that support for individual GPIO ports can
  * be disabled in order to reduce the size of the implemenation.
  */
@@ -446,10 +197,8 @@
 
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
-#define EXTERN extern "C"
-extern "C" {
-#else
-#define EXTERN extern
+extern "C"
+{
 #endif
 
 /************************************************************************************
@@ -464,7 +213,7 @@ extern "C" {
  *
  ****************************************************************************/
 
-EXTERN int gpio_irqattach(int irq, xcpt_t isr);
+int gpio_irqattach(int irq, xcpt_t isr);
 #define gpio_irqdetach(isr) gpio_irqattach(isr, NULL)
 
 /****************************************************************************
@@ -475,7 +224,7 @@ EXTERN int gpio_irqattach(int irq, xcpt_t isr);
  *
  ****************************************************************************/
 
-EXTERN void gpio_irqenable(int irq);
+void gpio_irqenable(int irq);
 
 /****************************************************************************
  * Name: gpio_irqdisable
@@ -485,13 +234,11 @@ EXTERN void gpio_irqenable(int irq);
  *
  ****************************************************************************/
 
-EXTERN void gpio_irqdisable(int irq);
+void gpio_irqdisable(int irq);
 
-#undef EXTERN
 #ifdef __cplusplus
 }
 #endif
 #endif
 
 #endif /* __ARCH_ARM_INCLUDE_LM_IRQ_H */
-