Changeset 8da2c60 in mainline for uspace/srv/net/nil/nildummy/nildummy.c

Timestamp:

2012-01-27T19:12:45Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

fe56c08a

Parents:

ea75ceb (diff), d81eaf94 (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 with mainline

File:

• uspace/srv/net/nil/nildummy/nildummy.c (modified) (7 diffs)

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

@@ -73 +73 @@
     void *arg);
 
-static int nildummy_device_state(nic_device_id_t device_id, sysarg_t state)
+static int nildummy_device_state(nildummy_device_t *device, sysarg_t state)
 {
         fibril_rwlock_read_lock(&nildummy_globals.protos_lock);
         if (nildummy_globals.proto.sess)
-                il_device_state_msg(nildummy_globals.proto.sess, device_id,
-                    state, nildummy_globals.proto.service);
+                il_device_state_msg(nildummy_globals.proto.sess,
+                    device->device_id, state, nildummy_globals.proto.service);
         fibril_rwlock_read_unlock(&nildummy_globals.protos_lock);
         
@@ -84 +84 @@
 }
 
-static int nildummy_addr_changed(nic_device_id_t device_id)
+static int nildummy_addr_changed(nildummy_device_t *device)
 {
         return ENOTSUP;
@@ -182 +182 @@
         }
         
-        int rc = nic_callback_create(device->sess, device_id,
-            nildummy_nic_cb_conn, NULL);
+        int rc = nic_callback_create(device->sess, nildummy_nic_cb_conn,
+            device);
         if (rc != EOK) {
                 async_hangup(device->sess);
@@ -383 +383 @@
 }
 
-static int nildummy_received(nic_device_id_t device_id)
+static int nildummy_received(nildummy_device_t *device)
 {
         void *data;
@@ -401 +401 @@
         free(pdata);
 
-        return nil_received_msg_local(device_id, packet);
+        return nil_received_msg_local(device->device_id, packet);
 }
 
@@ -465 +465 @@
 static void nildummy_nic_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
+        nildummy_device_t *device = (nildummy_device_t *)arg;
         int rc;
         
@@ -478 +479 @@
                 switch (IPC_GET_IMETHOD(call)) {
                 case NIC_EV_DEVICE_STATE:
-                        rc = nildummy_device_state(IPC_GET_ARG1(call),
-                            IPC_GET_ARG2(call));
+                        rc = nildummy_device_state(device, IPC_GET_ARG1(call));
                         async_answer_0(callid, (sysarg_t) rc);
                         break;
                 case NIC_EV_RECEIVED:
-                        rc = nildummy_received(IPC_GET_ARG1(call));
+                        rc = nildummy_received(device);
                         async_answer_0(callid, (sysarg_t) rc);
                         break;
                 case NIC_EV_ADDR_CHANGED:
-                        rc = nildummy_addr_changed(IPC_GET_ARG1(call));
+                        rc = nildummy_addr_changed(device);
                         async_answer_0(callid, (sysarg_t) rc);
                         break;