Changeset 7493e7b in mainline

Timestamp:

2014-07-13T22:59:27Z (10 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

07e647a

Parents:

af2a76c

Message:

Add more information about NIC in 'nic' utility. Fix nic_get_device_info
function in lib/drv.

Location:

uspace

Files:

• app/nic/nic.c (modified) (7 diffs)
• lib/drv/generic/remote_nic.c (modified) (1 diff)

uspace/app/nic/nic.c

@@ -45 +45 @@
 
 typedef struct {
+        nic_device_info_t device_info;
         nic_address_t address;
         nic_cable_state_t link_state;
+        nic_channel_mode_t duplex;
+        int speed;
 } nic_info_t;
 
@@ -59 +62 @@
 {
         async_sess_t *sess;
+        nic_role_t role;
         int rc;
 
@@ -75 +79 @@
         }
 
+        rc = nic_get_device_info(sess, &info->device_info);
+        if (rc != EOK) {
+                printf("Error getting NIC device info.\n");
+                rc = EIO;
+                goto error;
+        }
+
         rc = nic_get_cable_state(sess, &info->link_state);
         if (rc != EOK) {
@@ -81 +92 @@
                 goto error;
         }
+
+        rc = nic_get_operation_mode(sess, &info->speed, &info->duplex, &role);
+        if (rc != EOK) {
+                printf("Error getting NIC speed and duplex mode.\n");
+                rc = EIO;
+                goto error;
+        }
+
 
         return EOK;
@@ -93 +112 @@
         case NIC_CS_PLUGGED: return "up";
         case NIC_CS_UNPLUGGED: return "down";
+        default: assert(false); return NULL;
+        }
+}
+
+static const char *nic_duplex_mode_str(nic_channel_mode_t mode)
+{
+        switch (mode) {
+        case NIC_CM_FULL_DUPLEX: return "full-duplex";
+        case NIC_CM_HALF_DUPLEX: return "half-duplex";
         default: assert(false); return NULL;
         }
@@ -133 +161 @@
         }
 
-        printf("[Address] [Link State] [Service Name]\n");
+        printf("[Address] [Service Name]\n");
         for (i = 0; i < count; i++) {
                 rc = loc_service_get_name(nics[i], &svc_name);
@@ -152 +180 @@
                 }
 
-                printf("%s %s %s\n", addr_str,
-                    nic_link_state_str(nic_info.link_state), svc_name);
+                printf("%s %s\n", addr_str, svc_name);
+                printf("\tVendor name: %s\n",
+                    nic_info.device_info.vendor_name);
+                printf("\tModel name: %s\n",
+                    nic_info.device_info.model_name);
+                printf("\tLink state: %s\n",
+                    nic_link_state_str(nic_info.link_state));
+
+                if (nic_info.link_state == NIC_CS_PLUGGED) {
+                        printf("\tSpeed: %dMbps %s\n", nic_info.speed,
+                            nic_duplex_mode_str(nic_info.duplex));
+                }
 
                 free(svc_name);

uspace/lib/drv/generic/remote_nic.c

@@ -288 +288 @@
         async_exch_t *exch = async_exchange_begin(dev_sess);
         
-        int rc = async_req_1_0(exch, DEV_IFACE_ID(NIC_DEV_IFACE),
-            NIC_GET_DEVICE_INFO);
-        if (rc != EOK) {
-                async_exchange_end(exch);
+        aid_t aid = async_send_1(exch, DEV_IFACE_ID(NIC_DEV_IFACE),
+            NIC_GET_DEVICE_INFO, NULL);
+        int rc = async_data_read_start(exch, device_info, sizeof(nic_device_info_t));
+        async_exchange_end(exch);
+
+        sysarg_t res;
+        async_wait_for(aid, &res);
+        
+        if (rc != EOK)
                 return rc;
-        }
-        
-        rc = async_data_read_start(exch, device_info, sizeof(nic_device_info_t));
-        
-        async_exchange_end(exch);
-        
-        return rc;
+        
+        return (int) res;
 }