Changeset e5424e9 in mainline for uspace/drv/nic/rtl8139/driver.c

Timestamp:

2014-07-18T08:50:36Z (10 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.

File:

• uspace/drv/nic/rtl8139/driver.c (modified) (2 diffs)

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)