Changeset 5a6cc679 in mainline for uspace/lib/nic/src/nic_driver.c

Timestamp:

2018-01-31T02:21:24Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

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

uspace/lib/nic/src/nic_driver.c

@@ -61 +61 @@
  * @param name  Name of the device/driver (used in logging)
  */
-int nic_driver_init(const char *name)
+errno_t nic_driver_init(const char *name)
 {
         list_initialize(&nic_globals.frame_list_cache);
@@ -243 +243 @@
  * @return EOK or an error code
  */
-int nic_get_resources(nic_t *nic_data, hw_res_list_parsed_t *resources)
+errno_t nic_get_resources(nic_t *nic_data, hw_res_list_parsed_t *resources)
 {
         ddf_dev_t *dev = nic_data->dev;
@@ -399 +399 @@
  *  @return EINVAL
  */
-int nic_report_poll_mode(nic_t *nic_data, nic_poll_mode_t mode,
+errno_t nic_report_poll_mode(nic_t *nic_data, nic_poll_mode_t mode,
         struct timeval *period)
 {
-        int rc = EOK;
+        errno_t rc = EOK;
         fibril_rwlock_write_lock(&nic_data->main_lock);
         nic_data->poll_mode = mode;
@@ -423 +423 @@
  *
  */
-int nic_report_address(nic_t *nic_data, const nic_address_t *address)
+errno_t nic_report_address(nic_t *nic_data, const nic_address_t *address)
 {
         assert(nic_data);
@@ -434 +434 @@
         /* Notify NIL layer (and uppper) if bound - not in add_device */
         if (nic_data->client_session != NULL) {
-                int rc = nic_ev_addr_changed(nic_data->client_session,
+                errno_t rc = nic_ev_addr_changed(nic_data->client_session,
                     address);
 
@@ -450 +450 @@
          * calls this should not happen.
          */
-        int rc = nic_rxc_set_addr(&nic_data->rx_control,
+        errno_t rc = nic_rxc_set_addr(&nic_data->rx_control,
             &nic_data->mac, address);
         
@@ -808 +808 @@
  * @return ENOENT
  */
-int nic_query_vlan_mask(const nic_t *nic_data, nic_vlan_mask_t *mask)
+errno_t nic_query_vlan_mask(const nic_t *nic_data, nic_vlan_mask_t *mask)
 {
         assert(mask);
@@ -1039 +1039 @@
  *  @return 0, never reached
  */
-static int period_fibril_fun(void *data)
+static errno_t period_fibril_fun(void *data)
 {
         nic_t *nic = data;