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

File:

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

uspace/drv/nic/rtl8139/driver.c

@@ -217 +217 @@
  *  @param address  The place to store the address
  *
- *  @return EOK if succeed, negative error code otherwise
+ *  @return EOK if succeed, error code otherwise
  */
 inline static void rtl8139_hw_get_addr(rtl8139_t *rtl8139,
@@ -280 +280 @@
 }
 
-static int rtl8139_set_addr(ddf_fun_t *fun, const nic_address_t *);
-static int rtl8139_get_device_info(ddf_fun_t *fun, nic_device_info_t *info);
-static int rtl8139_get_cable_state(ddf_fun_t *fun, nic_cable_state_t *state);
-static int rtl8139_get_operation_mode(ddf_fun_t *fun, int *speed,
+static errno_t rtl8139_set_addr(ddf_fun_t *fun, const nic_address_t *);
+static errno_t rtl8139_get_device_info(ddf_fun_t *fun, nic_device_info_t *info);
+static errno_t rtl8139_get_cable_state(ddf_fun_t *fun, nic_cable_state_t *state);
+static errno_t rtl8139_get_operation_mode(ddf_fun_t *fun, int *speed,
     nic_channel_mode_t *duplex, nic_role_t *role);
-static int rtl8139_set_operation_mode(ddf_fun_t *fun, int speed,
+static errno_t rtl8139_set_operation_mode(ddf_fun_t *fun, int speed,
     nic_channel_mode_t duplex, nic_role_t);
 
-static int rtl8139_pause_get(ddf_fun_t*, nic_result_t*, nic_result_t*, 
+static errno_t rtl8139_pause_get(ddf_fun_t*, nic_result_t*, nic_result_t*, 
     uint16_t *);
-static int rtl8139_pause_set(ddf_fun_t*, int, int, uint16_t);
-
-static int rtl8139_autoneg_enable(ddf_fun_t *fun, uint32_t advertisement);
-static int rtl8139_autoneg_disable(ddf_fun_t *fun);
-static int rtl8139_autoneg_probe(ddf_fun_t *fun, uint32_t *our_advertisement,
+static errno_t rtl8139_pause_set(ddf_fun_t*, int, int, uint16_t);
+
+static errno_t rtl8139_autoneg_enable(ddf_fun_t *fun, uint32_t advertisement);
+static errno_t rtl8139_autoneg_disable(ddf_fun_t *fun);
+static errno_t rtl8139_autoneg_probe(ddf_fun_t *fun, uint32_t *our_advertisement,
     uint32_t *their_advertisement, nic_result_t *result, 
     nic_result_t *their_result);
-static int rtl8139_autoneg_restart(ddf_fun_t *fun);
-
-static int rtl8139_defective_get_mode(ddf_fun_t *fun, uint32_t *mode);
-static int rtl8139_defective_set_mode(ddf_fun_t *fun, uint32_t mode);
-
-static int rtl8139_wol_virtue_add(nic_t *nic_data,
+static errno_t rtl8139_autoneg_restart(ddf_fun_t *fun);
+
+static errno_t rtl8139_defective_get_mode(ddf_fun_t *fun, uint32_t *mode);
+static errno_t rtl8139_defective_set_mode(ddf_fun_t *fun, uint32_t mode);
+
+static errno_t rtl8139_wol_virtue_add(nic_t *nic_data,
         const nic_wol_virtue_t *virtue);
 static void rtl8139_wol_virtue_rem(nic_t *nic_data,
         const nic_wol_virtue_t *virtue);
 
-static int rtl8139_poll_mode_change(nic_t *nic_data, nic_poll_mode_t mode,
+static errno_t rtl8139_poll_mode_change(nic_t *nic_data, nic_poll_mode_t mode,
     const struct timeval *period);
 static void rtl8139_poll(nic_t *nic_data);
@@ -334 +334 @@
 static ddf_dev_ops_t rtl8139_dev_ops;
 
-static int rtl8139_dev_add(ddf_dev_t *dev);
+static errno_t rtl8139_dev_add(ddf_dev_t *dev);
 
 /** Basic driver operations for RTL8139 driver */
@@ -348 +348 @@
 
 /* The default implementation callbacks */
-static int rtl8139_on_activated(nic_t *nic_data);
-static int rtl8139_on_stopped(nic_t *nic_data);
+static errno_t rtl8139_on_activated(nic_t *nic_data);
+static errno_t rtl8139_on_stopped(nic_t *nic_data);
 static void rtl8139_send_frame(nic_t *nic_data, void *data, size_t size);
 
@@ -842 +842 @@
  *  @param nic_data  The driver data
  *
- *  @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)
+ *  @param[out] handle  IRQ capability handle if the handler was registered.
+ *
+ *  @return An error code otherwise.
+ */
+inline static errno_t 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);
+        errno_t 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;
 }
 
@@ -903 +904 @@
  *  @return EOK if activated successfully, error code otherwise
  */
-static int rtl8139_on_activated(nic_t *nic_data)
+static errno_t rtl8139_on_activated(nic_t *nic_data)
 {
         assert(nic_data);
@@ -918 +919 @@
         rtl8139_hw_int_set(rtl8139);
 
-        int rc = hw_res_enable_interrupt(rtl8139->parent_sess, rtl8139->irq);
+        errno_t rc = hw_res_enable_interrupt(rtl8139->parent_sess, rtl8139->irq);
         if (rc != EOK) {
                 rtl8139_on_stopped(nic_data);
@@ -934 +935 @@
  *  @return EOK if succeed, error code otherwise
  */
-static int rtl8139_on_stopped(nic_t *nic_data)
+static errno_t rtl8139_on_stopped(nic_t *nic_data)
 {
         assert(nic_data);
@@ -954 +955 @@
 
 
-static int rtl8139_unicast_set(nic_t *nic_data, nic_unicast_mode_t mode,
+static errno_t rtl8139_unicast_set(nic_t *nic_data, nic_unicast_mode_t mode,
     const nic_address_t *, size_t);
-static int rtl8139_multicast_set(nic_t *nic_data, nic_multicast_mode_t mode,
+static errno_t rtl8139_multicast_set(nic_t *nic_data, nic_multicast_mode_t mode,
     const nic_address_t *addr, size_t addr_count);
-static int rtl8139_broadcast_set(nic_t *nic_data, nic_broadcast_mode_t mode);
+static errno_t rtl8139_broadcast_set(nic_t *nic_data, nic_broadcast_mode_t mode);
 
 
@@ -1024 +1025 @@
  *  @param hw_resources  Devices hardware resources
  *
- *  @return EOK if succeed, negative error code otherwise
- */
-static int rtl8139_fill_resource_info(ddf_dev_t *dev, const hw_res_list_parsed_t
+ *  @return EOK if succeed, error code otherwise
+ */
+static errno_t rtl8139_fill_resource_info(ddf_dev_t *dev, const hw_res_list_parsed_t
     *hw_resources)
 {
@@ -1064 +1065 @@
  *  @param dev  The device structure
  *
- *  @return EOK if succeed, negative error code otherwise
- */
-static int rtl8139_get_resource_info(ddf_dev_t *dev)
+ *  @return EOK if succeed, error code otherwise
+ */
+static errno_t rtl8139_get_resource_info(ddf_dev_t *dev)
 {
         assert(dev);
@@ -1077 +1078 @@
 
         /* 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 = rtl8139_fill_resource_info(dev, &hw_res_parsed);
+        errno_t ret = rtl8139_fill_resource_info(dev, &hw_res_parsed);
         hw_res_list_parsed_clean(&hw_res_parsed);
 
@@ -1097 +1098 @@
  * @return EOK in the case of success, error code otherwise
  */
-static int rtl8139_buffers_create(rtl8139_t *rtl8139)
+static errno_t rtl8139_buffers_create(rtl8139_t *rtl8139)
 {
         size_t i = 0;
-        int rc;
+        errno_t rc;
 
         ddf_msg(LVL_DEBUG, "Creating buffers");
@@ -1146 +1147 @@
  *  @param dev  The device information
  *
- *  @return EOK if succeed, negative error code otherwise
- */
-static int rtl8139_device_initialize(ddf_dev_t *dev)
+ *  @return EOK if succeed, error code otherwise
+ */
+static errno_t rtl8139_device_initialize(ddf_dev_t *dev)
 {
         ddf_msg(LVL_DEBUG, "rtl8139_dev_initialize %s", ddf_dev_get_name(dev));
 
-        int ret = EOK;
+        errno_t ret = EOK;
 
         ddf_msg(LVL_DEBUG, "rtl8139: creating device data");
@@ -1205 +1206 @@
  * @param dev  The RTL8139 device.
  *
- * @return EOK if successed, negative error code otherwise
- */
-static int rtl8139_pio_enable(ddf_dev_t *dev)
+ * @return EOK if successed, error code otherwise
+ */
+static errno_t rtl8139_pio_enable(ddf_dev_t *dev)
 {
         ddf_msg(LVL_DEBUG, NAME ": rtl8139_pio_enable %s", ddf_dev_get_name(dev));
@@ -1255 +1256 @@
  * @param dev  The RTL8139 device.
  *
- * @return EOK if added successfully, negative error code otherwise
- */
-int rtl8139_dev_add(ddf_dev_t *dev)
+ * @return EOK if added successfully, error code otherwise
+ */
+errno_t rtl8139_dev_add(ddf_dev_t *dev)
 {
         ddf_fun_t *fun;
@@ -1265 +1266 @@
 
         /* Init device structure for rtl8139 */
-        int rc = rtl8139_device_initialize(dev);
+        errno_t rc = rtl8139_device_initialize(dev);
         if (rc != EOK)
                 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;
         }
@@ -1338 +1339 @@
  *  @param max_len  Maximal addresss length to store
  *
- *  @return EOK if succeed, negative error code otherwise
- */
-static int rtl8139_set_addr(ddf_fun_t *fun, const nic_address_t *addr)
+ *  @return EOK if succeed, error code otherwise
+ */
+static errno_t rtl8139_set_addr(ddf_fun_t *fun, const nic_address_t *addr)
 {
         assert(fun);
@@ -1351 +1352 @@
         rtl8139_lock_all(rtl8139);
 
-        int rc = nic_report_address(nic_data, addr);
+        errno_t rc = nic_report_address(nic_data, addr);
         if ( rc != EOK) {
                 rtl8139_unlock_all(rtl8139);
@@ -1370 +1371 @@
  *  @return EOK
  */
-static int rtl8139_get_device_info(ddf_fun_t *fun, nic_device_info_t *info)
+static errno_t rtl8139_get_device_info(ddf_fun_t *fun, nic_device_info_t *info)
 {
         assert(fun);
@@ -1405 +1406 @@
  *  @return EOK
  */
-static int rtl8139_get_cable_state(ddf_fun_t *fun, nic_cable_state_t *state)
+static errno_t rtl8139_get_cable_state(ddf_fun_t *fun, nic_cable_state_t *state)
 {
         assert(fun);
@@ -1424 +1425 @@
 /** Get operation mode of the device
  */
-static int rtl8139_get_operation_mode(ddf_fun_t *fun, int *speed,
+static errno_t rtl8139_get_operation_mode(ddf_fun_t *fun, int *speed,
     nic_channel_mode_t *duplex, nic_role_t *role)
 {
@@ -1501 +1502 @@
  *  @return EOK if succeed
  */
-static int rtl8139_pause_get(ddf_fun_t *fun, nic_result_t *we_send, 
+static errno_t rtl8139_pause_get(ddf_fun_t *fun, nic_result_t *we_send, 
     nic_result_t *we_receive, uint16_t *time)
 {
@@ -1536 +1537 @@
  *  @return EOK if succeed, INVAL if the pause frame has no sence
  */
-static int rtl8139_pause_set(ddf_fun_t *fun, int allow_send, int allow_receive, 
+static errno_t rtl8139_pause_set(ddf_fun_t *fun, int allow_send, int allow_receive, 
     uint16_t time)
 {
@@ -1566 +1567 @@
  *
  */
-static int rtl8139_set_operation_mode(ddf_fun_t *fun, int speed,
+static errno_t rtl8139_set_operation_mode(ddf_fun_t *fun, int speed,
     nic_channel_mode_t duplex, nic_role_t role)
 {
@@ -1610 +1611 @@
  *  @returns EOK if advertisement mode set successfully
  */
-static int rtl8139_autoneg_enable(ddf_fun_t *fun, uint32_t advertisement)
+static errno_t rtl8139_autoneg_enable(ddf_fun_t *fun, uint32_t advertisement)
 {
         assert(fun);
@@ -1656 +1657 @@
  *  @returns EOK
  */
-static int rtl8139_autoneg_disable(ddf_fun_t *fun)
+static errno_t rtl8139_autoneg_disable(ddf_fun_t *fun)
 {
         assert(fun);
@@ -1707 +1708 @@
  *  @returns EOK
  */
-static int rtl8139_autoneg_probe(ddf_fun_t *fun, uint32_t *advertisement,
+static errno_t rtl8139_autoneg_probe(ddf_fun_t *fun, uint32_t *advertisement,
     uint32_t *their_adv, nic_result_t *result, nic_result_t *their_result)
 {
@@ -1744 +1745 @@
  *  @returns EOK
  */
-static int rtl8139_autoneg_restart(ddf_fun_t *fun)
+static errno_t rtl8139_autoneg_restart(ddf_fun_t *fun)
 {
         assert(fun);
@@ -1792 +1793 @@
  *  @returns EOK
  */
-static int rtl8139_unicast_set(nic_t *nic_data, nic_unicast_mode_t mode,
+static errno_t rtl8139_unicast_set(nic_t *nic_data, nic_unicast_mode_t mode,
     const nic_address_t *addr, size_t addr_cnt)
 {
@@ -1850 +1851 @@
  *  @returns EOK
  */
-static int rtl8139_multicast_set(nic_t *nic_data, nic_multicast_mode_t mode,
+static errno_t rtl8139_multicast_set(nic_t *nic_data, nic_multicast_mode_t mode,
     const nic_address_t *addr, size_t addr_count)
 {
@@ -1893 +1894 @@
  *  @returns EOK
  */
-static int rtl8139_broadcast_set(nic_t *nic_data, nic_broadcast_mode_t mode)
+static errno_t rtl8139_broadcast_set(nic_t *nic_data, nic_broadcast_mode_t mode)
 {
         assert(nic_data);
@@ -1921 +1922 @@
  *  @param[out] mode    The current mode
  */
-static int rtl8139_defective_get_mode(ddf_fun_t *fun, uint32_t *mode)
+static errno_t rtl8139_defective_get_mode(ddf_fun_t *fun, uint32_t *mode)
 {
         assert(fun);
@@ -1946 +1947 @@
  *  @returns EOK of mode was set
  */
-static int rtl8139_defective_set_mode(ddf_fun_t *fun, uint32_t mode)
+static errno_t rtl8139_defective_set_mode(ddf_fun_t *fun, uint32_t mode)
 {
         assert(fun);
@@ -1978 +1979 @@
  *  @returns ELIMIT if no more methods of this kind can be enabled
  */
-static int rtl8139_wol_virtue_add(nic_t *nic_data,
+static errno_t rtl8139_wol_virtue_add(nic_t *nic_data,
         const nic_wol_virtue_t *virtue)
 {
@@ -2057 +2058 @@
  *  @returns ENOTSUP if the mode is not supported
  */
-static int rtl8139_poll_mode_change(nic_t *nic_data, nic_poll_mode_t mode,
+static errno_t rtl8139_poll_mode_change(nic_t *nic_data, nic_poll_mode_t mode,
     const struct timeval *period)
 {
         assert(nic_data);
-        int rc = EOK;
+        errno_t rc = EOK;
 
         rtl8139_t *rtl8139 = nic_get_specific(nic_data);
@@ -2142 +2143 @@
         printf("%s: HelenOS RTL8139 network adapter driver\n", NAME);
 
-        int rc = nic_driver_init(NAME);
+        errno_t rc = nic_driver_init(NAME);
         if (rc != EOK)
                 return rc;