Changeset 132ab5d1 in mainline for uspace/lib/nic/src/nic_driver.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/lib/nic/src/nic_driver.c (modified) (3 diffs)

uspace/lib/nic/src/nic_driver.c

@@ -241 +241 @@
  * @param[out]  resources       Parsed lists of resources.
  *
- * @return EOK or negative error code
+ * @return EOK or an error code
  */
 int nic_get_resources(nic_t *nic_data, hw_res_list_parsed_t *resources)
@@ -521 +521 @@
         fibril_rwlock_read_lock(&nic_data->rxc_lock);
         nic_frame_type_t frame_type;
-        int check = nic_rxc_check(&nic_data->rx_control, frame->data,
+        bool check = nic_rxc_check(&nic_data->rx_control, frame->data,
             frame->size, &frame_type);
         fibril_rwlock_read_unlock(&nic_data->rxc_lock);
@@ -1092 +1092 @@
                 fibril_rwlock_read_unlock(&nic->main_lock);
         }
-        return 0;
+        return EOK;
 }