Changeset e9d15d9 in mainline for uspace/drv/nic/rtl8169/driver.c

Timestamp:

2017-08-18T21:15:26Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

24abb85d

Parents:

1c85bae

Message:

Turn IRQ structures into kernel objects

ipc_irq_subscribe() now returns a capability for the underlying IRQ kernel
object. ipc_irq_unsubscribe() can now be done only with a valid IRQ capability.

File:

• uspace/drv/nic/rtl8169/driver.c (modified) (3 diffs)

uspace/drv/nic/rtl8169/driver.c

@@ -371 +371 @@
         rtl8169_irq_code.cmds[2].addr = rtl8169->regs + ISR;
         rtl8169_irq_code.cmds[3].addr = rtl8169->regs + IMR;
-        int rc = register_interrupt_handler(nic_get_ddf_dev(nic_data),
+        int irq_cap = register_interrupt_handler(nic_get_ddf_dev(nic_data),
             rtl8169->irq, rtl8169_irq_handler, &rtl8169_irq_code);
 
-        return rc;
+        return irq_cap;
 }
 
@@ -426 +426 @@
                 goto err_pio;
 
-        rc = rtl8169_register_int_handler(nic_data);
-        if (rc != EOK) {
+        int irq_cap = rtl8169_register_int_handler(nic_data);
+        if (irq_cap < 0) {
+                rc = irq_cap;
                 ddf_msg(LVL_ERROR, "Failed to register IRQ handler (%d)", rc);
                 goto err_irq;
-
         }
 
@@ -469 +469 @@
 err_srv:
         /* XXX Disconnect from services */
+        unregister_interrupt_handler(dev, irq_cap);
 err_irq:
-        //unregister_interrupt_handler(dev, rtl8169->irq);
 err_pio:
 err_destroy: