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

Timestamp:

2018-03-02T20:34:50Z (7 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/ne2k/ne2k.c (modified) (11 diffs)

uspace/drv/nic/ne2k/ne2k.c

@@ -183 +183 @@
         hw_res_list_parsed_t hw_res_parsed;
         hw_res_list_parsed_init(&hw_res_parsed);
-        
+
         errno_t rc = nic_get_resources(nic_data, &hw_res_parsed);
-        
+
         if (rc != EOK)
                 goto failed;
-        
+
         if (hw_res_parsed.irqs.count == 0) {
                 rc = EINVAL;
                 goto failed;
         }
-        
+
         if (hw_res_parsed.io_ranges.count == 0) {
                 rc = EINVAL;
                 goto failed;
         }
-        
+
         if (hw_res_parsed.io_ranges.ranges[0].size < NE2K_IO_SIZE) {
                 rc = EINVAL;
                 goto failed;
         }
-        
+
         ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);
         ne2k->irq = hw_res_parsed.irqs.irqs[0];
-        
+
         addr_range_t regs = hw_res_parsed.io_ranges.ranges[0];
         ne2k->base_port = RNGABSPTR(regs);
-        
+
         hw_res_list_parsed_clean(&hw_res_parsed);
-        
+
         /* Enable programmed I/O */
         if (pio_enable_range(&regs, &ne2k->port) != EOK)
                 return EADDRNOTAVAIL;
-        
+
         ne2k->data_port = ne2k->port + NE2K_DATA;
         ne2k->receive_configuration = RCR_AB | RCR_AM;
         ne2k->probed = false;
         ne2k->up = false;
-        
+
         /* Find out whether the device is present. */
         if (ne2k_probe(ne2k) != EOK)
                 return ENOENT;
-        
+
         ne2k->probed = true;
-        
+
         if (ne2k_register_interrupt(nic_data, NULL) != EOK)
                 return EINVAL;
-        
+
         return EOK;
-        
+
 failed:
         hw_res_list_parsed_clean(&hw_res_parsed);
@@ -358 +358 @@
 {
         ddf_fun_t *fun;
-        
+
         /* Allocate driver data for the device. */
         nic_t *nic_data = nic_create_and_bind(dev);
         if (nic_data == NULL)
                 return ENOMEM;
-        
+
         nic_set_send_frame_handler(nic_data, ne2k_send);
         nic_set_state_change_handlers(nic_data,
@@ -370 +370 @@
                 ne2k_on_unicast_mode_change, ne2k_on_multicast_mode_change,
                 ne2k_on_broadcast_mode_change, NULL, NULL);
-        
+
         ne2k_t *ne2k = malloc(sizeof(ne2k_t));
         if (NULL != ne2k) {
@@ -379 +379 @@
                 return ENOMEM;
         }
-        
+
         ne2k->dev = dev;
         ne2k->parent_sess = ddf_dev_parent_sess_get(dev);
@@ -386 +386 @@
                 return ENOMEM;
         }
-        
+
         errno_t rc = ne2k_dev_init(nic_data);
         if (rc != EOK) {
@@ -392 +392 @@
                 return rc;
         }
-        
+
         rc = nic_report_address(nic_data, &ne2k->mac);
         if (rc != EOK) {
@@ -398 +398 @@
                 return rc;
         }
-        
+
         fun = ddf_fun_create(nic_get_ddf_dev(nic_data), fun_exposed, "port0");
         if (fun == NULL) {
@@ -404 +404 @@
                 return ENOMEM;
         }
-        
+
         nic_set_ddf_fun(nic_data, fun);
         ddf_fun_set_ops(fun, &ne2k_dev_ops);
-        
+
         rc = ddf_fun_bind(fun);
         if (rc != EOK) {
@@ -414 +414 @@
                 return rc;
         }
-        
+
         rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
         if (rc != EOK) {
@@ -421 +421 @@
                 return rc;
         }
-        
+
         return EOK;
 }
@@ -441 +441 @@
 {
         printf("%s: HelenOS NE 2000 network adapter driver\n", NAME);
-        
+
         nic_driver_init(NAME);
         nic_driver_implement(&ne2k_driver_ops, &ne2k_dev_ops, &ne2k_nic_iface);
-        
+
         return ddf_driver_main(&ne2k_driver);
 }