Changeset 3bacee1 in mainline for uspace/drv/nic/rtl8169/driver.c

Timestamp:

2018-04-12T16:27:17Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3cf22f9

Parents:

76d0981d

git-author:

Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)

git-committer:

Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)

Message:

Make ccheck-fix again and commit more good files.

File:

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

uspace/drv/nic/rtl8169/driver.c

@@ -313 +313 @@
         nic_set_send_frame_handler(nic_data, rtl8169_send_frame);
         nic_set_state_change_handlers(nic_data,
-                rtl8169_on_activated, NULL, rtl8169_on_stopped);
+            rtl8169_on_activated, NULL, rtl8169_on_stopped);
         nic_set_filtering_change_handlers(nic_data,
-                rtl8169_unicast_set, rtl8169_multicast_set, rtl8169_broadcast_set,
-                NULL, NULL);
+            rtl8169_unicast_set, rtl8169_multicast_set, rtl8169_broadcast_set,
+            NULL, NULL);
 
         fibril_mutex_initialize(&rtl8169->rx_lock);
@@ -550 +550 @@
         uint8_t phystatus = pio_read_8(rtl8169->regs + PHYSTATUS);
 
-        *duplex = phystatus & PHYSTATUS_FDX
-            ? NIC_CM_FULL_DUPLEX : NIC_CM_HALF_DUPLEX;
+        *duplex = phystatus & PHYSTATUS_FDX ?
+            NIC_CM_FULL_DUPLEX : NIC_CM_HALF_DUPLEX;
 
         if (phystatus & PHYSTATUS_10M)
@@ -575 +575 @@
                 return EINVAL;
 
-        if (duplex != NIC_CM_HALF_DUPLEX && duplex != NIC_CM_FULL_DUPLEX)
+        if (duplex != NIC_CM_HALF_DUPLEX && duplex != NIC_CM_FULL_DUPLEX)
                 return EINVAL;
 
@@ -939 +939 @@
 
         pio_write_32(rtl8169->regs + RCR, rcr);
-        ddf_msg(LVL_DEBUG," new RCR value: 0x%08x", rcr);
+        ddf_msg(LVL_DEBUG, " new RCR value: 0x%08x", rcr);
 
         return EOK;
@@ -1173 +1173 @@
         uint32_t phyar;
 
-        phyar = PHYAR_RW_READ
-            | ((addr & PHYAR_ADDR_MASK) << PHYAR_ADDR_SHIFT);
+        phyar = PHYAR_RW_READ |
+            ((addr & PHYAR_ADDR_MASK) << PHYAR_ADDR_SHIFT);
 
         pio_write_32(rtl8169->regs + PHYAR, phyar);
@@ -1190 +1190 @@
         uint32_t phyar;
 
-        phyar = PHYAR_RW_WRITE
-            | ((addr & PHYAR_ADDR_MASK) << PHYAR_ADDR_SHIFT)
-            | (value & PHYAR_DATA_MASK);
+        phyar = PHYAR_RW_WRITE |
+            ((addr & PHYAR_ADDR_MASK) << PHYAR_ADDR_SHIFT) |
+            (value & PHYAR_DATA_MASK);
 
         pio_write_32(rtl8169->regs + PHYAR, phyar);
@@ -1215 +1215 @@
                 return rc;
         nic_driver_implement(
-                &rtl8169_driver_ops, &rtl8169_dev_ops, &rtl8169_nic_iface);
+            &rtl8169_driver_ops, &rtl8169_dev_ops, &rtl8169_nic_iface);
 
         ddf_log_init(NAME);