Changeset 071a1ddb in mainline for uspace/drv/nic/rtl8139

Timestamp:

2017-12-08T21:17:27Z (8 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/rtl8139/driver.c (modified) (3 diffs)

uspace/drv/nic/rtl8139/driver.c

@@ -842 +842 @@
  *  @param nic_data  The driver data
  *
- *  @return IRQ capability handle if the handler was registered.
+ *  @param[out] handle  IRQ capability handle if the handler was registered.
+ *
  *  @return Negative error code otherwise.
  */
-inline static int rtl8139_register_int_handler(nic_t *nic_data)
+inline static int rtl8139_register_int_handler(nic_t *nic_data, cap_handle_t *handle)
 {
         rtl8139_t *rtl8139 = nic_get_specific(nic_data);
@@ -856 +857 @@
         rtl8139_irq_code.cmds[2].addr = rtl8139->io_addr + ISR;
         rtl8139_irq_code.cmds[3].addr = rtl8139->io_addr + IMR;
-        int cap = register_interrupt_handler(nic_get_ddf_dev(nic_data),
-            rtl8139->irq, rtl8139_interrupt_handler, &rtl8139_irq_code);
+        int rc = register_interrupt_handler(nic_get_ddf_dev(nic_data),
+            rtl8139->irq, rtl8139_interrupt_handler, &rtl8139_irq_code, handle);
 
         RTL8139_IRQ_STRUCT_UNLOCK();
 
-        return cap;
+        return rc;
 }
 
@@ -1287 +1288 @@
 
         /* Register interrupt handler */
-        int irq_cap = rtl8139_register_int_handler(nic_data);
-        if (irq_cap < 0) {
-                rc = irq_cap;
+        int irq_cap;
+        rc = rtl8139_register_int_handler(nic_data, &irq_cap);
+        if (rc != EOK) {
                 goto err_pio;
         }