Changeset f2f4c00 in mainline for uspace/lib/drv/generic/remote_nic.c

Timestamp:

2014-08-03T15:54:44Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8e77b12f

Parents:

251d4dd (diff), 1f1fa64 (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:

Merge the rtl8169 driver and improvements to the nic utility from
lp:~nufcia/helenos/rtl8169.

• Revert the disabling of the ISA devices using IRQ 5.
• Two minor build fixes for 64-bit platforms.

File:

• uspace/lib/drv/generic/remote_nic.c (modified) (1 diff)

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;
 }