Changes in uspace/drv/nic/ne2k/ne2k.c [b7fd2a0:01c3bb4] in mainline

File:

• uspace/drv/nic/ne2k/ne2k.c (modified) (13 diffs)

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 int ne2k_register_interrupt(nic_t *nic_data)
 {
         ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);
@@ -160 +160 @@
         }
 
-        return register_interrupt_handler(nic_get_ddf_dev(nic_data),
-                ne2k->irq, ne2k_interrupt_handler, &ne2k->code, handle);
+        int irq_cap = register_interrupt_handler(nic_get_ddf_dev(nic_data),
+                ne2k->irq, ne2k_interrupt_handler, &ne2k->code);
+        return irq_cap;
 }
 
@@ -178 +179 @@
 }
 
-static errno_t ne2k_dev_init(nic_t *nic_data)
+static int ne2k_dev_init(nic_t *nic_data)
 {
         /* Get HW resources */
@@ -184 +185 @@
         hw_res_list_parsed_init(&hw_res_parsed);
         
-        errno_t rc = nic_get_resources(nic_data, &hw_res_parsed);
+        int rc = nic_get_resources(nic_data, &hw_res_parsed);
         
         if (rc != EOK)
@@ -227 +228 @@
         ne2k->probed = true;
         
-        if (ne2k_register_interrupt(nic_data, NULL) != EOK)
+        int irq_cap = ne2k_register_interrupt(nic_data);
+        if (irq_cap < 0)
                 return EINVAL;
         
@@ -243 +245 @@
 }
 
-static errno_t ne2k_on_activating(nic_t *nic_data)
+static int ne2k_on_activating(nic_t *nic_data)
 {
         ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);
 
         if (!ne2k->up) {
-                errno_t rc = ne2k_up(ne2k);
+                int rc = ne2k_up(ne2k);
                 if (rc != EOK)
                         return rc;
@@ -261 +263 @@
 }
 
-static errno_t ne2k_on_stopping(nic_t *nic_data)
+static int ne2k_on_stopping(nic_t *nic_data)
 {
         ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);
@@ -271 +273 @@
 }
 
-static errno_t ne2k_set_address(ddf_fun_t *fun, const nic_address_t *address)
+static int ne2k_set_address(ddf_fun_t *fun, const nic_address_t *address)
 {
         nic_t *nic_data = DRIVER_DATA(ddf_fun_get_dev(fun));
-        errno_t rc = nic_report_address(nic_data, address);
+        int rc = nic_report_address(nic_data, address);
         if (rc != EOK) {
                 return EINVAL;
@@ -286 +288 @@
 }
 
-static errno_t ne2k_on_unicast_mode_change(nic_t *nic_data,
+static int ne2k_on_unicast_mode_change(nic_t *nic_data,
         nic_unicast_mode_t new_mode,
         const nic_address_t *address_list, size_t address_count)
@@ -313 +315 @@
 }
 
-static errno_t ne2k_on_multicast_mode_change(nic_t *nic_data,
+static int ne2k_on_multicast_mode_change(nic_t *nic_data,
         nic_multicast_mode_t new_mode,
         const nic_address_t *address_list, size_t address_count)
@@ -339 +341 @@
 }
 
-static errno_t ne2k_on_broadcast_mode_change(nic_t *nic_data,
+static int ne2k_on_broadcast_mode_change(nic_t *nic_data,
         nic_broadcast_mode_t new_mode)
 {
@@ -355 +357 @@
 }
 
-static errno_t ne2k_dev_add(ddf_dev_t *dev)
+static int ne2k_dev_add(ddf_dev_t *dev)
 {
         ddf_fun_t *fun;
@@ -387 +389 @@
         }
         
-        errno_t rc = ne2k_dev_init(nic_data);
+        int rc = ne2k_dev_init(nic_data);
         if (rc != EOK) {
                 ne2k_dev_cleanup(dev);