Changes in uspace/drv/nic/rtl8169/driver.c [f300523:b7fd2a0] in mainline

File:

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

uspace/drv/nic/rtl8169/driver.c

@@ -30 +30 @@
 #include <async.h>
 #include <errno.h>
+#include <str_error.h>
 #include <align.h>
 #include <byteorder.h>
@@ -51 +52 @@
 FIBRIL_MUTEX_INITIALIZE(irq_reg_lock);
 
-static int rtl8169_set_addr(ddf_fun_t *fun, const nic_address_t *addr);
-static int rtl8169_get_device_info(ddf_fun_t *fun, nic_device_info_t *info);
-static int rtl8169_get_cable_state(ddf_fun_t *fun, nic_cable_state_t *state);
-static int rtl8169_get_operation_mode(ddf_fun_t *fun, int *speed,
+static errno_t rtl8169_set_addr(ddf_fun_t *fun, const nic_address_t *addr);
+static errno_t rtl8169_get_device_info(ddf_fun_t *fun, nic_device_info_t *info);
+static errno_t rtl8169_get_cable_state(ddf_fun_t *fun, nic_cable_state_t *state);
+static errno_t rtl8169_get_operation_mode(ddf_fun_t *fun, int *speed,
     nic_channel_mode_t *duplex, nic_role_t *role);
-static int rtl8169_set_operation_mode(ddf_fun_t *fun, int speed,
+static errno_t rtl8169_set_operation_mode(ddf_fun_t *fun, int speed,
     nic_channel_mode_t duplex, nic_role_t role);
-static int rtl8169_pause_get(ddf_fun_t *fun, nic_result_t *we_send, 
+static errno_t rtl8169_pause_get(ddf_fun_t *fun, nic_result_t *we_send, 
     nic_result_t *we_receive, uint16_t *time);
-static int rtl8169_pause_set(ddf_fun_t *fun, int allow_send, int allow_receive, 
+static errno_t rtl8169_pause_set(ddf_fun_t *fun, int allow_send, int allow_receive, 
     uint16_t time);
-static int rtl8169_autoneg_enable(ddf_fun_t *fun, uint32_t advertisement);
-static int rtl8169_autoneg_disable(ddf_fun_t *fun);
-static int rtl8169_autoneg_probe(ddf_fun_t *fun, uint32_t *advertisement,
+static errno_t rtl8169_autoneg_enable(ddf_fun_t *fun, uint32_t advertisement);
+static errno_t rtl8169_autoneg_disable(ddf_fun_t *fun);
+static errno_t rtl8169_autoneg_probe(ddf_fun_t *fun, uint32_t *advertisement,
     uint32_t *their_adv, nic_result_t *result, nic_result_t *their_result);
-static int rtl8169_autoneg_restart(ddf_fun_t *fun);
-static int rtl8169_defective_get_mode(ddf_fun_t *fun, uint32_t *mode);
-static int rtl8169_defective_set_mode(ddf_fun_t *fun, uint32_t mode);
-static int rtl8169_on_activated(nic_t *nic_data);
-static int rtl8169_on_stopped(nic_t *nic_data);
+static errno_t rtl8169_autoneg_restart(ddf_fun_t *fun);
+static errno_t rtl8169_defective_get_mode(ddf_fun_t *fun, uint32_t *mode);
+static errno_t rtl8169_defective_set_mode(ddf_fun_t *fun, uint32_t mode);
+static errno_t rtl8169_on_activated(nic_t *nic_data);
+static errno_t rtl8169_on_stopped(nic_t *nic_data);
 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 errno_t 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);
 
 static void rtl8169_reset(rtl8169_t *rtl8169);
-static int rtl8169_get_resource_info(ddf_dev_t *dev);
-static int rtl8169_fill_resource_info(ddf_dev_t *dev, const hw_res_list_parsed_t *hw_resources);
+static errno_t rtl8169_get_resource_info(ddf_dev_t *dev);
+static errno_t rtl8169_fill_resource_info(ddf_dev_t *dev, const hw_res_list_parsed_t *hw_resources);
 static rtl8169_t *rtl8169_create_dev_data(ddf_dev_t *dev);
 
-static int rtl8169_unicast_set(nic_t *nic_data, nic_unicast_mode_t mode,
+static errno_t rtl8169_unicast_set(nic_t *nic_data, nic_unicast_mode_t mode,
     const nic_address_t *, size_t);
-static int rtl8169_multicast_set(nic_t *nic_data, nic_multicast_mode_t mode,
+static errno_t rtl8169_multicast_set(nic_t *nic_data, nic_multicast_mode_t mode,
     const nic_address_t *addr, size_t addr_count);
-static int rtl8169_broadcast_set(nic_t *nic_data, nic_broadcast_mode_t mode);
+static errno_t rtl8169_broadcast_set(nic_t *nic_data, nic_broadcast_mode_t mode);
 
 static uint16_t rtl8169_mii_read(rtl8169_t *rtl8169, uint8_t addr);
@@ -160 +161 @@
 static ddf_dev_ops_t rtl8169_dev_ops;
 
-static int rtl8169_dev_add(ddf_dev_t *dev);
+static errno_t rtl8169_dev_add(ddf_dev_t *dev);
 
 /** Basic driver operations for RTL8169 driver */
@@ -173 +174 @@
 };
 
-static int rtl8169_get_resource_info(ddf_dev_t *dev)
+static errno_t rtl8169_get_resource_info(ddf_dev_t *dev)
 {
         assert(dev);
@@ -184 +185 @@
 
         /* Get hw resources form parent driver */
-        int rc = nic_get_resources(nic_data, &hw_res_parsed);
+        errno_t rc = nic_get_resources(nic_data, &hw_res_parsed);
         if (rc != EOK)
                 return rc;
 
         /* Fill resources information to the device */
-        int ret = rtl8169_fill_resource_info(dev, &hw_res_parsed);
+        errno_t ret = rtl8169_fill_resource_info(dev, &hw_res_parsed);
         hw_res_list_parsed_clean(&hw_res_parsed);
 
@@ -195 +196 @@
 }
 
-static int rtl8169_fill_resource_info(ddf_dev_t *dev, const hw_res_list_parsed_t
+static errno_t rtl8169_fill_resource_info(ddf_dev_t *dev, const hw_res_list_parsed_t
     *hw_resources)
 {
@@ -228 +229 @@
 }
 
-static int rtl8169_allocate_buffers(rtl8169_t *rtl8169)
-{
-        int rc;
+static errno_t rtl8169_allocate_buffers(rtl8169_t *rtl8169)
+{
+        errno_t rc;
 
         ddf_msg(LVL_DEBUG, "Allocating DMA buffer rings");
@@ -333 +334 @@
 }
 
-static int rtl8169_dev_initialize(ddf_dev_t *dev)
-{
-        int ret;
+static errno_t rtl8169_dev_initialize(ddf_dev_t *dev)
+{
+        errno_t ret;
 
         rtl8169_t *rtl8169 = rtl8169_create_dev_data(dev);
@@ -359 +360 @@
 }
 
-inline static int rtl8169_register_int_handler(nic_t *nic_data)
+inline static errno_t rtl8169_register_int_handler(nic_t *nic_data, cap_handle_t *handle)
 {
         rtl8169_t *rtl8169 = nic_get_specific(nic_data);
@@ -367 +368 @@
         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;
-}
-
-static int rtl8169_dev_add(ddf_dev_t *dev)
+        errno_t rc = register_interrupt_handler(nic_get_ddf_dev(nic_data),
+            rtl8169->irq, rtl8169_irq_handler, &rtl8169_irq_code, handle);
+
+        return rc;
+}
+
+static errno_t rtl8169_dev_add(ddf_dev_t *dev)
 {
         ddf_fun_t *fun;
         nic_address_t nic_addr;
-        int rc;
+        errno_t rc;
 
         assert(dev);
@@ -427 +428 @@
                 goto err_pio;
 
-        int irq_cap = rtl8169_register_int_handler(nic_data);
-        if (irq_cap < 0) {
-                rc = irq_cap;
-                ddf_msg(LVL_ERROR, "Failed to register IRQ handler (%d)", rc);
+        int irq_cap;
+        rc = rtl8169_register_int_handler(nic_data, &irq_cap);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed to register IRQ handler (%s)", str_error_name(rc));
                 goto err_irq;
         }
@@ -480 +481 @@
 }
 
-static int rtl8169_set_addr(ddf_fun_t *fun, const nic_address_t *addr)
+static errno_t rtl8169_set_addr(ddf_fun_t *fun, const nic_address_t *addr)
 {
         nic_t *nic_data = nic_get_from_ddf_fun(fun);
         rtl8169_t *rtl8169 = nic_get_specific(nic_data);
-        int rc;
+        errno_t rc;
 
         fibril_mutex_lock(&rtl8169->rx_lock);
@@ -501 +502 @@
 }
 
-static int rtl8169_get_device_info(ddf_fun_t *fun, nic_device_info_t *info)
+static errno_t rtl8169_get_device_info(ddf_fun_t *fun, nic_device_info_t *info)
 {
         nic_t *nic_data = nic_get_from_ddf_fun(fun);
@@ -527 +528 @@
 }
 
-static int rtl8169_get_cable_state(ddf_fun_t *fun, nic_cable_state_t *state)
+static errno_t rtl8169_get_cable_state(ddf_fun_t *fun, nic_cable_state_t *state)
 {
         rtl8169_t *rtl8169 = nic_get_specific(nic_get_from_ddf_fun(fun));
@@ -540 +541 @@
 }
 
-static int rtl8169_get_operation_mode(ddf_fun_t *fun, int *speed,
+static errno_t rtl8169_get_operation_mode(ddf_fun_t *fun, int *speed,
     nic_channel_mode_t *duplex, nic_role_t *role)
 {
@@ -562 +563 @@
 }
 
-static int rtl8169_set_operation_mode(ddf_fun_t *fun, int speed,
+static errno_t rtl8169_set_operation_mode(ddf_fun_t *fun, int speed,
     nic_channel_mode_t duplex, nic_role_t role)
 {
@@ -593 +594 @@
 }
 
-static int rtl8169_pause_get(ddf_fun_t *fun, nic_result_t *we_send, 
+static errno_t rtl8169_pause_get(ddf_fun_t *fun, nic_result_t *we_send, 
     nic_result_t *we_receive, uint16_t *time)
 {
@@ -599 +600 @@
 }
 
-static int rtl8169_pause_set(ddf_fun_t *fun, int allow_send, int allow_receive, 
+static errno_t rtl8169_pause_set(ddf_fun_t *fun, int allow_send, int allow_receive, 
     uint16_t time)
 {
@@ -605 +606 @@
 }
 
-static int rtl8169_autoneg_enable(ddf_fun_t *fun, uint32_t advertisement)
+static errno_t rtl8169_autoneg_enable(ddf_fun_t *fun, uint32_t advertisement)
 {
         rtl8169_t *rtl8169 = nic_get_specific(nic_get_from_ddf_fun(fun));
@@ -629 +630 @@
 }
 
-static int rtl8169_autoneg_disable(ddf_fun_t *fun)
+static errno_t rtl8169_autoneg_disable(ddf_fun_t *fun)
 {
         rtl8169_t *rtl8169 = nic_get_specific(nic_get_from_ddf_fun(fun));
@@ -640 +641 @@
 }
 
-static int rtl8169_autoneg_probe(ddf_fun_t *fun, uint32_t *advertisement,
+static errno_t rtl8169_autoneg_probe(ddf_fun_t *fun, uint32_t *advertisement,
     uint32_t *their_adv, nic_result_t *result, nic_result_t *their_result)
 {
@@ -646 +647 @@
 }
 
-static int rtl8169_autoneg_restart(ddf_fun_t *fun)
+static errno_t rtl8169_autoneg_restart(ddf_fun_t *fun)
 {
         rtl8169_t *rtl8169 = nic_get_specific(nic_get_from_ddf_fun(fun));
@@ -656 +657 @@
 }
 
-static int rtl8169_defective_get_mode(ddf_fun_t *fun, uint32_t *mode)
-{
-        return EOK;
-}
-
-static int rtl8169_defective_set_mode(ddf_fun_t *fun, uint32_t mode)
+static errno_t rtl8169_defective_get_mode(ddf_fun_t *fun, uint32_t *mode)
+{
+        return EOK;
+}
+
+static errno_t rtl8169_defective_set_mode(ddf_fun_t *fun, uint32_t mode)
 {
         return EOK;
@@ -690 +691 @@
 }
 
-static int rtl8169_on_activated(nic_t *nic_data)
-{
-        int rc;
+static errno_t rtl8169_on_activated(nic_t *nic_data)
+{
+        errno_t rc;
         uint64_t tmp;
 
@@ -706 +707 @@
         rc = rtl8169_allocate_buffers(rtl8169);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Error allocating buffers: %d", rc);
+                ddf_msg(LVL_ERROR, "Error allocating buffers: %s", str_error_name(rc));
                 return 0;
         }
@@ -752 +753 @@
 }
 
-static int rtl8169_on_stopped(nic_t *nic_data)
+static errno_t rtl8169_on_stopped(nic_t *nic_data)
 {
         ddf_msg(LVL_NOTE, "Stopping device");
@@ -818 +819 @@
 }
 
-static int rtl8169_unicast_set(nic_t *nic_data, nic_unicast_mode_t mode,
+static errno_t rtl8169_unicast_set(nic_t *nic_data, nic_unicast_mode_t mode,
     const nic_address_t *addr, size_t addr_count)
 {
@@ -870 +871 @@
 }
 
-static int rtl8169_multicast_set(nic_t *nic_data, nic_multicast_mode_t mode,
+static errno_t rtl8169_multicast_set(nic_t *nic_data, nic_multicast_mode_t mode,
     const nic_address_t *addr, size_t addr_count)
 {
@@ -914 +915 @@
 }
 
-static int rtl8169_broadcast_set(nic_t *nic_data, nic_broadcast_mode_t mode)
+static errno_t rtl8169_broadcast_set(nic_t *nic_data, nic_broadcast_mode_t mode)
 {
         rtl8169_t *rtl8169 = nic_get_specific(nic_data);
@@ -1207 +1208 @@
 int main(void)
 {
-        int rc = nic_driver_init(NAME);
+        errno_t rc = nic_driver_init(NAME);
         if (rc != EOK)
                 return rc;