Changeset eadaeae8 in mainline for uspace/drv/nic

Timestamp:

2018-03-21T20:58:49Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3be9d10

Parents:

874381a

Message:

Make capability handles type-safe

Define distinct pointer types for the handles of the supported
capability types and use them instead of integer handles. This makes it
virtually impossible to pass a non-handle or a handle of different type
instead of the proper handle. Also turn cap_handle_t into an "untyped"
capability handle that can be assigned to and from the "typed" handles.

This commit also fixes a bug in msim-con driver, which wrongly used the
IRQ number instead of the IRQ capability handle to unregister the IRQ.

This commit also fixes the wrong use of the capability handle instead
of error code in libusbhost.

Location:

uspace/drv/nic

Files:

• e1k/e1k.c (modified) (3 diffs)
• ne2k/ne2k.c (modified) (1 diff)
• rtl8139/driver.c (modified) (3 diffs)
• rtl8169/driver.c (modified) (4 diffs)

uspace/drv/nic/e1k/e1k.c

@@ -1264 +1264 @@
  *
  */
-inline static errno_t e1000_register_int_handler(nic_t *nic, cap_handle_t *handle)
+inline static errno_t e1000_register_int_handler(nic_t *nic,
+    cap_irq_handle_t *handle)
 {
         e1000_t *e1000 = DRIVER_DATA_NIC(nic);
@@ -2165 +2166 @@
         ddf_fun_set_ops(fun, &e1000_dev_ops);
 
-        int irq_cap;
-        rc = e1000_register_int_handler(nic, &irq_cap);
+        cap_irq_handle_t irq_handle;
+        rc = e1000_register_int_handler(nic, &irq_handle);
         if (rc != EOK) {
                 goto err_fun_create;
@@ -2204 +2205 @@
         e1000_uninitialize_rx_structure(nic);
 err_irq:
-        unregister_interrupt_handler(dev, irq_cap);
+        unregister_interrupt_handler(dev, irq_handle);
 err_fun_create:
         ddf_fun_destroy(fun);

uspace/drv/nic/ne2k/ne2k.c

@@ -124 +124 @@
 static void ne2k_interrupt_handler(ipc_call_t *, ddf_dev_t *);
 
-static errno_t ne2k_register_interrupt(nic_t *nic_data, cap_handle_t *handle)
+static errno_t ne2k_register_interrupt(nic_t *nic_data,
+    cap_irq_handle_t *handle)
 {
         ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);

uspace/drv/nic/rtl8139/driver.c

@@ -846 +846 @@
  *  @return An error code otherwise.
  */
-inline static errno_t rtl8139_register_int_handler(nic_t *nic_data, cap_handle_t *handle)
+inline static errno_t rtl8139_register_int_handler(nic_t *nic_data,
+    cap_irq_handle_t *handle)
 {
         rtl8139_t *rtl8139 = nic_get_specific(nic_data);
@@ -1288 +1289 @@
 
         /* Register interrupt handler */
-        int irq_cap;
-        rc = rtl8139_register_int_handler(nic_data, &irq_cap);
+        cap_irq_handle_t irq_handle;
+        rc = rtl8139_register_int_handler(nic_data, &irq_handle);
         if (rc != EOK) {
                 goto err_pio;
@@ -1324 +1325 @@
         ddf_fun_destroy(fun);
 err_srv:
-        unregister_interrupt_handler(dev, irq_cap);
+        unregister_interrupt_handler(dev, irq_handle);
 err_pio:
         // rtl8139_pio_disable(dev);

uspace/drv/nic/rtl8169/driver.c

@@ -75 +75 @@
 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 errno_t rtl8169_register_int_handler(nic_t *nic_data, cap_handle_t *handle);
+static inline errno_t rtl8169_register_int_handler(nic_t *nic_data,
+    cap_irq_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);
@@ -361 +362 @@
 }
 
-inline static errno_t rtl8169_register_int_handler(nic_t *nic_data, cap_handle_t *handle)
+inline static errno_t rtl8169_register_int_handler(nic_t *nic_data,
+    cap_irq_handle_t *handle)
 {
         rtl8169_t *rtl8169 = nic_get_specific(nic_data);
@@ -429 +431 @@
                 goto err_pio;
 
-        int irq_cap;
-        rc = rtl8169_register_int_handler(nic_data, &irq_cap);
+        cap_irq_handle_t irq_handle;
+        rc = rtl8169_register_int_handler(nic_data, &irq_handle);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed to register IRQ handler (%s)", str_error_name(rc));
@@ -472 +474 @@
 err_srv:
         /* XXX Disconnect from services */
-        unregister_interrupt_handler(dev, irq_cap);
+        unregister_interrupt_handler(dev, irq_handle);
 err_irq:
 err_pio: