Changes in uspace/drv/nic/rtl8139/driver.c [5cd3d67:e86b8f0] in mainline

File:

• uspace/drv/nic/rtl8139/driver.c (modified) (6 diffs)

uspace/drv/nic/rtl8139/driver.c

@@ -55 +55 @@
 /** Global mutex for work with shared irq structure */
 FIBRIL_MUTEX_INITIALIZE(irq_reg_lock);
-
 /** Lock interrupt structure mutex */
-#define RTL8139_IRQ_STRUCT_LOCK() \
-        fibril_mutex_lock(&irq_reg_lock)
-
+#define RTL8139_IRQ_STRUCT_LOCK() fibril_mutex_lock(&irq_reg_lock)
 /** Unlock interrupt structure mutex */
-#define RTL8139_IRQ_STRUCT_UNLOCK() \
-        fibril_mutex_unlock(&irq_reg_lock)
+#define RTL8139_IRQ_STRUCT_UNLOCK() fibril_mutex_unlock(&irq_reg_lock)
 
 /** PCI clock frequency in kHz */
-#define RTL8139_PCI_FREQ_KHZ  33000
-
-#define RTL8139_AUTONEG_CAPS (ETH_AUTONEG_10BASE_T_HALF | \
-        ETH_AUTONEG_10BASE_T_FULL | ETH_AUTONEG_100BASE_TX_HALF | \
-        ETH_AUTONEG_100BASE_TX_FULL | ETH_AUTONEG_PAUSE_SYMETRIC)
+#define RTL8139_PCI_FREQ_KHZ 33000
+
+#define RTL8139_AUTONEG_CAPS (ETH_AUTONEG_10BASE_T_HALF \
+    | ETH_AUTONEG_10BASE_T_FULL | ETH_AUTONEG_100BASE_TX_HALF \
+    | ETH_AUTONEG_100BASE_TX_FULL | ETH_AUTONEG_PAUSE_SYMETRIC)
 
 /** Lock transmitter and receiver data
- *
- * This function shall be called whenever
- * both transmitter and receiver locking
- * to force safe lock ordering (deadlock prevention)
- *
- * @param rtl8139 RTL8139 private data
- *
+ *  This function shall be called whenever both transmitter and receiver locking
+ *  to force safe lock ordering (deadlock prevention)
+ *
+ *  @param rtl8139  RTL8139 private data
  */
 inline static void rtl8139_lock_all(rtl8139_t *rtl8139)
@@ -89 +82 @@
 /** Unlock transmitter and receiver data
  *
- * @param rtl8139 RTL8139 private data
- *
+ *  @param rtl8139  RTL8139 private data
  */
 inline static void rtl8139_unlock_all(rtl8139_t *rtl8139)
@@ -465 +457 @@
         pio_write_32(tsd, tsd_value);
         return;
-        
+
 err_busy_no_inc:
 err_size:
@@ -521 +513 @@
  *
  * @return The frame list node (not connected)
- *
  */
 static nic_frame_t *rtl8139_read_frame(nic_t *nic_data,
@@ -1224 +1215 @@
         ddf_msg(LVL_DEBUG, "The device is initialized");
         return ret;
-        
+
 failed:
         ddf_msg(LVL_ERROR, "The device initialization failed");
@@ -1351 +1342 @@
 
         return EOK;
-        
+
 err_fun_bind:
         ddf_fun_unbind(fun);