Changeset cbfece7 in mainline for uspace/app/nic/nic.c

Timestamp:

2014-07-21T22:10:18Z (10 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

1f1fa64

Parents:

96e368a (diff), 54a1ca7 (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.

Message:

• Merged mainline changes
• Refactored rtl8169 driver to work with recent driver framework changes
• Fixed speed selection in rtl8169 (disables autonegotiation first)
• Added support for restarting autonegotiation
• Added new switch to 'nic' utility which restarts autonegotiation

File:

• uspace/app/nic/nic.c (modified) (4 diffs)

uspace/app/nic/nic.c

@@ -60 +60 @@
         printf("\taddr <mac_address> - set MAC address\n");
         printf("\tspeed <10|100|1000> - set NIC speed\n");
-        printf("\tduplex <half|full> - set duplex mode\n");
+        printf("\tduplex <half|full|simplex> - set duplex mode\n");
+        printf("\tauto - enable autonegotiation\n");
 }
 
@@ -206 +207 @@
         }
 
-        printf("[Service Name]\n");
+        printf("[Index]: [Service Name]\n");
         for (i = 0; i < count; i++) {
                 rc = loc_service_get_name(nics[i], &svc_name);
@@ -320 +321 @@
 
         return nic_set_operation_mode(sess, oldspeed, duplex, oldrole);
+}
+
+static int nic_set_autoneg(int i)
+{
+        async_sess_t *sess;
+        int rc;
+
+        sess = get_nic_by_index(i);
+        if (sess == NULL) {
+                printf("Specified NIC doesn't exist or cannot connect to it.\n");
+                return EINVAL;
+        }
+
+        rc = nic_autoneg_restart(sess);
+        if (rc != EOK) {
+                printf("Error restarting NIC autonegotiation.\n");
+                return EIO;
+        }
+
+        return EOK;
 }
 
@@ -376 +397 @@
                         return nic_set_duplex(index, argv[3]);
 
+                if (!str_cmp(argv[2], "auto"))
+                        return nic_set_autoneg(index);
+
         } else {
                 printf(NAME ": Invalid argument.\n");