RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2005-05-05 Jennifer Averett <jennifer.averett@oarcorp.com>

Browse Source 
* irq/irq_init.c, network/network.c: Fix calls/routines to match
	prototypes. Modified when a parameter was added to ISRs.
This commit is contained in:
Jennifer Averett
2005-05-05 19:35:38 +00:00
parent 20b21beb02
commit 702919b54e
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
View File

@@ -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> 2005-05-04 Jennifer Averett <jennifer.averett@oarcorp.com>
* clock/p_clock.c, irq/irq.c, irq/irq_init.c: Addition of a parameter * clock/p_clock.c, irq/irq.c, irq/irq_init.c: Addition of a parameter

4
c/src/lib/libbsp/powerpc/mbx8xx/irq/irq_init.c
View File

@@ -144,8 +144,8 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)
vectorDesc.hdl.vector = ASM_DEC_VECTOR; vectorDesc.hdl.vector = ASM_DEC_VECTOR;
vectorDesc.hdl.raw_hdl = decrementer_exception_vector_prolog_code; vectorDesc.hdl.raw_hdl = decrementer_exception_vector_prolog_code;
vectorDesc.hdl.raw_hdl_size = (unsigned) &decrementer_exception_vector_prolog_code_size; vectorDesc.hdl.raw_hdl_size = (unsigned) &decrementer_exception_vector_prolog_code_size;
vectorDesc.on = nop_func; vectorDesc.on = nop_func2;
vectorDesc.off = nop_func; vectorDesc.off = nop_func2;
vectorDesc.isOn = connected; vectorDesc.isOn = connected;
if (!mpc8xx_set_exception (&vectorDesc)) { if (!mpc8xx_set_exception (&vectorDesc)) {
BSP_panic("Unable to initialize RTEMS decrementer raw exception\n"); BSP_panic("Unable to initialize RTEMS decrementer raw exception\n");

5
c/src/lib/libbsp/powerpc/mbx8xx/network/network.c
View File

@@ -146,7 +146,7 @@ static void m8xx_scc1_ethernet_isOn(const rtems_irq_connect_data* ptr)
/* /*
* SCC1 interrupt handler * SCC1 interrupt handler
*/ */
static void m8xx_scc1_interrupt_handler () static void m8xx_scc1_interrupt_handler (void *unused)
{ {
/* Frame received? */ /* Frame received? */
if ((m8xx.scc1.sccm & 0x8) && (m8xx.scc1.scce & 0x8)) { 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 = { static rtems_irq_connect_data ethernetSCC1IrqData = {
BSP_CPM_IRQ_SCC1, BSP_CPM_IRQ_SCC1,
(rtems_irq_hdl) m8xx_scc1_interrupt_handler, (rtems_irq_hdl) m8xx_scc1_interrupt_handler,
0,
(rtems_irq_enable) m8xx_scc1_ethernet_on, (rtems_irq_enable) m8xx_scc1_ethernet_on,
(rtems_irq_disable) m8xx_scc1_ethernet_off, (rtems_irq_disable) m8xx_scc1_ethernet_off,
(rtems_irq_is_enabled)m8xx_scc1_ethernet_isOn (rtems_irq_is_enabled)m8xx_scc1_ethernet_isOn
@@ -1426,7 +1427,7 @@ enet_stats (struct m8xx_enet_struct *sc)
* Driver ioctl handler * Driver ioctl handler
*/ */
static int 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; struct m8xx_enet_struct *sc = ifp->if_softc;
int error = 0; int error = 0;