Changeset 77c2178 in rtems

Timestamp:

Jan 31, 2012, 10:23:26 AM (9 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

41572c4

Parents:

be42aa1a

git-author:

Sebastian Huber <sebastian.huber@…> (01/31/12 10:23:26)

git-committer:

Sebastian Huber <sebastian.huber@…> (01/31/12 10:25:15)

Message:

Fixed race condition during startup.

File:

• c/src/libchip/network/if_fxp.c (modified) (3 diffs)

c/src/libchip/network/if_fxp.c

@@ -586 +586 @@
         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.
@@ -1672 +1661 @@
         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);
@@ -1898 +1887 @@
                 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.