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/gumstix | |
| 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/gumstix')
| -rw-r--r-- | c/src/lib/libbsp/arm/gumstix/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/arm/gumstix/ChangeLog b/c/src/lib/libbsp/arm/gumstix/ChangeLog index 857cca8d15..f3661ad819 100644 --- a/c/src/lib/libbsp/arm/gumstix/ChangeLog +++ b/c/src/lib/libbsp/arm/gumstix/ChangeLog @@ -1,3 +1,7 @@ +2010-04-09 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> + + * rtl8019/rtl8019.c: make irq data types consistent + 2010-04-07 Joel Sherrill <joel.sherrill@oarcorp.com> * start/start.S: Verify boot_card() is passed a NULL. diff --git a/c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c b/c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c index 4754e0e67e..ab1f5378f4 100644 --- a/c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c +++ b/c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c @@ -352,12 +352,10 @@ ne_check_status (struct ne_softc *sc, int from_irq_handler) /* Handle an NE2000 interrupt. */ static void -ne_interrupt_handler (uint32_t cdata) +ne_interrupt_handler (rtems_irq_hdl_param handle) { - rtems_vector_number v = (rtems_vector_number) cdata; - struct ne_softc *sc; + struct ne_softc *sc = handle; - sc = ne_device_for_irno (v); if (sc == NULL) return; @@ -502,15 +500,16 @@ ne_init_hardware (struct ne_softc *sc) /* Set up interrupts. */ static void -ne_init_irq_handler(int irno) +ne_init_irq_handler(ne_softc *sc) { rtems_irq_connect_data irq; #ifdef DEBUG_NE printk("ne_init_irq_handler(%d)\n", irno); #endif - irq.name = irno; + irq.name = sc->irno; irq.hdl = ne_interrupt_handler; + irq.handle = sc; irq.on = ne_interrupt_on; irq.off = ne_interrupt_off; irq.isOn = ne_interrupt_is_on; @@ -976,7 +975,7 @@ ne_init (void *arg) sc->rx_daemon_tid = rtems_bsdnet_newproc ("SCrx", 4096, ne_rx_daemon, sc); /* install rtems irq handler */ - ne_init_irq_handler(sc->irno); + ne_init_irq_handler(sc); } ifp->if_flags |= IFF_RUNNING; |