2005-05-17 Jennifer Averett <jennifer.averett@oarcorp.com>

* at91rm9200/irq/irq.h, mc9328mxl/irq/irq.h, s3c2400/irq/irq.h:
	Modified names and types to match rtems/irq.h. Note: rtems/irq.h
	should be included after the addition of a parameter to ISRs.
This commit is contained in:
Jennifer Averett
2005-05-17 15:08:26 +00:00
parent d8999b705a
commit 2c247940a7
4 changed files with 147 additions and 148 deletions

View File

@@ -1,3 +1,9 @@
2005-05-17 Jennifer Averett <jennifer.averett@oarcorp.com>
* at91rm9200/irq/irq.h, mc9328mxl/irq/irq.h, s3c2400/irq/irq.h:
Modified names and types to match rtems/irq.h. Note: rtems/irq.h
should be included after the addition of a parameter to ISRs.
2005-05-11 Ralf Corsepius <ralf.corsepius@rtems.org> 2005-05-11 Ralf Corsepius <ralf.corsepius@rtems.org>
* Makefile.am: Merge-in s3c2400/Makefile.am. * Makefile.am: Merge-in s3c2400/Makefile.am.

View File

@@ -32,42 +32,40 @@ extern void default_int_handler();
/*********************************************************************** /***********************************************************************
* Constants * Constants
**********************************************************************/ **********************************************************************/
/* enum of the possible interrupt sources on the AT91RM9200 */ /* possible interrupt sources on the AT91RM9200 */
typedef enum { #define AT91RM9200_INT_FIQ 0
AT91RM9200_INT_FIQ = 0, #define AT91RM9200_INT_SYSIRQ 1
AT91RM9200_INT_SYSIRQ, #define AT91RM9200_INT_PIOA 2
AT91RM9200_INT_PIOA, #define AT91RM9200_INT_PIOB 3
AT91RM9200_INT_PIOB, #define AT91RM9200_INT_PIOC 4
AT91RM9200_INT_PIOC, #define AT91RM9200_INT_PIOD 5
AT91RM9200_INT_PIOD, #define AT91RM9200_INT_US0 6
AT91RM9200_INT_US0, #define AT91RM9200_INT_US1 7
AT91RM9200_INT_US1, #define AT91RM9200_INT_US2 8
AT91RM9200_INT_US2, #define AT91RM9200_INT_US3 9
AT91RM9200_INT_US3, #define AT91RM9200_INT_MCI 10
AT91RM9200_INT_MCI, #define AT91RM9200_INT_UDP 11
AT91RM9200_INT_UDP, #define AT91RM9200_INT_TWI 12
AT91RM9200_INT_TWI, #define AT91RM9200_INT_SPI 13
AT91RM9200_INT_SPI, #define AT91RM9200_INT_SSC0 14
AT91RM9200_INT_SSC0, #define AT91RM9200_INT_SSC1 15
AT91RM9200_INT_SSC1, #define AT91RM9200_INT_SSC2 16
AT91RM9200_INT_SSC2, #define AT91RM9200_INT_TC0 17
AT91RM9200_INT_TC0, #define AT91RM9200_INT_TC1 18
AT91RM9200_INT_TC1, #define AT91RM9200_INT_TC2 19
AT91RM9200_INT_TC2, #define AT91RM9200_INT_TC3 20
AT91RM9200_INT_TC3, #define AT91RM9200_INT_TC4 21
AT91RM9200_INT_TC4, #define AT91RM9200_INT_TC5 22
AT91RM9200_INT_TC5, #define AT91RM9200_INT_UHP 23
AT91RM9200_INT_UHP, #define AT91RM9200_INT_EMAC 24
AT91RM9200_INT_EMAC, #define AT91RM9200_INT_IRQ0 25
AT91RM9200_INT_IRQ0, #define AT91RM9200_INT_IRQ1 26
AT91RM9200_INT_IRQ1, #define AT91RM9200_INT_IRQ2 27
AT91RM9200_INT_IRQ2, #define AT91RM9200_INT_IRQ3 28
AT91RM9200_INT_IRQ3, #define AT91RM9200_INT_IRQ4 28
AT91RM9200_INT_IRQ4, #define AT91RM9200_INT_IRQ5 30
AT91RM9200_INT_IRQ5, #define AT91RM9200_INT_IRQ6 31
AT91RM9200_INT_IRQ6, #define AT91RM9200_MAX_INT 32
AT91RM9200_MAX_INT
} rtems_irq_symbolic_name;
/* vector table used by shared/irq_init.c */ /* vector table used by shared/irq_init.c */
/* we can treat the AT91RM9200 AIC_SVR_BASE as */ /* we can treat the AT91RM9200 AIC_SVR_BASE as */
@@ -78,7 +76,7 @@ typedef unsigned char rtems_irq_level;
typedef unsigned char rtems_irq_trigger; typedef unsigned char rtems_irq_trigger;
struct __rtems_irq_connect_data__; /* forward declaratiuon */ struct __rtems_irq_connect_data__; /* forward declaratiuon */
typedef unsigned int rtems_irq_number;
typedef void (*rtems_irq_hdl) (void); typedef void (*rtems_irq_hdl) (void);
typedef void (*rtems_irq_enable) (const struct __rtems_irq_connect_data__*); typedef void (*rtems_irq_enable) (const struct __rtems_irq_connect_data__*);
typedef void (*rtems_irq_disable) (const struct __rtems_irq_connect_data__*); typedef void (*rtems_irq_disable) (const struct __rtems_irq_connect_data__*);
@@ -86,7 +84,7 @@ typedef int (*rtems_irq_is_enabled)(const struct __rtems_irq_connect_data__*);
typedef struct __rtems_irq_connect_data__ { typedef struct __rtems_irq_connect_data__ {
/* IRQ line */ /* IRQ line */
rtems_irq_symbolic_name name; rtems_irq_number name;
/* Handler */ /* Handler */
rtems_irq_hdl hdl; rtems_irq_hdl hdl;

View File

@@ -34,79 +34,77 @@ extern void default_int_handler();
* Constants * Constants
**********************************************************************/ **********************************************************************/
/* enum of the possible interrupt sources on the AT91RM9200 */ /* possible interrupt sources on the AT91RM9200 */
typedef enum { #define BSP_INT_UART3_PFERR 0
BSP_INT_UART3_PFERR = 0, #define BSP_INT_UART3_RTS 1
BSP_INT_UART3_RTS, #define BSP_INT_UART3_DTR 2
BSP_INT_UART3_DTR, #define BSP_INT_UART3_UARTC 3
BSP_INT_UART3_UARTC, #define BSP_INT_UART3_TX 4
BSP_INT_UART3_TX, #define BSP_INT_PEN_UP 5
BSP_INT_PEN_UP, #define BSP_INT_CSI 6
BSP_INT_CSI, #define BSP_INT_MMA_MAC 7
BSP_INT_MMA_MAC, #define BSP_INT_MMA 8
BSP_INT_MMA, #define BSP_INT_COMP 9
BSP_INT_COMP, #define BSP_INT_MSIRQ 10
BSP_INT_MSIRQ, #define BSP_INT_GPIO_PORTA 11
BSP_INT_GPIO_PORTA, #define BSP_INT_GPIO_PORTB 12
BSP_INT_GPIO_PORTB, #define BSP_INT_GPIO_PORTC 13
BSP_INT_GPIO_PORTC, #define BSP_INT_LCDC 14
BSP_INT_LCDC, #define BSP_INT_SIM_IRQ 15
BSP_INT_SIM_IRQ, #define BSP_INT_SIM_DATA 16
BSP_INT_SIM_DATA, #define BSP_INT_RTC 17
BSP_INT_RTC, #define BSP_INT_RTC_SAM 18
BSP_INT_RTC_SAM, #define BSP_INT_UART2_PFERR 19
BSP_INT_UART2_PFERR, #define BSP_INT_UART2_RTS 20
BSP_INT_UART2_RTS, #define BSP_INT_UART2_DTR 21
BSP_INT_UART2_DTR, #define BSP_INT_UART2_UARTC 22
BSP_INT_UART2_UARTC, #define BSP_INT_UART2_TX 23
BSP_INT_UART2_TX, #define BSP_INT_UART2_RX 24
BSP_INT_UART2_RX, #define BSP_INT_UART1_PFERR 25
BSP_INT_UART1_PFERR, #define BSP_INT_UART1_RTS 26
BSP_INT_UART1_RTS, #define BSP_INT_UART1_DTR 27
BSP_INT_UART1_DTR, #define BSP_INT_UART1_UARTC 28
BSP_INT_UART1_UARTC, #define BSP_INT_UART1_TX 29
BSP_INT_UART1_TX, #define BSP_INT_UART1_RX 30
BSP_INT_UART1_RX, #define BSP_INT_RES31 31
BSP_INT_RES31, #define BSP_INT_RES32 32
BSP_INT_RES32, #define BSP_INT_PEN_DATA 33
BSP_INT_PEN_DATA, #define BSP_INT_PWM 34
BSP_INT_PWM, #define BSP_INT_MMC_IRQ 35
BSP_INT_MMC_IRQ, #define BSP_INT_SSI2_TX 36
BSP_INT_SSI2_TX, #define BSP_INT_SSI2_RX 37
BSP_INT_SSI2_RX, #define BSP_INT_SSI2_ERR 38
BSP_INT_SSI2_ERR, #define BSP_INT_I2C 39
BSP_INT_I2C, #define BSP_INT_SPI2 40
BSP_INT_SPI2, #define BSP_INT_SPI1 41
BSP_INT_SPI1, #define BSP_INT_SSI_TX 42
BSP_INT_SSI_TX, #define BSP_INT_SSI_TX_ERR 43
BSP_INT_SSI_TX_ERR, #define BSP_INT_SSI_RX 44
BSP_INT_SSI_RX, #define BSP_INT_SSI_RX_ERR 45
BSP_INT_SSI_RX_ERR, #define BSP_INT_TOUCH 46
BSP_INT_TOUCH, #define BSP_INT_USBD0 47
BSP_INT_USBD0, #define BSP_INT_USBD1 48
BSP_INT_USBD1, #define BSP_INT_USBD2 49
BSP_INT_USBD2, #define BSP_INT_USBD3 50
BSP_INT_USBD3, #define BSP_INT_USBD4 51
BSP_INT_USBD4, #define BSP_INT_USBD5 52
BSP_INT_USBD5, #define BSP_INT_USBD6 53
BSP_INT_USBD6, #define BSP_INT_UART3_RX 54
BSP_INT_UART3_RX, #define BSP_INT_BTSYS 55
BSP_INT_BTSYS, #define BSP_INT_BTTIM 56
BSP_INT_BTTIM, #define BSP_INT_BTWUI 57
BSP_INT_BTWUI, #define BSP_INT_TIMER2 58
BSP_INT_TIMER2, #define BSP_INT_TIMER1 59
BSP_INT_TIMER1, #define BSP_INT_DMA_ERR 60
BSP_INT_DMA_ERR, #define BSP_INT_DMA 61
BSP_INT_DMA, #define BSP_INT_GPIO_PORTD 62
BSP_INT_GPIO_PORTD, #define BSP_INT_WDT 63
BSP_INT_WDT, #define BSP_MAX_INT 64
BSP_MAX_INT
} rtems_irq_symbolic_name;
typedef unsigned char rtems_irq_level; typedef unsigned char rtems_irq_level;
typedef unsigned char rtems_irq_trigger; typedef unsigned char rtems_irq_trigger;
typedef unsigned int rtems_irq_number;
struct __rtems_irq_connect_data__; /* forward declaratiuon */ struct __rtems_irq_connect_data__; /* forward declaratiuon */
typedef void (*rtems_irq_hdl) (void); typedef void (*rtems_irq_hdl) (void);
@@ -119,7 +117,7 @@ extern rtems_irq_hdl bsp_vector_table[BSP_MAX_INT];
typedef struct __rtems_irq_connect_data__ { typedef struct __rtems_irq_connect_data__ {
/* IRQ line */ /* IRQ line */
rtems_irq_symbolic_name name; rtems_irq_number name;
/* Handler */ /* Handler */
rtems_irq_hdl hdl; rtems_irq_hdl hdl;

View File

@@ -32,43 +32,40 @@ extern void default_int_handler();
| Constants | Constants
+--------------------------------------------------------------------------*/ +--------------------------------------------------------------------------*/
/* enum of the possible interrupt sources */ /* possible interrupt sources */
typedef enum { #define BSP_EINT0 0
BSP_EINT0 = 0, #define BSP_EINT1 1
BSP_EINT1, #define BSP_EINT2 2
BSP_EINT2, #define BSP_EINT3 3
BSP_EINT3, #define BSP_EINT4 4
BSP_EINT4, #define BSP_EINT5 5
BSP_EINT5, #define BSP_EINT6 6
BSP_EINT6, #define BSP_EINT7 7
BSP_EINT7, #define BSP_INT_TICK 8
BSP_INT_TICK, #define BSP_INT_WDT 9
BSP_INT_WDT, #define BSP_INT_TIMER0 10
BSP_INT_TIMER0, #define BSP_INT_TIMER1 11
BSP_INT_TIMER1, #define BSP_INT_TIMER2 12
BSP_INT_TIMER2, #define BSP_INT_TIMER3 13
BSP_INT_TIMER3, #define BSP_INT_TIMER4 14
BSP_INT_TIMER4, #define BSP_INT_UERR01 15
BSP_INT_UERR01, #define _res0 16
_res0, #define BSP_INT_DMA0 17
BSP_INT_DMA0, #define BSP_INT_DMA1 18
BSP_INT_DMA1, #define BSP_INT_DMA2 19
BSP_INT_DMA2, #define BSP_INT_DMA3 20
BSP_INT_DMA3, #define BSP_INT_MMC 21
BSP_INT_MMC, #define BSP_INT_SPI 22
BSP_INT_SPI, #define BSP_INT_URXD0 23
BSP_INT_URXD0, #define BSP_INT_URXD1 24
BSP_INT_URXD1, #define BSP_INT_USBD 25
BSP_INT_USBD, #define BSP_INT_USBH 26
BSP_INT_USBH, #define BSP_INT_IIC 27
BSP_INT_IIC, #define BSP_INT_UTXD0 28
BSP_INT_UTXD0, #define BSP_INT_UTXD1 29
BSP_INT_UTXD1, #define BSP_INT_RTC 30
BSP_INT_RTC, #define BSP_INT_ADC 31
BSP_INT_ADC, #define BSP_MAX_INT 32
BSP_MAX_INT
} rtems_irq_symbolic_name;
extern void *bsp_vector_table; extern void *bsp_vector_table;
#define VECTOR_TABLE &bsp_vector_table #define VECTOR_TABLE &bsp_vector_table
@@ -80,7 +77,7 @@ typedef unsigned char rtems_irq_level;
typedef unsigned char rtems_irq_trigger; typedef unsigned char rtems_irq_trigger;
struct __rtems_irq_connect_data__; /* forward declaratiuon */ struct __rtems_irq_connect_data__; /* forward declaratiuon */
typedef unsigned int rtems_irq_number;
typedef void (*rtems_irq_hdl) (void); typedef void (*rtems_irq_hdl) (void);
typedef void (*rtems_irq_enable) (const struct __rtems_irq_connect_data__*); typedef void (*rtems_irq_enable) (const struct __rtems_irq_connect_data__*);
typedef void (*rtems_irq_disable) (const struct __rtems_irq_connect_data__*); typedef void (*rtems_irq_disable) (const struct __rtems_irq_connect_data__*);
@@ -90,7 +87,7 @@ typedef struct __rtems_irq_connect_data__ {
/* /*
* IRQ line * IRQ line
*/ */
rtems_irq_symbolic_name name; rtems_irq_number name;
/* /*
* handler. See comment on handler properties below in function prototype. * handler. See comment on handler properties below in function prototype.