Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-08-29 19:57:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed race condition during startup.

Browse Source
This commit is contained in:
Sebastian Huber
2012-01-31 11:25:15 +01:00
parent be42aa1aef
commit 77c2178501
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
c/src/libchip/network/if_fxp.c
+14 -12
View File
@@ -585,17 +585,6 @@ rtems_fxp_attach(struct rtems_bsdnet_ifconfig *config, int attaching)
pcib_conf_read8(sc->pci_signature, 60, &interrupt);
DBGLVL_PRINTK(3,"fxp_attach: interrupt = 0x%x\n",interrupt);
sc->irqInfo.name = (rtems_irq_number)interrupt;
/*
* Set up interrupts
*/
sc->irqInfo.hdl = (rtems_irq_hdl)fxp_intr;
sc->irqInfo.on = nopOn;
sc->irqInfo.off = nopOn;
sc->irqInfo.isOn = fxpIsOn;
s = BSP_install_rtems_irq_handler (&sc->irqInfo);
if (!s)
rtems_panic ("Can't attach fxp interrupt handler for irq %d\n",
sc->irqInfo.name);
/*
* Reset to a stable state.
CSR_WRITE_4(sc, FXP_CSR_PORT, FXP_PORT_SELECTIVE_RESET);
@@ -1671,7 +1660,7 @@ fxp_init(void *xsc)
struct fxp_cb_config *cbp;
struct fxp_cb_ias *cb_ias;
struct fxp_cb_tx *txp;
int i, prm, s;
int i, prm, s, rv;
rtems_task_wake_after(100);
DBGLVL_PRINTK(2,"fxp_init called\n");
@@ -1897,7 +1886,20 @@ rtems_task_wake_after(100);
*/
sc->daemonTid = rtems_bsdnet_newproc ("FXPd", 4096, fxp_daemon, sc);
/*
* Set up interrupts
*/
sc->irqInfo.hdl = (rtems_irq_hdl)fxp_intr;
sc->irqInfo.on = nopOn;
sc->irqInfo.off = nopOn;
sc->irqInfo.isOn = fxpIsOn;
rv = BSP_install_rtems_irq_handler (&sc->irqInfo);
if (rv != 1) {
rtems_panic ("Can't attach fxp interrupt handler for irq %d\n",
sc->irqInfo.name);
}
}
/*
* Enable interrupts.
*/