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

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.

Location:

uspace/drv/nic/ne2k

Files:

• dp8390.c (modified) (5 diffs)
• ne2k.c (modified) (6 diffs)

uspace/drv/nic/ne2k/dp8390.c

@@ -439 +439 @@
 
 static nic_frame_t *ne2k_receive_frame(nic_t *nic_data, uint8_t page,
-        size_t length)
+    size_t length)
 {
         ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);
@@ -451 +451 @@
 
         if (last >= ne2k->stop_page) {
-                size_t left = (ne2k->stop_page - page) * DP_PAGE
-                    - sizeof(recv_header_t);
+                size_t left = (ne2k->stop_page - page) * DP_PAGE -
+                    sizeof(recv_header_t);
                 ne2k_download(ne2k, frame->data, page * DP_PAGE + sizeof(recv_header_t),
                     left);
@@ -509 +509 @@
                 uint8_t next = header.next;
 
-                if ((length < ETH_MIN_PACK_SIZE)
-                    || (length > ETH_MAX_PACK_SIZE_TAGGED)) {
+                if ((length < ETH_MIN_PACK_SIZE) ||
+                    (length > ETH_MAX_PACK_SIZE_TAGGED)) {
                         next = current;
-                } else if ((header.next < ne2k->start_page)
-                    || (header.next > ne2k->stop_page)) {
+                } else if ((header.next < ne2k->start_page) ||
+                    (header.next > ne2k->stop_page)) {
                         next = current;
                 } else if (header.status & RSR_FO) {
@@ -525 +525 @@
                         if (frames != NULL) {
                                 nic_frame_t *frame =
-                                        ne2k_receive_frame(nic_data, boundary, length);
+                                    ne2k_receive_frame(nic_data, boundary, length);
                                 if (frame != NULL) {
                                         nic_frame_list_append(frames, frame);
@@ -558 +558 @@
                 if (tsr & TSR_COL) {
                         nic_report_collisions(nic_data,
-                                pio_read_8(ne2k->port + DP_NCR) & 15);
+                            pio_read_8(ne2k->port + DP_NCR) & 15);
                 }
 

uspace/drv/nic/ne2k/ne2k.c

@@ -162 +162 @@
 
         return register_interrupt_handler(nic_get_ddf_dev(nic_data),
-                ne2k->irq, ne2k_interrupt_handler, &ne2k->code, handle);
+            ne2k->irq, ne2k_interrupt_handler, &ne2k->code, handle);
 }
 
@@ -288 +288 @@
 
 static errno_t ne2k_on_unicast_mode_change(nic_t *nic_data,
-        nic_unicast_mode_t new_mode,
-        const nic_address_t *address_list, size_t address_count)
+    nic_unicast_mode_t new_mode,
+    const nic_address_t *address_list, size_t address_count)
 {
         ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);
@@ -315 +315 @@
 
 static errno_t ne2k_on_multicast_mode_change(nic_t *nic_data,
-        nic_multicast_mode_t new_mode,
-        const nic_address_t *address_list, size_t address_count)
+    nic_multicast_mode_t new_mode,
+    const nic_address_t *address_list, size_t address_count)
 {
         ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);
@@ -327 +327 @@
                 ne2k_set_accept_mcast(ne2k, true);
                 ne2k_set_mcast_hash(ne2k,
-                        nic_mcast_hash(address_list, address_count));
+                    nic_mcast_hash(address_list, address_count));
                 nic_report_hw_filtering(nic_data, -1, 0, -1);
                 return EOK;
@@ -341 +341 @@
 
 static errno_t ne2k_on_broadcast_mode_change(nic_t *nic_data,
-        nic_broadcast_mode_t new_mode)
+    nic_broadcast_mode_t new_mode)
 {
         ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);
@@ -367 +367 @@
         nic_set_send_frame_handler(nic_data, ne2k_send);
         nic_set_state_change_handlers(nic_data,
-                ne2k_on_activating, NULL, ne2k_on_stopping);
+            ne2k_on_activating, NULL, ne2k_on_stopping);
         nic_set_filtering_change_handlers(nic_data,
-                ne2k_on_unicast_mode_change, ne2k_on_multicast_mode_change,
-                ne2k_on_broadcast_mode_change, NULL, NULL);
+            ne2k_on_unicast_mode_change, ne2k_on_multicast_mode_change,
+            ne2k_on_broadcast_mode_change, NULL, NULL);
 
         ne2k_t *ne2k = malloc(sizeof(ne2k_t));