diff options
| author | Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> | 2010-04-09 20:24:57 +0000 |
|---|---|---|
| committer | Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> | 2010-04-09 20:24:57 +0000 |
| commit | c193baadaf4ba825374104b150eceaed203800b0 (patch) | |
| tree | 6933fe6b62789da022c05b5400f36cd2d7b80a57 /c/src/lib/libbsp/arm/csb337 | |
| parent | removed over-paranoid warning switches (diff) | |
| download | rtems-c193baadaf4ba825374104b150eceaed203800b0.tar.bz2 | |
unify irq data types and code, merge s3c2400/s3c2410 support
Diffstat (limited to 'c/src/lib/libbsp/arm/csb337')
| -rw-r--r-- | c/src/lib/libbsp/arm/csb337/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/csb337/network/network.c | 12 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/csb337/startup/bspstart.c | 1 |
3 files changed, 12 insertions, 6 deletions
diff --git a/c/src/lib/libbsp/arm/csb337/ChangeLog b/c/src/lib/libbsp/arm/csb337/ChangeLog index 1794020b1a..10bd660acf 100644 --- a/c/src/lib/libbsp/arm/csb337/ChangeLog +++ b/c/src/lib/libbsp/arm/csb337/ChangeLog @@ -1,3 +1,8 @@ +2010-04-09 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> + + * startup/bspstart.c, network/network.c: make irq data types + consistent + 2009-12-08 Fernando Nicodemos <fgnicodemos@terra.com.br> * console/font8x16.h, console/sed1356.c: Fix typos. diff --git a/c/src/lib/libbsp/arm/csb337/network/network.c b/c/src/lib/libbsp/arm/csb337/network/network.c index 34f8a7b5bc..e16b646035 100644 --- a/c/src/lib/libbsp/arm/csb337/network/network.c +++ b/c/src/lib/libbsp/arm/csb337/network/network.c @@ -84,7 +84,7 @@ /* RTEMS event used to start transmit daemon. */ #define START_TRANSMIT_EVENT RTEMS_EVENT_2 -rtems_isr at91rm9200_emac_isr(rtems_vector_number vector); +static void at91rm9200_emac_isr (rtems_irq_hdl_param unused); static void at91rm9200_emac_isr_on(const rtems_irq_connect_data *unused); static void at91rm9200_emac_isr_off(const rtems_irq_connect_data *unused); static int at91rm9200_emac_isr_is_on(const rtems_irq_connect_data *irq); @@ -92,12 +92,12 @@ static int at91rm9200_emac_isr_is_on(const rtems_irq_connect_data *irq); /* Replace the first value with the clock's interrupt name. */ rtems_irq_connect_data at91rm9200_emac_isr_data = { AT91RM9200_INT_EMAC, - (rtems_irq_hdl)at91rm9200_emac_isr, + at91rm9200_emac_isr, + NULL, at91rm9200_emac_isr_on, at91rm9200_emac_isr_off, - at91rm9200_emac_isr_is_on, - 3, /* unused for ARM */ - 0 }; /* unused for ARM */ + at91rm9200_emac_isr_is_on +}; /* use the values defined in linkcmds for our use of SRAM */ @@ -847,7 +847,7 @@ at91rm9200_emac_ioctl (struct ifnet *ifp, ioctl_command_t command, caddr_t data) } /* interrupt handler */ -rtems_isr at91rm9200_emac_isr (rtems_vector_number v) +static void at91rm9200_emac_isr (rtems_irq_hdl_param unused) { unsigned long status32; diff --git a/c/src/lib/libbsp/arm/csb337/startup/bspstart.c b/c/src/lib/libbsp/arm/csb337/startup/bspstart.c index 5857d04429..9546ceadbd 100644 --- a/c/src/lib/libbsp/arm/csb337/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/csb337/startup/bspstart.c @@ -25,6 +25,7 @@ /* Function prototypes */ extern void rtems_irq_mngt_init(void); +extern void rtems_exception_init_mngt(void); void bsp_libc_init( void *, uint32_t, int ); static void fix_mac_addr(void); void bsp_usart_init(void); |