Changeset 1bc35b5 in mainline for uspace/lib/net

Timestamp:

2012-01-19T08:13:45Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8da56b

Parents:

3ea725e

Message:

Remove most use of packet_t from NIC drivers.

Location:

uspace/lib/net

Files:

• include/nil_remote.h (modified) (2 diffs)
• nil/nil_remote.c (modified) (1 diff)

uspace/lib/net/include/nil_remote.h

@@ -39 +39 @@
 #include <generic.h>
 #include <async.h>
+#include <sys/types.h>
 
 #define nil_bind_service(service, device_id, me, receiver) \
@@ -61 +62 @@
     size_t);
 extern int nil_device_state_msg(async_sess_t *, nic_device_id_t, sysarg_t);
-extern int nil_received_msg(async_sess_t *, nic_device_id_t, packet_id_t);
+extern int nil_received_msg(async_sess_t *, nic_device_id_t, void *, size_t);
 extern int nil_addr_changed_msg(async_sess_t *, nic_device_id_t,
     const nic_address_t *);

uspace/lib/net/nil/nil_remote.c

@@ -77 +77 @@
  */
 int nil_received_msg(async_sess_t *sess, nic_device_id_t device_id,
-    packet_id_t packet_id)
+    void *data, size_t size)
 {
-        return generic_received_msg_remote(sess, NET_NIL_RECEIVED,
-            device_id, packet_id, 0, 0);
+        async_exch_t *exch = async_exchange_begin(sess);
+
+        ipc_call_t answer;
+        aid_t req = async_send_1(exch, NET_NIL_RECEIVED, (sysarg_t) device_id,
+            &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;
 }