Changeset 3bacee1 in mainline for uspace/drv/nic/rtl8139

Timestamp:

2018-04-12T16:27:17Z (8 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/rtl8139/driver.c (modified) (27 diffs)

uspace/drv/nic/rtl8139/driver.c

@@ -95 +95 @@
 #ifndef RXBUF_SIZE_FLAGS
         /** Flags for receiver buffer - 16kB default */
-        #define RXBUF_SIZE_FLAGS RTL8139_RXFLAGS_SIZE_16
+#define RXBUF_SIZE_FLAGS RTL8139_RXFLAGS_SIZE_16
 #endif
 
 #if (RXBUF_SIZE_FLAGS > RTL8139_RXFLAGS_SIZE_64) || (RXBUF_SIZE_FLAGS < 0)
-        #error Bad receiver buffer flags size flags
+#error Bad receiver buffer flags size flags
 #endif
 
@@ -152 +152 @@
 static void rtl8139_hw_update_rcr(rtl8139_t *rtl8139)
 {
-        uint32_t rcr = rtl8139->rcr_data.rcr_base | rtl8139->rcr_data.ucast_mask
-            | rtl8139->rcr_data.mcast_mask | rtl8139->rcr_data.bcast_mask
-            | rtl8139->rcr_data.defect_mask |
+        uint32_t rcr = rtl8139->rcr_data.rcr_base | rtl8139->rcr_data.ucast_mask |
+            rtl8139->rcr_data.mcast_mask | rtl8139->rcr_data.bcast_mask |
+            rtl8139->rcr_data.defect_mask |
             (RXBUF_SIZE_FLAGS << RCR_RBLEN_SHIFT);
 
@@ -199 +199 @@
 
         async_sess_t *pci_sess =
-                ddf_dev_parent_sess_get(nic_get_ddf_dev(rtl8139->nic_data));
+            ddf_dev_parent_sess_get(nic_get_ddf_dev(rtl8139->nic_data));
 
         if (bit_val) {
@@ -243 +243 @@
         assert(addr);
 
-        const uint32_t *val1 = (const uint32_t*)addr->address;
-        const uint16_t *val2 = (const uint16_t*)(addr->address + sizeof(uint32_t));
+        const uint32_t *val1 = (const uint32_t *)addr->address;
+        const uint16_t *val2 = (const uint16_t *)(addr->address + sizeof(uint32_t));
 
         rtl8139_regs_unlock(rtl8139->io_port);
@@ -258 +258 @@
  *   @param bits_add    The value to or
  */
-inline static void rtl8139_hw_reg_add_8(rtl8139_t * rtl8139, size_t reg_offset,
+inline static void rtl8139_hw_reg_add_8(rtl8139_t *rtl8139, size_t reg_offset,
     uint8_t bits_add)
 {
@@ -272 +272 @@
  *   @param bits_add    The mask of bits to remove
  */
-inline static void rtl8139_hw_reg_rem_8(rtl8139_t * rtl8139, size_t reg_offset,
+inline static void rtl8139_hw_reg_rem_8(rtl8139_t *rtl8139, size_t reg_offset,
     uint8_t bits_add)
 {
@@ -288 +288 @@
     nic_channel_mode_t duplex, nic_role_t);
 
-static errno_t rtl8139_pause_get(ddf_fun_t*, nic_result_t*, nic_result_t*,
+static errno_t rtl8139_pause_get(ddf_fun_t *, nic_result_t *, nic_result_t *,
     uint16_t *);
-static errno_t rtl8139_pause_set(ddf_fun_t*, int, int, uint16_t);
+static errno_t rtl8139_pause_set(ddf_fun_t *, int, int, uint16_t);
 
 static errno_t rtl8139_autoneg_enable(ddf_fun_t *fun, uint32_t advertisement);
@@ -303 +303 @@
 
 static errno_t rtl8139_wol_virtue_add(nic_t *nic_data,
-        const nic_wol_virtue_t *virtue);
+    const nic_wol_virtue_t *virtue);
 static void rtl8139_wol_virtue_rem(nic_t *nic_data,
-        const nic_wol_virtue_t *virtue);
+    const nic_wol_virtue_t *virtue);
 
 static errno_t rtl8139_poll_mode_change(nic_t *nic_data, nic_poll_mode_t mode,
@@ -434 +434 @@
         pio_write_8(io_base + CR, CR_RST);
         memory_barrier();
-        while(pio_read_8(io_base + CR) & CR_RST) {
+        while (pio_read_8(io_base + CR) & CR_RST) {
                 async_usleep(1);
                 read_barrier();
@@ -481 +481 @@
 {
         nic_frame_t *frame = nic_alloc_frame(nic_data, frame_size);
-        if (! frame) {
+        if (!frame) {
                 ddf_msg(LVL_ERROR, "Can not allocate frame for received frame.");
                 return NULL;
@@ -560 +560 @@
         while (!rtl8139_hw_buffer_empty(rtl8139)) {
                 void *rx_ptr = rx_buffer + rx_offset % RxBUF_SIZE;
-                uint32_t frame_header = uint32_t_le2host( *((uint32_t*)rx_ptr) );
+                uint32_t frame_header = uint32_t_le2host(*((uint32_t *)rx_ptr));
                 uint16_t size = frame_header >> 16;
                 uint16_t frame_size = size - RTL8139_CRC_SIZE;
@@ -580 +580 @@
                 }
                 if (size < RTL8139_RUNT_MAX_SIZE && !(rcs & RSR_RUNT)) {
-                        ddf_msg(LVL_ERROR, "Receiver error -> receiver reset (%"PRIx16")", size);
+                        ddf_msg(LVL_ERROR, "Receiver error -> receiver reset (%" PRIx16 ")", size);
                         goto rx_err;
                 }
@@ -680 +680 @@
         while (tx_used != tx_next) {
                 size_t desc_to_check = tx_used % TX_BUFF_COUNT;
-                void * tsd_to_check = rtl8139->io_port + TSD0
-                    + desc_to_check * sizeof(uint32_t);
+                void *tsd_to_check = rtl8139->io_port + TSD0 +
+                    desc_to_check * sizeof(uint32_t);
                 uint32_t tsd_value = pio_read_32(tsd_to_check);
 
@@ -757 +757 @@
         pio_write_32(rtl8139->io_port + TIMERINT, timer_val);
         pio_write_32(rtl8139->io_port + TCTR, 0x0);
-        ddf_msg(LVL_DEBUG, "rtl8139 timer: %"PRIu32"\treceive: %d", timer_val, receive);
+        ddf_msg(LVL_DEBUG, "rtl8139 timer: %" PRIu32 "\treceive: %d", timer_val, receive);
         return receive;
 }
@@ -784 +784 @@
                         receive = rtl8139_poll_interrupt(nic_data);
                 }
-                if (! receive)
+                if (!receive)
                         return;
         }
@@ -883 +883 @@
 
         /* Write transmittion buffer addresses */
-        for(i = 0; i < TX_BUFF_COUNT; ++i) {
-                uint32_t addr = PTR2U32(rtl8139->tx_buff_phys + i*TX_BUFF_SIZE);
-                pio_write_32(io_base + TSAD0 + 4*i, addr);
+        for (i = 0; i < TX_BUFF_COUNT; ++i) {
+                uint32_t addr = PTR2U32(rtl8139->tx_buff_phys + i * TX_BUFF_SIZE);
+                pio_write_32(io_base + TSAD0 + 4 * i, addr);
         }
         rtl8139->tx_next = 0;
@@ -988 +988 @@
         nic_set_send_frame_handler(nic_data, rtl8139_send_frame);
         nic_set_state_change_handlers(nic_data,
-                rtl8139_on_activated, NULL, rtl8139_on_stopped);
+            rtl8139_on_activated, NULL, rtl8139_on_stopped);
         nic_set_filtering_change_handlers(nic_data,
-                rtl8139_unicast_set, rtl8139_multicast_set, rtl8139_broadcast_set,
-                NULL, NULL);
+            rtl8139_unicast_set, rtl8139_multicast_set, rtl8139_broadcast_set,
+            NULL, NULL);
         nic_set_wol_virtue_change_handlers(nic_data,
-                rtl8139_wol_virtue_add, rtl8139_wol_virtue_rem);
+            rtl8139_wol_virtue_add, rtl8139_wol_virtue_rem);
         nic_set_poll_handlers(nic_data, rtl8139_poll_mode_change, rtl8139_poll);
 
@@ -1347 +1347 @@
         assert(addr);
 
-        nic_t *nic_data =nic_get_from_ddf_fun((fun));
+        nic_t *nic_data = nic_get_from_ddf_fun((fun));
         rtl8139_t *rtl8139 = nic_get_specific(nic_data);
         assert(rtl8139);
@@ -1354 +1354 @@
 
         errno_t rc = nic_report_address(nic_data, addr);
-        if ( rc != EOK) {
+        if (rc != EOK) {
                 rtl8139_unlock_all(rtl8139);
                 return rc;
@@ -1817 +1817 @@
                 break;
         case NIC_UNICAST_LIST:
-                rtl8139->rcr_data.ucast_mask = RCR_ACCEPT_PHYS_MATCH
-                    | RCR_ACCEPT_ALL_PHYS;
+                rtl8139->rcr_data.ucast_mask = RCR_ACCEPT_PHYS_MATCH |
+                    RCR_ACCEPT_ALL_PHYS;
 
                 if (mcast_mode == NIC_MULTICAST_PROMISC)
@@ -1826 +1826 @@
                 break;
         case NIC_UNICAST_PROMISC:
-                rtl8139->rcr_data.ucast_mask = RCR_ACCEPT_PHYS_MATCH
-                    | RCR_ACCEPT_ALL_PHYS;
+                rtl8139->rcr_data.ucast_mask = RCR_ACCEPT_PHYS_MATCH |
+                    RCR_ACCEPT_ALL_PHYS;
 
                 if (mcast_mode == NIC_MULTICAST_PROMISC)
@@ -1981 +1981 @@
  */
 static errno_t rtl8139_wol_virtue_add(nic_t *nic_data,
-        const nic_wol_virtue_t *virtue)
+    const nic_wol_virtue_t *virtue)
 {
         assert(nic_data);
@@ -1989 +1989 @@
         assert(rtl8139);
 
-        switch(virtue->type) {
+        switch (virtue->type) {
         case NIC_WV_BROADCAST:
                 rtl8139_hw_reg_add_8(rtl8139, CONFIG5, CONFIG5_BROADCAST_WAKEUP);
@@ -2008 +2008 @@
                 return EINVAL;
         }
-        if(rtl8139->pm.active++ == 0)
+        if (rtl8139->pm.active++ == 0)
                 rtl8139_hw_pmen_set(rtl8139, 1);
         return EOK;
@@ -2019 +2019 @@
  */
 static void rtl8139_wol_virtue_rem(nic_t *nic_data,
-        const nic_wol_virtue_t *virtue)
+    const nic_wol_virtue_t *virtue)
 {
         assert(nic_data);
@@ -2027 +2027 @@
         assert(rtl8139);
 
-        switch(virtue->type) {
+        switch (virtue->type) {
         case NIC_WV_BROADCAST:
                 rtl8139_hw_reg_rem_8(rtl8139, CONFIG5, CONFIG5_BROADCAST_WAKEUP);
@@ -2070 +2070 @@
         fibril_mutex_lock(&rtl8139->rx_lock);
 
-        switch(mode) {
+        switch (mode) {
         case NIC_POLL_IMMEDIATE:
                 rtl8139->int_mask = RTL_DEFAULT_INTERRUPTS;