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

Timestamp:

2017-12-08T21:17:27Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

0722869, 569a51a

Parents:

9233e9d

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 00:30:18)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 21:17:27)

Message:

Return IRQ handles via a separate out parameter in all uspace code.

File:

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

uspace/drv/nic/rtl8169/driver.c

@@ -73 +73 @@
 static void rtl8169_send_frame(nic_t *nic_data, void *data, size_t size);
 static void rtl8169_irq_handler(ipc_call_t *icall, ddf_dev_t *dev);
-static inline int rtl8169_register_int_handler(nic_t *nic_data);
+static inline int rtl8169_register_int_handler(nic_t *nic_data, cap_handle_t *handle);
 static inline void rtl8169_get_hwaddr(rtl8169_t *rtl8169, nic_address_t *addr);
 static inline void rtl8169_set_hwaddr(rtl8169_t *rtl8169, const nic_address_t *addr);
@@ -359 +359 @@
 }
 
-inline static int rtl8169_register_int_handler(nic_t *nic_data)
+inline static int rtl8169_register_int_handler(nic_t *nic_data, cap_handle_t *handle)
 {
         rtl8169_t *rtl8169 = nic_get_specific(nic_data);
@@ -367 +367 @@
         rtl8169_irq_code.cmds[2].addr = rtl8169->regs + ISR;
         rtl8169_irq_code.cmds[3].addr = rtl8169->regs + IMR;
-        int irq_cap = register_interrupt_handler(nic_get_ddf_dev(nic_data),
-            rtl8169->irq, rtl8169_irq_handler, &rtl8169_irq_code);
-
-        return irq_cap;
+        int rc = register_interrupt_handler(nic_get_ddf_dev(nic_data),
+            rtl8169->irq, rtl8169_irq_handler, &rtl8169_irq_code, handle);
+
+        return rc;
 }
 
@@ -427 +427 @@
                 goto err_pio;
 
-        int irq_cap = rtl8169_register_int_handler(nic_data);
-        if (irq_cap < 0) {
-                rc = irq_cap;
+        int irq_cap;
+        rc = rtl8169_register_int_handler(nic_data, &irq_cap);
+        if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed to register IRQ handler (%d)", rc);
                 goto err_irq;