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/rtl22xx | |
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 '')
-rw-r--r-- | c/src/lib/libbsp/arm/rtl22xx/ChangeLog | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/rtl22xx/network/network.c | 15 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c | 1 |
3 files changed, 13 insertions, 8 deletions
diff --git a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog index a81d2b2f51..b9e14fe895 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog +++ b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog @@ -1,3 +1,8 @@ +2010-04-09 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> + + * network/network.c, startup/bspstart.c: make + irq data types consistent + 2010-04-07 Joel Sherrill <joel.sherrill@oarcorp.com> * include/bsp.h: Rename poorly named define "M" to "JOEL_M" since diff --git a/c/src/lib/libbsp/arm/rtl22xx/network/network.c b/c/src/lib/libbsp/arm/rtl22xx/network/network.c index 6777bbf1a5..d2bdf832dc 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/network/network.c +++ b/c/src/lib/libbsp/arm/rtl22xx/network/network.c @@ -8,20 +8,19 @@ unsigned int bsp_cs8900_io_base = 0; unsigned int bsp_cs8900_memory_base = 0; cs8900_device *g_cs; -rtems_isr cs8900_isr(rtems_vector_number v); +void cs8900_isr(rtems_irq_hdl_param unused); rtems_irq_connect_data cs8900_isr_data = {LPC22xx_INTERRUPT_EINT2, (rtems_irq_hdl)cs8900_isr, - NULL, - NULL, - NULL, - 0, - 0 }; + NULL, + NULL, + NULL, + NULL}; char g_enetbuf[1520]; -rtems_isr cs8900_isr(rtems_vector_number v) +void cs8900_isr(rtems_irq_hdl_param unused) { - cs8900_interrupt(v, g_cs); + cs8900_interrupt(LPC22xx_INTERRUPT_EINT2, g_cs); } /* cs8900_io_set_reg - set one of the I/O addressed registers */ diff --git a/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c b/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c index 39824fac30..bb741130a0 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c @@ -17,6 +17,7 @@ * Function prototypes */ extern void rtems_irq_mngt_init(void); +extern void rtems_exception_init_mngt(void); extern void UART0_Ini(void); extern void printi(unsigned long); |