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

Timestamp:

2018-03-02T20:10:49Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:

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

uspace/lib/nic/src/nic_driver.c

@@ -68 +68 @@
         nic_globals.frame_cache_size = 0;
         fibril_mutex_initialize(&nic_globals.lock);
-        
+
         char buffer[256];
         snprintf(buffer, 256, "drv/" DEVICE_CATEGORY_NIC "/%s", name);
-        
+
         return EOK;
 }
@@ -247 +247 @@
         ddf_dev_t *dev = nic_data->dev;
         async_sess_t *parent_sess;
-        
+
         /* Connect to the parent's driver. */
         parent_sess = ddf_dev_parent_sess_get(dev);
         if (parent_sess == NULL)
                 return EIO;
-        
+
         return hw_res_get_list_parsed(parent_sess, resources, 0);
 }
@@ -277 +277 @@
                 if (!frame)
                         return NULL;
-                
+
                 link_initialize(&frame->link);
         }
@@ -327 +327 @@
         nic_frame_list_t *frames;
         fibril_mutex_lock(&nic_globals.lock);
-        
+
         if (nic_globals.frame_list_cache_size > 0) {
                 frames =
@@ -338 +338 @@
         } else {
                 fibril_mutex_unlock(&nic_globals.lock);
-                
+
                 frames = malloc(sizeof (nic_frame_list_t));
                 if (frames != NULL)
                         list_initialize(frames);
         }
-        
+
         return frames;
 }
@@ -426 +426 @@
 {
         assert(nic_data);
-        
+
         if (address->address[0] & 1)
                 return EINVAL;
-        
+
         fibril_rwlock_write_lock(&nic_data->main_lock);
-        
+
         /* Notify NIL layer (and uppper) if bound - not in add_device */
         if (nic_data->client_session != NULL) {
@@ -442 +442 @@
                 }
         }
-        
+
         fibril_rwlock_write_lock(&nic_data->rxc_lock);
-        
+
         /*
          * The initial address (all zeroes) shouldn't be
@@ -452 +452 @@
         errno_t rc = nic_rxc_set_addr(&nic_data->rx_control,
             &nic_data->mac, address);
-        
+
         /* For the first time also record the default MAC */
         if (MAC_IS_ZERO(nic_data->default_mac.address)) {
@@ -458 +458 @@
                 memcpy(&nic_data->default_mac, address, sizeof(nic_address_t));
         }
-        
+
         fibril_rwlock_write_unlock(&nic_data->rxc_lock);
-        
+
         if ((rc != EOK) && (rc != ENOENT)) {
                 fibril_rwlock_write_unlock(&nic_data->main_lock);
                 return rc;
         }
-        
+
         memcpy(&nic_data->mac, address, sizeof(nic_address_t));
-        
+
         fibril_rwlock_write_unlock(&nic_data->main_lock);
-        
+
         return EOK;
 }
@@ -593 +593 @@
         if (nic_data == NULL)
                 return NULL;
-        
+
         /* Force zero to all uninitialized fields (e.g. added in future) */
         if (nic_rxc_init(&nic_data->rx_control) != EOK) {
                 return NULL;
         }
-        
+
         if (nic_wol_virtues_init(&nic_data->wol_virtues) != EOK) {
                 return NULL;
         }
-        
+
         nic_data->dev = NULL;
         nic_data->fun = NULL;
@@ -614 +614 @@
         nic_data->on_stopping = NULL;
         nic_data->specific = NULL;
-        
+
         fibril_rwlock_initialize(&nic_data->main_lock);
         fibril_rwlock_initialize(&nic_data->stats_lock);
         fibril_rwlock_initialize(&nic_data->rxc_lock);
         fibril_rwlock_initialize(&nic_data->wv_lock);
-        
+
         memset(&nic_data->mac, 0, sizeof(nic_address_t));
         memset(&nic_data->default_mac, 0, sizeof(nic_address_t));
         memset(&nic_data->stats, 0, sizeof(nic_device_stats_t));
-        
+
         return nic_data;
 }
@@ -642 +642 @@
         if (!nic_data)
                 return NULL;
-        
+
         nic_data->dev = device;
-        
+
         return nic_data;
 }
@@ -943 +943 @@
         if (count == 0)
                 return;
-        
+
         fibril_rwlock_write_lock(&nic_data->stats_lock);
         nic_data->stats.send_errors += count;
@@ -1079 +1079 @@
                         }
                         async_usleep(wait);
-                        
+
                         /* Check if the period was not reset */
                         if (info->run != run)
                                 break;
                 }
-                
+
                 /* Provide polling if the period finished */
                 fibril_rwlock_read_lock(&nic->main_lock);