Changeset 1bc35b5 in mainline for uspace/srv/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/srv/net/nil

Files:

• eth/eth.c (modified) (2 diffs)
• nildummy/nildummy.c (modified) (2 diffs)

uspace/srv/net/nil/eth/eth.c

@@ -814 +814 @@
 }
 
+static int eth_received(nic_device_id_t device_id)
+{
+        void *data;
+        size_t size;
+        int rc;
+        
+        rc = async_data_write_accept(&data, false, 0, 0, 0, &size);
+        if (rc != EOK)
+                return rc;
+        
+        packet_t *packet = packet_get_1_remote(eth_globals.net_sess, size);
+        if (packet == NULL)
+                return ENOMEM;
+        
+        void *pdata = packet_suffix(packet, size);
+        memcpy(pdata, data, size);
+        free(data);
+        
+        return nil_received_msg_local(device_id, packet);
+}
+
 static int eth_addr_changed(nic_device_id_t device_id)
 {
@@ -926 +947 @@
                 return EOK;
         case NET_NIL_RECEIVED:
-                rc = packet_translate_remote(eth_globals.net_sess, &packet,
-                    IPC_GET_ARG2(*call));
-                if (rc == EOK)
-                        rc = nil_received_msg_local(IPC_GET_ARG1(*call), packet);
-                
+                rc = eth_received(IPC_GET_ARG1(*call));
                 async_answer_0(callid, (sysarg_t) rc);
                 return rc;

uspace/srv/net/nil/nildummy/nildummy.c

@@ -370 +370 @@
 }
 
+static int nildummy_received(nic_device_id_t device_id)
+{
+        void *data;
+        size_t size;
+        int rc;
+
+        rc = async_data_write_accept(&data, false, 0, 0, 0, &size);
+        if (rc != EOK)
+                return rc;
+
+        packet_t *packet = packet_get_1_remote(nildummy_globals.net_sess, size);
+        if (packet == NULL)
+                return ENOMEM;
+
+        void *pdata = packet_suffix(packet, size);
+        memcpy(pdata, data, size);
+        free(pdata);
+
+        return nil_received_msg_local(device_id, packet);
+}
+
 int nil_module_message(ipc_callid_t callid, ipc_call_t *call,
     ipc_call_t *answer, size_t *answer_count)
@@ -431 +452 @@
         
         case NET_NIL_RECEIVED:
-                rc = packet_translate_remote(nildummy_globals.net_sess, &packet,
-                    IPC_GET_ARG2(*call));
-                if (rc == EOK)
-                        rc = nil_received_msg_local(IPC_GET_ARG1(*call), packet);
-                
+                rc = nildummy_received(IPC_GET_ARG1(*call));
                 async_answer_0(callid, (sysarg_t) rc);
                 return rc;