Changeset e5424e9 in mainline for uspace/drv/nic

Timestamp:

2014-07-18T08:50:36Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ebc9c2c

Parents:

869d936

Message:

Defer connecting IRC service until actually needed. This allows the driver to be loaded even in its absence.

Location:

uspace/drv/nic

Files:

• e1k/e1k.c (modified) (2 diffs)
• ne2k/ne2k.c (modified) (3 diffs)
• rtl8139/driver.c (modified) (2 diffs)

uspace/drv/nic/e1k/e1k.c

@@ -1756 +1756 @@
         e1000_enable_interrupts(e1000);
         
-        irc_enable_interrupt(e1000->irq);
+        int rc = irc_enable_interrupt(e1000->irq);
+        if (rc != EOK) {
+                e1000_disable_interrupts(e1000);
+                fibril_mutex_unlock(&e1000->ctrl_lock);
+                fibril_mutex_unlock(&e1000->tx_lock);
+                fibril_mutex_unlock(&e1000->rx_lock);
+                return rc;
+        }
         
         e1000_clear_rx_ring(e1000);
@@ -2375 +2382 @@
         printf("%s: HelenOS E1000 network adapter driver\n", NAME);
         
-        if (irc_init() != EOK) {
-                printf("%s: Failed connecting IRC service\n", NAME);
-                return 1;
-        }
-        
         if (nic_driver_init(NAME) != EOK)
                 return 1;

uspace/drv/nic/ne2k/ne2k.c

@@ -257 +257 @@
         if (!ne2k->up) {
                 int rc = ne2k_up(ne2k);
+                if (rc != EOK)
+                        return rc;
+
+                rc = irc_enable_interrupt(ne2k->irq);
                 if (rc != EOK) {
+                        ne2k_down(ne2k);
                         return rc;
                 }
-
-                irc_enable_interrupt(ne2k->irq);
         }
         return EOK;
@@ -270 +273 @@
         ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);
 
-        irc_disable_interrupt(ne2k->irq);
+        (void) irc_disable_interrupt(ne2k->irq);
         ne2k->receive_configuration = RCR_AB | RCR_AM;
         ne2k_down(ne2k);
@@ -440 +443 @@
         printf("%s: HelenOS NE 2000 network adapter driver\n", NAME);
         
-        if (irc_init() != EOK) {
-                printf("%s: Failed connecting IRC service\n", NAME);
-                return 1;
-        }
-        
         nic_driver_init(NAME);
         nic_driver_implement(&ne2k_driver_ops, &ne2k_dev_ops, &ne2k_nic_iface);

uspace/drv/nic/rtl8139/driver.c

@@ -956 +956 @@
         rtl8139->int_mask = RTL_DEFAULT_INTERRUPTS;
         rtl8139_hw_int_enable(rtl8139);
-        irc_enable_interrupt(rtl8139->irq);
+
+        int rc = irc_enable_interrupt(rtl8139->irq);
+        if (rc != EOK) {
+                rtl8139_on_stopped(nic_data);
+                return rc;
+        }
 
         ddf_msg(LVL_DEBUG, "Device activated, interrupt %d registered", rtl8139->irq);
@@ -2170 +2175 @@
         printf("%s: HelenOS RTL8139 network adapter driver\n", NAME);
 
-        if (irc_init() != EOK) {
-                printf("%s: Failed connecting IRC service\n", NAME);
-                return 1;
-        }
-
         int rc = nic_driver_init(NAME);
         if (rc != EOK)