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

Timestamp:

2017-09-30T06:29:42Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

300f4c4

Parents:

d076f16 (diff), 6636fb19 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge support for capabilities from lp:~jakub/helenos/caps

This commit introduces capabilities as task-local names for references to kernel
objects. Kernel objects are reference-counted wrappers for a select group of
objects allocated in and by the kernel that can be made accessible to userspace
in a controlled way via integer handles.

So far, a kernel object encapsulates either an irq_t or a phone_t.

Support for the former lead to the removal of kernel-assigned devnos and
unsecure deregistration of IRQs in which a random task was able to unregister
some other task's IRQ.

File:

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

uspace/drv/nic/rtl8139/driver.c

@@ -881 +881 @@
  *  @param nic_data  The driver data
  *
- *  @return EOK if the handler was registered, negative error code otherwise
+ *  @return IRQ capability handle if the handler was registered.
+ *  @return Negative error code otherwise.
  */
 inline static int rtl8139_register_int_handler(nic_t *nic_data)
@@ -894 +895 @@
         rtl8139_irq_code.cmds[2].addr = rtl8139->io_addr + ISR;
         rtl8139_irq_code.cmds[3].addr = rtl8139->io_addr + IMR;
-        int rc = register_interrupt_handler(nic_get_ddf_dev(nic_data),
+        int cap = register_interrupt_handler(nic_get_ddf_dev(nic_data),
             rtl8139->irq, rtl8139_interrupt_handler, &rtl8139_irq_code);
 
         RTL8139_IRQ_STRUCT_UNLOCK();
 
-        return rc;
+        return cap;
 }
 
@@ -1321 +1322 @@
 
         /* Register interrupt handler */
-        rc = rtl8139_register_int_handler(nic_data);
-        if (rc != EOK)
+        int irq_cap = rtl8139_register_int_handler(nic_data);
+        if (irq_cap < 0) {
+                rc = irq_cap;
                 goto err_pio;
+        }
 
         fun = ddf_fun_create(nic_get_ddf_dev(nic_data), fun_exposed, "port0");
@@ -1355 +1358 @@
         ddf_fun_destroy(fun);
 err_srv:
-        unregister_interrupt_handler(dev, rtl8139->irq);
+        unregister_interrupt_handler(dev, irq_cap);
 err_pio:
         // rtl8139_pio_disable(dev);