diff options
| author | Jennifer Averett <Jennifer.Averett@OARcorp.com> | 2005-05-05 19:35:38 +0000 |
|---|---|---|
| committer | Jennifer Averett <Jennifer.Averett@OARcorp.com> | 2005-05-05 19:35:38 +0000 |
| commit | 702919b54ee4a12125460139b530c75cd5477eb5 (patch) | |
| tree | 94a0f4a96cf6dc7e601356515d8cf6bb438649df /c/src/lib/libbsp/powerpc | |
| parent | 2005-05-05 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-702919b54ee4a12125460139b530c75cd5477eb5.tar.bz2 | |
2005-05-05 Jennifer Averett <jennifer.averett@oarcorp.com>
* irq/irq_init.c, network/network.c: Fix calls/routines to match
prototypes. Modified when a parameter was added to ISRs.
Diffstat (limited to 'c/src/lib/libbsp/powerpc')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mbx8xx/irq/irq_init.c | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mbx8xx/network/network.c | 5 |
3 files changed, 10 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog index 24047b3ba7..23a1010281 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog @@ -1,3 +1,8 @@ +2005-05-05 Jennifer Averett <jennifer.averett@oarcorp.com> + + * irq/irq_init.c, network/network.c: Fix calls/routines to match + prototypes. Modified when a parameter was added to ISRs. + 2005-05-04 Jennifer Averett <jennifer.averett@oarcorp.com> * clock/p_clock.c, irq/irq.c, irq/irq_init.c: Addition of a parameter diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq_init.c b/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq_init.c index 34bb02aab6..5f21095e37 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq_init.c +++ b/c/src/lib/libbsp/powerpc/mbx8xx/irq/irq_init.c @@ -144,8 +144,8 @@ void BSP_rtems_irq_mng_init(unsigned cpuId) vectorDesc.hdl.vector = ASM_DEC_VECTOR; vectorDesc.hdl.raw_hdl = decrementer_exception_vector_prolog_code; vectorDesc.hdl.raw_hdl_size = (unsigned) &decrementer_exception_vector_prolog_code_size; - vectorDesc.on = nop_func; - vectorDesc.off = nop_func; + vectorDesc.on = nop_func2; + vectorDesc.off = nop_func2; vectorDesc.isOn = connected; if (!mpc8xx_set_exception (&vectorDesc)) { BSP_panic("Unable to initialize RTEMS decrementer raw exception\n"); diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/network/network.c b/c/src/lib/libbsp/powerpc/mbx8xx/network/network.c index 1ae82edaf0..e71d84b7ba 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/network/network.c +++ b/c/src/lib/libbsp/powerpc/mbx8xx/network/network.c @@ -146,7 +146,7 @@ static void m8xx_scc1_ethernet_isOn(const rtems_irq_connect_data* ptr) /* * SCC1 interrupt handler */ -static void m8xx_scc1_interrupt_handler () +static void m8xx_scc1_interrupt_handler (void *unused) { /* Frame received? */ if ((m8xx.scc1.sccm & 0x8) && (m8xx.scc1.scce & 0x8)) { @@ -194,6 +194,7 @@ static void m860_fec_interrupt_handler () static rtems_irq_connect_data ethernetSCC1IrqData = { BSP_CPM_IRQ_SCC1, (rtems_irq_hdl) m8xx_scc1_interrupt_handler, + 0, (rtems_irq_enable) m8xx_scc1_ethernet_on, (rtems_irq_disable) m8xx_scc1_ethernet_off, (rtems_irq_is_enabled)m8xx_scc1_ethernet_isOn @@ -1426,7 +1427,7 @@ enet_stats (struct m8xx_enet_struct *sc) * Driver ioctl handler */ static int -scc_ioctl (struct ifnet *ifp, int command, caddr_t data) +scc_ioctl (struct ifnet *ifp, u_long command, caddr_t data) { struct m8xx_enet_struct *sc = ifp->if_softc; int error = 0; |