Changeset 8565a42 in mainline for uspace/drv/nic/rtl8169/driver.c

Timestamp:

2018-03-02T20:34:50Z (8 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (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.

git-author:

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

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

File:

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

uspace/drv/nic/rtl8169/driver.c

@@ -352 +352 @@
         ddf_msg(LVL_DEBUG, "The device is initialized");
         return ret;
-        
+
 failed:
         ddf_msg(LVL_ERROR, "The device initialization failed");
@@ -460 +460 @@
                 goto err_fun_bind;
         }
-        
+
         ddf_msg(LVL_NOTE, "The %s device has been successfully initialized.",
             ddf_dev_get_name(dev));
@@ -512 +512 @@
         if (rtl8169->pci_vid == PCI_VID_REALTEK)
                 str_cpy(info->vendor_name, NIC_VENDOR_MAX_LENGTH, "Realtek");
-        
+
         if (rtl8169->pci_vid == PCI_VID_DLINK)
                 str_cpy(info->vendor_name, NIC_VENDOR_MAX_LENGTH, "D-Link");
-        
+
         if (rtl8169->pci_pid == 0x8168)
                 str_cpy(info->model_name, NIC_MODEL_MAX_LENGTH, "RTL8168");
-        
+
         if (rtl8169->pci_pid == 0x8169)
                 str_cpy(info->model_name, NIC_MODEL_MAX_LENGTH, "RTL8169");
@@ -577 +577 @@
         bmcr = rtl8169_mii_read(rtl8169, MII_BMCR);
         bmcr &= ~(BMCR_DUPLEX | BMCR_SPD_100 | BMCR_SPD_1000);
-        
+
         /* Disable autonegotiation */
         bmcr &= ~BMCR_AN_ENABLE;
@@ -918 +918 @@
 {
         rtl8169_t *rtl8169 = nic_get_specific(nic_data);
-        
+
         /* Configure Receive Control Register */
         uint32_t rcr = pio_read_32(rtl8169->regs + RCR);
@@ -961 +961 @@
                 write_barrier();
                 ddf_msg(LVL_DEBUG, "TX status for descr %d: 0x%08x", tail, descr->control);
-        
+
                 tail = (tail + 1) % TX_BUFFERS_COUNT;
                 sent++;
@@ -1005 +1005 @@
                 if (descr->control & CONTROL_FS)
                         fsidx = tail;
-                
+
                 if (descr->control & CONTROL_LS) {
                         ddf_msg(LVL_DEBUG, "received message at slot %d, control 0x%08x", tail, descr->control);