Changeset 7943c43 in mainline for uspace/lib/c/generic/device/nic.c

Timestamp:

2012-01-16T22:45:38Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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 mainline changes.

File:

• uspace/lib/c/generic/device/nic.c (modified) (1 diff)

uspace/lib/c/generic/device/nic.c

@@ -44 +44 @@
 #include <ipc/services.h>
 
-/** Send a packet through the device
- *
- * @param[in] dev_sess
- * @param[in] packet_id Id of the sent packet
- *
- * @return EOK If the operation was successfully completed
- *
- */
-int nic_send_message(async_sess_t *dev_sess, packet_id_t packet_id)
-{
-        async_exch_t *exch = async_exchange_begin(dev_sess);
-        int rc = async_req_2_0(exch, DEV_IFACE_ID(NIC_DEV_IFACE),
-            NIC_SEND_MESSAGE, packet_id);
-        async_exchange_end(exch);
-        
-        return rc;
+/** Send frame from NIC
+ *
+ * @param[in] dev_sess
+ * @param[in] data     Frame data
+ * @param[in] size     Frame size in bytes
+ *
+ * @return EOK If the operation was successfully completed
+ *
+ */
+int nic_send_frame(async_sess_t *dev_sess, void *data, size_t size)
+{
+        async_exch_t *exch = async_exchange_begin(dev_sess);
+        
+        ipc_call_t answer;
+        aid_t req = async_send_1(exch, DEV_IFACE_ID(NIC_DEV_IFACE),
+            NIC_SEND_MESSAGE, &answer);
+        sysarg_t retval = async_data_write_start(exch, data, size);
+        
+        async_exchange_end(exch);
+        
+        if (retval != EOK) {
+                async_wait_for(req, NULL);
+                return retval;
+        }
+
+        async_wait_for(req, &retval);
+        return retval;
 }