diff options
| author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2012-05-08 13:25:44 -0500 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2012-05-09 16:56:35 -0500 |
| commit | 541c5ddcb011385460e3df8a6b914b8c1c8370e1 (patch) | |
| tree | 952f78519bd056e6ceef9bcdd2cfc8295c405eac | |
| parent | libchip/serial - Only use set_vector() on Simple Vectored Architectures (diff) | |
| download | rtems-541c5ddcb011385460e3df8a6b914b8c1c8370e1.tar.bz2 | |
csb350 - Eliminate any set_vector() remnants
| -rw-r--r-- | c/src/lib/libbsp/mips/csb350/include/bsp.h | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/mips/csb350/network/network.c | 16 |
2 files changed, 14 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/mips/csb350/include/bsp.h b/c/src/lib/libbsp/mips/csb350/include/bsp.h index 5044f6fcaa..1f555216b0 100644 --- a/c/src/lib/libbsp/mips/csb350/include/bsp.h +++ b/c/src/lib/libbsp/mips/csb350/include/bsp.h @@ -44,11 +44,6 @@ int rtems_au1x00_emac_attach(struct rtems_bsdnet_ifconfig *config, #define RTEMS_BSP_NETWORK_DRIVER_NAME "eth0" #define RTEMS_BSP_NETWORK_DRIVER_ATTACH rtems_au1x00_emac_attach -/* functions */ - -rtems_isr_entry set_vector( - rtems_isr_entry, rtems_vector_number, int ); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/mips/csb350/network/network.c b/c/src/lib/libbsp/mips/csb350/network/network.c index 6183aebe61..f31029962d 100644 --- a/c/src/lib/libbsp/mips/csb350/network/network.c +++ b/c/src/lib/libbsp/mips/csb350/network/network.c @@ -337,9 +337,21 @@ void au1x00_emac_init(void *arg) /* install the interrupt handler */ if (sc->unitnumber == 0) { - set_vector(au1x00_emac_isr, AU1X00_IRQ_MAC0, 1); + rtems_interrupt_handler_install( + AU1X00_IRQ_MAC0, + "NIC0", + 0, + (rtems_interrupt_handler)au1x00_emac_isr, + NULL + ); } else { - set_vector(au1x00_emac_isr, AU1X00_IRQ_MAC1, 1); + rtems_interrupt_handler_install( + AU1X00_IRQ_MAC1, + "NIC1", + 0, + (rtems_interrupt_handler)au1x00_emac_isr, + NULL + ); } AU1X00_IC_MASKCLR(sc->int_ctrlr) = sc->int_mask; au_sync(); |